From c36ff8525956e594505b29988fdaa927b9169178 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Fri, 30 Aug 2024 23:39:51 +0300 Subject: [PATCH 01/68] SUPPORT-8392: frontend --- .../dropdown-treeview-select.component.scss | 9 + .../dropdown-treeview.component.scss | 22 ++ .../ngx-treeview/treeview-item.component.scss | 9 + .../ngx-treeview/treeview.component.scss | 32 +++ frontend/src/resources/css/style.css | 6 +- .../dropdown-treeview-select.component.html | 69 +++++ .../dropdown-treeview.component.html | 17 ++ .../ngx-treeview/treeview-item.component.html | 16 ++ .../ngx-treeview/treeview.component.html | 100 ++++++++ .../component/field/DropdownTreeView.html | 13 + .../dropdown-treeview-select-i18n.ts | 20 ++ .../dropdown-treeview-select.component.ts | 74 ++++++ .../lib/dropdown-menu.directive.ts | 14 + .../lib/dropdown-toggle.directive.ts | 17 ++ .../lib/dropdown-treeview.component.ts | 49 ++++ .../ngx-treeview/lib/dropdown.directive.ts | 54 ++++ .../ngx-treeview/lib/treeview-config.ts | 26 ++ .../ngx-treeview/lib/treeview-event-parser.ts | 107 ++++++++ .../lib/treeview-header-template-context.ts | 10 + .../ngx-treeview/lib/treeview-helper.ts | 94 +++++++ .../ngx-treeview/lib/treeview-i18n.ts | 49 ++++ .../lib/treeview-item-template-context.ts | 7 + .../lib/treeview-item.component.ts | 68 +++++ .../ngx-treeview/lib/treeview-item.ts | 185 +++++++++++++ .../ngx-treeview/lib/treeview.component.ts | 242 ++++++++++++++++++ .../ngx-treeview/lib/treeview.module.ts | 48 ++++ .../ngx-treeview/lib/treeview.pipe.ts | 16 ++ .../external/ngx-treeview/lib/utuls.ts | 45 ++++ .../field/DropdownTreeViewComponent.ts | 88 +++++++ frontend/src/ts/modules/app/app.module.ts | 16 +- .../main/resources/DropdownTreeView.component | 36 +++ 31 files changed, 1555 insertions(+), 3 deletions(-) create mode 100644 frontend/src/resources/css/external/ngx-treeview/dropdown-treeview-select.component.scss create mode 100644 frontend/src/resources/css/external/ngx-treeview/dropdown-treeview.component.scss create mode 100644 frontend/src/resources/css/external/ngx-treeview/treeview-item.component.scss create mode 100644 frontend/src/resources/css/external/ngx-treeview/treeview.component.scss create mode 100644 frontend/src/resources/template/component/external/ngx-treeview/dropdown-treeview-select.component.html create mode 100644 frontend/src/resources/template/component/external/ngx-treeview/dropdown-treeview.component.html create mode 100644 frontend/src/resources/template/component/external/ngx-treeview/treeview-item.component.html create mode 100644 frontend/src/resources/template/component/external/ngx-treeview/treeview.component.html create mode 100644 frontend/src/resources/template/component/field/DropdownTreeView.html create mode 100644 frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select-i18n.ts create mode 100644 frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component.ts create mode 100644 frontend/src/ts/component/external/ngx-treeview/lib/dropdown-menu.directive.ts create mode 100644 frontend/src/ts/component/external/ngx-treeview/lib/dropdown-toggle.directive.ts create mode 100644 frontend/src/ts/component/external/ngx-treeview/lib/dropdown-treeview.component.ts create mode 100644 frontend/src/ts/component/external/ngx-treeview/lib/dropdown.directive.ts create mode 100644 frontend/src/ts/component/external/ngx-treeview/lib/treeview-config.ts create mode 100644 frontend/src/ts/component/external/ngx-treeview/lib/treeview-event-parser.ts create mode 100644 frontend/src/ts/component/external/ngx-treeview/lib/treeview-header-template-context.ts create mode 100644 frontend/src/ts/component/external/ngx-treeview/lib/treeview-helper.ts create mode 100644 frontend/src/ts/component/external/ngx-treeview/lib/treeview-i18n.ts create mode 100644 frontend/src/ts/component/external/ngx-treeview/lib/treeview-item-template-context.ts create mode 100644 frontend/src/ts/component/external/ngx-treeview/lib/treeview-item.component.ts create mode 100644 frontend/src/ts/component/external/ngx-treeview/lib/treeview-item.ts create mode 100644 frontend/src/ts/component/external/ngx-treeview/lib/treeview.component.ts create mode 100644 frontend/src/ts/component/external/ngx-treeview/lib/treeview.module.ts create mode 100644 frontend/src/ts/component/external/ngx-treeview/lib/treeview.pipe.ts create mode 100644 frontend/src/ts/component/external/ngx-treeview/lib/utuls.ts create mode 100644 frontend/src/ts/component/field/DropdownTreeViewComponent.ts create mode 100644 resources/src/main/resources/DropdownTreeView.component diff --git a/frontend/src/resources/css/external/ngx-treeview/dropdown-treeview-select.component.scss b/frontend/src/resources/css/external/ngx-treeview/dropdown-treeview-select.component.scss new file mode 100644 index 00000000..8d5a0252 --- /dev/null +++ b/frontend/src/resources/css/external/ngx-treeview/dropdown-treeview-select.component.scss @@ -0,0 +1,9 @@ +label { + margin-bottom: 0; + cursor: pointer; +} + +.bi { + cursor: pointer; + margin-right: 0.3rem; +} diff --git a/frontend/src/resources/css/external/ngx-treeview/dropdown-treeview.component.scss b/frontend/src/resources/css/external/ngx-treeview/dropdown-treeview.component.scss new file mode 100644 index 00000000..c81c7542 --- /dev/null +++ b/frontend/src/resources/css/external/ngx-treeview/dropdown-treeview.component.scss @@ -0,0 +1,22 @@ +.dropdown { + width: 100%; + display: inline-block; + button { + width: 100%; + margin-right: 0.9rem; + text-align: left; + overflow: hidden; + padding-right: 30px; + text-overflow: ellipsis; + &::after { + position: absolute; + right: 0.6rem; + margin-top: 0.6rem; + } + } + .dropdown-menu { + .dropdown-container { + padding: 0 0.6rem; + } + } +} diff --git a/frontend/src/resources/css/external/ngx-treeview/treeview-item.component.scss b/frontend/src/resources/css/external/ngx-treeview/treeview-item.component.scss new file mode 100644 index 00000000..27e6358c --- /dev/null +++ b/frontend/src/resources/css/external/ngx-treeview/treeview-item.component.scss @@ -0,0 +1,9 @@ +:host { + display: block; + .treeview-item { + white-space: nowrap; + .treeview-item { + margin-left: 2rem; + } + } +} diff --git a/frontend/src/resources/css/external/ngx-treeview/treeview.component.scss b/frontend/src/resources/css/external/ngx-treeview/treeview.component.scss new file mode 100644 index 00000000..1047dd2e --- /dev/null +++ b/frontend/src/resources/css/external/ngx-treeview/treeview.component.scss @@ -0,0 +1,32 @@ +:host { + .treeview-header { + .row-filter { + margin-bottom: 0.5rem; + } + .row-all { + .bi { + cursor: pointer; + } + } + } + .treeview-container { + .row-item { + margin-bottom: 0.3rem; + flex-wrap: nowrap; + .bi { + cursor: pointer; + margin-right: 0.3rem; + } + } + } +} + +.treeview-container { + overflow-y: auto; + padding-right: 0.3rem; +} + +.treeview-text { + padding: 0.3rem 0; + white-space: nowrap; +} diff --git a/frontend/src/resources/css/style.css b/frontend/src/resources/css/style.css index 03ed56df..36d68241 100644 --- a/frontend/src/resources/css/style.css +++ b/frontend/src/resources/css/style.css @@ -7,4 +7,8 @@ @import "../../../node_modules/@webbpm/base-package/css/style.css"; @import "structure.css"; @import "inbox-dashboard.css"; -@import "components-dashboard.css"; \ No newline at end of file +@import "components-dashboard.css"; +@import "external/ngx-treeview/dropdown-treeview.component.scss"; +@import "external/ngx-treeview/dropdown-treeview-select.component.scss"; +@import "external/ngx-treeview/treeview.component.scss"; +@import "external/ngx-treeview/treeview-item.component.scss"; diff --git a/frontend/src/resources/template/component/external/ngx-treeview/dropdown-treeview-select.component.html b/frontend/src/resources/template/component/external/ngx-treeview/dropdown-treeview-select.component.html new file mode 100644 index 00000000..ca2f6105 --- /dev/null +++ b/frontend/src/resources/template/component/external/ngx-treeview/dropdown-treeview-select.component.html @@ -0,0 +1,69 @@ + +
+ + +
+ + +
+
+ +
+
+
+
+ + +
+
+
+ + + diff --git a/frontend/src/resources/template/component/external/ngx-treeview/dropdown-treeview.component.html b/frontend/src/resources/template/component/external/ngx-treeview/dropdown-treeview.component.html new file mode 100644 index 00000000..a42a65e5 --- /dev/null +++ b/frontend/src/resources/template/component/external/ngx-treeview/dropdown-treeview.component.html @@ -0,0 +1,17 @@ +
+ +
+
+ + +
+
+
diff --git a/frontend/src/resources/template/component/external/ngx-treeview/treeview-item.component.html b/frontend/src/resources/template/component/external/ngx-treeview/treeview-item.component.html new file mode 100644 index 00000000..1be2f358 --- /dev/null +++ b/frontend/src/resources/template/component/external/ngx-treeview/treeview-item.component.html @@ -0,0 +1,16 @@ +
+ + +
+ + +
+
diff --git a/frontend/src/resources/template/component/external/ngx-treeview/treeview.component.html b/frontend/src/resources/template/component/external/ngx-treeview/treeview.component.html new file mode 100644 index 00000000..d10f4ab7 --- /dev/null +++ b/frontend/src/resources/template/component/external/ngx-treeview/treeview.component.html @@ -0,0 +1,100 @@ + +
+ +
+ + +
+
+ + +
+
+ +
+
+
+
+
+
+ + +
+ +
+
+
+
+ +
+ + +
+
+
+ + +
+
+ {{i18n.getFilterNoItemsFoundText()}} +
+
diff --git a/frontend/src/resources/template/component/field/DropdownTreeView.html b/frontend/src/resources/template/component/field/DropdownTreeView.html new file mode 100644 index 00000000..dbc91ba0 --- /dev/null +++ b/frontend/src/resources/template/component/field/DropdownTreeView.html @@ -0,0 +1,13 @@ +
+
+
+
+ + +
+
+
+
diff --git a/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select-i18n.ts b/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select-i18n.ts new file mode 100644 index 00000000..f3cb3b85 --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select-i18n.ts @@ -0,0 +1,20 @@ +import {Injectable} from "@angular/core"; +import {DefaultTreeviewI18n} from "../lib/treeview-i18n"; +import {TreeviewItem, TreeviewSelection} from "../lib/treeview-item"; + +@Injectable() +export class DropdownTreeviewSelectI18n extends DefaultTreeviewI18n { + private internalSelectedItem: TreeviewItem; + + set selectedItem(value: TreeviewItem) { + this.internalSelectedItem = value; + } + + get selectedItem(): TreeviewItem { + return this.internalSelectedItem; + } + + getText(selection: TreeviewSelection): string { + return this.internalSelectedItem ? this.internalSelectedItem.text : 'Элемент не выбран'; + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component.ts b/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component.ts new file mode 100644 index 00000000..ba5df296 --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component.ts @@ -0,0 +1,74 @@ +import { + ChangeDetectionStrategy, + Component, + EventEmitter, + Input, + OnChanges, + Output, + ViewChild +} from '@angular/core'; +import { DropdownTreeviewSelectI18n } from './dropdown-treeview-select-i18n'; +import { DropdownTreeviewComponent } from "../lib/dropdown-treeview.component"; +import { TreeviewConfig } from "../lib/treeview-config"; +import { TreeviewHelper } from "../lib/treeview-helper"; +import { TreeviewI18n } from "../lib/treeview-i18n"; +import { TreeviewItem } from "../lib/treeview-item"; +import { isNil } from '../lib/utuls'; + +@Component({ + moduleId: module.id, + selector: 'ngx-dropdown-treeview-select', + templateUrl: './../../../../../../src/resources/template/component/external/ngx-treeview/dropdown-treeview-select.component.html', + providers: [{ provide: TreeviewI18n, useClass: DropdownTreeviewSelectI18n }], + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class DropdownTreeviewSelectComponent implements OnChanges { + @Input() config: TreeviewConfig; + @Input() items: TreeviewItem[]; + @Input() value: any; + @Output() valueChange = new EventEmitter(); + @ViewChild(DropdownTreeviewComponent) dropdownTreeviewComponent: DropdownTreeviewComponent; + filterText: string; + private dropdownTreeviewSelectI18n: DropdownTreeviewSelectI18n; + + constructor(public i18n: TreeviewI18n) { + this.config = TreeviewConfig.create({ + hasAllCheckBox: false, + hasCollapseExpand: false, + hasFilter: true, + maxHeight: 500 + }); + this.dropdownTreeviewSelectI18n = i18n as DropdownTreeviewSelectI18n; + } + + ngOnChanges(): void { + this.updateSelectedItem(); + } + + select(item: TreeviewItem): void { + this.selectItem(item); + } + + private updateSelectedItem(): void { + if (!isNil(this.items)) { + const selectedItem = TreeviewHelper.findItemInList(this.items, this.value); + this.selectItem(selectedItem); + } + } + + private selectItem(item: TreeviewItem): void { + if (this.dropdownTreeviewSelectI18n.selectedItem !== item) { + this.dropdownTreeviewSelectI18n.selectedItem = item; + if (this.dropdownTreeviewComponent) { + this.dropdownTreeviewComponent.onSelectedChange([item]); + } + + if (item) { + if (this.value !== item.value) { + this.value = item.value; + this.valueChange.emit(item.value); + } + } + } + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-menu.directive.ts b/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-menu.directive.ts new file mode 100644 index 00000000..7352d415 --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-menu.directive.ts @@ -0,0 +1,14 @@ +import { Directive } from '@angular/core'; +import { DropdownDirective } from './dropdown.directive'; + +@Directive({ + selector: '[ngxDropdownMenu]', + host: { + '[class.dropdown-menu]': 'true', + '[class.show]': 'dropdown.isOpen' + } + }) +export class DropdownMenuDirective { + constructor(public dropdown: DropdownDirective) { + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-toggle.directive.ts b/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-toggle.directive.ts new file mode 100644 index 00000000..d41f85b0 --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-toggle.directive.ts @@ -0,0 +1,17 @@ +import { Directive, ElementRef } from '@angular/core'; +import { DropdownDirective } from './dropdown.directive'; + +@Directive({ + selector: '[ngxDropdownToggle]', + host: { + class: 'dropdown-toggle', + 'aria-haspopup': 'true', + '[attr.aria-expanded]': 'dropdown.isOpen', + '(click)': 'dropdown.toggle()' + } + }) +export class DropdownToggleDirective { + constructor(public dropdown: DropdownDirective, elementRef: ElementRef) { + dropdown.toggleElement = elementRef.nativeElement; + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-treeview.component.ts b/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-treeview.component.ts new file mode 100644 index 00000000..b1f89fef --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-treeview.component.ts @@ -0,0 +1,49 @@ +import { + Component, + EventEmitter, + Input, + Output, + ViewChild, + TemplateRef, + ChangeDetectionStrategy +} from '@angular/core'; +import { TreeviewI18n } from './treeview-i18n'; +import { TreeviewItem } from './treeview-item'; +import { TreeviewConfig } from './treeview-config'; +import { TreeviewComponent } from './treeview.component'; +import { TreeviewHeaderTemplateContext } from './treeview-header-template-context'; +import { TreeviewItemTemplateContext } from './treeview-item-template-context'; + +@Component({ + moduleId: module.id, + selector: 'ngx-dropdown-treeview', + templateUrl: './../../../../../../src/resources/template/component/external/ngx-treeview/dropdown-treeview.component.html', + changeDetection: ChangeDetectionStrategy.OnPush + }) +export class DropdownTreeviewComponent { + @Input() buttonClass = 'btn-outline-secondary'; + @Input() headerTemplate: TemplateRef; + @Input() itemTemplate: TemplateRef; + @Input() items: TreeviewItem[]; + @Input() config: TreeviewConfig; + @Output() selectedChange = new EventEmitter(true); + @Output() filterChange = new EventEmitter(); + @ViewChild(TreeviewComponent) treeviewComponent: TreeviewComponent; + buttonLabel: string; + + constructor( + public i18n: TreeviewI18n, + private defaultConfig: TreeviewConfig + ) { + this.config = this.defaultConfig; + } + + onSelectedChange(values: any[]): void { + this.buttonLabel = this.i18n.getText(this.treeviewComponent.selection); + this.selectedChange.emit(values); + } + + onFilterChange(text: string): void { + this.filterChange.emit(text); + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/dropdown.directive.ts b/frontend/src/ts/component/external/ngx-treeview/lib/dropdown.directive.ts new file mode 100644 index 00000000..9d813506 --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/dropdown.directive.ts @@ -0,0 +1,54 @@ +import { Directive, Input, Output, HostBinding, HostListener, EventEmitter } from '@angular/core'; +import { isNil } from './utuls'; + +@Directive({ + selector: '[ngxDropdown]', + exportAs: 'ngxDropdown' + }) +export class DropdownDirective { + toggleElement: any; + @Input('open') internalOpen = false; + @Output() openChange = new EventEmitter(); + + @HostBinding('class.show') get isOpen(): boolean { + return this.internalOpen; + } + + @HostListener('keyup.esc') + onKeyupEsc(): void { + this.close(); + } + + @HostListener('document:click', ['$event']) + onDocumentClick(event: MouseEvent): void { + if (event.button !== 2 && !this.isEventFromToggle(event)) { + this.close(); + } + } + + open(): void { + if (!this.internalOpen) { + this.internalOpen = true; + this.openChange.emit(true); + } + } + + close(): void { + if (this.internalOpen) { + this.internalOpen = false; + this.openChange.emit(false); + } + } + + toggle(): void { + if (this.isOpen) { + this.close(); + } else { + this.open(); + } + } + + private isEventFromToggle(event: MouseEvent): boolean { + return !isNil(this.toggleElement) && this.toggleElement.contains(event.target); + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-config.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-config.ts new file mode 100644 index 00000000..e15c43d9 --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-config.ts @@ -0,0 +1,26 @@ +import { Injectable } from '@angular/core'; + +@Injectable() +export class TreeviewConfig { + hasAllCheckBox = true; + hasFilter = false; + hasCollapseExpand = false; + decoupleChildFromParent = false; + maxHeight = 500; + + get hasDivider(): boolean { + return this.hasFilter || this.hasAllCheckBox || this.hasCollapseExpand; + } + + public static create(fields?: { + hasAllCheckBox?: boolean, + hasFilter?: boolean, + hasCollapseExpand?: boolean, + decoupleChildFromParent?: boolean + maxHeight?: number, + }): TreeviewConfig { + const config = new TreeviewConfig(); + Object.assign(config, fields); + return config; + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-event-parser.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-event-parser.ts new file mode 100644 index 00000000..cd7de796 --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-event-parser.ts @@ -0,0 +1,107 @@ +import { Injectable } from '@angular/core'; +import { TreeviewItem } from './treeview-item'; +import {TreeviewComponent} from './treeview.component'; +import { isNil } from './utuls'; + +@Injectable() +export abstract class TreeviewEventParser { + abstract getSelectedChange(component: TreeviewComponent): any[]; +} + +@Injectable() +export class DefaultTreeviewEventParser extends TreeviewEventParser { + getSelectedChange(component: TreeviewComponent): any[] { + const checkedItems = component.selection.checkedItems; + if (!isNil(checkedItems)) { + return checkedItems.map(item => item.value); + } + + return []; + } +} + +export interface DownlineTreeviewItem { + item: TreeviewItem; + parent: DownlineTreeviewItem; +} + +@Injectable() +export class DownlineTreeviewEventParser extends TreeviewEventParser { + getSelectedChange(component: TreeviewComponent): any[] { + const items = component.items; + if (!isNil(items)) { + let result: DownlineTreeviewItem[] = []; + items.forEach(item => { + const links = this.getLinks(item, null); + if (!isNil(links)) { + result = result.concat(links); + } + }); + + return result; + } + + return []; + } + + private getLinks(item: TreeviewItem, parent: DownlineTreeviewItem): DownlineTreeviewItem[] { + if (!isNil(item.children)) { + const link = { + item, + parent + }; + let result: DownlineTreeviewItem[] = []; + item.children.forEach(child => { + const links = this.getLinks(child, link); + if (!isNil(links)) { + result = result.concat(links); + } + }); + + return result; + } + + if (item.checked) { + return [{ + item, + parent + }]; + } + + return null; + } +} + +@Injectable() +export class OrderDownlineTreeviewEventParser extends TreeviewEventParser { + private currentDownlines: DownlineTreeviewItem[] = []; + private parser = new DownlineTreeviewEventParser(); + + getSelectedChange(component: TreeviewComponent): any[] { + const newDownlines: DownlineTreeviewItem[] = this.parser.getSelectedChange(component); + if (this.currentDownlines.length === 0) { + this.currentDownlines = newDownlines; + } else { + const intersectDownlines: DownlineTreeviewItem[] = []; + this.currentDownlines.forEach(downline => { + let foundIndex = -1; + const length = newDownlines.length; + for (let i = 0; i < length; i++) { + if (downline.item.value === newDownlines[i].item.value) { + foundIndex = i; + break; + } + } + + if (foundIndex !== -1) { + intersectDownlines.push(newDownlines[foundIndex]); + newDownlines.splice(foundIndex, 1); + } + }); + + this.currentDownlines = intersectDownlines.concat(newDownlines); + } + + return this.currentDownlines; + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-header-template-context.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-header-template-context.ts new file mode 100644 index 00000000..6b4f1eb6 --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-header-template-context.ts @@ -0,0 +1,10 @@ +import { TreeviewItem } from './treeview-item'; +import { TreeviewConfig } from './treeview-config'; + +export interface TreeviewHeaderTemplateContext { + config: TreeviewConfig; + item: TreeviewItem; + onCollapseExpand: () => void; + onCheckedChange: (checked: boolean) => void; + onFilterTextChange: (text: string) => void; +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-helper.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-helper.ts new file mode 100644 index 00000000..eba9529d --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-helper.ts @@ -0,0 +1,94 @@ +import { TreeviewItem } from './treeview-item'; +import { isNil, pull } from './utuls'; + +export const TreeviewHelper = { + findItem, + findItemInList, + findParent, + removeItem, + concatSelection +}; + +function findItem(root: TreeviewItem, value: any): TreeviewItem { + if (isNil(root)) { + return undefined; + } + + if (root.value === value) { + return root; + } + + if (root.children) { + for (const child of root.children) { + const foundItem = findItem(child, value); + if (foundItem) { + return foundItem; + } + } + } + + return undefined; +} + +function findItemInList(list: TreeviewItem[], value: any): TreeviewItem { + if (isNil(list)) { + return undefined; + } + + for (const item of list) { + const foundItem = findItem(item, value); + if (foundItem) { + return foundItem; + } + } + + return undefined; +} + +function findParent(root: TreeviewItem, item: TreeviewItem): TreeviewItem { + if (isNil(root) || isNil(root.children)) { + return undefined; + } + + for (const child of root.children) { + if (child === item) { + return root; + } else { + const parent = findParent(child, item); + if (parent) { + return parent; + } + } + } + + return undefined; +} + +function removeItem(root: TreeviewItem, item: TreeviewItem): boolean { + const parent = findParent(root, item); + if (parent) { + pull(parent.children, item); + if (parent.children.length === 0) { + parent.children = undefined; + } else { + parent.correctChecked(); + } + return true; + } + + return false; +} + +function concatSelection(items: TreeviewItem[], checked: TreeviewItem[], unchecked: TreeviewItem[]): { [k: string]: TreeviewItem[] } { + let checkedItems = [...checked]; + let uncheckedItems = [...unchecked]; + for (const item of items) { + const selection = item.getSelection(); + checkedItems = checkedItems.concat(selection.checkedItems); + uncheckedItems = uncheckedItems.concat(selection.uncheckedItems); + } + return { + checked: checkedItems, + unchecked: uncheckedItems + }; +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-i18n.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-i18n.ts new file mode 100644 index 00000000..480ee696 --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-i18n.ts @@ -0,0 +1,49 @@ +import { Injectable } from '@angular/core'; +import { TreeviewSelection } from './treeview-item'; + +@Injectable() +export abstract class TreeviewI18n { + abstract getText(selection: TreeviewSelection): string; + abstract getAllCheckboxText(): string; + abstract getFilterPlaceholder(): string; + abstract getFilterNoItemsFoundText(): string; + abstract getTooltipCollapseExpandText(isCollapse: boolean): string; +} + +@Injectable() +export class DefaultTreeviewI18n extends TreeviewI18n { + getText(selection: TreeviewSelection): string { + if (selection.uncheckedItems.length === 0) { + if (selection.checkedItems.length > 0) { + return this.getAllCheckboxText(); + } else { + return ''; + } + } + + switch (selection.checkedItems.length) { + case 0: + return 'Select options'; + case 1: + return selection.checkedItems[0].text; + default: + return `${selection.checkedItems.length} options selected`; + } + } + + getAllCheckboxText(): string { + return 'Все'; + } + + getFilterPlaceholder(): string { + return 'Поиск'; + } + + getFilterNoItemsFoundText(): string { + return 'Элементы не найдены'; + } + + getTooltipCollapseExpandText(isCollapse: boolean): string { + return isCollapse ? 'Развернуть' : 'Свернуть'; + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item-template-context.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item-template-context.ts new file mode 100644 index 00000000..dd32c50c --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item-template-context.ts @@ -0,0 +1,7 @@ +import { TreeviewItem } from './treeview-item'; + +export interface TreeviewItemTemplateContext { + item: TreeviewItem; + onCollapseExpand: () => void; + onCheckedChange: () => void; +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item.component.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item.component.ts new file mode 100644 index 00000000..5fd5adfc --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item.component.ts @@ -0,0 +1,68 @@ +import { + ChangeDetectionStrategy, + Component, + EventEmitter, + Input, + Output, + TemplateRef +} from '@angular/core'; +import { TreeviewConfig } from './treeview-config'; +import { TreeviewItem } from './treeview-item'; +import { TreeviewItemTemplateContext } from './treeview-item-template-context'; +import { isNil } from './utuls'; + +@Component({ + moduleId: module.id, + selector: 'ngx-treeview-item', + templateUrl: './../../../../../../src/resources/template/component/external/ngx-treeview/treeview-item.component.html', + changeDetection: ChangeDetectionStrategy.OnPush + }) +export class TreeviewItemComponent { + @Input() config: TreeviewConfig; + @Input() template: TemplateRef; + @Input() item: TreeviewItem; + @Output() checkedChange = new EventEmitter(); + + constructor( + private defaultConfig: TreeviewConfig + ) { + this.config = this.defaultConfig; + } + + onCollapseExpand = () => { + this.item.collapsed = !this.item.collapsed; + } + + onCheckedChange = () => { + const checked = this.item.checked; + if (!isNil(this.item.children) && !this.config.decoupleChildFromParent) { + this.item.children.forEach(child => child.setCheckedRecursive(checked)); + } + this.checkedChange.emit(checked); + } + + onChildCheckedChange(child: TreeviewItem, checked: boolean): void { + if (!this.config.decoupleChildFromParent) { + let itemChecked: boolean = null; + for (const childItem of this.item.children) { + if (itemChecked === null) { + itemChecked = childItem.checked; + } else if (itemChecked !== childItem.checked) { + itemChecked = undefined; + break; + } + } + + if (itemChecked === null) { + itemChecked = false; + } + + if (this.item.checked !== itemChecked) { + this.item.checked = itemChecked; + } + + } + + this.checkedChange.emit(checked); + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item.ts new file mode 100644 index 00000000..da8f0a85 --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item.ts @@ -0,0 +1,185 @@ +import { TreeviewHelper } from './treeview-helper'; +import { isBoolean, isNil, isString } from './utuls'; + +export interface TreeviewSelection { + checkedItems: TreeviewItem[]; + uncheckedItems: TreeviewItem[]; +} + +export interface TreeItem { + text: string; + value: any; + disabled?: boolean; + checked?: boolean; + collapsed?: boolean; + children?: TreeItem[]; +} + +export class TreeviewItem { + private internalDisabled = false; + private internalChecked = true; + private internalCollapsed = false; + private internalChildren: TreeviewItem[]; + text: string; + value: any; + + constructor(item: TreeItem, autoCorrectChecked = false) { + if (isNil(item)) { + throw new Error('Item must be defined'); + } + if (isString(item.text)) { + this.text = item.text; + } else { + throw new Error('A text of item must be string object'); + } + this.value = item.value; + if (isBoolean(item.checked)) { + this.checked = item.checked; + } + if (isBoolean(item.collapsed)) { + this.collapsed = item.collapsed; + } + if (isBoolean(item.disabled)) { + this.disabled = item.disabled; + } + if (!isNil(item.children) && item.children.length > 0) { + this.children = item.children.map(child => { + if (this.disabled === true) { + child.disabled = true; + } + + return new TreeviewItem(child); + }); + } + + if (autoCorrectChecked) { + this.correctChecked(); + } + } + + get checked(): boolean { + return this.internalChecked; + } + + set checked(value: boolean) { + if (!this.internalDisabled) { + if (this.internalChecked !== value) { + this.internalChecked = value; + } + } + } + + get indeterminate(): boolean { + return this.checked === undefined; + } + + setCheckedRecursive(value: boolean): void { + if (!this.internalDisabled) { + this.internalChecked = value; + if (!isNil(this.internalChildren)) { + this.internalChildren.forEach(child => child.setCheckedRecursive(value)); + } + } + } + + get disabled(): boolean { + return this.internalDisabled; + } + + set disabled(value: boolean) { + if (this.internalDisabled !== value) { + this.internalDisabled = value; + if (!isNil(this.internalChildren)) { + this.internalChildren.forEach(child => child.disabled = value); + } + } + } + + get collapsed(): boolean { + return this.internalCollapsed; + } + + set collapsed(value: boolean) { + if (this.internalCollapsed !== value) { + this.internalCollapsed = value; + } + } + + setCollapsedRecursive(value: boolean): void { + this.internalCollapsed = value; + if (!isNil(this.internalChildren)) { + this.internalChildren.forEach(child => child.setCollapsedRecursive(value)); + } + } + + get children(): TreeviewItem[] { + return this.internalChildren; + } + + set children(value: TreeviewItem[]) { + if (this.internalChildren !== value) { + if (!isNil(value) && value.length === 0) { + throw new Error('Children must be not an empty array'); + } + this.internalChildren = value; + if (!isNil(this.internalChildren)) { + let checked = null; + this.internalChildren.forEach(child => { + if (checked === null) { + checked = child.checked; + } else { + if (child.checked !== checked) { + checked = undefined; + return; + } + } + }); + this.internalChecked = checked; + } + } + } + + getSelection(): TreeviewSelection { + let checkedItems: TreeviewItem[] = []; + let uncheckedItems: TreeviewItem[] = []; + if (isNil(this.internalChildren)) { + if (this.internalChecked) { + checkedItems.push(this); + } else { + uncheckedItems.push(this); + } + } else { + const selection = TreeviewHelper.concatSelection(this.internalChildren, checkedItems, uncheckedItems); + checkedItems = selection.checked; + uncheckedItems = selection.unchecked; + } + + return { + checkedItems, + uncheckedItems + }; + } + + correctChecked(): void { + this.internalChecked = this.getCorrectChecked(); + } + + private getCorrectChecked(): boolean { + let checked: boolean = null; + if (!isNil(this.internalChildren)) { + for (const child of this.internalChildren) { + child.internalChecked = child.getCorrectChecked(); + if (checked === null) { + checked = child.internalChecked; + } else if (checked !== child.internalChecked) { + checked = undefined; + break; + } + } + } else { + checked = this.checked; + } + + return checked; + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview.component.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview.component.ts new file mode 100644 index 00000000..c1551d4b --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview.component.ts @@ -0,0 +1,242 @@ +import { + Component, + Input, + Output, + EventEmitter, + OnChanges, + OnInit, + SimpleChanges, + TemplateRef, + ChangeDetectionStrategy +} from '@angular/core'; +import { TreeviewI18n } from './treeview-i18n'; +import { TreeviewItem, TreeviewSelection } from './treeview-item'; +import { TreeviewConfig } from './treeview-config'; +import { TreeviewEventParser } from './treeview-event-parser'; +import { TreeviewHeaderTemplateContext } from './treeview-header-template-context'; +import { TreeviewItemTemplateContext } from './treeview-item-template-context'; +import { TreeviewHelper } from './treeview-helper'; +import { isNil } from './utuls'; + +class FilterTreeviewItem extends TreeviewItem { + private readonly refItem: TreeviewItem; + constructor(item: TreeviewItem) { + super({ + text: item.text, + value: item.value, + disabled: item.disabled, + checked: item.checked, + collapsed: item.collapsed, + children: item.children + }); + this.refItem = item; + } + + updateRefChecked(): void { + this.children.forEach(child => { + if (child instanceof FilterTreeviewItem) { + child.updateRefChecked(); + } + }); + + let refChecked = this.checked; + if (refChecked) { + for (const refChild of this.refItem.children) { + if (!refChild.checked) { + refChecked = false; + break; + } + } + } + this.refItem.checked = refChecked; + } +} + +@Component({ + moduleId: module.id, + selector: 'ngx-treeview', + templateUrl: './../../../../../../src/resources/template/component/external/ngx-treeview/treeview.component.html', + changeDetection: ChangeDetectionStrategy.OnPush + }) +export class TreeviewComponent implements OnChanges, OnInit { + @Input() headerTemplate: TemplateRef; + @Input() itemTemplate: TemplateRef; + @Input() items: TreeviewItem[]; + @Input() config: TreeviewConfig; + @Output() selectedChange = new EventEmitter(); + @Output() filterChange = new EventEmitter(); + headerTemplateContext: TreeviewHeaderTemplateContext; + allItem: TreeviewItem; + filterText = ''; + filterItems: TreeviewItem[]; + selection: TreeviewSelection; + + constructor( + public i18n: TreeviewI18n, + private defaultConfig: TreeviewConfig, + private eventParser: TreeviewEventParser + ) { + this.config = this.defaultConfig; + this.allItem = new TreeviewItem({ text: 'All', value: undefined }); + } + + get hasFilterItems(): boolean { + return !isNil(this.filterItems) && this.filterItems.length > 0; + } + + get maxHeight(): string { + return `${this.config.maxHeight}`; + } + + ngOnInit(): void { + this.createHeaderTemplateContext(); + this.generateSelection(); + } + + ngOnChanges(changes: SimpleChanges): void { + const itemsSimpleChange = changes.items; + if (!isNil(itemsSimpleChange) && !isNil(this.items)) { + this.updateFilterItems(); + this.updateCollapsedOfAll(); + this.raiseSelectedChange(); + } + } + + onAllCollapseExpand(): void { + this.allItem.collapsed = !this.allItem.collapsed; + this.filterItems.forEach(item => item.setCollapsedRecursive(this.allItem.collapsed)); + } + + onFilterTextChange(text: string): void { + this.filterText = text; + this.filterChange.emit(text); + this.updateFilterItems(); + } + + onAllCheckedChange(): void { + const checked = this.allItem.checked; + this.filterItems.forEach(item => { + item.setCheckedRecursive(checked); + if (item instanceof FilterTreeviewItem) { + item.updateRefChecked(); + } + }); + + this.raiseSelectedChange(); + } + + onItemCheckedChange(item: TreeviewItem, checked: boolean): void { + if (item instanceof FilterTreeviewItem) { + item.updateRefChecked(); + } + + this.updateCheckedOfAll(); + this.raiseSelectedChange(); + } + + raiseSelectedChange(): void { + this.generateSelection(); + const values = this.eventParser.getSelectedChange(this); + setTimeout(() => { + this.selectedChange.emit(values); + }); + } + + private createHeaderTemplateContext(): void { + this.headerTemplateContext = { + config: this.config, + item: this.allItem, + onCheckedChange: () => this.onAllCheckedChange(), + onCollapseExpand: () => this.onAllCollapseExpand(), + onFilterTextChange: (text) => this.onFilterTextChange(text) + }; + } + + private generateSelection(): void { + let checkedItems: TreeviewItem[] = []; + let uncheckedItems: TreeviewItem[] = []; + if (!isNil(this.items)) { + const selection = TreeviewHelper.concatSelection(this.items, checkedItems, uncheckedItems); + checkedItems = selection.checked; + uncheckedItems = selection.unchecked; + } + + this.selection = { + checkedItems, + uncheckedItems + }; + } + + private updateFilterItems(): void { + if (this.filterText !== '') { + const filterItems: TreeviewItem[] = []; + const filterText = this.filterText.toLowerCase(); + this.items.forEach(item => { + const newItem = this.filterItem(item, filterText); + if (!isNil(newItem)) { + filterItems.push(newItem); + } + }); + this.filterItems = filterItems; + } else { + this.filterItems = this.items; + } + + this.updateCheckedOfAll(); + } + + private filterItem(item: TreeviewItem, filterText: string): TreeviewItem { + const isMatch = item.text.toLowerCase().includes(filterText); + if (isMatch) { + return item; + } else { + if (!isNil(item.children)) { + const children: TreeviewItem[] = []; + item.children.forEach(child => { + const newChild = this.filterItem(child, filterText); + if (!isNil(newChild)) { + children.push(newChild); + } + }); + if (children.length > 0) { + const newItem = new FilterTreeviewItem(item); + newItem.collapsed = false; + newItem.children = children; + return newItem; + } + } + } + + return undefined; + } + + private updateCheckedOfAll(): void { + let itemChecked: boolean = null; + for (const filterItem of this.filterItems) { + if (itemChecked === null) { + itemChecked = filterItem.checked; + } else if (itemChecked !== filterItem.checked) { + itemChecked = undefined; + break; + } + } + + if (itemChecked === null) { + itemChecked = false; + } + + this.allItem.checked = itemChecked; + } + + private updateCollapsedOfAll(): void { + let hasItemExpanded = false; + for (const filterItem of this.filterItems) { + if (!filterItem.collapsed) { + hasItemExpanded = true; + break; + } + } + + this.allItem.collapsed = !hasItemExpanded; + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview.module.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview.module.ts new file mode 100644 index 00000000..ca84acbd --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview.module.ts @@ -0,0 +1,48 @@ +import { NgModule, ModuleWithProviders } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { CommonModule } from '@angular/common'; +import { DropdownDirective } from './dropdown.directive'; +import { DropdownMenuDirective } from './dropdown-menu.directive'; +import { DropdownToggleDirective } from './dropdown-toggle.directive'; +import { DropdownTreeviewComponent } from './dropdown-treeview.component'; +import { TreeviewComponent } from './treeview.component'; +import { TreeviewItemComponent } from './treeview-item.component'; +import { TreeviewPipe } from './treeview.pipe'; +import { TreeviewI18n, DefaultTreeviewI18n } from './treeview-i18n'; +import { TreeviewConfig } from './treeview-config'; +import { TreeviewEventParser, DefaultTreeviewEventParser } from './treeview-event-parser'; + +@NgModule({ + imports: [ + FormsModule, + CommonModule + ], + declarations: [ +// TreeviewComponent, +// TreeviewItemComponent, + TreeviewPipe, + DropdownDirective, + DropdownMenuDirective, + DropdownToggleDirective +// DropdownTreeviewComponent + ], exports: [ +// TreeviewComponent, + TreeviewPipe, + DropdownDirective, + DropdownMenuDirective, + DropdownToggleDirective +// DropdownTreeviewComponent + ] +}) +export class TreeviewModule { + static forRoot(): ModuleWithProviders { + return { + ngModule: TreeviewModule, + providers: [ + TreeviewConfig, + { provide: TreeviewI18n, useClass: DefaultTreeviewI18n }, + { provide: TreeviewEventParser, useClass: DefaultTreeviewEventParser } + ] + }; + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview.pipe.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview.pipe.ts new file mode 100644 index 00000000..d99234c5 --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview.pipe.ts @@ -0,0 +1,16 @@ +import { Pipe, PipeTransform } from '@angular/core'; +import { TreeviewItem } from './treeview-item'; +import { isNil } from './utuls'; + +@Pipe({ + name: 'ngxTreeview' + }) +export class TreeviewPipe implements PipeTransform { + transform(objects: any[], textField: string): TreeviewItem[] { + if (isNil(objects)) { + return undefined; + } + + return objects.map(object => new TreeviewItem({ text: object[textField], value: object })); + } +} diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/utuls.ts b/frontend/src/ts/component/external/ngx-treeview/lib/utuls.ts new file mode 100644 index 00000000..d014b123 --- /dev/null +++ b/frontend/src/ts/component/external/ngx-treeview/lib/utuls.ts @@ -0,0 +1,45 @@ +export default class Utils { + static isBoolean(value): boolean { return isBoolean(value); } + static isNil(value): boolean { return isNil(value); } + static isString(value): boolean { return isString(value); } +}; + +export const isBoolean = (value:any): boolean => { + return value === true || value === false; // todo not completed; to complete from 'lodash' +}; + +export const isNil = (value:any): boolean => { + // from 'lodash' + return value == null; +}; + +export const isString = (value:any): boolean => { + return typeof value == 'string'; // todo not completed; to complete from 'lodash' +}; + +export const pull = (array:any[], item:any): any[] => { + // modified 'remove' from 'lodash' + // mutate array + const result = []; + if (!(array && array.length)) { + return result; + } + const indexes = []; + + array.forEach((value, index) => { + if (value === item) { + result.push(value); + indexes.push(index); + } + }); + + for (const index of indexes.reverse()) { + array.splice(index, 1); + } + return result; +}; + +export const reverse = (array:any[]): any[] => { + // from 'lodash' + return array == null ? array : array.reverse(); +}; diff --git a/frontend/src/ts/component/field/DropdownTreeViewComponent.ts b/frontend/src/ts/component/field/DropdownTreeViewComponent.ts new file mode 100644 index 00000000..e2f3b09c --- /dev/null +++ b/frontend/src/ts/component/field/DropdownTreeViewComponent.ts @@ -0,0 +1,88 @@ +import {ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef} from "@angular/core"; +import {Control, UserService, Visible} from "@webbpm/base-package"; +import {TreeItem, TreeviewItem} from "../external/ngx-treeview/lib/treeview-item"; +import { + DropdownTreeviewSelectI18n +} from "../external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select-i18n"; + +@Component({ + moduleId: module.id, + selector: 'dropdown-tree-view', + templateUrl: './../../../../src/resources/template/component/field/DropdownTreeView.html', + providers: [{ + provide: DropdownTreeviewSelectI18n, useClass: DropdownTreeviewSelectI18n + }], + changeDetection: ChangeDetectionStrategy.OnPush + }) +export class DropdownTreeViewComponent extends Control { + private treeItem: TreeItem = { + text: 'РФ', value: 9, children: [ + { + text: 'Регион 1 ', value: 91, children: [{ + text: 'Округ 11', value: 911, children: [ + { text: '111', value: 9111 }, + { text: '112', value: 9112 }, + { text: '113', value: 9113 } + ] + }, { + text: 'Округ 12', value: 912, children: [ + { text: '121', value: 9121 }, + { text: '122', value: 9122 }, + { text: '123', value: 9123, checked: false } + ] + }] + }, + { + text: 'Регион 2', value: 92, children: [ + { text: 'Округ 21', value: 921, children: [ + { text: '211', value: 922 } + ] + } + ] + } + ] + }; + + public collapseLevel: number; + @Visible("false") + public items: TreeviewItem[]; + @Visible("false") + public value: any; + + constructor(el: ElementRef, cd: ChangeDetectorRef, + private i18n: DropdownTreeviewSelectI18n, private userService: UserService) { + super(el, cd); + } + + public initialize() { + super.initialize(); + const rootItem = new TreeviewItem(this.treeItem); + this.i18n.selectedItem = rootItem; + this.value = rootItem.value; + this.items = [rootItem]; + this.doCollapseLevel(); + } + + public onValueChange($event: any) { + } + + @Visible() + public setCollapseLevel(level: number): void { + this.collapseLevel = level; + } + + private doCollapseLevel(): void { + if (this.items != null && this.collapseLevel != null) { + this.items.forEach((value) => this.checkCollapseLevelRecursive(value, 0)); + } + } + + private checkCollapseLevelRecursive(viewItem: TreeviewItem, level: number): void { + if (level != null && this.collapseLevel != null && level >= this.collapseLevel) { + viewItem.setCollapsedRecursive(true); + } + else if (viewItem.children != null) { + viewItem.children.forEach((value) => this.checkCollapseLevelRecursive(value, level + 1)) + } + } +} diff --git a/frontend/src/ts/modules/app/app.module.ts b/frontend/src/ts/modules/app/app.module.ts index c5b526d1..c9c5a1fc 100644 --- a/frontend/src/ts/modules/app/app.module.ts +++ b/frontend/src/ts/modules/app/app.module.ts @@ -21,6 +21,12 @@ import {AppProgressIndicationComponent} from "./component/app-progress-indicatio import {AppProgressIndicationService} from "./service/app-progress-indication.service"; import {ErvuChartV2} from "../../ervu-dashboard/component/chart/ErvuChartV2"; import {FilterContainer} from "../../ervu-dashboard/component/filter/FilterContainer"; +import {DropdownTreeViewComponent} from "../../component/field/DropdownTreeViewComponent"; +import {DropdownTreeviewSelectComponent} from "../../component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component"; +import {DropdownTreeviewComponent} from "../../component/external/ngx-treeview/lib/dropdown-treeview.component"; +import {TreeviewModule} from '../../component/external/ngx-treeview/lib/treeview.module'; +import {TreeviewComponent} from "../../component/external/ngx-treeview/lib/treeview.component"; +import {TreeviewItemComponent} from "../../component/external/ngx-treeview/lib/treeview-item.component"; registerLocaleData(localeRu); export const DIRECTIVES = [ @@ -30,7 +36,12 @@ export const DIRECTIVES = [ forwardRef(() => AccessDeniedComponent), forwardRef(() => AppProgressIndicationComponent), forwardRef(() => ErvuChartV2), - forwardRef(() => FilterContainer) + forwardRef(() => FilterContainer), + forwardRef(() => DropdownTreeViewComponent), + forwardRef(() => DropdownTreeviewComponent), + forwardRef(() => DropdownTreeviewSelectComponent), + forwardRef(() => TreeviewComponent), + forwardRef(() => TreeviewItemComponent) ]; @NgModule({ @@ -44,7 +55,8 @@ export const DIRECTIVES = [ ComponentsModule, AgGridModule, RouterModule, - InternationalPhoneNumberModule + InternationalPhoneNumberModule, + TreeviewModule.forRoot() ], declarations: [ DIRECTIVES diff --git a/resources/src/main/resources/DropdownTreeView.component b/resources/src/main/resources/DropdownTreeView.component new file mode 100644 index 00000000..e28e4903 --- /dev/null +++ b/resources/src/main/resources/DropdownTreeView.component @@ -0,0 +1,36 @@ + + + dd241482-d901-4d0b-9ad2-4d69b6661f82 + DropdownTreeView + false + + 3.177.3 + + + ru.cg.webbpm.packages.base.resources + 3.177.3 + + + + + DropdownTreeView + false + false + + + DropdownTreeViewComponent + component.field + + true + true + + + visible + + true + + + + + + From c2cb3b6cfdf2a125e4442a31056570753fdeed91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Fri, 30 Aug 2024 23:42:50 +0300 Subject: [PATCH 02/68] test component on the main page --- resources/src/main/resources/business-model/main.page | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/resources/src/main/resources/business-model/main.page b/resources/src/main/resources/business-model/main.page index e60068a0..9883965a 100644 --- a/resources/src/main/resources/business-model/main.page +++ b/resources/src/main/resources/business-model/main.page @@ -135,7 +135,6 @@ 7814e897-8d8a-4401-8b8f-46bed9fb1399 Горизонтальный контейнер true - false false @@ -327,6 +326,14 @@ false + + 630accd8-3776-4fc1-a87c-3a0f05274678 + 88a51057-2192-426e-b46b-96abbcb90608 + DropdownTreeView + false + false + + bce312bd-0c82-45e5-89dc-a1af90431c18 54217912-3cc9-4139-b8ff-a63129c4d9f8 From 422f9d7972822e1ae57864d2fcdcc1b319aa38d4 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 2 Sep 2024 10:49:37 +0300 Subject: [PATCH 03/68] dropdown-tree-view --- .../resources/css/components-dashboard.css | 58 +++++++++++++++++++ .../src/resources/css/inbox-dashboard.css | 6 +- 2 files changed, 61 insertions(+), 3 deletions(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 2f138f55..96e2e2ea 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -106,6 +106,64 @@ background: var(--color-dark-20); } + + + +.webbpm.ervu_dashboard dropdown-tree-view .dropdown > button, +.webbpm.ervu_dashboard dropdown-tree-view .dropdown > button:is(:focus, :active) { + color: var(--color-text-primary); + font-size: var(--size-text-primary); + padding: var(--indent-mini) var(--indent-huge) var(--indent-mini) var(--indent-xbase); + margin: 0; + border-radius: 100px; + border: 0; + background: var(--color-dark-20); + box-shadow: none !important; +} +.webbpm.ervu_dashboard dropdown-tree-view .dropdown.show > button { + background-color: var(--color-success); +} +.webbpm.ervu_dashboard dropdown-tree-view .dropdown > button::after { + position: absolute; + content: "\f282"; + color: var(--color-text-primary); + font-family: bootstrap-icons !important; + font-weight: 800 !important; + font-size: var(--size-text-secondary); + top: calc(50% - (var(--size-text-secondary) + 4px) / 2); + right: var(--indent-base); + margin: 0; + border: 0; +} +.webbpm.ervu_dashboard dropdown-tree-view .dropdown.show > button::after { + top: calc(50% - (var(--size-text-secondary) + 8px) / 2); + transform: rotate(180deg); +} +.webbpm.ervu_dashboard dropdown-tree-view .dropdown-menu { + border-radius: 24px; + border: 1px solid var(--color-text-secondary); + background: + linear-gradient(180deg, rgba(19, 46, 55, 0.5) 0%, rgba(19, 46, 55, 0.7) 100%), + linear-gradient(180deg, rgba(8, 131, 198, 0.5) 0%, rgba(8, 131, 198, 0.7) 100%); + backdrop-filter: var(--bg-blur-40); + box-shadow: var(--bg-shadow); +} +.webbpm.ervu_dashboard dropdown-tree-view .dropdown-menu :is(.dropdown-container, .treeview-container) { + padding: 0; +} +.webbpm.ervu_dashboard dropdown-tree-view .row-item { + color: var(--color-text-primary); + padding: var(--indent-base) var(--indent-xbase); + border-top: 1px solid var(--color-primary-20); +} +.webbpm.ervu_dashboard dropdown-tree-view .treeview-header input { + width: auto; + padding: var(--indent-base) var(--indent-xbase); +} + + + + .webbpm.ervu_dashboard :is(.arrow-btn, .delete-btn) .btn { position: relative; display: grid; diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css index f9370d65..2e842f8a 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-dashboard.css @@ -269,16 +269,16 @@ body.webbpm.ervu_dashboard { scrollbar-width: thin; scrollbar-color: var(--color-dark) transparent; } -*::-webkit-scrollbar { +::-webkit-scrollbar { width: 8px; height: 8px; background-color: transparent; } -*::-webkit-scrollbar-thumb { +::-webkit-scrollbar-thumb { border-radius: 8px; background-color: var(--color-dark); } -*::-webkit-scrollbar-track { +::-webkit-scrollbar-track { height: 8px; background-color: transparent; } From 9962ddb6be3c63de9d396d92fdac5dd10e8a71dc Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 2 Sep 2024 14:37:32 +0300 Subject: [PATCH 04/68] fix --- .../resources/css/components-dashboard.css | 103 +++++++----------- 1 file changed, 42 insertions(+), 61 deletions(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 96e2e2ea..8ed68866 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -55,59 +55,8 @@ font-size: var(--size-text-secondary); top: 50%; transform: translateY(-50%); - margin-left: var(--indent-small); + margin-left: var(--indent-small); } -.webbpm.ervu_dashboard .top-btn-block .selectize-control { - font-size: inherit; - background-color: transparent; -} -.webbpm.ervu_dashboard .top-btn-block .selectize-control .selectize-input { - display: flex; - min-height: max-content; - padding: var(--indent-mini) var(--indent-xlarge) var(--indent-mini) var(--indent-xbase); - border-radius: 100px; - border: 0; - background: var(--color-dark-20); -} -.webbpm.ervu_dashboard .top-btn-block .selectize-control .selectize-input::after { - position: absolute; - content: "\f282"; - color: var(--color-text-primary); - font-family: bootstrap-icons !important; - font-weight: 800 !important; - font-size: var(--size-text-secondary); - top: calc((50% - var(--size-text-secondary)/ 2)); - right: var(--indent-base); - height: auto; - width: auto; - border: 0; -} - -.webbpm.ervu_dashboard .top-btn-block .selectize-control .selectize-input.dropdown-active { - background-color: var(--color-success); -} -.webbpm.ervu_dashboard .top-btn-block .selectize-control .selectize-input.dropdown-active::after { - transform: rotate(180deg); -} -.webbpm.ervu_dashboard .top-btn-block .selectize-control .selectize-input .item, -.webbpm.ervu_dashboard .top-btn-block .selectize-control .selectize-input input { - color: var(--color-text-primary); - font-size: var(--size-text-primary); - line-height: 1.3 !important; -} -.webbpm.ervu_dashboard .top-btn-block .selectize-control .selectize-input .item { - display: block; -} -.webbpm.ervu_dashboard .top-btn-block .selectize-control .selectize-input input::-webkit-input-placeholder, -.webbpm.ervu_dashboard .top-btn-block .selectize-control .selectize-input input::placeholder { - color: var(--color-text-primary); -} -.webbpm.ervu_dashboard .top-btn-block .selectize-control .selectize-input .selectize-dropdown-content { - background: var(--color-dark-20); -} - - - .webbpm.ervu_dashboard dropdown-tree-view .dropdown > button, .webbpm.ervu_dashboard dropdown-tree-view .dropdown > button:is(:focus, :active) { @@ -140,28 +89,60 @@ transform: rotate(180deg); } .webbpm.ervu_dashboard dropdown-tree-view .dropdown-menu { + padding: 0; border-radius: 24px; border: 1px solid var(--color-text-secondary); - background: - linear-gradient(180deg, rgba(19, 46, 55, 0.5) 0%, rgba(19, 46, 55, 0.7) 100%), - linear-gradient(180deg, rgba(8, 131, 198, 0.5) 0%, rgba(8, 131, 198, 0.7) 100%); + background: var(--color-dark-20); backdrop-filter: var(--bg-blur-40); box-shadow: var(--bg-shadow); } .webbpm.ervu_dashboard dropdown-tree-view .dropdown-menu :is(.dropdown-container, .treeview-container) { padding: 0; } +.webbpm.ervu_dashboard dropdown-tree-view .treeview-header input { + color: var(--black); + font-size: var(--size-text-primary); + width: auto; + padding: var(--indent-mini) var(--indent-xlarge) var(--indent-mini) var(--indent-xbase); + margin: var(--indent-base) var(--indent-xbase); + border: 0; + border-radius: 24px; + background-color: var(--color-text-secondary); +} + +.webbpm.ervu_dashboard dropdown-tree-view .treeview-header input::-webkit-input-placeholder { + color: var(--black); +} +.webbpm.ervu_dashboard dropdown-tree-view .treeview-header input:-moz-placeholder { + color: var(--black); +} +.webbpm.ervu_dashboard dropdown-tree-view .treeview-header input::-moz-placeholder { + color: var(--black); +} +.webbpm.ervu_dashboard dropdown-tree-view .treeview-header input:-ms-input-placeholder { + color: var(--black); +} + +.webbpm.ervu_dashboard dropdown-tree-view .dropdown-divider { + margin: 0; + border-color: var(--color-primary-5); +} .webbpm.ervu_dashboard dropdown-tree-view .row-item { color: var(--color-text-primary); padding: var(--indent-base) var(--indent-xbase); - border-top: 1px solid var(--color-primary-20); + border-bottom: 1px solid var(--color-primary-5); } -.webbpm.ervu_dashboard dropdown-tree-view .treeview-header input { - width: auto; - padding: var(--indent-base) var(--indent-xbase); +.webbpm.ervu_dashboard dropdown-tree-view .row-item:is(:hover, :focus, :active) { + color: var(--color-success); } - - +.webbpm.ervu_dashboard dropdown-tree-view ngx-treeview-item ngx-treeview-item .treeview-item { + padding-left: var(--indent-xbase); +} +/* +.webbpm.ervu_dashboard ngx-treeview-item > .treeview-item > div > ngx-treeview-item > .treeview-item:hover { + background-color: cyan; +} +*/ .webbpm.ervu_dashboard :is(.arrow-btn, .delete-btn) .btn { From 99c78472e4543a8f555f5e0f993b2f71ba898240 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 2 Sep 2024 15:05:09 +0300 Subject: [PATCH 05/68] search icon --- frontend/src/resources/css/components-dashboard.css | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 8ed68866..6c899631 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -122,6 +122,19 @@ .webbpm.ervu_dashboard dropdown-tree-view .treeview-header input:-ms-input-placeholder { color: var(--black); } +.webbpm.ervu_dashboard dropdown-tree-view .row-filter { + position: relative; +} +.webbpm.ervu_dashboard dropdown-tree-view .row-filter::after { + content: "\f52a"; + position: absolute; + color: var(--color-dark); + font-family: bootstrap-icons !important; + font-weight: 800 !important; + font-size: var(--size-text-secondary); + top: calc(50% - (var(--size-text-secondary) + 8px) / 2); + right: var(--indent-huge); +} .webbpm.ervu_dashboard dropdown-tree-view .dropdown-divider { margin: 0; From d9071299492b84e42a6fadf82dd605c1cc280cc0 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 2 Sep 2024 15:44:27 +0300 Subject: [PATCH 06/68] scroll --- frontend/src/resources/css/components-dashboard.css | 9 ++++++++- frontend/src/resources/css/inbox-dashboard.css | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 6c899631..3ccce9d6 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -99,6 +99,13 @@ .webbpm.ervu_dashboard dropdown-tree-view .dropdown-menu :is(.dropdown-container, .treeview-container) { padding: 0; } +.webbpm.ervu_dashboard dropdown-tree-view .dropdown-menu .treeview-container { + scrollbar-color: var(--color-dark-40) transparent; +} +.webbpm.ervu_dashboard dropdown-tree-view .dropdown-menu .treeview-container::-webkit-scrollbar-thumb { + background-color: var(--color-dark-40); +} + .webbpm.ervu_dashboard dropdown-tree-view .treeview-header input { color: var(--black); font-size: var(--size-text-primary); @@ -140,7 +147,7 @@ margin: 0; border-color: var(--color-primary-5); } -.webbpm.ervu_dashboard dropdown-tree-view .row-item { +.webbpm.ervu_dashboard dropdown-tree-view :is(.row-item, .treeview-text) { color: var(--color-text-primary); padding: var(--indent-base) var(--indent-xbase); border-bottom: 1px solid var(--color-primary-5); diff --git a/frontend/src/resources/css/inbox-dashboard.css b/frontend/src/resources/css/inbox-dashboard.css index 2e842f8a..fbb9b812 100644 --- a/frontend/src/resources/css/inbox-dashboard.css +++ b/frontend/src/resources/css/inbox-dashboard.css @@ -30,7 +30,8 @@ --color-success: #00db5d; --color-error: #f91e11; --color-dark: #070e1a; - --color-dark-20: rgba(7, 14, 26, 0.2); + --color-dark-20: rgba(7, 14, 26, 0.2); + --color-dark-40: rgba(7, 14, 26, 0.4); --btn-border: #00f0ff; --btn-bg: linear-gradient(40deg, rgba(8, 131, 198, 1) 0%, rgba(32, 181, 219, 1) 100%); From eb0e3d5a4ac21419e9fe9407356dea912ac4e7cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Tue, 3 Sep 2024 14:21:50 +0300 Subject: [PATCH 07/68] SUPPORT-8392: svg tags replaced by i-tags --- .../dropdown-treeview-select.component.html | 12 ++---------- .../external/ngx-treeview/treeview.component.html | 12 ++---------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/frontend/src/resources/template/component/external/ngx-treeview/dropdown-treeview-select.component.html b/frontend/src/resources/template/component/external/ngx-treeview/dropdown-treeview-select.component.html index ca2f6105..a297b28f 100644 --- a/frontend/src/resources/template/component/external/ngx-treeview/dropdown-treeview-select.component.html +++ b/frontend/src/resources/template/component/external/ngx-treeview/dropdown-treeview-select.component.html @@ -5,16 +5,8 @@ (click)="onCollapseExpand()" aria-hidden="true" [ngSwitch]="item.collapsed"> - - - - - - + + diff --git a/frontend/src/resources/template/component/external/ngx-treeview/treeview.component.html b/frontend/src/resources/template/component/external/ngx-treeview/treeview.component.html index d10f4ab7..0bb0c872 100644 --- a/frontend/src/resources/template/component/external/ngx-treeview/treeview.component.html +++ b/frontend/src/resources/template/component/external/ngx-treeview/treeview.component.html @@ -3,16 +3,8 @@
Date: Tue, 3 Sep 2024 17:34:01 +0300 Subject: [PATCH 08/68] // --- frontend/src/resources/css/components-dashboard.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 3ccce9d6..89ae9064 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -158,6 +158,18 @@ .webbpm.ervu_dashboard dropdown-tree-view ngx-treeview-item ngx-treeview-item .treeview-item { padding-left: var(--indent-xbase); } +.webbpm.ervu_dashboard dropdown-tree-view .row-item { + font-size: var(--size-text-primary); + width: auto; +} +.webbpm.ervu_dashboard dropdown-tree-view .bi-caret-down-fill::before { + content: "\f2e9"; + font-size: var(--size-text-secondary); +} +.webbpm.ervu_dashboard dropdown-tree-view .bi-caret-right-fill::before { + content: "\f4fd"; + font-size: var(--size-text-secondary); +} /* .webbpm.ervu_dashboard ngx-treeview-item > .treeview-item > div > ngx-treeview-item > .treeview-item:hover { background-color: cyan; From 860b6b0e6354cb5300221a985978bdb4ea6944ae Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Wed, 4 Sep 2024 07:35:17 +0300 Subject: [PATCH 09/68] search --- .../resources/css/components-dashboard.css | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 89ae9064..bf8d5dfb 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -79,13 +79,13 @@ font-family: bootstrap-icons !important; font-weight: 800 !important; font-size: var(--size-text-secondary); - top: calc(50% - (var(--size-text-secondary) + 4px) / 2); + top: calc(50% - (var(--size-text-secondary) + var(--indent-xmini)) / 2); right: var(--indent-base); margin: 0; border: 0; } .webbpm.ervu_dashboard dropdown-tree-view .dropdown.show > button::after { - top: calc(50% - (var(--size-text-secondary) + 8px) / 2); + top: calc(50% - (var(--size-text-secondary) + var(--indent-mini)) / 2); transform: rotate(180deg); } .webbpm.ervu_dashboard dropdown-tree-view .dropdown-menu { @@ -106,12 +106,17 @@ background-color: var(--color-dark-40); } +.webbpm.ervu_dashboard dropdown-tree-view .treeview-header .row-filter { + margin: var(--indent-base) var(--indent-xbase); +} +.webbpm.ervu_dashboard dropdown-tree-view .treeview-header .row-filter > div { + padding: 0; +} .webbpm.ervu_dashboard dropdown-tree-view .treeview-header input { color: var(--black); font-size: var(--size-text-primary); - width: auto; + width: 100%; padding: var(--indent-mini) var(--indent-xlarge) var(--indent-mini) var(--indent-xbase); - margin: var(--indent-base) var(--indent-xbase); border: 0; border-radius: 24px; background-color: var(--color-text-secondary); @@ -139,8 +144,8 @@ font-family: bootstrap-icons !important; font-weight: 800 !important; font-size: var(--size-text-secondary); - top: calc(50% - (var(--size-text-secondary) + 8px) / 2); - right: var(--indent-huge); + top: calc(50% - (var(--size-text-secondary) + var(--indent-mini)) / 2); + right: var(--indent-xbase); } .webbpm.ervu_dashboard dropdown-tree-view .dropdown-divider { @@ -168,7 +173,7 @@ } .webbpm.ervu_dashboard dropdown-tree-view .bi-caret-right-fill::before { content: "\f4fd"; - font-size: var(--size-text-secondary); + font-size: var(--size-text-secondary); } /* .webbpm.ervu_dashboard ngx-treeview-item > .treeview-item > div > ngx-treeview-item > .treeview-item:hover { From a26ce19876b0762ac6d825607102c5a482808864 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Wed, 4 Sep 2024 10:02:51 +0300 Subject: [PATCH 10/68] fix --- .../src/resources/css/components-dashboard.css | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index bf8d5dfb..76cf8f24 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -163,17 +163,24 @@ .webbpm.ervu_dashboard dropdown-tree-view ngx-treeview-item ngx-treeview-item .treeview-item { padding-left: var(--indent-xbase); } -.webbpm.ervu_dashboard dropdown-tree-view .row-item { +.webbpm.ervu_dashboard dropdown-tree-view .row-item label { font-size: var(--size-text-primary); width: auto; + min-width: min(7.5vw, 9.375rem); /*150*/ +} +.webbpm.ervu_dashboard dropdown-tree-view :is(.bi-caret-down-fill, .bi-caret-right-fill) { + margin-right: var(--indent-mini); +} +.webbpm.ervu_dashboard dropdown-tree-view :is(.bi-caret-down-fill, .bi-caret-right-fill)::before { + position: relative; + top: calc(var(--indent-xmini) / -4); + font-size: var(--size-text-secondary); } .webbpm.ervu_dashboard dropdown-tree-view .bi-caret-down-fill::before { content: "\f2e9"; - font-size: var(--size-text-secondary); } .webbpm.ervu_dashboard dropdown-tree-view .bi-caret-right-fill::before { content: "\f4fd"; - font-size: var(--size-text-secondary); } /* .webbpm.ervu_dashboard ngx-treeview-item > .treeview-item > div > ngx-treeview-item > .treeview-item:hover { @@ -181,7 +188,6 @@ } */ - .webbpm.ervu_dashboard :is(.arrow-btn, .delete-btn) .btn { position: relative; display: grid; From 0d6b06afc96f79b4832c2830f2ba26a7676223e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Sun, 8 Sep 2024 22:27:47 +0300 Subject: [PATCH 11/68] SUPPORT-8392: backend added --- .../java/component/model/TreeItemDto.java | 20 +++++ .../component/rpc/TreeItemRpcService.java | 23 ++++++ .../component/service/TreeItemService.java | 81 +++++++++++++++++++ .../field/DropdownTreeViewComponent.ts | 53 +++++------- 4 files changed, 144 insertions(+), 33 deletions(-) create mode 100644 backend/src/main/java/component/model/TreeItemDto.java create mode 100644 backend/src/main/java/component/rpc/TreeItemRpcService.java create mode 100644 backend/src/main/java/component/service/TreeItemService.java diff --git a/backend/src/main/java/component/model/TreeItemDto.java b/backend/src/main/java/component/model/TreeItemDto.java new file mode 100644 index 00000000..8809e10a --- /dev/null +++ b/backend/src/main/java/component/model/TreeItemDto.java @@ -0,0 +1,20 @@ +package component.model; + +import ru.cg.webbpm.modules.webkit.annotations.Model; + +/** + * @author r.latypov + */ +@Model +public class TreeItemDto { + public Object id; + public Object parentId; + public String label; + public TreeItemDto[] children = new TreeItemDto[0]; + + public TreeItemDto(Object id, Object parentId, String label) { + this.id = id; + this.parentId = parentId; + this.label = label; + } +} diff --git a/backend/src/main/java/component/rpc/TreeItemRpcService.java b/backend/src/main/java/component/rpc/TreeItemRpcService.java new file mode 100644 index 00000000..bb9819da --- /dev/null +++ b/backend/src/main/java/component/rpc/TreeItemRpcService.java @@ -0,0 +1,23 @@ +package component.rpc; + +import java.util.List; + +import component.model.TreeItemDto; +import component.service.TreeItemService; + +import ru.cg.webbpm.modules.webkit.annotations.RpcCall; +import ru.cg.webbpm.modules.webkit.annotations.RpcService; +import ru.cg.webbpm.modules.webkit.beans.Behavior; + +/** + * @author r.latypov + */ +@RpcService +public class TreeItemRpcService extends Behavior { + public TreeItemService treeItemService; + + @RpcCall + public List loadTreeData() { + return treeItemService.loadTreeData(); + } +} diff --git a/backend/src/main/java/component/service/TreeItemService.java b/backend/src/main/java/component/service/TreeItemService.java new file mode 100644 index 00000000..b1360c70 --- /dev/null +++ b/backend/src/main/java/component/service/TreeItemService.java @@ -0,0 +1,81 @@ +package component.service; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import component.model.TreeItemDto; +import component.rpc.TreeItemRpcService; +import database.dao.DefaultLoadDao; +import org.springframework.stereotype.Service; + +import ru.cg.webbpm.modules.database.api.bean.TableRow; +import ru.cg.webbpm.modules.database.api.dao.option.LoadOptions; +import ru.cg.webbpm.modules.database.bean.annotation.GraphSource; +import ru.cg.webbpm.modules.database.bean.annotation.TypedColumn; +import ru.cg.webbpm.modules.database.bean.entity_graph.EntityColumn; +import ru.cg.webbpm.modules.database.bean.entity_graph.EntityColumnType; +import ru.cg.webbpm.modules.standard_annotations.validation.NotNull; + +/** + * @author r.latypov + */ +@Service +public class TreeItemService { + @NotNull + public DefaultLoadDao loadDao; + @GraphSource(value = TreeItemRpcService.class, scanMode = GraphSource.ScanMode.SELF) + @NotNull + public EntityColumn idColumn; + @GraphSource(value = TreeItemRpcService.class, scanMode = GraphSource.ScanMode.SELF) + @NotNull + public EntityColumn parentIdColumn; + @GraphSource(value = TreeItemRpcService.class, scanMode = GraphSource.ScanMode.SELF) + @TypedColumn(colTypes = EntityColumnType.STRING) + @NotNull + public EntityColumn labelColumn; + + public List loadTreeData() { + List loadedList = this.loadDao.load(getColumns(), new LoadOptions()).stream() + .map(this::toTreeItemDto) + .toList(); + + Map> childrenMap = new HashMap<>(); + loadedList.forEach(item -> { + Object parentId = item.parentId; + if (parentId != null) { + List listFromMap = childrenMap.computeIfAbsent(parentId, + k -> new ArrayList<>() + ); + listFromMap.add(item); + } + }); + + loadedList.forEach(item -> { + List children = childrenMap.get(item.id); + if (children != null) { + item.children = children.toArray(new TreeItemDto[0]); + } + }); + + return loadedList.stream() + .filter(item -> item.parentId == null) + .toList(); + } + + private Set getColumns() { + Set columnSet = new HashSet<>(); + columnSet.add(parentIdColumn); + columnSet.add(labelColumn); + return columnSet; + } + + private TreeItemDto toTreeItemDto(TableRow tableRow) { + return new TreeItemDto( + tableRow.get(idColumn), tableRow.get(parentIdColumn), (String) tableRow.get(labelColumn) + ); + } +} diff --git a/frontend/src/ts/component/field/DropdownTreeViewComponent.ts b/frontend/src/ts/component/field/DropdownTreeViewComponent.ts index e2f3b09c..52f904ee 100644 --- a/frontend/src/ts/component/field/DropdownTreeViewComponent.ts +++ b/frontend/src/ts/component/field/DropdownTreeViewComponent.ts @@ -1,9 +1,11 @@ import {ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef} from "@angular/core"; import {Control, UserService, Visible} from "@webbpm/base-package"; -import {TreeItem, TreeviewItem} from "../external/ngx-treeview/lib/treeview-item"; +import {TreeviewItem} from "../external/ngx-treeview/lib/treeview-item"; import { DropdownTreeviewSelectI18n } from "../external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select-i18n"; +import {TreeItemDto} from "../../generated/component/model/TreeItemDto"; +import {TreeItemRpcService} from "../../generated/component/rpc/TreeItemRpcService"; @Component({ moduleId: module.id, @@ -15,33 +17,6 @@ import { changeDetection: ChangeDetectionStrategy.OnPush }) export class DropdownTreeViewComponent extends Control { - private treeItem: TreeItem = { - text: 'РФ', value: 9, children: [ - { - text: 'Регион 1 ', value: 91, children: [{ - text: 'Округ 11', value: 911, children: [ - { text: '111', value: 9111 }, - { text: '112', value: 9112 }, - { text: '113', value: 9113 } - ] - }, { - text: 'Округ 12', value: 912, children: [ - { text: '121', value: 9121 }, - { text: '122', value: 9122 }, - { text: '123', value: 9123, checked: false } - ] - }] - }, - { - text: 'Регион 2', value: 92, children: [ - { text: 'Округ 21', value: 921, children: [ - { text: '211', value: 922 } - ] - } - ] - } - ] - }; public collapseLevel: number; @Visible("false") @@ -49,18 +24,30 @@ export class DropdownTreeViewComponent extends Control { @Visible("false") public value: any; + private rpcService: TreeItemRpcService; + constructor(el: ElementRef, cd: ChangeDetectorRef, + // todo replace UserService by another one providing accountId or domainId private i18n: DropdownTreeviewSelectI18n, private userService: UserService) { super(el, cd); } public initialize() { super.initialize(); - const rootItem = new TreeviewItem(this.treeItem); - this.i18n.selectedItem = rootItem; - this.value = rootItem.value; - this.items = [rootItem]; - this.doCollapseLevel(); + this.rpcService = this.getScript(TreeItemRpcService); + this.loadTreeItems(); + } + + @Visible() + public loadTreeItems(): void { + this.rpcService.loadTreeData() + .then((res: TreeItemDto[]) => { + const rootItem = this.items[0]; + this.i18n.selectedItem = rootItem; + this.value = rootItem.value; + this.doCollapseLevel(); + this.cd.markForCheck(); + }); } public onValueChange($event: any) { From 020fc7390b48d860223d753af515045484ce172c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Thu, 12 Sep 2024 14:21:43 +0300 Subject: [PATCH 12/68] SUPPORT-8392: fix for backend and frontend --- .../java/component/model/TreeItemDto.java | 2 +- .../component/service/TreeItemService.java | 1 + .../field/DropdownTreeViewComponent.ts | 22 +++++++++- .../main/resources/DropdownTreeView.component | 8 ++++ .../main/resources/business-model/main.page | 42 +++++++++++++++++++ 5 files changed, 73 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/component/model/TreeItemDto.java b/backend/src/main/java/component/model/TreeItemDto.java index 8809e10a..7b1566df 100644 --- a/backend/src/main/java/component/model/TreeItemDto.java +++ b/backend/src/main/java/component/model/TreeItemDto.java @@ -10,7 +10,7 @@ public class TreeItemDto { public Object id; public Object parentId; public String label; - public TreeItemDto[] children = new TreeItemDto[0]; + public TreeItemDto[] children; public TreeItemDto(Object id, Object parentId, String label) { this.id = id; diff --git a/backend/src/main/java/component/service/TreeItemService.java b/backend/src/main/java/component/service/TreeItemService.java index b1360c70..b4b902ec 100644 --- a/backend/src/main/java/component/service/TreeItemService.java +++ b/backend/src/main/java/component/service/TreeItemService.java @@ -68,6 +68,7 @@ public class TreeItemService { private Set getColumns() { Set columnSet = new HashSet<>(); + columnSet.add(idColumn); columnSet.add(parentIdColumn); columnSet.add(labelColumn); return columnSet; diff --git a/frontend/src/ts/component/field/DropdownTreeViewComponent.ts b/frontend/src/ts/component/field/DropdownTreeViewComponent.ts index 52f904ee..4a3b7c8d 100644 --- a/frontend/src/ts/component/field/DropdownTreeViewComponent.ts +++ b/frontend/src/ts/component/field/DropdownTreeViewComponent.ts @@ -1,6 +1,6 @@ import {ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef} from "@angular/core"; import {Control, UserService, Visible} from "@webbpm/base-package"; -import {TreeviewItem} from "../external/ngx-treeview/lib/treeview-item"; +import {TreeItem, TreeviewItem} from "../external/ngx-treeview/lib/treeview-item"; import { DropdownTreeviewSelectI18n } from "../external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select-i18n"; @@ -42,6 +42,7 @@ export class DropdownTreeViewComponent extends Control { public loadTreeItems(): void { this.rpcService.loadTreeData() .then((res: TreeItemDto[]) => { + this.items = res.map(value => new TreeviewItem(this.createTreeItem(value))); const rootItem = this.items[0]; this.i18n.selectedItem = rootItem; this.value = rootItem.value; @@ -50,6 +51,25 @@ export class DropdownTreeViewComponent extends Control { }); } + private createTreeItem(treeItemDto: TreeItemDto): TreeItem { + let treeItem: TreeItem; + if (treeItemDto) { + treeItem = { + text: treeItemDto.label, + value: treeItemDto.id, + children: this.createTreeItemArray(treeItemDto.children) + }; + } + return treeItem; + } + + private createTreeItemArray(treeItemDtoArray: TreeItemDto[]): TreeItem[] { + if (treeItemDtoArray && treeItemDtoArray.length > 0) { + return treeItemDtoArray.map(value => this.createTreeItem(value)); + } + return undefined; + } + public onValueChange($event: any) { } diff --git a/resources/src/main/resources/DropdownTreeView.component b/resources/src/main/resources/DropdownTreeView.component index e28e4903..d6fce25c 100644 --- a/resources/src/main/resources/DropdownTreeView.component +++ b/resources/src/main/resources/DropdownTreeView.component @@ -32,5 +32,13 @@ + + + TreeItemRpcService + component.rpc + + true + true + diff --git a/resources/src/main/resources/business-model/main.page b/resources/src/main/resources/business-model/main.page index 9883965a..715dc951 100644 --- a/resources/src/main/resources/business-model/main.page +++ b/resources/src/main/resources/business-model/main.page @@ -333,6 +333,48 @@ false false + + + + treeItemService + + + + idColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + + labelColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"} + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + + + parentIdColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"parent_id"} + + + + + + + bce312bd-0c82-45e5-89dc-a1af90431c18 From bd49766cf658a1f55775075bbcf3f4b1dd840dae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Thu, 12 Sep 2024 23:27:20 +0300 Subject: [PATCH 13/68] SUPPORT-8392: fix file name 'utils.ts' --- .../dropdown-treeview-select.component.ts | 2 +- .../component/external/ngx-treeview/lib/dropdown.directive.ts | 2 +- .../external/ngx-treeview/lib/treeview-event-parser.ts | 2 +- .../ts/component/external/ngx-treeview/lib/treeview-helper.ts | 2 +- .../external/ngx-treeview/lib/treeview-item.component.ts | 2 +- .../src/ts/component/external/ngx-treeview/lib/treeview-item.ts | 2 +- .../component/external/ngx-treeview/lib/treeview.component.ts | 2 +- .../src/ts/component/external/ngx-treeview/lib/treeview.pipe.ts | 2 +- .../component/external/ngx-treeview/lib/{utuls.ts => utils.ts} | 0 9 files changed, 8 insertions(+), 8 deletions(-) rename frontend/src/ts/component/external/ngx-treeview/lib/{utuls.ts => utils.ts} (100%) diff --git a/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component.ts b/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component.ts index ba5df296..e655b0ca 100644 --- a/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component.ts +++ b/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component.ts @@ -13,7 +13,7 @@ import { TreeviewConfig } from "../lib/treeview-config"; import { TreeviewHelper } from "../lib/treeview-helper"; import { TreeviewI18n } from "../lib/treeview-i18n"; import { TreeviewItem } from "../lib/treeview-item"; -import { isNil } from '../lib/utuls'; +import { isNil } from '../lib/utils'; @Component({ moduleId: module.id, diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/dropdown.directive.ts b/frontend/src/ts/component/external/ngx-treeview/lib/dropdown.directive.ts index 9d813506..17d4f1ca 100644 --- a/frontend/src/ts/component/external/ngx-treeview/lib/dropdown.directive.ts +++ b/frontend/src/ts/component/external/ngx-treeview/lib/dropdown.directive.ts @@ -1,5 +1,5 @@ import { Directive, Input, Output, HostBinding, HostListener, EventEmitter } from '@angular/core'; -import { isNil } from './utuls'; +import { isNil } from './utils'; @Directive({ selector: '[ngxDropdown]', diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-event-parser.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-event-parser.ts index cd7de796..8ea4ffcb 100644 --- a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-event-parser.ts +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-event-parser.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; import { TreeviewItem } from './treeview-item'; import {TreeviewComponent} from './treeview.component'; -import { isNil } from './utuls'; +import { isNil } from './utils'; @Injectable() export abstract class TreeviewEventParser { diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-helper.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-helper.ts index eba9529d..cbd2a50a 100644 --- a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-helper.ts +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-helper.ts @@ -1,5 +1,5 @@ import { TreeviewItem } from './treeview-item'; -import { isNil, pull } from './utuls'; +import { isNil, pull } from './utils'; export const TreeviewHelper = { findItem, diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item.component.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item.component.ts index 5fd5adfc..82130bb3 100644 --- a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item.component.ts +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item.component.ts @@ -9,7 +9,7 @@ import { import { TreeviewConfig } from './treeview-config'; import { TreeviewItem } from './treeview-item'; import { TreeviewItemTemplateContext } from './treeview-item-template-context'; -import { isNil } from './utuls'; +import { isNil } from './utils'; @Component({ moduleId: module.id, diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item.ts index da8f0a85..30fde275 100644 --- a/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item.ts +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview-item.ts @@ -1,5 +1,5 @@ import { TreeviewHelper } from './treeview-helper'; -import { isBoolean, isNil, isString } from './utuls'; +import { isBoolean, isNil, isString } from './utils'; export interface TreeviewSelection { checkedItems: TreeviewItem[]; diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview.component.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview.component.ts index c1551d4b..8e14e65a 100644 --- a/frontend/src/ts/component/external/ngx-treeview/lib/treeview.component.ts +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview.component.ts @@ -16,7 +16,7 @@ import { TreeviewEventParser } from './treeview-event-parser'; import { TreeviewHeaderTemplateContext } from './treeview-header-template-context'; import { TreeviewItemTemplateContext } from './treeview-item-template-context'; import { TreeviewHelper } from './treeview-helper'; -import { isNil } from './utuls'; +import { isNil } from './utils'; class FilterTreeviewItem extends TreeviewItem { private readonly refItem: TreeviewItem; diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/treeview.pipe.ts b/frontend/src/ts/component/external/ngx-treeview/lib/treeview.pipe.ts index d99234c5..1aa4f6b3 100644 --- a/frontend/src/ts/component/external/ngx-treeview/lib/treeview.pipe.ts +++ b/frontend/src/ts/component/external/ngx-treeview/lib/treeview.pipe.ts @@ -1,6 +1,6 @@ import { Pipe, PipeTransform } from '@angular/core'; import { TreeviewItem } from './treeview-item'; -import { isNil } from './utuls'; +import { isNil } from './utils'; @Pipe({ name: 'ngxTreeview' diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/utuls.ts b/frontend/src/ts/component/external/ngx-treeview/lib/utils.ts similarity index 100% rename from frontend/src/ts/component/external/ngx-treeview/lib/utuls.ts rename to frontend/src/ts/component/external/ngx-treeview/lib/utils.ts From 9f89cb8eb61e855b43fc5b7534868b3fa92277b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Fri, 13 Sep 2024 13:17:49 +0300 Subject: [PATCH 14/68] SUPPORT-8392: adding businessId and domainId + search by domainId + value changed event --- .../java/component/model/TreeItemDto.java | 2 + .../component/rpc/TreeItemRpcService.java | 5 +++ .../component/service/TreeItemService.java | 45 ++++++++++++++++--- .../field/DropdownTreeViewComponent.ts | 17 +++++-- 4 files changed, 61 insertions(+), 8 deletions(-) diff --git a/backend/src/main/java/component/model/TreeItemDto.java b/backend/src/main/java/component/model/TreeItemDto.java index 7b1566df..d62eb049 100644 --- a/backend/src/main/java/component/model/TreeItemDto.java +++ b/backend/src/main/java/component/model/TreeItemDto.java @@ -11,6 +11,8 @@ public class TreeItemDto { public Object parentId; public String label; public TreeItemDto[] children; + public Object businessId; + public String domainId; public TreeItemDto(Object id, Object parentId, String label) { this.id = id; diff --git a/backend/src/main/java/component/rpc/TreeItemRpcService.java b/backend/src/main/java/component/rpc/TreeItemRpcService.java index bb9819da..0e174d3b 100644 --- a/backend/src/main/java/component/rpc/TreeItemRpcService.java +++ b/backend/src/main/java/component/rpc/TreeItemRpcService.java @@ -20,4 +20,9 @@ public class TreeItemRpcService extends Behavior { public List loadTreeData() { return treeItemService.loadTreeData(); } + + @RpcCall + public List loadTreeDataByDomainId(String domainId) { + return treeItemService.loadTreeDataByDomainId(domainId); + } } diff --git a/backend/src/main/java/component/service/TreeItemService.java b/backend/src/main/java/component/service/TreeItemService.java index b4b902ec..588ffa8a 100644 --- a/backend/src/main/java/component/service/TreeItemService.java +++ b/backend/src/main/java/component/service/TreeItemService.java @@ -37,8 +37,33 @@ public class TreeItemService { @TypedColumn(colTypes = EntityColumnType.STRING) @NotNull public EntityColumn labelColumn; + @GraphSource(value = TreeItemRpcService.class, scanMode = GraphSource.ScanMode.SELF) + public EntityColumn businessIdColumn; + @GraphSource(value = TreeItemRpcService.class, scanMode = GraphSource.ScanMode.SELF) + public EntityColumn domainIdColumn; public List loadTreeData() { + List loadedTreeItems = loadTreeItems(); + loadedTreeItems.forEach(item -> item.domainId = null); + return loadedTreeItems.stream() + .filter(item -> item.parentId == null) + .toList(); + } + + public List loadTreeDataByDomainId(String domainId) { + if (domainId == null || domainIdColumn == null) { + return loadTreeData(); + } + + List loadedTreeItems = loadTreeItems(); + List filteredTreeItems = loadedTreeItems.stream() + .filter(item -> item.domainId.equalsIgnoreCase(domainId)) + .toList(); + loadedTreeItems.forEach(item -> item.domainId = null); + return filteredTreeItems; + } + + private List loadTreeItems() { List loadedList = this.loadDao.load(getColumns(), new LoadOptions()).stream() .map(this::toTreeItemDto) .toList(); @@ -60,10 +85,7 @@ public class TreeItemService { item.children = children.toArray(new TreeItemDto[0]); } }); - - return loadedList.stream() - .filter(item -> item.parentId == null) - .toList(); + return loadedList; } private Set getColumns() { @@ -71,12 +93,25 @@ public class TreeItemService { columnSet.add(idColumn); columnSet.add(parentIdColumn); columnSet.add(labelColumn); + if (businessIdColumn != null) { + columnSet.add(businessIdColumn); + } + if (domainIdColumn != null) { + columnSet.add(domainIdColumn); + } return columnSet; } private TreeItemDto toTreeItemDto(TableRow tableRow) { - return new TreeItemDto( + TreeItemDto treeItemDto = new TreeItemDto( tableRow.get(idColumn), tableRow.get(parentIdColumn), (String) tableRow.get(labelColumn) ); + if (businessIdColumn != null) { + treeItemDto.businessId = tableRow.get(businessIdColumn); + } + if (domainIdColumn != null) { + treeItemDto.businessId = tableRow.get(domainIdColumn); + } + return treeItemDto; } } diff --git a/frontend/src/ts/component/field/DropdownTreeViewComponent.ts b/frontend/src/ts/component/field/DropdownTreeViewComponent.ts index 4a3b7c8d..4e3182fd 100644 --- a/frontend/src/ts/component/field/DropdownTreeViewComponent.ts +++ b/frontend/src/ts/component/field/DropdownTreeViewComponent.ts @@ -1,5 +1,5 @@ import {ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef} from "@angular/core"; -import {Control, UserService, Visible} from "@webbpm/base-package"; +import {Control, Event, UserService, Visible} from "@webbpm/base-package"; import {TreeItem, TreeviewItem} from "../external/ngx-treeview/lib/treeview-item"; import { DropdownTreeviewSelectI18n @@ -24,10 +24,13 @@ export class DropdownTreeViewComponent extends Control { @Visible("false") public value: any; + @Visible("false") + public valueChangeEvent: Event = new Event(); + private rpcService: TreeItemRpcService; constructor(el: ElementRef, cd: ChangeDetectorRef, - // todo replace UserService by another one providing accountId or domainId + // todo replace UserService by another one from SUPPORT-8421 providing accountId or domainId private i18n: DropdownTreeviewSelectI18n, private userService: UserService) { super(el, cd); } @@ -40,6 +43,8 @@ export class DropdownTreeViewComponent extends Control { @Visible() public loadTreeItems(): void { + // todo replace the called method by + // this.rpcService.loadTreeDataByDomainId(domainId) this.rpcService.loadTreeData() .then((res: TreeItemDto[]) => { this.items = res.map(value => new TreeviewItem(this.createTreeItem(value))); @@ -56,7 +61,7 @@ export class DropdownTreeViewComponent extends Control { if (treeItemDto) { treeItem = { text: treeItemDto.label, - value: treeItemDto.id, + value: treeItemDto, children: this.createTreeItemArray(treeItemDto.children) }; } @@ -71,6 +76,12 @@ export class DropdownTreeViewComponent extends Control { } public onValueChange($event: any) { + this.valueChangeEvent.trigger($event); + } + + @Visible() + public getBusinessId(): any { + return this.value ? this.value.businessId : this.value; } @Visible() From 7c963f3341f302cd135b62c3f20a4258c461c567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Fri, 13 Sep 2024 13:18:51 +0300 Subject: [PATCH 15/68] SUPPORT-8392: replacing ComboBox by DropdownTreeView --- .../main/resources/business-model/main.page | 172 +++--------------- 1 file changed, 30 insertions(+), 142 deletions(-) diff --git a/resources/src/main/resources/business-model/main.page b/resources/src/main/resources/business-model/main.page index 8e9373a5..5d7a5e89 100644 --- a/resources/src/main/resources/business-model/main.page +++ b/resources/src/main/resources/business-model/main.page @@ -193,138 +193,7 @@ 1776e9b1-dafa-47ee-8d99-b6797144cc93 Combo box false - false - false - - - - placeholder - -"Российская Федерация" - - - - - - - - comboBoxService - - - - businessIdColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"code"} - - - - columnSorts - - - - - - field - -{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"sort"} - - - - sortOrder - -"ASC" - - - - - - - - - displayColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"} - - - - loadDao - - - - graph - - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":251.0,"y":207.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":251.0,"y":207.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":251.0,"y":207.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - - - - uniqueResult - - false - - - - - - - - - - - - - - - defaultValueColumn - -{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - - loadType - -"BY_COLUMN" - - - - service - - - - entityColumn - - {"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - - loadDao - - - - graph - - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - - - - - DefaultLoadDao - database.dao - - - - - - DefaultValueByEntityGraphServiceV2 - service.loading - - - - - - - - false - + true 630accd8-3776-4fc1-a87c-3a0f05274678 @@ -339,6 +208,18 @@ treeItemService + + businessIdColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"code"} + + + + domainIdColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"idm_id"} + + idColumn @@ -466,6 +347,13 @@ + + 630accd8-3776-4fc1-a87c-3a0f05274678 + 88a51057-2192-426e-b46b-96abbcb90608 + DropdownTreeView + false + true + fd7e47b9-dce1-4d14-9f3a-580c79f59579 c696d351-c814-4abb-9f9e-fbb50eadfc49 @@ -650,7 +538,7 @@ behavior - {"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -683,7 +571,7 @@ behavior -{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -3004,7 +2892,7 @@ behavior - {"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -3037,7 +2925,7 @@ behavior -{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -5601,7 +5489,7 @@ behavior -{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -5634,7 +5522,7 @@ behavior - {"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -7561,7 +7449,7 @@ behavior -{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -7594,7 +7482,7 @@ behavior - {"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -9563,7 +9451,7 @@ behavior - {"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -9596,7 +9484,7 @@ behavior -{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} From 7f87ddfc3156fab2ddfc83875f6534f050de250f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Fri, 13 Sep 2024 13:17:49 +0300 Subject: [PATCH 16/68] SUPPORT-8392: adding businessId and domainId + search by domainId + value changed event --- .../java/component/model/TreeItemDto.java | 2 + .../component/rpc/TreeItemRpcService.java | 5 +++ .../component/service/TreeItemService.java | 45 ++++++++++++++++--- .../field/DropdownTreeViewComponent.ts | 17 +++++-- 4 files changed, 61 insertions(+), 8 deletions(-) diff --git a/backend/src/main/java/component/model/TreeItemDto.java b/backend/src/main/java/component/model/TreeItemDto.java index 7b1566df..d62eb049 100644 --- a/backend/src/main/java/component/model/TreeItemDto.java +++ b/backend/src/main/java/component/model/TreeItemDto.java @@ -11,6 +11,8 @@ public class TreeItemDto { public Object parentId; public String label; public TreeItemDto[] children; + public Object businessId; + public String domainId; public TreeItemDto(Object id, Object parentId, String label) { this.id = id; diff --git a/backend/src/main/java/component/rpc/TreeItemRpcService.java b/backend/src/main/java/component/rpc/TreeItemRpcService.java index bb9819da..0e174d3b 100644 --- a/backend/src/main/java/component/rpc/TreeItemRpcService.java +++ b/backend/src/main/java/component/rpc/TreeItemRpcService.java @@ -20,4 +20,9 @@ public class TreeItemRpcService extends Behavior { public List loadTreeData() { return treeItemService.loadTreeData(); } + + @RpcCall + public List loadTreeDataByDomainId(String domainId) { + return treeItemService.loadTreeDataByDomainId(domainId); + } } diff --git a/backend/src/main/java/component/service/TreeItemService.java b/backend/src/main/java/component/service/TreeItemService.java index b4b902ec..588ffa8a 100644 --- a/backend/src/main/java/component/service/TreeItemService.java +++ b/backend/src/main/java/component/service/TreeItemService.java @@ -37,8 +37,33 @@ public class TreeItemService { @TypedColumn(colTypes = EntityColumnType.STRING) @NotNull public EntityColumn labelColumn; + @GraphSource(value = TreeItemRpcService.class, scanMode = GraphSource.ScanMode.SELF) + public EntityColumn businessIdColumn; + @GraphSource(value = TreeItemRpcService.class, scanMode = GraphSource.ScanMode.SELF) + public EntityColumn domainIdColumn; public List loadTreeData() { + List loadedTreeItems = loadTreeItems(); + loadedTreeItems.forEach(item -> item.domainId = null); + return loadedTreeItems.stream() + .filter(item -> item.parentId == null) + .toList(); + } + + public List loadTreeDataByDomainId(String domainId) { + if (domainId == null || domainIdColumn == null) { + return loadTreeData(); + } + + List loadedTreeItems = loadTreeItems(); + List filteredTreeItems = loadedTreeItems.stream() + .filter(item -> item.domainId.equalsIgnoreCase(domainId)) + .toList(); + loadedTreeItems.forEach(item -> item.domainId = null); + return filteredTreeItems; + } + + private List loadTreeItems() { List loadedList = this.loadDao.load(getColumns(), new LoadOptions()).stream() .map(this::toTreeItemDto) .toList(); @@ -60,10 +85,7 @@ public class TreeItemService { item.children = children.toArray(new TreeItemDto[0]); } }); - - return loadedList.stream() - .filter(item -> item.parentId == null) - .toList(); + return loadedList; } private Set getColumns() { @@ -71,12 +93,25 @@ public class TreeItemService { columnSet.add(idColumn); columnSet.add(parentIdColumn); columnSet.add(labelColumn); + if (businessIdColumn != null) { + columnSet.add(businessIdColumn); + } + if (domainIdColumn != null) { + columnSet.add(domainIdColumn); + } return columnSet; } private TreeItemDto toTreeItemDto(TableRow tableRow) { - return new TreeItemDto( + TreeItemDto treeItemDto = new TreeItemDto( tableRow.get(idColumn), tableRow.get(parentIdColumn), (String) tableRow.get(labelColumn) ); + if (businessIdColumn != null) { + treeItemDto.businessId = tableRow.get(businessIdColumn); + } + if (domainIdColumn != null) { + treeItemDto.businessId = tableRow.get(domainIdColumn); + } + return treeItemDto; } } diff --git a/frontend/src/ts/component/field/DropdownTreeViewComponent.ts b/frontend/src/ts/component/field/DropdownTreeViewComponent.ts index 4a3b7c8d..4e3182fd 100644 --- a/frontend/src/ts/component/field/DropdownTreeViewComponent.ts +++ b/frontend/src/ts/component/field/DropdownTreeViewComponent.ts @@ -1,5 +1,5 @@ import {ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef} from "@angular/core"; -import {Control, UserService, Visible} from "@webbpm/base-package"; +import {Control, Event, UserService, Visible} from "@webbpm/base-package"; import {TreeItem, TreeviewItem} from "../external/ngx-treeview/lib/treeview-item"; import { DropdownTreeviewSelectI18n @@ -24,10 +24,13 @@ export class DropdownTreeViewComponent extends Control { @Visible("false") public value: any; + @Visible("false") + public valueChangeEvent: Event = new Event(); + private rpcService: TreeItemRpcService; constructor(el: ElementRef, cd: ChangeDetectorRef, - // todo replace UserService by another one providing accountId or domainId + // todo replace UserService by another one from SUPPORT-8421 providing accountId or domainId private i18n: DropdownTreeviewSelectI18n, private userService: UserService) { super(el, cd); } @@ -40,6 +43,8 @@ export class DropdownTreeViewComponent extends Control { @Visible() public loadTreeItems(): void { + // todo replace the called method by + // this.rpcService.loadTreeDataByDomainId(domainId) this.rpcService.loadTreeData() .then((res: TreeItemDto[]) => { this.items = res.map(value => new TreeviewItem(this.createTreeItem(value))); @@ -56,7 +61,7 @@ export class DropdownTreeViewComponent extends Control { if (treeItemDto) { treeItem = { text: treeItemDto.label, - value: treeItemDto.id, + value: treeItemDto, children: this.createTreeItemArray(treeItemDto.children) }; } @@ -71,6 +76,12 @@ export class DropdownTreeViewComponent extends Control { } public onValueChange($event: any) { + this.valueChangeEvent.trigger($event); + } + + @Visible() + public getBusinessId(): any { + return this.value ? this.value.businessId : this.value; } @Visible() From fec97a421049434d64f26008d0e79c94cada5473 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Fri, 13 Sep 2024 13:18:51 +0300 Subject: [PATCH 17/68] SUPPORT-8392: replacing ComboBox by DropdownTreeView --- .../main/resources/business-model/main.page | 222 +++++------------- 1 file changed, 55 insertions(+), 167 deletions(-) diff --git a/resources/src/main/resources/business-model/main.page b/resources/src/main/resources/business-model/main.page index 715dc951..5d7a5e89 100644 --- a/resources/src/main/resources/business-model/main.page +++ b/resources/src/main/resources/business-model/main.page @@ -164,7 +164,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"public","x":255.0,"y":206.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"public","x":255.0,"y":206.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":255.0,"y":206.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":155.0,"y":200.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":155.0,"y":200.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":155.0,"y":200.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} @@ -193,138 +193,7 @@ 1776e9b1-dafa-47ee-8d99-b6797144cc93 Combo box false - false - false - - - - placeholder - -"Российская Федерация" - - - - - - - - comboBoxService - - - - businessIdColumn - - {"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"} - - - - columnSorts - - - - - - field - -{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"sort"} - - - - sortOrder - -"ASC" - - - - - - - - - displayColumn - - {"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"} - - - - loadDao - - - - graph - - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"public","x":161.0,"y":271.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"public","x":161.0,"y":271.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":161.0,"y":271.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - - - - uniqueResult - - false - - - - - - - - - - - - - - - defaultValueColumn - -{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - - loadType - -"BY_COLUMN" - - - - service - - - - entityColumn - - {"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - - loadDao - - - - graph - - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - - - - - DefaultLoadDao - database.dao - - - - - - DefaultValueByEntityGraphServiceV2 - service.loading - - - - - - - - false - + true 630accd8-3776-4fc1-a87c-3a0f05274678 @@ -339,6 +208,18 @@ treeItemService + + businessIdColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"code"} + + + + domainIdColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"idm_id"} + + idColumn @@ -395,7 +276,6 @@ 9021abd0-d34a-43f2-a12d-649e728db7b1 Горизонтальный контейнер true - false false @@ -409,12 +289,6 @@ - - disabled - -true - - @@ -453,6 +327,12 @@ +disabled + + true + + + route "/ratings" @@ -467,6 +347,13 @@ + + 630accd8-3776-4fc1-a87c-3a0f05274678 + 88a51057-2192-426e-b46b-96abbcb90608 + DropdownTreeView + false + true + fd7e47b9-dce1-4d14-9f3a-580c79f59579 c696d351-c814-4abb-9f9e-fbb50eadfc49 @@ -593,9 +480,10 @@ "child-block" - + + - "bg-diamond" + "bg-diamond-people" @@ -616,7 +504,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"total_registered","schemaName":"main_dashboard","x":334.0,"y":244.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"pub_recruitment","schemaName":"public","x":131.0,"y":247.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"total_registered","schemaName":"main_dashboard","x":334.0,"y":244.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"pub_recruitment","schemaName":"public","x":131.0,"y":247.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":131.0,"y":247.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"total_registered":{"tableName":"total_registered","schemaName":"main_dashboard","x":334.0,"y":244.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"total_registered","refToEntityName":"pub_recruitment","refToColumns":[{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"}],"refOnColumns":[{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"total_registered","schemaName":"main_dashboard","x":334.0,"y":244.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"total_registered","schemaName":"main_dashboard","x":334.0,"y":244.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"total_registered":{"tableName":"total_registered","schemaName":"main_dashboard","x":334.0,"y":244.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} @@ -650,7 +538,7 @@ behavior - {"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -683,7 +571,7 @@ behavior -{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -2970,7 +2858,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"waiting_registration","schemaName":"main_dashboard","x":357.0,"y":262.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"pub_recruitment","schemaName":"public","x":186.0,"y":261.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"waiting_registration","schemaName":"main_dashboard","x":357.0,"y":262.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"pub_recruitment","schemaName":"public","x":186.0,"y":261.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":186.0,"y":261.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"waiting_registration":{"tableName":"waiting_registration","schemaName":"main_dashboard","x":357.0,"y":262.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"waiting_registration","refToEntityName":"pub_recruitment","refToColumns":[{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"}],"refOnColumns":[{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"waiting_registration","schemaName":"main_dashboard","x":357.0,"y":262.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"waiting_registration","schemaName":"main_dashboard","x":357.0,"y":262.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"waiting_registration":{"tableName":"waiting_registration","schemaName":"main_dashboard","x":357.0,"y":262.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} @@ -3004,7 +2892,7 @@ behavior - {"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -3037,7 +2925,7 @@ behavior -{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -5349,7 +5237,6 @@ 287754e8-934b-4750-b623-48758802904c Призывная кампания true - false false @@ -5568,7 +5455,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"public","x":103.0,"y":205.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment_campaign","schemaName":"main_dashboard","x":264.0,"y":209.0,"alias":"recruitment_campaign","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"public","x":103.0,"y":205.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment_campaign","schemaName":"main_dashboard","x":264.0,"y":209.0,"alias":"recruitment_campaign","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":103.0,"y":205.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment_campaign":{"tableName":"recruitment_campaign","schemaName":"main_dashboard","x":264.0,"y":209.0,"alias":"recruitment_campaign","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,null],[{"refOnEntityName":"recruitment_campaign","refToEntityName":"pub_recruitment","refToColumns":[{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"}],"refOnColumns":[{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null]],"mainNodeIndex":1} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment_campaign","schemaName":"main_dashboard","x":264.0,"y":209.0,"alias":"recruitment_campaign","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment_campaign","schemaName":"main_dashboard","x":264.0,"y":209.0,"alias":"recruitment_campaign","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment_campaign":{"tableName":"recruitment_campaign","schemaName":"main_dashboard","x":264.0,"y":209.0,"alias":"recruitment_campaign","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} @@ -5602,7 +5489,7 @@ behavior -{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -5635,13 +5522,13 @@ behavior - {"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} method - "getValue" + "getBusinessId" @@ -7528,7 +7415,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"public","x":105.0,"y":224.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment_campaign","schemaName":"main_dashboard","x":261.0,"y":220.0,"alias":"recruitment_campaign","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"public","x":105.0,"y":224.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment_campaign","schemaName":"main_dashboard","x":261.0,"y":220.0,"alias":"recruitment_campaign","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":105.0,"y":224.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment_campaign":{"tableName":"recruitment_campaign","schemaName":"main_dashboard","x":261.0,"y":220.0,"alias":"recruitment_campaign","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,null],[{"refOnEntityName":"recruitment_campaign","refToEntityName":"pub_recruitment","refToColumns":[{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"}],"refOnColumns":[{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},null]],"mainNodeIndex":1} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"recruitment_campaign","schemaName":"main_dashboard","x":261.0,"y":220.0,"alias":"recruitment_campaign","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"recruitment_campaign","schemaName":"main_dashboard","x":261.0,"y":220.0,"alias":"recruitment_campaign","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"recruitment_campaign":{"tableName":"recruitment_campaign","schemaName":"main_dashboard","x":261.0,"y":220.0,"alias":"recruitment_campaign","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"recruitment_campaign","entity":"recruitment_campaign","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} @@ -7562,7 +7449,7 @@ behavior -{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -7595,13 +7482,13 @@ behavior - {"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} method - "getValue" + "getBusinessId" @@ -9494,9 +9381,8 @@ 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 bf17f367-0137-4d8b-8168-6b7c38d287a2 - VB - Обжалования + VB - Обжалование true - false false @@ -9531,7 +9417,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"appeals","schemaName":"main_dashboard","x":287.0,"y":264.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"pub_recruitment","schemaName":"public","x":115.0,"y":263.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"appeals","schemaName":"main_dashboard","x":287.0,"y":264.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"pub_recruitment","schemaName":"public","x":115.0,"y":263.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"appeals":{"tableName":"appeals","schemaName":"main_dashboard","x":287.0,"y":264.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":115.0,"y":263.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"code"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"appeals","refToEntityName":"pub_recruitment","refToColumns":[{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"}],"refOnColumns":[{"schema":"main_dashboard","table":"appeals","entity":"appeals","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"appeals","schemaName":"main_dashboard","x":287.0,"y":264.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"appeals","schemaName":"main_dashboard","x":287.0,"y":264.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"appeals":{"tableName":"appeals","schemaName":"main_dashboard","x":287.0,"y":264.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} @@ -9565,7 +9451,7 @@ behavior - {"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -9598,7 +9484,7 @@ behavior -{"objectId":"1776e9b1-dafa-47ee-8d99-b6797144cc93","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -9661,6 +9547,7 @@ 42d02493-7752-4083-bdf7-53420afae804 HB - title true + false false @@ -9670,7 +9557,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 c3d08ac8-bc0d-47e4-a1f7-76a31f87b61c - Обжалования + Обжалование false false @@ -9688,7 +9575,7 @@ initialValue - "Обжалования" + "Обжалование" @@ -9766,6 +9653,7 @@ 1d635bf3-35ce-46b7-8a82-9c1243fb5943 Вертикальный контейнер true + false false @@ -10758,7 +10646,7 @@ 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 e7a24b2c-1ff9-42a2-985b-714e54140ba1 - VB - способы подачи жалоб + VB - способ подачи жалоб true false false @@ -10789,7 +10677,7 @@ ba24d307-0b91-4299-ba82-9d0b52384ff2 e59da7b3-ab9d-484f-b98b-5245de437ffd - Способы подачи жалоб + Способ подачи жалоб false false @@ -10807,7 +10695,7 @@ initialValue - "Способы подачи жалоб" + "Способ подачи жалоб" From 1b7d741c5f748ba1fdd5c9c84e45d1dd51881b0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Fri, 13 Sep 2024 13:41:32 +0300 Subject: [PATCH 18/68] SUPPORT-8392: small fix of mane.page --- resources/src/main/resources/business-model/main.page | 7 ------- 1 file changed, 7 deletions(-) diff --git a/resources/src/main/resources/business-model/main.page b/resources/src/main/resources/business-model/main.page index 5d7a5e89..306abb2d 100644 --- a/resources/src/main/resources/business-model/main.page +++ b/resources/src/main/resources/business-model/main.page @@ -347,13 +347,6 @@ - - 630accd8-3776-4fc1-a87c-3a0f05274678 - 88a51057-2192-426e-b46b-96abbcb90608 - DropdownTreeView - false - true - fd7e47b9-dce1-4d14-9f3a-580c79f59579 c696d351-c814-4abb-9f9e-fbb50eadfc49 From d22b6bcb1f5ae90112cfc13f1a4ae912a3e4410f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Tue, 17 Sep 2024 08:10:06 +0300 Subject: [PATCH 19/68] SUPPORT-8392: FilterCimponent --- .../main/resources/DropdownTreeView.component | 1 + .../FilterDropdownTreeView.component | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 resources/src/main/resources/FilterDropdownTreeView.component diff --git a/resources/src/main/resources/DropdownTreeView.component b/resources/src/main/resources/DropdownTreeView.component index d6fce25c..b21a0563 100644 --- a/resources/src/main/resources/DropdownTreeView.component +++ b/resources/src/main/resources/DropdownTreeView.component @@ -2,6 +2,7 @@ dd241482-d901-4d0b-9ad2-4d69b6661f82 DropdownTreeView + fields false 3.177.3 diff --git a/resources/src/main/resources/FilterDropdownTreeView.component b/resources/src/main/resources/FilterDropdownTreeView.component new file mode 100644 index 00000000..21ca0d1a --- /dev/null +++ b/resources/src/main/resources/FilterDropdownTreeView.component @@ -0,0 +1,37 @@ + + + 236ea5f5-8f3b-4266-9395-e7062180423d + FilterDropdownTreeView + filters + false + + 3.177.3 + + + ru.cg.webbpm.packages.base.resources + 3.177.3 + + + + + FilterDropdownTreeView + false + false + + + DropdownTreeViewComponent + component.field + + true + true + + + + FilterComponent + component.filter + + true + true + + + From 3ac774b160ab5fd325ff8c4eb070e934a155f597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Tue, 17 Sep 2024 08:11:03 +0300 Subject: [PATCH 20/68] SUPPORT-8392: fix for review (1) --- .../java/component/service/TreeItemService.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/component/service/TreeItemService.java b/backend/src/main/java/component/service/TreeItemService.java index 588ffa8a..ce05fd0b 100644 --- a/backend/src/main/java/component/service/TreeItemService.java +++ b/backend/src/main/java/component/service/TreeItemService.java @@ -55,14 +55,22 @@ public class TreeItemService { return loadTreeData(); } - List loadedTreeItems = loadTreeItems(); - List filteredTreeItems = loadedTreeItems.stream() + List filteredTreeItems = loadTreeItems().stream() .filter(item -> item.domainId.equalsIgnoreCase(domainId)) .toList(); - loadedTreeItems.forEach(item -> item.domainId = null); + filteredTreeItems.forEach(this::setDomainIdToNull); return filteredTreeItems; } + private void setDomainIdToNull(TreeItemDto treeItem) { + treeItem.domainId = null; + if (treeItem.children != null) { + for (TreeItemDto child : treeItem.children) { + setDomainIdToNull(child); + } + } + } + private List loadTreeItems() { List loadedList = this.loadDao.load(getColumns(), new LoadOptions()).stream() .map(this::toTreeItemDto) From d0dc29b29268f684f35fd225ae2ef915e6295bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Tue, 17 Sep 2024 08:21:05 +0300 Subject: [PATCH 21/68] SUPPORT-8392: fix for review (1.2) --- backend/src/main/java/component/service/TreeItemService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/component/service/TreeItemService.java b/backend/src/main/java/component/service/TreeItemService.java index ce05fd0b..c761bb31 100644 --- a/backend/src/main/java/component/service/TreeItemService.java +++ b/backend/src/main/java/component/service/TreeItemService.java @@ -64,8 +64,9 @@ public class TreeItemService { private void setDomainIdToNull(TreeItemDto treeItem) { treeItem.domainId = null; - if (treeItem.children != null) { - for (TreeItemDto child : treeItem.children) { + TreeItemDto[] treeItemChildren = treeItem.children; + if (treeItemChildren != null && treeItemChildren.length > 0) { + for (TreeItemDto child : treeItemChildren) { setDomainIdToNull(child); } } From 54108c99f5e883870ae3a88b0527c9c927d8bbd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Tue, 17 Sep 2024 08:21:05 +0300 Subject: [PATCH 22/68] SUPPORT-8392: fix for review (1.2) (cherry picked from commit d0dc29b29268f684f35fd225ae2ef915e6295bc9) --- backend/src/main/java/component/service/TreeItemService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/component/service/TreeItemService.java b/backend/src/main/java/component/service/TreeItemService.java index e68e07e3..1921f16b 100644 --- a/backend/src/main/java/component/service/TreeItemService.java +++ b/backend/src/main/java/component/service/TreeItemService.java @@ -64,8 +64,9 @@ public class TreeItemService { private void setDomainIdToNull(TreeItemDto treeItem) { treeItem.domainId = null; - if (treeItem.children != null) { - for (TreeItemDto child : treeItem.children) { + TreeItemDto[] treeItemChildren = treeItem.children; + if (treeItemChildren != null && treeItemChildren.length > 0) { + for (TreeItemDto child : treeItemChildren) { setDomainIdToNull(child); } } From 7fa86e1d32800570cb77b6a6f2fab6bda1e0c643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Thu, 19 Sep 2024 22:51:17 +0300 Subject: [PATCH 23/68] SUPPORT-9392: fix loading by businessId --- backend/src/main/java/component/service/TreeItemService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/component/service/TreeItemService.java b/backend/src/main/java/component/service/TreeItemService.java index 1921f16b..fbb170bc 100644 --- a/backend/src/main/java/component/service/TreeItemService.java +++ b/backend/src/main/java/component/service/TreeItemService.java @@ -119,7 +119,7 @@ public class TreeItemService { treeItemDto.businessId = tableRow.get(businessIdColumn); } if (domainIdColumn != null) { - treeItemDto.businessId = tableRow.get(domainIdColumn); + treeItemDto.domainId =(String) tableRow.get(domainIdColumn); } return treeItemDto; } From a3a3fbecb2bd4d46f358ea91480d9c4e27239275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Fri, 20 Sep 2024 08:19:28 +0300 Subject: [PATCH 24/68] SUPPORT-8392: fix closing dropdown --- .../ngx-treeview/lib/dropdown-menu.directive.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-menu.directive.ts b/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-menu.directive.ts index 7352d415..3b235aa1 100644 --- a/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-menu.directive.ts +++ b/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-menu.directive.ts @@ -1,4 +1,4 @@ -import { Directive } from '@angular/core'; +import { Directive, HostListener } from '@angular/core'; import { DropdownDirective } from './dropdown.directive'; @Directive({ @@ -11,4 +11,12 @@ import { DropdownDirective } from './dropdown.directive'; export class DropdownMenuDirective { constructor(public dropdown: DropdownDirective) { } + + @HostListener('click', ['$event']) + onClick(event: MouseEvent): void { + if (event.button !== 2 && event.srcElement.attributes[0] + && event.srcElement.attributes[0].nodeValue === 'form-check-label') { + this.dropdown.close(); + } + } } From fe14322c4bef284c5277b3550f9d9f7456c90bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Fri, 20 Sep 2024 08:35:15 +0300 Subject: [PATCH 25/68] SUPPORT-8392: maxHeight parameter added --- .../resources/template/component/field/DropdownTreeView.html | 1 + .../dropdown-treeview-select.component.ts | 4 ++++ frontend/src/ts/component/field/DropdownTreeViewComponent.ts | 1 + 3 files changed, 6 insertions(+) diff --git a/frontend/src/resources/template/component/field/DropdownTreeView.html b/frontend/src/resources/template/component/field/DropdownTreeView.html index dbc91ba0..abc6dd3f 100644 --- a/frontend/src/resources/template/component/field/DropdownTreeView.html +++ b/frontend/src/resources/template/component/field/DropdownTreeView.html @@ -4,6 +4,7 @@
diff --git a/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component.ts b/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component.ts index e655b0ca..2f2762dd 100644 --- a/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component.ts +++ b/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component.ts @@ -25,6 +25,7 @@ import { isNil } from '../lib/utils'; export class DropdownTreeviewSelectComponent implements OnChanges { @Input() config: TreeviewConfig; @Input() items: TreeviewItem[]; + @Input() maxHeight: number; @Input() value: any; @Output() valueChange = new EventEmitter(); @ViewChild(DropdownTreeviewComponent) dropdownTreeviewComponent: DropdownTreeviewComponent; @@ -42,6 +43,9 @@ export class DropdownTreeviewSelectComponent implements OnChanges { } ngOnChanges(): void { + if (this.maxHeight) { + this.config.maxHeight = this.maxHeight; + } this.updateSelectedItem(); } diff --git a/frontend/src/ts/component/field/DropdownTreeViewComponent.ts b/frontend/src/ts/component/field/DropdownTreeViewComponent.ts index 4e3182fd..94274533 100644 --- a/frontend/src/ts/component/field/DropdownTreeViewComponent.ts +++ b/frontend/src/ts/component/field/DropdownTreeViewComponent.ts @@ -19,6 +19,7 @@ import {TreeItemRpcService} from "../../generated/component/rpc/TreeItemRpcServi export class DropdownTreeViewComponent extends Control { public collapseLevel: number; + public maxHeight: number; @Visible("false") public items: TreeviewItem[]; @Visible("false") From 5d98d5cb27807a25281dc8c5b4a4b9310c70f78d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Thu, 19 Sep 2024 22:51:17 +0300 Subject: [PATCH 26/68] SUPPORT-9392: fix loading by businessId --- backend/src/main/java/component/service/TreeItemService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/component/service/TreeItemService.java b/backend/src/main/java/component/service/TreeItemService.java index c761bb31..aa72e2e8 100644 --- a/backend/src/main/java/component/service/TreeItemService.java +++ b/backend/src/main/java/component/service/TreeItemService.java @@ -119,7 +119,7 @@ public class TreeItemService { treeItemDto.businessId = tableRow.get(businessIdColumn); } if (domainIdColumn != null) { - treeItemDto.businessId = tableRow.get(domainIdColumn); + treeItemDto.domainId =(String) tableRow.get(domainIdColumn); } return treeItemDto; } From c4b5d444c0f833e2cb60ef89b16c3a11a3551b97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Fri, 20 Sep 2024 08:19:28 +0300 Subject: [PATCH 27/68] SUPPORT-8392: fix closing dropdown --- .../ngx-treeview/lib/dropdown-menu.directive.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-menu.directive.ts b/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-menu.directive.ts index 7352d415..3b235aa1 100644 --- a/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-menu.directive.ts +++ b/frontend/src/ts/component/external/ngx-treeview/lib/dropdown-menu.directive.ts @@ -1,4 +1,4 @@ -import { Directive } from '@angular/core'; +import { Directive, HostListener } from '@angular/core'; import { DropdownDirective } from './dropdown.directive'; @Directive({ @@ -11,4 +11,12 @@ import { DropdownDirective } from './dropdown.directive'; export class DropdownMenuDirective { constructor(public dropdown: DropdownDirective) { } + + @HostListener('click', ['$event']) + onClick(event: MouseEvent): void { + if (event.button !== 2 && event.srcElement.attributes[0] + && event.srcElement.attributes[0].nodeValue === 'form-check-label') { + this.dropdown.close(); + } + } } From a737beb31b861e4672788fe59c188560f5c3366b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Fri, 20 Sep 2024 08:35:15 +0300 Subject: [PATCH 28/68] SUPPORT-8392: maxHeight parameter added --- .../resources/template/component/field/DropdownTreeView.html | 1 + .../dropdown-treeview-select.component.ts | 4 ++++ frontend/src/ts/component/field/DropdownTreeViewComponent.ts | 1 + 3 files changed, 6 insertions(+) diff --git a/frontend/src/resources/template/component/field/DropdownTreeView.html b/frontend/src/resources/template/component/field/DropdownTreeView.html index dbc91ba0..abc6dd3f 100644 --- a/frontend/src/resources/template/component/field/DropdownTreeView.html +++ b/frontend/src/resources/template/component/field/DropdownTreeView.html @@ -4,6 +4,7 @@
diff --git a/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component.ts b/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component.ts index e655b0ca..2f2762dd 100644 --- a/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component.ts +++ b/frontend/src/ts/component/external/ngx-treeview/dropdown-treeview-select/dropdown-treeview-select.component.ts @@ -25,6 +25,7 @@ import { isNil } from '../lib/utils'; export class DropdownTreeviewSelectComponent implements OnChanges { @Input() config: TreeviewConfig; @Input() items: TreeviewItem[]; + @Input() maxHeight: number; @Input() value: any; @Output() valueChange = new EventEmitter(); @ViewChild(DropdownTreeviewComponent) dropdownTreeviewComponent: DropdownTreeviewComponent; @@ -42,6 +43,9 @@ export class DropdownTreeviewSelectComponent implements OnChanges { } ngOnChanges(): void { + if (this.maxHeight) { + this.config.maxHeight = this.maxHeight; + } this.updateSelectedItem(); } diff --git a/frontend/src/ts/component/field/DropdownTreeViewComponent.ts b/frontend/src/ts/component/field/DropdownTreeViewComponent.ts index 4e3182fd..94274533 100644 --- a/frontend/src/ts/component/field/DropdownTreeViewComponent.ts +++ b/frontend/src/ts/component/field/DropdownTreeViewComponent.ts @@ -19,6 +19,7 @@ import {TreeItemRpcService} from "../../generated/component/rpc/TreeItemRpcServi export class DropdownTreeViewComponent extends Control { public collapseLevel: number; + public maxHeight: number; @Visible("false") public items: TreeviewItem[]; @Visible("false") From 0929a3672c2d77c22bd8ebec0dbd738f108a9237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Fri, 20 Sep 2024 09:37:55 +0300 Subject: [PATCH 29/68] SUPPORT-8392: fixing scrollbar appearance --- frontend/src/resources/css/components-dashboard.css | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 4dcfcb96..5027c67b 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -100,6 +100,7 @@ padding: 0; } .webbpm.ervu_dashboard dropdown-tree-view .dropdown-menu .treeview-container { + overflow-y: auto; scrollbar-color: var(--color-dark-40) transparent; } .webbpm.ervu_dashboard dropdown-tree-view .dropdown-menu .treeview-container::-webkit-scrollbar-thumb { From 1442ff4a5041843b63ba0ccbeba8c23846ae0a38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D0=B0=D1=83=D1=84=20=D0=9B=D0=B0=D1=82=D1=8B=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2?= Date: Fri, 20 Sep 2024 09:37:55 +0300 Subject: [PATCH 30/68] SUPPORT-8392: fixing scrollbar appearance --- frontend/src/resources/css/components-dashboard.css | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 76cf8f24..8d5a4370 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -100,6 +100,7 @@ padding: 0; } .webbpm.ervu_dashboard dropdown-tree-view .dropdown-menu .treeview-container { + overflow-y: auto; scrollbar-color: var(--color-dark-40) transparent; } .webbpm.ervu_dashboard dropdown-tree-view .dropdown-menu .treeview-container::-webkit-scrollbar-thumb { From ecbbcf71382380d14617cc174f4003e3d1291799 Mon Sep 17 00:00:00 2001 From: Makarova Elena Date: Mon, 23 Sep 2024 16:35:39 +0300 Subject: [PATCH 31/68] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=D0=B0=20=D0=B1=D0=B4,=20=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=BB=D0=B0=20font-bold=20=D0=BD=D0=B0=20subtitle?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ervu_dashboard/ErvuDashboard.java | 9 +- .../db_beans/ervu_dashboard/Keys.java | 3 + .../db_beans/ervu_dashboard/Tables.java | 6 + .../db_beans/ervu_dashboard/tables/Work.java | 282 ++++++++++++++++++ .../tables/records/WorkRecord.java | 228 ++++++++++++++ .../public_/enums/EmployerCategoryType.java | 62 ++++ .../resources/business-model/citizencard.page | 102 +------ 7 files changed, 605 insertions(+), 87 deletions(-) create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Work.java create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/WorkRecord.java create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/enums/EmployerCategoryType.java diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java index ec3afd3b..f80c2039 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java @@ -20,6 +20,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.PubRecruitme import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Recruitment; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Subpoena; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.TemporaryMeasures; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Work; import java.util.Arrays; import java.util.List; @@ -117,6 +118,11 @@ public class ErvuDashboard extends SchemaImpl { */ public final TemporaryMeasures TEMPORARY_MEASURES = TemporaryMeasures.TEMPORARY_MEASURES; + /** + * сведения об имуществе + */ + public final Work WORK = Work.WORK; + /** * No further instances allowed */ @@ -147,7 +153,8 @@ public class ErvuDashboard extends SchemaImpl { PubRecruitment.PUB_RECRUITMENT, Recruitment.RECRUITMENT, Subpoena.SUBPOENA, - TemporaryMeasures.TEMPORARY_MEASURES + TemporaryMeasures.TEMPORARY_MEASURES, + Work.WORK ); } } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java index 55bf1a92..e375bae8 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java @@ -18,6 +18,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.PubRecruitme import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Recruitment; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Subpoena; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.TemporaryMeasures; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Work; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenChildRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenGuardianshipRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenRecord; @@ -32,6 +33,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.PubR import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.RecruitmentRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.SubpoenaRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.TemporaryMeasuresRecord; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.WorkRecord; import org.jooq.TableField; import org.jooq.UniqueKey; @@ -65,4 +67,5 @@ public class Keys { public static final UniqueKey RECRUITMENT_PKEY = Internal.createUniqueKey(Recruitment.RECRUITMENT, DSL.name("recruitment_pkey"), new TableField[] { Recruitment.RECRUITMENT.ID }, true); public static final UniqueKey SUBPOENA_PKEY = Internal.createUniqueKey(Subpoena.SUBPOENA, DSL.name("subpoena_pkey"), new TableField[] { Subpoena.SUBPOENA.SUBPOENA_ID }, true); public static final UniqueKey TEMPORARY_MEASURES_PKEY = Internal.createUniqueKey(TemporaryMeasures.TEMPORARY_MEASURES, DSL.name("temporary_measures_pkey"), new TableField[] { TemporaryMeasures.TEMPORARY_MEASURES.TEMPORARY_MEASURES_ID }, true); + public static final UniqueKey PK_WORK = Internal.createUniqueKey(Work.WORK, DSL.name("pk_work"), new TableField[] { Work.WORK.WORK_ID }, true); } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java index b08f69c8..2e519461 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java @@ -19,6 +19,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.PubRecruitme import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Recruitment; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Subpoena; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.TemporaryMeasures; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Work; /** @@ -101,4 +102,9 @@ public class Tables { * The table ervu_dashboard.temporary_measures. */ public static final TemporaryMeasures TEMPORARY_MEASURES = TemporaryMeasures.TEMPORARY_MEASURES; + + /** + * сведения об имуществе + */ + public static final Work WORK = Work.WORK; } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Work.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Work.java new file mode 100644 index 00000000..f9360b1b --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Work.java @@ -0,0 +1,282 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables; + + +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.WorkRecord; +import ervu_dashboard.ervu_dashboard.db_beans.public_.enums.EmployerCategoryType; + +import java.sql.Date; +import java.util.Collection; +import java.util.UUID; + +import org.jooq.Condition; +import org.jooq.Field; +import org.jooq.Identity; +import org.jooq.Name; +import org.jooq.PlainSQL; +import org.jooq.QueryPart; +import org.jooq.SQL; +import org.jooq.Schema; +import org.jooq.Select; +import org.jooq.Stringly; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.TableOptions; +import org.jooq.UniqueKey; +import org.jooq.impl.DSL; +import org.jooq.impl.SQLDataType; +import org.jooq.impl.TableImpl; + + +/** + * сведения об имуществе + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class Work extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of ervu_dashboard.work + */ + public static final Work WORK = new Work(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return WorkRecord.class; + } + + /** + * The column ervu_dashboard.work.work_id. + */ + public final TableField WORK_ID = createField(DSL.name("work_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + /** + * The column ervu_dashboard.work.recruit_id. ссылка на + * гражданина (citizen) + */ + public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "ссылка на гражданина (citizen)"); + + /** + * The column ervu_dashboard.work.employer_category. категория + * работодателя: юр лицо/ИП/физ лицо/глава КФХ + */ + public final TableField EMPLOYER_CATEGORY = createField(DSL.name("employer_category"), SQLDataType.VARCHAR.asEnumDataType(EmployerCategoryType.class), this, "категория работодателя: юр лицо/ИП/физ лицо/глава КФХ"); + + /** + * The column ervu_dashboard.work.place. место работы + */ + public final TableField PLACE = createField(DSL.name("place"), SQLDataType.CLOB, this, "место работы"); + + /** + * The column ervu_dashboard.work.organization_name. + * наименование организации + */ + public final TableField ORGANIZATION_NAME = createField(DSL.name("organization_name"), SQLDataType.VARCHAR(100), this, "наименование организации"); + + /** + * The column ervu_dashboard.work.inn. ИНН + */ + public final TableField INN = createField(DSL.name("inn"), SQLDataType.VARCHAR(15), this, "ИНН"); + + /** + * The column ervu_dashboard.work.kpp. КПП + */ + public final TableField KPP = createField(DSL.name("kpp"), SQLDataType.VARCHAR(15), this, "КПП"); + + /** + * The column ervu_dashboard.work.ogrnip. ОГРНИП + */ + public final TableField OGRNIP = createField(DSL.name("ogrnip"), SQLDataType.VARCHAR(20), this, "ОГРНИП"); + + /** + * The column ervu_dashboard.work.position. должность + */ + public final TableField POSITION = createField(DSL.name("position"), SQLDataType.VARCHAR(150), this, "должность"); + + /** + * The column ervu_dashboard.work.event_type. тип кадрового + * мероприятия + */ + public final TableField EVENT_TYPE = createField(DSL.name("event_type"), SQLDataType.VARCHAR(50), this, "тип кадрового мероприятия "); + + /** + * The column ervu_dashboard.work.event_date. дата кадрового + * мероприятия + */ + public final TableField EVENT_DATE = createField(DSL.name("event_date"), SQLDataType.DATE, this, "дата кадрового мероприятия"); + + private Work(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private Work(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment("сведения об имуществе"), TableOptions.table(), where); + } + + /** + * Create an aliased ervu_dashboard.work table reference + */ + public Work(String alias) { + this(DSL.name(alias), WORK); + } + + /** + * Create an aliased ervu_dashboard.work table reference + */ + public Work(Name alias) { + this(alias, WORK); + } + + /** + * Create a ervu_dashboard.work table reference + */ + public Work() { + this(DSL.name("work"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD; + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public UniqueKey getPrimaryKey() { + return Keys.PK_WORK; + } + + @Override + public Work as(String alias) { + return new Work(DSL.name(alias), this); + } + + @Override + public Work as(Name alias) { + return new Work(alias, this); + } + + @Override + public Work as(Table alias) { + return new Work(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public Work rename(String name) { + return new Work(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public Work rename(Name name) { + return new Work(name, null); + } + + /** + * Rename this table + */ + @Override + public Work rename(Table name) { + return new Work(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Work where(Condition condition) { + return new Work(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Work where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Work where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Work where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Work where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Work where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Work where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Work where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Work whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Work whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/WorkRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/WorkRecord.java new file mode 100644 index 00000000..fc86a5f5 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/WorkRecord.java @@ -0,0 +1,228 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records; + + +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Work; +import ervu_dashboard.ervu_dashboard.db_beans.public_.enums.EmployerCategoryType; + +import java.sql.Date; +import java.util.UUID; + +import org.jooq.Record1; +import org.jooq.impl.UpdatableRecordImpl; + + +/** + * сведения об имуществе + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class WorkRecord extends UpdatableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for ervu_dashboard.work.work_id. + */ + public void setWorkId(Long value) { + set(0, value); + } + + /** + * Getter for ervu_dashboard.work.work_id. + */ + public Long getWorkId() { + return (Long) get(0); + } + + /** + * Setter for ervu_dashboard.work.recruit_id. ссылка на + * гражданина (citizen) + */ + public void setRecruitId(UUID value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.work.recruit_id. ссылка на + * гражданина (citizen) + */ + public UUID getRecruitId() { + return (UUID) get(1); + } + + /** + * Setter for ervu_dashboard.work.employer_category. категория + * работодателя: юр лицо/ИП/физ лицо/глава КФХ + */ + public void setEmployerCategory(EmployerCategoryType value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.work.employer_category. категория + * работодателя: юр лицо/ИП/физ лицо/глава КФХ + */ + public EmployerCategoryType getEmployerCategory() { + return (EmployerCategoryType) get(2); + } + + /** + * Setter for ervu_dashboard.work.place. место работы + */ + public void setPlace(String value) { + set(3, value); + } + + /** + * Getter for ervu_dashboard.work.place. место работы + */ + public String getPlace() { + return (String) get(3); + } + + /** + * Setter for ervu_dashboard.work.organization_name. + * наименование организации + */ + public void setOrganizationName(String value) { + set(4, value); + } + + /** + * Getter for ervu_dashboard.work.organization_name. + * наименование организации + */ + public String getOrganizationName() { + return (String) get(4); + } + + /** + * Setter for ervu_dashboard.work.inn. ИНН + */ + public void setInn(String value) { + set(5, value); + } + + /** + * Getter for ervu_dashboard.work.inn. ИНН + */ + public String getInn() { + return (String) get(5); + } + + /** + * Setter for ervu_dashboard.work.kpp. КПП + */ + public void setKpp(String value) { + set(6, value); + } + + /** + * Getter for ervu_dashboard.work.kpp. КПП + */ + public String getKpp() { + return (String) get(6); + } + + /** + * Setter for ervu_dashboard.work.ogrnip. ОГРНИП + */ + public void setOgrnip(String value) { + set(7, value); + } + + /** + * Getter for ervu_dashboard.work.ogrnip. ОГРНИП + */ + public String getOgrnip() { + return (String) get(7); + } + + /** + * Setter for ervu_dashboard.work.position. должность + */ + public void setPosition(String value) { + set(8, value); + } + + /** + * Getter for ervu_dashboard.work.position. должность + */ + public String getPosition() { + return (String) get(8); + } + + /** + * Setter for ervu_dashboard.work.event_type. тип кадрового + * мероприятия + */ + public void setEventType(String value) { + set(9, value); + } + + /** + * Getter for ervu_dashboard.work.event_type. тип кадрового + * мероприятия + */ + public String getEventType() { + return (String) get(9); + } + + /** + * Setter for ervu_dashboard.work.event_date. дата кадрового + * мероприятия + */ + public void setEventDate(Date value) { + set(10, value); + } + + /** + * Getter for ervu_dashboard.work.event_date. дата кадрового + * мероприятия + */ + public Date getEventDate() { + return (Date) get(10); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 key() { + return (Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached WorkRecord + */ + public WorkRecord() { + super(Work.WORK); + } + + /** + * Create a detached, initialised WorkRecord + */ + public WorkRecord(Long workId, UUID recruitId, EmployerCategoryType employerCategory, String place, String organizationName, String inn, String kpp, String ogrnip, String position, String eventType, Date eventDate) { + super(Work.WORK); + + setWorkId(workId); + setRecruitId(recruitId); + setEmployerCategory(employerCategory); + setPlace(place); + setOrganizationName(organizationName); + setInn(inn); + setKpp(kpp); + setOgrnip(ogrnip); + setPosition(position); + setEventType(eventType); + setEventDate(eventDate); + resetChangedOnNotNull(); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/enums/EmployerCategoryType.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/enums/EmployerCategoryType.java new file mode 100644 index 00000000..46cc5b28 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/enums/EmployerCategoryType.java @@ -0,0 +1,62 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.public_.enums; + + +import ervu_dashboard.ervu_dashboard.db_beans.public_.Public; + +import org.jooq.Catalog; +import org.jooq.EnumType; +import org.jooq.Schema; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public enum EmployerCategoryType implements EnumType { + + fl("fl"), + + ul("ul"), + + kfh("kfh"), + + ip("ip"); + + private final String literal; + + private EmployerCategoryType(String literal) { + this.literal = literal; + } + + @Override + public Catalog getCatalog() { + return getSchema().getCatalog(); + } + + @Override + public Schema getSchema() { + return Public.PUBLIC; + } + + @Override + public String getName() { + return "employer_category_type"; + } + + @Override + public String getLiteral() { + return literal; + } + + /** + * Lookup a value of this EnumType by its literal. Returns + * null, if no such value could be found, see {@link + * EnumType#lookupLiteral(Class, String)}. + */ + public static EmployerCategoryType lookupLiteral(String literal) { + return EnumType.lookupLiteral(EmployerCategoryType.class, literal); + } +} diff --git a/resources/src/main/resources/business-model/citizencard.page b/resources/src/main/resources/business-model/citizencard.page index 68a2aa0f..1aae338a 100644 --- a/resources/src/main/resources/business-model/citizencard.page +++ b/resources/src/main/resources/business-model/citizencard.page @@ -2386,7 +2386,7 @@ - "font-bold" + "subtitle" @@ -2662,7 +2662,7 @@ - "font-bold" + "subtitle" @@ -9883,7 +9883,7 @@ - "font-bold" + "subtitle" @@ -12437,7 +12437,7 @@ - "font-bold" + "subtitle" @@ -12744,7 +12744,7 @@ - "font-bold" + "subtitle" @@ -13058,7 +13058,7 @@ - "font-bold" + "subtitle" @@ -13301,7 +13301,7 @@ - "font-bold" + "subtitle" @@ -15511,16 +15511,9 @@ cb814ffd-638b-4901-9d9f-ec3f5838d159 Сведения о состоянии зоровья, о присвоении спортивных разрядов и званий true - false false - - disabled - - true - - heading @@ -15640,7 +15633,7 @@ - "font-bold" + "subtitle" @@ -16024,7 +16017,7 @@ - "font-bold" + "subtitle" @@ -16282,20 +16275,6 @@ - - 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 - a995d6b8-3864-4936-80ba-d420b390a278 - Column - false - true - - - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - 500cd6d7-ada0-4e27-8407-e3897dc6176f - Hbox - true - true ba24d307-0b91-4299-ba82-9d0b52384ff2 @@ -16310,7 +16289,7 @@ - "font-bold" + "subtitle" @@ -16611,13 +16590,6 @@ - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - fcec512d-4ee7-4a68-8d06-e7ba3c67b993 - Hbox - true - true - ba24d307-0b91-4299-ba82-9d0b52384ff2 405ddccd-4227-41a1-904b-9d15cd3917e5 @@ -16631,7 +16603,7 @@ - "font-bold" + "subtitle" @@ -16992,20 +16964,6 @@ - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - c4521c61-cf32-4842-9a06-ead23bc115d6 - Hbox - true - true - - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - bcd3705f-251b-4a64-9356-91d3f9606606 - Hbox - true - true - ba24d307-0b91-4299-ba82-9d0b52384ff2 79fe2c36-664a-42ca-b256-0a797219f4df @@ -17019,7 +16977,7 @@ - "font-bold" + "subtitle" @@ -17308,13 +17266,6 @@ - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - 166a49d5-def6-49be-83b0-69e339e9d756 - Hbox - true - true - ba24d307-0b91-4299-ba82-9d0b52384ff2 3d6b196e-c1a4-4d61-9b0f-11b6441c8a70 @@ -17382,13 +17333,6 @@ false - - 16071adb-3bdf-4c33-b29b-886876016415 - e873a4ea-624f-4299-b05f-e5dddfb3f584 - Grid_спортивные разряды - true - true - d7d54cfb-26b5-4dba-b56f-b6247183c24d 053ec24b-2e83-41f6-859f-dd7b90be2d14 @@ -17883,13 +17827,6 @@ - - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - b83acf9a-3acc-4fb8-a429-b62eec53b6f0 - Hbox - true - true @@ -17946,7 +17883,6 @@ bc82d1bf-8f7b-4d2b-bfdc-be633ce53893 Vbox true -false false @@ -18033,7 +17969,7 @@ - "font-bold" + "subtitle" @@ -18497,7 +18433,7 @@ - "font-bold" + "subtitle" @@ -19260,7 +19196,7 @@ - "font-bold" + "subtitle" @@ -19940,7 +19876,7 @@ - "font-bold" + "subtitle" @@ -20653,12 +20589,6 @@ false - - disabled - - true - - heading From 859d7ee5a14197ac508077bc92ddccaf87c6acd2 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 23 Sep 2024 17:16:41 +0300 Subject: [PATCH 32/68] subtitle fix --- frontend/src/resources/css/components-dashboard.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 6dabc878..2bfebc46 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -1097,6 +1097,10 @@ display: none !important; } +.webbpm.ervu_dashboard grid-v2 + .subtitle { + margin-top: var(--indent-medium); +} + /* Special pages */ .webbpm.ervu_dashboard #total_registered_second .child-block:nth-child(1) { flex: 0; From 851449e8d859e71b53af6da65deeeec7fe7c9e60 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Tue, 24 Sep 2024 10:11:12 +0300 Subject: [PATCH 33/68] new scrollbar --- frontend/src/resources/css/components-dashboard.css | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 4c573900..3c2aba89 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -97,7 +97,7 @@ } .webbpm.ervu_dashboard dropdown-tree-view .dropdown-menu { padding: 0; - border-radius: 24px; + border-radius: var(--indent-xbase); border: 1px solid var(--color-text-secondary); background: var(--color-dark-20); backdrop-filter: var(--bg-blur-40); @@ -107,11 +107,8 @@ padding: 0; } .webbpm.ervu_dashboard dropdown-tree-view .dropdown-menu .treeview-container { + margin-bottom: var(--indent-base); overflow-y: auto; - scrollbar-color: var(--color-dark-40) transparent; -} -.webbpm.ervu_dashboard dropdown-tree-view .dropdown-menu .treeview-container::-webkit-scrollbar-thumb { - background-color: var(--color-dark-40); } .webbpm.ervu_dashboard dropdown-tree-view .treeview-header .row-filter { From 5349b4fee597a691973b4537c184744e364a3dec Mon Sep 17 00:00:00 2001 From: Makarova Elena Date: Tue, 24 Sep 2024 10:47:19 +0300 Subject: [PATCH 34/68] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=D0=B0=20=D0=B1=D0=B4,=20=D0=BD=D0=B0=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=B8=D0=BB=D0=B0=20=D1=81=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BE=20=D0=B3=D1=80=D0=B0=D0=B6=D0=B4=D0=B0?= =?UTF-8?q?=D0=BD=D1=81=D1=82=D0=B2=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ervu_dashboard/ErvuDashboard.java | 14 + .../db_beans/ervu_dashboard/Keys.java | 6 + .../db_beans/ervu_dashboard/Tables.java | 12 + .../ervu_dashboard/tables/Citizenship.java | 281 ++++++ .../tables/CitizenshipForeign.java | 276 ++++++ .../records/CitizenshipForeignRecord.java | 198 +++++ .../tables/records/CitizenshipRecord.java | 222 +++++ .../resources/business-model/citizencard.page | 809 +++++++++--------- 8 files changed, 1418 insertions(+), 400 deletions(-) create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizenship.java create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/CitizenshipForeign.java create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenshipForeignRecord.java create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenshipRecord.java diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java index f80c2039..70f8d68d 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java @@ -9,6 +9,8 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Citizen; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenChild; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenGuardianship; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenSpouse; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Citizenship; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenshipForeign; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangelog; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangeloglock; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disability; @@ -63,6 +65,16 @@ public class ErvuDashboard extends SchemaImpl { */ public final CitizenSpouse CITIZEN_SPOUSE = CitizenSpouse.CITIZEN_SPOUSE; + /** + * сведения о гражданстве РФ + */ + public final Citizenship CITIZENSHIP = Citizenship.CITIZENSHIP; + + /** + * сведения об иностранном гражданстве + */ + public final CitizenshipForeign CITIZENSHIP_FOREIGN = CitizenshipForeign.CITIZENSHIP_FOREIGN; + /** * The table ervu_dashboard.databasechangelog. */ @@ -143,6 +155,8 @@ public class ErvuDashboard extends SchemaImpl { CitizenChild.CITIZEN_CHILD, CitizenGuardianship.CITIZEN_GUARDIANSHIP, CitizenSpouse.CITIZEN_SPOUSE, + Citizenship.CITIZENSHIP, + CitizenshipForeign.CITIZENSHIP_FOREIGN, Databasechangelog.DATABASECHANGELOG, Databasechangeloglock.DATABASECHANGELOGLOCK, Disability.DISABILITY, diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java index e375bae8..3b0fdff3 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java @@ -8,6 +8,8 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Citizen; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenChild; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenGuardianship; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenSpouse; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Citizenship; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenshipForeign; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangeloglock; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disability; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disease; @@ -23,6 +25,8 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.Citi import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenGuardianshipRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenSpouseRecord; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenshipForeignRecord; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenshipRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DatabasechangeloglockRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DisabilityRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DiseaseRecord; @@ -56,6 +60,8 @@ public class Keys { public static final UniqueKey PK_CITIZEN_CHILD = Internal.createUniqueKey(CitizenChild.CITIZEN_CHILD, DSL.name("pk_citizen_child"), new TableField[] { CitizenChild.CITIZEN_CHILD.CITIZEN_CHILD_ID }, true); public static final UniqueKey PK_CITIZEN_GUARDIANSHIP = Internal.createUniqueKey(CitizenGuardianship.CITIZEN_GUARDIANSHIP, DSL.name("pk_citizen_guardianship"), new TableField[] { CitizenGuardianship.CITIZEN_GUARDIANSHIP.CITIZEN_GUARDIANSHIP_ID }, true); public static final UniqueKey PK_CITIZEN_SPOUSE = Internal.createUniqueKey(CitizenSpouse.CITIZEN_SPOUSE, DSL.name("pk_citizen_spouse"), new TableField[] { CitizenSpouse.CITIZEN_SPOUSE.CITIZEN_SPOUSE_ID }, true); + public static final UniqueKey PK_CITIZENSHIP = Internal.createUniqueKey(Citizenship.CITIZENSHIP, DSL.name("pk_citizenship"), new TableField[] { Citizenship.CITIZENSHIP.CITIZENSHIP_ID }, true); + public static final UniqueKey PK_CITIZENSHIP_FOREIGN = Internal.createUniqueKey(CitizenshipForeign.CITIZENSHIP_FOREIGN, DSL.name("pk_citizenship_foreign"), new TableField[] { CitizenshipForeign.CITIZENSHIP_FOREIGN.CITIZENSHIP_FOREIGN_ID }, true); public static final UniqueKey DATABASECHANGELOGLOCK_PKEY = Internal.createUniqueKey(Databasechangeloglock.DATABASECHANGELOGLOCK, DSL.name("databasechangeloglock_pkey"), new TableField[] { Databasechangeloglock.DATABASECHANGELOGLOCK.ID }, true); public static final UniqueKey PK_DISABILITY = Internal.createUniqueKey(Disability.DISABILITY, DSL.name("pk_disability"), new TableField[] { Disability.DISABILITY.DISABILITY_ID }, true); public static final UniqueKey PK_DISEASE = Internal.createUniqueKey(Disease.DISEASE, DSL.name("pk_disease"), new TableField[] { Disease.DISEASE.DISEASE_ID }, true); diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java index 2e519461..43fa92eb 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java @@ -8,6 +8,8 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Citizen; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenChild; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenGuardianship; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenSpouse; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Citizenship; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenshipForeign; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangelog; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangeloglock; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disability; @@ -48,6 +50,16 @@ public class Tables { */ public static final CitizenSpouse CITIZEN_SPOUSE = CitizenSpouse.CITIZEN_SPOUSE; + /** + * сведения о гражданстве РФ + */ + public static final Citizenship CITIZENSHIP = Citizenship.CITIZENSHIP; + + /** + * сведения об иностранном гражданстве + */ + public static final CitizenshipForeign CITIZENSHIP_FOREIGN = CitizenshipForeign.CITIZENSHIP_FOREIGN; + /** * The table ervu_dashboard.databasechangelog. */ diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizenship.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizenship.java new file mode 100644 index 00000000..24cfebed --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizenship.java @@ -0,0 +1,281 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables; + + +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenshipRecord; + +import java.sql.Date; +import java.util.Collection; +import java.util.UUID; + +import org.jooq.Condition; +import org.jooq.Field; +import org.jooq.Identity; +import org.jooq.Name; +import org.jooq.PlainSQL; +import org.jooq.QueryPart; +import org.jooq.SQL; +import org.jooq.Schema; +import org.jooq.Select; +import org.jooq.Stringly; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.TableOptions; +import org.jooq.UniqueKey; +import org.jooq.impl.DSL; +import org.jooq.impl.SQLDataType; +import org.jooq.impl.TableImpl; + + +/** + * сведения о гражданстве РФ + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class Citizenship extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of ervu_dashboard.citizenship + */ + public static final Citizenship CITIZENSHIP = new Citizenship(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return CitizenshipRecord.class; + } + + /** + * The column ervu_dashboard.citizenship.citizenship_id. + */ + public final TableField CITIZENSHIP_ID = createField(DSL.name("citizenship_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + /** + * The column ervu_dashboard.citizenship.recruit_id. ссылка на + * гражданина (citizen) + */ + public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "ссылка на гражданина (citizen)"); + + /** + * The column ervu_dashboard.citizenship.acquiring_basis. + * основание приобретения гражданства РФ + */ + public final TableField ACQUIRING_BASIS = createField(DSL.name("acquiring_basis"), SQLDataType.CLOB, this, "основание приобретения гражданства РФ"); + + /** + * The column ervu_dashboard.citizenship.acquiring_number. + * номер решения о приобретении гражданства РФ + */ + public final TableField ACQUIRING_NUMBER = createField(DSL.name("acquiring_number"), SQLDataType.VARCHAR(20), this, "номер решения о приобретении гражданства РФ"); + + /** + * The column ervu_dashboard.citizenship.acquiring_date. дата + * решения о приобретении гражданства РФ + */ + public final TableField ACQUIRING_DATE = createField(DSL.name("acquiring_date"), SQLDataType.DATE, this, "дата решения о приобретении гражданства РФ"); + + /** + * The column ervu_dashboard.citizenship.acquiring_authority. + * наименование органа, принявшего решение о приобретении гражданства РФ + */ + public final TableField ACQUIRING_AUTHORITY = createField(DSL.name("acquiring_authority"), SQLDataType.CLOB, this, "наименование органа, принявшего решение о приобретении гражданства РФ"); + + /** + * The column ervu_dashboard.citizenship.renunciation_basis. + * основание выхода гражданства РФ + */ + public final TableField RENUNCIATION_BASIS = createField(DSL.name("renunciation_basis"), SQLDataType.CLOB, this, "основание выхода гражданства РФ"); + + /** + * The column ervu_dashboard.citizenship.renunciation_number. + * номер решения о выходе из гражданства РФ + */ + public final TableField RENUNCIATION_NUMBER = createField(DSL.name("renunciation_number"), SQLDataType.VARCHAR(20), this, "номер решения о выходе из гражданства РФ"); + + /** + * The column ervu_dashboard.citizenship.renunciation_date. + * дата решения о выходе из гражданства РФ + */ + public final TableField RENUNCIATION_DATE = createField(DSL.name("renunciation_date"), SQLDataType.DATE, this, "дата решения о выходе из гражданства РФ"); + + /** + * The column + * ervu_dashboard.citizenship.renunciation_authority. + * наименование органа, принявшего решение о выходе из гражданства РФ + */ + public final TableField RENUNCIATION_AUTHORITY = createField(DSL.name("renunciation_authority"), SQLDataType.CLOB, this, "наименование органа, принявшего решение о выходе из гражданства РФ"); + + private Citizenship(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private Citizenship(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment("сведения о гражданстве РФ"), TableOptions.table(), where); + } + + /** + * Create an aliased ervu_dashboard.citizenship table reference + */ + public Citizenship(String alias) { + this(DSL.name(alias), CITIZENSHIP); + } + + /** + * Create an aliased ervu_dashboard.citizenship table reference + */ + public Citizenship(Name alias) { + this(alias, CITIZENSHIP); + } + + /** + * Create a ervu_dashboard.citizenship table reference + */ + public Citizenship() { + this(DSL.name("citizenship"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD; + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public UniqueKey getPrimaryKey() { + return Keys.PK_CITIZENSHIP; + } + + @Override + public Citizenship as(String alias) { + return new Citizenship(DSL.name(alias), this); + } + + @Override + public Citizenship as(Name alias) { + return new Citizenship(alias, this); + } + + @Override + public Citizenship as(Table alias) { + return new Citizenship(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public Citizenship rename(String name) { + return new Citizenship(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public Citizenship rename(Name name) { + return new Citizenship(name, null); + } + + /** + * Rename this table + */ + @Override + public Citizenship rename(Table name) { + return new Citizenship(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Citizenship where(Condition condition) { + return new Citizenship(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Citizenship where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Citizenship where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Citizenship where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Citizenship where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Citizenship where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Citizenship where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Citizenship where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Citizenship whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Citizenship whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/CitizenshipForeign.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/CitizenshipForeign.java new file mode 100644 index 00000000..317e824e --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/CitizenshipForeign.java @@ -0,0 +1,276 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables; + + +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenshipForeignRecord; + +import java.sql.Date; +import java.util.Collection; +import java.util.UUID; + +import org.jooq.Condition; +import org.jooq.Field; +import org.jooq.Identity; +import org.jooq.Name; +import org.jooq.PlainSQL; +import org.jooq.QueryPart; +import org.jooq.SQL; +import org.jooq.Schema; +import org.jooq.Select; +import org.jooq.Stringly; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.TableOptions; +import org.jooq.UniqueKey; +import org.jooq.impl.DSL; +import org.jooq.impl.SQLDataType; +import org.jooq.impl.TableImpl; + + +/** + * сведения об иностранном гражданстве + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class CitizenshipForeign extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of ervu_dashboard.citizenship_foreign + */ + public static final CitizenshipForeign CITIZENSHIP_FOREIGN = new CitizenshipForeign(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return CitizenshipForeignRecord.class; + } + + /** + * The column + * ervu_dashboard.citizenship_foreign.citizenship_foreign_id. + */ + public final TableField CITIZENSHIP_FOREIGN_ID = createField(DSL.name("citizenship_foreign_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + /** + * The column ervu_dashboard.citizenship_foreign.recruit_id. + * ссылка на гражданина (citizen) + */ + public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "ссылка на гражданина (citizen)"); + + /** + * The column ervu_dashboard.citizenship_foreign.country_name. + * наименование государства + */ + public final TableField COUNTRY_NAME = createField(DSL.name("country_name"), SQLDataType.VARCHAR(255), this, "наименование государства"); + + /** + * The column + * ervu_dashboard.citizenship_foreign.residense_right. наличие + * права проживания в иностранном государстве + */ + public final TableField RESIDENSE_RIGHT = createField(DSL.name("residense_right"), SQLDataType.BOOLEAN.defaultValue(DSL.field(DSL.raw("true"), SQLDataType.BOOLEAN)), this, "наличие права проживания в иностранном государстве"); + + /** + * The column + * ervu_dashboard.citizenship_foreign.residense_right_basis. + * основание получения права на постоянное проживание + */ + public final TableField RESIDENSE_RIGHT_BASIS = createField(DSL.name("residense_right_basis"), SQLDataType.VARCHAR(255), this, "основание получения права на постоянное проживание"); + + /** + * The column + * ervu_dashboard.citizenship_foreign.residense_right_date. + * дата возникновения права на постоянное проживание + */ + public final TableField RESIDENSE_RIGHT_DATE = createField(DSL.name("residense_right_date"), SQLDataType.DATE, this, "дата возникновения права на постоянное проживание"); + + /** + * The column + * ervu_dashboard.citizenship_foreign.citizenship_basis. + * основание получения иностранного гражданства + */ + public final TableField CITIZENSHIP_BASIS = createField(DSL.name("citizenship_basis"), SQLDataType.VARCHAR(255), this, "основание получения иностранного гражданства"); + + /** + * The column + * ervu_dashboard.citizenship_foreign.citizenship_date. дата + * получения иностранного гражданства + */ + public final TableField CITIZENSHIP_DATE = createField(DSL.name("citizenship_date"), SQLDataType.DATE, this, "дата получения иностранного гражданства"); + + private CitizenshipForeign(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private CitizenshipForeign(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment("сведения об иностранном гражданстве"), TableOptions.table(), where); + } + + /** + * Create an aliased ervu_dashboard.citizenship_foreign table + * reference + */ + public CitizenshipForeign(String alias) { + this(DSL.name(alias), CITIZENSHIP_FOREIGN); + } + + /** + * Create an aliased ervu_dashboard.citizenship_foreign table + * reference + */ + public CitizenshipForeign(Name alias) { + this(alias, CITIZENSHIP_FOREIGN); + } + + /** + * Create a ervu_dashboard.citizenship_foreign table reference + */ + public CitizenshipForeign() { + this(DSL.name("citizenship_foreign"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD; + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public UniqueKey getPrimaryKey() { + return Keys.PK_CITIZENSHIP_FOREIGN; + } + + @Override + public CitizenshipForeign as(String alias) { + return new CitizenshipForeign(DSL.name(alias), this); + } + + @Override + public CitizenshipForeign as(Name alias) { + return new CitizenshipForeign(alias, this); + } + + @Override + public CitizenshipForeign as(Table alias) { + return new CitizenshipForeign(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public CitizenshipForeign rename(String name) { + return new CitizenshipForeign(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public CitizenshipForeign rename(Name name) { + return new CitizenshipForeign(name, null); + } + + /** + * Rename this table + */ + @Override + public CitizenshipForeign rename(Table name) { + return new CitizenshipForeign(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public CitizenshipForeign where(Condition condition) { + return new CitizenshipForeign(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public CitizenshipForeign where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public CitizenshipForeign where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public CitizenshipForeign where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public CitizenshipForeign where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public CitizenshipForeign where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public CitizenshipForeign where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public CitizenshipForeign where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public CitizenshipForeign whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public CitizenshipForeign whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenshipForeignRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenshipForeignRecord.java new file mode 100644 index 00000000..e53a2a8b --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenshipForeignRecord.java @@ -0,0 +1,198 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records; + + +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenshipForeign; + +import java.sql.Date; +import java.util.UUID; + +import org.jooq.Record1; +import org.jooq.impl.UpdatableRecordImpl; + + +/** + * сведения об иностранном гражданстве + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class CitizenshipForeignRecord extends UpdatableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for + * ervu_dashboard.citizenship_foreign.citizenship_foreign_id. + */ + public void setCitizenshipForeignId(Long value) { + set(0, value); + } + + /** + * Getter for + * ervu_dashboard.citizenship_foreign.citizenship_foreign_id. + */ + public Long getCitizenshipForeignId() { + return (Long) get(0); + } + + /** + * Setter for ervu_dashboard.citizenship_foreign.recruit_id. + * ссылка на гражданина (citizen) + */ + public void setRecruitId(UUID value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.citizenship_foreign.recruit_id. + * ссылка на гражданина (citizen) + */ + public UUID getRecruitId() { + return (UUID) get(1); + } + + /** + * Setter for ervu_dashboard.citizenship_foreign.country_name. + * наименование государства + */ + public void setCountryName(String value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.citizenship_foreign.country_name. + * наименование государства + */ + public String getCountryName() { + return (String) get(2); + } + + /** + * Setter for + * ervu_dashboard.citizenship_foreign.residense_right. наличие + * права проживания в иностранном государстве + */ + public void setResidenseRight(Boolean value) { + set(3, value); + } + + /** + * Getter for + * ervu_dashboard.citizenship_foreign.residense_right. наличие + * права проживания в иностранном государстве + */ + public Boolean getResidenseRight() { + return (Boolean) get(3); + } + + /** + * Setter for + * ervu_dashboard.citizenship_foreign.residense_right_basis. + * основание получения права на постоянное проживание + */ + public void setResidenseRightBasis(String value) { + set(4, value); + } + + /** + * Getter for + * ervu_dashboard.citizenship_foreign.residense_right_basis. + * основание получения права на постоянное проживание + */ + public String getResidenseRightBasis() { + return (String) get(4); + } + + /** + * Setter for + * ervu_dashboard.citizenship_foreign.residense_right_date. + * дата возникновения права на постоянное проживание + */ + public void setResidenseRightDate(Date value) { + set(5, value); + } + + /** + * Getter for + * ervu_dashboard.citizenship_foreign.residense_right_date. + * дата возникновения права на постоянное проживание + */ + public Date getResidenseRightDate() { + return (Date) get(5); + } + + /** + * Setter for + * ervu_dashboard.citizenship_foreign.citizenship_basis. + * основание получения иностранного гражданства + */ + public void setCitizenshipBasis(String value) { + set(6, value); + } + + /** + * Getter for + * ervu_dashboard.citizenship_foreign.citizenship_basis. + * основание получения иностранного гражданства + */ + public String getCitizenshipBasis() { + return (String) get(6); + } + + /** + * Setter for + * ervu_dashboard.citizenship_foreign.citizenship_date. дата + * получения иностранного гражданства + */ + public void setCitizenshipDate(Date value) { + set(7, value); + } + + /** + * Getter for + * ervu_dashboard.citizenship_foreign.citizenship_date. дата + * получения иностранного гражданства + */ + public Date getCitizenshipDate() { + return (Date) get(7); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 key() { + return (Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached CitizenshipForeignRecord + */ + public CitizenshipForeignRecord() { + super(CitizenshipForeign.CITIZENSHIP_FOREIGN); + } + + /** + * Create a detached, initialised CitizenshipForeignRecord + */ + public CitizenshipForeignRecord(Long citizenshipForeignId, UUID recruitId, String countryName, Boolean residenseRight, String residenseRightBasis, Date residenseRightDate, String citizenshipBasis, Date citizenshipDate) { + super(CitizenshipForeign.CITIZENSHIP_FOREIGN); + + setCitizenshipForeignId(citizenshipForeignId); + setRecruitId(recruitId); + setCountryName(countryName); + setResidenseRight(residenseRight); + setResidenseRightBasis(residenseRightBasis); + setResidenseRightDate(residenseRightDate); + setCitizenshipBasis(citizenshipBasis); + setCitizenshipDate(citizenshipDate); + resetChangedOnNotNull(); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenshipRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenshipRecord.java new file mode 100644 index 00000000..b1baef0f --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenshipRecord.java @@ -0,0 +1,222 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records; + + +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Citizenship; + +import java.sql.Date; +import java.util.UUID; + +import org.jooq.Record1; +import org.jooq.impl.UpdatableRecordImpl; + + +/** + * сведения о гражданстве РФ + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class CitizenshipRecord extends UpdatableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for ervu_dashboard.citizenship.citizenship_id. + */ + public void setCitizenshipId(Long value) { + set(0, value); + } + + /** + * Getter for ervu_dashboard.citizenship.citizenship_id. + */ + public Long getCitizenshipId() { + return (Long) get(0); + } + + /** + * Setter for ervu_dashboard.citizenship.recruit_id. ссылка на + * гражданина (citizen) + */ + public void setRecruitId(UUID value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.citizenship.recruit_id. ссылка на + * гражданина (citizen) + */ + public UUID getRecruitId() { + return (UUID) get(1); + } + + /** + * Setter for ervu_dashboard.citizenship.acquiring_basis. + * основание приобретения гражданства РФ + */ + public void setAcquiringBasis(String value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.citizenship.acquiring_basis. + * основание приобретения гражданства РФ + */ + public String getAcquiringBasis() { + return (String) get(2); + } + + /** + * Setter for ervu_dashboard.citizenship.acquiring_number. + * номер решения о приобретении гражданства РФ + */ + public void setAcquiringNumber(String value) { + set(3, value); + } + + /** + * Getter for ervu_dashboard.citizenship.acquiring_number. + * номер решения о приобретении гражданства РФ + */ + public String getAcquiringNumber() { + return (String) get(3); + } + + /** + * Setter for ervu_dashboard.citizenship.acquiring_date. дата + * решения о приобретении гражданства РФ + */ + public void setAcquiringDate(Date value) { + set(4, value); + } + + /** + * Getter for ervu_dashboard.citizenship.acquiring_date. дата + * решения о приобретении гражданства РФ + */ + public Date getAcquiringDate() { + return (Date) get(4); + } + + /** + * Setter for ervu_dashboard.citizenship.acquiring_authority. + * наименование органа, принявшего решение о приобретении гражданства РФ + */ + public void setAcquiringAuthority(String value) { + set(5, value); + } + + /** + * Getter for ervu_dashboard.citizenship.acquiring_authority. + * наименование органа, принявшего решение о приобретении гражданства РФ + */ + public String getAcquiringAuthority() { + return (String) get(5); + } + + /** + * Setter for ervu_dashboard.citizenship.renunciation_basis. + * основание выхода гражданства РФ + */ + public void setRenunciationBasis(String value) { + set(6, value); + } + + /** + * Getter for ervu_dashboard.citizenship.renunciation_basis. + * основание выхода гражданства РФ + */ + public String getRenunciationBasis() { + return (String) get(6); + } + + /** + * Setter for ervu_dashboard.citizenship.renunciation_number. + * номер решения о выходе из гражданства РФ + */ + public void setRenunciationNumber(String value) { + set(7, value); + } + + /** + * Getter for ervu_dashboard.citizenship.renunciation_number. + * номер решения о выходе из гражданства РФ + */ + public String getRenunciationNumber() { + return (String) get(7); + } + + /** + * Setter for ervu_dashboard.citizenship.renunciation_date. + * дата решения о выходе из гражданства РФ + */ + public void setRenunciationDate(Date value) { + set(8, value); + } + + /** + * Getter for ervu_dashboard.citizenship.renunciation_date. + * дата решения о выходе из гражданства РФ + */ + public Date getRenunciationDate() { + return (Date) get(8); + } + + /** + * Setter for + * ervu_dashboard.citizenship.renunciation_authority. + * наименование органа, принявшего решение о выходе из гражданства РФ + */ + public void setRenunciationAuthority(String value) { + set(9, value); + } + + /** + * Getter for + * ervu_dashboard.citizenship.renunciation_authority. + * наименование органа, принявшего решение о выходе из гражданства РФ + */ + public String getRenunciationAuthority() { + return (String) get(9); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 key() { + return (Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached CitizenshipRecord + */ + public CitizenshipRecord() { + super(Citizenship.CITIZENSHIP); + } + + /** + * Create a detached, initialised CitizenshipRecord + */ + public CitizenshipRecord(Long citizenshipId, UUID recruitId, String acquiringBasis, String acquiringNumber, Date acquiringDate, String acquiringAuthority, String renunciationBasis, String renunciationNumber, Date renunciationDate, String renunciationAuthority) { + super(Citizenship.CITIZENSHIP); + + setCitizenshipId(citizenshipId); + setRecruitId(recruitId); + setAcquiringBasis(acquiringBasis); + setAcquiringNumber(acquiringNumber); + setAcquiringDate(acquiringDate); + setAcquiringAuthority(acquiringAuthority); + setRenunciationBasis(renunciationBasis); + setRenunciationNumber(renunciationNumber); + setRenunciationDate(renunciationDate); + setRenunciationAuthority(renunciationAuthority); + resetChangedOnNotNull(); + } +} diff --git a/resources/src/main/resources/business-model/citizencard.page b/resources/src/main/resources/business-model/citizencard.page index 1aae338a..61726870 100644 --- a/resources/src/main/resources/business-model/citizencard.page +++ b/resources/src/main/resources/business-model/citizencard.page @@ -41,7 +41,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"3":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"citizen":{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"drivers_licence1":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"drivers_licence":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"citizen","refToEntityName":"recruitment","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"drivers_licence","refToColumns":[{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence","name":"tractor_driver"},"operation":"EQUAL","typeCode":"CONST","values":["false"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"drivers_licence1","refToColumns":[{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence1","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence1","name":"tractor_driver"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]}}],[null,null,null,null],[null,null,null,null],[null,null,null,null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"3":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"4":{"tableName":"citizenship","schemaName":"ervu_dashboard","x":102.0,"y":153.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"citizenship","schemaName":"ervu_dashboard","x":102.0,"y":153.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"citizen":{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"citizenship":{"tableName":"citizenship","schemaName":"ervu_dashboard","x":102.0,"y":153.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"drivers_licence1":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"drivers_licence":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"citizen","refToEntityName":"recruitment","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"drivers_licence","refToColumns":[{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence","name":"tractor_driver"},"operation":"EQUAL","typeCode":"CONST","values":["false"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"drivers_licence1","refToColumns":[{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence1","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence1","name":"tractor_driver"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"citizenship","refToColumns":[{"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null,null,null,null],[null,null,null,null,null],[null,null,null,null,null],[null,null,null,null,null]],"mainNodeIndex":0} @@ -15511,6 +15511,7 @@ cb814ffd-638b-4901-9d9f-ec3f5838d159 Сведения о состоянии зоровья, о присвоении спортивных разрядов и званий true + false false @@ -17860,12 +17861,6 @@ false - - disabled - - true - - heading @@ -17883,6 +17878,7 @@ bc82d1bf-8f7b-4d2b-bfdc-be633ce53893 Vbox true +false false @@ -19083,16 +19079,9 @@ 123aa48f-2065-47ad-b4f2-4b2a35a7d313 Сведения о гражданстве true - false false - - disabled - - true - - heading @@ -19250,12 +19239,11 @@ false - + d7d54cfb-26b5-4dba-b56f-b6247183c24d - 6b5d4505-3913-44fd-a936-9492ed0b6195 + 0ed0dda6-faae-4e41-a957-a2e92435b408 Hbox true - false false @@ -19316,12 +19304,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"acquiring_basis"} @@ -19381,17 +19368,42 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"acquiring_number"} + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 6b5d4505-3913-44fd-a936-9492ed0b6195 + Hbox + true + false + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + c0ffd529-d2a3-47d0-a340-1db9a84b35a1 + Основание приобретения гражданства РФ + false + true + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + b8b99f48-367c-4744-aab4-6f3387e4f57b + Номер решения о приобретении гражданства РФ + false + true + ba24d307-0b91-4299-ba82-9d0b52384ff2 af8a929c-1879-4f0c-890f-435fb93aa552 @@ -19446,12 +19458,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"acquiring_date"} @@ -19511,12 +19522,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"acquiring_authority"} @@ -19528,7 +19538,6 @@ 327af2fc-5966-45a3-a6d0-1adaf498649c Hbox true - false false @@ -19589,12 +19598,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"renunciation_basis"} @@ -19654,17 +19662,42 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"renunciation_number"} + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 55feffdd-e47e-4c8d-8380-7478c82625c1 + Дата решения о выходе из гражданства РФ + false + true + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 6d988204-fea9-401f-abac-fd96cb02c766 + Наименование органа, принявшего решение о выходе из гражданства РФ + false + true + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 7c88fa47-2d5b-4b02-a5dd-77fe81708fc0 + Hbox + true + false + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 55feffdd-e47e-4c8d-8380-7478c82625c1 @@ -19719,12 +19752,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"renunciation_date"} @@ -19784,12 +19816,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"renunciation_authority"} @@ -19930,430 +19961,351 @@ false - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - 551ba182-2369-4442-a0c8-d45226043bc2 - Hbox + + 27912fc5-0be7-4d4c-ae46-a82979253599 + 11a431f3-038f-4471-9270-7ca0e4c5de5b + Filter group true false - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 75a93b25-23ac-45b6-b58a-9f9415c72425 - Наличие права проживания в иностранном государстве + + + + liveFilter + + true + + + + visible + + false + + + + + + + + filterable + + {"objectId":"b31d5075-d3ea-4335-9afa-e3645008917c","packageName":"rpc","className":"GridRpcService","type":"JAVA"} + + + + + + + + + + 4d981f15-5535-45f7-882b-3647b251ad05 + e9dfe6ff-25ba-4908-98d0-17083259f7ed + citizen_id (filter) false false - initialValue + label - null + "citizen_id" + + + + - label + operation + + "EQUAL" + + + + + + + + columnForFilter + + {"schema":"ervu_dashboard","table":"citizenship_foreign","entity":"citizenship_foreign","name":"recruit_id"} + + + + + + + + + + + + 16071adb-3bdf-4c33-b29b-886876016415 + b31d5075-d3ea-4335-9afa-e3645008917c + Grid_иностранное гражданство + true + false + false + + + + autoStretchColumns + + true + + + + + + + + gridService + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"citizenship_foreign","schemaName":"ervu_dashboard","x":190.0,"y":263.0,"alias":"citizenship_foreign","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"citizenship_foreign","schemaName":"ervu_dashboard","x":190.0,"y":263.0,"alias":"citizenship_foreign","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"citizenship_foreign":{"tableName":"citizenship_foreign","schemaName":"ervu_dashboard","x":190.0,"y":263.0,"alias":"citizenship_foreign","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + + + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 8ed6c130-6c28-4bcb-99cc-7b69fa514be2 + Наличие права проживания в иностранном государстве + false + false + + + + + displayName "Наличие права проживания в иностранном государстве" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - - columnForSave + field - {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"acquired_citizenship"} + {"schema":"ervu_dashboard","table":"citizenship_foreign","entity":"citizenship_foreign","name":"residense_right"} - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 37706944-74a7-4ef2-947b-0777a408af27 + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + e254e728-b508-491d-9d14-1fdde7dff1db Наименование государства false false - + + - initialValue - - null - - - - label + displayName "Наименование государства" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"citizenship_foreign","entity":"citizenship_foreign","name":"country_name"} + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 7b289d26-aff6-4d84-a454-7886624183fd + Основание получения права на постоянное проживание + false + false + + + + + displayName + + "Основание получения права на постоянное проживание" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"citizenship_foreign","entity":"citizenship_foreign","name":"residense_right_basis"} + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 2dbd3d95-a0c9-4da9-9a5e-4f13dafa66fc + Дата возникновения права на постоянное проживание + false + false + + + + valueFormatter + + + DateFormatter + component.grid.formatters + + + + + + + + + displayName + + "Дата возникновения права на постоянное проживание" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"citizenship_foreign","entity":"citizenship_foreign","name":"residense_right_date"} + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + ae557b88-cf36-4cdf-b99f-8b874f4b6702 + Основание получения иностранного гражданства + false + false + + + + + displayName + + "Основание получения иностранного гражданства" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"citizenship_foreign","entity":"citizenship_foreign","name":"citizenship_basis"} + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 6e2bedb9-88f9-40ed-984f-3fcb42e3e507 + Дата получения иностранного гражданства + false + false + + + + valueFormatter + + + DateFormatter + component.grid.formatters + + + + + + + + + displayName + + "Дата получения иностранного гражданства" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"citizenship_foreign","entity":"citizenship_foreign","name":"citizenship_date"} + + + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 551ba182-2369-4442-a0c8-d45226043bc2 + Hbox + true + true d7d54cfb-26b5-4dba-b56f-b6247183c24d 958ddfd3-12a6-4be3-9b18-90a907faf20e Hbox true - false - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - ea5ae056-c741-45ac-be03-acdbfab7396f - Основание получения права на постоянное проживание - false - false - - - - initialValue - - null - - - - label - - "Основание получения права на постоянное проживание" - - - - textFormatter - - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - - columnForSave - - null - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - dc96861f-ff45-460d-a38b-c344995f6a64 - Дата возникновения права на постоянное проживание - false - false - - - - initialValue - - null - - - - label - - "Дата возникновения права на постоянное проживание" - - - - textFormatter - - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - - columnForSave - - null - - - - - + true d7d54cfb-26b5-4dba-b56f-b6247183c24d e1b3161d-e94e-40ed-a0b5-4aea5c28cfe2 Hbox true - false - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 8499b2ee-51fc-43fc-83e6-e668e3871c58 - Основание получения иностранного гражданства - false - false - - - - initialValue - - null - - - - label - - "Основание получения иностранного гражданства" - - - - textFormatter - - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - - columnForSave - - null - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 3c3f02cd-883c-48a2-83cf-7bb52d81f6ea - Дата получения иностранного гражданства - false - false - - - - initialValue - - null - - - - label - - "Дата получения иностранного гражданства" - - - - textFormatter - - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - - columnForSave - - null - - - - - + true ba24d307-0b91-4299-ba82-9d0b52384ff2 @@ -20564,6 +20516,13 @@ + + +27912fc5-0be7-4d4c-ae46-a82979253599 +11a431f3-038f-4471-9270-7ca0e4c5de5b +Filter group +true +true ba24d307-0b91-4299-ba82-9d0b52384ff2 @@ -30462,6 +30421,56 @@ + + + + + + behavior + + {"objectId":"e9dfe6ff-25ba-4908-98d0-17083259f7ed","packageName":"component.field","className":"TextField","type":"TS"} + + + + method + + "setValue" + + + + value + + + + objectValue + + + + argument + + null + + + + behavior + + {"objectId":"55e4b61a-3031-4221-a732-d31a727d89f9","packageName":"component","className":"Text","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + From 873e56b49c36ce2ebe2b9966eb3fc045e85b4b36 Mon Sep 17 00:00:00 2001 From: Makarova Elena Date: Tue, 24 Sep 2024 16:17:16 +0300 Subject: [PATCH 35/68] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=D0=B0=20=D0=B1=D0=B4,=20=D0=BD=D0=B0=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=B8=D0=BB=D0=B0=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D1=82=D1=83=20=D0=B4=D0=B5=D1=80=D0=B5=D0=B2=D0=BE?= =?UTF-8?q?=20=D1=81=D1=83=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tables/CitizenshipForeign.java | 7 - .../ervu_dashboard/tables/Recruitment.java | 14 - .../records/CitizenshipForeignRecord.java | 37 +-- .../db_beans/recruitment_campaign/Keys.java | 3 +- .../recruitment_campaign/tables/Appeals.java | 81 +---- .../tables/records/AppealsRecord.java | 97 +++--- .../resources/business-model/appeals.page | 142 +++------ .../resources/business-model/citizen.page | 135 ++------ .../resources/business-model/citizencard.page | 79 +---- .../main/resources/business-model/main.page | 5 + .../business-model/milregistration.page | 289 +++++++----------- .../business-model/notregistered.page | 215 +++++-------- .../resources/business-model/ratings.page | 122 ++------ .../resources/business-model/recruitment.page | 192 +++--------- .../Всего на учете (2й уровень).page | 169 +++------- 15 files changed, 437 insertions(+), 1150 deletions(-) diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/CitizenshipForeign.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/CitizenshipForeign.java index 317e824e..1b42774c 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/CitizenshipForeign.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/CitizenshipForeign.java @@ -70,13 +70,6 @@ public class CitizenshipForeign extends TableImpl { */ public final TableField COUNTRY_NAME = createField(DSL.name("country_name"), SQLDataType.VARCHAR(255), this, "наименование государства"); - /** - * The column - * ervu_dashboard.citizenship_foreign.residense_right. наличие - * права проживания в иностранном государстве - */ - public final TableField RESIDENSE_RIGHT = createField(DSL.name("residense_right"), SQLDataType.BOOLEAN.defaultValue(DSL.field(DSL.raw("true"), SQLDataType.BOOLEAN)), this, "наличие права проживания в иностранном государстве"); - /** * The column * ervu_dashboard.citizenship_foreign.residense_right_basis. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Recruitment.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Recruitment.java index 8a8b9a66..b87f5409 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Recruitment.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Recruitment.java @@ -9,7 +9,6 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.RecruitmentRecord; import ervu_dashboard.ervu_dashboard.db_beans.ratings.tables.AppearSubppoena.AppearSubppoenaPath; import ervu_dashboard.ervu_dashboard.db_beans.ratings.tables.ConscriptionInfo.ConscriptionInfoPath; -import ervu_dashboard.ervu_dashboard.db_beans.recruitment_campaign.tables.Appeals.AppealsPath; import ervu_dashboard.ervu_dashboard.db_beans.recruitment_campaign.tables.PostponementInfo.PostponementInfoPath; import java.util.Collection; @@ -189,19 +188,6 @@ public class Recruitment extends TableImpl { return _conscriptionInfo; } - private transient AppealsPath _appeals; - - /** - * Get the implicit to-many join path to the - * recruitment_campaign.appeals table - */ - public AppealsPath appeals() { - if (_appeals == null) - _appeals = new AppealsPath(this, null, ervu_dashboard.ervu_dashboard.db_beans.recruitment_campaign.Keys.APPEALS__RC_APPEALS_FK1.getInverseKey()); - - return _appeals; - } - private transient PostponementInfoPath _postponementInfo; /** diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenshipForeignRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenshipForeignRecord.java index e53a2a8b..cf6cfd78 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenshipForeignRecord.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenshipForeignRecord.java @@ -69,31 +69,13 @@ public class CitizenshipForeignRecord extends UpdatableRecordImplervu_dashboard.citizenship_foreign.residense_right. наличие - * права проживания в иностранном государстве - */ - public void setResidenseRight(Boolean value) { - set(3, value); - } - - /** - * Getter for - * ervu_dashboard.citizenship_foreign.residense_right. наличие - * права проживания в иностранном государстве - */ - public Boolean getResidenseRight() { - return (Boolean) get(3); - } - /** * Setter for * ervu_dashboard.citizenship_foreign.residense_right_basis. * основание получения права на постоянное проживание */ public void setResidenseRightBasis(String value) { - set(4, value); + set(3, value); } /** @@ -102,7 +84,7 @@ public class CitizenshipForeignRecord extends UpdatableRecordImpl PK_APPEAL = Internal.createUniqueKey(Appeals.APPEALS, DSL.name("pk_appeal"), new TableField[] { Appeals.APPEALS.ID_APPEAL }, true); + public static final UniqueKey APPEALS_PKEY = Internal.createUniqueKey(Appeals.APPEALS, DSL.name("appeals_pkey"), new TableField[] { Appeals.APPEALS.RECORDING_DATE, Appeals.APPEALS.SPRING_AUTUMN, Appeals.APPEALS.RECRUITMENT_ID }, true); public static final UniqueKey PK_POSTPONEMENT_INFO = Internal.createUniqueKey(PostponementInfo.POSTPONEMENT_INFO, DSL.name("pk_postponement_info"), new TableField[] { PostponementInfo.POSTPONEMENT_INFO.POSTPONEMENT_INFO_ID }, true); public static final UniqueKey SUBPOENAS_PKEY = Internal.createUniqueKey(Subpoenas.SUBPOENAS, DSL.name("subpoenas_pkey"), new TableField[] { Subpoenas.SUBPOENAS.SPRING_AUTUMN, Subpoenas.SUBPOENAS.RECRUITMENT_ID, Subpoenas.SUBPOENAS.RECORDING_DATE }, true); @@ -39,6 +39,5 @@ public class Keys { // FOREIGN KEY definitions // ------------------------------------------------------------------------- - public static final ForeignKey APPEALS__RC_APPEALS_FK1 = Internal.createForeignKey(Appeals.APPEALS, DSL.name("rc_appeals_fk1"), new TableField[] { Appeals.APPEALS.RECRUITMENT_ID }, ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys.RECRUITMENT_PKEY, new TableField[] { Recruitment.RECRUITMENT.ID }, true); public static final ForeignKey POSTPONEMENT_INFO__POSTPONEMENT_INFO_FK1 = Internal.createForeignKey(PostponementInfo.POSTPONEMENT_INFO, DSL.name("postponement_info_fk1"), new TableField[] { PostponementInfo.POSTPONEMENT_INFO.RECRUITMENT_ID }, ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys.RECRUITMENT_PKEY, new TableField[] { Recruitment.RECRUITMENT.ID }, true); } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/Appeals.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/Appeals.java index 9b3657c3..c372d5e9 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/Appeals.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/Appeals.java @@ -4,27 +4,19 @@ package ervu_dashboard.ervu_dashboard.db_beans.recruitment_campaign.tables; -import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Recruitment.RecruitmentPath; import ervu_dashboard.ervu_dashboard.db_beans.recruitment_campaign.Keys; import ervu_dashboard.ervu_dashboard.db_beans.recruitment_campaign.RecruitmentCampaign; import ervu_dashboard.ervu_dashboard.db_beans.recruitment_campaign.tables.records.AppealsRecord; import java.math.BigDecimal; import java.sql.Date; -import java.util.Arrays; import java.util.Collection; -import java.util.List; import org.jooq.Condition; import org.jooq.Field; -import org.jooq.ForeignKey; -import org.jooq.Identity; -import org.jooq.InverseForeignKey; import org.jooq.Name; -import org.jooq.Path; import org.jooq.PlainSQL; import org.jooq.QueryPart; -import org.jooq.Record; import org.jooq.SQL; import org.jooq.Schema; import org.jooq.Select; @@ -60,15 +52,10 @@ public class Appeals extends TableImpl { } /** - * The column recruitment_campaign.appeals.id_appeal. - */ - public final TableField ID_APPEAL = createField(DSL.name("id_appeal"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); - - /** - * The column recruitment_campaign.appeals.total_appeal. + * The column recruitment_campaign.appeals.total_appeals. * Получено жалоб */ - public final TableField TOTAL_APPEAL = createField(DSL.name("total_appeal"), SQLDataType.NUMERIC, this, "Получено жалоб"); + public final TableField TOTAL_APPEALS = createField(DSL.name("total_appeals"), SQLDataType.NUMERIC, this, "Получено жалоб"); /** * The column recruitment_campaign.appeals.resolved. Решено @@ -98,7 +85,7 @@ public class Appeals extends TableImpl { * The column recruitment_campaign.appeals.recording_date. Дата * записи */ - public final TableField RECORDING_DATE = createField(DSL.name("recording_date"), SQLDataType.DATE.defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.DATE)), this, "Дата записи"); + public final TableField RECORDING_DATE = createField(DSL.name("recording_date"), SQLDataType.DATE.nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.DATE)), this, "Дата записи"); /** * The column recruitment_campaign.appeals.resolved_percent. @@ -116,12 +103,12 @@ public class Appeals extends TableImpl { /** * The column recruitment_campaign.appeals.recruitment_id. */ - public final TableField RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.CHAR(36), this, ""); + public final TableField RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.CHAR(36).nullable(false), this, ""); /** - * The column recruitment_campaign.appeals.testspring_autumn. + * The column recruitment_campaign.appeals.spring_autumn. */ - public final TableField TESTSPRING_AUTUMN = createField(DSL.name("testspring_autumn"), SQLDataType.CHAR(36), this, ""); + public final TableField SPRING_AUTUMN = createField(DSL.name("spring_autumn"), SQLDataType.VARCHAR.nullable(false), this, ""); private Appeals(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); @@ -154,68 +141,14 @@ public class Appeals extends TableImpl { this(DSL.name("appeals"), null); } - public Appeals(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath, APPEALS); - } - - /** - * A subtype implementing {@link Path} for simplified path-based joins. - */ - public static class AppealsPath extends Appeals implements Path { - public AppealsPath(Table path, ForeignKey childPath, InverseForeignKey parentPath) { - super(path, childPath, parentPath); - } - private AppealsPath(Name alias, Table aliased) { - super(alias, aliased); - } - - @Override - public AppealsPath as(String alias) { - return new AppealsPath(DSL.name(alias), this); - } - - @Override - public AppealsPath as(Name alias) { - return new AppealsPath(alias, this); - } - - @Override - public AppealsPath as(Table alias) { - return new AppealsPath(alias.getQualifiedName(), this); - } - } - @Override public Schema getSchema() { return aliased() ? null : RecruitmentCampaign.RECRUITMENT_CAMPAIGN; } - @Override - public Identity getIdentity() { - return (Identity) super.getIdentity(); - } - @Override public UniqueKey getPrimaryKey() { - return Keys.PK_APPEAL; - } - - @Override - public List> getReferences() { - return Arrays.asList(Keys.APPEALS__RC_APPEALS_FK1); - } - - private transient RecruitmentPath _recruitment; - - /** - * Get the implicit join path to the ervu_dashboard.recruitment - * table. - */ - public RecruitmentPath recruitment() { - if (_recruitment == null) - _recruitment = new RecruitmentPath(this, Keys.APPEALS__RC_APPEALS_FK1, null); - - return _recruitment; + return Keys.APPEALS_PKEY; } @Override diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/records/AppealsRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/records/AppealsRecord.java index 5bd16443..081752a8 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/records/AppealsRecord.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/records/AppealsRecord.java @@ -9,7 +9,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.recruitment_campaign.tables.Appeal import java.math.BigDecimal; import java.sql.Date; -import org.jooq.Record1; +import org.jooq.Record3; import org.jooq.impl.UpdatableRecordImpl; @@ -22,47 +22,33 @@ public class AppealsRecord extends UpdatableRecordImpl { private static final long serialVersionUID = 1L; /** - * Setter for recruitment_campaign.appeals.id_appeal. + * Setter for recruitment_campaign.appeals.total_appeals. + * Получено жалоб */ - public void setIdAppeal(Long value) { + public void setTotalAppeals(BigDecimal value) { set(0, value); } /** - * Getter for recruitment_campaign.appeals.id_appeal. - */ - public Long getIdAppeal() { - return (Long) get(0); - } - - /** - * Setter for recruitment_campaign.appeals.total_appeal. + * Getter for recruitment_campaign.appeals.total_appeals. * Получено жалоб */ - public void setTotalAppeal(BigDecimal value) { - set(1, value); - } - - /** - * Getter for recruitment_campaign.appeals.total_appeal. - * Получено жалоб - */ - public BigDecimal getTotalAppeal() { - return (BigDecimal) get(1); + public BigDecimal getTotalAppeals() { + return (BigDecimal) get(0); } /** * Setter for recruitment_campaign.appeals.resolved. Решено */ public void setResolved(BigDecimal value) { - set(2, value); + set(1, value); } /** * Getter for recruitment_campaign.appeals.resolved. Решено */ public BigDecimal getResolved() { - return (BigDecimal) get(2); + return (BigDecimal) get(1); } /** @@ -70,7 +56,7 @@ public class AppealsRecord extends UpdatableRecordImpl { * решено */ public void setNotResolved(BigDecimal value) { - set(3, value); + set(2, value); } /** @@ -78,7 +64,7 @@ public class AppealsRecord extends UpdatableRecordImpl { * решено */ public BigDecimal getNotResolved() { - return (BigDecimal) get(3); + return (BigDecimal) get(2); } /** @@ -87,7 +73,7 @@ public class AppealsRecord extends UpdatableRecordImpl { * решения */ public void setAverageConsideration(BigDecimal value) { - set(4, value); + set(3, value); } /** @@ -96,7 +82,7 @@ public class AppealsRecord extends UpdatableRecordImpl { * решения */ public BigDecimal getAverageConsideration() { - return (BigDecimal) get(4); + return (BigDecimal) get(3); } /** @@ -104,7 +90,7 @@ public class AppealsRecord extends UpdatableRecordImpl { * Оценка удовлетворенности */ public void setAverageRating(BigDecimal value) { - set(5, value); + set(4, value); } /** @@ -112,7 +98,7 @@ public class AppealsRecord extends UpdatableRecordImpl { * Оценка удовлетворенности */ public BigDecimal getAverageRating() { - return (BigDecimal) get(5); + return (BigDecimal) get(4); } /** @@ -120,7 +106,7 @@ public class AppealsRecord extends UpdatableRecordImpl { * записи */ public void setRecordingDate(Date value) { - set(6, value); + set(5, value); } /** @@ -128,7 +114,7 @@ public class AppealsRecord extends UpdatableRecordImpl { * записи */ public Date getRecordingDate() { - return (Date) get(6); + return (Date) get(5); } /** @@ -136,7 +122,7 @@ public class AppealsRecord extends UpdatableRecordImpl { * Процент решенных */ public void setResolvedPercent(BigDecimal value) { - set(7, value); + set(6, value); } /** @@ -144,7 +130,7 @@ public class AppealsRecord extends UpdatableRecordImpl { * Процент решенных */ public BigDecimal getResolvedPercent() { - return (BigDecimal) get(7); + return (BigDecimal) get(6); } /** @@ -153,7 +139,7 @@ public class AppealsRecord extends UpdatableRecordImpl { * не решенных */ public void setNotResolvedPercent(BigDecimal value) { - set(8, value); + set(7, value); } /** @@ -162,44 +148,44 @@ public class AppealsRecord extends UpdatableRecordImpl { * не решенных */ public BigDecimal getNotResolvedPercent() { - return (BigDecimal) get(8); + return (BigDecimal) get(7); } /** * Setter for recruitment_campaign.appeals.recruitment_id. */ public void setRecruitmentId(String value) { - set(9, value); + set(8, value); } /** * Getter for recruitment_campaign.appeals.recruitment_id. */ public String getRecruitmentId() { + return (String) get(8); + } + + /** + * Setter for recruitment_campaign.appeals.spring_autumn. + */ + public void setSpringAutumn(String value) { + set(9, value); + } + + /** + * Getter for recruitment_campaign.appeals.spring_autumn. + */ + public String getSpringAutumn() { return (String) get(9); } - /** - * Setter for recruitment_campaign.appeals.testspring_autumn. - */ - public void setTestspringAutumn(String value) { - set(10, value); - } - - /** - * Getter for recruitment_campaign.appeals.testspring_autumn. - */ - public String getTestspringAutumn() { - return (String) get(10); - } - // ------------------------------------------------------------------------- // Primary key information // ------------------------------------------------------------------------- @Override - public Record1 key() { - return (Record1) super.key(); + public Record3 key() { + return (Record3) super.key(); } // ------------------------------------------------------------------------- @@ -216,11 +202,10 @@ public class AppealsRecord extends UpdatableRecordImpl { /** * Create a detached, initialised AppealsRecord */ - public AppealsRecord(Long idAppeal, BigDecimal totalAppeal, BigDecimal resolved, BigDecimal notResolved, BigDecimal averageConsideration, BigDecimal averageRating, Date recordingDate, BigDecimal resolvedPercent, BigDecimal notResolvedPercent, String recruitmentId, String testspringAutumn) { + public AppealsRecord(BigDecimal totalAppeals, BigDecimal resolved, BigDecimal notResolved, BigDecimal averageConsideration, BigDecimal averageRating, Date recordingDate, BigDecimal resolvedPercent, BigDecimal notResolvedPercent, String recruitmentId, String springAutumn) { super(Appeals.APPEALS); - setIdAppeal(idAppeal); - setTotalAppeal(totalAppeal); + setTotalAppeals(totalAppeals); setResolved(resolved); setNotResolved(notResolved); setAverageConsideration(averageConsideration); @@ -229,7 +214,7 @@ public class AppealsRecord extends UpdatableRecordImpl { setResolvedPercent(resolvedPercent); setNotResolvedPercent(notResolvedPercent); setRecruitmentId(recruitmentId); - setTestspringAutumn(testspringAutumn); + setSpringAutumn(springAutumn); resetChangedOnNotNull(); } } diff --git a/resources/src/main/resources/business-model/appeals.page b/resources/src/main/resources/business-model/appeals.page index 2fb3d667..e4bc9591 100644 --- a/resources/src/main/resources/business-model/appeals.page +++ b/resources/src/main/resources/business-model/appeals.page @@ -211,21 +211,19 @@ ef6b1859-1146-4e08-9b35-19c3af856acf Combo box false + true + + + 630accd8-3776-4fc1-a87c-3a0f05274678 + ecdabc20-20d2-473f-886a-e3e53a4cb4f1 + DropdownTreeView + false false - + + - placeholder - -"Российская Федерация" - - - - - - - - comboBoxService + treeItemService @@ -235,30 +233,19 @@ - columnSorts + domainIdColumn - - - - - field - -{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"sort"} - - - - sortOrder - -"ASC" - - - - - + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"idm_id"} - displayColumn + idColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + + labelColumn {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"} @@ -270,80 +257,23 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":190.0,"y":206.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":190.0,"y":206.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":190.0,"y":206.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - - - - uniqueResult - - false + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + parentIdColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"parent_id"} + + - - - - - defaultValueColumn - -{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - - loadType - -"BY_COLUMN" - - - - service - - - - entityColumn - - {"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - - loadDao - - - - graph - - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - - - - - DefaultLoadDao - database.dao - - - - - - DefaultValueByEntityGraphServiceV2 - service.loading - - - - - - - false - - - false - bce312bd-0c82-45e5-89dc-a1af90431c18 @@ -630,7 +560,7 @@ behavior - {"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"ecdabc20-20d2-473f-886a-e3e53a4cb4f1","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -663,7 +593,7 @@ behavior - {"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"ecdabc20-20d2-473f-886a-e3e53a4cb4f1","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -1818,7 +1748,7 @@ behavior - {"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"ecdabc20-20d2-473f-886a-e3e53a4cb4f1","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -1851,7 +1781,7 @@ behavior - {"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"ecdabc20-20d2-473f-886a-e3e53a4cb4f1","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -2327,7 +2257,7 @@ behavior - {"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"ecdabc20-20d2-473f-886a-e3e53a4cb4f1","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -2360,7 +2290,7 @@ behavior - {"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"ecdabc20-20d2-473f-886a-e3e53a4cb4f1","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -3696,7 +3626,7 @@ behavior - {"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"ecdabc20-20d2-473f-886a-e3e53a4cb4f1","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -3729,7 +3659,7 @@ behavior - {"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"ecdabc20-20d2-473f-886a-e3e53a4cb4f1","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -4255,7 +4185,7 @@ behavior - {"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"ecdabc20-20d2-473f-886a-e3e53a4cb4f1","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -4288,7 +4218,7 @@ behavior - {"objectId":"ef6b1859-1146-4e08-9b35-19c3af856acf","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"ecdabc20-20d2-473f-886a-e3e53a4cb4f1","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} diff --git a/resources/src/main/resources/business-model/citizen.page b/resources/src/main/resources/business-model/citizen.page index 914d7859..ab48e9d3 100644 --- a/resources/src/main/resources/business-model/citizen.page +++ b/resources/src/main/resources/business-model/citizen.page @@ -251,21 +251,19 @@ 47490b00-a300-41e5-9ad6-a9dcfde20e18 Combo box false + true + + + 630accd8-3776-4fc1-a87c-3a0f05274678 + a82fddb1-5654-4b24-a337-c164f22af58f + DropdownTreeView + false false - + + - placeholder - -"Российская Федерация" - - - - - - - - comboBoxService + treeItemService @@ -275,30 +273,19 @@ - columnSorts + domainIdColumn - - - - - field - -{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"sort"} - - - - sortOrder - -"ASC" - - - - - + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"idm_id"} - displayColumn + idColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + + labelColumn {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"} @@ -310,80 +297,23 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":226.0,"y":205.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":226.0,"y":205.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":226.0,"y":205.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - - - - uniqueResult - - false + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + parentIdColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"parent_id"} + + - - - - - defaultValueColumn - -{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - - loadType - -"BY_COLUMN" - - - - service - - - - entityColumn - - {"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - - loadDao - - - - graph - - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - - - - - DefaultLoadDao - database.dao - - - - - - DefaultValueByEntityGraphServiceV2 - service.loading - - - - - - - false - - - false - bce312bd-0c82-45e5-89dc-a1af90431c18 @@ -397,6 +327,7 @@ 4cf989ce-b7fb-4e56-b6b1-38dc1a9149ac Горизонтальный контейнер true + false false @@ -601,7 +532,6 @@ 922d5930-d22f-4b74-9912-17543cbc8493 VB - фильтры true - false false @@ -626,6 +556,7 @@ fa7ae3c8-ea04-4655-8e67-34adece37342 HB - заголовок true + false false @@ -1424,7 +1355,7 @@ behavior - {"objectId":"47490b00-a300-41e5-9ad6-a9dcfde20e18","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a82fddb1-5654-4b24-a337-c164f22af58f","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -1470,13 +1401,13 @@ behavior - {"objectId":"47490b00-a300-41e5-9ad6-a9dcfde20e18","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a82fddb1-5654-4b24-a337-c164f22af58f","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} method - "getValue" + "getBusinessId" @@ -1521,7 +1452,7 @@ behavior - {"objectId":"47490b00-a300-41e5-9ad6-a9dcfde20e18","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"a82fddb1-5654-4b24-a337-c164f22af58f","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -1611,7 +1542,7 @@ behavior -{"objectId":"47490b00-a300-41e5-9ad6-a9dcfde20e18","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"a82fddb1-5654-4b24-a337-c164f22af58f","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} diff --git a/resources/src/main/resources/business-model/citizencard.page b/resources/src/main/resources/business-model/citizencard.page index 61726870..a51dc981 100644 --- a/resources/src/main/resources/business-model/citizencard.page +++ b/resources/src/main/resources/business-model/citizencard.page @@ -93,7 +93,6 @@ bee73e63-b4c0-4cd7-b2f1-2a9d0bc919e8 Горизонтальный контейнер true - false false @@ -375,6 +374,7 @@ c79fdd00-a749-4b79-9a0e-ef89fb276c96 Горизонтальный контейнер true + false false @@ -593,7 +593,6 @@ 67120d9a-602f-44a1-9ede-88a2e797a295 Вертикальный контейнер - сведения о гражданине true - false false @@ -1579,7 +1578,6 @@ 999acadc-8a62-45b9-ae62-9d653411fdb6 Личные сведения true - false false @@ -19390,20 +19388,6 @@ - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - c0ffd529-d2a3-47d0-a340-1db9a84b35a1 - Основание приобретения гражданства РФ - false - true - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - b8b99f48-367c-4744-aab4-6f3387e4f57b - Номер решения о приобретении гражданства РФ - false - true - ba24d307-0b91-4299-ba82-9d0b52384ff2 af8a929c-1879-4f0c-890f-435fb93aa552 @@ -19672,20 +19656,6 @@ - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 55feffdd-e47e-4c8d-8380-7478c82625c1 - Дата решения о выходе из гражданства РФ - false - true - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 6d988204-fea9-401f-abac-fd96cb02c766 - Наименование органа, принявшего решение о выходе из гражданства РФ - false - true - d7d54cfb-26b5-4dba-b56f-b6247183c24d @@ -20044,7 +20014,6 @@ b31d5075-d3ea-4335-9afa-e3645008917c Grid_иностранное гражданство true - false false @@ -20086,30 +20055,7 @@ 8ed6c130-6c28-4bcb-99cc-7b69fa514be2 Наличие права проживания в иностранном государстве false - false - - - - - displayName - - "Наличие права проживания в иностранном государстве" - - - - displayType - - "ONE_COLUMN" - - - - field - - {"schema":"ervu_dashboard","table":"citizenship_foreign","entity":"citizenship_foreign","name":"residense_right"} - - - - + true 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 @@ -20286,27 +20232,6 @@ - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - 551ba182-2369-4442-a0c8-d45226043bc2 - Hbox - true - true - - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - 958ddfd3-12a6-4be3-9b18-90a907faf20e - Hbox - true - true - - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - e1b3161d-e94e-40ed-a0b5-4aea5c28cfe2 - Hbox - true - true - ba24d307-0b91-4299-ba82-9d0b52384ff2 454cab8e-a7f8-44b4-9ec3-413f0b9c755f diff --git a/resources/src/main/resources/business-model/main.page b/resources/src/main/resources/business-model/main.page index 5d7a5e89..001ae919 100644 --- a/resources/src/main/resources/business-model/main.page +++ b/resources/src/main/resources/business-model/main.page @@ -655,6 +655,7 @@ c628b56d-670d-4067-8dd9-0843420c1499 Вертикальный контейнер true + false false @@ -1507,6 +1508,7 @@ 42f079fa-ffe9-49b0-b8f7-aac7ceb54563 Вертикальный контейнер true + false false @@ -3896,6 +3898,7 @@ ec109c35-b859-43cc-ae23-df59e10a11b0 Вертикальный контейнер true + false false @@ -5237,6 +5240,7 @@ 287754e8-934b-4750-b623-48758802904c Призывная кампания true + false false @@ -9383,6 +9387,7 @@ bf17f367-0137-4d8b-8168-6b7c38d287a2 VB - Обжалование true + false false diff --git a/resources/src/main/resources/business-model/milregistration.page b/resources/src/main/resources/business-model/milregistration.page index 3372123d..9a3af268 100644 --- a/resources/src/main/resources/business-model/milregistration.page +++ b/resources/src/main/resources/business-model/milregistration.page @@ -336,21 +336,19 @@ a7c50c86-84f8-4092-8fbc-d04c6d2adbb1 Combo box false + true + + + 630accd8-3776-4fc1-a87c-3a0f05274678 + cf76edb6-2f7a-4017-877e-0f49bdec7e93 + DropdownTreeView + false false - + + -placeholder - - "Российская Федерация" - - - - - - - -comboBoxService +treeItemService @@ -360,30 +358,19 @@ - columnSorts + domainIdColumn - - - - -field - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"sort"} - - - -sortOrder - - "ASC" - - - - - + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"idm_id"} - displayColumn + idColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + + labelColumn {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"} @@ -395,93 +382,32 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":214.0,"y":210.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":214.0,"y":210.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":214.0,"y":210.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - - - - uniqueResult - - false + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + parentIdColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"parent_id"} + + - - - - -defaultValueColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - -loadType - - "BY_COLUMN" - - - -service - - - - entityColumn - - {"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - - loadDao - - - - graph - - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - - - - - DefaultLoadDao - database.dao - - - - - - DefaultValueByEntityGraphServiceV2 - service.loading - - - - - - - - false - - + - ComboboxFilterComponent - ervu-dashboard.component.filter + FilterComponent + component.filter true true -isBusinessId - - true - - - operation "EQUAL" @@ -510,6 +436,7 @@ 06e1198c-f255-420a-b577-6de772702bb1 Горизонтальный контейнер true + false false @@ -772,7 +699,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -805,7 +732,7 @@ behavior -{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -2976,6 +2903,7 @@ af7000dd-283a-45b6-acbf-6e1de7f22f88 Возраст true + false false @@ -3168,7 +3096,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -3201,7 +3129,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -3912,7 +3840,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -3945,7 +3873,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -4689,7 +4617,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -4722,7 +4650,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -5437,7 +5365,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -5470,7 +5398,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -6214,7 +6142,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -6247,7 +6175,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -6958,7 +6886,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -6991,7 +6919,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -7639,6 +7567,7 @@ 79fc57e0-9c07-425f-9139-9a95f9987d2d Дети до 18 лет true + false false @@ -7831,7 +7760,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -7864,7 +7793,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -9448,7 +9377,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -9481,7 +9410,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -11065,7 +10994,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -11098,7 +11027,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -12598,6 +12527,7 @@ 2359c3ed-8136-4822-9e4c-e741b5686010 VB - семейное положение true + false false @@ -13002,6 +12932,7 @@ + false @@ -13096,7 +13027,7 @@ filterComponent - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} @@ -13129,7 +13060,7 @@ -{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} +{"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.filter","className":"FilterComponent","type":"TS"} @@ -13269,6 +13200,7 @@ 221f086a-83ce-4516-af03-aa6bb50eb427 VB - в браке/холост true + false false @@ -13345,7 +13277,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -13378,7 +13310,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -14358,6 +14290,7 @@ + false @@ -14466,7 +14399,7 @@ filterComponent - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} @@ -14499,7 +14432,7 @@ -{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} +{"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.filter","className":"FilterComponent","type":"TS"} @@ -14703,7 +14636,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -14736,7 +14669,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -15716,6 +15649,7 @@ + false @@ -15810,7 +15744,7 @@ filterComponent - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} @@ -15843,7 +15777,7 @@ -{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} +{"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.filter","className":"FilterComponent","type":"TS"} @@ -16047,7 +15981,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -16080,7 +16014,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -17186,6 +17120,7 @@ + false @@ -17262,7 +17197,7 @@ -{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} +{"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.filter","className":"FilterComponent","type":"TS"} @@ -17313,7 +17248,7 @@ filterComponent - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} @@ -17442,6 +17377,7 @@ 040d034c-91b6-484e-89be-61240013bfeb VB - в учатся/работают/безработ true + false false @@ -17518,7 +17454,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -17551,7 +17487,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -18418,6 +18354,7 @@ + false @@ -18428,7 +18365,6 @@ ervu-dashboard.component.chart true - true cssClasses @@ -18527,7 +18463,7 @@ filterComponent - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} @@ -18560,7 +18496,7 @@ -{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} +{"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.filter","className":"FilterComponent","type":"TS"} @@ -18688,6 +18624,7 @@ 84a87967-c60c-4b7a-83d1-9f1ec58fba16 VB - в учатся/работают/безработ true + false false @@ -18764,7 +18701,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -18797,7 +18734,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -19657,6 +19594,7 @@ + false @@ -19765,7 +19703,7 @@ filterComponent - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} @@ -19798,7 +19736,7 @@ -{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} +{"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.filter","className":"FilterComponent","type":"TS"} @@ -19926,6 +19864,7 @@ 5fbce3e8-88d1-48da-b868-aa00549af586 VB - в учатся/работают/безработ true + false false @@ -20002,7 +19941,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -20035,7 +19974,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -20570,6 +20509,7 @@ 28f4be3e-5a7f-4c9c-b414-5ed0d0107739 Наличие водительского удостоверения true + false false @@ -20762,7 +20702,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -20795,7 +20735,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -21748,7 +21688,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -21781,7 +21721,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -22761,7 +22701,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -22794,7 +22734,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -23747,7 +23687,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -23780,7 +23720,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -24760,7 +24700,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -24793,7 +24733,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -25746,7 +25686,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -25779,7 +25719,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -26839,7 +26779,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -26872,7 +26812,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -27273,6 +27213,7 @@ + false @@ -27374,7 +27315,7 @@ filterComponent - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} @@ -27407,7 +27348,7 @@ -{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} +{"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.filter","className":"FilterComponent","type":"TS"} @@ -28713,7 +28654,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -28746,7 +28687,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -28809,7 +28750,6 @@ 04c978b3-c4d4-4fd3-a7f3-1279b7f7f9b9 VB - график true - false false @@ -29148,6 +29088,7 @@ + false @@ -29249,7 +29190,7 @@ filterComponent - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} @@ -29282,7 +29223,7 @@ -{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} +{"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.filter","className":"FilterComponent","type":"TS"} @@ -30616,7 +30557,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -30649,7 +30590,7 @@ behavior - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -30712,7 +30653,6 @@ 6fcfa6af-0c5d-4c83-b34d-2bfe7363d121 VB - график true - false false @@ -31046,6 +30986,7 @@ + false @@ -31147,7 +31088,7 @@ filterComponent - {"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} @@ -31180,7 +31121,7 @@ -{"objectId":"a7c50c86-84f8-4092-8fbc-d04c6d2adbb1","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} +{"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.filter","className":"FilterComponent","type":"TS"} diff --git a/resources/src/main/resources/business-model/notregistered.page b/resources/src/main/resources/business-model/notregistered.page index f19f0a01..e7fa84d2 100644 --- a/resources/src/main/resources/business-model/notregistered.page +++ b/resources/src/main/resources/business-model/notregistered.page @@ -300,22 +300,19 @@ 49393e6f-f349-4f15-99ca-f0f3e794f67d Combo box false - false + true + + + 630accd8-3776-4fc1-a87c-3a0f05274678 + f3ba1055-e764-420f-9c42-3232bbcbb321 + DropdownTreeView + false false - + + -placeholder - - "Российская Федерация" - - - - - - - -comboBoxService +treeItemService @@ -325,30 +322,19 @@ - columnSorts + domainIdColumn - - - - -field - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"sort"} - - - -sortOrder - - "ASC" - - - - - + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"idm_id"} - displayColumn + idColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + + labelColumn {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"} @@ -360,108 +346,32 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":183.0,"y":225.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":183.0,"y":225.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":183.0,"y":225.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - - - - uniqueResult - - false + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + parentIdColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"parent_id"} + + - - - - -defaultValueColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - -loadType - - "BY_COLUMN" - - - -service - - - - entityColumn - - {"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - - loadDao - - - - graph - - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - - - - - DefaultLoadDao - database.dao - - - - - - DefaultValueByEntityGraphServiceV2 - service.loading - - - - - - - - false - - + FilterComponent component.filter - true - - -operation - - "EQUAL" - - - - - - - ComboboxFilterComponent - ervu-dashboard.component.filter - true true -isBusinessId - - true - - - operation "EQUAL" @@ -752,7 +662,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -787,7 +697,7 @@ behavior -{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -3036,6 +2946,7 @@ 90815563-92e7-462e-9799-94bc6347c6b1 Возраст true + false false @@ -3228,7 +3139,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -3261,7 +3172,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -3972,7 +3883,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -4005,7 +3916,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -4749,7 +4660,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -4782,7 +4693,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -5493,7 +5404,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -5526,7 +5437,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -6270,7 +6181,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -6303,7 +6214,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -7014,7 +6925,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -7047,7 +6958,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -7695,6 +7606,7 @@ e304e85c-a38b-48f9-82b6-2b3fc14a912c VB - Занятость true + false false @@ -8097,7 +8009,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -8130,7 +8042,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -8995,7 +8907,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -9028,7 +8940,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -9897,7 +9809,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -9930,7 +9842,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -10480,7 +10392,6 @@ c82f22ad-6e64-4e09-9a35-982e97a0302c VB - Категории постановки на ВУ true - false false @@ -10544,7 +10455,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -10577,7 +10488,7 @@ behavior -{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -10640,6 +10551,7 @@ 1e4b856b-4819-4132-90e2-6b29bdf48081 Горизонтальный контейнер true + false false @@ -10723,6 +10635,7 @@ 3fec20ea-9d76-4166-af15-048e370dd6da Вертикальный контейнер true + false false @@ -12767,7 +12680,7 @@ behavior - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -12800,7 +12713,7 @@ behavior -{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -12919,6 +12832,20 @@ + + 27912fc5-0be7-4d4c-ae46-a82979253599 + 30f1bbf2-b94b-4c47-97d0-d9240ba51b28 + Filter group + true + true + + + 97aef2b8-52a1-47f4-a930-9b0bce6994f9 + bc422eca-7177-433c-a0a5-d77f022ac443 + FilterDropdownTreeView + false + true + 85eb12aa-f878-4e29-b109-9d31af0fefb4 621e0b1c-cdec-4ed6-a82e-bc259a6fd4fa @@ -13497,7 +13424,7 @@ filterComponent -{"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} +{"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} @@ -13530,7 +13457,7 @@ - {"objectId":"49393e6f-f349-4f15-99ca-f0f3e794f67d","packageName":"component.filter","className":"FilterComponent","type":"TS"} + {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.filter","className":"FilterComponent","type":"TS"} diff --git a/resources/src/main/resources/business-model/ratings.page b/resources/src/main/resources/business-model/ratings.page index 958bbd1b..b8ef3b3b 100644 --- a/resources/src/main/resources/business-model/ratings.page +++ b/resources/src/main/resources/business-model/ratings.page @@ -252,22 +252,19 @@ fdad3248-54b5-4d3d-914e-ad8d4d5ec0ff Combo box false - false + true + + + 630accd8-3776-4fc1-a87c-3a0f05274678 + 25b29b33-5c56-485c-b734-6c48669448ef + DropdownTreeView + false false - + + - placeholder - -"Российская Федерация" - - - - - - - - comboBoxService + treeItemService @@ -277,30 +274,19 @@ - columnSorts + domainIdColumn - - - - - field - -{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"sort"} - - - - sortOrder - -"ASC" - - - - - + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"idm_id"} - displayColumn + idColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + + labelColumn {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"} @@ -312,78 +298,23 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":225.0,"y":255.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":225.0,"y":255.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":225.0,"y":255.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - - - - uniqueResult - - false + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + parentIdColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"parent_id"} + + - - - - - defaultValueColumn - -{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - - loadType - -"BY_COLUMN" - - - - service - - - - entityColumn - - {"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - - loadDao - - - - graph - - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - - - - - DefaultLoadDao - database.dao - - - - - - DefaultValueByEntityGraphServiceV2 - service.loading - - - - - - - - false - bce312bd-0c82-45e5-89dc-a1af90431c18 @@ -1254,6 +1185,7 @@ a24d8714-b47f-4f2e-8ff4-3c120ab1f7ad HB - title true + false false diff --git a/resources/src/main/resources/business-model/recruitment.page b/resources/src/main/resources/business-model/recruitment.page index 9c0a8427..220c88ba 100644 --- a/resources/src/main/resources/business-model/recruitment.page +++ b/resources/src/main/resources/business-model/recruitment.page @@ -293,21 +293,19 @@ c02754db-ba91-4be8-b11a-06e2c5dada24 Combo box false + true + + + 630accd8-3776-4fc1-a87c-3a0f05274678 + 051c3e53-8e91-4ba4-8b5d-a2c20865adc9 + DropdownTreeView + false false - + + -placeholder - - "Российская Федерация" - - - - - - - -comboBoxService +treeItemService @@ -317,30 +315,19 @@ - columnSorts + domainIdColumn - - - - -field - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"sort"} - - - -sortOrder - - "ASC" - - - - - + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"idm_id"} - displayColumn + idColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + + labelColumn {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"} @@ -352,108 +339,32 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":138.0,"y":217.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":138.0,"y":217.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":138.0,"y":217.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - - - - uniqueResult - - false + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + parentIdColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"parent_id"} + + - - - - -defaultValueColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - -loadType - - "BY_COLUMN" - - - -service - - - - entityColumn - - {"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - - loadDao - - - - graph - - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - - - - - DefaultLoadDao - database.dao - - - - - - DefaultValueByEntityGraphServiceV2 - service.loading - - - - - - - - false - - + FilterComponent component.filter - true - - -operation - - "EQUAL" - - - - - - - ComboboxFilterComponent - ervu-dashboard.component.filter - true true -isBusinessId - - true - - - operation "EQUAL" @@ -482,6 +393,7 @@ c129b37c-c980-4ce5-b152-ca154807a6a2 Горизонтальный контейнер true + false false @@ -890,7 +802,7 @@ behavior -{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -923,7 +835,7 @@ behavior - {"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -1939,7 +1851,7 @@ behavior -{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -1972,7 +1884,7 @@ behavior - {"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -2990,6 +2902,7 @@ 71008512-360f-4156-b208-cf1daf67b070 Контейнер вкладок true + false false @@ -3071,7 +2984,7 @@ behavior -{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -3104,7 +3017,7 @@ behavior - {"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -3669,7 +3582,6 @@ ervu-dashboard.component.chart true - true cssClasses @@ -3799,7 +3711,7 @@ filterComponent - {"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + {"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} @@ -3832,7 +3744,7 @@ - {"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.filter","className":"FilterComponent","type":"TS"} + {"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.filter","className":"FilterComponent","type":"TS"} @@ -5914,7 +5826,7 @@ behavior -{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -5947,7 +5859,7 @@ behavior - {"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -6503,7 +6415,6 @@ ervu-dashboard.component.chart true - true bars @@ -6741,7 +6652,7 @@ filterComponent - {"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + {"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} @@ -6774,7 +6685,7 @@ - {"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.filter","className":"FilterComponent","type":"TS"} + {"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.filter","className":"FilterComponent","type":"TS"} @@ -8962,7 +8873,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"appeals","schemaName":"recruitment_campaign","x":323.0,"y":174.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"appeals","schemaName":"recruitment_campaign","x":323.0,"y":174.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"appeals":{"tableName":"appeals","schemaName":"recruitment_campaign","x":323.0,"y":174.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"appeals","schemaName":"recruitment_campaign","x":263.0,"y":275.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"appeals","schemaName":"recruitment_campaign","x":263.0,"y":275.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"appeals":{"tableName":"appeals","schemaName":"recruitment_campaign","x":263.0,"y":275.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} @@ -8996,7 +8907,7 @@ behavior -{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -9029,7 +8940,7 @@ behavior - {"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -9062,7 +8973,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"appeals","schemaName":"recruitment_campaign","x":200.0,"y":221.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"appeals","schemaName":"recruitment_campaign","x":200.0,"y":221.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"appeals":{"tableName":"appeals","schemaName":"recruitment_campaign","x":200.0,"y":221.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"appeals","schemaName":"recruitment_campaign","x":194.0,"y":298.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"EQUAL","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"appeals","schemaName":"recruitment_campaign","x":194.0,"y":298.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"EQUAL","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"appeals":{"tableName":"appeals","schemaName":"recruitment_campaign","x":194.0,"y":298.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"EQUAL","typeCode":"CONST","values":["\"Осень%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} @@ -9219,7 +9130,6 @@ 4650f6c6-bb8e-4c1d-9201-df57ada9e0fe HB - решено true -false false @@ -9533,7 +9443,6 @@ a7fda8f9-000f-4400-b040-24c842938ac1 HB - не решено true -false false @@ -9847,7 +9756,6 @@ e16ef66d-a068-4623-86cb-97ba74bc9442 HB - время решения true -false false @@ -10027,7 +9935,6 @@ 9661fbc4-ea41-4206-95f0-e15b0fc8c3e3 HB - оценка удовлетворенности true -false false @@ -10240,7 +10147,6 @@ 3fe4a71f-8cd7-488e-b43d-9ba61d63f7cc VB - весна true - false false @@ -10266,7 +10172,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"appeals","schemaName":"recruitment_campaign","x":235.0,"y":184.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"appeals","schemaName":"recruitment_campaign","x":235.0,"y":184.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"appeals":{"tableName":"appeals","schemaName":"recruitment_campaign","x":235.0,"y":184.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"appeals","schemaName":"recruitment_campaign","x":329.0,"y":238.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"appeals","schemaName":"recruitment_campaign","x":329.0,"y":238.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"appeals":{"tableName":"appeals","schemaName":"recruitment_campaign","x":329.0,"y":238.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} @@ -10300,7 +10206,7 @@ behavior -{"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -10333,7 +10239,7 @@ behavior - {"objectId":"c02754db-ba91-4be8-b11a-06e2c5dada24","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -10366,7 +10272,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"appeals","schemaName":"recruitment_campaign","x":210.0,"y":220.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"appeals","schemaName":"recruitment_campaign","x":210.0,"y":220.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"appeals":{"tableName":"appeals","schemaName":"recruitment_campaign","x":210.0,"y":220.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"testspring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"appeals","schemaName":"recruitment_campaign","x":303.0,"y":289.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"appeals","schemaName":"recruitment_campaign","x":303.0,"y":289.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"appeals":{"tableName":"appeals","schemaName":"recruitment_campaign","x":303.0,"y":289.0,"alias":"appeals","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"spring_autumn"},"operation":"LIKE","typeCode":"CONST","values":["\"Весна%\""]},{"column":{"schema":"recruitment_campaign","table":"appeals","entity":"appeals","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} diff --git a/resources/src/main/resources/business-model/Всего на учете (2й уровень).page b/resources/src/main/resources/business-model/Всего на учете (2й уровень).page index 4fc4a838..4e6f499a 100644 --- a/resources/src/main/resources/business-model/Всего на учете (2й уровень).page +++ b/resources/src/main/resources/business-model/Всего на учете (2й уровень).page @@ -292,22 +292,19 @@ 01426200-9f22-492e-a812-b9d08afd02ce Combo box false - false + true + + + 630accd8-3776-4fc1-a87c-3a0f05274678 + bcda3e31-265c-4f80-8984-fd0359b0fc36 + DropdownTreeView + false false - + + -placeholder - - "Российская Федерация" - - - - - - - -comboBoxService +treeItemService @@ -317,30 +314,19 @@ - columnSorts + domainIdColumn - - - - -field - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"sort"} - - - -sortOrder - - "ASC" - - - - - + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"idm_id"} - displayColumn + idColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + + labelColumn {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"} @@ -352,108 +338,32 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":156.0,"y":200.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":156.0,"y":200.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":156.0,"y":200.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - - - - uniqueResult - - false + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + parentIdColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"parent_id"} + + - - - - -defaultValueColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - -loadType - - "BY_COLUMN" - - - -service - - - - entityColumn - - {"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - - loadDao - - - - graph - - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - - - - - DefaultLoadDao - database.dao - - - - - - DefaultValueByEntityGraphServiceV2 - service.loading - - - - - - - - false - - + FilterComponent component.filter - true - - -operation - - "EQUAL" - - - - - - - ComboboxFilterComponent - ervu-dashboard.component.filter - true true -isBusinessId - - true - - - operation "EQUAL" @@ -475,6 +385,7 @@ 85a7fcd5-52c1-4e3f-98b6-fddbf951c1c4 Горизонтальный контейнер true + false false @@ -673,6 +584,7 @@ 1c6c88af-a164-4e0d-9cbb-a6bc59d30414 Всего состоят на учете true + false false @@ -736,7 +648,7 @@ behavior - {"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"bcda3e31-265c-4f80-8984-fd0359b0fc36","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -769,7 +681,7 @@ behavior -{"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"bcda3e31-265c-4f80-8984-fd0359b0fc36","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -3057,6 +2969,7 @@ 01003c5b-75c8-496d-98da-c3c2620dc0aa Категории постановки на ВУ true + false false @@ -3120,7 +3033,7 @@ behavior - {"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"bcda3e31-265c-4f80-8984-fd0359b0fc36","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -3153,7 +3066,7 @@ behavior -{"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"bcda3e31-265c-4f80-8984-fd0359b0fc36","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -5333,7 +5246,7 @@ behavior - {"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"bcda3e31-265c-4f80-8984-fd0359b0fc36","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -5366,7 +5279,7 @@ behavior -{"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"bcda3e31-265c-4f80-8984-fd0359b0fc36","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -7627,7 +7540,6 @@ a00e8828-e03e-434a-98f8-7dfd6575a687 VB - Повестки true - false false @@ -7696,7 +7608,7 @@ behavior - {"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"} + {"objectId":"bcda3e31-265c-4f80-8984-fd0359b0fc36","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -7729,7 +7641,7 @@ behavior -{"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field","className":"ComboBox","type":"TS"} +{"objectId":"bcda3e31-265c-4f80-8984-fd0359b0fc36","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} @@ -8324,6 +8236,7 @@ + false @@ -8439,7 +8352,7 @@ filterComponent -{"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} +{"objectId":"bcda3e31-265c-4f80-8984-fd0359b0fc36","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} @@ -8472,7 +8385,7 @@ - {"objectId":"01426200-9f22-492e-a812-b9d08afd02ce","packageName":"component.filter","className":"FilterComponent","type":"TS"} + {"objectId":"bcda3e31-265c-4f80-8984-fd0359b0fc36","packageName":"component.filter","className":"FilterComponent","type":"TS"} From 8c66e804b1101b4af077f868f619b94c752cb59c Mon Sep 17 00:00:00 2001 From: Makarova Elena Date: Wed, 25 Sep 2024 10:39:55 +0300 Subject: [PATCH 36/68] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=D0=B0=20=D0=B1=D0=B4,=20=D0=BD=D0=B0=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=B8=D0=BB=D0=B0=20=D1=81=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BE=20=D0=B4=D0=B5=D0=BF=D1=83=D1=82=D0=B0?= =?UTF-8?q?=D1=82=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ervu_dashboard/ErvuDashboard.java | 8 + .../db_beans/ervu_dashboard/Keys.java | 3 + .../db_beans/ervu_dashboard/Tables.java | 7 + .../ervu_dashboard/tables/Deputy.java | 264 ++++++++++++++++++ .../tables/records/DeputyRecord.java | 172 ++++++++++++ .../resources/business-model/citizencard.page | 36 +-- 6 files changed, 463 insertions(+), 27 deletions(-) create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Deputy.java create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/DeputyRecord.java diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java index 70f8d68d..5783c901 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java @@ -13,6 +13,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Citizenship; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenshipForeign; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangelog; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangeloglock; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Deputy; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disability; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disease; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.DriversLicence; @@ -85,6 +86,12 @@ public class ErvuDashboard extends SchemaImpl { */ public final Databasechangeloglock DATABASECHANGELOGLOCK = Databasechangeloglock.DATABASECHANGELOGLOCK; + /** + * сведения о гражданах, избранных депутатами/зарегистрированных кандидатами + * на участие в выборах + */ + public final Deputy DEPUTY = Deputy.DEPUTY; + /** * сведения об инвалидности/недееспособности/ограниченной дееспособности */ @@ -159,6 +166,7 @@ public class ErvuDashboard extends SchemaImpl { CitizenshipForeign.CITIZENSHIP_FOREIGN, Databasechangelog.DATABASECHANGELOG, Databasechangeloglock.DATABASECHANGELOGLOCK, + Deputy.DEPUTY, Disability.DISABILITY, Disease.DISEASE, DriversLicence.DRIVERS_LICENCE, diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java index 3b0fdff3..7821c31d 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java @@ -11,6 +11,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenSpous import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Citizenship; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenshipForeign; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangeloglock; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Deputy; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disability; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disease; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.DriversLicence; @@ -28,6 +29,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.Citi import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenshipForeignRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenshipRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DatabasechangeloglockRecord; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DeputyRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DisabilityRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DiseaseRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DriversLicenceRecord; @@ -63,6 +65,7 @@ public class Keys { public static final UniqueKey PK_CITIZENSHIP = Internal.createUniqueKey(Citizenship.CITIZENSHIP, DSL.name("pk_citizenship"), new TableField[] { Citizenship.CITIZENSHIP.CITIZENSHIP_ID }, true); public static final UniqueKey PK_CITIZENSHIP_FOREIGN = Internal.createUniqueKey(CitizenshipForeign.CITIZENSHIP_FOREIGN, DSL.name("pk_citizenship_foreign"), new TableField[] { CitizenshipForeign.CITIZENSHIP_FOREIGN.CITIZENSHIP_FOREIGN_ID }, true); public static final UniqueKey DATABASECHANGELOGLOCK_PKEY = Internal.createUniqueKey(Databasechangeloglock.DATABASECHANGELOGLOCK, DSL.name("databasechangeloglock_pkey"), new TableField[] { Databasechangeloglock.DATABASECHANGELOGLOCK.ID }, true); + public static final UniqueKey PK_DEPUTY = Internal.createUniqueKey(Deputy.DEPUTY, DSL.name("pk_deputy"), new TableField[] { Deputy.DEPUTY.DEPUTY_ID }, true); public static final UniqueKey PK_DISABILITY = Internal.createUniqueKey(Disability.DISABILITY, DSL.name("pk_disability"), new TableField[] { Disability.DISABILITY.DISABILITY_ID }, true); public static final UniqueKey PK_DISEASE = Internal.createUniqueKey(Disease.DISEASE, DSL.name("pk_disease"), new TableField[] { Disease.DISEASE.DISEASE_ID }, true); public static final UniqueKey PK_DRIVERS_LICENCE = Internal.createUniqueKey(DriversLicence.DRIVERS_LICENCE, DSL.name("pk_drivers_licence"), new TableField[] { DriversLicence.DRIVERS_LICENCE.DRIVERS_LICENCE_ID }, true); diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java index 43fa92eb..92b3cdc2 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java @@ -12,6 +12,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Citizenship; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenshipForeign; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangelog; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangeloglock; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Deputy; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disability; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disease; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.DriversLicence; @@ -70,6 +71,12 @@ public class Tables { */ public static final Databasechangeloglock DATABASECHANGELOGLOCK = Databasechangeloglock.DATABASECHANGELOGLOCK; + /** + * сведения о гражданах, избранных депутатами/зарегистрированных кандидатами + * на участие в выборах + */ + public static final Deputy DEPUTY = Deputy.DEPUTY; + /** * сведения об инвалидности/недееспособности/ограниченной дееспособности */ diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Deputy.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Deputy.java new file mode 100644 index 00000000..f6c7ce5f --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Deputy.java @@ -0,0 +1,264 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables; + + +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DeputyRecord; + +import java.sql.Date; +import java.util.Collection; +import java.util.UUID; + +import org.jooq.Condition; +import org.jooq.Field; +import org.jooq.Identity; +import org.jooq.Name; +import org.jooq.PlainSQL; +import org.jooq.QueryPart; +import org.jooq.SQL; +import org.jooq.Schema; +import org.jooq.Select; +import org.jooq.Stringly; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.TableOptions; +import org.jooq.UniqueKey; +import org.jooq.impl.DSL; +import org.jooq.impl.SQLDataType; +import org.jooq.impl.TableImpl; + + +/** + * сведения о гражданах, избранных депутатами/зарегистрированных кандидатами на + * участие в выборах + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class Deputy extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of ervu_dashboard.deputy + */ + public static final Deputy DEPUTY = new Deputy(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return DeputyRecord.class; + } + + /** + * The column ervu_dashboard.deputy.deputy_id. + */ + public final TableField DEPUTY_ID = createField(DSL.name("deputy_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + /** + * The column ervu_dashboard.deputy.recruit_id. ссылка на + * гражданина (citizen) + */ + public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "ссылка на гражданина (citizen)"); + + /** + * The column ervu_dashboard.deputy.deputy. является + * депутатом(true)/кандидатом на участие в выборах(false) + */ + public final TableField DEPUTY_ = createField(DSL.name("deputy"), SQLDataType.BOOLEAN.defaultValue(DSL.field(DSL.raw("true"), SQLDataType.BOOLEAN)), this, "является депутатом(true)/кандидатом на участие в выборах(false)"); + + /** + * The column ervu_dashboard.deputy.information. сведения об + * избрании гражданина депутатом/сведения о регистрации кандидатом на + * выборах + */ + public final TableField INFORMATION = createField(DSL.name("information"), SQLDataType.CLOB, this, "сведения об избрании гражданина депутатом/сведения о регистрации кандидатом на выборах"); + + /** + * The column ervu_dashboard.deputy.end_date. дата досрочного + * прекращения полномочий/снятия кандидатуры с выборов + */ + public final TableField END_DATE = createField(DSL.name("end_date"), SQLDataType.DATE, this, "дата досрочного прекращения полномочий/снятия кандидатуры с выборов"); + + /** + * The column ervu_dashboard.deputy.period_office. срок + * полномочий + */ + public final TableField PERIOD_OFFICE = createField(DSL.name("period_office"), SQLDataType.VARCHAR(50), this, "срок полномочий"); + + /** + * The column ervu_dashboard.deputy.cancellation_date. дата + * аннулирования регистрации + */ + public final TableField CANCELLATION_DATE = createField(DSL.name("cancellation_date"), SQLDataType.DATE, this, "дата аннулирования регистрации"); + + private Deputy(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private Deputy(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment("сведения о гражданах, избранных депутатами/зарегистрированных кандидатами на участие в выборах"), TableOptions.table(), where); + } + + /** + * Create an aliased ervu_dashboard.deputy table reference + */ + public Deputy(String alias) { + this(DSL.name(alias), DEPUTY); + } + + /** + * Create an aliased ervu_dashboard.deputy table reference + */ + public Deputy(Name alias) { + this(alias, DEPUTY); + } + + /** + * Create a ervu_dashboard.deputy table reference + */ + public Deputy() { + this(DSL.name("deputy"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD; + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public UniqueKey getPrimaryKey() { + return Keys.PK_DEPUTY; + } + + @Override + public Deputy as(String alias) { + return new Deputy(DSL.name(alias), this); + } + + @Override + public Deputy as(Name alias) { + return new Deputy(alias, this); + } + + @Override + public Deputy as(Table alias) { + return new Deputy(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public Deputy rename(String name) { + return new Deputy(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public Deputy rename(Name name) { + return new Deputy(name, null); + } + + /** + * Rename this table + */ + @Override + public Deputy rename(Table name) { + return new Deputy(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Deputy where(Condition condition) { + return new Deputy(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Deputy where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Deputy where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Deputy where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Deputy where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Deputy where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Deputy where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Deputy where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Deputy whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Deputy whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/DeputyRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/DeputyRecord.java new file mode 100644 index 00000000..10d5d8d4 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/DeputyRecord.java @@ -0,0 +1,172 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records; + + +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Deputy; + +import java.sql.Date; +import java.util.UUID; + +import org.jooq.Record1; +import org.jooq.impl.UpdatableRecordImpl; + + +/** + * сведения о гражданах, избранных депутатами/зарегистрированных кандидатами на + * участие в выборах + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class DeputyRecord extends UpdatableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for ervu_dashboard.deputy.deputy_id. + */ + public void setDeputyId(Long value) { + set(0, value); + } + + /** + * Getter for ervu_dashboard.deputy.deputy_id. + */ + public Long getDeputyId() { + return (Long) get(0); + } + + /** + * Setter for ervu_dashboard.deputy.recruit_id. ссылка на + * гражданина (citizen) + */ + public void setRecruitId(UUID value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.deputy.recruit_id. ссылка на + * гражданина (citizen) + */ + public UUID getRecruitId() { + return (UUID) get(1); + } + + /** + * Setter for ervu_dashboard.deputy.deputy. является + * депутатом(true)/кандидатом на участие в выборах(false) + */ + public void setDeputy(Boolean value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.deputy.deputy. является + * депутатом(true)/кандидатом на участие в выборах(false) + */ + public Boolean getDeputy() { + return (Boolean) get(2); + } + + /** + * Setter for ervu_dashboard.deputy.information. сведения об + * избрании гражданина депутатом/сведения о регистрации кандидатом на + * выборах + */ + public void setInformation(String value) { + set(3, value); + } + + /** + * Getter for ervu_dashboard.deputy.information. сведения об + * избрании гражданина депутатом/сведения о регистрации кандидатом на + * выборах + */ + public String getInformation() { + return (String) get(3); + } + + /** + * Setter for ervu_dashboard.deputy.end_date. дата досрочного + * прекращения полномочий/снятия кандидатуры с выборов + */ + public void setEndDate(Date value) { + set(4, value); + } + + /** + * Getter for ervu_dashboard.deputy.end_date. дата досрочного + * прекращения полномочий/снятия кандидатуры с выборов + */ + public Date getEndDate() { + return (Date) get(4); + } + + /** + * Setter for ervu_dashboard.deputy.period_office. срок + * полномочий + */ + public void setPeriodOffice(String value) { + set(5, value); + } + + /** + * Getter for ervu_dashboard.deputy.period_office. срок + * полномочий + */ + public String getPeriodOffice() { + return (String) get(5); + } + + /** + * Setter for ervu_dashboard.deputy.cancellation_date. дата + * аннулирования регистрации + */ + public void setCancellationDate(Date value) { + set(6, value); + } + + /** + * Getter for ervu_dashboard.deputy.cancellation_date. дата + * аннулирования регистрации + */ + public Date getCancellationDate() { + return (Date) get(6); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 key() { + return (Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached DeputyRecord + */ + public DeputyRecord() { + super(Deputy.DEPUTY); + } + + /** + * Create a detached, initialised DeputyRecord + */ + public DeputyRecord(Long deputyId, UUID recruitId, Boolean deputy, String information, Date endDate, String periodOffice, Date cancellationDate) { + super(Deputy.DEPUTY); + + setDeputyId(deputyId); + setRecruitId(recruitId); + setDeputy(deputy); + setInformation(information); + setEndDate(endDate); + setPeriodOffice(periodOffice); + setCancellationDate(cancellationDate); + resetChangedOnNotNull(); + } +} diff --git a/resources/src/main/resources/business-model/citizencard.page b/resources/src/main/resources/business-model/citizencard.page index a51dc981..06790917 100644 --- a/resources/src/main/resources/business-model/citizencard.page +++ b/resources/src/main/resources/business-model/citizencard.page @@ -41,7 +41,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"3":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"4":{"tableName":"citizenship","schemaName":"ervu_dashboard","x":102.0,"y":153.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"citizenship","schemaName":"ervu_dashboard","x":102.0,"y":153.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"citizen":{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"citizenship":{"tableName":"citizenship","schemaName":"ervu_dashboard","x":102.0,"y":153.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"drivers_licence1":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"drivers_licence":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"citizen","refToEntityName":"recruitment","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"drivers_licence","refToColumns":[{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence","name":"tractor_driver"},"operation":"EQUAL","typeCode":"CONST","values":["false"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"drivers_licence1","refToColumns":[{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence1","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence1","name":"tractor_driver"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"citizenship","refToColumns":[{"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null,null,null,null],[null,null,null,null,null],[null,null,null,null,null],[null,null,null,null,null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"3":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"4":{"tableName":"citizenship","schemaName":"ervu_dashboard","x":106.0,"y":50.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"5":{"tableName":"deputy","schemaName":"ervu_dashboard","x":110.0,"y":162.0,"alias":"deputy","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"6":{"tableName":"deputy","schemaName":"ervu_dashboard","x":113.0,"y":268.0,"alias":"deputy1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"citizenship","schemaName":"ervu_dashboard","x":106.0,"y":50.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"deputy","schemaName":"ervu_dashboard","x":110.0,"y":162.0,"alias":"deputy","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"deputy","schemaName":"ervu_dashboard","x":113.0,"y":268.0,"alias":"deputy1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"citizen":{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"deputy":{"tableName":"deputy","schemaName":"ervu_dashboard","x":110.0,"y":162.0,"alias":"deputy","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"citizenship":{"tableName":"citizenship","schemaName":"ervu_dashboard","x":106.0,"y":50.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"drivers_licence1":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"drivers_licence":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"deputy1":{"tableName":"deputy","schemaName":"ervu_dashboard","x":113.0,"y":268.0,"alias":"deputy1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"citizen","refToEntityName":"recruitment","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"drivers_licence","refToColumns":[{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence","name":"tractor_driver"},"operation":"EQUAL","typeCode":"CONST","values":["false"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"drivers_licence1","refToColumns":[{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence1","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence1","name":"tractor_driver"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"citizenship","refToColumns":[{"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"deputy","refToColumns":[{"schema":"ervu_dashboard","table":"deputy","entity":"deputy","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"deputy","entity":"deputy","name":"deputy"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"deputy1","refToColumns":[{"schema":"ervu_dashboard","table":"deputy","entity":"deputy1","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"deputy","entity":"deputy1","name":"deputy"},"operation":"EQUAL","typeCode":"CONST","values":["false"]}],"groups":[]}}],[null,null,null,null,null,null,null],[null,null,null,null,null,null,null],[null,null,null,null,null,null,null],[null,null,null,null,null,null,null],[null,null,null,null,null,null,null],[null,null,null,null,null,null,null]],"mainNodeIndex":0} @@ -1578,6 +1578,7 @@ 999acadc-8a62-45b9-ae62-9d653411fdb6 Личные сведения true + false false @@ -19077,6 +19078,7 @@ 123aa48f-2065-47ad-b4f2-4b2a35a7d313 Сведения о гражданстве true + false false @@ -20050,13 +20052,6 @@ - - 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 - 8ed6c130-6c28-4bcb-99cc-7b69fa514be2 - Наличие права проживания в иностранном государстве - false - true - 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 e254e728-b508-491d-9d14-1fdde7dff1db @@ -22121,16 +22116,9 @@ 59d67b7a-8404-484e-b55e-170c5b630558 Граждане, избранные депутатами true - false false - - disabled - - true - - heading @@ -22365,12 +22353,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"deputy","entity":"deputy","name":"information"} @@ -22442,12 +22429,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"deputy","entity":"deputy","name":"period_office"} @@ -22507,12 +22493,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"deputy","entity":"deputy","name":"end_date"} @@ -22716,12 +22701,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"deputy","entity":"deputy1","name":"information"} @@ -22793,12 +22777,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"deputy","entity":"deputy1","name":"end_date"} @@ -22858,12 +22841,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"deputy","entity":"deputy1","name":"cancellation_date"} From 7f3cc1ffc94483fb17d318b5ff176f99e50ef073 Mon Sep 17 00:00:00 2001 From: Makarova Elena Date: Wed, 25 Sep 2024 18:20:05 +0300 Subject: [PATCH 37/68] =?UTF-8?q?=D1=81=D1=82=D0=B8=D0=BB=D0=B8=20=D0=B2?= =?UTF-8?q?=20=D0=B3=D1=80=D0=B8=D0=B4=D0=B0=D1=85=20=D0=BF=D1=80=D0=B8?= =?UTF-8?q?=D0=B2=D0=B5=D0=BB=D0=B0=20=D0=BA=20=D0=B5=D0=B4=D0=B8=D0=BD?= =?UTF-8?q?=D0=BE=D0=BE=D0=B1=D1=80=D0=B0=D0=B7=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/business-model/citizencard.page | 64 ++++++++++++++++++- 1 file changed, 61 insertions(+), 3 deletions(-) diff --git a/resources/src/main/resources/business-model/citizencard.page b/resources/src/main/resources/business-model/citizencard.page index 06790917..110c2b2d 100644 --- a/resources/src/main/resources/business-model/citizencard.page +++ b/resources/src/main/resources/business-model/citizencard.page @@ -15510,7 +15510,6 @@ cb814ffd-638b-4901-9d9f-ec3f5838d159 Сведения о состоянии зоровья, о присвоении спортивных разрядов и званий true - false false @@ -15834,7 +15833,6 @@ f5159cc8-9f20-4f88-91bf-139ebe97b5df Grid true - false false @@ -15844,6 +15842,12 @@ true + + theme + + "BALHAM_DARK" + + @@ -16154,7 +16158,6 @@ 63aeb701-89aa-43f7-9b6c-b55c03302036 Grid_вич true - false false @@ -16164,9 +16167,16 @@ true + + theme + + "BALHAM_DARK" + + + false gridService @@ -16436,6 +16446,12 @@ true + + theme + + "BALHAM_DARK" + + @@ -16750,6 +16766,12 @@ true + + theme + + "BALHAM_DARK" + + @@ -17124,6 +17146,12 @@ true + + theme + + "BALHAM_DARK" + + @@ -20025,6 +20053,12 @@ true + + theme + + "BALHAM_DARK" + + @@ -20672,6 +20706,12 @@ true + + theme + + "BALHAM_DARK" + + @@ -21037,6 +21077,12 @@ true + + theme + + "BALHAM_DARK" + + @@ -21498,6 +21544,12 @@ true + + theme + + "BALHAM_DARK" + + @@ -21876,6 +21928,12 @@ + + theme + + "BALHAM_DARK" + + From 05659200b411a5a140d86da5db0b9fd90131d109 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Thu, 26 Sep 2024 08:40:47 +0300 Subject: [PATCH 38/68] grid-checkbox --- .../resources/css/components-dashboard.css | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 0a08619a..1980495a 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -1446,3 +1446,26 @@ width: 100% !important; } } + + + +/* +grid-checkbox + +.webbpm.ervu_dashboard ag-grid-angular .ag-cell .grid-cell-checkbox { + width: 16px; + height: 16px; + border-radius: 4px; + background-color: var(--color-dark-20); +} +.webbpm.ervu_dashboard ag-grid-angular .ag-cell .grid-cell-checkbox { + content: url(../img/svg/mark.svg); + border: 1px solid var(--color-success); + background-color: var(--color-primary-5); +} +.webbpm.ervu_dashboard ag-grid-angular .ag-cell .grid-cell-checkbox > input { + position: absolute; + z-index: -1; + opacity: 0; +} +*/ From acb7d53ea89db5e4b04bd59478bf2f74f7a319ea Mon Sep 17 00:00:00 2001 From: Makarova Elena Date: Thu, 26 Sep 2024 15:49:21 +0300 Subject: [PATCH 39/68] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=D0=B0=20=D0=B1=D0=B4,=20=D0=BD=D0=B0=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=B8=D0=BB=D0=B0=20=D1=81=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BE=20=D1=81=D1=83=D0=B4=D0=B8=D0=BC=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ervu_dashboard/ErvuDashboard.java | 14 + .../db_beans/ervu_dashboard/Keys.java | 6 + .../db_beans/ervu_dashboard/Tables.java | 12 + .../ervu_dashboard/tables/Prosecution.java | 292 +++ .../ervu_dashboard/tables/Punishment.java | 310 +++ .../tables/records/ProsecutionRecord.java | 254 ++ .../tables/records/PunishmentRecord.java | 305 +++ .../resources/business-model/citizencard.page | 2153 +++++++++++------ 8 files changed, 2611 insertions(+), 735 deletions(-) create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Prosecution.java create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Punishment.java create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/ProsecutionRecord.java create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/PunishmentRecord.java diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java index 5783c901..6850455d 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java @@ -19,7 +19,9 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disease; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.DriversLicence; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.MedicalAuthorities; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Property; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Prosecution; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.PubRecruitment; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Punishment; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Recruitment; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Subpoena; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.TemporaryMeasures; @@ -117,11 +119,21 @@ public class ErvuDashboard extends SchemaImpl { */ public final Property PROPERTY = Property.PROPERTY; + /** + * сведения об уголовном преследовании + */ + public final Prosecution PROSECUTION = Prosecution.PROSECUTION; + /** * The table ervu_dashboard.pub_recruitment. */ public final PubRecruitment PUB_RECRUITMENT = PubRecruitment.PUB_RECRUITMENT; + /** + * сведения об уголовном преследовании и вынесенном приговоре + */ + public final Punishment PUNISHMENT = Punishment.PUNISHMENT; + /** * The table ervu_dashboard.recruitment. */ @@ -172,7 +184,9 @@ public class ErvuDashboard extends SchemaImpl { DriversLicence.DRIVERS_LICENCE, MedicalAuthorities.MEDICAL_AUTHORITIES, Property.PROPERTY, + Prosecution.PROSECUTION, PubRecruitment.PUB_RECRUITMENT, + Punishment.PUNISHMENT, Recruitment.RECRUITMENT, Subpoena.SUBPOENA, TemporaryMeasures.TEMPORARY_MEASURES, diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java index 7821c31d..5e66e1b7 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java @@ -17,7 +17,9 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disease; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.DriversLicence; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.MedicalAuthorities; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Property; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Prosecution; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.PubRecruitment; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Punishment; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Recruitment; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Subpoena; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.TemporaryMeasures; @@ -35,7 +37,9 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.Dise import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DriversLicenceRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.MedicalAuthoritiesRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.PropertyRecord; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.ProsecutionRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.PubRecruitmentRecord; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.PunishmentRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.RecruitmentRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.SubpoenaRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.TemporaryMeasuresRecord; @@ -71,8 +75,10 @@ public class Keys { public static final UniqueKey PK_DRIVERS_LICENCE = Internal.createUniqueKey(DriversLicence.DRIVERS_LICENCE, DSL.name("pk_drivers_licence"), new TableField[] { DriversLicence.DRIVERS_LICENCE.DRIVERS_LICENCE_ID }, true); public static final UniqueKey PK_MEDICAL_AUTHORITIES = Internal.createUniqueKey(MedicalAuthorities.MEDICAL_AUTHORITIES, DSL.name("pk_medical_authorities"), new TableField[] { MedicalAuthorities.MEDICAL_AUTHORITIES.MEDICAL_AUTHORITIES_ID }, true); public static final UniqueKey PK_PROPERTY = Internal.createUniqueKey(Property.PROPERTY, DSL.name("pk_property"), new TableField[] { Property.PROPERTY.PROPERTY_ID }, true); + public static final UniqueKey PK_PROSECUTION = Internal.createUniqueKey(Prosecution.PROSECUTION, DSL.name("pk_prosecution"), new TableField[] { Prosecution.PROSECUTION.PROSECUTION_ID }, true); public static final UniqueKey PUB_RECRUITMENT_PKEY = Internal.createUniqueKey(PubRecruitment.PUB_RECRUITMENT, DSL.name("pub_recruitment_pkey"), new TableField[] { PubRecruitment.PUB_RECRUITMENT.ID }, true); public static final UniqueKey RECRUITMENT_IDM_ID_KEY = Internal.createUniqueKey(PubRecruitment.PUB_RECRUITMENT, DSL.name("recruitment_idm_id_key"), new TableField[] { PubRecruitment.PUB_RECRUITMENT.IDM_ID }, true); + public static final UniqueKey PK_PUNISHMENT = Internal.createUniqueKey(Punishment.PUNISHMENT, DSL.name("pk_punishment"), new TableField[] { Punishment.PUNISHMENT.PUNISHMENT_ID }, true); public static final UniqueKey RECRUITMENT_PKEY = Internal.createUniqueKey(Recruitment.RECRUITMENT, DSL.name("recruitment_pkey"), new TableField[] { Recruitment.RECRUITMENT.ID }, true); public static final UniqueKey SUBPOENA_PKEY = Internal.createUniqueKey(Subpoena.SUBPOENA, DSL.name("subpoena_pkey"), new TableField[] { Subpoena.SUBPOENA.SUBPOENA_ID }, true); public static final UniqueKey TEMPORARY_MEASURES_PKEY = Internal.createUniqueKey(TemporaryMeasures.TEMPORARY_MEASURES, DSL.name("temporary_measures_pkey"), new TableField[] { TemporaryMeasures.TEMPORARY_MEASURES.TEMPORARY_MEASURES_ID }, true); diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java index 92b3cdc2..541e9689 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java @@ -18,7 +18,9 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disease; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.DriversLicence; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.MedicalAuthorities; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Property; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Prosecution; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.PubRecruitment; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Punishment; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Recruitment; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Subpoena; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.TemporaryMeasures; @@ -102,11 +104,21 @@ public class Tables { */ public static final Property PROPERTY = Property.PROPERTY; + /** + * сведения об уголовном преследовании + */ + public static final Prosecution PROSECUTION = Prosecution.PROSECUTION; + /** * The table ervu_dashboard.pub_recruitment. */ public static final PubRecruitment PUB_RECRUITMENT = PubRecruitment.PUB_RECRUITMENT; + /** + * сведения об уголовном преследовании и вынесенном приговоре + */ + public static final Punishment PUNISHMENT = Punishment.PUNISHMENT; + /** * The table ervu_dashboard.recruitment. */ diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Prosecution.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Prosecution.java new file mode 100644 index 00000000..fa716ac8 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Prosecution.java @@ -0,0 +1,292 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables; + + +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.ProsecutionRecord; + +import java.sql.Date; +import java.util.Collection; +import java.util.UUID; + +import org.jooq.Condition; +import org.jooq.Field; +import org.jooq.Identity; +import org.jooq.Name; +import org.jooq.PlainSQL; +import org.jooq.QueryPart; +import org.jooq.SQL; +import org.jooq.Schema; +import org.jooq.Select; +import org.jooq.Stringly; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.TableOptions; +import org.jooq.UniqueKey; +import org.jooq.impl.DSL; +import org.jooq.impl.SQLDataType; +import org.jooq.impl.TableImpl; + + +/** + * сведения об уголовном преследовании + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class Prosecution extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of ervu_dashboard.prosecution + */ + public static final Prosecution PROSECUTION = new Prosecution(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return ProsecutionRecord.class; + } + + /** + * The column ervu_dashboard.prosecution.prosecution_id. + */ + public final TableField PROSECUTION_ID = createField(DSL.name("prosecution_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + /** + * The column ervu_dashboard.prosecution.recruit_id. ссылка на + * гражданина (citizen) + */ + public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "ссылка на гражданина (citizen)"); + + /** + * The column ervu_dashboard.prosecution.kind. вид уголовного + * преследования + */ + public final TableField KIND = createField(DSL.name("kind"), SQLDataType.VARCHAR(255), this, "вид уголовного преследования"); + + /** + * The column ervu_dashboard.prosecution.create_date. дата + * возбуждения уголовного дела + */ + public final TableField CREATE_DATE = createField(DSL.name("create_date"), SQLDataType.DATE, this, "дата возбуждения уголовного дела"); + + /** + * The column ervu_dashboard.prosecution.close_date. дата + * прекращения уголовного преследования + */ + public final TableField CLOSE_DATE = createField(DSL.name("close_date"), SQLDataType.DATE, this, "дата прекращения уголовного преследования"); + + /** + * The column ervu_dashboard.prosecution.authority_name. + * наименование органа, принявшего решение + */ + public final TableField AUTHORITY_NAME = createField(DSL.name("authority_name"), SQLDataType.VARCHAR(255), this, "наименование органа, принявшего решение"); + + /** + * The column ervu_dashboard.prosecution.law_point. пункт, + * часть, статья УК РФ + */ + public final TableField LAW_POINT = createField(DSL.name("law_point"), SQLDataType.VARCHAR(100), this, "пункт, часть, статья УК РФ"); + + /** + * The column ervu_dashboard.prosecution.termination_basis. + * основание прекращения уголовного преследования + */ + public final TableField TERMINATION_BASIS = createField(DSL.name("termination_basis"), SQLDataType.VARCHAR(255), this, "основание прекращения уголовного преследования"); + + /** + * The column ervu_dashboard.prosecution.transfer_to_court. + * признак передачи в суд уголовного дела в отношении гражданина + */ + public final TableField TRANSFER_TO_COURT = createField(DSL.name("transfer_to_court"), SQLDataType.BOOLEAN.defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "признак передачи в суд уголовного дела в отношении гражданина"); + + /** + * The column ervu_dashboard.prosecution.case_number. номер + * уголовного дела (предварительный) + */ + public final TableField CASE_NUMBER = createField(DSL.name("case_number"), SQLDataType.VARCHAR(50), this, "номер уголовного дела (предварительный)"); + + /** + * The column ervu_dashboard.prosecution.case_number_court. + * номер уголовного дела (судебный) + */ + public final TableField CASE_NUMBER_COURT = createField(DSL.name("case_number_court"), SQLDataType.VARCHAR(50), this, "номер уголовного дела (судебный)"); + + /** + * The column ervu_dashboard.prosecution.reclassification. + * сведения о переквалификации деяния + */ + public final TableField RECLASSIFICATION = createField(DSL.name("reclassification"), SQLDataType.CLOB, this, "сведения о переквалификации деяния"); + + private Prosecution(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private Prosecution(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment("сведения об уголовном преследовании"), TableOptions.table(), where); + } + + /** + * Create an aliased ervu_dashboard.prosecution table reference + */ + public Prosecution(String alias) { + this(DSL.name(alias), PROSECUTION); + } + + /** + * Create an aliased ervu_dashboard.prosecution table reference + */ + public Prosecution(Name alias) { + this(alias, PROSECUTION); + } + + /** + * Create a ervu_dashboard.prosecution table reference + */ + public Prosecution() { + this(DSL.name("prosecution"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD; + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public UniqueKey getPrimaryKey() { + return Keys.PK_PROSECUTION; + } + + @Override + public Prosecution as(String alias) { + return new Prosecution(DSL.name(alias), this); + } + + @Override + public Prosecution as(Name alias) { + return new Prosecution(alias, this); + } + + @Override + public Prosecution as(Table alias) { + return new Prosecution(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public Prosecution rename(String name) { + return new Prosecution(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public Prosecution rename(Name name) { + return new Prosecution(name, null); + } + + /** + * Rename this table + */ + @Override + public Prosecution rename(Table name) { + return new Prosecution(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Prosecution where(Condition condition) { + return new Prosecution(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Prosecution where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Prosecution where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Prosecution where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Prosecution where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Prosecution where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Prosecution where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Prosecution where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Prosecution whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Prosecution whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Punishment.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Punishment.java new file mode 100644 index 00000000..60bb1f3c --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Punishment.java @@ -0,0 +1,310 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables; + + +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.PunishmentRecord; + +import java.sql.Date; +import java.util.Collection; +import java.util.UUID; + +import org.jooq.Condition; +import org.jooq.Field; +import org.jooq.Identity; +import org.jooq.Name; +import org.jooq.PlainSQL; +import org.jooq.QueryPart; +import org.jooq.SQL; +import org.jooq.Schema; +import org.jooq.Select; +import org.jooq.Stringly; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.TableOptions; +import org.jooq.UniqueKey; +import org.jooq.impl.DSL; +import org.jooq.impl.SQLDataType; +import org.jooq.impl.TableImpl; + + +/** + * сведения об уголовном преследовании и вынесенном приговоре + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class Punishment extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of ervu_dashboard.punishment + */ + public static final Punishment PUNISHMENT = new Punishment(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return PunishmentRecord.class; + } + + /** + * The column ervu_dashboard.punishment.punishment_id. + */ + public final TableField PUNISHMENT_ID = createField(DSL.name("punishment_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + /** + * The column ervu_dashboard.punishment.recruit_id. ссылка на + * гражданина (citizen) + */ + public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "ссылка на гражданина (citizen)"); + + /** + * The column ervu_dashboard.punishment.sentence. срок или + * размер наказания + */ + public final TableField SENTENCE = createField(DSL.name("sentence"), SQLDataType.VARCHAR(255), this, "срок или размер наказания"); + + /** + * The column ervu_dashboard.punishment.sentence_changed. + * изменение срока или размера наказания + */ + public final TableField SENTENCE_CHANGED = createField(DSL.name("sentence_changed"), SQLDataType.VARCHAR(255), this, "изменение срока или размера наказания"); + + /** + * The column ervu_dashboard.punishment.sentense_date. дата + * вынесения обвинительного приговора + */ + public final TableField SENTENSE_DATE = createField(DSL.name("sentense_date"), SQLDataType.DATE, this, "дата вынесения обвинительного приговора"); + + /** + * The column ervu_dashboard.punishment.authority_name. + * наименование суда, вынесшего приговор + */ + public final TableField AUTHORITY_NAME = createField(DSL.name("authority_name"), SQLDataType.VARCHAR(255), this, "наименование суда, вынесшего приговор"); + + /** + * The column ervu_dashboard.punishment.law_point. пункт, + * часть, статья УК РФ + */ + public final TableField LAW_POINT = createField(DSL.name("law_point"), SQLDataType.VARCHAR(100), this, "пункт, часть, статья УК РФ"); + + /** + * The column ervu_dashboard.punishment.punishment_type. вид + * наказания + */ + public final TableField PUNISHMENT_TYPE = createField(DSL.name("punishment_type"), SQLDataType.VARCHAR(100), this, "вид наказания"); + + /** + * The column ervu_dashboard.punishment.punishment_code. код + * вида наказания + */ + public final TableField PUNISHMENT_CODE = createField(DSL.name("punishment_code"), SQLDataType.VARCHAR(5), this, "код вида наказания"); + + /** + * The column ervu_dashboard.punishment.sentence_place. + * наименование и адрес места отбывания наказания + */ + public final TableField SENTENCE_PLACE = createField(DSL.name("sentence_place"), SQLDataType.CLOB, this, "наименование и адрес места отбывания наказания"); + + /** + * The column ervu_dashboard.punishment.start_date. дата начала + * срока отбывания наказания + */ + public final TableField START_DATE = createField(DSL.name("start_date"), SQLDataType.DATE, this, "дата начала срока отбывания наказания"); + + /** + * The column ervu_dashboard.punishment.planned_date. плановая + * дата отбытия + */ + public final TableField PLANNED_DATE = createField(DSL.name("planned_date"), SQLDataType.DATE, this, "плановая дата отбытия"); + + /** + * The column ervu_dashboard.punishment.release_date. дата + * освобождения + */ + public final TableField RELEASE_DATE = createField(DSL.name("release_date"), SQLDataType.DATE, this, "дата освобождения"); + + /** + * The column ervu_dashboard.punishment.release_reason. + * основание освобождения + */ + public final TableField RELEASE_REASON = createField(DSL.name("release_reason"), SQLDataType.VARCHAR(255), this, "основание освобождения"); + + /** + * The column ervu_dashboard.punishment.mandatory_work. признак + * отбывания наказания в виде обязательных работ + */ + public final TableField MANDATORY_WORK = createField(DSL.name("mandatory_work"), SQLDataType.BOOLEAN.defaultValue(DSL.field(DSL.raw("false"), SQLDataType.BOOLEAN)), this, "признак отбывания наказания в виде обязательных работ"); + + private Punishment(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private Punishment(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment("сведения об уголовном преследовании и вынесенном приговоре"), TableOptions.table(), where); + } + + /** + * Create an aliased ervu_dashboard.punishment table reference + */ + public Punishment(String alias) { + this(DSL.name(alias), PUNISHMENT); + } + + /** + * Create an aliased ervu_dashboard.punishment table reference + */ + public Punishment(Name alias) { + this(alias, PUNISHMENT); + } + + /** + * Create a ervu_dashboard.punishment table reference + */ + public Punishment() { + this(DSL.name("punishment"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD; + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public UniqueKey getPrimaryKey() { + return Keys.PK_PUNISHMENT; + } + + @Override + public Punishment as(String alias) { + return new Punishment(DSL.name(alias), this); + } + + @Override + public Punishment as(Name alias) { + return new Punishment(alias, this); + } + + @Override + public Punishment as(Table alias) { + return new Punishment(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public Punishment rename(String name) { + return new Punishment(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public Punishment rename(Name name) { + return new Punishment(name, null); + } + + /** + * Rename this table + */ + @Override + public Punishment rename(Table name) { + return new Punishment(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Punishment where(Condition condition) { + return new Punishment(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Punishment where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Punishment where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Punishment where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Punishment where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Punishment where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Punishment where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Punishment where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Punishment whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Punishment whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/ProsecutionRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/ProsecutionRecord.java new file mode 100644 index 00000000..e7fe56d7 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/ProsecutionRecord.java @@ -0,0 +1,254 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records; + + +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Prosecution; + +import java.sql.Date; +import java.util.UUID; + +import org.jooq.Record1; +import org.jooq.impl.UpdatableRecordImpl; + + +/** + * сведения об уголовном преследовании + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class ProsecutionRecord extends UpdatableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for ervu_dashboard.prosecution.prosecution_id. + */ + public void setProsecutionId(Long value) { + set(0, value); + } + + /** + * Getter for ervu_dashboard.prosecution.prosecution_id. + */ + public Long getProsecutionId() { + return (Long) get(0); + } + + /** + * Setter for ervu_dashboard.prosecution.recruit_id. ссылка на + * гражданина (citizen) + */ + public void setRecruitId(UUID value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.prosecution.recruit_id. ссылка на + * гражданина (citizen) + */ + public UUID getRecruitId() { + return (UUID) get(1); + } + + /** + * Setter for ervu_dashboard.prosecution.kind. вид уголовного + * преследования + */ + public void setKind(String value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.prosecution.kind. вид уголовного + * преследования + */ + public String getKind() { + return (String) get(2); + } + + /** + * Setter for ervu_dashboard.prosecution.create_date. дата + * возбуждения уголовного дела + */ + public void setCreateDate(Date value) { + set(3, value); + } + + /** + * Getter for ervu_dashboard.prosecution.create_date. дата + * возбуждения уголовного дела + */ + public Date getCreateDate() { + return (Date) get(3); + } + + /** + * Setter for ervu_dashboard.prosecution.close_date. дата + * прекращения уголовного преследования + */ + public void setCloseDate(Date value) { + set(4, value); + } + + /** + * Getter for ervu_dashboard.prosecution.close_date. дата + * прекращения уголовного преследования + */ + public Date getCloseDate() { + return (Date) get(4); + } + + /** + * Setter for ervu_dashboard.prosecution.authority_name. + * наименование органа, принявшего решение + */ + public void setAuthorityName(String value) { + set(5, value); + } + + /** + * Getter for ervu_dashboard.prosecution.authority_name. + * наименование органа, принявшего решение + */ + public String getAuthorityName() { + return (String) get(5); + } + + /** + * Setter for ervu_dashboard.prosecution.law_point. пункт, + * часть, статья УК РФ + */ + public void setLawPoint(String value) { + set(6, value); + } + + /** + * Getter for ervu_dashboard.prosecution.law_point. пункт, + * часть, статья УК РФ + */ + public String getLawPoint() { + return (String) get(6); + } + + /** + * Setter for ervu_dashboard.prosecution.termination_basis. + * основание прекращения уголовного преследования + */ + public void setTerminationBasis(String value) { + set(7, value); + } + + /** + * Getter for ervu_dashboard.prosecution.termination_basis. + * основание прекращения уголовного преследования + */ + public String getTerminationBasis() { + return (String) get(7); + } + + /** + * Setter for ervu_dashboard.prosecution.transfer_to_court. + * признак передачи в суд уголовного дела в отношении гражданина + */ + public void setTransferToCourt(Boolean value) { + set(8, value); + } + + /** + * Getter for ervu_dashboard.prosecution.transfer_to_court. + * признак передачи в суд уголовного дела в отношении гражданина + */ + public Boolean getTransferToCourt() { + return (Boolean) get(8); + } + + /** + * Setter for ervu_dashboard.prosecution.case_number. номер + * уголовного дела (предварительный) + */ + public void setCaseNumber(String value) { + set(9, value); + } + + /** + * Getter for ervu_dashboard.prosecution.case_number. номер + * уголовного дела (предварительный) + */ + public String getCaseNumber() { + return (String) get(9); + } + + /** + * Setter for ervu_dashboard.prosecution.case_number_court. + * номер уголовного дела (судебный) + */ + public void setCaseNumberCourt(String value) { + set(10, value); + } + + /** + * Getter for ervu_dashboard.prosecution.case_number_court. + * номер уголовного дела (судебный) + */ + public String getCaseNumberCourt() { + return (String) get(10); + } + + /** + * Setter for ervu_dashboard.prosecution.reclassification. + * сведения о переквалификации деяния + */ + public void setReclassification(String value) { + set(11, value); + } + + /** + * Getter for ervu_dashboard.prosecution.reclassification. + * сведения о переквалификации деяния + */ + public String getReclassification() { + return (String) get(11); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 key() { + return (Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached ProsecutionRecord + */ + public ProsecutionRecord() { + super(Prosecution.PROSECUTION); + } + + /** + * Create a detached, initialised ProsecutionRecord + */ + public ProsecutionRecord(Long prosecutionId, UUID recruitId, String kind, Date createDate, Date closeDate, String authorityName, String lawPoint, String terminationBasis, Boolean transferToCourt, String caseNumber, String caseNumberCourt, String reclassification) { + super(Prosecution.PROSECUTION); + + setProsecutionId(prosecutionId); + setRecruitId(recruitId); + setKind(kind); + setCreateDate(createDate); + setCloseDate(closeDate); + setAuthorityName(authorityName); + setLawPoint(lawPoint); + setTerminationBasis(terminationBasis); + setTransferToCourt(transferToCourt); + setCaseNumber(caseNumber); + setCaseNumberCourt(caseNumberCourt); + setReclassification(reclassification); + resetChangedOnNotNull(); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/PunishmentRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/PunishmentRecord.java new file mode 100644 index 00000000..9c729f3d --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/PunishmentRecord.java @@ -0,0 +1,305 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records; + + +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Punishment; + +import java.sql.Date; +import java.util.UUID; + +import org.jooq.Record1; +import org.jooq.impl.UpdatableRecordImpl; + + +/** + * сведения об уголовном преследовании и вынесенном приговоре + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class PunishmentRecord extends UpdatableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for ervu_dashboard.punishment.punishment_id. + */ + public void setPunishmentId(Long value) { + set(0, value); + } + + /** + * Getter for ervu_dashboard.punishment.punishment_id. + */ + public Long getPunishmentId() { + return (Long) get(0); + } + + /** + * Setter for ervu_dashboard.punishment.recruit_id. ссылка на + * гражданина (citizen) + */ + public void setRecruitId(UUID value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.punishment.recruit_id. ссылка на + * гражданина (citizen) + */ + public UUID getRecruitId() { + return (UUID) get(1); + } + + /** + * Setter for ervu_dashboard.punishment.sentence. срок или + * размер наказания + */ + public void setSentence(String value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.punishment.sentence. срок или + * размер наказания + */ + public String getSentence() { + return (String) get(2); + } + + /** + * Setter for ervu_dashboard.punishment.sentence_changed. + * изменение срока или размера наказания + */ + public void setSentenceChanged(String value) { + set(3, value); + } + + /** + * Getter for ervu_dashboard.punishment.sentence_changed. + * изменение срока или размера наказания + */ + public String getSentenceChanged() { + return (String) get(3); + } + + /** + * Setter for ervu_dashboard.punishment.sentense_date. дата + * вынесения обвинительного приговора + */ + public void setSentenseDate(Date value) { + set(4, value); + } + + /** + * Getter for ervu_dashboard.punishment.sentense_date. дата + * вынесения обвинительного приговора + */ + public Date getSentenseDate() { + return (Date) get(4); + } + + /** + * Setter for ervu_dashboard.punishment.authority_name. + * наименование суда, вынесшего приговор + */ + public void setAuthorityName(String value) { + set(5, value); + } + + /** + * Getter for ervu_dashboard.punishment.authority_name. + * наименование суда, вынесшего приговор + */ + public String getAuthorityName() { + return (String) get(5); + } + + /** + * Setter for ervu_dashboard.punishment.law_point. пункт, + * часть, статья УК РФ + */ + public void setLawPoint(String value) { + set(6, value); + } + + /** + * Getter for ervu_dashboard.punishment.law_point. пункт, + * часть, статья УК РФ + */ + public String getLawPoint() { + return (String) get(6); + } + + /** + * Setter for ervu_dashboard.punishment.punishment_type. вид + * наказания + */ + public void setPunishmentType(String value) { + set(7, value); + } + + /** + * Getter for ervu_dashboard.punishment.punishment_type. вид + * наказания + */ + public String getPunishmentType() { + return (String) get(7); + } + + /** + * Setter for ervu_dashboard.punishment.punishment_code. код + * вида наказания + */ + public void setPunishmentCode(String value) { + set(8, value); + } + + /** + * Getter for ervu_dashboard.punishment.punishment_code. код + * вида наказания + */ + public String getPunishmentCode() { + return (String) get(8); + } + + /** + * Setter for ervu_dashboard.punishment.sentence_place. + * наименование и адрес места отбывания наказания + */ + public void setSentencePlace(String value) { + set(9, value); + } + + /** + * Getter for ervu_dashboard.punishment.sentence_place. + * наименование и адрес места отбывания наказания + */ + public String getSentencePlace() { + return (String) get(9); + } + + /** + * Setter for ervu_dashboard.punishment.start_date. дата начала + * срока отбывания наказания + */ + public void setStartDate(Date value) { + set(10, value); + } + + /** + * Getter for ervu_dashboard.punishment.start_date. дата начала + * срока отбывания наказания + */ + public Date getStartDate() { + return (Date) get(10); + } + + /** + * Setter for ervu_dashboard.punishment.planned_date. плановая + * дата отбытия + */ + public void setPlannedDate(Date value) { + set(11, value); + } + + /** + * Getter for ervu_dashboard.punishment.planned_date. плановая + * дата отбытия + */ + public Date getPlannedDate() { + return (Date) get(11); + } + + /** + * Setter for ervu_dashboard.punishment.release_date. дата + * освобождения + */ + public void setReleaseDate(Date value) { + set(12, value); + } + + /** + * Getter for ervu_dashboard.punishment.release_date. дата + * освобождения + */ + public Date getReleaseDate() { + return (Date) get(12); + } + + /** + * Setter for ervu_dashboard.punishment.release_reason. + * основание освобождения + */ + public void setReleaseReason(String value) { + set(13, value); + } + + /** + * Getter for ervu_dashboard.punishment.release_reason. + * основание освобождения + */ + public String getReleaseReason() { + return (String) get(13); + } + + /** + * Setter for ervu_dashboard.punishment.mandatory_work. признак + * отбывания наказания в виде обязательных работ + */ + public void setMandatoryWork(Boolean value) { + set(14, value); + } + + /** + * Getter for ervu_dashboard.punishment.mandatory_work. признак + * отбывания наказания в виде обязательных работ + */ + public Boolean getMandatoryWork() { + return (Boolean) get(14); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 key() { + return (Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached PunishmentRecord + */ + public PunishmentRecord() { + super(Punishment.PUNISHMENT); + } + + /** + * Create a detached, initialised PunishmentRecord + */ + public PunishmentRecord(Long punishmentId, UUID recruitId, String sentence, String sentenceChanged, Date sentenseDate, String authorityName, String lawPoint, String punishmentType, String punishmentCode, String sentencePlace, Date startDate, Date plannedDate, Date releaseDate, String releaseReason, Boolean mandatoryWork) { + super(Punishment.PUNISHMENT); + + setPunishmentId(punishmentId); + setRecruitId(recruitId); + setSentence(sentence); + setSentenceChanged(sentenceChanged); + setSentenseDate(sentenseDate); + setAuthorityName(authorityName); + setLawPoint(lawPoint); + setPunishmentType(punishmentType); + setPunishmentCode(punishmentCode); + setSentencePlace(sentencePlace); + setStartDate(startDate); + setPlannedDate(plannedDate); + setReleaseDate(releaseDate); + setReleaseReason(releaseReason); + setMandatoryWork(mandatoryWork); + resetChangedOnNotNull(); + } +} diff --git a/resources/src/main/resources/business-model/citizencard.page b/resources/src/main/resources/business-model/citizencard.page index 110c2b2d..46c29f86 100644 --- a/resources/src/main/resources/business-model/citizencard.page +++ b/resources/src/main/resources/business-model/citizencard.page @@ -41,7 +41,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"3":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"4":{"tableName":"citizenship","schemaName":"ervu_dashboard","x":106.0,"y":50.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"5":{"tableName":"deputy","schemaName":"ervu_dashboard","x":110.0,"y":162.0,"alias":"deputy","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"6":{"tableName":"deputy","schemaName":"ervu_dashboard","x":113.0,"y":268.0,"alias":"deputy1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"citizenship","schemaName":"ervu_dashboard","x":106.0,"y":50.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"deputy","schemaName":"ervu_dashboard","x":110.0,"y":162.0,"alias":"deputy","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"deputy","schemaName":"ervu_dashboard","x":113.0,"y":268.0,"alias":"deputy1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"citizen":{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"deputy":{"tableName":"deputy","schemaName":"ervu_dashboard","x":110.0,"y":162.0,"alias":"deputy","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"citizenship":{"tableName":"citizenship","schemaName":"ervu_dashboard","x":106.0,"y":50.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"drivers_licence1":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"drivers_licence":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"deputy1":{"tableName":"deputy","schemaName":"ervu_dashboard","x":113.0,"y":268.0,"alias":"deputy1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"citizen","refToEntityName":"recruitment","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"drivers_licence","refToColumns":[{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence","name":"tractor_driver"},"operation":"EQUAL","typeCode":"CONST","values":["false"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"drivers_licence1","refToColumns":[{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence1","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence1","name":"tractor_driver"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"citizenship","refToColumns":[{"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"deputy","refToColumns":[{"schema":"ervu_dashboard","table":"deputy","entity":"deputy","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"deputy","entity":"deputy","name":"deputy"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"deputy1","refToColumns":[{"schema":"ervu_dashboard","table":"deputy","entity":"deputy1","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"deputy","entity":"deputy1","name":"deputy"},"operation":"EQUAL","typeCode":"CONST","values":["false"]}],"groups":[]}}],[null,null,null,null,null,null,null],[null,null,null,null,null,null,null],[null,null,null,null,null,null,null],[null,null,null,null,null,null,null],[null,null,null,null,null,null,null],[null,null,null,null,null,null,null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"3":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"4":{"tableName":"citizenship","schemaName":"ervu_dashboard","x":106.0,"y":50.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"5":{"tableName":"deputy","schemaName":"ervu_dashboard","x":110.0,"y":162.0,"alias":"deputy","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"6":{"tableName":"deputy","schemaName":"ervu_dashboard","x":113.0,"y":268.0,"alias":"deputy1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"7":{"tableName":"prosecution","schemaName":"ervu_dashboard","x":247.0,"y":269.0,"alias":"prosecution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"8":{"tableName":"punishment","schemaName":"ervu_dashboard","x":401.0,"y":266.0,"alias":"punishment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"citizenship","schemaName":"ervu_dashboard","x":106.0,"y":50.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"deputy","schemaName":"ervu_dashboard","x":110.0,"y":162.0,"alias":"deputy","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"deputy","schemaName":"ervu_dashboard","x":113.0,"y":268.0,"alias":"deputy1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"prosecution","schemaName":"ervu_dashboard","x":247.0,"y":269.0,"alias":"prosecution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"punishment","schemaName":"ervu_dashboard","x":401.0,"y":266.0,"alias":"punishment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"citizen":{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"punishment":{"tableName":"punishment","schemaName":"ervu_dashboard","x":401.0,"y":266.0,"alias":"punishment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"deputy":{"tableName":"deputy","schemaName":"ervu_dashboard","x":110.0,"y":162.0,"alias":"deputy","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"citizenship":{"tableName":"citizenship","schemaName":"ervu_dashboard","x":106.0,"y":50.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"prosecution":{"tableName":"prosecution","schemaName":"ervu_dashboard","x":247.0,"y":269.0,"alias":"prosecution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"drivers_licence1":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"drivers_licence":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"deputy1":{"tableName":"deputy","schemaName":"ervu_dashboard","x":113.0,"y":268.0,"alias":"deputy1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"citizen","refToEntityName":"recruitment","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"drivers_licence","refToColumns":[{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence","name":"tractor_driver"},"operation":"EQUAL","typeCode":"CONST","values":["false"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"drivers_licence1","refToColumns":[{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence1","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence1","name":"tractor_driver"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"citizenship","refToColumns":[{"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"deputy","refToColumns":[{"schema":"ervu_dashboard","table":"deputy","entity":"deputy","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"deputy","entity":"deputy","name":"deputy"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"deputy1","refToColumns":[{"schema":"ervu_dashboard","table":"deputy","entity":"deputy1","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"deputy","entity":"deputy1","name":"deputy"},"operation":"EQUAL","typeCode":"CONST","values":["false"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"prosecution","refToColumns":[{"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"punishment","refToColumns":[{"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null]],"mainNodeIndex":0} @@ -6379,7 +6379,6 @@ c3b1ac79-f3da-4d48-b7e5-810010ec64d9 HB - мобил, добровол, контракт true - false false @@ -15510,6 +15509,7 @@ cb814ffd-638b-4901-9d9f-ec3f5838d159 Сведения о состоянии зоровья, о присвоении спортивных разрядов и званий true + false false @@ -22174,6 +22174,7 @@ 59d67b7a-8404-484e-b55e-170c5b630558 Граждане, избранные депутатами true + false false @@ -22924,16 +22925,9 @@ df066734-2e41-4721-b37c-d1d27536377b Сведения о судимости и уголовном преследовании true - false false - - disabled - - true - - heading @@ -23024,754 +23018,497 @@ false - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - 9ad54f07-7d54-4af9-8b9c-918882776e81 - Hbox + + 27912fc5-0be7-4d4c-ae46-a82979253599 + 4112b27a-28cf-4538-9562-af4387af9a10 + Filter group true false false - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 2533cb48-6eec-4885-a5ee-bbb03c9454e8 - Сведения о факте уголовного преследования либо о прекращении уголовного преследования + + + + liveFilter + + true + + + + visible + + false + + + + + + + + filterable + + {"objectId":"1b7f7bcb-5b22-4904-a4ac-6822f486d514","packageName":"rpc","className":"GridRpcService","type":"JAVA"} + + + + + + + + + + 4d981f15-5535-45f7-882b-3647b251ad05 + 93d489e2-fb46-420c-aa33-28b898664e4d + citizen_id (filter) false false - - initialValue - - null - - label - "Сведения о факте уголовного преследования либо о прекращении уголовного преследования" - - - - textFormatter - - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - + "citizen_id" - - - - - false + - columnForSave + operation - null + "EQUAL" + + + + columnForFilter + + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"recruit_id"} + + + + + + + + - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 64cc66ac-4a0b-4b01-89dc-aa9c8a763c5a + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 2d9d08a6-500c-4741-8cb8-d3b19bbd9ebb + Action Controller + false + true + + + + 16071adb-3bdf-4c33-b29b-886876016415 + 1b7f7bcb-5b22-4904-a4ac-6822f486d514 + Grid_уголовное преследование + true + false + false + + + + autoStretchColumns + + true + + + + theme + + "BALHAM_DARK" + + + + + + + + gridService + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"prosecution","schemaName":"ervu_dashboard","x":303.0,"y":178.0,"alias":"prosecution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"prosecution","schemaName":"ervu_dashboard","x":303.0,"y":178.0,"alias":"prosecution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"prosecution":{"tableName":"prosecution","schemaName":"ervu_dashboard","x":303.0,"y":178.0,"alias":"prosecution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + + + + + + + + + + columnSorts + + + + + + field + + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"create_date"} + + + + sortOrder + + "ASC" + + + + + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + ac68d867-218d-4778-8745-6a04f0c40cf9 Вид уголовного преследования false false - + + - initialValue - - null - - - - label + displayName "Вид уголовного преследования" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"kind"} - - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - 65faa42d-c894-46d2-b98e-ae7bc74cc3d5 - Hbox - true - false - false - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - a4ea31a9-4dad-4e32-83bf-327643bc6556 + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 3093524e-e809-4678-b90e-f12e5f924e13 Дата возбуждения уголовного дела false false - + - initialValue + valueFormatter - null + + DateFormatter + component.grid.formatters + + + + + - label + displayName "Дата возбуждения уголовного дела" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"create_date"} - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - f93a3b38-522c-4f63-a158-2b0fb6a943f1 + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + a5a1d189-6f5d-482a-ae82-e12b498f40a0 Номер уголовного дела (предварительный) false false - + - initialValue + valueFormatter - null + + DateFormatter + component.grid.formatters + + + + + - label + displayName "Номер уголовного дела (предварительный)" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"case_number"} - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 30377913-84ec-449d-8365-d665909d53fd + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + a92114cb-88d8-4f61-85d1-a982e6745501 Наименование органа, принявшего решение false false - + + - initialValue - - null - - - - label + displayName "Наименование органа, принявшего решение" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"authority_name"} - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 24cae97a-6657-4a50-94dc-a6cd39517b0b + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 052e5842-3737-4bf0-baee-0dd7be402beb Пункт, часть, статья УК РФ false false - + + - initialValue - - null - - - - label + displayName "Пункт, часть, статья УК РФ" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"law_point"} - - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - fa2456ea-c1b7-4250-b17a-2ec5f7e0acf6 - Hbox - true - false - false - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - caccedd6-c142-440c-9d5d-ebbafd858fa8 + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + d0e7a70c-1ad2-43dd-afba-212868bf813a Дата прекращения уголовного преследования false false - + - initialValue + valueFormatter - null + + DateFormatter + component.grid.formatters + + + + + - label + displayName "Дата прекращения уголовного преследования" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"close_date"} - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 25e68e82-eb48-4032-b4ba-16cdbb050d7a + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 8a091628-31c2-4be8-9960-b803cdc0c3c3 Основание прекращения уголовного преследования false false - + + - initialValue - - null - - - - label + displayName "Основание прекращения уголовного преследования" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"termination_basis"} - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 130e3b9c-cca0-46a8-90d2-54f1b5b11c72 + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 1e6b574f-471c-4c16-9583-793a22ffa14c Признак передачи в суд уголовного дела в отношении гражданина false false - + + - initialValue - - null - - - - label + displayName "Признак передачи в суд уголовного дела в отношении гражданина" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"transfer_to_court"} - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 16f8f943-1941-4831-8fee-80fccbb23cee + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + aa944443-460b-40db-9a36-aa73175758cb Номер уголовного дела (судебный) false false - + + - initialValue - - null - - - - label + displayName "Номер уголовного дела (судебный)" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"case_number_court"} - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - e42285ee-2d1c-47f3-860d-f37c493d0700 + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 34246611-c254-47c3-b719-00d0b08b0d3e Сведения о переквалификации деяния false false - + + - initialValue - - null - - - - label + displayName "Сведения о переквалификации деяния" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"reclassification"} @@ -23911,12 +23648,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"sentence"} @@ -23976,12 +23712,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"sentence_changed"} @@ -24041,12 +23776,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"sentense_date"} @@ -24119,12 +23853,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"authority_name"} @@ -24189,16 +23922,16 @@ columnForSave - null + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"law_point"} - + ba24d307-0b91-4299-ba82-9d0b52384ff2 - cad884f8-2337-4ee8-8d6b-65c989b4fe02 - Срок наказания + 89281b76-7816-4abe-b45c-bb7f49a6a16b + Вид наказания false false @@ -24212,7 +23945,7 @@ label - "Срок наказания" + "Вид наказания" @@ -24249,20 +23982,19 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"punishment_type"} - + ba24d307-0b91-4299-ba82-9d0b52384ff2 - 89281b76-7816-4abe-b45c-bb7f49a6a16b + 53ce4bea-0d35-4cd2-9606-f8bf7477a4d5 Код вида наказания false false @@ -24314,12 +24046,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"punishment_code"} @@ -24405,14 +24136,37 @@ - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - d2e82323-f838-4e58-befb-b94b6b8ec971 - Признак отбывания наказания в местах лишения свободы + + 8b755f7b-e52b-4800-830a-f01467cd5cbb + a0b43271-5940-4092-9b85-fb89fbee550b + Признак отбывания наказания в местах лишения свободы_checkbox false false - + + + allowNull + + true + + + + cssClasses + + + +"check-invert" + + + + + + + disabled + + true + + initialValue @@ -24421,36 +24175,51 @@ label + + null + + + + + + + + + false + + + columnForSave + + null + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 0c4dd753-e88b-426b-b7eb-5fa65d5d0d8a + Признак отбывания наказания в местах лишения свободы_text + false + false + + + + initialValue "Признак отбывания наказания в местах лишения свободы" + + label + + null + + textFormatter - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - + @@ -24470,137 +24239,797 @@ + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + eb680691-fb58-4757-bfa2-1264c10f59d2 + Vbox + true + true + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + d2e82323-f838-4e58-befb-b94b6b8ec971 + Признак отбывания наказания в местах лишения свободы + false + true + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 2d47cdc2-2011-4467-a62d-298f162f18a4 + AC_признак отбывания наказания_true + false + false + + + + eventRefs + + + + + + behavior + + {"objectId":"c12c936d-0269-4149-a634-b5390b26c137","packageName":"component","className":"Text","type":"TS"} + + + + propertyName + + "valueChangeEvent" + + + + + + + + + + behavior + + {"objectId":"49e5ec22-8aaa-4f6c-84e0-e84541253686","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + propertyName + + "valueChangeEvent" + + + + + + + + + ifCondition + + + +conditions + + + + + + _isGroupSelected + + false + + + + one + + + +conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"c12c936d-0269-4149-a634-b5390b26c137","packageName":"component","className":"Text","type":"TS"} + + + + method + + "getValue" + + + + + + + + + +operation + + "IS_NOT_EMPTY" + + + + + + + + + + + + + + + _isGroupSelected + + true + + + + group + + + +conditions + + + + + + _isGroupSelected + + true + + + + group + + + +conditions + + + + + + _isGroupSelected + + false + + + + one + + + +conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"49e5ec22-8aaa-4f6c-84e0-e84541253686","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + method + + "getDateValue" + + + + + + + + + +operation + + "IS_NOT_EMPTY" + + + + + + + + + + + + + _isGroupSelected + + false + + + + one + + + +conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"49e5ec22-8aaa-4f6c-84e0-e84541253686","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + method + + "getDateValue" + + + + + + + + + +conditionSecondPart + + + + objectValue + + + + argument + + null + + + + behavior + + {"objectId":"15f99a2f-53fe-4ef7-a7fe-012c7b1f38fc","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + method + + "getDateValue" + + + + + + + + + +operation + + "GREATER_THAN_OR_EQUAL" + + + + + + + + + + + +logicalOperation + + null + + + + + + + + + + + + + _isGroupSelected + + false + + + + one + + + +conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"49e5ec22-8aaa-4f6c-84e0-e84541253686","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + method + + "getDateValue" + + + + + + + + + +operation + + "IS_EMPTY" + + + + + + + + + + + +logicalOperation + + "OR" + + + + + + + + + + + +logicalOperation + + null + + + + + + + thenActions + + + + + + behavior + + {"objectId":"a0b43271-5940-4092-9b85-fb89fbee550b","packageName":"component.field","className":"CheckBox","type":"TS"} + + + + method + + "setValue" + + + + value + + + + staticValue + + + boolean + + + true + + + + + + + + + + + + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + 2e74c1c0-cde7-4355-8e9a-4f3067394548 + AC_признак отбывания наказания_false + false + false + + + + eventRefs + + + + + + behavior + + {"objectId":"c12c936d-0269-4149-a634-b5390b26c137","packageName":"component","className":"Text","type":"TS"} + + + + propertyName + + "valueChangeEvent" + + + + + + + + + + behavior + + {"objectId":"49e5ec22-8aaa-4f6c-84e0-e84541253686","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + propertyName + + "valueChangeEvent" + + + + + + + + + ifCondition + + + +conditions + + + + + + _isGroupSelected + + false + + + + one + + + +conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"c12c936d-0269-4149-a634-b5390b26c137","packageName":"component","className":"Text","type":"TS"} + + + + method + + "getValue" + + + + + + + + + +operation + + "IS_NOT_EMPTY" + + + + + + + + + + + + + _isGroupSelected + + false + + + + one + + + +conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"49e5ec22-8aaa-4f6c-84e0-e84541253686","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + method + + "getDateValue" + + + + + + + + + +operation + + "IS_NOT_EMPTY" + + + + + + + + + + + + + _isGroupSelected + + false + + + + one + + + +conditionFirstPart + + + + objectValue + + + + behavior + + {"objectId":"49e5ec22-8aaa-4f6c-84e0-e84541253686","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + method + + "getDateValue" + + + + + + + + + +conditionSecondPart + + + + objectValue + + + + argument + + null + + + + behavior + + {"objectId":"15f99a2f-53fe-4ef7-a7fe-012c7b1f38fc","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + method + + "getDateValue" + + + + + + + + + +operation + + "LESS_THAN" + + + + + + + + + + + + + +logicalOperation + + null + + + + + + + thenActions + + + + + + behavior + + {"objectId":"a0b43271-5940-4092-9b85-fb89fbee550b","packageName":"component.field","className":"CheckBox","type":"TS"} + + + + method + + "setValue" + + + + value + + + + staticValue + + + boolean + + + false + + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 c014d150-614c-4108-abaf-ed43f094ed82 - Наименование места отбывания наказания + Наименование и адрес места отбывания наказания false - false - - - - initialValue - - null - - - - label - - "Наименование места отбывания наказания" - - - - textFormatter - - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - - columnForSave - - null - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 04bdfbb8-efee-4f85-aaf4-cc59cb57636e - Адрес места отбывания наказания - false - false - - - - initialValue - - null - - - - label - - "Адрес места отбывания наказания" - - - - textFormatter - - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - - columnForSave - - null - - - - + true + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + c014d150-614c-4108-abaf-ed43f094ed82 + Наименование и адрес места отбывания наказания + false + false + + + + initialValue + + null + + + + label + + "Наименование и адрес места отбывания наказания" + + + + textFormatter + + + + replaceModels + + + + + + value + + "-" + + + + + + + + + + ReplaceValueTextFormatter + ervu-dashboard.formatter + + + + + + + + + + + + columnForSave + + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"sentence_place"} + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d cbbc9a62-f224-4fdf-bda6-6f24d16b28db @@ -24667,12 +25096,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"start_date"} @@ -24732,12 +25160,11 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"planned_date"} @@ -24797,12 +25224,47 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"release_date"} + + + + + + + c6a4e38d-d0b3-46dd-960b-36c7e8beba36 + 49e5ec22-8aaa-4f6c-84e0-e84541253686 + Date time picker + false + false + + + + dateValueFormat + + "DATE" + + + + visible + + false + + + + + + + + + + + columnForSave + + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"release_date"} @@ -24862,25 +25324,79 @@ - false columnForSave - null + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"release_reason"} - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 40879edf-fa19-43b8-a247-b87e6fd6dcff + + 9d1b5af1-0b8f-4b1b-b9a5-c2e6acf72d91 + c72a8505-a983-47f2-bd16-e802770f96e2 + Vbox + true + true + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 9a37d336-cd90-418d-960e-0fdde0da3854 + Hbox + true + true + + + 8b755f7b-e52b-4800-830a-f01467cd5cbb + 630ce2c5-75fb-42e7-ae54-a2034bd49f1a Признак отбывания наказания в виде обязательных работ false + true + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 9a37d336-cd90-418d-960e-0fdde0da3854 + Hbox + true + false + + + + + + + 8b755f7b-e52b-4800-830a-f01467cd5cbb + 630ce2c5-75fb-42e7-ae54-a2034bd49f1a + Признак отбывания наказания в виде обязательных работ_checkbox + false false - + + + allowNull + + true + + + + cssClasses + + + +"check-invert" + + + + + + disabled + + true + + initialValue @@ -24889,36 +25405,50 @@ label + + null + + + + + + + + + + + columnForSave + + {"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"mandatory_work"} + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 40879edf-fa19-43b8-a247-b87e6fd6dcff + Признак отбывания наказания в виде обязательных работ_text + false + false + + + + initialValue "Признак отбывания наказания в виде обязательных работ" + + label + + null + + textFormatter - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - + @@ -27881,6 +28411,7 @@ f8182129-2730-4704-8569-52b5e14436ba Hbox true + false false @@ -28220,6 +28751,7 @@ 0e7ff672-c56e-4daa-9747-673de7146fc3 Hbox true + false false @@ -28427,6 +28959,7 @@ abc82822-6d9a-4453-9c50-64e9347cd169 Hbox true + false false @@ -30436,6 +30969,156 @@ + + + + + + behavior + + {"objectId":"93d489e2-fb46-420c-aa33-28b898664e4d","packageName":"component.field","className":"TextField","type":"TS"} + + + + method + + "setValue" + + + + value + + + + objectValue + + + + argument + + null + + + + behavior + + {"objectId":"55e4b61a-3031-4221-a732-d31a727d89f9","packageName":"component","className":"Text","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + + + + + + + + + c6a4e38d-d0b3-46dd-960b-36c7e8beba36 + 15f99a2f-53fe-4ef7-a7fe-012c7b1f38fc + CurDate + false + false + false + + + + visible + +false + + + + + + + + + false + + + + 98594cec-0a9b-4cef-af09-e1b71cb2ad9e + fad533d1-66d2-4737-9492-3db4bc727ee6 + AC_curdate + false + false + + + + eventRefs + + + + + + behavior + + {"objectId":"c1ded618-c0e0-4068-b160-29c489aaf8f6","packageName":"component.container","className":"VBox","type":"TS"} + + + + propertyName + + "beforeStart" + + + + + + + + + ifCondition + + + + logicalOperation + + null + + + + + + + thenActions + + + + + + behavior + + {"objectId":"15f99a2f-53fe-4ef7-a7fe-012c7b1f38fc","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + method + + "setCurrentDate" + + + + value + + null + + + + From a2ef59accbd0a20bf9ea431c571d8860278c399e Mon Sep 17 00:00:00 2001 From: Makarova Elena Date: Thu, 26 Sep 2024 18:21:13 +0300 Subject: [PATCH 40/68] =?UTF-8?q?=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=D0=B0=20=D0=B1=D0=B4,=20=D0=BD=D0=B0=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=B8=D0=BB=D0=B0=20=D0=B3=D1=80=D0=B8=D0=B4=20=D0=BF?= =?UTF-8?q?=D0=BE=20=D0=BF=D0=B0=D1=81=D0=BF=D0=BE=D1=80=D1=82=D0=BD=D1=8B?= =?UTF-8?q?=D0=BC=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ervu_dashboard/ErvuDashboard.java | 7 + .../db_beans/ervu_dashboard/Keys.java | 3 + .../db_beans/ervu_dashboard/Tables.java | 6 + .../ervu_dashboard/tables/Passport.java | 268 ++++++ .../tables/records/PassportRecord.java | 186 ++++ .../resources/business-model/citizencard.page | 859 +++++++----------- 6 files changed, 818 insertions(+), 511 deletions(-) create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Passport.java create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/PassportRecord.java diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java index 6850455d..03e659b7 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java @@ -18,6 +18,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disability; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disease; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.DriversLicence; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.MedicalAuthorities; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Passport; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Property; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Prosecution; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.PubRecruitment; @@ -114,6 +115,11 @@ public class ErvuDashboard extends SchemaImpl { */ public final MedicalAuthorities MEDICAL_AUTHORITIES = MedicalAuthorities.MEDICAL_AUTHORITIES; + /** + * сведения о паспорте + */ + public final Passport PASSPORT = Passport.PASSPORT; + /** * сведения об имуществе */ @@ -183,6 +189,7 @@ public class ErvuDashboard extends SchemaImpl { Disease.DISEASE, DriversLicence.DRIVERS_LICENCE, MedicalAuthorities.MEDICAL_AUTHORITIES, + Passport.PASSPORT, Property.PROPERTY, Prosecution.PROSECUTION, PubRecruitment.PUB_RECRUITMENT, diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java index 5e66e1b7..3287f830 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java @@ -16,6 +16,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disability; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disease; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.DriversLicence; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.MedicalAuthorities; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Passport; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Property; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Prosecution; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.PubRecruitment; @@ -36,6 +37,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.Disa import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DiseaseRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DriversLicenceRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.MedicalAuthoritiesRecord; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.PassportRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.PropertyRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.ProsecutionRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.PubRecruitmentRecord; @@ -74,6 +76,7 @@ public class Keys { public static final UniqueKey PK_DISEASE = Internal.createUniqueKey(Disease.DISEASE, DSL.name("pk_disease"), new TableField[] { Disease.DISEASE.DISEASE_ID }, true); public static final UniqueKey PK_DRIVERS_LICENCE = Internal.createUniqueKey(DriversLicence.DRIVERS_LICENCE, DSL.name("pk_drivers_licence"), new TableField[] { DriversLicence.DRIVERS_LICENCE.DRIVERS_LICENCE_ID }, true); public static final UniqueKey PK_MEDICAL_AUTHORITIES = Internal.createUniqueKey(MedicalAuthorities.MEDICAL_AUTHORITIES, DSL.name("pk_medical_authorities"), new TableField[] { MedicalAuthorities.MEDICAL_AUTHORITIES.MEDICAL_AUTHORITIES_ID }, true); + public static final UniqueKey PK_PASSPORT = Internal.createUniqueKey(Passport.PASSPORT, DSL.name("pk_passport"), new TableField[] { Passport.PASSPORT.PASSPORT_ID }, true); public static final UniqueKey PK_PROPERTY = Internal.createUniqueKey(Property.PROPERTY, DSL.name("pk_property"), new TableField[] { Property.PROPERTY.PROPERTY_ID }, true); public static final UniqueKey PK_PROSECUTION = Internal.createUniqueKey(Prosecution.PROSECUTION, DSL.name("pk_prosecution"), new TableField[] { Prosecution.PROSECUTION.PROSECUTION_ID }, true); public static final UniqueKey PUB_RECRUITMENT_PKEY = Internal.createUniqueKey(PubRecruitment.PUB_RECRUITMENT, DSL.name("pub_recruitment_pkey"), new TableField[] { PubRecruitment.PUB_RECRUITMENT.ID }, true); diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java index 541e9689..bfc83539 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java @@ -17,6 +17,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disability; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disease; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.DriversLicence; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.MedicalAuthorities; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Passport; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Property; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Prosecution; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.PubRecruitment; @@ -99,6 +100,11 @@ public class Tables { */ public static final MedicalAuthorities MEDICAL_AUTHORITIES = MedicalAuthorities.MEDICAL_AUTHORITIES; + /** + * сведения о паспорте + */ + public static final Passport PASSPORT = Passport.PASSPORT; + /** * сведения об имуществе */ diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Passport.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Passport.java new file mode 100644 index 00000000..1847b92f --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Passport.java @@ -0,0 +1,268 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables; + + +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.PassportRecord; + +import java.sql.Date; +import java.util.Collection; +import java.util.UUID; + +import org.jooq.Condition; +import org.jooq.Field; +import org.jooq.Identity; +import org.jooq.Name; +import org.jooq.PlainSQL; +import org.jooq.QueryPart; +import org.jooq.SQL; +import org.jooq.Schema; +import org.jooq.Select; +import org.jooq.Stringly; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.TableOptions; +import org.jooq.UniqueKey; +import org.jooq.impl.DSL; +import org.jooq.impl.SQLDataType; +import org.jooq.impl.TableImpl; + + +/** + * сведения о паспорте + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class Passport extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of ervu_dashboard.passport + */ + public static final Passport PASSPORT = new Passport(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return PassportRecord.class; + } + + /** + * The column ervu_dashboard.passport.passport_id. + */ + public final TableField PASSPORT_ID = createField(DSL.name("passport_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + /** + * The column ervu_dashboard.passport.recruit_id. ссылка на + * гражданина (citizen) + */ + public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID.nullable(false), this, "ссылка на гражданина (citizen)"); + + /** + * The column ervu_dashboard.passport.actual. статус документа: + * действительный(true)/недействительный(false) + */ + public final TableField ACTUAL = createField(DSL.name("actual"), SQLDataType.BOOLEAN.defaultValue(DSL.field(DSL.raw("true"), SQLDataType.BOOLEAN)), this, "статус документа: действительный(true)/недействительный(false)"); + + /** + * The column ervu_dashboard.passport.passport_series. серия + * паспорта + */ + public final TableField PASSPORT_SERIES = createField(DSL.name("passport_series"), SQLDataType.VARCHAR(4), this, "серия паспорта"); + + /** + * The column ervu_dashboard.passport.passport_number. номер + * паспорта + */ + public final TableField PASSPORT_NUMBER = createField(DSL.name("passport_number"), SQLDataType.VARCHAR(6), this, "номер паспорта"); + + /** + * The column ervu_dashboard.passport.issue_date. дата выдачи + * документа + */ + public final TableField ISSUE_DATE = createField(DSL.name("issue_date"), SQLDataType.DATE, this, "дата выдачи документа"); + + /** + * The column ervu_dashboard.passport.organization_name. + * наименование органа, выдавшего документ + */ + public final TableField ORGANIZATION_NAME = createField(DSL.name("organization_name"), SQLDataType.VARCHAR(255), this, "наименование органа, выдавшего документ"); + + /** + * The column ervu_dashboard.passport.unit_code. код + * подразделения + */ + public final TableField UNIT_CODE = createField(DSL.name("unit_code"), SQLDataType.VARCHAR(7), this, "код подразделения"); + + private Passport(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private Passport(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment("сведения о паспорте"), TableOptions.table(), where); + } + + /** + * Create an aliased ervu_dashboard.passport table reference + */ + public Passport(String alias) { + this(DSL.name(alias), PASSPORT); + } + + /** + * Create an aliased ervu_dashboard.passport table reference + */ + public Passport(Name alias) { + this(alias, PASSPORT); + } + + /** + * Create a ervu_dashboard.passport table reference + */ + public Passport() { + this(DSL.name("passport"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD; + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public UniqueKey getPrimaryKey() { + return Keys.PK_PASSPORT; + } + + @Override + public Passport as(String alias) { + return new Passport(DSL.name(alias), this); + } + + @Override + public Passport as(Name alias) { + return new Passport(alias, this); + } + + @Override + public Passport as(Table alias) { + return new Passport(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public Passport rename(String name) { + return new Passport(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public Passport rename(Name name) { + return new Passport(name, null); + } + + /** + * Rename this table + */ + @Override + public Passport rename(Table name) { + return new Passport(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Passport where(Condition condition) { + return new Passport(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Passport where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Passport where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Passport where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Passport where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Passport where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Passport where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Passport where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Passport whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Passport whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/PassportRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/PassportRecord.java new file mode 100644 index 00000000..9d8b5e03 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/PassportRecord.java @@ -0,0 +1,186 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records; + + +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Passport; + +import java.sql.Date; +import java.util.UUID; + +import org.jooq.Record1; +import org.jooq.impl.UpdatableRecordImpl; + + +/** + * сведения о паспорте + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class PassportRecord extends UpdatableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for ervu_dashboard.passport.passport_id. + */ + public void setPassportId(Long value) { + set(0, value); + } + + /** + * Getter for ervu_dashboard.passport.passport_id. + */ + public Long getPassportId() { + return (Long) get(0); + } + + /** + * Setter for ervu_dashboard.passport.recruit_id. ссылка на + * гражданина (citizen) + */ + public void setRecruitId(UUID value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.passport.recruit_id. ссылка на + * гражданина (citizen) + */ + public UUID getRecruitId() { + return (UUID) get(1); + } + + /** + * Setter for ervu_dashboard.passport.actual. статус документа: + * действительный(true)/недействительный(false) + */ + public void setActual(Boolean value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.passport.actual. статус документа: + * действительный(true)/недействительный(false) + */ + public Boolean getActual() { + return (Boolean) get(2); + } + + /** + * Setter for ervu_dashboard.passport.passport_series. серия + * паспорта + */ + public void setPassportSeries(String value) { + set(3, value); + } + + /** + * Getter for ervu_dashboard.passport.passport_series. серия + * паспорта + */ + public String getPassportSeries() { + return (String) get(3); + } + + /** + * Setter for ervu_dashboard.passport.passport_number. номер + * паспорта + */ + public void setPassportNumber(String value) { + set(4, value); + } + + /** + * Getter for ervu_dashboard.passport.passport_number. номер + * паспорта + */ + public String getPassportNumber() { + return (String) get(4); + } + + /** + * Setter for ervu_dashboard.passport.issue_date. дата выдачи + * документа + */ + public void setIssueDate(Date value) { + set(5, value); + } + + /** + * Getter for ervu_dashboard.passport.issue_date. дата выдачи + * документа + */ + public Date getIssueDate() { + return (Date) get(5); + } + + /** + * Setter for ervu_dashboard.passport.organization_name. + * наименование органа, выдавшего документ + */ + public void setOrganizationName(String value) { + set(6, value); + } + + /** + * Getter for ervu_dashboard.passport.organization_name. + * наименование органа, выдавшего документ + */ + public String getOrganizationName() { + return (String) get(6); + } + + /** + * Setter for ervu_dashboard.passport.unit_code. код + * подразделения + */ + public void setUnitCode(String value) { + set(7, value); + } + + /** + * Getter for ervu_dashboard.passport.unit_code. код + * подразделения + */ + public String getUnitCode() { + return (String) get(7); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 key() { + return (Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached PassportRecord + */ + public PassportRecord() { + super(Passport.PASSPORT); + } + + /** + * Create a detached, initialised PassportRecord + */ + public PassportRecord(Long passportId, UUID recruitId, Boolean actual, String passportSeries, String passportNumber, Date issueDate, String organizationName, String unitCode) { + super(Passport.PASSPORT); + + setPassportId(passportId); + setRecruitId(recruitId); + setActual(actual); + setPassportSeries(passportSeries); + setPassportNumber(passportNumber); + setIssueDate(issueDate); + setOrganizationName(organizationName); + setUnitCode(unitCode); + resetChangedOnNotNull(); + } +} diff --git a/resources/src/main/resources/business-model/citizencard.page b/resources/src/main/resources/business-model/citizencard.page index 46c29f86..c85fb2eb 100644 --- a/resources/src/main/resources/business-model/citizencard.page +++ b/resources/src/main/resources/business-model/citizencard.page @@ -41,7 +41,7 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"3":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"4":{"tableName":"citizenship","schemaName":"ervu_dashboard","x":106.0,"y":50.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"5":{"tableName":"deputy","schemaName":"ervu_dashboard","x":110.0,"y":162.0,"alias":"deputy","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"6":{"tableName":"deputy","schemaName":"ervu_dashboard","x":113.0,"y":268.0,"alias":"deputy1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"7":{"tableName":"prosecution","schemaName":"ervu_dashboard","x":247.0,"y":269.0,"alias":"prosecution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"8":{"tableName":"punishment","schemaName":"ervu_dashboard","x":401.0,"y":266.0,"alias":"punishment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"citizenship","schemaName":"ervu_dashboard","x":106.0,"y":50.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"deputy","schemaName":"ervu_dashboard","x":110.0,"y":162.0,"alias":"deputy","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"deputy","schemaName":"ervu_dashboard","x":113.0,"y":268.0,"alias":"deputy1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"prosecution","schemaName":"ervu_dashboard","x":247.0,"y":269.0,"alias":"prosecution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"punishment","schemaName":"ervu_dashboard","x":401.0,"y":266.0,"alias":"punishment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"citizen":{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"punishment":{"tableName":"punishment","schemaName":"ervu_dashboard","x":401.0,"y":266.0,"alias":"punishment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"deputy":{"tableName":"deputy","schemaName":"ervu_dashboard","x":110.0,"y":162.0,"alias":"deputy","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"citizenship":{"tableName":"citizenship","schemaName":"ervu_dashboard","x":106.0,"y":50.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"prosecution":{"tableName":"prosecution","schemaName":"ervu_dashboard","x":247.0,"y":269.0,"alias":"prosecution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"drivers_licence1":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"drivers_licence":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"deputy1":{"tableName":"deputy","schemaName":"ervu_dashboard","x":113.0,"y":268.0,"alias":"deputy1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"citizen","refToEntityName":"recruitment","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"drivers_licence","refToColumns":[{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence","name":"tractor_driver"},"operation":"EQUAL","typeCode":"CONST","values":["false"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"drivers_licence1","refToColumns":[{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence1","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence1","name":"tractor_driver"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"citizenship","refToColumns":[{"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"deputy","refToColumns":[{"schema":"ervu_dashboard","table":"deputy","entity":"deputy","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"deputy","entity":"deputy","name":"deputy"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"deputy1","refToColumns":[{"schema":"ervu_dashboard","table":"deputy","entity":"deputy1","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"deputy","entity":"deputy1","name":"deputy"},"operation":"EQUAL","typeCode":"CONST","values":["false"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"prosecution","refToColumns":[{"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"punishment","refToColumns":[{"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"1":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"2":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"3":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"4":{"tableName":"citizenship","schemaName":"ervu_dashboard","x":59.0,"y":53.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"5":{"tableName":"deputy","schemaName":"ervu_dashboard","x":54.0,"y":157.0,"alias":"deputy","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"6":{"tableName":"deputy","schemaName":"ervu_dashboard","x":68.0,"y":266.0,"alias":"deputy1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"7":{"tableName":"prosecution","schemaName":"ervu_dashboard","x":247.0,"y":269.0,"alias":"prosecution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"8":{"tableName":"punishment","schemaName":"ervu_dashboard","x":401.0,"y":266.0,"alias":"punishment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"citizenship","schemaName":"ervu_dashboard","x":59.0,"y":53.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"deputy","schemaName":"ervu_dashboard","x":54.0,"y":157.0,"alias":"deputy","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"deputy","schemaName":"ervu_dashboard","x":68.0,"y":266.0,"alias":"deputy1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"prosecution","schemaName":"ervu_dashboard","x":247.0,"y":269.0,"alias":"prosecution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},{"tableName":"punishment","schemaName":"ervu_dashboard","x":401.0,"y":266.0,"alias":"punishment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"citizen":{"tableName":"citizen","schemaName":"ervu_dashboard","x":241.4000000000001,"y":158.60000000000002,"alias":"citizen","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"punishment":{"tableName":"punishment","schemaName":"ervu_dashboard","x":401.0,"y":266.0,"alias":"punishment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"deputy":{"tableName":"deputy","schemaName":"ervu_dashboard","x":54.0,"y":157.0,"alias":"deputy","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"recruitment":{"tableName":"recruitment","schemaName":"ervu_dashboard","x":241.39999999999998,"y":49.2,"alias":"recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"citizenship":{"tableName":"citizenship","schemaName":"ervu_dashboard","x":59.0,"y":53.0,"alias":"citizenship","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"prosecution":{"tableName":"prosecution","schemaName":"ervu_dashboard","x":247.0,"y":269.0,"alias":"prosecution","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"drivers_licence1":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":397.0,"y":51.0,"alias":"drivers_licence1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"drivers_licence":{"tableName":"drivers_licence","schemaName":"ervu_dashboard","x":403.0,"y":161.0,"alias":"drivers_licence","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"},"deputy1":{"tableName":"deputy","schemaName":"ervu_dashboard","x":68.0,"y":266.0,"alias":"deputy1","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null,{"refOnEntityName":"citizen","refToEntityName":"recruitment","refToColumns":[{"schema":"ervu_dashboard","table":"recruitment","entity":"recruitment","name":"idm_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruitment_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"drivers_licence","refToColumns":[{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence","name":"tractor_driver"},"operation":"EQUAL","typeCode":"CONST","values":["false"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"drivers_licence1","refToColumns":[{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence1","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"drivers_licence","entity":"drivers_licence1","name":"tractor_driver"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"citizenship","refToColumns":[{"schema":"ervu_dashboard","table":"citizenship","entity":"citizenship","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"deputy","refToColumns":[{"schema":"ervu_dashboard","table":"deputy","entity":"deputy","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"deputy","entity":"deputy","name":"deputy"},"operation":"EQUAL","typeCode":"CONST","values":["true"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"deputy1","refToColumns":[{"schema":"ervu_dashboard","table":"deputy","entity":"deputy1","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"ervu_dashboard","table":"deputy","entity":"deputy1","name":"deputy"},"operation":"EQUAL","typeCode":"CONST","values":["false"]}],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"prosecution","refToColumns":[{"schema":"ervu_dashboard","table":"prosecution","entity":"prosecution","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}},{"refOnEntityName":"citizen","refToEntityName":"punishment","refToColumns":[{"schema":"ervu_dashboard","table":"punishment","entity":"punishment","name":"recruit_id"}],"refOnColumns":[{"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"recruit_id"}],"required":false,"cyclic":false,"conditionGroup":{"operator":"AND","conditions":[],"groups":[]}}],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null],[null,null,null,null,null,null,null,null,null]],"mainNodeIndex":0} @@ -1578,7 +1578,6 @@ 999acadc-8a62-45b9-ae62-9d653411fdb6 Личные сведения true - false false @@ -1674,179 +1673,173 @@ - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - d3cc5314-3f68-4f7e-b8f9-083562f65a68 - HB паспорт + + 27912fc5-0be7-4d4c-ae46-a82979253599 + 9761eb8f-3e6c-401f-b6f6-34e9fb3eb8b9 + Filter group true - false false - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 4c101735-cabc-4327-b0fd-fcfa21eb06b7 - Вид документа + + + + liveFilter + + true + + + + visible + + false + + + + + + + + filterable + + {"objectId":"9a8bbda3-a7e1-4ca4-b709-e712039aacfd","packageName":"rpc","className":"GridRpcService","type":"JAVA"} + + + + + + + + + + 4d981f15-5535-45f7-882b-3647b251ad05 + b218cd5c-b76f-472d-85c8-562613d5a7c6 + citizen_id (filter) false false - - disabled - - true - - - - initialValue - - null - - label - "Вид документа" - - - - textFormatter - - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - + "citizen_id" - - - - + - columnForSave + operation - {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"employment"} + "EQUAL" + + + + columnForFilter + + {"schema":"ervu_dashboard","table":"passport","entity":"passport","name":"recruit_id"} + + + + + + + + - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 45fb28c3-9823-49b3-8208-0c6803977edf - Серия и номер - false - false - - - - initialValue - - null - - - - label - - "Серия и номер" - - - - style - - - -width - - null - - - - - - - textFormatter - - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - - - TextBuilder - component.util - - true - true - - - parts - - + + 16071adb-3bdf-4c33-b29b-886876016415 + 9a8bbda3-a7e1-4ca4-b709-e712039aacfd + Grid_иностранное гражданство + true + true + + + + 16071adb-3bdf-4c33-b29b-886876016415 + 9a8bbda3-a7e1-4ca4-b709-e712039aacfd + Grid_паспорт + true + false + + + + autoStretchColumns + + true + + + + theme + + "BALHAM_DARK" + + + + + + + + gridService + + + + loadDao - inputControl + graph - {"objectId":"e14edd5e-f32b-4523-b307-d7e12b9e06c6","packageName":"component","className":"Text","type":"TS"} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"passport","schemaName":"ervu_dashboard","x":206.0,"y":181.0,"alias":"passport","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"passport","schemaName":"ervu_dashboard","x":206.0,"y":181.0,"alias":"passport","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"passport":{"tableName":"passport","schemaName":"ervu_dashboard","x":206.0,"y":181.0,"alias":"passport","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + + + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + e374fc3f-1c60-4607-884d-909fcd4c3636 + Серия и номер + false + false + + + + + displayColumns + + + + + + entityColumn + + {"schema":"ervu_dashboard","table":"passport","entity":"passport","name":"passport_series"} + + + + + + + + + + entityColumn + + {"schema":"ervu_dashboard","table":"passport","entity":"passport","name":"passport_number"} - postfix + prefix " " @@ -1854,257 +1847,153 @@ - - - - - inputControl - - {"objectId":"45131b35-22ce-4748-84c3-be9bb0fb9345","packageName":"component","className":"Text","type":"TS"} - - - - - + + + + displayName + + "Серия и номер" + + + + displayType + + "MULTI_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"citizenship_foreign","entity":"citizenship_foreign","name":"country_name"} - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - e14edd5e-f32b-4523-b307-d7e12b9e06c6 - Паспорт серия - false - false - - - - initialValue - - null - - - - label - - "серия" - - - - style - - - -width - - null - - - - - - - textFormatter - - - - - - visible - - false - - - - - - - - - - - columnForSave - - {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"passport_series"} - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 45131b35-22ce-4748-84c3-be9bb0fb9345 - Паспорт номер - false - false - false - - - - initialValue - - null - - - - label - - "номер" - - - - style - - - -width - - null - - - - - - - textFormatter - - - - - - visible - - false - - - - - - - - - - - columnForSave - - {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"passport_number"} - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 719093ce-aa65-4963-9e16-78b3f5820eda + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + af2227a4-cd6e-47bb-9f0a-a1b62ca92b09 Дата выдачи false false - + - disabled + valueFormatter - true + + DateFormatter + component.grid.formatters + + + + + - initialValue - - null - - - - label + displayName "Дата выдачи" - textFormatter + displayType - - -replaceModels - - - - - - value - - "-" + "ONE_COLUMN" - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - columnForSave + field - null + {"schema":"ervu_dashboard","table":"passport","entity":"passport","name":"issue_date"} - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - c32c36dc-1a00-401e-8ae3-6eef29cb65f2 + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 9df54d1b-75fc-4984-9afe-8ef42971d9fd Код подразделения false false - + + - disabled - - true - - - - initialValue - - null - - - - label + displayName "Код подразделения" - textFormatter + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"passport","entity":"passport","name":"unit_code"} + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 4b7263cb-fa75-4028-9c05-f573b6827cf8 + Статус документа + false + false + + + + valueFormatter -replaceModels +noDataValue - + null + + + +valuesToReplace + + - value + newValue - "-" + "Действительный" + + + + regex + + "true" + + + + + + + + + + newValue + + "Недействительный" + + + + regex + + "false" @@ -2114,182 +2003,80 @@ - ReplaceValueTextFormatter - ervu-dashboard.formatter + ReplaceValueFormatter + component.grid.formatters - - - - - false + - columnForSave + displayName - null + "Статус документа" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"passport","entity":"passport","name":"actual"} + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 + 97fc89e4-fc5e-4178-93be-34f9d5bacbe0 + Наименование органа, выдавшего документ + false + false + + + + + displayName + + "Наименование органа, выдавшего документ" + + + + displayType + + "ONE_COLUMN" + + + + field + + {"schema":"ervu_dashboard","table":"passport","entity":"passport","name":"organization_name"} + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + d3cc5314-3f68-4f7e-b8f9-083562f65a68 + HB паспорт + true + true + d7d54cfb-26b5-4dba-b56f-b6247183c24d bb841fa3-d799-4507-b17c-745e4ae6419d Hbox кем выдан true - false - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 478fb2e3-82a2-42c8-baa1-89ec8ee8b5b4 - Статус документа - false - false - - - - disabled - - true - - - - initialValue - - null - - - - label - - "Статус документа" - - - - textFormatter - - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - - columnForSave - - null - - - - - - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - 3577239e-2bb7-476f-b496-e9747b5baf87 - Наименование органа, выдавшего документ - false - false - - - - disabled - - true - - - - initialValue - - null - - - - label - - "Наименование органа, выдавшего документ" - - - - textFormatter - - - -replaceModels - - - - - - value - - "-" - - - - - - - - - - ReplaceValueTextFormatter - ervu-dashboard.formatter - - - - - - - - - - false - - - columnForSave - - null - - - - - + true @@ -2297,6 +2084,7 @@ 02ba0224-fcbe-45cd-be93-aa9ea32145ce Vbox_место жительства true +false false @@ -24129,7 +23917,6 @@ 368464bb-a786-465a-8fab-d740c0fd8388 Hbox true - false false @@ -24176,7 +23963,7 @@ label - null + " " @@ -25406,7 +25193,7 @@ label - null + " " @@ -31019,6 +30806,56 @@ + + + + + + behavior + + {"objectId":"b218cd5c-b76f-472d-85c8-562613d5a7c6","packageName":"component.field","className":"TextField","type":"TS"} + + + + method + + "setValue" + + + + value + + + + objectValue + + + + argument + + null + + + + behavior + + {"objectId":"55e4b61a-3031-4221-a732-d31a727d89f9","packageName":"component","className":"Text","type":"TS"} + + + + method + + "getValue" + + + + + + + + + + From f6fa20bcc913e1e9b7338127f9cdaddd9edb95a1 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Thu, 26 Sep 2024 18:28:24 +0300 Subject: [PATCH 41/68] check-box --- .../resources/css/components-dashboard.css | 63 +++++++++---------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 1980495a..db647207 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -4,6 +4,36 @@ padding-right: var(--indent-mini); } +.webbpm.ervu_dashboard check-box label { + width: min-content !important; +} +.webbpm.ervu_dashboard check-box label span { + content: ""; + position: absolute; + top: 0; + left: 0; + width: min(1.4vw, 1.75rem); /*28*/ + height: min(1.4vw, 1.75rem); /*28*/ + padding: 2px; + margin: 0; + border-radius: 4px; + background-color: var(--color-dark-20); +} +.webbpm.ervu_dashboard check-box label input { + position: absolute; + z-index: -1; + opacity: 0; +} +.webbpm.ervu_dashboard check-box.wb-not-empty label span { + content: url('../img/svg/mark.svg'); + border: 1px solid var(--color-success); + background-color: var(--color-primary-5); +} +.webbpm.ervu_dashboard check-box + text { + color: var(--color-text-secondary); + margin-left: var(--indent-xbase) !important; +} + .webbpm.ervu_dashboard .bread-crumb .form-group { margin-bottom: 0; } @@ -776,35 +806,7 @@ padding: 0; margin: 0 0 var(--indent-mini) var(--indent-small); } -.webbpm.ervu_dashboard .search-block .child-block check-box label { - width: min-content; -} -.webbpm.ervu_dashboard .search-block .child-block check-box label span { - content: ""; - position: absolute; - top: 0; - left: 0; - width: min(1.4vw, 1.75rem); /*28*/ - height: min(1.4vw, 1.75rem); /*28*/ - padding: 2px; - margin: 0; - border-radius: 4px; - background-color: var(--color-dark-20); -} -.webbpm.ervu_dashboard .search-block .child-block check-box label input { - position: absolute; - z-index: -1; - opacity: 0; -} -.webbpm.ervu_dashboard .search-block .child-block check-box.wb-valid.wb-not-empty label span { - content: url('../img/svg/mark.svg'); - border: 1px solid var(--color-success); - background-color: var(--color-primary-5); -} -.webbpm.ervu_dashboard .search-block .child-block check-box + text { - color: var(--color-text-secondary); - margin-left: var(--indent-base) !important; -} + .webbpm.ervu_dashboard .search-block .child-block :is(.title, .nav-tabs, text) { margin-left: var(--indent-small); } @@ -959,9 +961,6 @@ .webbpm.ervu_dashboard .search-block .selectize-input::before { display: none; } -.webbpm.ervu_dashboard .search-block check-box label > span { - width: auto; -} .webbpm.ervu_dashboard .search-block .grid { flex-direction: column; flex: 1 1 auto; From e1038696cf3800f36527093f73fbab05656a56d5 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Fri, 27 Sep 2024 09:04:17 +0300 Subject: [PATCH 42/68] check-box label fix --- frontend/src/resources/css/components-dashboard.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index db647207..80b02693 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -6,6 +6,7 @@ .webbpm.ervu_dashboard check-box label { width: min-content !important; + margin: 0 !important; } .webbpm.ervu_dashboard check-box label span { content: ""; @@ -31,7 +32,7 @@ } .webbpm.ervu_dashboard check-box + text { color: var(--color-text-secondary); - margin-left: var(--indent-xbase) !important; + margin-left: var(--indent-large) !important; } .webbpm.ervu_dashboard .bread-crumb .form-group { From b09c33640f4e6347abb16d870be35ed854833c43 Mon Sep 17 00:00:00 2001 From: Makarova Elena Date: Fri, 27 Sep 2024 10:44:54 +0300 Subject: [PATCH 43/68] =?UTF-8?q?=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=D0=B0=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BA=D0=BE=D0=BB=D0=BE=D0=BD=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/business-model/citizencard.page | 128 +++++++----------- 1 file changed, 52 insertions(+), 76 deletions(-) diff --git a/resources/src/main/resources/business-model/citizencard.page b/resources/src/main/resources/business-model/citizencard.page index c85fb2eb..7703d5f8 100644 --- a/resources/src/main/resources/business-model/citizencard.page +++ b/resources/src/main/resources/business-model/citizencard.page @@ -1948,68 +1948,7 @@ Статус документа false false - - - - valueFormatter - - - -noDataValue - - null - - - -valuesToReplace - - - - - - newValue - - "Действительный" - - - - regex - - "true" - - - - - - - - - - newValue - - "Недействительный" - - - - regex - - "false" - - - - - - - - - - ReplaceValueFormatter - component.grid.formatters - - - - - + @@ -2032,6 +1971,57 @@ + + + ReplaceValueFormatter + component.grid.formatters + + true + true + + + valuesToReplace + + + + + + newValue + + "Действительный" + + + + regex + + "true" + + + + + + + + + + newValue + + "Недействительный" + + + + regex + + "false" + + + + + + + + + 364c8faa-5e56-46cd-9203-d2ec6ef2dc74 @@ -24033,13 +24023,6 @@ true true - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - d2e82323-f838-4e58-befb-b94b6b8ec971 - Признак отбывания наказания в местах лишения свободы - false - true - 98594cec-0a9b-4cef-af09-e1b71cb2ad9e 2d47cdc2-2011-4467-a62d-298f162f18a4 @@ -24745,13 +24728,6 @@ - - ba24d307-0b91-4299-ba82-9d0b52384ff2 - c014d150-614c-4108-abaf-ed43f094ed82 - Наименование и адрес места отбывания наказания - false - true - ba24d307-0b91-4299-ba82-9d0b52384ff2 From 0665cf7042236ddcaaf0739f22212288d84e0aef Mon Sep 17 00:00:00 2001 From: Makarova Elena Date: Mon, 30 Sep 2024 13:35:10 +0300 Subject: [PATCH 44/68] =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=BD=D1=83=D0=BB?= =?UTF-8?q?=D0=B0=20=D0=BA=D0=BE=D0=BC=D0=B1=D0=BE=D0=B1=D0=BE=D0=BA=D1=81?= =?UTF-8?q?=20=D1=81=20=D1=81=D1=83=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=D0=B0?= =?UTF-8?q?=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/business-model/appeals.page | 217 +++++++++----- .../resources/business-model/citizen.page | 132 +++++++-- .../resources/business-model/citizencard.page | 1 + .../main/resources/business-model/main.page | 144 +++++++-- .../business-model/milregistration.page | 279 ++++++++++++------ .../business-model/notregistered.page | 201 ++++++++++--- .../resources/business-model/ratings.page | 122 ++++++-- .../resources/business-model/recruitment.page | 190 +++++++++--- .../Всего на учете (2й уровень).page | 164 ++++++++-- 9 files changed, 1093 insertions(+), 357 deletions(-) diff --git a/resources/src/main/resources/business-model/appeals.page b/resources/src/main/resources/business-model/appeals.page index e4bc9591..048215d0 100644 --- a/resources/src/main/resources/business-model/appeals.page +++ b/resources/src/main/resources/business-model/appeals.page @@ -206,6 +206,145 @@ + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 + 223ff98e-a925-49c3-9735-7d1fa2f9fcb0 + Combo box + false + false + + + + placeholder + +"Российская Федерация" + + + + + + + + comboBoxService + + + + businessIdColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"code"} + + + + columnSorts + + + + + + field + +{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"sort"} + + + + sortOrder + +"ASC" + + + + + + + + + displayColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"} + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":190.0,"y":206.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":190.0,"y":206.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":190.0,"y":206.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + uniqueResult + + false + + + + + + + + + + + + + + + defaultValueColumn + +{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + + loadType + +"BY_COLUMN" + + + + service + + + + entityColumn + + {"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + DefaultLoadDao + database.dao + + + + + + DefaultValueByEntityGraphServiceV2 + service.loading + + + + + + + false + + + false + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 ef6b1859-1146-4e08-9b35-19c3af856acf @@ -218,62 +357,7 @@ ecdabc20-20d2-473f-886a-e3e53a4cb4f1 DropdownTreeView false - false - - - - - treeItemService - - - - businessIdColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"code"} - - - - domainIdColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"idm_id"} - - - - idColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - - labelColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"} - - - - loadDao - - - - graph - - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - - - - - - - parentIdColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"parent_id"} - - - - - - - + true bce312bd-0c82-45e5-89dc-a1af90431c18 @@ -287,6 +371,7 @@ 019f0534-870c-4e92-b6e9-b65afcdc0238 Горизонтальный контейнер true + false false @@ -560,7 +645,7 @@ behavior - {"objectId":"ecdabc20-20d2-473f-886a-e3e53a4cb4f1","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -593,7 +678,7 @@ behavior - {"objectId":"ecdabc20-20d2-473f-886a-e3e53a4cb4f1","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -1748,7 +1833,7 @@ behavior - {"objectId":"ecdabc20-20d2-473f-886a-e3e53a4cb4f1","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -1781,7 +1866,7 @@ behavior - {"objectId":"ecdabc20-20d2-473f-886a-e3e53a4cb4f1","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -2257,7 +2342,7 @@ behavior - {"objectId":"ecdabc20-20d2-473f-886a-e3e53a4cb4f1","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -2290,7 +2375,7 @@ behavior - {"objectId":"ecdabc20-20d2-473f-886a-e3e53a4cb4f1","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3626,7 +3711,7 @@ behavior - {"objectId":"ecdabc20-20d2-473f-886a-e3e53a4cb4f1","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3659,7 +3744,7 @@ behavior - {"objectId":"ecdabc20-20d2-473f-886a-e3e53a4cb4f1","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -4185,7 +4270,7 @@ behavior - {"objectId":"ecdabc20-20d2-473f-886a-e3e53a4cb4f1","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -4218,7 +4303,7 @@ behavior - {"objectId":"ecdabc20-20d2-473f-886a-e3e53a4cb4f1","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"223ff98e-a925-49c3-9735-7d1fa2f9fcb0","packageName":"component.field","className":"ComboBox","type":"TS"} diff --git a/resources/src/main/resources/business-model/citizen.page b/resources/src/main/resources/business-model/citizen.page index ab48e9d3..ca4f6626 100644 --- a/resources/src/main/resources/business-model/citizen.page +++ b/resources/src/main/resources/business-model/citizen.page @@ -258,12 +258,28 @@ a82fddb1-5654-4b24-a337-c164f22af58f DropdownTreeView false + true + + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 + 90036811-af6e-4962-b234-9f90dcb95375 + Combo box + false false - - + - treeItemService + placeholder + +"Российская Федерация" + + + + + + + + comboBoxService @@ -273,19 +289,30 @@ - domainIdColumn + columnSorts - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"idm_id"} + + + + + field + +{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"sort"} + + + + sortOrder + +"ASC" + + + + + - idColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - - labelColumn + displayColumn {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"} @@ -297,23 +324,80 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":226.0,"y":205.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":226.0,"y":205.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":226.0,"y":205.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + uniqueResult + + false - - parentIdColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"parent_id"} - - + + + + + defaultValueColumn + +{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + + loadType + +"BY_COLUMN" + + + + service + + + + entityColumn + + {"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + DefaultLoadDao + database.dao + + + + + + DefaultValueByEntityGraphServiceV2 + service.loading + + + + + + + false + + + false + bce312bd-0c82-45e5-89dc-a1af90431c18 @@ -1355,7 +1439,7 @@ behavior - {"objectId":"a82fddb1-5654-4b24-a337-c164f22af58f","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"90036811-af6e-4962-b234-9f90dcb95375","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -1401,13 +1485,13 @@ behavior - {"objectId":"a82fddb1-5654-4b24-a337-c164f22af58f","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"90036811-af6e-4962-b234-9f90dcb95375","packageName":"component.field","className":"ComboBox","type":"TS"} method - "getBusinessId" + "getValue" @@ -1452,7 +1536,7 @@ behavior - {"objectId":"a82fddb1-5654-4b24-a337-c164f22af58f","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"90036811-af6e-4962-b234-9f90dcb95375","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -1542,7 +1626,7 @@ behavior -{"objectId":"a82fddb1-5654-4b24-a337-c164f22af58f","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} +{"objectId":"90036811-af6e-4962-b234-9f90dcb95375","packageName":"component.field","className":"ComboBox","type":"TS"} diff --git a/resources/src/main/resources/business-model/citizencard.page b/resources/src/main/resources/business-model/citizencard.page index 7703d5f8..3c293f60 100644 --- a/resources/src/main/resources/business-model/citizencard.page +++ b/resources/src/main/resources/business-model/citizencard.page @@ -25124,6 +25124,7 @@ 9a37d336-cd90-418d-960e-0fdde0da3854 Hbox true + false false diff --git a/resources/src/main/resources/business-model/main.page b/resources/src/main/resources/business-model/main.page index 001ae919..aeb20bed 100644 --- a/resources/src/main/resources/business-model/main.page +++ b/resources/src/main/resources/business-model/main.page @@ -200,12 +200,29 @@ 88a51057-2192-426e-b46b-96abbcb90608 DropdownTreeView false + true + + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 + 7c78831c-9af0-49d2-9f7e-b357abf0a6ef + Combo box + false + false false - - + - treeItemService + placeholder + +"Российская Федерация" + + + + + + + + comboBoxService @@ -215,19 +232,30 @@ - domainIdColumn + columnSorts - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"idm_id"} + + + + + field + +{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"sort"} + + + + sortOrder + +"ASC" + + + + + - idColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - - labelColumn + displayColumn {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"} @@ -239,23 +267,78 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":251.0,"y":207.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":251.0,"y":207.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":251.0,"y":207.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + uniqueResult + + false - - parentIdColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"parent_id"} - - + + + + + defaultValueColumn + +{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + + loadType + +"BY_COLUMN" + + + + service + + + + entityColumn + + {"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + DefaultLoadDao + database.dao + + + + + + DefaultValueByEntityGraphServiceV2 + service.loading + + + + + + + + false + bce312bd-0c82-45e5-89dc-a1af90431c18 @@ -276,6 +359,7 @@ 9021abd0-d34a-43f2-a12d-649e728db7b1 Горизонтальный контейнер true + false false @@ -538,7 +622,7 @@ behavior - {"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -571,7 +655,7 @@ behavior -{"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} +{"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -2894,7 +2978,7 @@ behavior - {"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -2927,7 +3011,7 @@ behavior -{"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} +{"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -5240,7 +5324,6 @@ 287754e8-934b-4750-b623-48758802904c Призывная кампания true - false false @@ -5493,7 +5576,7 @@ behavior -{"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} +{"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -5526,7 +5609,7 @@ behavior - {"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -5589,6 +5672,7 @@ 99c90421-8054-4f0e-9d5e-aa1c29e23ecc Горизонтальный контейнер - Попадающие под призыв true +false false @@ -7453,7 +7537,7 @@ behavior -{"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} +{"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -7486,7 +7570,7 @@ behavior - {"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -9456,7 +9540,7 @@ behavior - {"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -9489,7 +9573,7 @@ behavior -{"objectId":"88a51057-2192-426e-b46b-96abbcb90608","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} +{"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field","className":"ComboBox","type":"TS"} diff --git a/resources/src/main/resources/business-model/milregistration.page b/resources/src/main/resources/business-model/milregistration.page index 9a3af268..4943a042 100644 --- a/resources/src/main/resources/business-model/milregistration.page +++ b/resources/src/main/resources/business-model/milregistration.page @@ -331,24 +331,34 @@ - - b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 - a7c50c86-84f8-4092-8fbc-d04c6d2adbb1 - Combo box - false - true - 630accd8-3776-4fc1-a87c-3a0f05274678 cf76edb6-2f7a-4017-877e-0f49bdec7e93 DropdownTreeView false + true + + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 + a16e0d37-04dc-47b5-b7a6-b162bdbe1f40 + Combo box + false + false false - - + -treeItemService +placeholder + + "Российская Федерация" + + + + + + + +comboBoxService @@ -358,19 +368,30 @@ - domainIdColumn + columnSorts - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"idm_id"} + + + + +field + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"sort"} + + + +sortOrder + + "ASC" + + + + + - idColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - - labelColumn + displayColumn {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"} @@ -382,32 +403,93 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":214.0,"y":210.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":214.0,"y":210.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":214.0,"y":210.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + uniqueResult + + false - - parentIdColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"parent_id"} - - - + + + + +defaultValueColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + +loadType + + "BY_COLUMN" + + + +service + + + + entityColumn + + {"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + DefaultLoadDao + database.dao + + + + + + DefaultValueByEntityGraphServiceV2 + service.loading + + + + + + + + false + + - FilterComponent - component.filter + ComboboxFilterComponent + ervu-dashboard.component.filter true true +isBusinessId + + true + + + operation "EQUAL" @@ -699,7 +781,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -732,7 +814,7 @@ behavior -{"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} +{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -2892,6 +2974,7 @@ ec7e0341-cba8-4c6a-a472-6ff1dd337054 Возраст и Дети до 18лет true + false false @@ -3096,7 +3179,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3129,7 +3212,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3840,7 +3923,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3873,7 +3956,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -4617,7 +4700,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -4650,7 +4733,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -5365,7 +5448,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -5398,7 +5481,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -6142,7 +6225,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -6175,7 +6258,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -6886,7 +6969,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -6919,7 +7002,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -7567,7 +7650,6 @@ 79fc57e0-9c07-425f-9139-9a95f9987d2d Дети до 18 лет true - false false @@ -7760,7 +7842,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -7793,7 +7875,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -9377,7 +9459,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -9410,7 +9492,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -10994,7 +11076,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -11027,7 +11109,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -13027,7 +13109,7 @@ filterComponent - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -13060,7 +13142,7 @@ -{"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.filter","className":"FilterComponent","type":"TS"} +{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -13277,7 +13359,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -13310,7 +13392,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -14399,7 +14481,7 @@ filterComponent - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -14432,7 +14514,7 @@ -{"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.filter","className":"FilterComponent","type":"TS"} +{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -14636,7 +14718,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -14669,7 +14751,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -15744,7 +15826,7 @@ filterComponent - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -15777,7 +15859,7 @@ -{"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.filter","className":"FilterComponent","type":"TS"} +{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -15981,7 +16063,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -16014,7 +16096,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -16687,6 +16769,7 @@ 0caafab8-de1c-42b0-b845-fca7e0e97ec3 VB - Занятость true + false false @@ -17197,7 +17280,7 @@ -{"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.filter","className":"FilterComponent","type":"TS"} +{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -17248,7 +17331,7 @@ filterComponent - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -17454,7 +17537,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -17487,7 +17570,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -18463,7 +18546,7 @@ filterComponent - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -18496,7 +18579,7 @@ -{"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.filter","className":"FilterComponent","type":"TS"} +{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -18701,7 +18784,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -18734,7 +18817,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -19703,7 +19786,7 @@ filterComponent - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -19736,7 +19819,7 @@ -{"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.filter","className":"FilterComponent","type":"TS"} +{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -19941,7 +20024,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -19974,7 +20057,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -20702,7 +20785,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -20735,7 +20818,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -21688,7 +21771,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -21721,7 +21804,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -22701,7 +22784,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -22734,7 +22817,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -23687,7 +23770,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -23720,7 +23803,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -24700,7 +24783,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -24733,7 +24816,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -25686,7 +25769,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -25719,7 +25802,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -26779,7 +26862,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -26812,7 +26895,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -27315,7 +27398,7 @@ filterComponent - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -27348,7 +27431,7 @@ -{"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.filter","className":"FilterComponent","type":"TS"} +{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -28654,7 +28737,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -28687,7 +28770,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -29190,7 +29273,7 @@ filterComponent - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -29223,7 +29306,7 @@ -{"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.filter","className":"FilterComponent","type":"TS"} +{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} @@ -30557,7 +30640,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -30590,7 +30673,7 @@ behavior - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -31088,7 +31171,7 @@ filterComponent - {"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -31121,7 +31204,7 @@ -{"objectId":"cf76edb6-2f7a-4017-877e-0f49bdec7e93","packageName":"component.filter","className":"FilterComponent","type":"TS"} +{"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} diff --git a/resources/src/main/resources/business-model/notregistered.page b/resources/src/main/resources/business-model/notregistered.page index e7fa84d2..1e460e12 100644 --- a/resources/src/main/resources/business-model/notregistered.page +++ b/resources/src/main/resources/business-model/notregistered.page @@ -26,6 +26,7 @@ 2a5b0bb1-72ef-4473-9006-0cde6cb5dc62 Горизонтальный контейнер true + false false @@ -307,12 +308,29 @@ f3ba1055-e764-420f-9c42-3232bbcbb321 DropdownTreeView false + true + + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 + 41e6e628-5e34-4e8b-894b-1f60d3461bd0 + Combo box + false + false false - - + -treeItemService +placeholder + + "Российская Федерация" + + + + + + + +comboBoxService @@ -322,19 +340,30 @@ - domainIdColumn + columnSorts - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"idm_id"} + + + + +field + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"sort"} + + + +sortOrder + + "ASC" + + + + + - idColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - - labelColumn + displayColumn {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"} @@ -346,32 +375,108 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":183.0,"y":225.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":183.0,"y":225.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":183.0,"y":225.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + uniqueResult + + false - - parentIdColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"parent_id"} - - - + + + + +defaultValueColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + +loadType + + "BY_COLUMN" + + + +service + + + + entityColumn + + {"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + DefaultLoadDao + database.dao + + + + + + DefaultValueByEntityGraphServiceV2 + service.loading + + + + + + + + false + + FilterComponent component.filter + true + + +operation + + "EQUAL" + + + + + + + ComboboxFilterComponent + ervu-dashboard.component.filter + true true +isBusinessId + + true + + + operation "EQUAL" @@ -400,6 +505,7 @@ be84d33b-5d20-416f-8393-1328fd5ed190 Горизонтальный контейнер true + false false @@ -662,7 +768,7 @@ behavior - {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -697,7 +803,7 @@ behavior -{"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} +{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -2935,6 +3041,7 @@ 76298b31-e12e-4ce4-b510-3e2378cb672c VB - Возраст и занятость true + false false @@ -3139,7 +3246,7 @@ behavior - {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3172,7 +3279,7 @@ behavior - {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3883,7 +3990,7 @@ behavior - {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3916,7 +4023,7 @@ behavior - {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -4660,7 +4767,7 @@ behavior - {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -4693,7 +4800,7 @@ behavior - {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -5404,7 +5511,7 @@ behavior - {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -5437,7 +5544,7 @@ behavior - {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -6181,7 +6288,7 @@ behavior - {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -6214,7 +6321,7 @@ behavior - {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -6925,7 +7032,7 @@ behavior - {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -6958,7 +7065,7 @@ behavior - {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -8009,7 +8116,7 @@ behavior - {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -8042,7 +8149,7 @@ behavior - {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -8907,7 +9014,7 @@ behavior - {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -8940,7 +9047,7 @@ behavior - {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -9809,7 +9916,7 @@ behavior - {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -9842,7 +9949,7 @@ behavior - {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -10392,6 +10499,7 @@ c82f22ad-6e64-4e09-9a35-982e97a0302c VB - Категории постановки на ВУ true + false false @@ -10455,7 +10563,7 @@ behavior - {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -10488,7 +10596,7 @@ behavior -{"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} +{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -12680,7 +12788,7 @@ behavior - {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -12713,7 +12821,7 @@ behavior -{"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} +{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -13302,6 +13410,7 @@ + false RoundSingleChartDataSetService ervu_dashboard.component.chart @@ -13424,7 +13533,7 @@ filterComponent -{"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} +{"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -13457,7 +13566,7 @@ - {"objectId":"f3ba1055-e764-420f-9c42-3232bbcbb321","packageName":"component.filter","className":"FilterComponent","type":"TS"} + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.filter","className":"FilterComponent","type":"TS"} diff --git a/resources/src/main/resources/business-model/ratings.page b/resources/src/main/resources/business-model/ratings.page index b8ef3b3b..d6f22b7e 100644 --- a/resources/src/main/resources/business-model/ratings.page +++ b/resources/src/main/resources/business-model/ratings.page @@ -259,12 +259,29 @@ 25b29b33-5c56-485c-b734-6c48669448ef DropdownTreeView false + true + + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 + 487a7008-1a93-4ea4-8524-067728b8597d + Combo box + false + false false - - + - treeItemService + placeholder + +"Российская Федерация" + + + + + + + + comboBoxService @@ -274,19 +291,30 @@ - domainIdColumn + columnSorts - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"idm_id"} + + + + + field + +{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"sort"} + + + + sortOrder + +"ASC" + + + + + - idColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - - labelColumn + displayColumn {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"} @@ -298,23 +326,78 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":225.0,"y":255.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":225.0,"y":255.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":225.0,"y":255.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + uniqueResult + + false - - parentIdColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"parent_id"} - - + + + + + defaultValueColumn + +{"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + + loadType + +"BY_COLUMN" + + + + service + + + + entityColumn + + {"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + DefaultLoadDao + database.dao + + + + + + DefaultValueByEntityGraphServiceV2 + service.loading + + + + + + + + false + bce312bd-0c82-45e5-89dc-a1af90431c18 @@ -328,6 +411,7 @@ 2215cb71-27f6-4db2-a7c4-438498404c86 Горизонтальный контейнер true + false false diff --git a/resources/src/main/resources/business-model/recruitment.page b/resources/src/main/resources/business-model/recruitment.page index 220c88ba..c973878e 100644 --- a/resources/src/main/resources/business-model/recruitment.page +++ b/resources/src/main/resources/business-model/recruitment.page @@ -288,24 +288,33 @@ - - b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 - c02754db-ba91-4be8-b11a-06e2c5dada24 - Combo box - false - true - 630accd8-3776-4fc1-a87c-3a0f05274678 051c3e53-8e91-4ba4-8b5d-a2c20865adc9 DropdownTreeView false + true + + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 + ba22549b-4759-40d8-8d78-aa13b3a332c0 + Combo box + false false - - + -treeItemService +placeholder + + "Российская Федерация" + + + + + + + +comboBoxService @@ -315,19 +324,30 @@ - domainIdColumn + columnSorts - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"idm_id"} + + + + +field + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"sort"} + + + +sortOrder + + "ASC" + + + + + - idColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - - labelColumn + displayColumn {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"} @@ -339,32 +359,108 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":138.0,"y":217.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":138.0,"y":217.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":138.0,"y":217.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + uniqueResult + + false - - parentIdColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"parent_id"} - - - + + + + +defaultValueColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + +loadType + + "BY_COLUMN" + + + +service + + + + entityColumn + + {"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + DefaultLoadDao + database.dao + + + + + + DefaultValueByEntityGraphServiceV2 + service.loading + + + + + + + + false + + FilterComponent component.filter + true + + +operation + + "EQUAL" + + + + + + + ComboboxFilterComponent + ervu-dashboard.component.filter + true true +isBusinessId + + true + + + operation "EQUAL" @@ -592,6 +688,7 @@ 7206a4d4-1dd2-4a36-bad7-a692bf291d79 VB - Призыв true + false false @@ -802,7 +899,7 @@ behavior -{"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} +{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -835,7 +932,7 @@ behavior - {"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -1036,6 +1133,7 @@ + false DoughnutMockChartV2Service ervu_dashboard.component.chart @@ -1801,6 +1899,7 @@ 7589d279-f6bc-430a-8a9d-908a84af789d VB - весна true + false false @@ -1851,7 +1950,7 @@ behavior -{"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} +{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -1884,7 +1983,7 @@ behavior - {"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -2832,6 +2931,7 @@ 0a07229f-1c03-4f45-8651-c70f6b68df74 VB - Повестки true + false false @@ -2902,7 +3002,6 @@ 71008512-360f-4156-b208-cf1daf67b070 Контейнер вкладок true - false false @@ -2984,7 +3083,7 @@ behavior -{"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} +{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3017,7 +3116,7 @@ behavior - {"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3711,7 +3810,7 @@ filterComponent - {"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} + {"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -3744,7 +3843,7 @@ - {"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.filter","className":"FilterComponent","type":"TS"} + {"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.filter","className":"FilterComponent","type":"TS"} @@ -5826,7 +5925,7 @@ behavior -{"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} +{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -5859,7 +5958,7 @@ behavior - {"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -6652,7 +6751,7 @@ filterComponent - {"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} + {"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -6685,7 +6784,7 @@ - {"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.filter","className":"FilterComponent","type":"TS"} + {"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.filter","className":"FilterComponent","type":"TS"} @@ -8857,6 +8956,7 @@ 3123f8a4-427f-4986-8238-d1918dab7198 VB - осень true + false false @@ -8907,7 +9007,7 @@ behavior -{"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} +{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -8940,7 +9040,7 @@ behavior - {"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -9076,6 +9176,7 @@ + false DoughnutMockChartV2Service ervu_dashboard.component.chart @@ -10147,6 +10248,7 @@ 3fe4a71f-8cd7-488e-b43d-9ba61d63f7cc VB - весна true + false false @@ -10206,7 +10308,7 @@ behavior -{"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} +{"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -10239,7 +10341,7 @@ behavior - {"objectId":"051c3e53-8e91-4ba4-8b5d-a2c20865adc9","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"ba22549b-4759-40d8-8d78-aa13b3a332c0","packageName":"component.field","className":"ComboBox","type":"TS"} diff --git a/resources/src/main/resources/business-model/Всего на учете (2й уровень).page b/resources/src/main/resources/business-model/Всего на учете (2й уровень).page index 4e6f499a..049b20b0 100644 --- a/resources/src/main/resources/business-model/Всего на учете (2й уровень).page +++ b/resources/src/main/resources/business-model/Всего на учете (2й уровень).page @@ -299,12 +299,29 @@ bcda3e31-265c-4f80-8984-fd0359b0fc36 DropdownTreeView false + true + + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 + e80a965c-389c-4a42-ade9-cc551317f3a6 + Combo box + false + false false - - + -treeItemService +placeholder + + "Российская Федерация" + + + + + + + +comboBoxService @@ -314,19 +331,30 @@ - domainIdColumn + columnSorts - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"idm_id"} + + + + +field + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"sort"} + + + +sortOrder + + "ASC" + + + + + - idColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} - - - - labelColumn + displayColumn {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"} @@ -338,32 +366,108 @@ graph - {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":271.0,"y":293.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":156.0,"y":200.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":156.0,"y":200.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"ervu_dashboard","x":156.0,"y":200.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + uniqueResult + + false - - parentIdColumn - - {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"parent_id"} - - - + + + + +defaultValueColumn + + {"schema":"ervu_dashboard","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + +loadType + + "BY_COLUMN" + + + +service + + + + entityColumn + + {"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"id"} + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"pub_recruitment":{"tableName":"pub_recruitment","schemaName":"public","x":176.0,"y":299.0,"alias":"pub_recruitment","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"public","table":"pub_recruitment","entity":"pub_recruitment","name":"shortname"},"operation":"EQUAL","typeCode":"CONST","values":["\"Российская Федерация\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} + + + + + DefaultLoadDao + database.dao + + + + + + DefaultValueByEntityGraphServiceV2 + service.loading + + + + + + + + false + + FilterComponent component.filter + true + + +operation + + "EQUAL" + + + + + + + ComboboxFilterComponent + ervu-dashboard.component.filter + true true +isBusinessId + + true + + + operation "EQUAL" @@ -648,7 +752,7 @@ behavior - {"objectId":"bcda3e31-265c-4f80-8984-fd0359b0fc36","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -681,7 +785,7 @@ behavior -{"objectId":"bcda3e31-265c-4f80-8984-fd0359b0fc36","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} +{"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3033,7 +3137,7 @@ behavior - {"objectId":"bcda3e31-265c-4f80-8984-fd0359b0fc36","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -3066,7 +3170,7 @@ behavior -{"objectId":"bcda3e31-265c-4f80-8984-fd0359b0fc36","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} +{"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -5246,7 +5350,7 @@ behavior - {"objectId":"bcda3e31-265c-4f80-8984-fd0359b0fc36","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -5279,7 +5383,7 @@ behavior -{"objectId":"bcda3e31-265c-4f80-8984-fd0359b0fc36","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} +{"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -7608,7 +7712,7 @@ behavior - {"objectId":"bcda3e31-265c-4f80-8984-fd0359b0fc36","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} + {"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -7641,7 +7745,7 @@ behavior -{"objectId":"bcda3e31-265c-4f80-8984-fd0359b0fc36","packageName":"component.field","className":"DropdownTreeViewComponent","type":"TS"} +{"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field","className":"ComboBox","type":"TS"} @@ -8352,7 +8456,7 @@ filterComponent -{"objectId":"bcda3e31-265c-4f80-8984-fd0359b0fc36","packageName":"component.rpc","className":"TreeItemRpcService","type":"JAVA"} +{"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} @@ -8385,7 +8489,7 @@ - {"objectId":"bcda3e31-265c-4f80-8984-fd0359b0fc36","packageName":"component.filter","className":"FilterComponent","type":"TS"} + {"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.filter","className":"FilterComponent","type":"TS"} From 1a10f9ed6a6f95d6bf873d4496befbdfab9b6331 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Mon, 30 Sep 2024 14:42:05 +0300 Subject: [PATCH 45/68] return old select --- .../resources/css/components-dashboard.css | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 80b02693..3e0a00b7 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -96,6 +96,57 @@ margin-left: var(--indent-small); } +/* temp list */ +.webbpm.ervu_dashboard .top-btn-block .selectize-control { + font-size: inherit; + background-color: transparent; +} +.webbpm.ervu_dashboard .top-btn-block .selectize-control .selectize-input { + display: flex; + min-height: max-content; + padding: var(--indent-mini) var(--indent-xlarge) var(--indent-mini) var(--indent-xbase); + border-radius: 100px; + border: 0; + background: var(--color-dark-20); +} +.webbpm.ervu_dashboard .top-btn-block .selectize-control .selectize-input::after { + position: absolute; + content: "\f282"; + color: var(--color-text-primary); + font-family: bootstrap-icons !important; + font-weight: 800 !important; + font-size: var(--size-text-secondary); + top: calc((50% - var(--size-text-secondary)/ 2)); + right: var(--indent-base); + height: auto; + width: auto; + border: 0; +} + +.webbpm.ervu_dashboard .top-btn-block .selectize-control .selectize-input.dropdown-active { + background-color: var(--color-success); +} +.webbpm.ervu_dashboard .top-btn-block .selectize-control .selectize-input.dropdown-active::after { + transform: rotate(180deg); +} +.webbpm.ervu_dashboard .top-btn-block .selectize-control .selectize-input .item, +.webbpm.ervu_dashboard .top-btn-block .selectize-control .selectize-input input { + color: var(--color-text-primary); + font-size: var(--size-text-primary); + line-height: 1.3 !important; +} +.webbpm.ervu_dashboard .top-btn-block .selectize-control .selectize-input .item { + display: block; +} +.webbpm.ervu_dashboard .top-btn-block .selectize-control .selectize-input input::-webkit-input-placeholder, +.webbpm.ervu_dashboard .top-btn-block .selectize-control .selectize-input input::placeholder { + color: var(--color-text-primary); +} +.webbpm.ervu_dashboard .top-btn-block .selectize-control .selectize-input .selectize-dropdown-content { + background: var(--color-dark-20); +} +/* temp list */ + .webbpm.ervu_dashboard dropdown-tree-view .dropdown > button, .webbpm.ervu_dashboard dropdown-tree-view .dropdown > button:is(:focus, :active) { color: var(--color-text-primary); From bea44a16340dd71cf26086f623378d14774c3a61 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 30 Sep 2024 16:09:35 +0300 Subject: [PATCH 46/68] Update for next development version --- backend/pom.xml | 2 +- distribution/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 2 +- resources/pom.xml | 2 +- test/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index fe1d6c90..682c1be0 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.5.0-SNAPSHOT + 1.6.0-SNAPSHOT ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index 2f2915d7..65773c97 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.5.0-SNAPSHOT + 1.6.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index 69671412..c9cf52b6 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.5.0-SNAPSHOT + 1.6.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index fc50429d..93d4fc13 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.5.0-SNAPSHOT + 1.6.0-SNAPSHOT pom backend diff --git a/resources/pom.xml b/resources/pom.xml index 26eb655c..cccc0d3b 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.5.0-SNAPSHOT + 1.6.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index 157ab256..5c1e94c4 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.5.0-SNAPSHOT + 1.6.0-SNAPSHOT ru.micord.ervu.dashboard From b64c66b0a2c8ca046717710ea34fe13e155e6c15 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 30 Sep 2024 17:00:46 +0300 Subject: [PATCH 47/68] Update for next development version --- backend/pom.xml | 2 +- distribution/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 2 +- resources/pom.xml | 2 +- test/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index fe1d6c90..c2c18697 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.5.0-SNAPSHOT + 1.5.0 ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index 2f2915d7..e1c293a0 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.5.0-SNAPSHOT + 1.5.0 ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index 69671412..61f6d7e7 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.5.0-SNAPSHOT + 1.5.0 ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index fc50429d..247eef6e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.5.0-SNAPSHOT + 1.5.0 pom backend diff --git a/resources/pom.xml b/resources/pom.xml index 26eb655c..477ffc11 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.5.0-SNAPSHOT + 1.5.0 ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index 157ab256..ef06645d 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.5.0-SNAPSHOT + 1.5.0 ru.micord.ervu.dashboard From 346c156cf59850daa45e45941a15adb77136b308 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 30 Sep 2024 17:00:49 +0300 Subject: [PATCH 48/68] Update develop to production version to avoid merge conflicts --- backend/pom.xml | 2 +- distribution/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 2 +- resources/pom.xml | 2 +- test/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index 682c1be0..c2c18697 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.5.0 ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index 65773c97..e1c293a0 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.5.0 ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index c9cf52b6..61f6d7e7 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.5.0 ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index 93d4fc13..247eef6e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.5.0 pom backend diff --git a/resources/pom.xml b/resources/pom.xml index cccc0d3b..477ffc11 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.5.0 ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index 5c1e94c4..ef06645d 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.5.0 ru.micord.ervu.dashboard From e7315a522565e826312bf01e190d619ca4e0f8f0 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 30 Sep 2024 17:00:51 +0300 Subject: [PATCH 49/68] Update develop version back to pre-merge state --- backend/pom.xml | 2 +- distribution/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 2 +- resources/pom.xml | 2 +- test/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index c2c18697..682c1be0 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.5.0 + 1.6.0-SNAPSHOT ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index e1c293a0..65773c97 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.5.0 + 1.6.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index 61f6d7e7..c9cf52b6 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.5.0 + 1.6.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index 247eef6e..93d4fc13 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.5.0 + 1.6.0-SNAPSHOT pom backend diff --git a/resources/pom.xml b/resources/pom.xml index 477ffc11..cccc0d3b 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.5.0 + 1.6.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index ef06645d..5c1e94c4 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.5.0 + 1.6.0-SNAPSHOT ru.micord.ervu.dashboard From a3a6a2fd59936caef7ad4a0e15a876ba91749822 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 30 Sep 2024 18:24:43 +0300 Subject: [PATCH 50/68] Update versions for hotfix --- backend/pom.xml | 2 +- distribution/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 2 +- resources/pom.xml | 2 +- test/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index c2c18697..4942b497 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.5.0 + 1.5.1-SNAPSHOT ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index e1c293a0..d434aa7e 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.5.0 + 1.5.1-SNAPSHOT ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index 61f6d7e7..4c383bc7 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.5.0 + 1.5.1-SNAPSHOT ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index 247eef6e..7574ae89 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.5.0 + 1.5.1-SNAPSHOT pom backend diff --git a/resources/pom.xml b/resources/pom.xml index 477ffc11..08898674 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.5.0 + 1.5.1-SNAPSHOT ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index ef06645d..7d316c54 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.5.0 + 1.5.1-SNAPSHOT ru.micord.ervu.dashboard From 420a4f839bfafbb180e6384f5a406f2b4bc27493 Mon Sep 17 00:00:00 2001 From: kochetkov Date: Mon, 30 Sep 2024 18:26:53 +0300 Subject: [PATCH 51/68] fix --- .../ts/ervu-dashboard/formatter/ReplaceValueTextFormatter.ts | 4 ++-- .../model/{ReplaceValueModel.ts => ErvuReplaceValueModel.ts} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename frontend/src/ts/ervu-dashboard/formatter/model/{ReplaceValueModel.ts => ErvuReplaceValueModel.ts} (59%) diff --git a/frontend/src/ts/ervu-dashboard/formatter/ReplaceValueTextFormatter.ts b/frontend/src/ts/ervu-dashboard/formatter/ReplaceValueTextFormatter.ts index 69b28a46..0548a46c 100644 --- a/frontend/src/ts/ervu-dashboard/formatter/ReplaceValueTextFormatter.ts +++ b/frontend/src/ts/ervu-dashboard/formatter/ReplaceValueTextFormatter.ts @@ -1,8 +1,8 @@ import {Behavior, TextFormatter} from "@webbpm/base-package"; -import {ReplaceValueModel} from "./model/ReplaceValueModel"; +import {ErvuReplaceValueModel} from "./model/ErvuReplaceValueModel"; export class ReplaceValueTextFormatter extends Behavior implements TextFormatter { - public replaceModels: ReplaceValueModel[] + public replaceModels: ErvuReplaceValueModel[] format(value: string): string { if (this.replaceModels) { diff --git a/frontend/src/ts/ervu-dashboard/formatter/model/ReplaceValueModel.ts b/frontend/src/ts/ervu-dashboard/formatter/model/ErvuReplaceValueModel.ts similarity index 59% rename from frontend/src/ts/ervu-dashboard/formatter/model/ReplaceValueModel.ts rename to frontend/src/ts/ervu-dashboard/formatter/model/ErvuReplaceValueModel.ts index 30423862..e22a1e8d 100644 --- a/frontend/src/ts/ervu-dashboard/formatter/model/ReplaceValueModel.ts +++ b/frontend/src/ts/ervu-dashboard/formatter/model/ErvuReplaceValueModel.ts @@ -1,4 +1,4 @@ -export class ReplaceValueModel { +export class ErvuReplaceValueModel { public valueToReplace: string; public value: string; -} \ No newline at end of file +} From 1ef02292dd2ebeab133c77ef467d2ce3356f5f4e Mon Sep 17 00:00:00 2001 From: root Date: Mon, 30 Sep 2024 18:35:57 +0300 Subject: [PATCH 52/68] Update for next development version --- backend/pom.xml | 2 +- distribution/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 2 +- resources/pom.xml | 2 +- test/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index 4942b497..1c191a1b 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.5.1-SNAPSHOT + 1.5.1 ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index d434aa7e..29252b0b 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.5.1-SNAPSHOT + 1.5.1 ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index 4c383bc7..ce9f0606 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.5.1-SNAPSHOT + 1.5.1 ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index 7574ae89..1b466bae 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.5.1-SNAPSHOT + 1.5.1 pom backend diff --git a/resources/pom.xml b/resources/pom.xml index 08898674..9161284e 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.5.1-SNAPSHOT + 1.5.1 ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index 7d316c54..dbb23f78 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.5.1-SNAPSHOT + 1.5.1 ru.micord.ervu.dashboard From a1aa4504f3a4a45e277bbe5327f538a5cbed718d Mon Sep 17 00:00:00 2001 From: root Date: Mon, 30 Sep 2024 18:35:59 +0300 Subject: [PATCH 53/68] Update to hotfix version --- backend/pom.xml | 2 +- distribution/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 2 +- resources/pom.xml | 2 +- test/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index 682c1be0..1c191a1b 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.5.1 ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index 65773c97..29252b0b 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.5.1 ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index c9cf52b6..ce9f0606 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.5.1 ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index 93d4fc13..1b466bae 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.5.1 pom backend diff --git a/resources/pom.xml b/resources/pom.xml index cccc0d3b..9161284e 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.5.1 ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index 5c1e94c4..dbb23f78 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.5.1 ru.micord.ervu.dashboard From 8256482af61d1cdb3570c69e1c74f323cb585eab Mon Sep 17 00:00:00 2001 From: root Date: Mon, 30 Sep 2024 18:36:02 +0300 Subject: [PATCH 54/68] Update for next development version --- backend/pom.xml | 2 +- distribution/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 2 +- resources/pom.xml | 2 +- test/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index 1c191a1b..682c1be0 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.5.1 + 1.6.0-SNAPSHOT ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index 29252b0b..65773c97 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.5.1 + 1.6.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index ce9f0606..c9cf52b6 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.5.1 + 1.6.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index 1b466bae..93d4fc13 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.5.1 + 1.6.0-SNAPSHOT pom backend diff --git a/resources/pom.xml b/resources/pom.xml index 9161284e..cccc0d3b 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.5.1 + 1.6.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index dbb23f78..5c1e94c4 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.5.1 + 1.6.0-SNAPSHOT ru.micord.ervu.dashboard From 53bbe560d80b4a0e73c5a8a661fcf7748ae7fa12 Mon Sep 17 00:00:00 2001 From: "m.epshtein" Date: Tue, 1 Oct 2024 13:39:14 +0300 Subject: [PATCH 55/68] dashboard in title --- frontend/index.html | 2 +- frontend/index.webpack.html | 2 +- frontend/preview.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/index.html b/frontend/index.html index d81cc685..22b58aa5 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -1,7 +1,7 @@ - ervu_dashboard + Дашборд diff --git a/frontend/index.webpack.html b/frontend/index.webpack.html index d2951109..e9aa8fe0 100644 --- a/frontend/index.webpack.html +++ b/frontend/index.webpack.html @@ -1,7 +1,7 @@ - ervu_dashboard + Дашборд diff --git a/frontend/preview.html b/frontend/preview.html index 4bd5c4b0..6fe24323 100644 --- a/frontend/preview.html +++ b/frontend/preview.html @@ -1,7 +1,7 @@ - Web BPM + Дашборд From cb7b4763f83ef279046c986298e2974c2e6b4142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=83=D0=BB=D0=B0=D1=82=20=D0=A5=D0=B0=D0=B9=D1=80?= =?UTF-8?q?=D1=83=D0=BB=D0=BB=D0=B8=D0=BD?= Date: Fri, 4 Oct 2024 21:45:48 +0300 Subject: [PATCH 56/68] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B2=20=D0=BA=D0=B0=D1=80=D1=82=D0=BE=D1=87=D0=BA=D0=B5=20?= =?UTF-8?q?=D0=B3=D1=80=D0=B0=D0=B6=D0=B4=D0=B0=D0=BD=D0=B8=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/business-model/citizencard.page | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/src/main/resources/business-model/citizencard.page b/resources/src/main/resources/business-model/citizencard.page index 335062d3..62ec3bf7 100644 --- a/resources/src/main/resources/business-model/citizencard.page +++ b/resources/src/main/resources/business-model/citizencard.page @@ -7059,7 +7059,7 @@ columnForFilter - {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"citizen_id"} + {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"recruit_id"} @@ -7171,7 +7171,7 @@ field - {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"name"} + {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"restriction_name"} @@ -7213,7 +7213,7 @@ field - {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"date_application"} + {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"decision_date_create"} @@ -7255,7 +7255,7 @@ field - {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"withdrawal_date"} + {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"cancel_date"} @@ -7285,7 +7285,7 @@ field - {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"status"} + {"schema":"ervu_dashboard","table":"temporary_measures","entity":"temporary_measures","name":"status_measure"} From 20907f3e7c895f7c586fb88b77c968cb4f4aea2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=83=D0=BB=D0=B0=D1=82=20=D0=A5=D0=B0=D0=B9=D1=80?= =?UTF-8?q?=D1=83=D0=BB=D0=BB=D0=B8=D0=BD?= Date: Fri, 4 Oct 2024 21:46:29 +0300 Subject: [PATCH 57/68] db beans --- .../ervu_dashboard/ErvuDashboard.java | 9 +- .../db_beans/ervu_dashboard/Keys.java | 5 +- .../db_beans/ervu_dashboard/Tables.java | 8 +- .../ervu_dashboard/tables/Citizen.java | 2 +- .../ervu_dashboard/tables/Decision.java | 240 ++++++++++++++ .../ervu_dashboard/tables/Recruitment.java | 3 +- .../ervu_dashboard/tables/Subpoena.java | 133 ++++++-- .../tables/TemporaryMeasures.java | 73 ++++- .../tables/records/CitizenRecord.java | 8 +- .../tables/records/DecisionRecord.java | 111 +++++++ .../tables/records/RecruitmentRecord.java | 10 +- .../tables/records/SubpoenaRecord.java | 294 ++++++++++++++++-- .../records/TemporaryMeasuresRecord.java | 247 +++++++++++---- 13 files changed, 1013 insertions(+), 130 deletions(-) create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Decision.java create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/DecisionRecord.java diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java index 03e659b7..3590f2d5 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/ErvuDashboard.java @@ -13,6 +13,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Citizenship; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenshipForeign; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangelog; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangeloglock; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Decision; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Deputy; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disability; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disease; @@ -89,6 +90,11 @@ public class ErvuDashboard extends SchemaImpl { */ public final Databasechangeloglock DATABASECHANGELOGLOCK = Databasechangeloglock.DATABASECHANGELOGLOCK; + /** + * The table ervu_dashboard.decision. + */ + public final Decision DECISION = Decision.DECISION; + /** * сведения о гражданах, избранных депутатами/зарегистрированных кандидатами * на участие в выборах @@ -146,7 +152,7 @@ public class ErvuDashboard extends SchemaImpl { public final Recruitment RECRUITMENT = Recruitment.RECRUITMENT; /** - * The table ervu_dashboard.subpoena. + * сведения о направлении повестки военного комиссариата */ public final Subpoena SUBPOENA = Subpoena.SUBPOENA; @@ -184,6 +190,7 @@ public class ErvuDashboard extends SchemaImpl { CitizenshipForeign.CITIZENSHIP_FOREIGN, Databasechangelog.DATABASECHANGELOG, Databasechangeloglock.DATABASECHANGELOGLOCK, + Decision.DECISION, Deputy.DEPUTY, Disability.DISABILITY, Disease.DISEASE, diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java index 3287f830..b2010943 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Keys.java @@ -11,6 +11,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenSpous import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Citizenship; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenshipForeign; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangeloglock; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Decision; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Deputy; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disability; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disease; @@ -32,6 +33,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.Citi import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenshipForeignRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.CitizenshipRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DatabasechangeloglockRecord; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DecisionRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DeputyRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DisabilityRecord; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DiseaseRecord; @@ -71,6 +73,7 @@ public class Keys { public static final UniqueKey PK_CITIZENSHIP = Internal.createUniqueKey(Citizenship.CITIZENSHIP, DSL.name("pk_citizenship"), new TableField[] { Citizenship.CITIZENSHIP.CITIZENSHIP_ID }, true); public static final UniqueKey PK_CITIZENSHIP_FOREIGN = Internal.createUniqueKey(CitizenshipForeign.CITIZENSHIP_FOREIGN, DSL.name("pk_citizenship_foreign"), new TableField[] { CitizenshipForeign.CITIZENSHIP_FOREIGN.CITIZENSHIP_FOREIGN_ID }, true); public static final UniqueKey DATABASECHANGELOGLOCK_PKEY = Internal.createUniqueKey(Databasechangeloglock.DATABASECHANGELOGLOCK, DSL.name("databasechangeloglock_pkey"), new TableField[] { Databasechangeloglock.DATABASECHANGELOGLOCK.ID }, true); + public static final UniqueKey DECISION_PKEY = Internal.createUniqueKey(Decision.DECISION, DSL.name("decision_pkey"), new TableField[] { Decision.DECISION.DECISION_ID }, true); public static final UniqueKey PK_DEPUTY = Internal.createUniqueKey(Deputy.DEPUTY, DSL.name("pk_deputy"), new TableField[] { Deputy.DEPUTY.DEPUTY_ID }, true); public static final UniqueKey PK_DISABILITY = Internal.createUniqueKey(Disability.DISABILITY, DSL.name("pk_disability"), new TableField[] { Disability.DISABILITY.DISABILITY_ID }, true); public static final UniqueKey PK_DISEASE = Internal.createUniqueKey(Disease.DISEASE, DSL.name("pk_disease"), new TableField[] { Disease.DISEASE.DISEASE_ID }, true); @@ -83,7 +86,7 @@ public class Keys { public static final UniqueKey RECRUITMENT_IDM_ID_KEY = Internal.createUniqueKey(PubRecruitment.PUB_RECRUITMENT, DSL.name("recruitment_idm_id_key"), new TableField[] { PubRecruitment.PUB_RECRUITMENT.IDM_ID }, true); public static final UniqueKey PK_PUNISHMENT = Internal.createUniqueKey(Punishment.PUNISHMENT, DSL.name("pk_punishment"), new TableField[] { Punishment.PUNISHMENT.PUNISHMENT_ID }, true); public static final UniqueKey RECRUITMENT_PKEY = Internal.createUniqueKey(Recruitment.RECRUITMENT, DSL.name("recruitment_pkey"), new TableField[] { Recruitment.RECRUITMENT.ID }, true); - public static final UniqueKey SUBPOENA_PKEY = Internal.createUniqueKey(Subpoena.SUBPOENA, DSL.name("subpoena_pkey"), new TableField[] { Subpoena.SUBPOENA.SUBPOENA_ID }, true); + public static final UniqueKey SUBPOENA_PKEY = Internal.createUniqueKey(Subpoena.SUBPOENA, DSL.name("subpoena_pkey"), new TableField[] { Subpoena.SUBPOENA.SUB_ID }, true); public static final UniqueKey TEMPORARY_MEASURES_PKEY = Internal.createUniqueKey(TemporaryMeasures.TEMPORARY_MEASURES, DSL.name("temporary_measures_pkey"), new TableField[] { TemporaryMeasures.TEMPORARY_MEASURES.TEMPORARY_MEASURES_ID }, true); public static final UniqueKey PK_WORK = Internal.createUniqueKey(Work.WORK, DSL.name("pk_work"), new TableField[] { Work.WORK.WORK_ID }, true); } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java index bfc83539..5472f66c 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/Tables.java @@ -12,6 +12,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Citizenship; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.CitizenshipForeign; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangelog; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Databasechangeloglock; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Decision; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Deputy; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disability; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Disease; @@ -74,6 +75,11 @@ public class Tables { */ public static final Databasechangeloglock DATABASECHANGELOGLOCK = Databasechangeloglock.DATABASECHANGELOGLOCK; + /** + * The table ervu_dashboard.decision. + */ + public static final Decision DECISION = Decision.DECISION; + /** * сведения о гражданах, избранных депутатами/зарегистрированных кандидатами * на участие в выборах @@ -131,7 +137,7 @@ public class Tables { public static final Recruitment RECRUITMENT = Recruitment.RECRUITMENT; /** - * The table ervu_dashboard.subpoena. + * сведения о направлении повестки военного комиссариата */ public static final Subpoena SUBPOENA = Subpoena.SUBPOENA; diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizen.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizen.java index 9d6cb5f5..c757b5ef 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizen.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Citizen.java @@ -265,7 +265,7 @@ public class Citizen extends TableImpl { /** * The column ervu_dashboard.citizen.recruitment_id. */ - public final TableField RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.CHAR(36), this, ""); + public final TableField RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.UUID, this, ""); /** * The column ervu_dashboard.citizen.issue_date. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Decision.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Decision.java new file mode 100644 index 00000000..5887fdd5 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Decision.java @@ -0,0 +1,240 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables; + + +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.DecisionRecord; + +import java.util.Collection; +import java.util.UUID; + +import org.jooq.Condition; +import org.jooq.Field; +import org.jooq.Identity; +import org.jooq.Name; +import org.jooq.PlainSQL; +import org.jooq.QueryPart; +import org.jooq.SQL; +import org.jooq.Schema; +import org.jooq.Select; +import org.jooq.Stringly; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.TableOptions; +import org.jooq.UniqueKey; +import org.jooq.impl.DSL; +import org.jooq.impl.SQLDataType; +import org.jooq.impl.TableImpl; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class Decision extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of ervu_dashboard.decision + */ + public static final Decision DECISION = new Decision(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return DecisionRecord.class; + } + + /** + * The column ervu_dashboard.decision.decision_id. + */ + public final TableField DECISION_ID = createField(DSL.name("decision_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + /** + * The column ervu_dashboard.decision.subpoena_id. + */ + public final TableField SUBPOENA_ID = createField(DSL.name("subpoena_id"), SQLDataType.UUID, this, ""); + + /** + * The column ervu_dashboard.decision.recruit_id. + */ + public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID, this, ""); + + /** + * The column ervu_dashboard.decision.recruitment_id. + */ + public final TableField RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.UUID, this, ""); + + private Decision(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private Decision(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where); + } + + /** + * Create an aliased ervu_dashboard.decision table reference + */ + public Decision(String alias) { + this(DSL.name(alias), DECISION); + } + + /** + * Create an aliased ervu_dashboard.decision table reference + */ + public Decision(Name alias) { + this(alias, DECISION); + } + + /** + * Create a ervu_dashboard.decision table reference + */ + public Decision() { + this(DSL.name("decision"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD; + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public UniqueKey getPrimaryKey() { + return Keys.DECISION_PKEY; + } + + @Override + public Decision as(String alias) { + return new Decision(DSL.name(alias), this); + } + + @Override + public Decision as(Name alias) { + return new Decision(alias, this); + } + + @Override + public Decision as(Table alias) { + return new Decision(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public Decision rename(String name) { + return new Decision(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public Decision rename(Name name) { + return new Decision(name, null); + } + + /** + * Rename this table + */ + @Override + public Decision rename(Table name) { + return new Decision(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Decision where(Condition condition) { + return new Decision(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Decision where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Decision where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Decision where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Decision where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Decision where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Decision where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Decision where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Decision whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Decision whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Recruitment.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Recruitment.java index b87f5409..daf2477c 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Recruitment.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Recruitment.java @@ -12,6 +12,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ratings.tables.ConscriptionInfo.Co import ervu_dashboard.ervu_dashboard.db_beans.recruitment_campaign.tables.PostponementInfo.PostponementInfoPath; import java.util.Collection; +import java.util.UUID; import org.jooq.Condition; import org.jooq.Field; @@ -70,7 +71,7 @@ public class Recruitment extends TableImpl { /** * The column ervu_dashboard.recruitment.idm_id. */ - public final TableField IDM_ID = createField(DSL.name("idm_id"), SQLDataType.VARCHAR(36), this, ""); + public final TableField IDM_ID = createField(DSL.name("idm_id"), SQLDataType.UUID, this, ""); /** * The column ervu_dashboard.recruitment.code. diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Subpoena.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Subpoena.java index 55c9acf3..31870fa8 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Subpoena.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Subpoena.java @@ -32,7 +32,7 @@ import org.jooq.impl.TableImpl; /** - * This class is generated by jOOQ. + * сведения о направлении повестки военного комиссариата */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Subpoena extends TableImpl { @@ -53,66 +53,153 @@ public class Subpoena extends TableImpl { } /** - * The column ervu_dashboard.subpoena.subpoena_id. + * The column ervu_dashboard.subpoena.sub_id. */ - public final TableField SUBPOENA_ID = createField(DSL.name("subpoena_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + public final TableField SUB_ID = createField(DSL.name("sub_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); /** - * The column ervu_dashboard.subpoena.series. + * The column ervu_dashboard.subpoena.series. серия повестки */ - public final TableField SERIES = createField(DSL.name("series"), SQLDataType.VARCHAR(16), this, ""); + public final TableField SERIES = createField(DSL.name("series"), SQLDataType.VARCHAR(16), this, "серия повестки"); /** - * The column ervu_dashboard.subpoena.number. + * The column ervu_dashboard.subpoena.number. номер повестки */ - public final TableField NUMBER = createField(DSL.name("number"), SQLDataType.VARCHAR(36).nullable(false), this, ""); + public final TableField NUMBER = createField(DSL.name("number"), SQLDataType.VARCHAR(36).nullable(false), this, "номер повестки"); /** - * The column ervu_dashboard.subpoena.create_date. + * The column ervu_dashboard.subpoena.create_date. дата + * создания записи */ - public final TableField CREATE_DATE = createField(DSL.name("create_date"), SQLDataType.TIMESTAMP(0).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.TIMESTAMP)), this, ""); + public final TableField CREATE_DATE = createField(DSL.name("create_date"), SQLDataType.TIMESTAMP(0).nullable(false).defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.TIMESTAMP)), this, "дата создания записи"); /** - * The column ervu_dashboard.subpoena.visit_date. + * The column ervu_dashboard.subpoena.visit_date. время и дата + * явки в ВК */ - public final TableField VISIT_DATE = createField(DSL.name("visit_date"), SQLDataType.TIMESTAMP(0), this, ""); + public final TableField VISIT_DATE = createField(DSL.name("visit_date"), SQLDataType.TIMESTAMP(0), this, "время и дата явки в ВК"); /** - * The column ervu_dashboard.subpoena.send_date. + * The column ervu_dashboard.subpoena.send_date. дата + * направления повестки */ - public final TableField SEND_DATE = createField(DSL.name("send_date"), SQLDataType.TIMESTAMP(0), this, ""); + public final TableField SEND_DATE = createField(DSL.name("send_date"), SQLDataType.TIMESTAMP(0), this, "дата направления повестки"); /** - * The column ervu_dashboard.subpoena.reason_cancelled. + * The column ervu_dashboard.subpoena.reason_cancelled. причина + * отклонения повестки */ - public final TableField REASON_CANCELLED = createField(DSL.name("reason_cancelled"), SQLDataType.VARCHAR(255), this, ""); + public final TableField REASON_CANCELLED = createField(DSL.name("reason_cancelled"), SQLDataType.VARCHAR(255), this, "причина отклонения повестки"); /** - * The column ervu_dashboard.subpoena.recruit_id. + * The column ervu_dashboard.subpoena.recruit_id. идентификатор + * рекрута */ - public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID, this, ""); + public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID, this, "идентификатор рекрута"); /** * The column ervu_dashboard.subpoena.department_id. + * идентификатор ВК */ - public final TableField DEPARTMENT_ID = createField(DSL.name("department_id"), SQLDataType.UUID, this, ""); + public final TableField DEPARTMENT_ID = createField(DSL.name("department_id"), SQLDataType.UUID, this, "идентификатор ВК"); /** - * The column ervu_dashboard.subpoena.subpoena_status. + * The column ervu_dashboard.subpoena.subpoena_status. статус + * повестки */ - public final TableField SUBPOENA_STATUS = createField(DSL.name("subpoena_status"), SQLDataType.CLOB, this, ""); + public final TableField SUBPOENA_STATUS = createField(DSL.name("subpoena_status"), SQLDataType.CLOB, this, "статус повестки"); /** - * The column ervu_dashboard.subpoena.subpoena_reason. + * The column ervu_dashboard.subpoena.subpoena_reason. причина + * вызова по повестке */ - public final TableField SUBPOENA_REASON = createField(DSL.name("subpoena_reason"), SQLDataType.CLOB, this, ""); + public final TableField SUBPOENA_REASON = createField(DSL.name("subpoena_reason"), SQLDataType.CLOB, this, "причина вызова по повестке"); + + /** + * The column ervu_dashboard.subpoena.fio_commiss. фио + * комиссара + */ + public final TableField FIO_COMMISS = createField(DSL.name("fio_commiss"), SQLDataType.CLOB, this, "фио комиссара"); + + /** + * The column ervu_dashboard.subpoena.track_number. уникальный + * номер заказного почтового отправления, которым направлена повестка + */ + public final TableField TRACK_NUMBER = createField(DSL.name("track_number"), SQLDataType.CLOB, this, "уникальный номер заказного почтового отправления, которым направлена повестка"); + + /** + * The column ervu_dashboard.subpoena.recruitment_name. + * наименование ВК, направившего повестку + */ + public final TableField RECRUITMENT_NAME = createField(DSL.name("recruitment_name"), SQLDataType.CLOB, this, "наименование ВК, направившего повестку"); + + /** + * The column ervu_dashboard.subpoena.address. адрес, по + * которому нужно явиться по повестке + */ + public final TableField ADDRESS = createField(DSL.name("address"), SQLDataType.CLOB, this, "адрес, по которому нужно явиться по повестке"); + + /** + * The column ervu_dashboard.subpoena.method_sending. способ + * направления повестки + */ + public final TableField METHOD_SENDING = createField(DSL.name("method_sending"), SQLDataType.CLOB, this, "способ направления повестки"); + + /** + * The column ervu_dashboard.subpoena.subpoena_id. + * идентификатор повестки + */ + public final TableField SUBPOENA_ID = createField(DSL.name("subpoena_id"), SQLDataType.UUID, this, "идентификатор повестки"); + + /** + * The column ervu_dashboard.subpoena.sig_info. открепленная ЭП + */ + public final TableField SIG_INFO = createField(DSL.name("sig_info"), SQLDataType.VARCHAR(255), this, "открепленная ЭП"); + + /** + * The column ervu_dashboard.subpoena.delivery_fio. фио лица, + * оповестившего гражданина о последствиях отказа от получения повестки + */ + public final TableField DELIVERY_FIO = createField(DSL.name("delivery_fio"), SQLDataType.CLOB, this, "фио лица, оповестившего гражданина о последствиях отказа от получения повестки"); + + /** + * The column ervu_dashboard.subpoena.act_number. номер акта об + * отказе от получения повестки + */ + public final TableField ACT_NUMBER = createField(DSL.name("act_number"), SQLDataType.CLOB, this, "номер акта об отказе от получения повестки"); + + /** + * The column ervu_dashboard.subpoena.method_delivery. способ + * вручения + */ + public final TableField METHOD_DELIVERY = createField(DSL.name("method_delivery"), SQLDataType.CLOB, this, "способ вручения"); + + /** + * The column ervu_dashboard.subpoena.delivery_date. + */ + public final TableField DELIVERY_DATE = createField(DSL.name("delivery_date"), SQLDataType.TIMESTAMP(0), this, ""); + + /** + * The column ervu_dashboard.subpoena.delivery_status. + */ + public final TableField DELIVERY_STATUS = createField(DSL.name("delivery_status"), SQLDataType.CLOB, this, ""); + + /** + * The column ervu_dashboard.subpoena.appearance. + */ + public final TableField APPEARANCE = createField(DSL.name("appearance"), SQLDataType.CLOB, this, ""); + + /** + * The column ervu_dashboard.subpoena.appearance_status. + */ + public final TableField APPEARANCE_STATUS = createField(DSL.name("appearance_status"), SQLDataType.CLOB, this, ""); private Subpoena(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); } private Subpoena(Name alias, Table aliased, Field[] parameters, Condition where) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where); + super(alias, null, aliased, parameters, DSL.comment("сведения о направлении повестки военного комиссариата"), TableOptions.table(), where); } /** diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/TemporaryMeasures.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/TemporaryMeasures.java index 4c6e2ba0..a2d50051 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/TemporaryMeasures.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/TemporaryMeasures.java @@ -8,7 +8,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.TemporaryMeasuresRecord; -import java.sql.Date; +import java.sql.Timestamp; import java.util.Collection; import java.util.UUID; @@ -58,37 +58,86 @@ public class TemporaryMeasures extends TableImpl { */ public final TableField TEMPORARY_MEASURES_ID = createField(DSL.name("temporary_measures_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + /** + * The column ervu_dashboard.temporary_measures.subpoena_id. + */ + public final TableField SUBPOENA_ID = createField(DSL.name("subpoena_id"), SQLDataType.UUID, this, ""); + + /** + * The column ervu_dashboard.temporary_measures.recruit_id. + */ + public final TableField RECRUIT_ID = createField(DSL.name("recruit_id"), SQLDataType.UUID, this, ""); + /** * The column ervu_dashboard.temporary_measures.recruitment_id. */ - public final TableField RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.VARCHAR.nullable(false), this, ""); + public final TableField RECRUITMENT_ID = createField(DSL.name("recruitment_id"), SQLDataType.UUID, this, ""); /** - * The column ervu_dashboard.temporary_measures.name. + * The column ervu_dashboard.temporary_measures.status_measure. + * статус временной меры */ - public final TableField NAME = createField(DSL.name("name"), SQLDataType.VARCHAR.nullable(false), this, ""); + public final TableField STATUS_MEASURE = createField(DSL.name("status_measure"), SQLDataType.CLOB, this, "статус временной меры"); /** * The column - * ervu_dashboard.temporary_measures.date_application. + * ervu_dashboard.temporary_measures.recruitment_name. + * наименование ВК */ - public final TableField DATE_APPLICATION = createField(DSL.name("date_application"), SQLDataType.DATE.nullable(false), this, ""); + public final TableField RECRUITMENT_NAME = createField(DSL.name("recruitment_name"), SQLDataType.CLOB, this, "наименование ВК"); + + /** + * The column ervu_dashboard.temporary_measures.cancel_date. + * дата, с которой отменена временная мера + */ + public final TableField CANCEL_DATE = createField(DSL.name("cancel_date"), SQLDataType.TIMESTAMP(0), this, "дата, с которой отменена временная мера"); /** * The column - * ervu_dashboard.temporary_measures.withdrawal_date. + * ervu_dashboard.temporary_measures.restriction_name. + * наименование временной меры */ - public final TableField WITHDRAWAL_DATE = createField(DSL.name("withdrawal_date"), SQLDataType.DATE, this, ""); + public final TableField RESTRICTION_NAME = createField(DSL.name("restriction_name"), SQLDataType.CLOB, this, "наименование временной меры"); /** - * The column ervu_dashboard.temporary_measures.status. + * The column ervu_dashboard.temporary_measures.type. тип + * документа ограничения */ - public final TableField STATUS = createField(DSL.name("status"), SQLDataType.CHAR(100), this, ""); + public final TableField TYPE = createField(DSL.name("type"), SQLDataType.CLOB, this, "тип документа ограничения"); /** - * The column ervu_dashboard.temporary_measures.citizen_id. + * The column + * ervu_dashboard.temporary_measures.decision_number_create. + * номер решения о применении временной меры */ - public final TableField CITIZEN_ID = createField(DSL.name("citizen_id"), SQLDataType.UUID, this, ""); + public final TableField DECISION_NUMBER_CREATE = createField(DSL.name("decision_number_create"), SQLDataType.CLOB, this, "номер решения о применении временной меры"); + + /** + * The column + * ervu_dashboard.temporary_measures.decision_number_cancel. + * номер решения об отмене временной меры + */ + public final TableField DECISION_NUMBER_CANCEL = createField(DSL.name("decision_number_cancel"), SQLDataType.CLOB, this, "номер решения об отмене временной меры"); + + /** + * The column + * ervu_dashboard.temporary_measures.decision_date_create. дата + * решения о применении временной меры + */ + public final TableField DECISION_DATE_CREATE = createField(DSL.name("decision_date_create"), SQLDataType.TIMESTAMP(0), this, "дата решения о применении временной меры"); + + /** + * The column + * ervu_dashboard.temporary_measures.decision_date_cancel. дата + * решения об отмене временной меры + */ + public final TableField DECISION_DATE_CANCEL = createField(DSL.name("decision_date_cancel"), SQLDataType.TIMESTAMP(0), this, "дата решения об отмене временной меры"); + + /** + * The column ervu_dashboard.temporary_measures.applied_fact. + * факт применения временной меры + */ + public final TableField APPLIED_FACT = createField(DSL.name("applied_fact"), SQLDataType.CLOB, this, "факт применения временной меры"); private TemporaryMeasures(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenRecord.java index 0e483a65..4c9c553c 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenRecord.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/CitizenRecord.java @@ -593,15 +593,15 @@ public class CitizenRecord extends UpdatableRecordImpl { /** * Setter for ervu_dashboard.citizen.recruitment_id. */ - public void setRecruitmentId(String value) { + public void setRecruitmentId(UUID value) { set(37, value); } /** * Getter for ervu_dashboard.citizen.recruitment_id. */ - public String getRecruitmentId() { - return (String) get(37); + public UUID getRecruitmentId() { + return (UUID) get(37); } /** @@ -655,7 +655,7 @@ public class CitizenRecord extends UpdatableRecordImpl { /** * Create a detached, initialised CitizenRecord */ - public CitizenRecord(String residence, String isRegistered, String passportSeries, String passportNumber, String phone, String medicalRequirements, String defermentLiberation, String gender, String maritalStatus, String education, String employment, String reasonRegistration, String driverLicense, String disabilityGroup, String dispensaryRegistrationCode, String regionBirth, String cityBirth, Boolean rightDeferment, Boolean tookBreak, Boolean medic, Boolean sportsCategory, Boolean tractorLicense, Boolean isWanted, Boolean isInPrison, Boolean acquiredCitizenship, Boolean urgentService, Boolean contractService, Boolean mobilization, String fullName, String lastName, String firstName, String middleName, BigDecimal age, String birthPlace, BigDecimal numberChildren, Date birthDate, UUID recruitId, String recruitmentId, Date issueDate, BigDecimal numberChildren_18Old) { + public CitizenRecord(String residence, String isRegistered, String passportSeries, String passportNumber, String phone, String medicalRequirements, String defermentLiberation, String gender, String maritalStatus, String education, String employment, String reasonRegistration, String driverLicense, String disabilityGroup, String dispensaryRegistrationCode, String regionBirth, String cityBirth, Boolean rightDeferment, Boolean tookBreak, Boolean medic, Boolean sportsCategory, Boolean tractorLicense, Boolean isWanted, Boolean isInPrison, Boolean acquiredCitizenship, Boolean urgentService, Boolean contractService, Boolean mobilization, String fullName, String lastName, String firstName, String middleName, BigDecimal age, String birthPlace, BigDecimal numberChildren, Date birthDate, UUID recruitId, UUID recruitmentId, Date issueDate, BigDecimal numberChildren_18Old) { super(Citizen.CITIZEN); setResidence(residence); diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/DecisionRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/DecisionRecord.java new file mode 100644 index 00000000..8d0fd5e0 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/DecisionRecord.java @@ -0,0 +1,111 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records; + + +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Decision; + +import java.util.UUID; + +import org.jooq.Record1; +import org.jooq.impl.UpdatableRecordImpl; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class DecisionRecord extends UpdatableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for ervu_dashboard.decision.decision_id. + */ + public void setDecisionId(Long value) { + set(0, value); + } + + /** + * Getter for ervu_dashboard.decision.decision_id. + */ + public Long getDecisionId() { + return (Long) get(0); + } + + /** + * Setter for ervu_dashboard.decision.subpoena_id. + */ + public void setSubpoenaId(UUID value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.decision.subpoena_id. + */ + public UUID getSubpoenaId() { + return (UUID) get(1); + } + + /** + * Setter for ervu_dashboard.decision.recruit_id. + */ + public void setRecruitId(UUID value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.decision.recruit_id. + */ + public UUID getRecruitId() { + return (UUID) get(2); + } + + /** + * Setter for ervu_dashboard.decision.recruitment_id. + */ + public void setRecruitmentId(UUID value) { + set(3, value); + } + + /** + * Getter for ervu_dashboard.decision.recruitment_id. + */ + public UUID getRecruitmentId() { + return (UUID) get(3); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 key() { + return (Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached DecisionRecord + */ + public DecisionRecord() { + super(Decision.DECISION); + } + + /** + * Create a detached, initialised DecisionRecord + */ + public DecisionRecord(Long decisionId, UUID subpoenaId, UUID recruitId, UUID recruitmentId) { + super(Decision.DECISION); + + setDecisionId(decisionId); + setSubpoenaId(subpoenaId); + setRecruitId(recruitId); + setRecruitmentId(recruitmentId); + resetChangedOnNotNull(); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/RecruitmentRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/RecruitmentRecord.java index c40726dc..8a7ae183 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/RecruitmentRecord.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/RecruitmentRecord.java @@ -6,6 +6,8 @@ package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Recruitment; +import java.util.UUID; + import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; @@ -49,15 +51,15 @@ public class RecruitmentRecord extends UpdatableRecordImpl { /** * Setter for ervu_dashboard.recruitment.idm_id. */ - public void setIdmId(String value) { + public void setIdmId(UUID value) { set(2, value); } /** * Getter for ervu_dashboard.recruitment.idm_id. */ - public String getIdmId() { - return (String) get(2); + public UUID getIdmId() { + return (UUID) get(2); } /** @@ -125,7 +127,7 @@ public class RecruitmentRecord extends UpdatableRecordImpl { /** * Create a detached, initialised RecruitmentRecord */ - public RecruitmentRecord(String id, String shortname, String idmId, String code, String parentId, Long sort) { + public RecruitmentRecord(String id, String shortname, UUID idmId, String code, String parentId, Long sort) { super(Recruitment.RECRUITMENT); setId(id); diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/SubpoenaRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/SubpoenaRecord.java index 61ab235f..ecae847d 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/SubpoenaRecord.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/SubpoenaRecord.java @@ -14,7 +14,7 @@ import org.jooq.impl.UpdatableRecordImpl; /** - * This class is generated by jOOQ. + * сведения о направлении повестки военного комиссариата */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class SubpoenaRecord extends UpdatableRecordImpl { @@ -22,112 +22,122 @@ public class SubpoenaRecord extends UpdatableRecordImpl { private static final long serialVersionUID = 1L; /** - * Setter for ervu_dashboard.subpoena.subpoena_id. + * Setter for ervu_dashboard.subpoena.sub_id. */ - public void setSubpoenaId(Long value) { + public void setSubId(Long value) { set(0, value); } /** - * Getter for ervu_dashboard.subpoena.subpoena_id. + * Getter for ervu_dashboard.subpoena.sub_id. */ - public Long getSubpoenaId() { + public Long getSubId() { return (Long) get(0); } /** - * Setter for ervu_dashboard.subpoena.series. + * Setter for ervu_dashboard.subpoena.series. серия повестки */ public void setSeries(String value) { set(1, value); } /** - * Getter for ervu_dashboard.subpoena.series. + * Getter for ervu_dashboard.subpoena.series. серия повестки */ public String getSeries() { return (String) get(1); } /** - * Setter for ervu_dashboard.subpoena.number. + * Setter for ervu_dashboard.subpoena.number. номер повестки */ public void setNumber(String value) { set(2, value); } /** - * Getter for ervu_dashboard.subpoena.number. + * Getter for ervu_dashboard.subpoena.number. номер повестки */ public String getNumber() { return (String) get(2); } /** - * Setter for ervu_dashboard.subpoena.create_date. + * Setter for ervu_dashboard.subpoena.create_date. дата + * создания записи */ public void setCreateDate(Timestamp value) { set(3, value); } /** - * Getter for ervu_dashboard.subpoena.create_date. + * Getter for ervu_dashboard.subpoena.create_date. дата + * создания записи */ public Timestamp getCreateDate() { return (Timestamp) get(3); } /** - * Setter for ervu_dashboard.subpoena.visit_date. + * Setter for ervu_dashboard.subpoena.visit_date. время и дата + * явки в ВК */ public void setVisitDate(Timestamp value) { set(4, value); } /** - * Getter for ervu_dashboard.subpoena.visit_date. + * Getter for ervu_dashboard.subpoena.visit_date. время и дата + * явки в ВК */ public Timestamp getVisitDate() { return (Timestamp) get(4); } /** - * Setter for ervu_dashboard.subpoena.send_date. + * Setter for ervu_dashboard.subpoena.send_date. дата + * направления повестки */ public void setSendDate(Timestamp value) { set(5, value); } /** - * Getter for ervu_dashboard.subpoena.send_date. + * Getter for ervu_dashboard.subpoena.send_date. дата + * направления повестки */ public Timestamp getSendDate() { return (Timestamp) get(5); } /** - * Setter for ervu_dashboard.subpoena.reason_cancelled. + * Setter for ervu_dashboard.subpoena.reason_cancelled. причина + * отклонения повестки */ public void setReasonCancelled(String value) { set(6, value); } /** - * Getter for ervu_dashboard.subpoena.reason_cancelled. + * Getter for ervu_dashboard.subpoena.reason_cancelled. причина + * отклонения повестки */ public String getReasonCancelled() { return (String) get(6); } /** - * Setter for ervu_dashboard.subpoena.recruit_id. + * Setter for ervu_dashboard.subpoena.recruit_id. идентификатор + * рекрута */ public void setRecruitId(UUID value) { set(7, value); } /** - * Getter for ervu_dashboard.subpoena.recruit_id. + * Getter for ervu_dashboard.subpoena.recruit_id. идентификатор + * рекрута */ public UUID getRecruitId() { return (UUID) get(7); @@ -135,6 +145,7 @@ public class SubpoenaRecord extends UpdatableRecordImpl { /** * Setter for ervu_dashboard.subpoena.department_id. + * идентификатор ВК */ public void setDepartmentId(UUID value) { set(8, value); @@ -142,39 +153,258 @@ public class SubpoenaRecord extends UpdatableRecordImpl { /** * Getter for ervu_dashboard.subpoena.department_id. + * идентификатор ВК */ public UUID getDepartmentId() { return (UUID) get(8); } /** - * Setter for ervu_dashboard.subpoena.subpoena_status. + * Setter for ervu_dashboard.subpoena.subpoena_status. статус + * повестки */ public void setSubpoenaStatus(String value) { set(9, value); } /** - * Getter for ervu_dashboard.subpoena.subpoena_status. + * Getter for ervu_dashboard.subpoena.subpoena_status. статус + * повестки */ public String getSubpoenaStatus() { return (String) get(9); } /** - * Setter for ervu_dashboard.subpoena.subpoena_reason. + * Setter for ervu_dashboard.subpoena.subpoena_reason. причина + * вызова по повестке */ public void setSubpoenaReason(String value) { set(10, value); } /** - * Getter for ervu_dashboard.subpoena.subpoena_reason. + * Getter for ervu_dashboard.subpoena.subpoena_reason. причина + * вызова по повестке */ public String getSubpoenaReason() { return (String) get(10); } + /** + * Setter for ervu_dashboard.subpoena.fio_commiss. фио + * комиссара + */ + public void setFioCommiss(String value) { + set(11, value); + } + + /** + * Getter for ervu_dashboard.subpoena.fio_commiss. фио + * комиссара + */ + public String getFioCommiss() { + return (String) get(11); + } + + /** + * Setter for ervu_dashboard.subpoena.track_number. уникальный + * номер заказного почтового отправления, которым направлена повестка + */ + public void setTrackNumber(String value) { + set(12, value); + } + + /** + * Getter for ervu_dashboard.subpoena.track_number. уникальный + * номер заказного почтового отправления, которым направлена повестка + */ + public String getTrackNumber() { + return (String) get(12); + } + + /** + * Setter for ervu_dashboard.subpoena.recruitment_name. + * наименование ВК, направившего повестку + */ + public void setRecruitmentName(String value) { + set(13, value); + } + + /** + * Getter for ervu_dashboard.subpoena.recruitment_name. + * наименование ВК, направившего повестку + */ + public String getRecruitmentName() { + return (String) get(13); + } + + /** + * Setter for ervu_dashboard.subpoena.address. адрес, по + * которому нужно явиться по повестке + */ + public void setAddress(String value) { + set(14, value); + } + + /** + * Getter for ervu_dashboard.subpoena.address. адрес, по + * которому нужно явиться по повестке + */ + public String getAddress() { + return (String) get(14); + } + + /** + * Setter for ervu_dashboard.subpoena.method_sending. способ + * направления повестки + */ + public void setMethodSending(String value) { + set(15, value); + } + + /** + * Getter for ervu_dashboard.subpoena.method_sending. способ + * направления повестки + */ + public String getMethodSending() { + return (String) get(15); + } + + /** + * Setter for ervu_dashboard.subpoena.subpoena_id. + * идентификатор повестки + */ + public void setSubpoenaId(UUID value) { + set(16, value); + } + + /** + * Getter for ervu_dashboard.subpoena.subpoena_id. + * идентификатор повестки + */ + public UUID getSubpoenaId() { + return (UUID) get(16); + } + + /** + * Setter for ervu_dashboard.subpoena.sig_info. открепленная ЭП + */ + public void setSigInfo(String value) { + set(17, value); + } + + /** + * Getter for ervu_dashboard.subpoena.sig_info. открепленная ЭП + */ + public String getSigInfo() { + return (String) get(17); + } + + /** + * Setter for ervu_dashboard.subpoena.delivery_fio. фио лица, + * оповестившего гражданина о последствиях отказа от получения повестки + */ + public void setDeliveryFio(String value) { + set(18, value); + } + + /** + * Getter for ervu_dashboard.subpoena.delivery_fio. фио лица, + * оповестившего гражданина о последствиях отказа от получения повестки + */ + public String getDeliveryFio() { + return (String) get(18); + } + + /** + * Setter for ervu_dashboard.subpoena.act_number. номер акта об + * отказе от получения повестки + */ + public void setActNumber(String value) { + set(19, value); + } + + /** + * Getter for ervu_dashboard.subpoena.act_number. номер акта об + * отказе от получения повестки + */ + public String getActNumber() { + return (String) get(19); + } + + /** + * Setter for ervu_dashboard.subpoena.method_delivery. способ + * вручения + */ + public void setMethodDelivery(String value) { + set(20, value); + } + + /** + * Getter for ervu_dashboard.subpoena.method_delivery. способ + * вручения + */ + public String getMethodDelivery() { + return (String) get(20); + } + + /** + * Setter for ervu_dashboard.subpoena.delivery_date. + */ + public void setDeliveryDate(Timestamp value) { + set(21, value); + } + + /** + * Getter for ervu_dashboard.subpoena.delivery_date. + */ + public Timestamp getDeliveryDate() { + return (Timestamp) get(21); + } + + /** + * Setter for ervu_dashboard.subpoena.delivery_status. + */ + public void setDeliveryStatus(String value) { + set(22, value); + } + + /** + * Getter for ervu_dashboard.subpoena.delivery_status. + */ + public String getDeliveryStatus() { + return (String) get(22); + } + + /** + * Setter for ervu_dashboard.subpoena.appearance. + */ + public void setAppearance(String value) { + set(23, value); + } + + /** + * Getter for ervu_dashboard.subpoena.appearance. + */ + public String getAppearance() { + return (String) get(23); + } + + /** + * Setter for ervu_dashboard.subpoena.appearance_status. + */ + public void setAppearanceStatus(String value) { + set(24, value); + } + + /** + * Getter for ervu_dashboard.subpoena.appearance_status. + */ + public String getAppearanceStatus() { + return (String) get(24); + } + // ------------------------------------------------------------------------- // Primary key information // ------------------------------------------------------------------------- @@ -198,10 +428,10 @@ public class SubpoenaRecord extends UpdatableRecordImpl { /** * Create a detached, initialised SubpoenaRecord */ - public SubpoenaRecord(Long subpoenaId, String series, String number, Timestamp createDate, Timestamp visitDate, Timestamp sendDate, String reasonCancelled, UUID recruitId, UUID departmentId, String subpoenaStatus, String subpoenaReason) { + public SubpoenaRecord(Long subId, String series, String number, Timestamp createDate, Timestamp visitDate, Timestamp sendDate, String reasonCancelled, UUID recruitId, UUID departmentId, String subpoenaStatus, String subpoenaReason, String fioCommiss, String trackNumber, String recruitmentName, String address, String methodSending, UUID subpoenaId, String sigInfo, String deliveryFio, String actNumber, String methodDelivery, Timestamp deliveryDate, String deliveryStatus, String appearance, String appearanceStatus) { super(Subpoena.SUBPOENA); - setSubpoenaId(subpoenaId); + setSubId(subId); setSeries(series); setNumber(number); setCreateDate(createDate); @@ -212,6 +442,20 @@ public class SubpoenaRecord extends UpdatableRecordImpl { setDepartmentId(departmentId); setSubpoenaStatus(subpoenaStatus); setSubpoenaReason(subpoenaReason); + setFioCommiss(fioCommiss); + setTrackNumber(trackNumber); + setRecruitmentName(recruitmentName); + setAddress(address); + setMethodSending(methodSending); + setSubpoenaId(subpoenaId); + setSigInfo(sigInfo); + setDeliveryFio(deliveryFio); + setActNumber(actNumber); + setMethodDelivery(methodDelivery); + setDeliveryDate(deliveryDate); + setDeliveryStatus(deliveryStatus); + setAppearance(appearance); + setAppearanceStatus(appearanceStatus); resetChangedOnNotNull(); } } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/TemporaryMeasuresRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/TemporaryMeasuresRecord.java index 63dcb70c..3cd87b39 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/TemporaryMeasuresRecord.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/TemporaryMeasuresRecord.java @@ -6,7 +6,7 @@ package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.TemporaryMeasures; -import java.sql.Date; +import java.sql.Timestamp; import java.util.UUID; import org.jooq.Record1; @@ -37,92 +37,218 @@ public class TemporaryMeasuresRecord extends UpdatableRecordImplervu_dashboard.temporary_measures.subpoena_id. + */ + public void setSubpoenaId(UUID value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.temporary_measures.subpoena_id. + */ + public UUID getSubpoenaId() { + return (UUID) get(1); + } + + /** + * Setter for ervu_dashboard.temporary_measures.recruit_id. + */ + public void setRecruitId(UUID value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.temporary_measures.recruit_id. + */ + public UUID getRecruitId() { + return (UUID) get(2); + } + /** * Setter for ervu_dashboard.temporary_measures.recruitment_id. */ - public void setRecruitmentId(String value) { - set(1, value); + public void setRecruitmentId(UUID value) { + set(3, value); } /** * Getter for ervu_dashboard.temporary_measures.recruitment_id. */ - public String getRecruitmentId() { - return (String) get(1); + public UUID getRecruitmentId() { + return (UUID) get(3); } /** - * Setter for ervu_dashboard.temporary_measures.name. + * Setter for ervu_dashboard.temporary_measures.status_measure. + * статус временной меры */ - public void setName(String value) { - set(2, value); - } - - /** - * Getter for ervu_dashboard.temporary_measures.name. - */ - public String getName() { - return (String) get(2); - } - - /** - * Setter for - * ervu_dashboard.temporary_measures.date_application. - */ - public void setDateApplication(Date value) { - set(3, value); - } - - /** - * Getter for - * ervu_dashboard.temporary_measures.date_application. - */ - public Date getDateApplication() { - return (Date) get(3); - } - - /** - * Setter for - * ervu_dashboard.temporary_measures.withdrawal_date. - */ - public void setWithdrawalDate(Date value) { + public void setStatusMeasure(String value) { set(4, value); } /** - * Getter for - * ervu_dashboard.temporary_measures.withdrawal_date. + * Getter for ervu_dashboard.temporary_measures.status_measure. + * статус временной меры */ - public Date getWithdrawalDate() { - return (Date) get(4); + public String getStatusMeasure() { + return (String) get(4); } /** - * Setter for ervu_dashboard.temporary_measures.status. + * Setter for + * ervu_dashboard.temporary_measures.recruitment_name. + * наименование ВК */ - public void setStatus(String value) { + public void setRecruitmentName(String value) { set(5, value); } /** - * Getter for ervu_dashboard.temporary_measures.status. + * Getter for + * ervu_dashboard.temporary_measures.recruitment_name. + * наименование ВК */ - public String getStatus() { + public String getRecruitmentName() { return (String) get(5); } /** - * Setter for ervu_dashboard.temporary_measures.citizen_id. + * Setter for ervu_dashboard.temporary_measures.cancel_date. + * дата, с которой отменена временная мера */ - public void setCitizenId(UUID value) { + public void setCancelDate(Timestamp value) { set(6, value); } /** - * Getter for ervu_dashboard.temporary_measures.citizen_id. + * Getter for ervu_dashboard.temporary_measures.cancel_date. + * дата, с которой отменена временная мера */ - public UUID getCitizenId() { - return (UUID) get(6); + public Timestamp getCancelDate() { + return (Timestamp) get(6); + } + + /** + * Setter for + * ervu_dashboard.temporary_measures.restriction_name. + * наименование временной меры + */ + public void setRestrictionName(String value) { + set(7, value); + } + + /** + * Getter for + * ervu_dashboard.temporary_measures.restriction_name. + * наименование временной меры + */ + public String getRestrictionName() { + return (String) get(7); + } + + /** + * Setter for ervu_dashboard.temporary_measures.type. тип + * документа ограничения + */ + public void setType(String value) { + set(8, value); + } + + /** + * Getter for ervu_dashboard.temporary_measures.type. тип + * документа ограничения + */ + public String getType() { + return (String) get(8); + } + + /** + * Setter for + * ervu_dashboard.temporary_measures.decision_number_create. + * номер решения о применении временной меры + */ + public void setDecisionNumberCreate(String value) { + set(9, value); + } + + /** + * Getter for + * ervu_dashboard.temporary_measures.decision_number_create. + * номер решения о применении временной меры + */ + public String getDecisionNumberCreate() { + return (String) get(9); + } + + /** + * Setter for + * ervu_dashboard.temporary_measures.decision_number_cancel. + * номер решения об отмене временной меры + */ + public void setDecisionNumberCancel(String value) { + set(10, value); + } + + /** + * Getter for + * ervu_dashboard.temporary_measures.decision_number_cancel. + * номер решения об отмене временной меры + */ + public String getDecisionNumberCancel() { + return (String) get(10); + } + + /** + * Setter for + * ervu_dashboard.temporary_measures.decision_date_create. дата + * решения о применении временной меры + */ + public void setDecisionDateCreate(Timestamp value) { + set(11, value); + } + + /** + * Getter for + * ervu_dashboard.temporary_measures.decision_date_create. дата + * решения о применении временной меры + */ + public Timestamp getDecisionDateCreate() { + return (Timestamp) get(11); + } + + /** + * Setter for + * ervu_dashboard.temporary_measures.decision_date_cancel. дата + * решения об отмене временной меры + */ + public void setDecisionDateCancel(Timestamp value) { + set(12, value); + } + + /** + * Getter for + * ervu_dashboard.temporary_measures.decision_date_cancel. дата + * решения об отмене временной меры + */ + public Timestamp getDecisionDateCancel() { + return (Timestamp) get(12); + } + + /** + * Setter for ervu_dashboard.temporary_measures.applied_fact. + * факт применения временной меры + */ + public void setAppliedFact(String value) { + set(13, value); + } + + /** + * Getter for ervu_dashboard.temporary_measures.applied_fact. + * факт применения временной меры + */ + public String getAppliedFact() { + return (String) get(13); } // ------------------------------------------------------------------------- @@ -148,16 +274,23 @@ public class TemporaryMeasuresRecord extends UpdatableRecordImpl Date: Mon, 7 Oct 2024 16:31:33 +0300 Subject: [PATCH 58/68] Update for next development version --- backend/pom.xml | 2 +- distribution/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 2 +- resources/pom.xml | 2 +- test/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index 682c1be0..0d9afcc3 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index 65773c97..17d80086 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index c9cf52b6..81cf0eea 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index 93d4fc13..09742efb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT pom backend diff --git a/resources/pom.xml b/resources/pom.xml index cccc0d3b..e52d4bc9 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index 5c1e94c4..878c5983 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.7.0-SNAPSHOT ru.micord.ervu.dashboard From a74208d08021745e6b3a0c2b8fee714663971051 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 7 Oct 2024 16:35:06 +0300 Subject: [PATCH 59/68] Update for next development version --- backend/pom.xml | 2 +- distribution/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 2 +- resources/pom.xml | 2 +- test/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index 682c1be0..69364096 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.6.0 ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index 65773c97..0acc7689 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.6.0 ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index c9cf52b6..efbb5668 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.6.0 ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index 93d4fc13..19aff4e6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.6.0 pom backend diff --git a/resources/pom.xml b/resources/pom.xml index cccc0d3b..47c0c402 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.6.0 ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index 5c1e94c4..2578242a 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.6.0-SNAPSHOT + 1.6.0 ru.micord.ervu.dashboard From 9cd073c8b8f0a706073b57358e0bbc8ed41c945b Mon Sep 17 00:00:00 2001 From: root Date: Mon, 7 Oct 2024 16:35:09 +0300 Subject: [PATCH 60/68] Update develop to production version to avoid merge conflicts --- backend/pom.xml | 2 +- distribution/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 2 +- resources/pom.xml | 2 +- test/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index 0d9afcc3..69364096 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.6.0 ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index 17d80086..0acc7689 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.6.0 ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index 81cf0eea..efbb5668 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.6.0 ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index 09742efb..19aff4e6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.6.0 pom backend diff --git a/resources/pom.xml b/resources/pom.xml index e52d4bc9..47c0c402 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.6.0 ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index 878c5983..2578242a 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.6.0 ru.micord.ervu.dashboard From 07816182a0f053af77be858ba56c4f751a7166b7 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 7 Oct 2024 16:35:11 +0300 Subject: [PATCH 61/68] Update develop version back to pre-merge state --- backend/pom.xml | 2 +- distribution/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 2 +- resources/pom.xml | 2 +- test/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index 69364096..0d9afcc3 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.6.0 + 1.7.0-SNAPSHOT ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index 0acc7689..17d80086 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.0 + 1.7.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index efbb5668..81cf0eea 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.0 + 1.7.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index 19aff4e6..09742efb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.6.0 + 1.7.0-SNAPSHOT pom backend diff --git a/resources/pom.xml b/resources/pom.xml index 47c0c402..e52d4bc9 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.0 + 1.7.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index 2578242a..878c5983 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.6.0 + 1.7.0-SNAPSHOT ru.micord.ervu.dashboard From 1350e053b8100ac492bc9ab2942fa9c138e7936c Mon Sep 17 00:00:00 2001 From: root Date: Mon, 7 Oct 2024 16:45:28 +0300 Subject: [PATCH 62/68] Update versions for hotfix --- backend/pom.xml | 2 +- distribution/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 2 +- resources/pom.xml | 2 +- test/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index 69364096..62d2bc24 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.6.0 + 1.6.1-SNAPSHOT ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index 0acc7689..5f8514a1 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.0 + 1.6.1-SNAPSHOT ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index efbb5668..2ab739f9 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.0 + 1.6.1-SNAPSHOT ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index 19aff4e6..6e29fb78 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.6.0 + 1.6.1-SNAPSHOT pom backend diff --git a/resources/pom.xml b/resources/pom.xml index 47c0c402..a1279b16 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.0 + 1.6.1-SNAPSHOT ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index 2578242a..34b0f66b 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.6.0 + 1.6.1-SNAPSHOT ru.micord.ervu.dashboard From 28174e8487ac7ed419aeb105fac2c12f3bb06cc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=83=D0=BB=D0=B0=D1=82=20=D0=A5=D0=B0=D0=B9=D1=80?= =?UTF-8?q?=D1=83=D0=BB=D0=BB=D0=B8=D0=BD?= Date: Mon, 7 Oct 2024 16:55:52 +0300 Subject: [PATCH 63/68] infinite_load table --- .../src/main/resources/business-model/citizen.page | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/resources/src/main/resources/business-model/citizen.page b/resources/src/main/resources/business-model/citizen.page index ca4f6626..781a5b06 100644 --- a/resources/src/main/resources/business-model/citizen.page +++ b/resources/src/main/resources/business-model/citizen.page @@ -246,13 +246,6 @@ - - b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 - 47490b00-a300-41e5-9ad6-a9dcfde20e18 - Combo box - false - true - 630accd8-3776-4fc1-a87c-3a0f05274678 a82fddb1-5654-4b24-a337-c164f22af58f @@ -4002,12 +3995,6 @@ -rowModelType - - "CLIENT_SIDE" - - - style From 4b581ca09fe7ba6696f194037616ddf39cc9d28b Mon Sep 17 00:00:00 2001 From: root Date: Mon, 7 Oct 2024 16:58:30 +0300 Subject: [PATCH 64/68] Update for next development version --- backend/pom.xml | 2 +- distribution/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 2 +- resources/pom.xml | 2 +- test/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index 62d2bc24..c7640bb5 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.6.1-SNAPSHOT + 1.6.1 ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index 5f8514a1..d65d04d0 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.1-SNAPSHOT + 1.6.1 ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index 2ab739f9..938a8cf9 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.1-SNAPSHOT + 1.6.1 ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index 6e29fb78..f338edbb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.6.1-SNAPSHOT + 1.6.1 pom backend diff --git a/resources/pom.xml b/resources/pom.xml index a1279b16..abcac042 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.1-SNAPSHOT + 1.6.1 ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index 34b0f66b..0b01b7ad 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.6.1-SNAPSHOT + 1.6.1 ru.micord.ervu.dashboard From 9e02a12c8d8d6e2e6602d50dfe573111fb3d9ffb Mon Sep 17 00:00:00 2001 From: root Date: Mon, 7 Oct 2024 16:58:33 +0300 Subject: [PATCH 65/68] Update to hotfix version --- backend/pom.xml | 2 +- distribution/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 2 +- resources/pom.xml | 2 +- test/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index 0d9afcc3..c7640bb5 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.6.1 ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index 17d80086..d65d04d0 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.6.1 ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index 81cf0eea..938a8cf9 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.6.1 ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index 09742efb..f338edbb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.6.1 pom backend diff --git a/resources/pom.xml b/resources/pom.xml index e52d4bc9..abcac042 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.6.1 ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index 878c5983..0b01b7ad 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.6.1 ru.micord.ervu.dashboard From 9fad75173e3b3be430fe7a7f63a68d6542adb1cc Mon Sep 17 00:00:00 2001 From: root Date: Mon, 7 Oct 2024 16:58:35 +0300 Subject: [PATCH 66/68] Update for next development version --- backend/pom.xml | 2 +- distribution/pom.xml | 2 +- frontend/pom.xml | 2 +- pom.xml | 2 +- resources/pom.xml | 2 +- test/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/pom.xml b/backend/pom.xml index c7640bb5..0d9afcc3 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.6.1 + 1.7.0-SNAPSHOT ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index d65d04d0..17d80086 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.1 + 1.7.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index 938a8cf9..81cf0eea 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.1 + 1.7.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index f338edbb..09742efb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.6.1 + 1.7.0-SNAPSHOT pom backend diff --git a/resources/pom.xml b/resources/pom.xml index abcac042..e52d4bc9 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.6.1 + 1.7.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index 0b01b7ad..878c5983 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.6.1 + 1.7.0-SNAPSHOT ru.micord.ervu.dashboard From 3e75c2ae4b2fff0bdd386a92e39038512fe9efad Mon Sep 17 00:00:00 2001 From: Makarova Elena Date: Wed, 9 Oct 2024 21:00:40 +0300 Subject: [PATCH 67/68] =?UTF-8?q?=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=B8=D0=BB=D0=B0=20=D0=B1=D0=B0=D1=80=D1=8B=20=D0=B2=D1=81?= =?UTF-8?q?=D0=B5=D0=B3=D0=BE=20=D0=BD=D0=B0=20=D1=83=D1=87=D0=B5=D1=82?= =?UTF-8?q?=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/business-model/main.page | 315 +++++++++++++++--- 1 file changed, 269 insertions(+), 46 deletions(-) diff --git a/resources/src/main/resources/business-model/main.page b/resources/src/main/resources/business-model/main.page index aeb20bed..86a7bc63 100644 --- a/resources/src/main/resources/business-model/main.page +++ b/resources/src/main/resources/business-model/main.page @@ -188,13 +188,6 @@ - - b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 - 1776e9b1-dafa-47ee-8d99-b6797144cc93 - Combo box - false - true - 630accd8-3776-4fc1-a87c-3a0f05274678 88a51057-2192-426e-b46b-96abbcb90608 @@ -339,6 +332,28 @@ false + + + ComboboxFilterComponent + ervu-dashboard.component.filter + + true + true + + + isBusinessId + +true + + + + operation + +"EQUAL" + + + + bce312bd-0c82-45e5-89dc-a1af90431c18 @@ -552,7 +567,6 @@ 6710c493-e4f6-4a38-b56a-3dcf5cf7269b Всего состоят на учете true - false false @@ -739,7 +753,6 @@ c628b56d-670d-4067-8dd9-0843420c1499 Вертикальный контейнер true - false false @@ -1592,7 +1605,6 @@ 42f079fa-ffe9-49b0-b8f7-aac7ceb54563 Вертикальный контейнер true - false false @@ -1707,31 +1719,112 @@ - datasetsConfiguration + chartType - - - datasets - - + "BAR" + + + + dataSetServices + + + + + + columnAggregationDataSet - backgroundColor + aggregationData - + - "#00FFFFFF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"volunteer_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FFFFFF" + + + + label + + "Срочной службы" + + + - + - "#FFC737FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"contract_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#FFC737FF" + + + + label + + "Контрактной службы" + + + - + - "#00FF00FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"mobilization_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FF00FF" + + + + label + + "Мобилизации" + + + @@ -1749,39 +1842,55 @@ - data + chartType - - - 1 - - - - - 1 - - - - - 1 - - + "BAR" + + + + dataSetLabel + + " " - - - - + + + datasetType + + "COLUMN_AGGREGATION" + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"total_registered","schemaName":"main_dashboard","x":230.0,"y":253.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"total_registered","schemaName":"main_dashboard","x":230.0,"y":253.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"total_registered":{"tableName":"total_registered","schemaName":"main_dashboard","x":230.0,"y":253.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - BarMockChartV2Service - ervu_dashboard.component.chart + DefaultLoadDao + database.dao + + + +ErvuMultiChartDataSetService +ervu_dashboard.component.chart + + + + + + + + @@ -1843,7 +1952,7 @@ grace -"10%" +"50%" @@ -1905,6 +2014,7 @@ + false @@ -1954,11 +2064,123 @@ "#B3B3B3FF" + + family + + null + + + + labelAxis + + + number + + + null + + + + size + + null + + useStaticColor true + + + weight + + null + + + + + + +FilterReferences +ervu_dashboard.component.filter + + true + true + + + references + + + + + + column + + "recruitment_id" + + + + dataConverter + + +StringValueConverter +component.field.dataconvert + + + + + filterComponent + + {"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + + + + table + + "total_registered" + + + + + StaticFilterReference + ervu_dashboard.component.filter + + + + + + + + + +FilterGroupDelegate +ervu-dashboard.component.filter + + true + true + + + filterComponents + + + + {"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} + + + + + + liveFilter + + true + + + + triggerOnStart + + true + @@ -5324,6 +5546,7 @@ 287754e8-934b-4750-b623-48758802904c Призывная кампания true + false false From 8042b7c74290fb7f6ff53b7e6b79edc8d3099aa9 Mon Sep 17 00:00:00 2001 From: Makarova Elena Date: Thu, 10 Oct 2024 10:40:37 +0300 Subject: [PATCH 68/68] =?UTF-8?q?=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=B8=D0=BB=D0=B0=20=D0=B2=D1=81=D0=B5=20=D0=B1=D0=B0=D1=80?= =?UTF-8?q?=D1=8B=20=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=BB=D0=BD=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B1=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/business-model/main.page | 292 ++++++++++++++---- .../business-model/milregistration.page | 253 ++++++++++++--- .../business-model/notregistered.page | 267 +++++++++++++--- .../resources/business-model/recruitment.page | 6 +- .../Всего на учете (2й уровень).page | 276 ++++++++++++++--- 5 files changed, 901 insertions(+), 193 deletions(-) diff --git a/resources/src/main/resources/business-model/main.page b/resources/src/main/resources/business-model/main.page index 86a7bc63..90eb8efb 100644 --- a/resources/src/main/resources/business-model/main.page +++ b/resources/src/main/resources/business-model/main.page @@ -2014,7 +2014,12 @@ - false + + + + noDataText + + "0" @@ -2064,28 +2069,6 @@ "#B3B3B3FF" - - family - - null - - - - labelAxis - - - number - - - null - - - - size - - null - - useStaticColor @@ -3131,7 +3114,6 @@ bc72b920-b037-453b-b7d6-2aae8a5ab38d VB - Подлежат постановке на учет true - false false @@ -3317,7 +3299,6 @@ 5d23344d-2a90-488c-b936-440edc766dcc Вертикальный контейнер true - false false @@ -4204,7 +4185,6 @@ ec109c35-b859-43cc-ae23-df59e10a11b0 Вертикальный контейнер true - false false @@ -4318,31 +4298,112 @@ - datasetsConfiguration + chartType - - - datasets - - + "BAR" + + + + dataSetServices + + + + + + columnAggregationDataSet - backgroundColor + aggregationData - + - "#00FFFFFF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"volunteer_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FFFFFF" + + + + label + + "Срочной службы" + + + - + - "#FFC737FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"contract_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#FFC737FF" + + + + label + + "Контрактной службы" + + + - + - "#00FF00FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"mobilization_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FF00FF" + + + + label + + "Мобилизации" + + + @@ -4360,41 +4421,54 @@ - data + chartType - - - 1 - - - - - 1 - - - - - 1 - - + "BAR" + + + + dataSetLabel + + " " - - - - - - + + + datasetType + + "COLUMN_AGGREGATION" + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"waiting_registration","schemaName":"main_dashboard","x":233.0,"y":241.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"waiting_registration","schemaName":"main_dashboard","x":233.0,"y":241.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"waiting_registration":{"tableName":"waiting_registration","schemaName":"main_dashboard","x":233.0,"y":241.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - BarMockChartV2Service - ervu_dashboard.component.chart + DefaultLoadDao + database.dao + + + +ErvuMultiChartDataSetService +ervu_dashboard.component.chart + + + + + + + @@ -4456,7 +4530,7 @@ grace -"10%" +"50%" @@ -4520,6 +4594,12 @@ + + noDataText + + "0" + + style @@ -4566,6 +4646,90 @@ true + + + + + +FilterReferences +ervu_dashboard.component.filter + + true + true + + + references + + + + + + column + + "recruitment_id" + + + + dataConverter + + +StringValueConverter +component.field.dataconvert + + + + + filterComponent + + {"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + + + + table + + "waiting_registration" + + + + + StaticFilterReference + ervu_dashboard.component.filter + + + + + + + + + +FilterGroupDelegate +ervu-dashboard.component.filter + + true + true + + + filterComponents + + + + {"objectId":"7c78831c-9af0-49d2-9f7e-b357abf0a6ef","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} + + + + + + liveFilter + + true + + + + triggerOnStart + + true + diff --git a/resources/src/main/resources/business-model/milregistration.page b/resources/src/main/resources/business-model/milregistration.page index 4943a042..584b4ed3 100644 --- a/resources/src/main/resources/business-model/milregistration.page +++ b/resources/src/main/resources/business-model/milregistration.page @@ -717,7 +717,6 @@ 3cd1c88a-a967-4ede-8090-685369098604 Всего состоят на учете true - false false @@ -1772,31 +1771,112 @@ - datasetsConfiguration + chartType - - - datasets - - + "BAR" + + + + dataSetServices + + + + + + columnAggregationDataSet - backgroundColor + aggregationData - + - "#00FFFFFF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"volunteer_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FFFFFF" + + + + label + + "Срочной службы" + + + - + - "#FFC737FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"contract_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#FFC737FF" + + + + label + + "Контрактной службы" + + + - + - "#00FF00FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"mobilization_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FF00FF" + + + + label + + "Мобилизации" + + + @@ -1814,39 +1894,54 @@ - data + chartType - - - 1 - - - - - 1 - - - - - 1 - - + "BAR" + + + + dataSetLabel + + " " - - - - + + + datasetType + + "COLUMN_AGGREGATION" + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"total_registered","schemaName":"main_dashboard","x":256.0,"y":270.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"total_registered","schemaName":"main_dashboard","x":256.0,"y":270.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"total_registered":{"tableName":"total_registered","schemaName":"main_dashboard","x":256.0,"y":270.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - BarMockChartV2Service - ervu_dashboard.component.chart + DefaultLoadDao + database.dao + + + +ErvuMultiChartDataSetService +ervu_dashboard.component.chart + + + + + + + @@ -1908,7 +2003,7 @@ grace -"10%" +"50%" @@ -2018,6 +2113,90 @@ true + + + + + +FilterReferences +ervu_dashboard.component.filter + + true + true + + + references + + + + + + column + + "recruitment_id" + + + + dataConverter + + +StringValueConverter +component.field.dataconvert + + + + + filterComponent + + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + + + + table + + "total_registered" + + + + + StaticFilterReference + ervu_dashboard.component.filter + + + + + + + + + +FilterGroupDelegate +ervu-dashboard.component.filter + + true + true + + + filterComponents + + + + {"objectId":"a16e0d37-04dc-47b5-b7a6-b162bdbe1f40","packageName":"ervu-dashboard.component.filter","className":"ComboboxFilterComponent","type":"TS"} + + + + + + liveFilter + + true + + + + triggerOnStart + + true + diff --git a/resources/src/main/resources/business-model/notregistered.page b/resources/src/main/resources/business-model/notregistered.page index 1e460e12..cd7eb4a0 100644 --- a/resources/src/main/resources/business-model/notregistered.page +++ b/resources/src/main/resources/business-model/notregistered.page @@ -296,13 +296,6 @@ - - b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 - 49393e6f-f349-4f15-99ca-f0f3e794f67d - Combo box - false - true - 630accd8-3776-4fc1-a87c-3a0f05274678 f3ba1055-e764-420f-9c42-3232bbcbb321 @@ -704,7 +697,6 @@ 62ad92df-92a4-456b-9c72-c4e133f621f9 VB - Подлежат постановке на учет true - false false @@ -1806,32 +1798,112 @@ - datasetsConfiguration + chartType - - - datasets - - - + "BAR" + + + + dataSetServices + + + + + + columnAggregationDataSet - backgroundColor + aggregationData - + - "#00FFFFFF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"volunteer_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FFFFFF" + + + + label + + "Срочной службы" + + + - + - "#FFC737FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"contract_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#FFC737FF" + + + + label + + "Контрактной слуюжбы" + + + - + - "#00FF00FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"mobilization_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FF00FF" + + + + label + + "Мобилизации" + + + @@ -1849,39 +1921,54 @@ - data + chartType - - - 1 - - - - - 1 - - - - - 1 - - + "BAR" + + + + dataSetLabel + + " " - - - - + + + datasetType + + "COLUMN_AGGREGATION" + + + + loadDao + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"waiting_registration","schemaName":"main_dashboard","x":314.0,"y":249.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"waiting_registration","schemaName":"main_dashboard","x":314.0,"y":249.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"waiting_registration":{"tableName":"waiting_registration","schemaName":"main_dashboard","x":314.0,"y":249.0,"alias":"waiting_registration","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"waiting_registration","entity":"waiting_registration","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - BarMockChartV2Service - ervu_dashboard.component.chart + DefaultLoadDao + database.dao + + + +ErvuMultiChartDataSetService +ervu_dashboard.component.chart + + + + + + + @@ -1949,7 +2036,7 @@ grace -"10%" +"50%" @@ -2015,6 +2102,12 @@ + + noDataText + + "0" + + style @@ -2061,6 +2154,90 @@ true + + + + + +FilterReferences +ervu_dashboard.component.filter + + true + true + + + references + + + + + + column + + "recruitment_id" + + + + dataConverter + + +StringValueConverter +component.field.dataconvert + + + + + filterComponent + + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + + + + table + + "waiting_registration" + + + + + StaticFilterReference + ervu_dashboard.component.filter + + + + + + + + + +FilterGroupDelegate +ervu-dashboard.component.filter + + true + true + + + filterComponents + + + + {"objectId":"41e6e628-5e34-4e8b-894b-1f60d3461bd0","packageName":"component.filter","className":"FilterComponent","type":"TS"} + + + + + + liveFilter + + true + + + + triggerOnStart + + true + diff --git a/resources/src/main/resources/business-model/recruitment.page b/resources/src/main/resources/business-model/recruitment.page index c973878e..b4d3c8e8 100644 --- a/resources/src/main/resources/business-model/recruitment.page +++ b/resources/src/main/resources/business-model/recruitment.page @@ -2931,7 +2931,6 @@ 0a07229f-1c03-4f45-8651-c70f6b68df74 VB - Повестки true - false false @@ -3660,10 +3659,10 @@ - false + false RoundSingleChartDataSetService ervu_dashboard.component.chart @@ -3681,6 +3680,7 @@ ervu-dashboard.component.chart true + true cssClasses @@ -6514,6 +6514,7 @@ ervu-dashboard.component.chart true + true bars @@ -8854,6 +8855,7 @@ 6da4fd55-7c44-452f-bb1b-c7bc75ab21fd VB - Обжалование true + false false diff --git a/resources/src/main/resources/business-model/Всего на учете (2й уровень).page b/resources/src/main/resources/business-model/Всего на учете (2й уровень).page index 049b20b0..d60ab38d 100644 --- a/resources/src/main/resources/business-model/Всего на учете (2й уровень).page +++ b/resources/src/main/resources/business-model/Всего на учете (2й уровень).page @@ -287,13 +287,6 @@ - - b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 - 01426200-9f22-492e-a812-b9d08afd02ce - Combo box - false - true - 630accd8-3776-4fc1-a87c-3a0f05274678 bcda3e31-265c-4f80-8984-fd0359b0fc36 @@ -688,7 +681,6 @@ 1c6c88af-a164-4e0d-9cbb-a6bc59d30414 Всего состоят на учете true - false false @@ -1876,31 +1868,112 @@ - datasetsConfiguration + chartType - - - datasets - - + "BAR" + + + + dataSetServices + + + + + + columnAggregationDataSet - backgroundColor + aggregationData - + - "#00FFFFFF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"volunteer_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FFFFFF" + + + + label + + "Срочной службы" + + + - + - "#FFC737FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"contract_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#FFC737FF" + + + + label + + "Контрактной службы" + + + - + - "#00FF00FF" + + + aggregationColumn + + {"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"mobilization_criterion"} + + + + aggregationFunction + + "SUM" + + + + borderColor + + "#00FF00FF" + + + + label + + "Мобилизации" + + + @@ -1918,40 +1991,60 @@ - data + chartType - - - 1 - - - - - 1 - - - - - 1 - - - + "BAR" + + + + dataSetLabel + + " " - - - - + + + datasetType + + "COLUMN_AGGREGATION" + + + + loadDao + + + + datasourceJndiName + + null + + + + graph + + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"total_registered","schemaName":"main_dashboard","x":306.0,"y":220.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"total_registered","schemaName":"main_dashboard","x":306.0,"y":220.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"total_registered":{"tableName":"total_registered","schemaName":"main_dashboard","x":306.0,"y":220.0,"alias":"total_registered","conditionGroup":{"operator":"AND","conditions":[{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recording_date"},"operation":"EQUAL","typeCode":"RUNTIME_VARIABLE","values":["\"CURRENT_DATE\""]},{"column":{"schema":"main_dashboard","table":"total_registered","entity":"total_registered","name":"recruitment_id"},"operation":"EQUAL","typeCode":"CONST","values":["\"00\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} - BarMockChartV2Service - ervu_dashboard.component.chart + DefaultLoadDao + database.dao + + + +ErvuMultiChartDataSetService +ervu_dashboard.component.chart + + + + + + + @@ -2013,7 +2106,7 @@ grace -"10%" +"50%" @@ -2075,6 +2168,13 @@ + false + + + + noDataText + + "0" @@ -2123,6 +2223,90 @@ true + + + + + +FilterReferences +ervu_dashboard.component.filter + + true + true + + + references + + + + + + column + + "recruitment_id" + + + + dataConverter + + +StringValueConverter +component.field.dataconvert + + + + + filterComponent + + {"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.field.loading","className":"ComboBoxDefaultValue","type":"JAVA"} + + + + table + + "total_registered" + + + + + StaticFilterReference + ervu_dashboard.component.filter + + + + + + + + + +FilterGroupDelegate +ervu-dashboard.component.filter + + true + true + + + filterComponents + + + + {"objectId":"e80a965c-389c-4a42-ade9-cc551317f3a6","packageName":"component.filter","className":"FilterComponent","type":"TS"} + + + + + + liveFilter + + true + + + + triggerOnStart + + true + @@ -7644,6 +7828,7 @@ a00e8828-e03e-434a-98f8-7dfd6575a687 VB - Повестки true + false false @@ -8351,6 +8536,7 @@ ervu-dashboard.component.chart true +true cssClasses