From 5ecbb8520e31ed4e886b29ce8c894d483f2b4d9a Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Tue, 24 Sep 2024 18:13:12 +0300 Subject: [PATCH 01/49] SUPPORT-8508: add new component --- .../component/field/TextAgeComponent.ts | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 frontend/src/ts/ervu-dashboard/component/field/TextAgeComponent.ts diff --git a/frontend/src/ts/ervu-dashboard/component/field/TextAgeComponent.ts b/frontend/src/ts/ervu-dashboard/component/field/TextAgeComponent.ts new file mode 100644 index 00000000..dcb4cf12 --- /dev/null +++ b/frontend/src/ts/ervu-dashboard/component/field/TextAgeComponent.ts @@ -0,0 +1,58 @@ +import {Behavior} from "@webbpm/base-package"; +import {ChangeDetectionStrategy, Component, Input} from "@angular/core"; + +export class TextAgeComponent extends Behavior { + @Input() + public birthDate: string; + public info: string; + + start() { + super.start(); + this.info = this.convertBirthDateToAgeInfo(this.birthDate); + } + + private calculateAge(birthDate: string): string { + const birth = new Date(birthDate); + const currentDate = new Date(); + let age = currentDate.getFullYear() - birth.getFullYear(); + if (currentDate.getMonth() < birth.getMonth() || + (currentDate.getMonth() === birth.getMonth() && currentDate.getDate() < birth.getDate())) { + age--; + } + return String(age); + } + + private getAgeText(age: number): string { + if (age % 10 === 1 && age % 100 !== 11) { + return 'год'; + } + else if (age % 10 >= 2 && age % 10 <= 4 && (age % 100 < 10 || age % 100 >= 20)) { + return 'года'; + } + else { + return 'лет'; + } + } + + private convertBirthDateToAgeInfo(birthDate: string) { + const age = this.calculateAge(birthDate); + const namingAge = this.getAgeText(Number(age)); + const birthDateEU = this.toFormatDateEU(new Date(birthDate)); + + return `${age} ${namingAge}, ${birthDateEU}`; + } + + private toFormatDateEU(date: Date): string { + const day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate().toString(); + const month = (date.getMonth() + 1) < 10 ? '0' + (date.getMonth() + 1) : (date.getMonth() + + 1).toString(); + const year = date.getFullYear().toString(); + + return `${day}.${month}.${year}`; + } + + getInfo(): string { + return this.info; + } + +} \ No newline at end of file From bb1fe44713fa27bccfd5476a10c6f28d0251eef5 Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Wed, 25 Sep 2024 22:07:32 +0300 Subject: [PATCH 02/49] SUPPORT-8508: add new component --- .../formatter/ErvuBirthDateFormatter.ts | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 frontend/src/ts/ervu-dashboard/formatter/ErvuBirthDateFormatter.ts diff --git a/frontend/src/ts/ervu-dashboard/formatter/ErvuBirthDateFormatter.ts b/frontend/src/ts/ervu-dashboard/formatter/ErvuBirthDateFormatter.ts new file mode 100644 index 00000000..d1d67644 --- /dev/null +++ b/frontend/src/ts/ervu-dashboard/formatter/ErvuBirthDateFormatter.ts @@ -0,0 +1,59 @@ +import { + AnalyticalScope, + Behavior, + ControlWithValue, + DateTimeUtil, + NotNull, + ObjectRef, + Text +} from "@webbpm/base-package"; +import moment = require("moment"); + +@AnalyticalScope(Text) +export class ErvuBirthDateFormatter extends Behavior { + + @ObjectRef() + @NotNull() + public inputBirthDate: ControlWithValue; + private text: Text; + private birthDate: Date; + private age: number; + + initialize() { + this.text = this.getScript(Text); + this.inputBirthDate.addChangeListener(() => { + this.birthDate = moment(this.inputBirthDate.getValue(), DateTimeUtil.DATE_FORMAT).toDate(); + this.text.setValue(this.format(this.birthDate)); + }); + } + + private format(birthdate: Date): string { + const age = this.calculateAge(birthdate) + const ageString = this.getTextAge(age); + const strBirthDate = new Date(birthdate).toLocaleDateString("uk-Uk"); + return `${age} ${ageString}, ${strBirthDate}`; + } + + private getTextAge(age: number) { + if (age % 10 === 1 && age % 100 !== 11) { + return 'год'; + } else if (age % 10 >= 2 && age % 10 <= 4 && + (age % 100 < 10 || age % 100 >= 20)) { + return 'года'; + } else { + return 'лет'; + } + } + + private calculateAge(birthDate: Date) { + const currentDate = new Date(); + this.age = currentDate.getFullYear() - birthDate.getFullYear(); + + const difMonthValue = currentDate.getMonth() - birthDate.getMonth(); + if (difMonthValue < 0 || (difMonthValue === 0 && currentDate.getDate() < birthDate.getDate())) { + this.age--; + } + + return this.age; + } +} \ No newline at end of file From 708232b2d7533d7324815dd4bc53b94d00bca91a Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Tue, 1 Oct 2024 13:08:40 +0300 Subject: [PATCH 03/49] SUPPORT-8508: add new changes and new script BirthDateRageCalculator.ts --- .../ervu-dashboard/BirthDateRageCalculator.ts | 65 +++++++++++++++++++ .../component/field/TextAgeComponent.ts | 58 ----------------- ...s => UnionAgeAndBirthDateTextFormatter.ts} | 41 ++++++++---- 3 files changed, 94 insertions(+), 70 deletions(-) create mode 100644 frontend/src/ts/ervu-dashboard/BirthDateRageCalculator.ts delete mode 100644 frontend/src/ts/ervu-dashboard/component/field/TextAgeComponent.ts rename frontend/src/ts/ervu-dashboard/formatter/{ErvuBirthDateFormatter.ts => UnionAgeAndBirthDateTextFormatter.ts} (55%) diff --git a/frontend/src/ts/ervu-dashboard/BirthDateRageCalculator.ts b/frontend/src/ts/ervu-dashboard/BirthDateRageCalculator.ts new file mode 100644 index 00000000..26786bdb --- /dev/null +++ b/frontend/src/ts/ervu-dashboard/BirthDateRageCalculator.ts @@ -0,0 +1,65 @@ +import { + AnalyticalScope, + Behavior, + DateTimePicker, + NotNull, + ObjectRef, + ScriptLocationError, + TextField +} from "@webbpm/base-package"; + +@AnalyticalScope(TextField) +export class BirthDateRageCalculator extends Behavior { + + @ObjectRef() + @NotNull() + public startDate: DateTimePicker; + + @ObjectRef() + @NotNull() + public endDate: DateTimePicker; + + private ageField: TextField; + private onUpdateFunction: Function; + + public initialize() { + super.initialize(); + this.ageField = this.getScript(TextField); + if (!this.ageField) { + throw new ScriptLocationError(TextField.name, this); + } + this.onUpdateFunction = () => { + const age = Number(this.ageField.getTextValue()); + this.startDate.setValueAsDate(this.getStartDate(age)); + this.endDate.setValueAsDate(this.getEndDate(age)); + }; + } + + public bindEvents() { + super.bindEvents(); + this.ageField.addUserChangeValueListener(this.onUpdateFunction); + } + + public unbindEvents() { + super.unbindEvents(); + this.ageField.removeUserChangeValueListener(this.onUpdateFunction) + } + + protected getStartDate(age: number) : Date { + const date = new Date( + new Date().getFullYear() - age - 1, + new Date().getMonth(), + new Date().getDay() + ); + date.setDate(date.getDate() + 1); + return date; + } + + protected getEndDate(age: number) : Date { + return new Date( + new Date().getFullYear() - age, + new Date().getMonth(), + new Date().getDay(), + ); + } +} \ No newline at end of file diff --git a/frontend/src/ts/ervu-dashboard/component/field/TextAgeComponent.ts b/frontend/src/ts/ervu-dashboard/component/field/TextAgeComponent.ts deleted file mode 100644 index dcb4cf12..00000000 --- a/frontend/src/ts/ervu-dashboard/component/field/TextAgeComponent.ts +++ /dev/null @@ -1,58 +0,0 @@ -import {Behavior} from "@webbpm/base-package"; -import {ChangeDetectionStrategy, Component, Input} from "@angular/core"; - -export class TextAgeComponent extends Behavior { - @Input() - public birthDate: string; - public info: string; - - start() { - super.start(); - this.info = this.convertBirthDateToAgeInfo(this.birthDate); - } - - private calculateAge(birthDate: string): string { - const birth = new Date(birthDate); - const currentDate = new Date(); - let age = currentDate.getFullYear() - birth.getFullYear(); - if (currentDate.getMonth() < birth.getMonth() || - (currentDate.getMonth() === birth.getMonth() && currentDate.getDate() < birth.getDate())) { - age--; - } - return String(age); - } - - private getAgeText(age: number): string { - if (age % 10 === 1 && age % 100 !== 11) { - return 'год'; - } - else if (age % 10 >= 2 && age % 10 <= 4 && (age % 100 < 10 || age % 100 >= 20)) { - return 'года'; - } - else { - return 'лет'; - } - } - - private convertBirthDateToAgeInfo(birthDate: string) { - const age = this.calculateAge(birthDate); - const namingAge = this.getAgeText(Number(age)); - const birthDateEU = this.toFormatDateEU(new Date(birthDate)); - - return `${age} ${namingAge}, ${birthDateEU}`; - } - - private toFormatDateEU(date: Date): string { - const day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate().toString(); - const month = (date.getMonth() + 1) < 10 ? '0' + (date.getMonth() + 1) : (date.getMonth() + - 1).toString(); - const year = date.getFullYear().toString(); - - return `${day}.${month}.${year}`; - } - - getInfo(): string { - return this.info; - } - -} \ No newline at end of file diff --git a/frontend/src/ts/ervu-dashboard/formatter/ErvuBirthDateFormatter.ts b/frontend/src/ts/ervu-dashboard/formatter/UnionAgeAndBirthDateTextFormatter.ts similarity index 55% rename from frontend/src/ts/ervu-dashboard/formatter/ErvuBirthDateFormatter.ts rename to frontend/src/ts/ervu-dashboard/formatter/UnionAgeAndBirthDateTextFormatter.ts index d1d67644..f0e7f502 100644 --- a/frontend/src/ts/ervu-dashboard/formatter/ErvuBirthDateFormatter.ts +++ b/frontend/src/ts/ervu-dashboard/formatter/UnionAgeAndBirthDateTextFormatter.ts @@ -8,29 +8,45 @@ import { Text } from "@webbpm/base-package"; import moment = require("moment"); +import {Moment} from "moment"; @AnalyticalScope(Text) -export class ErvuBirthDateFormatter extends Behavior { +export class UnionAgeAndBirthDateTextFormatter extends Behavior { @ObjectRef() @NotNull() public inputBirthDate: ControlWithValue; + private text: Text; private birthDate: Date; private age: number; - initialize() { - this.text = this.getScript(Text); - this.inputBirthDate.addChangeListener(() => { + private readonly onChangeFunction = () => { + if (this.text) { this.birthDate = moment(this.inputBirthDate.getValue(), DateTimeUtil.DATE_FORMAT).toDate(); - this.text.setValue(this.format(this.birthDate)); - }); + this.text.setValue(this.format(moment(this.birthDate))); + } } - private format(birthdate: Date): string { + initialize() { + super.initialize(); + this.text = this.getScript(Text); + } + + bindEvents() { + super.bindEvents(); + this.inputBirthDate.addChangeListener(this.onChangeFunction) + } + + unbindEvents() { + super.unbindEvents(); + this.inputBirthDate.removeChangeListener(this.onChangeFunction); + } + + private format(birthdate: Moment): string { const age = this.calculateAge(birthdate) const ageString = this.getTextAge(age); - const strBirthDate = new Date(birthdate).toLocaleDateString("uk-Uk"); + const strBirthDate = DateTimeUtil.formatToDate(birthdate); return `${age} ${ageString}, ${strBirthDate}`; } @@ -45,12 +61,13 @@ export class ErvuBirthDateFormatter extends Behavior { } } - private calculateAge(birthDate: Date) { + private calculateAge(birthDate: Moment) { const currentDate = new Date(); - this.age = currentDate.getFullYear() - birthDate.getFullYear(); + const date = birthDate.toDate(); + this.age = currentDate.getFullYear() - date.getFullYear(); - const difMonthValue = currentDate.getMonth() - birthDate.getMonth(); - if (difMonthValue < 0 || (difMonthValue === 0 && currentDate.getDate() < birthDate.getDate())) { + const difMonthValue = currentDate.getMonth() - date.getMonth(); + if (difMonthValue < 0 || (difMonthValue === 0 && currentDate.getDate() < date.getDate())) { this.age--; } From 4ccdea2c8883187df108b6a3f9308bde47fefc3c Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Tue, 1 Oct 2024 16:39:40 +0300 Subject: [PATCH 04/49] SUPPORT-8508: delete fields --- .../formatter/UnionAgeAndBirthDateTextFormatter.ts | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/frontend/src/ts/ervu-dashboard/formatter/UnionAgeAndBirthDateTextFormatter.ts b/frontend/src/ts/ervu-dashboard/formatter/UnionAgeAndBirthDateTextFormatter.ts index f0e7f502..903f58d5 100644 --- a/frontend/src/ts/ervu-dashboard/formatter/UnionAgeAndBirthDateTextFormatter.ts +++ b/frontend/src/ts/ervu-dashboard/formatter/UnionAgeAndBirthDateTextFormatter.ts @@ -18,13 +18,10 @@ export class UnionAgeAndBirthDateTextFormatter extends Behavior { public inputBirthDate: ControlWithValue; private text: Text; - private birthDate: Date; - private age: number; - private readonly onChangeFunction = () => { if (this.text) { - this.birthDate = moment(this.inputBirthDate.getValue(), DateTimeUtil.DATE_FORMAT).toDate(); - this.text.setValue(this.format(moment(this.birthDate))); + const birthDate = moment(this.inputBirthDate.getValue(), DateTimeUtil.DATE_FORMAT).toDate(); + this.text.setValue(this.format(moment(birthDate))); } } @@ -64,13 +61,13 @@ export class UnionAgeAndBirthDateTextFormatter extends Behavior { private calculateAge(birthDate: Moment) { const currentDate = new Date(); const date = birthDate.toDate(); - this.age = currentDate.getFullYear() - date.getFullYear(); + let age = currentDate.getFullYear() - date.getFullYear(); const difMonthValue = currentDate.getMonth() - date.getMonth(); if (difMonthValue < 0 || (difMonthValue === 0 && currentDate.getDate() < date.getDate())) { - this.age--; + age--; } - return this.age; + return age; } } \ No newline at end of file From 526a724406e2e03070881929b50d4ffa323895b5 Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Tue, 1 Oct 2024 17:20:58 +0300 Subject: [PATCH 05/49] SUPPORT-8508: fix --- frontend/src/ts/ervu-dashboard/BirthDateRageCalculator.ts | 6 ++++-- .../formatter/UnionAgeAndBirthDateTextFormatter.ts | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/frontend/src/ts/ervu-dashboard/BirthDateRageCalculator.ts b/frontend/src/ts/ervu-dashboard/BirthDateRageCalculator.ts index 26786bdb..ac6b97cb 100644 --- a/frontend/src/ts/ervu-dashboard/BirthDateRageCalculator.ts +++ b/frontend/src/ts/ervu-dashboard/BirthDateRageCalculator.ts @@ -30,8 +30,10 @@ export class BirthDateRageCalculator extends Behavior { } this.onUpdateFunction = () => { const age = Number(this.ageField.getTextValue()); - this.startDate.setValueAsDate(this.getStartDate(age)); - this.endDate.setValueAsDate(this.getEndDate(age)); + if (age !== null) { + this.startDate.setValueAsDate(this.getStartDate(age)); + this.endDate.setValueAsDate(this.getEndDate(age)); + } }; } diff --git a/frontend/src/ts/ervu-dashboard/formatter/UnionAgeAndBirthDateTextFormatter.ts b/frontend/src/ts/ervu-dashboard/formatter/UnionAgeAndBirthDateTextFormatter.ts index 903f58d5..112d16b2 100644 --- a/frontend/src/ts/ervu-dashboard/formatter/UnionAgeAndBirthDateTextFormatter.ts +++ b/frontend/src/ts/ervu-dashboard/formatter/UnionAgeAndBirthDateTextFormatter.ts @@ -20,8 +20,8 @@ export class UnionAgeAndBirthDateTextFormatter extends Behavior { private text: Text; private readonly onChangeFunction = () => { if (this.text) { - const birthDate = moment(this.inputBirthDate.getValue(), DateTimeUtil.DATE_FORMAT).toDate(); - this.text.setValue(this.format(moment(birthDate))); + const birthDate = moment(this.inputBirthDate.getTextValue()); + this.text.setValue(this.format(birthDate)); } } From f0106f14e81ef96a1aa62260ac9ef85f566abfdf Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Wed, 2 Oct 2024 13:11:27 +0300 Subject: [PATCH 06/49] SUPPORT-8508: fix --- .../ervu-dashboard/BirthDateRageCalculator.ts | 46 ++++++++++--------- ...r.ts => UnionAgeAndBirthDateTextScript.ts} | 2 +- 2 files changed, 26 insertions(+), 22 deletions(-) rename frontend/src/ts/ervu-dashboard/{formatter/UnionAgeAndBirthDateTextFormatter.ts => UnionAgeAndBirthDateTextScript.ts} (96%) diff --git a/frontend/src/ts/ervu-dashboard/BirthDateRageCalculator.ts b/frontend/src/ts/ervu-dashboard/BirthDateRageCalculator.ts index ac6b97cb..1bca7d55 100644 --- a/frontend/src/ts/ervu-dashboard/BirthDateRageCalculator.ts +++ b/frontend/src/ts/ervu-dashboard/BirthDateRageCalculator.ts @@ -29,12 +29,10 @@ export class BirthDateRageCalculator extends Behavior { throw new ScriptLocationError(TextField.name, this); } this.onUpdateFunction = () => { - const age = Number(this.ageField.getTextValue()); - if (age !== null) { - this.startDate.setValueAsDate(this.getStartDate(age)); - this.endDate.setValueAsDate(this.getEndDate(age)); - } - }; + const age = this.ageField.getTextValue(); + this.startDate.setValueAsDate(this.getStartDate(age)); + this.endDate.setValueAsDate(this.getEndDate(age)); + } } public bindEvents() { @@ -44,24 +42,30 @@ export class BirthDateRageCalculator extends Behavior { public unbindEvents() { super.unbindEvents(); - this.ageField.removeUserChangeValueListener(this.onUpdateFunction) + this.ageField.removeUserChangeValueListener(this.onUpdateFunction); } - protected getStartDate(age: number) : Date { - const date = new Date( - new Date().getFullYear() - age - 1, - new Date().getMonth(), - new Date().getDay() - ); - date.setDate(date.getDate() + 1); - return date; + protected getStartDate(age: string) : Date { + if (age !== null && age !== "") { + const date = new Date( + new Date().getFullYear() - Number(age) - 1, + new Date().getMonth(), + new Date().getDay() + ); + date.setDate(date.getDate() + 1); + return date; + } + return null; } - protected getEndDate(age: number) : Date { - return new Date( - new Date().getFullYear() - age, - new Date().getMonth(), - new Date().getDay(), - ); + protected getEndDate(age: string) : Date { + if (age !== null && age !== "") { + return new Date( + new Date().getFullYear() - Number(age), + new Date().getMonth(), + new Date().getDay(), + ); + } + return null; } } \ No newline at end of file diff --git a/frontend/src/ts/ervu-dashboard/formatter/UnionAgeAndBirthDateTextFormatter.ts b/frontend/src/ts/ervu-dashboard/UnionAgeAndBirthDateTextScript.ts similarity index 96% rename from frontend/src/ts/ervu-dashboard/formatter/UnionAgeAndBirthDateTextFormatter.ts rename to frontend/src/ts/ervu-dashboard/UnionAgeAndBirthDateTextScript.ts index 112d16b2..cd671fb5 100644 --- a/frontend/src/ts/ervu-dashboard/formatter/UnionAgeAndBirthDateTextFormatter.ts +++ b/frontend/src/ts/ervu-dashboard/UnionAgeAndBirthDateTextScript.ts @@ -11,7 +11,7 @@ import moment = require("moment"); import {Moment} from "moment"; @AnalyticalScope(Text) -export class UnionAgeAndBirthDateTextFormatter extends Behavior { +export class UnionAgeAndBirthDateTextScript extends Behavior { @ObjectRef() @NotNull() From 4d3a373cc636560f65e2b2c6fbe60aebe3920265 Mon Sep 17 00:00:00 2001 From: "adel.kalimullin" Date: Thu, 3 Oct 2024 13:34:04 +0300 Subject: [PATCH 07/49] SUPPORT-8500: add PhoneNumberTextFormatter --- .../formatter/PhoneNumberTextFormatter.ts | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 frontend/src/ts/ervu-dashboard/formatter/PhoneNumberTextFormatter.ts diff --git a/frontend/src/ts/ervu-dashboard/formatter/PhoneNumberTextFormatter.ts b/frontend/src/ts/ervu-dashboard/formatter/PhoneNumberTextFormatter.ts new file mode 100644 index 00000000..878cd3ba --- /dev/null +++ b/frontend/src/ts/ervu-dashboard/formatter/PhoneNumberTextFormatter.ts @@ -0,0 +1,30 @@ +import {AnalyticalScope, Text} from "@webbpm/base-package"; +import {ReplaceValueTextFormatter} from "./ReplaceValueTextFormatter"; + +@AnalyticalScope(Text) +export class PhoneNumberTextFormatter extends ReplaceValueTextFormatter { + format(value: string): string { + const defaultValue= super.format(value) + if (defaultValue !== value) { + return defaultValue + } + const cleanedNumber = this.cleanNumber(value); + const numberWithoutPrefix = this.removePrefix(cleanedNumber); + if (numberWithoutPrefix.length !== 10) { + return '-'; + } + return this.formatNumber(numberWithoutPrefix); + } + + private cleanNumber(value: string): string { + return value.replace(/\D/g, ''); + } + + private removePrefix(number: string): string { + return number.startsWith('7')? number.slice(1):number; + } + + private formatNumber(number: string): string { + return `+7 (${number.slice(0, 3)}) ${number.slice(3, 6)}-${number.slice(6, 8)}-${number.slice(8)}`; + } +} \ No newline at end of file From ebc856d2acc666118bb8446767ed93acc91eed5e Mon Sep 17 00:00:00 2001 From: "adel.kalimullin" Date: Fri, 4 Oct 2024 12:34:10 +0300 Subject: [PATCH 08/49] SUPPORT-8500: fix --- .../formatter/PhoneNumberTextFormatter.ts | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/frontend/src/ts/ervu-dashboard/formatter/PhoneNumberTextFormatter.ts b/frontend/src/ts/ervu-dashboard/formatter/PhoneNumberTextFormatter.ts index 878cd3ba..97942b40 100644 --- a/frontend/src/ts/ervu-dashboard/formatter/PhoneNumberTextFormatter.ts +++ b/frontend/src/ts/ervu-dashboard/formatter/PhoneNumberTextFormatter.ts @@ -4,27 +4,18 @@ import {ReplaceValueTextFormatter} from "./ReplaceValueTextFormatter"; @AnalyticalScope(Text) export class PhoneNumberTextFormatter extends ReplaceValueTextFormatter { format(value: string): string { - const defaultValue= super.format(value) - if (defaultValue !== value) { - return defaultValue + const newValue = super.format(value); + if (newValue !== value) { + return newValue; } - const cleanedNumber = this.cleanNumber(value); - const numberWithoutPrefix = this.removePrefix(cleanedNumber); - if (numberWithoutPrefix.length !== 10) { - return '-'; - } - return this.formatNumber(numberWithoutPrefix); + return this.formatNumber(value); } - - private cleanNumber(value: string): string { - return value.replace(/\D/g, ''); - } - - private removePrefix(number: string): string { - return number.startsWith('7')? number.slice(1):number; - } - private formatNumber(number: string): string { - return `+7 (${number.slice(0, 3)}) ${number.slice(3, 6)}-${number.slice(6, 8)}-${number.slice(8)}`; + let cleanedNumber = number.replace(/\D/g, ''); + if (cleanedNumber.length === 11 && (cleanedNumber.startsWith('7') || cleanedNumber.startsWith('8'))) { + cleanedNumber = cleanedNumber.slice(1) + return cleanedNumber.replace(/^(\d{3})(\d{3})(\d{2})(\d{2})$/, '+7 ($1) $2-$3-$4'); + } + return number; } } \ No newline at end of file From 33e8b963ae0f36111c62b00ea0c7d771cce335a0 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 10 Oct 2024 23:58:34 +0300 Subject: [PATCH 09/49] 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 0d9afcc3..933bf03c 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.8.0-SNAPSHOT ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index 17d80086..43bbce2b 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.8.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index 81cf0eea..479858c5 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.8.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index 09742efb..3fe6e67c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.8.0-SNAPSHOT pom backend diff --git a/resources/pom.xml b/resources/pom.xml index e52d4bc9..8c47dd1c 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.8.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index 878c5983..2e8c8278 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.8.0-SNAPSHOT ru.micord.ervu.dashboard From 3d2346bbd449378a5f266a67e4644cbd7bd4bade 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, 11 Oct 2024 00:01:00 +0300 Subject: [PATCH 10/49] fix --- .../ervu_dashboard/db_beans/appeals/Keys.java | 1 - .../db_beans/appeals/tables/ReviewRating.java | 19 +- .../tables/records/ReviewRatingRecord.java | 9 +- .../ervu_dashboard/tables/PubRecruitment.java | 14 - .../db_beans/public_/Public.java | 9 +- .../db_beans/public_/Tables.java | 6 + .../public_/tables/LastRecordingDate.java | 217 +++++ .../records/LastRecordingDateRecord.java | 71 ++ .../tables/Subpoenas.java | 24 + .../tables/records/SubpoenasRecord.java | 70 +- .../total_registered/tables/Subpoenas.java | 21 + .../tables/records/SubpoenasRecord.java | 64 +- .../resources/css/components-dashboard.css | 6 + .../main/resources/business-model/main.page | 10 +- .../business-model/notregistered.page | 696 +++++++++++++++- .../resources/business-model/recruitment.page | 756 +++++++++++++++++- .../Всего на учете (2й уровень).page | 700 +++++++++++++++- 17 files changed, 2626 insertions(+), 67 deletions(-) create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/LastRecordingDate.java create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/records/LastRecordingDateRecord.java diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/appeals/Keys.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/appeals/Keys.java index 16d90a8d..0ea9ff9d 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/appeals/Keys.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/appeals/Keys.java @@ -47,6 +47,5 @@ public class Keys { public static final ForeignKey MAIN_PROFILE__MAIN_PROFILE_FK1 = Internal.createForeignKey(MainProfile.MAIN_PROFILE, DSL.name("main_profile_fk1"), new TableField[] { MainProfile.MAIN_PROFILE.RECRUITMENT_ID }, ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys.PUB_RECRUITMENT_PKEY, new TableField[] { PubRecruitment.PUB_RECRUITMENT.ID }, true); public static final ForeignKey REASONS_APPEAL__REASONS_APPEAL_FK1 = Internal.createForeignKey(ReasonsAppeal.REASONS_APPEAL, DSL.name("reasons_appeal_fk1"), new TableField[] { ReasonsAppeal.REASONS_APPEAL.RECRUITMENT_ID }, ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys.PUB_RECRUITMENT_PKEY, new TableField[] { PubRecruitment.PUB_RECRUITMENT.ID }, true); public static final ForeignKey REVIEW_RATING__FK_REGION = Internal.createForeignKey(ReviewRating.REVIEW_RATING, DSL.name("fk_region"), new TableField[] { ReviewRating.REVIEW_RATING.ID_REGION }, ervu_dashboard.ervu_dashboard.db_beans.space.Keys.PK_REGION, new TableField[] { Region.REGION.ID_REGION }, true); - public static final ForeignKey REVIEW_RATING__REVIEW_RATING_FK1 = Internal.createForeignKey(ReviewRating.REVIEW_RATING, DSL.name("review_rating_fk1"), new TableField[] { ReviewRating.REVIEW_RATING.RECRUITMENT_ID }, ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys.PUB_RECRUITMENT_PKEY, new TableField[] { PubRecruitment.PUB_RECRUITMENT.ID }, true); public static final ForeignKey TOPIC_APPEAL__TOPIC_APPEAL_FK1 = Internal.createForeignKey(TopicAppeal.TOPIC_APPEAL, DSL.name("topic_appeal_fk1"), new TableField[] { TopicAppeal.TOPIC_APPEAL.RECRUITMENT_ID }, ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys.PUB_RECRUITMENT_PKEY, new TableField[] { PubRecruitment.PUB_RECRUITMENT.ID }, true); } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/appeals/tables/ReviewRating.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/appeals/tables/ReviewRating.java index cc24a8ea..41f19d15 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/appeals/tables/ReviewRating.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/appeals/tables/ReviewRating.java @@ -7,7 +7,6 @@ package ervu_dashboard.ervu_dashboard.db_beans.appeals.tables; import ervu_dashboard.ervu_dashboard.db_beans.appeals.Appeals; import ervu_dashboard.ervu_dashboard.db_beans.appeals.Keys; import ervu_dashboard.ervu_dashboard.db_beans.appeals.tables.records.ReviewRatingRecord; -import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.PubRecruitment.PubRecruitmentPath; import ervu_dashboard.ervu_dashboard.db_beans.space.tables.Region.RegionPath; import java.math.BigDecimal; @@ -15,6 +14,7 @@ import java.sql.Date; import java.util.Arrays; import java.util.Collection; import java.util.List; +import java.util.UUID; import org.jooq.Condition; import org.jooq.Field; @@ -90,7 +90,7 @@ public class ReviewRating extends TableImpl { /** * The column appeals.review_rating.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, ""); private ReviewRating(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); @@ -169,7 +169,7 @@ public class ReviewRating extends TableImpl { @Override public List> getReferences() { - return Arrays.asList(Keys.REVIEW_RATING__FK_REGION, Keys.REVIEW_RATING__REVIEW_RATING_FK1); + return Arrays.asList(Keys.REVIEW_RATING__FK_REGION); } private transient RegionPath _region; @@ -184,19 +184,6 @@ public class ReviewRating extends TableImpl { return _region; } - private transient PubRecruitmentPath _pubRecruitment; - - /** - * Get the implicit join path to the - * ervu_dashboard.pub_recruitment table. - */ - public PubRecruitmentPath pubRecruitment() { - if (_pubRecruitment == null) - _pubRecruitment = new PubRecruitmentPath(this, Keys.REVIEW_RATING__REVIEW_RATING_FK1, null); - - return _pubRecruitment; - } - @Override public ReviewRating as(String alias) { return new ReviewRating(DSL.name(alias), this); diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/appeals/tables/records/ReviewRatingRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/appeals/tables/records/ReviewRatingRecord.java index 5e12311b..d51faea9 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/appeals/tables/records/ReviewRatingRecord.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/appeals/tables/records/ReviewRatingRecord.java @@ -8,6 +8,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.appeals.tables.ReviewRating; import java.math.BigDecimal; import java.sql.Date; +import java.util.UUID; import org.jooq.Record1; import org.jooq.impl.UpdatableRecordImpl; @@ -98,15 +99,15 @@ public class ReviewRatingRecord extends UpdatableRecordImpl /** * Setter for appeals.review_rating.recruitment_id. */ - public void setRecruitmentId(String value) { + public void setRecruitmentId(UUID value) { set(5, value); } /** * Getter for appeals.review_rating.recruitment_id. */ - public String getRecruitmentId() { - return (String) get(5); + public UUID getRecruitmentId() { + return (UUID) get(5); } // ------------------------------------------------------------------------- @@ -132,7 +133,7 @@ public class ReviewRatingRecord extends UpdatableRecordImpl /** * Create a detached, initialised ReviewRatingRecord */ - public ReviewRatingRecord(Long idReviewRating, BigDecimal speed, BigDecimal rating, Date recordingDate, Long idRegion, String recruitmentId) { + public ReviewRatingRecord(Long idReviewRating, BigDecimal speed, BigDecimal rating, Date recordingDate, Long idRegion, UUID recruitmentId) { super(ReviewRating.REVIEW_RATING); setIdReviewRating(idReviewRating); diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/PubRecruitment.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/PubRecruitment.java index 1955b06b..e9640da2 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/PubRecruitment.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/PubRecruitment.java @@ -6,7 +6,6 @@ package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables; import ervu_dashboard.ervu_dashboard.db_beans.appeals.tables.MainProfile.MainProfilePath; import ervu_dashboard.ervu_dashboard.db_beans.appeals.tables.ReasonsAppeal.ReasonsAppealPath; -import ervu_dashboard.ervu_dashboard.db_beans.appeals.tables.ReviewRating.ReviewRatingPath; import ervu_dashboard.ervu_dashboard.db_beans.appeals.tables.TopicAppeal.TopicAppealPath; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.Keys; @@ -203,19 +202,6 @@ public class PubRecruitment extends TableImpl { return _reasonsAppeal; } - private transient ReviewRatingPath _reviewRating; - - /** - * Get the implicit to-many join path to the - * appeals.review_rating table - */ - public ReviewRatingPath reviewRating() { - if (_reviewRating == null) - _reviewRating = new ReviewRatingPath(this, null, ervu_dashboard.ervu_dashboard.db_beans.appeals.Keys.REVIEW_RATING__REVIEW_RATING_FK1.getInverseKey()); - - return _reviewRating; - } - private transient TopicAppealPath _topicAppeal; /** diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/Public.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/Public.java index c0f6c9b6..176ffb90 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/Public.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/Public.java @@ -10,6 +10,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.Databasechangelog; import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.Databasechangeloglock; import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.JobEntryLog; import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.JobLog; +import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.LastRecordingDate; import java.util.Arrays; import java.util.List; @@ -57,6 +58,11 @@ public class Public extends SchemaImpl { */ public final JobLog JOB_LOG = JobLog.JOB_LOG; + /** + * The table public.last_recording_date. + */ + public final LastRecordingDate LAST_RECORDING_DATE = LastRecordingDate.LAST_RECORDING_DATE; + /** * No further instances allowed */ @@ -77,7 +83,8 @@ public class Public extends SchemaImpl { Databasechangelog.DATABASECHANGELOG, Databasechangeloglock.DATABASECHANGELOGLOCK, JobEntryLog.JOB_ENTRY_LOG, - JobLog.JOB_LOG + JobLog.JOB_LOG, + LastRecordingDate.LAST_RECORDING_DATE ); } } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/Tables.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/Tables.java index 61f92157..c74f1a9a 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/Tables.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/Tables.java @@ -9,6 +9,7 @@ import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.Databasechangelog; import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.Databasechangeloglock; import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.JobEntryLog; import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.JobLog; +import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.LastRecordingDate; /** @@ -41,4 +42,9 @@ public class Tables { * The table public.job_log. */ public static final JobLog JOB_LOG = JobLog.JOB_LOG; + + /** + * The table public.last_recording_date. + */ + public static final LastRecordingDate LAST_RECORDING_DATE = LastRecordingDate.LAST_RECORDING_DATE; } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/LastRecordingDate.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/LastRecordingDate.java new file mode 100644 index 00000000..457d5cc1 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/LastRecordingDate.java @@ -0,0 +1,217 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.public_.tables; + + +import ervu_dashboard.ervu_dashboard.db_beans.public_.Public; +import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records.LastRecordingDateRecord; + +import java.sql.Date; +import java.util.Collection; + +import org.jooq.Condition; +import org.jooq.Field; +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.impl.DSL; +import org.jooq.impl.SQLDataType; +import org.jooq.impl.TableImpl; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class LastRecordingDate extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of public.last_recording_date + */ + public static final LastRecordingDate LAST_RECORDING_DATE = new LastRecordingDate(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return LastRecordingDateRecord.class; + } + + /** + * The column public.last_recording_date.last_recording_date. + */ + public final TableField LAST_RECORDING_DATE_ = createField(DSL.name("last_recording_date"), SQLDataType.DATE.defaultValue(DSL.field(DSL.raw("now()"), SQLDataType.DATE)), this, ""); + + /** + * The column public.last_recording_date.entry. + */ + public final TableField ENTRY = createField(DSL.name("entry"), SQLDataType.CLOB, this, ""); + + private LastRecordingDate(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private LastRecordingDate(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where); + } + + /** + * Create an aliased public.last_recording_date table reference + */ + public LastRecordingDate(String alias) { + this(DSL.name(alias), LAST_RECORDING_DATE); + } + + /** + * Create an aliased public.last_recording_date table reference + */ + public LastRecordingDate(Name alias) { + this(alias, LAST_RECORDING_DATE); + } + + /** + * Create a public.last_recording_date table reference + */ + public LastRecordingDate() { + this(DSL.name("last_recording_date"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : Public.PUBLIC; + } + + @Override + public LastRecordingDate as(String alias) { + return new LastRecordingDate(DSL.name(alias), this); + } + + @Override + public LastRecordingDate as(Name alias) { + return new LastRecordingDate(alias, this); + } + + @Override + public LastRecordingDate as(Table alias) { + return new LastRecordingDate(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public LastRecordingDate rename(String name) { + return new LastRecordingDate(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public LastRecordingDate rename(Name name) { + return new LastRecordingDate(name, null); + } + + /** + * Rename this table + */ + @Override + public LastRecordingDate rename(Table name) { + return new LastRecordingDate(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public LastRecordingDate where(Condition condition) { + return new LastRecordingDate(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public LastRecordingDate where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public LastRecordingDate where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public LastRecordingDate where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public LastRecordingDate where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public LastRecordingDate where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public LastRecordingDate where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public LastRecordingDate where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public LastRecordingDate whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public LastRecordingDate whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/records/LastRecordingDateRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/records/LastRecordingDateRecord.java new file mode 100644 index 00000000..9fb72ef2 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/records/LastRecordingDateRecord.java @@ -0,0 +1,71 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records; + + +import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.LastRecordingDate; + +import java.sql.Date; + +import org.jooq.impl.TableRecordImpl; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class LastRecordingDateRecord extends TableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for public.last_recording_date.last_recording_date. + */ + public void setLastRecordingDate(Date value) { + set(0, value); + } + + /** + * Getter for public.last_recording_date.last_recording_date. + */ + public Date getLastRecordingDate() { + return (Date) get(0); + } + + /** + * Setter for public.last_recording_date.entry. + */ + public void setEntry(String value) { + set(1, value); + } + + /** + * Getter for public.last_recording_date.entry. + */ + public String getEntry() { + return (String) get(1); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached LastRecordingDateRecord + */ + public LastRecordingDateRecord() { + super(LastRecordingDate.LAST_RECORDING_DATE); + } + + /** + * Create a detached, initialised LastRecordingDateRecord + */ + public LastRecordingDateRecord(Date lastRecordingDate, String entry) { + super(LastRecordingDate.LAST_RECORDING_DATE); + + setLastRecordingDate(lastRecordingDate); + setEntry(entry); + resetChangedOnNotNull(); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/Subpoenas.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/Subpoenas.java index 905bb652..11522a81 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/Subpoenas.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/Subpoenas.java @@ -163,6 +163,30 @@ public class Subpoenas extends TableImpl { */ public final TableField ID_SUBPOENA = createField(DSL.name("id_subpoena"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + /** + * The column + * recruitment_campaign.subpoenas.count_not_delivery. + */ + public final TableField COUNT_NOT_DELIVERY = createField(DSL.name("count_not_delivery"), SQLDataType.NUMERIC, this, ""); + + /** + * The column + * recruitment_campaign.subpoenas.appear_date_is_good. + */ + public final TableField APPEAR_DATE_IS_GOOD = createField(DSL.name("appear_date_is_good"), SQLDataType.NUMERIC, this, ""); + + /** + * The column + * recruitment_campaign.subpoenas.not_delivery_percent. + */ + public final TableField NOT_DELIVERY_PERCENT = createField(DSL.name("not_delivery_percent"), SQLDataType.NUMERIC, this, ""); + + /** + * The column + * recruitment_campaign.subpoenas.appear_date_is_good_percent. + */ + public final TableField APPEAR_DATE_IS_GOOD_PERCENT = createField(DSL.name("appear_date_is_good_percent"), SQLDataType.NUMERIC, this, ""); + private Subpoenas(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/records/SubpoenasRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/records/SubpoenasRecord.java index 6325ae49..e046bef9 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/records/SubpoenasRecord.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/records/SubpoenasRecord.java @@ -315,6 +315,70 @@ public class SubpoenasRecord extends UpdatableRecordImpl { return (Long) get(17); } + /** + * Setter for + * recruitment_campaign.subpoenas.count_not_delivery. + */ + public void setCountNotDelivery(BigDecimal value) { + set(18, value); + } + + /** + * Getter for + * recruitment_campaign.subpoenas.count_not_delivery. + */ + public BigDecimal getCountNotDelivery() { + return (BigDecimal) get(18); + } + + /** + * Setter for + * recruitment_campaign.subpoenas.appear_date_is_good. + */ + public void setAppearDateIsGood(BigDecimal value) { + set(19, value); + } + + /** + * Getter for + * recruitment_campaign.subpoenas.appear_date_is_good. + */ + public BigDecimal getAppearDateIsGood() { + return (BigDecimal) get(19); + } + + /** + * Setter for + * recruitment_campaign.subpoenas.not_delivery_percent. + */ + public void setNotDeliveryPercent(BigDecimal value) { + set(20, value); + } + + /** + * Getter for + * recruitment_campaign.subpoenas.not_delivery_percent. + */ + public BigDecimal getNotDeliveryPercent() { + return (BigDecimal) get(20); + } + + /** + * Setter for + * recruitment_campaign.subpoenas.appear_date_is_good_percent. + */ + public void setAppearDateIsGoodPercent(BigDecimal value) { + set(21, value); + } + + /** + * Getter for + * recruitment_campaign.subpoenas.appear_date_is_good_percent. + */ + public BigDecimal getAppearDateIsGoodPercent() { + return (BigDecimal) get(21); + } + // ------------------------------------------------------------------------- // Primary key information // ------------------------------------------------------------------------- @@ -338,7 +402,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl { /** * Create a detached, initialised SubpoenasRecord */ - public SubpoenasRecord(BigDecimal subpoena, BigDecimal appeared, BigDecimal notAppeared, BigDecimal notApGoodReason, BigDecimal apNotRequired, BigDecimal restrictionsApplied, Date recordingDate, BigDecimal appearedPercent, BigDecimal notAppearedPercent, BigDecimal notApGoodReasonPercent, BigDecimal apNotRequiredPercent, BigDecimal restrictionsAppliedPercent, BigDecimal introducedMeasures, BigDecimal introducedMeasuresPercent, String recruitmentId, BigDecimal rest, String springAutumn, Long idSubpoena) { + public SubpoenasRecord(BigDecimal subpoena, BigDecimal appeared, BigDecimal notAppeared, BigDecimal notApGoodReason, BigDecimal apNotRequired, BigDecimal restrictionsApplied, Date recordingDate, BigDecimal appearedPercent, BigDecimal notAppearedPercent, BigDecimal notApGoodReasonPercent, BigDecimal apNotRequiredPercent, BigDecimal restrictionsAppliedPercent, BigDecimal introducedMeasures, BigDecimal introducedMeasuresPercent, String recruitmentId, BigDecimal rest, String springAutumn, Long idSubpoena, BigDecimal countNotDelivery, BigDecimal appearDateIsGood, BigDecimal notDeliveryPercent, BigDecimal appearDateIsGoodPercent) { super(Subpoenas.SUBPOENAS); setSubpoena(subpoena); @@ -359,6 +423,10 @@ public class SubpoenasRecord extends UpdatableRecordImpl { setRest(rest); setSpringAutumn(springAutumn); setIdSubpoena(idSubpoena); + setCountNotDelivery(countNotDelivery); + setAppearDateIsGood(appearDateIsGood); + setNotDeliveryPercent(notDeliveryPercent); + setAppearDateIsGoodPercent(appearDateIsGoodPercent); resetChangedOnNotNull(); } } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/Subpoenas.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/Subpoenas.java index 523cacdd..66df1acb 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/Subpoenas.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/Subpoenas.java @@ -182,6 +182,27 @@ public class Subpoenas extends TableImpl { */ public final TableField ID_SUBPOENA = createField(DSL.name("id_subpoena"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + /** + * The column total_registered.subpoenas.count_not_delivery. + */ + public final TableField COUNT_NOT_DELIVERY = createField(DSL.name("count_not_delivery"), SQLDataType.NUMERIC, this, ""); + + /** + * The column total_registered.subpoenas.appear_date_is_good. + */ + public final TableField APPEAR_DATE_IS_GOOD = createField(DSL.name("appear_date_is_good"), SQLDataType.NUMERIC, this, ""); + + /** + * The column total_registered.subpoenas.not_delivery_percent. + */ + public final TableField NOT_DELIVERY_PERCENT = createField(DSL.name("not_delivery_percent"), SQLDataType.NUMERIC, this, ""); + + /** + * The column + * total_registered.subpoenas.appear_date_is_good_percent. + */ + public final TableField APPEAR_DATE_IS_GOOD_PERCENT = createField(DSL.name("appear_date_is_good_percent"), SQLDataType.NUMERIC, this, ""); + private Subpoenas(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/records/SubpoenasRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/records/SubpoenasRecord.java index fb95f294..c4254a9b 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/records/SubpoenasRecord.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/records/SubpoenasRecord.java @@ -369,6 +369,64 @@ public class SubpoenasRecord extends UpdatableRecordImpl { return (Long) get(21); } + /** + * Setter for total_registered.subpoenas.count_not_delivery. + */ + public void setCountNotDelivery(BigDecimal value) { + set(22, value); + } + + /** + * Getter for total_registered.subpoenas.count_not_delivery. + */ + public BigDecimal getCountNotDelivery() { + return (BigDecimal) get(22); + } + + /** + * Setter for total_registered.subpoenas.appear_date_is_good. + */ + public void setAppearDateIsGood(BigDecimal value) { + set(23, value); + } + + /** + * Getter for total_registered.subpoenas.appear_date_is_good. + */ + public BigDecimal getAppearDateIsGood() { + return (BigDecimal) get(23); + } + + /** + * Setter for total_registered.subpoenas.not_delivery_percent. + */ + public void setNotDeliveryPercent(BigDecimal value) { + set(24, value); + } + + /** + * Getter for total_registered.subpoenas.not_delivery_percent. + */ + public BigDecimal getNotDeliveryPercent() { + return (BigDecimal) get(24); + } + + /** + * Setter for + * total_registered.subpoenas.appear_date_is_good_percent. + */ + public void setAppearDateIsGoodPercent(BigDecimal value) { + set(25, value); + } + + /** + * Getter for + * total_registered.subpoenas.appear_date_is_good_percent. + */ + public BigDecimal getAppearDateIsGoodPercent() { + return (BigDecimal) get(25); + } + // ------------------------------------------------------------------------- // Primary key information // ------------------------------------------------------------------------- @@ -392,7 +450,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl { /** * Create a detached, initialised SubpoenasRecord */ - public SubpoenasRecord(BigDecimal subpoena, BigDecimal averageAppeared, BigDecimal appeared, BigDecimal notAppeared, BigDecimal notApGoodReason, BigDecimal apNotRequired, BigDecimal electron, BigDecimal paper, BigDecimal restrictionsApplied, BigDecimal introducedMeasures, Date recordingDate, BigDecimal appearedPercent, BigDecimal notAppearedPercent, BigDecimal notApGoodReasonPercent, BigDecimal apNotRequiredPercent, BigDecimal electronPercent, BigDecimal paperPercent, BigDecimal restrictionsAppliedPercent, BigDecimal introducedMeasuresPercent, String recruitmentId, BigDecimal milReg, Long idSubpoena) { + public SubpoenasRecord(BigDecimal subpoena, BigDecimal averageAppeared, BigDecimal appeared, BigDecimal notAppeared, BigDecimal notApGoodReason, BigDecimal apNotRequired, BigDecimal electron, BigDecimal paper, BigDecimal restrictionsApplied, BigDecimal introducedMeasures, Date recordingDate, BigDecimal appearedPercent, BigDecimal notAppearedPercent, BigDecimal notApGoodReasonPercent, BigDecimal apNotRequiredPercent, BigDecimal electronPercent, BigDecimal paperPercent, BigDecimal restrictionsAppliedPercent, BigDecimal introducedMeasuresPercent, String recruitmentId, BigDecimal milReg, Long idSubpoena, BigDecimal countNotDelivery, BigDecimal appearDateIsGood, BigDecimal notDeliveryPercent, BigDecimal appearDateIsGoodPercent) { super(Subpoenas.SUBPOENAS); setSubpoena(subpoena); @@ -417,6 +475,10 @@ public class SubpoenasRecord extends UpdatableRecordImpl { setRecruitmentId(recruitmentId); setMilReg(milReg); setIdSubpoena(idSubpoena); + setCountNotDelivery(countNotDelivery); + setAppearDateIsGood(appearDateIsGood); + setNotDeliveryPercent(notDeliveryPercent); + setAppearDateIsGoodPercent(appearDateIsGoodPercent); resetChangedOnNotNull(); } } diff --git a/frontend/src/resources/css/components-dashboard.css b/frontend/src/resources/css/components-dashboard.css index 3e0a00b7..64ce67eb 100644 --- a/frontend/src/resources/css/components-dashboard.css +++ b/frontend/src/resources/css/components-dashboard.css @@ -765,6 +765,12 @@ .webbpm.ervu_dashboard [class*="graph-legend"] .legend-col-orange-dk::before { background-color: #db5c00; } +.webbpm.ervu_dashboard [class*="graph-legend"] .legend-col-olive::before { + background-color: #808000; +} +.webbpm.ervu_dashboard [class*="graph-legend"] .legend-col-dark-blue::before { + background-color: #4d66cc; +} .webbpm.ervu_dashboard .pers-group .vertical-container > text:first-child { color: var(--color-text-secondary); diff --git a/resources/src/main/resources/business-model/main.page b/resources/src/main/resources/business-model/main.page index 90eb8efb..d126140e 100644 --- a/resources/src/main/resources/business-model/main.page +++ b/resources/src/main/resources/business-model/main.page @@ -567,6 +567,7 @@ 6710c493-e4f6-4a38-b56a-3dcf5cf7269b Всего состоят на учете true + false false @@ -1605,6 +1606,7 @@ 42f079fa-ffe9-49b0-b8f7-aac7ceb54563 Вертикальный контейнер true + false false @@ -3114,6 +3116,7 @@ bc72b920-b037-453b-b7d6-2aae8a5ab38d VB - Подлежат постановке на учет true + false false @@ -5710,7 +5713,6 @@ 287754e8-934b-4750-b623-48758802904c Призывная кампания true - false false @@ -7843,6 +7845,12 @@ false + + disabled + + true + + heading diff --git a/resources/src/main/resources/business-model/notregistered.page b/resources/src/main/resources/business-model/notregistered.page index cd7eb4a0..0708a1f6 100644 --- a/resources/src/main/resources/business-model/notregistered.page +++ b/resources/src/main/resources/business-model/notregistered.page @@ -697,6 +697,7 @@ 62ad92df-92a4-456b-9c72-c4e133f621f9 VB - Подлежат постановке на учет true + false false @@ -12896,7 +12897,6 @@ 321237e7-f5f9-4f77-a791-c18ac5cbfd25 VB - Повестки true - false false @@ -13178,6 +13178,36 @@ aggregationData + + + + aggregationColumn + + {"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"appear_date_is_good"} + + + + aggregationFunction + + "SUM" + + + + backgroundColor + + "#4D66CCFF" + + + + label + + "Дата явки не наступила" + + + + + + @@ -13207,7 +13237,7 @@ - + @@ -13237,7 +13267,7 @@ - + @@ -13267,7 +13297,7 @@ - + @@ -13416,6 +13446,36 @@ + + + + + aggregationColumn + + {"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"count_not_delivery"} + + + + aggregationFunction + + "SUM" + + + + backgroundColor + + "#808000FF" + + + + label + + "Не вручено" + + + + + @@ -13587,7 +13647,6 @@ - false RoundSingleChartDataSetService ervu_dashboard.component.chart @@ -13769,6 +13828,7 @@ ead471a6-804a-493c-8d42-f8dda6380b16 VB - направлено повесток, средний срок явки true + false false @@ -14060,6 +14120,315 @@ +false + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 26b807da-413e-43a7-878c-666a42f15a79 + HB - Дата явки не наступила + true + false + false + + + +cssClasses + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 421974b9-e1fc-4ac8-83d7-eb8def4a3658 + Дата явки не наступила + false + false + + + + cssClasses + + + + "legend-col-dark-blue" + + + + + + initialValue + + "Дата явки не наступила" + + + + + + + + + false + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 857b72d5-b26a-4209-a22e-e7fb402ac493 + HB - значения + true + false + + + + cssClasses + + + + "pull-right" + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 93590e64-250f-46f5-9b3a-1347c2d7c4ae + 1.1 млн. + false + false + + + + cssClasses + + + + "text-invert" + + + + + + initialValue + + null + + + + label + + null + + + + textFormatter + + + + decimalDelimiter + + "." + + + + decimalLength + + 1.0 + + + + millionsLabel + + "млн." + + + + replaceModels + + + + + + value + + "0" + + + + + + + + + thousandsLabel + + "тыс." + + + + unitsText + + {"objectId":"93590e64-250f-46f5-9b3a-1347c2d7c4ae","packageName":"component","className":"Text","type":"TS"} + + + + + UnitsLabelReplaceValueTextFormatter + ervu-dashboard.formatter + + + + + + + + + + defaultValueColumn + + {"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"appear_date_is_good"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"appear_date_is_good"} + + + + + +false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 339293fb-ed3d-439d-a7a2-e176e94627c4 + 50% + false + false + + + + cssClasses + + + + "text-invert" + + + + + "mute" + + + + + + initialValue + + null + + + + label + + "%" + + + + textFormatter + + + + replaceModels + + + + + + value + + "0" + + + + + + + + + + ReplaceValueTextFormatter + ervu-dashboard.formatter + + + + + + + + + + defaultValueColumn + + {"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"appear_date_is_good_percent"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"appear_date_is_good_percent"} + + + + + false @@ -14070,6 +14439,7 @@ 49da3ae5-b8dc-41ee-a1f5-fc8547de7bb5 HB - явились true + false false @@ -14378,6 +14748,7 @@ 23f6f797-d97a-4863-a418-a6d5e97de2b1 HB - не явились true + false false @@ -14686,6 +15057,7 @@ 5d7842bf-7fcc-489c-b3e5-a1bf9a539c03 HB - не явились по уважительной причине true + false false @@ -14995,6 +15367,7 @@ 16139fc8-0e23-4c9c-9614-8350a2e9b2c7 HB - явка не требуется true + false false @@ -15304,6 +15677,7 @@ 7109fbbe-a033-4797-b6e8-ac2ef0a34558 HB - электронно true + false false @@ -15617,6 +15991,7 @@ 3bc83cd8-a66e-4c9a-87f3-1b7c812584f0 HB - нарочно true + false false @@ -15916,6 +16291,315 @@ +false + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 3085e23c-0268-43c7-9013-e20815817417 + HB - не вручено + true + false + + + +cssClasses + + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 2536d045-af3d-4ce3-b04d-c6725ef7d3ff + Не вручено + false + false + + + + cssClasses + + + + "legend-col-olive" + + + + + + initialValue + + "Не вручено" + + + + + + + + + false + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 0cfb7534-f6c7-4a1f-9599-0cf56c78a01c + HB - значения + true + false + + + + cssClasses + + + + "pull-right" + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 69ee3182-af54-4047-886b-cb79ac8a77bf + 400 тыс. + false + false + + + + cssClasses + + + + "text-invert" + + + + + + initialValue + + null + + + + label + + null + + + + textFormatter + + + + decimalDelimiter + + "." + + + + decimalLength + + 1.0 + + + + millionsLabel + + "млн." + + + + replaceModels + + + + + + value + + "0" + + + + + + + + + thousandsLabel + + "тыс." + + + + unitsText + + {"objectId":"69ee3182-af54-4047-886b-cb79ac8a77bf","packageName":"component","className":"Text","type":"TS"} + + + + + UnitsLabelReplaceValueTextFormatter + ervu-dashboard.formatter + + + + + + + + + + defaultValueColumn + + {"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"count_not_delivery"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"count_not_delivery"} + + + + + +false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 3217768c-b99b-47df-a3ff-00966e5978bb + 18% + false + false + + + + cssClasses + + + + "text-invert" + + + + + "mute" + + + + + + initialValue + + null + + + + label + + "%" + + + + textFormatter + + + + replaceModels + + + + + + value + + "0" + + + + + + + + + + ReplaceValueTextFormatter + ervu-dashboard.formatter + + + + + + + + + + defaultValueColumn + + {"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"not_delivery_percent"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"not_delivery_percent"} + + + + + false @@ -15926,6 +16610,7 @@ f6fca60f-3536-4d66-b1c3-adc5b22e6802 HB - применено ограничений true + false false @@ -16239,6 +16924,7 @@ 78e23488-23d5-4c09-ad8b-f52fe56604fa HB - введено реализатором мер true + false false diff --git a/resources/src/main/resources/business-model/recruitment.page b/resources/src/main/resources/business-model/recruitment.page index b4d3c8e8..9f74c9c4 100644 --- a/resources/src/main/resources/business-model/recruitment.page +++ b/resources/src/main/resources/business-model/recruitment.page @@ -288,13 +288,6 @@ - - 630accd8-3776-4fc1-a87c-3a0f05274678 - 051c3e53-8e91-4ba4-8b5d-a2c20865adc9 - DropdownTreeView - false - true - b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 ba22549b-4759-40d8-8d78-aa13b3a332c0 @@ -469,6 +462,13 @@ + + 630accd8-3776-4fc1-a87c-3a0f05274678 + 051c3e53-8e91-4ba4-8b5d-a2c20865adc9 + DropdownTreeView + false + true + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 @@ -688,7 +688,6 @@ 7206a4d4-1dd2-4a36-bad7-a692bf291d79 VB - Призыв true - false false @@ -829,6 +828,7 @@ ad49eb04-6457-4a7e-8971-8228d8003f5f Осень true + false false @@ -1879,9 +1879,16 @@ da149bbb-ceee-4711-94ad-8f3583482359 Весна true + false false + + disabled + + true + + heading @@ -2924,6 +2931,13 @@ true + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 + ba22549b-4759-40d8-8d78-aa13b3a332c0 + Combo box + false + true + @@ -3012,6 +3026,7 @@ d6946025-d558-4474-80ee-3bddcb912eab Осень true + false false @@ -3032,6 +3047,7 @@ 625de419-b90b-42d4-ad1c-e7ee4038edaf VB - осень true + false false @@ -3342,6 +3358,36 @@ aggregationData + + + + aggregationColumn + + {"schema":"recruitment_campaign","table":"subpoenas","entity":"subpoenas","name":"appear_date_is_good"} + + + + aggregationFunction + + "SUM" + + + + backgroundColor + + "#4D66CCFF" + + + + label + + "Дата явки не наступила" + + + + + + @@ -3371,7 +3417,7 @@ - + @@ -3401,7 +3447,7 @@ - + @@ -3429,9 +3475,10 @@ + false - + @@ -3459,6 +3506,7 @@ + false @@ -3657,12 +3705,12 @@ + false - false RoundSingleChartDataSetService ervu_dashboard.component.chart @@ -3937,6 +3985,321 @@ + + +d7d54cfb-26b5-4dba-b56f-b6247183c24d +a2f96221-f3dd-447f-a9f5-550e0d6effa4 +HB - Дата явки не наступила +true +false +false + + + + cssClasses + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 6ffef737-b63b-4419-8c65-1db95d6fef77 + Дата явки не наступила + false + false + + + + cssClasses + + + + "legend-col-dark-blue" + + + + + + initialValue + + "Дата явки не наступила" + + + + + + + + + false + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 8796bcfd-0480-409c-8310-b19a939ddea1 + HB - значения + true + false + + + + cssClasses + + + + "pull-right" + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + ef5f0ebe-b8a2-48d8-bee9-5a4c03dfbf05 + 1.1 млн. + false + false + + + + cssClasses + + + +"text-invert" + + + + + + initialValue + + null + + + + label + + null + + + + textFormatter + + + +billionsLabel + + "млрд." + + + +decimalDelimiter + + "." + + + +decimalLength + + 1.0 + + + +millionsLabel + + "млн." + + + +replaceModels + + + + + + value + + "0" + + + + + + + + +thousandsLabel + + "тыс." + + + +unitsText + + {"objectId":"ef5f0ebe-b8a2-48d8-bee9-5a4c03dfbf05","packageName":"component","className":"Text","type":"TS"} + + + + + UnitsLabelReplaceValueTextFormatter + ervu-dashboard.formatter + + + + + + + + + + defaultValueColumn + + {"schema":"recruitment_campaign","table":"subpoenas","entity":"subpoenas","name":"appear_date_is_good"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"recruitment_campaign","table":"subpoenas","entity":"subpoenas","name":"appear_date_is_good"} + + + + + + false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 2707dc16-62ae-4a86-a3a5-f3d568bc6621 + 50% + false + false + + + + cssClasses + + + +"text-invert" + + + + +"mute" + + + + + + initialValue + + null + + + + label + + "%" + + + + textFormatter + + + +replaceModels + + + + + + value + + "0" + + + + + + + + + + ReplaceValueTextFormatter + ervu-dashboard.formatter + + + + + + + + + + defaultValueColumn + + {"schema":"recruitment_campaign","table":"subpoenas","entity":"subpoenas","name":"appear_date_is_good_percent"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"recruitment_campaign","table":"subpoenas","entity":"subpoenas","name":"appear_date_is_good_percent"} + + + + + + false + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d @@ -5851,6 +6214,12 @@ false + + disabled + + true + + heading @@ -5875,6 +6244,7 @@ 8b48c377-93d1-4505-9b60-dc2031de794e VB - весна true + false false @@ -6159,6 +6529,7 @@ + false @@ -6175,6 +6546,36 @@ aggregationData + + + + aggregationColumn + + {"schema":"recruitment_campaign","table":"subpoenas","entity":"subpoenas","name":"appear_date_is_good"} + + + + aggregationFunction + + "SUM" + + + + backgroundColor + + "#4D66CCFF" + + + + label + + "Дата явки не наступила" + + + + + + @@ -6204,7 +6605,7 @@ - + @@ -6234,7 +6635,7 @@ - + @@ -6264,7 +6665,7 @@ - + @@ -6492,11 +6893,9 @@ - false - false RoundSingleChartDataSetService ervu_dashboard.component.chart @@ -6871,6 +7270,314 @@ + + +d7d54cfb-26b5-4dba-b56f-b6247183c24d +d88cc336-2fad-48b1-8752-64d9ece5b542 +HB - Дата явки не наступила +true +false + + + + cssClasses + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + b440f0f8-45d3-4192-9f6f-633f891d19cd + Дата явки не наступила + false + false + + + + cssClasses + + + + "legend-col-dark-blue" + + + + + + initialValue + + "Дата явки не наступила" + + + + + + + + + false + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + e580196a-df35-408e-bfe0-4f7a797886bf + HB - значения + true + false + + + + cssClasses + + + + "pull-right" + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 1789229b-eb4d-45a1-845c-c699dff9dca2 + 1.1 млн. + false + false + + + + cssClasses + + + +"text-invert" + + + + + + initialValue + + null + + + + label + + null + + + + textFormatter + + + +decimalDelimiter + + "." + + + +decimalLength + + 1.0 + + + +millionsLabel + + "млн." + + + +replaceModels + + + + + + value + + "0" + + + + + + + + +thousandsLabel + + "тыс." + + + +unitsText + + {"objectId":"1789229b-eb4d-45a1-845c-c699dff9dca2","packageName":"component","className":"Text","type":"TS"} + + + + + UnitsLabelReplaceValueTextFormatter + ervu-dashboard.formatter + + + + + + + + + + defaultValueColumn + + {"schema":"recruitment_campaign","table":"subpoenas","entity":"subpoenas","name":"appear_date_is_good"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"recruitment_campaign","table":"subpoenas","entity":"subpoenas","name":"appear_date_is_good_percent"} + + + + + + false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 3d821ad3-61e8-45d5-abc9-1df434a34072 + 50% + false + false + + + + cssClasses + + + +"text-invert" + + + + +"mute" + + + + + + initialValue + + null + + + + label + + "%" + + + + textFormatter + + + +replaceModels + + + + + + value + + "0" + + + + + + + + + + ReplaceValueTextFormatter + ervu-dashboard.formatter + + + + + + + + + + defaultValueColumn + + {"schema":"recruitment_campaign","table":"subpoenas","entity":"subpoenas","name":"appeared_percent"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"recruitment_campaign","table":"subpoenas","entity":"subpoenas","name":"appeared_percent"} + + + + + + false + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d @@ -8855,7 +9562,6 @@ 6da4fd55-7c44-452f-bb1b-c7bc75ab21fd VB - Обжалование true - false false @@ -8938,6 +9644,7 @@ e720e961-bd68-4e3d-bf2f-4a9d4ac59f87 Осень true + false false @@ -10233,6 +10940,12 @@ false + + disabled + + true + + heading @@ -11482,6 +12195,13 @@ true + + b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94 + ba22549b-4759-40d8-8d78-aa13b3a332c0 + Combo box + false + true + 27912fc5-0be7-4d4c-ae46-a82979253599 45031522-8e77-4c19-86f6-0f27d49ea19e diff --git a/resources/src/main/resources/business-model/Всего на учете (2й уровень).page b/resources/src/main/resources/business-model/Всего на учете (2й уровень).page index d60ab38d..35b4fdbe 100644 --- a/resources/src/main/resources/business-model/Всего на учете (2й уровень).page +++ b/resources/src/main/resources/business-model/Всего на учете (2й уровень).page @@ -681,6 +681,7 @@ 1c6c88af-a164-4e0d-9cbb-a6bc59d30414 Всего состоят на учете true + false false @@ -7828,7 +7829,6 @@ a00e8828-e03e-434a-98f8-7dfd6575a687 VB - Повестки true - false false @@ -8089,6 +8089,36 @@ aggregationData + + + + aggregationColumn + + {"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"appear_date_is_good"} + + + + aggregationFunction + + "SUM" + + + + backgroundColor + + "#4D66CCFF" + + + + label + + "Дата явки не наступила" + + + + + + @@ -8118,7 +8148,7 @@ - + @@ -8148,7 +8178,7 @@ - + @@ -8178,7 +8208,7 @@ - + @@ -8302,6 +8332,7 @@ + false @@ -8332,6 +8363,38 @@ + false + + + + + + + aggregationColumn + + {"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"count_not_delivery"} + + + + aggregationFunction + + "SUM" + + + + backgroundColor + + "#808000FF" + + + + label + + "Не вручено" + + + + false @@ -8525,7 +8588,6 @@ - false @@ -8701,6 +8763,7 @@ bf84b1e8-452a-42d8-8662-d0512744dc20 VB - направлено повесток, средний срок явки true + false false @@ -8993,6 +9056,315 @@ +false + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 03c03be0-4dfc-4e9d-be17-a3200c045be2 + HB - Дата явки не наступила + true + false + false + + + +cssClasses + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + c7653d80-65b9-4e15-ac4f-fc586ea1ac5a + Дата явки не наступила + false + false + + + + cssClasses + + + + "legend-col-dark-blue" + + + + + + initialValue + + "Дата явки не наступила" + + + + + + + + + false + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + fb2ae320-31fb-4e27-900e-39ca7da90bdd + HB - значения + true + false + + + + cssClasses + + + + "pull-right" + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 72b8b894-570d-47b5-9011-bac8a944088e + 1.1 млн. + false + false + + + + cssClasses + + + + "text-invert" + + + + + + initialValue + + null + + + + label + + null + + + + textFormatter + + + + decimalDelimiter + + "." + + + + decimalLength + + 1.0 + + + + millionsLabel + + "млн." + + + + replaceModels + + + + + + value + + "0" + + + + + + + + + thousandsLabel + + "тыс." + + + + unitsText + + {"objectId":"72b8b894-570d-47b5-9011-bac8a944088e","packageName":"component","className":"Text","type":"TS"} + + + + + UnitsLabelReplaceValueTextFormatter + ervu-dashboard.formatter + + + + + + + + + + defaultValueColumn + + {"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"appear_date_is_good"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"appear_date_is_good"} + + + + + +false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 9631b14f-f8fb-4cbd-94cf-dd19603be9dd + 50% + false + false + + + + cssClasses + + + + "text-invert" + + + + + "mute" + + + + + + initialValue + + null + + + + label + + "%" + + + + textFormatter + + + + replaceModels + + + + + + value + + "0" + + + + + + + + + + ReplaceValueTextFormatter + ervu-dashboard.formatter + + + + + + + + + + defaultValueColumn + + {"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"appear_date_is_good_percent"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"appear_date_is_good_percent"} + + + + + false @@ -9003,6 +9375,7 @@ 614ba516-ed3d-4d56-b7d3-df164c7b15ac HB - явились true + false false @@ -9311,6 +9684,7 @@ 78d5f746-3a5c-4d19-a3c1-81675ea2a5a0 HB - не явились true + false false @@ -9619,6 +9993,7 @@ 57deeade-c1fc-48f8-a25d-2aa6b88a42aa HB - не явились по уважительной причине true + false false @@ -9928,6 +10303,7 @@ c95ca017-01b4-42ef-b4e9-44e363990402 HB - явка не требуется true + false false @@ -10237,6 +10613,7 @@ 606e74a1-0f80-44c8-a0dd-307259abbf3c HB - электронно true + false false @@ -10550,6 +10927,7 @@ 2a077891-0dd9-48fb-873e-331d8320b032 HB - нарочно true + false false @@ -10849,6 +11227,316 @@ +false + + + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + e809fc02-ab05-4fe7-a828-0c1d74274dea + HB - не вручено + true + false + false + + + +cssClasses + + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + fdc63b5f-103d-4a75-b500-62e103701342 + Не вручено + false + false + + + + cssClasses + + + + "legend-col-olive" + + + + + + initialValue + + "Не вручено" + + + + + + + + + false + + + + d7d54cfb-26b5-4dba-b56f-b6247183c24d + 01d799c5-55d3-40b3-b468-510e90e419cf + HB - значения + true + false + + + + cssClasses + + + + "pull-right" + + + + + + + + + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + 595c39bb-ad44-4f60-bbd9-f5fa9188f8a5 + 400 тыс. + false + false + + + + cssClasses + + + + "text-invert" + + + + + + initialValue + + null + + + + label + + null + + + + textFormatter + + + + decimalDelimiter + + "." + + + + decimalLength + + 1.0 + + + + millionsLabel + + "млн." + + + + replaceModels + + + + + + value + + "0" + + + + + + + + + thousandsLabel + + "тыс." + + + + unitsText + + {"objectId":"595c39bb-ad44-4f60-bbd9-f5fa9188f8a5","packageName":"component","className":"Text","type":"TS"} + + + + + UnitsLabelReplaceValueTextFormatter + ervu-dashboard.formatter + + + + + + + + + + defaultValueColumn + + {"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"count_not_delivery"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"count_not_delivery"} + + + + + +false + + + + ba24d307-0b91-4299-ba82-9d0b52384ff2 + e97bd7bd-757b-4c25-b357-648e4a536a67 + 18% + false + false + + + + cssClasses + + + + "text-invert" + + + + + "mute" + + + + + + initialValue + + null + + + + label + + "%" + + + + textFormatter + + + + replaceModels + + + + + + value + + "0" + + + + + + + + + + ReplaceValueTextFormatter + ervu-dashboard.formatter + + + + + + + + + + defaultValueColumn + + {"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"not_delivery_percent"} + + + + loadType + + "BY_COLUMN" + + + + + + + + loadType + + "BY_COLUMN" + + + + valueByEventColumn + + {"schema":"total_registered","table":"subpoenas","entity":"subpoenas","name":"not_delivery_percent"} + + + + + false @@ -10859,6 +11547,7 @@ aad0e207-43df-4b6f-8244-a59a4df393b2 HB - применено ограничений true + false false @@ -11172,6 +11861,7 @@ 54007a55-013a-4704-a7cb-cde80fda7383 HB - введено реализатором мер true + false false From 1625742c602fa23025b8cd1afbf9c6f1a6e50afc Mon Sep 17 00:00:00 2001 From: root Date: Fri, 11 Oct 2024 00:05:26 +0300 Subject: [PATCH 11/49] 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 0d9afcc3..a4e87ade 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.7.0 ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index 17d80086..a4e54888 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.7.0 ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index 81cf0eea..0884497e 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.7.0 ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index 09742efb..51fd3f42 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.7.0 pom backend diff --git a/resources/pom.xml b/resources/pom.xml index e52d4bc9..26fd67bc 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.7.0 ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index 878c5983..5d457452 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.7.0-SNAPSHOT + 1.7.0 ru.micord.ervu.dashboard From 4d93ea76f14502e96edcac8786bc333a69c1dd9d Mon Sep 17 00:00:00 2001 From: root Date: Fri, 11 Oct 2024 00:05:29 +0300 Subject: [PATCH 12/49] 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 933bf03c..a4e87ade 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.8.0-SNAPSHOT + 1.7.0 ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index 43bbce2b..a4e54888 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.8.0-SNAPSHOT + 1.7.0 ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index 479858c5..0884497e 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.8.0-SNAPSHOT + 1.7.0 ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index 3fe6e67c..51fd3f42 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.8.0-SNAPSHOT + 1.7.0 pom backend diff --git a/resources/pom.xml b/resources/pom.xml index 8c47dd1c..26fd67bc 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.8.0-SNAPSHOT + 1.7.0 ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index 2e8c8278..5d457452 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.8.0-SNAPSHOT + 1.7.0 ru.micord.ervu.dashboard From c93ba4208d8574c85f061afdb1d2fde3f3cbdfd6 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 11 Oct 2024 00:05:32 +0300 Subject: [PATCH 13/49] 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 a4e87ade..933bf03c 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.7.0 + 1.8.0-SNAPSHOT ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index a4e54888..43bbce2b 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.0 + 1.8.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index 0884497e..479858c5 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.0 + 1.8.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index 51fd3f42..3fe6e67c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.7.0 + 1.8.0-SNAPSHOT pom backend diff --git a/resources/pom.xml b/resources/pom.xml index 26fd67bc..8c47dd1c 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.0 + 1.8.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index 5d457452..2e8c8278 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.7.0 + 1.8.0-SNAPSHOT ru.micord.ervu.dashboard From 49c65a39686c6a0611611fe180a39f2fda9d72d2 Mon Sep 17 00:00:00 2001 From: agent46 Date: Fri, 11 Oct 2024 12:55:53 +0300 Subject: [PATCH 14/49] 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 a4e87ade..7e1dc779 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.7.0 + 1.7.1-SNAPSHOT ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index a4e54888..77fad27a 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.0 + 1.7.1-SNAPSHOT ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index 0884497e..dadda5ca 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.0 + 1.7.1-SNAPSHOT ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index 51fd3f42..a5e31dca 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.7.0 + 1.7.1-SNAPSHOT pom backend diff --git a/resources/pom.xml b/resources/pom.xml index 26fd67bc..715177f8 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.0 + 1.7.1-SNAPSHOT ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index 5d457452..c06266a1 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.7.0 + 1.7.1-SNAPSHOT ru.micord.ervu.dashboard From fe982ed1552d4c21fa6491371107b9db4b615f22 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, 11 Oct 2024 13:13:49 +0300 Subject: [PATCH 15/49] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=BF=D0=BE=20=D0=B1=D0=B0=D1=80=D0=B0=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/src/main/resources/business-model/main.page | 11 +++-------- .../main/resources/business-model/notregistered.page | 4 ++-- .../business-model/Всего на учете (2й уровень).page | 4 ++-- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/resources/src/main/resources/business-model/main.page b/resources/src/main/resources/business-model/main.page index d126140e..b26f4c0c 100644 --- a/resources/src/main/resources/business-model/main.page +++ b/resources/src/main/resources/business-model/main.page @@ -567,7 +567,6 @@ 6710c493-e4f6-4a38-b56a-3dcf5cf7269b Всего состоят на учете true - false false @@ -765,7 +764,6 @@ da163cd2-73b9-4dbd-9203-271802779d0f Горизонтальный контейнер true - false false @@ -941,7 +939,6 @@ 35edb048-fd74-4ecb-a101-d3b7cf933b64 Вертикальный контейнер true - false false @@ -1161,7 +1158,6 @@ 8c755756-157d-4666-9233-f9f199ce4dc0 Горизонтальный контейнер true - false false @@ -1606,7 +1602,6 @@ 42f079fa-ffe9-49b0-b8f7-aac7ceb54563 Вертикальный контейнер true - false false @@ -1871,7 +1866,7 @@ 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} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"total_registered","schemaName":"main_dashboard","x":375.6,"y":271.4,"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"}},"nodes":[{"tableName":"total_registered","schemaName":"main_dashboard","x":375.6,"y":271.4,"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"}],"nodeByEntityName":{"total_registered":{"tableName":"total_registered","schemaName":"main_dashboard","x":375.6,"y":271.4,"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]],"mainNodeIndex":0} @@ -3116,7 +3111,6 @@ bc72b920-b037-453b-b7d6-2aae8a5ab38d VB - Подлежат постановке на учет true - false false @@ -4451,7 +4445,7 @@ 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} + {"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"waiting_registration","schemaName":"main_dashboard","x":305.0,"y":273.79999999999995,"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"}},"nodes":[{"tableName":"waiting_registration","schemaName":"main_dashboard","x":305.0,"y":273.79999999999995,"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"}],"nodeByEntityName":{"waiting_registration":{"tableName":"waiting_registration","schemaName":"main_dashboard","x":305.0,"y":273.79999999999995,"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]],"mainNodeIndex":0} @@ -5713,6 +5707,7 @@ 287754e8-934b-4750-b623-48758802904c Призывная кампания true + false false diff --git a/resources/src/main/resources/business-model/notregistered.page b/resources/src/main/resources/business-model/notregistered.page index 0708a1f6..f91ca5a7 100644 --- a/resources/src/main/resources/business-model/notregistered.page +++ b/resources/src/main/resources/business-model/notregistered.page @@ -697,7 +697,6 @@ 62ad92df-92a4-456b-9c72-c4e133f621f9 VB - Подлежат постановке на учет true - false false @@ -1949,7 +1948,7 @@ 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} + {"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\""]}],"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\""]}],"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\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} @@ -12897,6 +12896,7 @@ 321237e7-f5f9-4f77-a791-c18ac5cbfd25 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 35b4fdbe..fc580c22 100644 --- a/resources/src/main/resources/business-model/Всего на учете (2й уровень).page +++ b/resources/src/main/resources/business-model/Всего на учете (2й уровень).page @@ -681,7 +681,6 @@ 1c6c88af-a164-4e0d-9cbb-a6bc59d30414 Всего состоят на учете true - false false @@ -2025,7 +2024,7 @@ 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} + {"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\""]}],"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\""]}],"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\""]}],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0} @@ -7829,6 +7828,7 @@ a00e8828-e03e-434a-98f8-7dfd6575a687 VB - Повестки true + false false From c65a83b1d48d658c8e4752c734041992046d78fa Mon Sep 17 00:00:00 2001 From: root Date: Fri, 11 Oct 2024 14:13:24 +0300 Subject: [PATCH 16/49] 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 7e1dc779..e4d98d49 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.7.1-SNAPSHOT + 1.7.1 ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index 77fad27a..8cfd9123 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.1-SNAPSHOT + 1.7.1 ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index dadda5ca..c4cc38a9 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.1-SNAPSHOT + 1.7.1 ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index a5e31dca..7b3ca3aa 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.7.1-SNAPSHOT + 1.7.1 pom backend diff --git a/resources/pom.xml b/resources/pom.xml index 715177f8..ab57110a 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.1-SNAPSHOT + 1.7.1 ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index c06266a1..e9b9d780 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.7.1-SNAPSHOT + 1.7.1 ru.micord.ervu.dashboard From d7675b4872dbc72669ff84bbe4b865fcf126f9c5 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 11 Oct 2024 14:13:27 +0300 Subject: [PATCH 17/49] 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 933bf03c..e4d98d49 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.8.0-SNAPSHOT + 1.7.1 ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index 43bbce2b..8cfd9123 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.8.0-SNAPSHOT + 1.7.1 ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index 479858c5..c4cc38a9 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.8.0-SNAPSHOT + 1.7.1 ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index 3fe6e67c..7b3ca3aa 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.8.0-SNAPSHOT + 1.7.1 pom backend diff --git a/resources/pom.xml b/resources/pom.xml index 8c47dd1c..ab57110a 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.8.0-SNAPSHOT + 1.7.1 ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index 2e8c8278..e9b9d780 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.8.0-SNAPSHOT + 1.7.1 ru.micord.ervu.dashboard From 638b72877ea0d896c9eb9af25835bc02e3434628 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 11 Oct 2024 14:13:30 +0300 Subject: [PATCH 18/49] 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 e4d98d49..933bf03c 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.7.1 + 1.8.0-SNAPSHOT ru.micord.ervu.dashboard backend diff --git a/distribution/pom.xml b/distribution/pom.xml index 8cfd9123..43bbce2b 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.1 + 1.8.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/frontend/pom.xml b/frontend/pom.xml index c4cc38a9..479858c5 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.1 + 1.8.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/pom.xml b/pom.xml index 7b3ca3aa..3fe6e67c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu dashboard - 1.7.1 + 1.8.0-SNAPSHOT pom backend diff --git a/resources/pom.xml b/resources/pom.xml index ab57110a..8c47dd1c 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu dashboard - 1.7.1 + 1.8.0-SNAPSHOT ru.micord.ervu.dashboard diff --git a/test/pom.xml b/test/pom.xml index e9b9d780..2e8c8278 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu dashboard - 1.7.1 + 1.8.0-SNAPSHOT ru.micord.ervu.dashboard From 6b9ef746c4dded355b36149a62ea9e4a06a49fb2 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: Wed, 16 Oct 2024 14:42:29 +0300 Subject: [PATCH 19/49] =?UTF-8?q?=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82?= =?UTF-8?q?=D1=8B=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81=D0=B0=20?= =?UTF-8?q?=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sync-backend.ps1 | 4 ++++ sync-frontend.ps1 | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 sync-backend.ps1 create mode 100644 sync-frontend.ps1 diff --git a/sync-backend.ps1 b/sync-backend.ps1 new file mode 100644 index 00000000..20b9e180 --- /dev/null +++ b/sync-backend.ps1 @@ -0,0 +1,4 @@ +$DestDir = 'C:\work\ervu-dashboard-backend' +$SourceDir = (Get-Location) + +robocopy $SourceDir $DestDir /S /mir /XF .npmrc sync-frontend.ps1 sync-backend.ps1 .gitignore .studioignore Dockerfile.pgs2 .gitlab-ci.yml config.md project.md system-requirements.md /XD $SourceDir\config .git target .studio $SourceDir\frontend\build $SourceDir\frontend\build_dev $SourceDir\frontend\dist $SourceDir\frontend\node_modules \ No newline at end of file diff --git a/sync-frontend.ps1 b/sync-frontend.ps1 new file mode 100644 index 00000000..2fd61268 --- /dev/null +++ b/sync-frontend.ps1 @@ -0,0 +1,4 @@ +$DestDir = 'C:\work\ervu-dashboard-frontend\' +$SourceDir = (Get-Location) + +robocopy $SourceDir $DestDir /S /mir /XF .npmrc sync-frontend.ps1 sync-backend.ps1 .gitignore .studioignore Dockerfile.pgs2 .gitlab-ci.yml config.md project.md system-requirements.md /XD $SourceDir\config .git target .studio $SourceDir\frontend\build $SourceDir\frontend\build_dev $SourceDir\frontend\dist $SourceDir\frontend\node_modules \ No newline at end of file From 0b6f5b10bb8784785a6245bb9a06e68a7ff47db6 Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Wed, 16 Oct 2024 15:29:41 +0300 Subject: [PATCH 20/49] SUPPORT-8617: add new patches. Insert data in ervu_dashboard.pub_recruitment SUPPORT-8617: add patches(only structure) SUPPORT-8617: add patches(schemes, role, obj type, ext uuid, schema and structure: appeals, ervu_dashboard) --- .../v_1.0/2024-08-20--01-core-extensions.xml | 15 - ...08-20--02-core-db-schema-ervudashboard.xml | 157 ----- .../2024-08-20--03-core-db-schema-appeals.xml | 93 --- .../2024-08-20--04-core-db-schema-ratings.xml | 66 -- ...05-core-db-schema-recruitment-campaign.xml | 87 --- .../2024-08-20--06-core-db-schema-space.xml | 52 -- ...8-20--07-core-db-schema-main_dashboard.xml | 114 ---- ...20--08-core-db-schema-total_registered.xml | 250 -------- .../v_1.0/2024-08-21--09-add-fk-tables.xml | 133 ----- .../2024-08-21--10-add-data-in-tables.xml | 301 ---------- ...-28--11-drop-column-testrecruitment_id.xml | 20 - .../2024-08-28--12-drop-column-mil_reg.xml | 11 - ...e-fk-recruitment_id-pub_recruitment.id.xml | 141 ----- .../config/v_1.0/2024-10-16--01-add-role.xml | 33 + .../2024-10-16--02-core-create-schemes.xml | 119 ++++ .../v_1.0/2024-10-16--03-add-ext-uuid.xml | 25 + .../v_1.0/2024-10-16--04-add-obj-type.xml | 29 + .../v_1.0/2024-10-16--05-create-appeals.xml | 106 ++++ .../2024-10-16--06-create-ervu_dashboard.xml | 564 ++++++++++++++++++ .../2024-10-16--07-create-main_dashboard.xml | 133 +++++ .../v_1.0/2024-10-17--08-create-public.xml | 82 +++ .../v_1.0/2024-10-17--09-create-ratings.xml | 72 +++ ...-10-17--10-create-recruitment_campaign.xml | 95 +++ .../v_1.0/2024-10-17--11-create-space.xml | 74 +++ ...2024-10-17--12-create-total_registered.xml | 303 ++++++++++ .../v_1.0/2024-10-17--13-add-indexes.xml | 116 ++++ .../config/v_1.0/2024-10-17--14-add-fk.xml | 74 +++ ...0-17--15-insert-data-in-ervu_dashboard.xml | 29 + .../resources/config/v_1.0/changelog-v1.0.xml | 17 + .../src/main/resources/liquibase.properties | 6 - 30 files changed, 1871 insertions(+), 1446 deletions(-) delete mode 100644 backend/src/main/resources/config/v_1.0/2024-08-20--01-core-extensions.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-08-20--02-core-db-schema-ervudashboard.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-08-20--03-core-db-schema-appeals.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-08-20--04-core-db-schema-ratings.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-08-20--05-core-db-schema-recruitment-campaign.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-08-20--06-core-db-schema-space.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-08-20--07-core-db-schema-main_dashboard.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-08-20--08-core-db-schema-total_registered.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-08-21--09-add-fk-tables.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-08-21--10-add-data-in-tables.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-08-28--11-drop-column-testrecruitment_id.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-08-28--12-drop-column-mil_reg.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-08-28--13-reconfigure-fk-recruitment_id-pub_recruitment.id.xml create mode 100644 backend/src/main/resources/config/v_1.0/2024-10-16--01-add-role.xml create mode 100644 backend/src/main/resources/config/v_1.0/2024-10-16--02-core-create-schemes.xml create mode 100644 backend/src/main/resources/config/v_1.0/2024-10-16--03-add-ext-uuid.xml create mode 100644 backend/src/main/resources/config/v_1.0/2024-10-16--04-add-obj-type.xml create mode 100644 backend/src/main/resources/config/v_1.0/2024-10-16--05-create-appeals.xml create mode 100644 backend/src/main/resources/config/v_1.0/2024-10-16--06-create-ervu_dashboard.xml create mode 100644 backend/src/main/resources/config/v_1.0/2024-10-16--07-create-main_dashboard.xml create mode 100644 backend/src/main/resources/config/v_1.0/2024-10-17--08-create-public.xml create mode 100644 backend/src/main/resources/config/v_1.0/2024-10-17--09-create-ratings.xml create mode 100644 backend/src/main/resources/config/v_1.0/2024-10-17--10-create-recruitment_campaign.xml create mode 100644 backend/src/main/resources/config/v_1.0/2024-10-17--11-create-space.xml create mode 100644 backend/src/main/resources/config/v_1.0/2024-10-17--12-create-total_registered.xml create mode 100644 backend/src/main/resources/config/v_1.0/2024-10-17--13-add-indexes.xml create mode 100644 backend/src/main/resources/config/v_1.0/2024-10-17--14-add-fk.xml create mode 100644 backend/src/main/resources/config/v_1.0/2024-10-17--15-insert-data-in-ervu_dashboard.xml delete mode 100644 backend/src/main/resources/liquibase.properties diff --git a/backend/src/main/resources/config/v_1.0/2024-08-20--01-core-extensions.xml b/backend/src/main/resources/config/v_1.0/2024-08-20--01-core-extensions.xml deleted file mode 100644 index ce2d2105..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-08-20--01-core-extensions.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - CREATE EXTENSION IF NOT EXISTS "uuid-ossp" - - - \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-08-20--02-core-db-schema-ervudashboard.xml b/backend/src/main/resources/config/v_1.0/2024-08-20--02-core-db-schema-ervudashboard.xml deleted file mode 100644 index e165b144..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-08-20--02-core-db-schema-ervudashboard.xml +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/backend/src/main/resources/config/v_1.0/2024-08-20--03-core-db-schema-appeals.xml b/backend/src/main/resources/config/v_1.0/2024-08-20--03-core-db-schema-appeals.xml deleted file mode 100644 index 7b4c4cf5..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-08-20--03-core-db-schema-appeals.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - CREATE SCHEMA IF NOT EXISTS appeals; - ALTER SCHEMA appeals OWNER TO "ervu-dashboard"; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/backend/src/main/resources/config/v_1.0/2024-08-20--04-core-db-schema-ratings.xml b/backend/src/main/resources/config/v_1.0/2024-08-20--04-core-db-schema-ratings.xml deleted file mode 100644 index e97c3454..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-08-20--04-core-db-schema-ratings.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - CREATE SCHEMA IF NOT EXISTS ratings; - ALTER SCHEMA ratings OWNER TO "ervu-dashboard"; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/backend/src/main/resources/config/v_1.0/2024-08-20--05-core-db-schema-recruitment-campaign.xml b/backend/src/main/resources/config/v_1.0/2024-08-20--05-core-db-schema-recruitment-campaign.xml deleted file mode 100644 index 11759db5..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-08-20--05-core-db-schema-recruitment-campaign.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - CREATE SCHEMA IF NOT EXISTS recruitment_campaign; - ALTER SCHEMA recruitment_campaign OWNER TO "ervu-dashboard" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/backend/src/main/resources/config/v_1.0/2024-08-20--06-core-db-schema-space.xml b/backend/src/main/resources/config/v_1.0/2024-08-20--06-core-db-schema-space.xml deleted file mode 100644 index 0e5273dd..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-08-20--06-core-db-schema-space.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - CREATE SCHEMA IF NOT EXISTS space; - ALTER SCHEMA space OWNER TO "ervu-dashboard"; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/backend/src/main/resources/config/v_1.0/2024-08-20--07-core-db-schema-main_dashboard.xml b/backend/src/main/resources/config/v_1.0/2024-08-20--07-core-db-schema-main_dashboard.xml deleted file mode 100644 index 4aaa397a..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-08-20--07-core-db-schema-main_dashboard.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - CREATE SCHEMA IF NOT EXISTS main_dashboard; - ALTER SCHEMA main_dashboard OWNER TO "ervu-dashboard"; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/backend/src/main/resources/config/v_1.0/2024-08-20--08-core-db-schema-total_registered.xml b/backend/src/main/resources/config/v_1.0/2024-08-20--08-core-db-schema-total_registered.xml deleted file mode 100644 index a551dcb5..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-08-20--08-core-db-schema-total_registered.xml +++ /dev/null @@ -1,250 +0,0 @@ - - - - - - CREATE SCHEMA IF NOT EXISTS total_registered; - ALTER SCHEMA total_registered OWNER TO "ervu-dashboard"; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - CREATE TABLE IF NOT EXISTS total_registered.driver_license - ( - id_driver_license BIGINT PRIMARY KEY GENERATED BY DEFAULT AS IDENTITY (START WITH 4), - nope NUMERIC, - "A" NUMERIC, - "B" NUMERIC, - "C" NUMERIC, - "D" NUMERIC, - "E" NUMERIC, - "all_M_W" TEXT, - recording_date DATE, - nope_repcent NUMERIC, - "A_repcent" NUMERIC, - "B_repcent" NUMERIC, - "C_repcent" NUMERIC, - "D_repcent" NUMERIC, - "E_repcent" NUMERIC, - recruitment_id UUID - ); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/backend/src/main/resources/config/v_1.0/2024-08-21--09-add-fk-tables.xml b/backend/src/main/resources/config/v_1.0/2024-08-21--09-add-fk-tables.xml deleted file mode 100644 index 62109496..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-08-21--09-add-fk-tables.xml +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-08-21--10-add-data-in-tables.xml b/backend/src/main/resources/config/v_1.0/2024-08-21--10-add-data-in-tables.xml deleted file mode 100644 index ca764aae..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-08-21--10-add-data-in-tables.xml +++ /dev/null @@ -1,301 +0,0 @@ - - - - Insert values in ervu_dashboard.pub_recruitment - - INSERT INTO ervu_dashboard.pub_recruitment (id, idm_id, parent_id, military_code, shortname, fullname, code, sort) VALUES ('6b56f46a-16e7-4c0f-83a8-05fbddf2e6cb', '0340dea4-bf2d-4591-be09-987f7e79d0b4', '76e40191-adc7-4f03-84a4-0c29c44961a7', '00012345', 'Сахалинская область', 'Военный комиссариат Сахалинской области', '65', 4); - INSERT INTO ervu_dashboard.pub_recruitment (id, idm_id, parent_id, military_code, shortname, fullname, code, sort) VALUES ('76e40191-adc7-4f03-84a4-0c29c44961a7', '08ce08c9-3595-4c36-bd14-8deda575d822', null, '00000001', 'Российская Федерация', 'Российская Федерация', '00', 1); - INSERT INTO ervu_dashboard.pub_recruitment (id, idm_id, parent_id, military_code, shortname, fullname, code, sort) VALUES ('794ed0fa-a25b-4858-b89e-815bb391f2b5', 'b16c8334-07a5-43e0-8c6f-bc07830fb096', '76e40191-adc7-4f03-84a4-0c29c44961a7', '07706878', 'Липецкая область', 'Военный комиссариат Липецкой области', '48', 2); - INSERT INTO ervu_dashboard.pub_recruitment (id, idm_id, parent_id, military_code, shortname, fullname, code, sort) VALUES ('d2e839ef-933c-48df-9a3a-ac1c00663154', '3f1d6fb7-c9a8-4692-b292-e7a3732c1aff', '76e40191-adc7-4f03-84a4-0c29c44961a7', '08400325', 'Рязанская область', 'Военный комиссариат Рязанской области, г. Рязань', '62', 3); - - - - - Insert values in ervu_dashboard.citizen - - INSERT INTO ervu_dashboard.citizen ("id_ERN", fio, residence, recruitment, recruitment_id, is_registered, issue_date, passport_series, passport_number, phone, medical_requirements, deferment_liberation, subpoena_citizen_id, temporary_measures_id, citizen_id, gender, marital_status, education, employment, reason_registration, number_children, date_birth, driver_license, disability_group, dispensary_registration_code, region_birth, city_birth, number_children_18_old, right_deferment, took_break, medic, sports_category, tractor_license, is_wanted, is_in_prison, acquired_citizenship, urgent_service, contract_service, mobilization, age) VALUES ('547392424526', 'Вадим Вадимович Щипачёв', 'г. Москва', 'Военный комиссариат (объединенный) Тверского района ЦФО г. Москвы', 'd2e839ef-933c-48df-9a3a-ac1c00663154', 'Сосотоит на ВУ', null, null, null, null, null, null, null, null, 'a88e4b95-a235-4427-adf9-332b53a4a278', 'Мужской', 'Холост', 'Среднее профессилональное', 'Работающий на постоянной работе', null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null); - INSERT INTO ervu_dashboard.citizen ("id_ERN", fio, residence, recruitment, recruitment_id, is_registered, issue_date, passport_series, passport_number, phone, medical_requirements, deferment_liberation, subpoena_citizen_id, temporary_measures_id, citizen_id, gender, marital_status, education, employment, reason_registration, number_children, date_birth, driver_license, disability_group, dispensary_registration_code, region_birth, city_birth, number_children_18_old, right_deferment, took_break, medic, sports_category, tractor_license, is_wanted, is_in_prison, acquired_citizenship, urgent_service, contract_service, mobilization, age) VALUES ('547392424527', 'Вадим Вадимович Щипачёв-2', 'г. Москва', 'Военный комиссариат (объединенный) Тверского района ЦФО г. Москвы', 'd2e839ef-933c-48df-9a3a-ac1c00663154', 'Не состоит на ВУ', null, null, null, null, null, null, null, null, 'e21955b2-67b4-4d41-a6b5-c4cfe46b2711', 'Мужской', 'Женат', 'Высшее', 'Работающий на постоянной работе', null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null); - INSERT INTO ervu_dashboard.citizen ("id_ERN", fio, residence, recruitment, recruitment_id, is_registered, issue_date, passport_series, passport_number, phone, medical_requirements, deferment_liberation, subpoena_citizen_id, temporary_measures_id, citizen_id, gender, marital_status, education, employment, reason_registration, number_children, date_birth, driver_license, disability_group, dispensary_registration_code, region_birth, city_birth, number_children_18_old, right_deferment, took_break, medic, sports_category, tractor_license, is_wanted, is_in_prison, acquired_citizenship, urgent_service, contract_service, mobilization, age) VALUES ('547392424525', 'Константин Михайлович Белов', 'г. Москва, Краснопресненская, д.4, кв. 45', 'Военный комиссариат Рязанской области, г. Рязань', 'd2e839ef-933c-48df-9a3a-ac1c00663154', 'Состоит на ВУ', '2024-01-15', '9201', '000111', '79047648974', 'Имеет заболевание из специального перечня (требующие специального учёта)', 'Граждане, признанные не годными к воинной службе по состоянию здоровья', 1, 1, 'e582c6ab-810c-49c4-84b3-4a9a0961fc02', 'Мужской', 'Холост', 'Среднее профессиональное', 'Безработный', 'Гражданин РФ прибыл из-за границы после отсутствия на территории Российской Федерации более 6 месяцев', '1 ребёнок', '1993-01-01', null, null, null, 'Республика Тататрстан', 'г. Казань', '0', false, false, false, false, false, false, false, false, false, true, false, null); - - - - - Insert values in ervu_dashboard.subpoena - - INSERT INTO ervu_dashboard.subpoena (subpoena_id, series, number, id_ern, create_date, visit_date, send_date, reason_cancelled, recruit_id, department_id, subpoena_status, subpoena_reason) VALUES (1, '01', '0001', null, '2024-01-01 00:00:00.000000', '2024-01-15 00:00:00.000000', '2024-01-13 21:00:00.000000 +00:00', null, 'e582c6ab-810c-49c4-84b3-4a9a0961fc02', 'd2e839ef-933c-48df-9a3a-ac1c00663154', 'Гражданин явился после назначенной даты', 'Для прохождения медицинского освидетельствования или мероприятий, связанных с ним'); - - - - - Insert values in ervu_dashboard.temporary_measures - - INSERT INTO ervu_dashboard.temporary_measures (temporary_measures_id, recruitment_id, name, date_application, withdrawal_date, status, citizen_id) VALUES (1, 'd2e839ef-933c-48df-9a3a-ac1c00663154', 'Ограничение на управление транстпортным средством', '2024-01-01', '2024-01-15', 'Временная мера снята ', 'e582c6ab-810c-49c4-84b3-4a9a0961fc02'); - - - - - - Insert values in appeals.main_profile - - INSERT INTO appeals.main_profile (id_main_profile, gender, age, child_min_18, education, employment, recording_date, recruitment_id) VALUES (1, null, null, null, null, null, '2024-07-22', '76e40191-adc7-4f03-84a4-0c29c44961a7'); - - - - - Insert values in appeals.reasons_appeal - - INSERT INTO appeals.reasons_appeal (id_reasons_appeal, appeal, incorrect_inf, no_data, other, recording_date, incorrect_inf_percent, no_data_percent, other_percent, recruitment_id) VALUES (1, 1200000, 0, 0, 0, '2024-07-19', 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - - - - Insert values in space.region - - INSERT INTO space.region (id_region, region) VALUES (5, 'Волгоградская область'); - INSERT INTO space.region (id_region, region) VALUES (4, 'Кабардино-Балкарская Республика'); - INSERT INTO space.region (id_region, region) VALUES (3, 'Сахалинская область'); - INSERT INTO space.region (id_region, region) VALUES (2, 'Рязанская область'); - INSERT INTO space.region (id_region, region) VALUES (6, 'Кировская область'); - INSERT INTO space.region (id_region, region) VALUES (9, 'Сахалинская область'); - INSERT INTO space.region (id_region, region) VALUES (10, 'Приморский край'); - INSERT INTO space.region (id_region, region) VALUES (11, 'Алтайский край'); - INSERT INTO space.region (id_region, region) VALUES (12, 'Республика Дагестан'); - INSERT INTO space.region (id_region, region) VALUES (13, 'Новгородская область'); - INSERT INTO space.region (id_region, region) VALUES (14, 'Курганская область'); - INSERT INTO space.region (id_region, region) VALUES (15, 'Воронежская область'); - INSERT INTO space.region (id_region, region) VALUES (1, 'Липецкая область'); - - - - - Insert values in appeals.review_rating - - INSERT INTO appeals.review_rating (id_review_rating, speed, rating, recording_date, id_region, recruitment_id) VALUES (1, 0, 0, '2024-07-22', 1, '794ed0fa-a25b-4858-b89e-815bb391f2b5'); - INSERT INTO appeals.review_rating (id_review_rating, speed, rating, recording_date, id_region, recruitment_id) VALUES (2, 0, 0, '2024-07-22', 2, 'd2e839ef-933c-48df-9a3a-ac1c00663154'); - INSERT INTO appeals.review_rating (id_review_rating, speed, rating, recording_date, id_region, recruitment_id) VALUES (3, 0, 0, '2024-07-22', 3, '6b56f46a-16e7-4c0f-83a8-05fbddf2e6cb'); - - - - - Insert values in appeals.topic_appeal - - INSERT INTO appeals.topic_appeal (id_topic_appeal, registration, sabpoena, appear, temporary_measures, recording_date, registration_percent, sabpoena_percent, appear_percent, temporary_measures_percent, recruitment_id) VALUES (1, 0, 0, 0, 0, '2024-07-22', 0, 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - - - - - - - Insert values in ratings.appear_subppoena - - INSERT INTO ratings.appear_subppoena (id_appear_subppoena, id_region, appear_mil_com, recording_date, appear_mil_com_percent, recruitment_id) VALUES (2, 3, 72, '2024-07-01', 85, null); - INSERT INTO ratings.appear_subppoena (id_appear_subppoena, id_region, appear_mil_com, recording_date, appear_mil_com_percent, recruitment_id) VALUES (3, 5, 26, '2024-07-01', 26, null); - INSERT INTO ratings.appear_subppoena (id_appear_subppoena, id_region, appear_mil_com, recording_date, appear_mil_com_percent, recruitment_id) VALUES (4, 4, 31, '2024-07-01', 31, null); - INSERT INTO ratings.appear_subppoena (id_appear_subppoena, id_region, appear_mil_com, recording_date, appear_mil_com_percent, recruitment_id) VALUES (5, 9, 72, '2024-07-01', 72, null); - INSERT INTO ratings.appear_subppoena (id_appear_subppoena, id_region, appear_mil_com, recording_date, appear_mil_com_percent, recruitment_id) VALUES (6, 6, 24, '2024-07-01', 24, null); - INSERT INTO ratings.appear_subppoena (id_appear_subppoena, id_region, appear_mil_com, recording_date, appear_mil_com_percent, recruitment_id) VALUES (1, 1, 90, '2024-07-01', null, null); - - - - - - Insert values in ratings.consideration_complaint - - INSERT INTO ratings.consideration_complaint (id_consideration_complaint, id_region, consideration_complaint, recording_date, consideration_complaint_percent, recruitment_id) VALUES (1, 4, 31, '2024-07-01', 31, null); - INSERT INTO ratings.consideration_complaint (id_consideration_complaint, id_region, consideration_complaint, recording_date, consideration_complaint_percent, recruitment_id) VALUES (2, 6, 24, '2024-07-01', 24, null); - INSERT INTO ratings.consideration_complaint (id_consideration_complaint, id_region, consideration_complaint, recording_date, consideration_complaint_percent, recruitment_id) VALUES (3, 5, 26, '2024-07-01', 26, null); - INSERT INTO ratings.consideration_complaint (id_consideration_complaint, id_region, consideration_complaint, recording_date, consideration_complaint_percent, recruitment_id) VALUES (4, 9, 72, '2024-07-01', 72, null); - INSERT INTO ratings.consideration_complaint (id_consideration_complaint, id_region, consideration_complaint, recording_date, consideration_complaint_percent, recruitment_id) VALUES (5, 2, 85, '2024-07-01', 85, null); - INSERT INTO ratings.consideration_complaint (id_consideration_complaint, id_region, consideration_complaint, recording_date, consideration_complaint_percent, recruitment_id) VALUES (6, 1, 90, '2024-07-01', 90, null); - - - - - - Insert values in ratings.recruitment - - INSERT INTO ratings.recruitment (id_recruitment, id_region, execution, spring_autumn, recording_date, execution_percent, recruitment_id) VALUES (1, 10, 95, null, '2024-07-01', 95, null); - INSERT INTO ratings.recruitment (id_recruitment, id_region, execution, spring_autumn, recording_date, execution_percent, recruitment_id) VALUES (2, 11, 93, null, '2024-07-01', 93, null); - INSERT INTO ratings.recruitment (id_recruitment, id_region, execution, spring_autumn, recording_date, execution_percent, recruitment_id) VALUES (3, 12, 89, null, '2024-07-01', 89, null); - INSERT INTO ratings.recruitment (id_recruitment, id_region, execution, spring_autumn, recording_date, execution_percent, recruitment_id) VALUES (4, 13, 47, null, '2024-07-01', 47, null); - INSERT INTO ratings.recruitment (id_recruitment, id_region, execution, spring_autumn, recording_date, execution_percent, recruitment_id) VALUES (5, 14, 39, null, '2024-07-01', 39, null); - INSERT INTO ratings.recruitment (id_recruitment, id_region, execution, spring_autumn, recording_date, execution_percent, recruitment_id) VALUES (6, 15, 32, null, '2024-07-01', 32, null); - - - - - - Insert values in recruitment_campaign.appeals - - INSERT INTO recruitment_campaign.appeals (id_appeal, total_appeal, resolved, not_resolved, average_consideration, average_rating, spring_autumn, recording_date, resolved_percent, not_resolved_percent, recruitment_id) VALUES (1, 0, 0, 0, 0, 0, 'Осень', '2024-07-19', 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - INSERT INTO recruitment_campaign.appeals (id_appeal, total_appeal, resolved, not_resolved, average_consideration, average_rating, spring_autumn, recording_date, resolved_percent, not_resolved_percent, recruitment_id) VALUES (2, 0, 0, 0, 0, 0, 'Весна', '2024-07-22', 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - - - - Insert values in recruitment_campaign.recruitment - - INSERT INTO recruitment_campaign.recruitment (id_recruitment, suitable_recruit, postponement_have_right, postponement_granted, spring_autumn, recording_date, postponement_have_right_percent, postponement_granted_percent, recruitment_id) VALUES (1, 0, 0, 0, 'Осень', '2024-07-19', 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - INSERT INTO recruitment_campaign.recruitment (id_recruitment, suitable_recruit, postponement_have_right, postponement_granted, spring_autumn, recording_date, postponement_have_right_percent, postponement_granted_percent, recruitment_id) VALUES (2, 0, 0, 0, 'Весна', '2024-07-22', 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - - - - Insert values in recruitment_campaign.subpoenas - - INSERT INTO recruitment_campaign.subpoenas (id_subpoena, subpoena, appeared, not_appeared, not_ap_good_reason, ap_not_required, restrictions_applied, spring_autumn, recording_date, appeared_percent, not_appeared_percent, not_ap_good_reason_percent, ap_not_required_percent, restrictions_applied_percent, introduced_measures, introduced_measures_percent, recruitment_id, rest, testrecruitment_id, testspring_autumn) VALUES (64, 0, 0, 0, 0, 0, 0, null, '2024-12-27', 0, 0, 0, 0, 0, 0, 0, null, 0, 'bf12841f-df92-4ded-a89a-3cf11d7a5a7c', 'Осень '); - INSERT INTO recruitment_campaign.subpoenas (id_subpoena, subpoena, appeared, not_appeared, not_ap_good_reason, ap_not_required, restrictions_applied, spring_autumn, recording_date, appeared_percent, not_appeared_percent, not_ap_good_reason_percent, ap_not_required_percent, restrictions_applied_percent, introduced_measures, introduced_measures_percent, recruitment_id, rest, testrecruitment_id, testspring_autumn) VALUES (65, 0, 0, 0, 0, 0, 0, null, '2024-12-27', 0, 0, 0, 0, 0, 0, 0, null, 0, 'bf12841f-df92-4ded-a89a-3cf11d7a5a7c', 'Осень '); - INSERT INTO recruitment_campaign.subpoenas (id_subpoena, subpoena, appeared, not_appeared, not_ap_good_reason, ap_not_required, restrictions_applied, spring_autumn, recording_date, appeared_percent, not_appeared_percent, not_ap_good_reason_percent, ap_not_required_percent, restrictions_applied_percent, introduced_measures, introduced_measures_percent, recruitment_id, rest, testrecruitment_id, testspring_autumn) VALUES (66, 0, 0, 0, 0, 0, 0, null, '2024-12-27', 0, 0, 0, 0, 0, 0, 0, null, 0, 'bf12841f-df92-4ded-a89a-3cf11d7a5a7c', 'Осень '); - INSERT INTO recruitment_campaign.subpoenas (id_subpoena, subpoena, appeared, not_appeared, not_ap_good_reason, ap_not_required, restrictions_applied, spring_autumn, recording_date, appeared_percent, not_appeared_percent, not_ap_good_reason_percent, ap_not_required_percent, restrictions_applied_percent, introduced_measures, introduced_measures_percent, recruitment_id, rest, testrecruitment_id, testspring_autumn) VALUES (67, 0, 0, 0, 0, 0, 0, null, '2024-12-27', 0, 0, 0, 0, 0, 0, 0, null, 0, '48 ', 'Осень '); - INSERT INTO recruitment_campaign.subpoenas (id_subpoena, subpoena, appeared, not_appeared, not_ap_good_reason, ap_not_required, restrictions_applied, spring_autumn, recording_date, appeared_percent, not_appeared_percent, not_ap_good_reason_percent, ap_not_required_percent, restrictions_applied_percent, introduced_measures, introduced_measures_percent, recruitment_id, rest, testrecruitment_id, testspring_autumn) VALUES (68, 0, 0, 0, 0, 0, 0, null, '2024-12-27', 0, 0, 0, 0, 0, 0, 0, null, 0, '62 ', 'Осень '); - INSERT INTO recruitment_campaign.subpoenas (id_subpoena, subpoena, appeared, not_appeared, not_ap_good_reason, ap_not_required, restrictions_applied, spring_autumn, recording_date, appeared_percent, not_appeared_percent, not_ap_good_reason_percent, ap_not_required_percent, restrictions_applied_percent, introduced_measures, introduced_measures_percent, recruitment_id, rest, testrecruitment_id, testspring_autumn) VALUES (69, 0, 0, 0, 0, 0, 0, null, '2024-12-27', 0, 0, 0, 0, 0, 0, 0, null, 0, '65 ', 'Осень '); - INSERT INTO recruitment_campaign.subpoenas (id_subpoena, subpoena, appeared, not_appeared, not_ap_good_reason, ap_not_required, restrictions_applied, spring_autumn, recording_date, appeared_percent, not_appeared_percent, not_ap_good_reason_percent, ap_not_required_percent, restrictions_applied_percent, introduced_measures, introduced_measures_percent, recruitment_id, rest, testrecruitment_id, testspring_autumn) VALUES (1, 2200000, 1300000, 510000, 490000, 100000, 550000, 'Осень', '2024-07-19', 50, 27, 23, 5, 25, 450000, 41, '76e40191-adc7-4f03-84a4-0c29c44961a7', 40, null, null); - INSERT INTO recruitment_campaign.subpoenas (id_subpoena, subpoena, appeared, not_appeared, not_ap_good_reason, ap_not_required, restrictions_applied, spring_autumn, recording_date, appeared_percent, not_appeared_percent, not_ap_good_reason_percent, ap_not_required_percent, restrictions_applied_percent, introduced_measures, introduced_measures_percent, recruitment_id, rest, testrecruitment_id, testspring_autumn) VALUES (2, 2200000, 1000000, 520000, 480000, 90000, 560000, 'Весна', '2024-07-22', 50, 27, 23, 5, 25, 460000, 42, '76e40191-adc7-4f03-84a4-0c29c44961a7', 40, null, null); - INSERT INTO recruitment_campaign.subpoenas (id_subpoena, subpoena, appeared, not_appeared, not_ap_good_reason, ap_not_required, restrictions_applied, spring_autumn, recording_date, appeared_percent, not_appeared_percent, not_ap_good_reason_percent, ap_not_required_percent, restrictions_applied_percent, introduced_measures, introduced_measures_percent, recruitment_id, rest, testrecruitment_id, testspring_autumn) VALUES (70, 0, 0, 0, 0, 0, 0, null, '2024-12-27', 0, 0, 0, 0, 0, 0, 0, null, 0, '48 ', 'Осень '); - INSERT INTO recruitment_campaign.subpoenas (id_subpoena, subpoena, appeared, not_appeared, not_ap_good_reason, ap_not_required, restrictions_applied, spring_autumn, recording_date, appeared_percent, not_appeared_percent, not_ap_good_reason_percent, ap_not_required_percent, restrictions_applied_percent, introduced_measures, introduced_measures_percent, recruitment_id, rest, testrecruitment_id, testspring_autumn) VALUES (71, 0, 0, 0, 0, 0, 0, null, '2024-12-27', 0, 0, 0, 0, 0, 0, 0, null, 0, '62 ', 'Осень '); - INSERT INTO recruitment_campaign.subpoenas (id_subpoena, subpoena, appeared, not_appeared, not_ap_good_reason, ap_not_required, restrictions_applied, spring_autumn, recording_date, appeared_percent, not_appeared_percent, not_ap_good_reason_percent, ap_not_required_percent, restrictions_applied_percent, introduced_measures, introduced_measures_percent, recruitment_id, rest, testrecruitment_id, testspring_autumn) VALUES (72, 0, 0, 0, 0, 0, 0, null, '2024-12-27', 0, 0, 0, 0, 0, 0, 0, null, 0, '65 ', 'Осень '); - - - - - Insert values in space.testrecruitment - - INSERT INTO space.testrecruitment (id, shortname, idm_id, code, parent_id) VALUES ('474e3768-c948-48ea-bdfd-2e8693ed966a', '5656556 ', '1bcd1c31-c326-48b9-b753-6ceb560d7d25', '48 ', '744b6ebc-d7a8-45d9-b11d-67cd84494522 '); - INSERT INTO space.testrecruitment (id, shortname, idm_id, code, parent_id) VALUES ('15287b52-d532-49f1-adf9-3bc7ecc7233a', 'ЖурналПО ', '0b9f8f3f-36bb-4c6a-99cb-241bd67ffa00', '48 ', 'ec2bfd8e-0f26-4977-92e4-3454a866e425 '); - INSERT INTO space.testrecruitment (id, shortname, idm_id, code, parent_id) VALUES ('f1dfbf77-e138-45e6-ba05-bf69f7124b75', 'ВК города Сасово, Ермишинского, Кадомского, Сасовского и Пителинского районов Рязанской области ', 'e437b97c-0da1-4f24-98cd-b68a0cf1b54a', '62 ', '3f1d6fb7-c9a8-4692-b292-e7a3732c1aff '); - INSERT INTO space.testrecruitment (id, shortname, idm_id, code, parent_id) VALUES ('d2f2b8b6-2f10-41f9-a5af-4b1cb448fd4b', ' ВК города Поронайск, Макаровского, Поронайского и Смирныховского районов Сахалинской области ', '0c1f0217-ed9d-4a3d-9148-878586e26ed5', '65 ', '0340dea4-bf2d-4591-be09-987f7e79d0b4 '); - INSERT INTO space.testrecruitment (id, shortname, idm_id, code, parent_id) VALUES ('2c4d9668-f343-4977-af2a-1ff2706030ea', 'ВК города Елец и Елецкого района Липецкой области ', 'e80e6600-0b44-40c0-984e-f5ad2a06621a', '48 ', 'b16c8334-07a5-43e0-8c6f-bc07830fb096 '); - INSERT INTO space.testrecruitment (id, shortname, idm_id, code, parent_id) VALUES ('645863d2-2a41-4c6c-9686-7628ba496cfc', 'ВК Лебедянского района Липецкой области ', 'fe24089e-6fe1-4bc8-818e-79f36506300d', '48 ', 'b16c8334-07a5-43e0-8c6f-bc07830fb096 '); - INSERT INTO space.testrecruitment (id, shortname, idm_id, code, parent_id) VALUES ('47cc6c93-670c-4d5f-8624-f3613f08f515', 'ВК Липецкого района Липецкой области, г. Липецк ', '503b41b1-cfa8-4206-a809-1d3a7c167608', '48 ', 'b16c8334-07a5-43e0-8c6f-bc07830fb096 '); - - - - - Insert values in total_registered.age - - INSERT INTO total_registered.age (id_age, "17_yaers", "18-26_years", "27-30_years", "31-35_years", "36-40_years", "41-45_years", "51+_years", "all_M_W", registered, recording_date, "46-50_years", "17_yaers_percent", "18-26_years_percent", "27-30_years_percent", "31-35_years_percent", "36-40_years_percent", "41-45_years_percent", "46-50_years_percent", "51+_years_percent", recruitment_id) VALUES (4, 0, 0, 0, 0, 0, 0, 0, 'W', false, '2024-07-01', 0, 0, 0, 0, 0, 0, 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - INSERT INTO total_registered.age (id_age, "17_yaers", "18-26_years", "27-30_years", "31-35_years", "36-40_years", "41-45_years", "51+_years", "all_M_W", registered, recording_date, "46-50_years", "17_yaers_percent", "18-26_years_percent", "27-30_years_percent", "31-35_years_percent", "36-40_years_percent", "41-45_years_percent", "46-50_years_percent", "51+_years_percent", recruitment_id) VALUES (5, 0, 0, 0, 0, 0, 0, 0, 'M', false, '2024-07-01', 0, 0, 0, 0, 0, 0, 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - INSERT INTO total_registered.age (id_age, "17_yaers", "18-26_years", "27-30_years", "31-35_years", "36-40_years", "41-45_years", "51+_years", "all_M_W", registered, recording_date, "46-50_years", "17_yaers_percent", "18-26_years_percent", "27-30_years_percent", "31-35_years_percent", "36-40_years_percent", "41-45_years_percent", "46-50_years_percent", "51+_years_percent", recruitment_id) VALUES (6, 0, 0, 0, 0, 0, 0, 0, 'ALL', false, '2024-07-01', 0, 0, 0, 0, 0, 0, 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - INSERT INTO total_registered.age (id_age, "17_yaers", "18-26_years", "27-30_years", "31-35_years", "36-40_years", "41-45_years", "51+_years", "all_M_W", registered, recording_date, "46-50_years", "17_yaers_percent", "18-26_years_percent", "27-30_years_percent", "31-35_years_percent", "36-40_years_percent", "41-45_years_percent", "46-50_years_percent", "51+_years_percent", recruitment_id) VALUES (1, 0, 0, 0, 0, 0, 0, 0, 'ALL', true, '2024-07-01', 0, 0, 0, 0, 0, 0, 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - INSERT INTO total_registered.age (id_age, "17_yaers", "18-26_years", "27-30_years", "31-35_years", "36-40_years", "41-45_years", "51+_years", "all_M_W", registered, recording_date, "46-50_years", "17_yaers_percent", "18-26_years_percent", "27-30_years_percent", "31-35_years_percent", "36-40_years_percent", "41-45_years_percent", "46-50_years_percent", "51+_years_percent", recruitment_id) VALUES (2, 0, 0, 0, 0, 0, 0, 0, 'M', true, '2024-07-01', 0, 0, 0, 0, 0, 0, 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - INSERT INTO total_registered.age (id_age, "17_yaers", "18-26_years", "27-30_years", "31-35_years", "36-40_years", "41-45_years", "51+_years", "all_M_W", registered, recording_date, "46-50_years", "17_yaers_percent", "18-26_years_percent", "27-30_years_percent", "31-35_years_percent", "36-40_years_percent", "41-45_years_percent", "46-50_years_percent", "51+_years_percent", recruitment_id) VALUES (3, 0, 0, 0, 0, 0, 0, 0, 'W', true, '2024-07-01', 0, 0, 0, 0, 0, 0, 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - - - - - - - INSERT INTO total_registered.busyness (id_busyness, study, work, not_work, "all_M_W", registered, recording_date, study_percent, work_percent, not_work_percent, recruitment_id) VALUES (2, 0, 0, 0, 'ALL', false, '2024-07-17', 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - INSERT INTO total_registered.busyness (id_busyness, study, work, not_work, "all_M_W", registered, recording_date, study_percent, work_percent, not_work_percent, recruitment_id) VALUES (5, 0, 0, 0, 'M', false, '2024-07-17', 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - INSERT INTO total_registered.busyness (id_busyness, study, work, not_work, "all_M_W", registered, recording_date, study_percent, work_percent, not_work_percent, recruitment_id) VALUES (6, 0, 0, 0, 'W', false, '2024-07-17', 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - INSERT INTO total_registered.busyness (id_busyness, study, work, not_work, "all_M_W", registered, recording_date, study_percent, work_percent, not_work_percent, recruitment_id) VALUES (1, 0, 0, 0, 'ALL', true, '2024-07-17', 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - INSERT INTO total_registered.busyness (id_busyness, study, work, not_work, "all_M_W", registered, recording_date, study_percent, work_percent, not_work_percent, recruitment_id) VALUES (3, 0, 0, 0, 'W', true, '2024-07-17', 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - INSERT INTO total_registered.busyness (id_busyness, study, work, not_work, "all_M_W", registered, recording_date, study_percent, work_percent, not_work_percent, recruitment_id) VALUES (4, 0, 0, 0, 'M', true, '2024-07-17', 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - - - - - - - INSERT INTO total_registered.child_minor (id_child_minor, no_child, "1_child", "2_child", "3_child", "4_more_child", "all_M_W", recording_date, no_child_percent, "1_child_percent", "2_child_percent", "3_child_percent", "4_more_child_percent", recruitment_id) VALUES (1, 0, 0, 0, 0, 0, 'W', '2024-07-01', 0, 0, 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - INSERT INTO total_registered.child_minor (id_child_minor, no_child, "1_child", "2_child", "3_child", "4_more_child", "all_M_W", recording_date, no_child_percent, "1_child_percent", "2_child_percent", "3_child_percent", "4_more_child_percent", recruitment_id) VALUES (2, 0, 0, 0, 0, 0, 'M', '2024-07-01', 0, 0, 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - INSERT INTO total_registered.child_minor (id_child_minor, no_child, "1_child", "2_child", "3_child", "4_more_child", "all_M_W", recording_date, no_child_percent, "1_child_percent", "2_child_percent", "3_child_percent", "4_more_child_percent", recruitment_id) VALUES (3, 0, 0, 0, 0, 0, 'ALL', '2024-07-01', 0, 0, 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - - - - - - INSERT INTO total_registered.driver_license (id_driver_license, nope, "A", "B", "C", "D", "E", "all_M_W", recording_date, nope_repcent, "A_repcent", "B_repcent", "C_repcent", "D_repcent", "E_repcent", recruitment_id) VALUES (1, 0, 0, 0, 0, 0, 0, 'W', '2024-07-01', 0, 0, 0, 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - INSERT INTO total_registered.driver_license (id_driver_license, nope, "A", "B", "C", "D", "E", "all_M_W", recording_date, nope_repcent, "A_repcent", "B_repcent", "C_repcent", "D_repcent", "E_repcent", recruitment_id) VALUES (2, 0, 0, 0, 0, 0, 0, 'M', '2024-07-01', 0, 0, 0, 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - INSERT INTO total_registered.driver_license (id_driver_license, nope, "A", "B", "C", "D", "E", "all_M_W", recording_date, nope_repcent, "A_repcent", "B_repcent", "C_repcent", "D_repcent", "E_repcent", recruitment_id) VALUES (3, 0, 0, 0, 0, 0, 0, 'ALL', '2024-07-01', 0, 0, 0, 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - - - - - INSERT INTO total_registered.education_level (id_education_level, higher, average, "all_M_W", only_general, no_data, recording_date, higher_percent, average_percent, only_general_percent, no_data_percent, recruitment_id) VALUES (1, 0, 0, 'ALL', 0, 0, '2024-07-18', 0, 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - INSERT INTO total_registered.education_level (id_education_level, higher, average, "all_M_W", only_general, no_data, recording_date, higher_percent, average_percent, only_general_percent, no_data_percent, recruitment_id) VALUES (2, 0, 0, 'M', 0, 0, '2024-07-18', 0, 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - INSERT INTO total_registered.education_level (id_education_level, higher, average, "all_M_W", only_general, no_data, recording_date, higher_percent, average_percent, only_general_percent, no_data_percent, recruitment_id) VALUES (3, 0, 0, 'W', 0, 0, '2024-07-18', 0, 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - - - - - - INSERT INTO total_registered.marital_status (id_marital_status, married, not_married, "all_M_W", recording_date, married_percent, not_married_percent, recruitment_id) VALUES (1, 0, 0, 'ALL', '2024-07-17', 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - INSERT INTO total_registered.marital_status (id_marital_status, married, not_married, "all_M_W", recording_date, married_percent, not_married_percent, recruitment_id) VALUES (3, 0, 0, 'M', '2024-07-17', 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - INSERT INTO total_registered.marital_status (id_marital_status, married, not_married, "all_M_W", recording_date, married_percent, not_married_percent, recruitment_id) VALUES (4, 0, 0, 'W', '2024-07-17', 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7'); - - - - - - INSERT INTO total_registered.reg_mil_cat (id_reg_mil_cat, first_reg_17, first_reg_18, returned_dep_liberty, "mil_spec_W", punished, received_citizenship, mil_reg, recording_date, first_reg_17_percent, first_reg_18_percent, returned_dep_liberty_percent, "mil_spec_W_percent", punished_percent, received_citizenship_percent, recruitment_id, testrecruitment_id, testmil_reg) VALUES (78, 0, 0, 0, 0, 0, 0, null, '2024-12-27', 0, 0, 0, 0, 0, 0, null, '48 ', 1); - INSERT INTO total_registered.reg_mil_cat (id_reg_mil_cat, first_reg_17, first_reg_18, returned_dep_liberty, "mil_spec_W", punished, received_citizenship, mil_reg, recording_date, first_reg_17_percent, first_reg_18_percent, returned_dep_liberty_percent, "mil_spec_W_percent", punished_percent, received_citizenship_percent, recruitment_id, testrecruitment_id, testmil_reg) VALUES (79, 0, 0, 0, 0, 0, 0, null, '2024-12-27', 0, 0, 0, 0, 0, 0, null, '62 ', 1); - INSERT INTO total_registered.reg_mil_cat (id_reg_mil_cat, first_reg_17, first_reg_18, returned_dep_liberty, "mil_spec_W", punished, received_citizenship, mil_reg, recording_date, first_reg_17_percent, first_reg_18_percent, returned_dep_liberty_percent, "mil_spec_W_percent", punished_percent, received_citizenship_percent, recruitment_id, testrecruitment_id, testmil_reg) VALUES (80, 0, 0, 0, 0, 0, 0, null, '2024-12-27', 0, 0, 0, 0, 0, 0, null, '65 ', 1); - INSERT INTO total_registered.reg_mil_cat (id_reg_mil_cat, first_reg_17, first_reg_18, returned_dep_liberty, "mil_spec_W", punished, received_citizenship, mil_reg, recording_date, first_reg_17_percent, first_reg_18_percent, returned_dep_liberty_percent, "mil_spec_W_percent", punished_percent, received_citizenship_percent, recruitment_id, testrecruitment_id, testmil_reg) VALUES (2, 0, 0, 0, 0, 0, 0, false, '2024-07-17', 0, 0, 0, 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7', null, null); - INSERT INTO total_registered.reg_mil_cat (id_reg_mil_cat, first_reg_17, first_reg_18, returned_dep_liberty, "mil_spec_W", punished, received_citizenship, mil_reg, recording_date, first_reg_17_percent, first_reg_18_percent, returned_dep_liberty_percent, "mil_spec_W_percent", punished_percent, received_citizenship_percent, recruitment_id, testrecruitment_id, testmil_reg) VALUES (1, 5300000, 18000000, 0, 600000, 0, 0, true, '2024-07-17', 22.7, 77.3, 0, 2.6, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7', null, null); - - - - - - INSERT INTO total_registered.removed_registry (removed_registry, deprivation_citizenship, age_limit, death, travel_abroad, living_abroad, other, recording_date, deprivation_citizen_percents, age_limit_percent, death_percent, travel_abroad_percent, living_abroad_percent, other_percent, recruitment_id, id_removed_registry, testrecruitment_id) VALUES (53000000, 0, 11000000, 21000000, 0, 0, 30000000, '2024-07-17', 0, 23.3, 47.9, 0, 0, 0.4, '76e40191-adc7-4f03-84a4-0c29c44961a7', 1, null); - INSERT INTO total_registered.removed_registry (removed_registry, deprivation_citizenship, age_limit, death, travel_abroad, living_abroad, other, recording_date, deprivation_citizen_percents, age_limit_percent, death_percent, travel_abroad_percent, living_abroad_percent, other_percent, recruitment_id, id_removed_registry, testrecruitment_id) VALUES (0, 0, 0, 0, 0, 0, 0, '2024-12-27', 0, 0, 0, 0, 0, 0, null, 40, '48 '); - INSERT INTO total_registered.removed_registry (removed_registry, deprivation_citizenship, age_limit, death, travel_abroad, living_abroad, other, recording_date, deprivation_citizen_percents, age_limit_percent, death_percent, travel_abroad_percent, living_abroad_percent, other_percent, recruitment_id, id_removed_registry, testrecruitment_id) VALUES (0, 0, 0, 0, 0, 0, 0, '2024-12-27', 0, 0, 0, 0, 0, 0, null, 41, '62 '); - INSERT INTO total_registered.removed_registry (removed_registry, deprivation_citizenship, age_limit, death, travel_abroad, living_abroad, other, recording_date, deprivation_citizen_percents, age_limit_percent, death_percent, travel_abroad_percent, living_abroad_percent, other_percent, recruitment_id, id_removed_registry, testrecruitment_id) VALUES (0, 0, 0, 0, 0, 0, 0, '2024-12-27', 0, 0, 0, 0, 0, 0, null, 42, '65 '); - - - - - - INSERT INTO total_registered.subpoenas (id_subpoena, subpoena, average_appeared, appeared, not_appeared, not_ap_good_reason, ap_not_required, electron, paper, restrictions_applied, introduced_measures, mil_reg, recording_date, appeared_percent, not_appeared_percent, not_ap_good_reason_percent, ap_not_required_percent, electron_percent, paper_percent, restrictions_applied_percent, introduced_measures_percent, recruitment_id, testrecruitment_id, testmil_reg) VALUES (1, 2200000, 4, 1100000, 510000, 490000, 100000, 1800000, 400000, 550000, 450000, true, '2024-07-17', 50, 27, 23, 5, 25, 18, 25, 81, '76e40191-adc7-4f03-84a4-0c29c44961a7', null, null); - INSERT INTO total_registered.subpoenas (id_subpoena, subpoena, average_appeared, appeared, not_appeared, not_ap_good_reason, ap_not_required, electron, paper, restrictions_applied, introduced_measures, mil_reg, recording_date, appeared_percent, not_appeared_percent, not_ap_good_reason_percent, ap_not_required_percent, electron_percent, paper_percent, restrictions_applied_percent, introduced_measures_percent, recruitment_id, testrecruitment_id, testmil_reg) VALUES (123, 0, null, 0, 0, 0, 0, 0, 0, 0, 0, null, '2024-12-27', 0, 0, 0, 0, 0, 0, 0, 0, null, '48 ', 1); - INSERT INTO total_registered.subpoenas (id_subpoena, subpoena, average_appeared, appeared, not_appeared, not_ap_good_reason, ap_not_required, electron, paper, restrictions_applied, introduced_measures, mil_reg, recording_date, appeared_percent, not_appeared_percent, not_ap_good_reason_percent, ap_not_required_percent, electron_percent, paper_percent, restrictions_applied_percent, introduced_measures_percent, recruitment_id, testrecruitment_id, testmil_reg) VALUES (124, 0, null, 0, 0, 0, 0, 0, 0, 0, 0, null, '2024-12-27', 0, 0, 0, 0, 0, 0, 0, 0, null, '62 ', 1); - INSERT INTO total_registered.subpoenas (id_subpoena, subpoena, average_appeared, appeared, not_appeared, not_ap_good_reason, ap_not_required, electron, paper, restrictions_applied, introduced_measures, mil_reg, recording_date, appeared_percent, not_appeared_percent, not_ap_good_reason_percent, ap_not_required_percent, electron_percent, paper_percent, restrictions_applied_percent, introduced_measures_percent, recruitment_id, testrecruitment_id, testmil_reg) VALUES (125, 0, null, 0, 0, 0, 0, 0, 0, 0, 0, null, '2024-12-27', 0, 0, 0, 0, 0, 0, 0, 0, null, '65 ', 1); - INSERT INTO total_registered.subpoenas (id_subpoena, subpoena, average_appeared, appeared, not_appeared, not_ap_good_reason, ap_not_required, electron, paper, restrictions_applied, introduced_measures, mil_reg, recording_date, appeared_percent, not_appeared_percent, not_ap_good_reason_percent, ap_not_required_percent, electron_percent, paper_percent, restrictions_applied_percent, introduced_measures_percent, recruitment_id, testrecruitment_id, testmil_reg) VALUES (2, 4000000, 4, 2000000, 100000, 90000, 10000, 900000, 40000, 55000, 45000, false, '2024-07-19', 51, 26, 22, 4, 23, 21, 24, 77, '76e40191-adc7-4f03-84a4-0c29c44961a7', null, null); - - - - - - - INSERT INTO main_dashboard.appeals (id_appeal, total_appeals, resolved, average_consideration, average_rating, average_to_face, "average_EPGU", recording_date, average_to_face_percent, "average_EPGU_percent", recruitment_id, testrecruitment_id) VALUES (1, 1200000, 0, 3, 0, 0, 0, '2024-07-17', 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7', null); - INSERT INTO main_dashboard.appeals (id_appeal, total_appeals, resolved, average_consideration, average_rating, average_to_face, "average_EPGU", recording_date, average_to_face_percent, "average_EPGU_percent", recruitment_id, testrecruitment_id) VALUES (54, 0, 0, null, 0, 0, 0, '2024-12-27', 0, 0, null, '48 '); - INSERT INTO main_dashboard.appeals (id_appeal, total_appeals, resolved, average_consideration, average_rating, average_to_face, "average_EPGU", recording_date, average_to_face_percent, "average_EPGU_percent", recruitment_id, testrecruitment_id) VALUES (55, 0, 0, null, 0, 0, 0, '2024-12-27', 0, 0, null, '62 '); - INSERT INTO main_dashboard.appeals (id_appeal, total_appeals, resolved, average_consideration, average_rating, average_to_face, "average_EPGU", recording_date, average_to_face_percent, "average_EPGU_percent", recruitment_id, testrecruitment_id) VALUES (56, 0, 0, null, 0, 0, 0, '2024-12-27', 0, 0, null, '65 '); - INSERT INTO main_dashboard.appeals (id_appeal, total_appeals, resolved, average_consideration, average_rating, average_to_face, "average_EPGU", recording_date, average_to_face_percent, "average_EPGU_percent", recruitment_id, testrecruitment_id) VALUES (57, 0, 0, null, 0, 0, 0, '2024-12-27', 0, 0, null, '48 '); - INSERT INTO main_dashboard.appeals (id_appeal, total_appeals, resolved, average_consideration, average_rating, average_to_face, "average_EPGU", recording_date, average_to_face_percent, "average_EPGU_percent", recruitment_id, testrecruitment_id) VALUES (58, 0, 0, null, 0, 0, 0, '2024-12-27', 0, 0, null, '62 '); - INSERT INTO main_dashboard.appeals (id_appeal, total_appeals, resolved, average_consideration, average_rating, average_to_face, "average_EPGU", recording_date, average_to_face_percent, "average_EPGU_percent", recruitment_id, testrecruitment_id) VALUES (59, 0, 0, null, 0, 0, 0, '2024-12-27', 0, 0, null, '65 '); - - - - - - INSERT INTO main_dashboard.recruitment_campaign (id_recruitment_campaign, new_recruits, subpoenas_sent, appeared_on_subpoenas, not_appeared_on_subpoenas, postponement_have_right, postponement_granted, recording_date, spring_autumn, appeared_on_subpoenas_percent, not_appeared_on_subpoenas_percent, postponement_have_right_percent, postponement_granted_percent, recruitment_id, testrecruitment_id, testspring_autumn) VALUES (130, 0, 0, 0, 0, 0, 0, '2024-12-27', null, 0, 0, 0, 0, null, '48 ', 'Осень '); - INSERT INTO main_dashboard.recruitment_campaign (id_recruitment_campaign, new_recruits, subpoenas_sent, appeared_on_subpoenas, not_appeared_on_subpoenas, postponement_have_right, postponement_granted, recording_date, spring_autumn, appeared_on_subpoenas_percent, not_appeared_on_subpoenas_percent, postponement_have_right_percent, postponement_granted_percent, recruitment_id, testrecruitment_id, testspring_autumn) VALUES (1, 0, 476000, 415000, 50000, 0, 0, '2024-07-17', 'Весна', 87.4, 10.5, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7', null, null); - INSERT INTO main_dashboard.recruitment_campaign (id_recruitment_campaign, new_recruits, subpoenas_sent, appeared_on_subpoenas, not_appeared_on_subpoenas, postponement_have_right, postponement_granted, recording_date, spring_autumn, appeared_on_subpoenas_percent, not_appeared_on_subpoenas_percent, postponement_have_right_percent, postponement_granted_percent, recruitment_id, testrecruitment_id, testspring_autumn) VALUES (2, 0, 482000, 420000, 60000, 0, 0, '2024-07-22', 'Осень', 87.1, 12.4, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7', null, null); - INSERT INTO main_dashboard.recruitment_campaign (id_recruitment_campaign, new_recruits, subpoenas_sent, appeared_on_subpoenas, not_appeared_on_subpoenas, postponement_have_right, postponement_granted, recording_date, spring_autumn, appeared_on_subpoenas_percent, not_appeared_on_subpoenas_percent, postponement_have_right_percent, postponement_granted_percent, recruitment_id, testrecruitment_id, testspring_autumn) VALUES (131, 0, 0, 0, 0, 0, 0, '2024-12-27', null, 0, 0, 0, 0, null, '62 ', 'Осень '); - INSERT INTO main_dashboard.recruitment_campaign (id_recruitment_campaign, new_recruits, subpoenas_sent, appeared_on_subpoenas, not_appeared_on_subpoenas, postponement_have_right, postponement_granted, recording_date, spring_autumn, appeared_on_subpoenas_percent, not_appeared_on_subpoenas_percent, postponement_have_right_percent, postponement_granted_percent, recruitment_id, testrecruitment_id, testspring_autumn) VALUES (132, 0, 0, 0, 0, 0, 0, '2024-12-27', null, 0, 0, 0, 0, null, '65 ', 'Осень '); - - - - - - INSERT INTO main_dashboard.total_registered (id_total_registered, total_registered, "total_registered_M", "total_registered_W", mobilization_criterion, volunteer_criterion, contract_criterion, recording_date, mobilization_criterion_percent, volunteer_criterion_percent, contract_criterion_percent, recruitment_id, testrecruitment_id) VALUES (2, 23400000, null, null, 14300000, 5400000, 381, '2024-07-15', null, null, null, null, null); - INSERT INTO main_dashboard.total_registered (id_total_registered, total_registered, "total_registered_M", "total_registered_W", mobilization_criterion, volunteer_criterion, contract_criterion, recording_date, mobilization_criterion_percent, volunteer_criterion_percent, contract_criterion_percent, recruitment_id, testrecruitment_id) VALUES (4, 2360, null, null, 1450, 560, 383, '2024-07-17', null, null, null, null, null); - INSERT INTO main_dashboard.total_registered (id_total_registered, total_registered, "total_registered_M", "total_registered_W", mobilization_criterion, volunteer_criterion, contract_criterion, recording_date, mobilization_criterion_percent, volunteer_criterion_percent, contract_criterion_percent, recruitment_id, testrecruitment_id) VALUES (3, 33, 23, 10, 1440, 550, 382, '2024-07-16', null, null, null, null, null); - INSERT INTO main_dashboard.total_registered (id_total_registered, total_registered, "total_registered_M", "total_registered_W", mobilization_criterion, volunteer_criterion, contract_criterion, recording_date, mobilization_criterion_percent, volunteer_criterion_percent, contract_criterion_percent, recruitment_id, testrecruitment_id) VALUES (52, 0, 0, 0, 0, 0, 0, '2024-12-27', 0, 0, 0, null, '48 '); - INSERT INTO main_dashboard.total_registered (id_total_registered, total_registered, "total_registered_M", "total_registered_W", mobilization_criterion, volunteer_criterion, contract_criterion, recording_date, mobilization_criterion_percent, volunteer_criterion_percent, contract_criterion_percent, recruitment_id, testrecruitment_id) VALUES (53, 0, 0, 0, 0, 0, 0, '2024-12-27', 0, 0, 0, null, '62 '); - INSERT INTO main_dashboard.total_registered (id_total_registered, total_registered, "total_registered_M", "total_registered_W", mobilization_criterion, volunteer_criterion, contract_criterion, recording_date, mobilization_criterion_percent, volunteer_criterion_percent, contract_criterion_percent, recruitment_id, testrecruitment_id) VALUES (54, 0, 0, 0, 0, 0, 0, '2024-12-27', 0, 0, 0, null, '65 '); - INSERT INTO main_dashboard.total_registered (id_total_registered, total_registered, "total_registered_M", "total_registered_W", mobilization_criterion, volunteer_criterion, contract_criterion, recording_date, mobilization_criterion_percent, volunteer_criterion_percent, contract_criterion_percent, recruitment_id, testrecruitment_id) VALUES (1, 23300000, 20000000, 3300000, 0, 0, 0, '2024-07-14', 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7', null); - - - - - - INSERT INTO main_dashboard.waiting_registration (id_waiting_registration, waiting_registration, "waiting_registration_M", "waiting_registration_W", mobilization_criterion, volunteer_criterion, contract_criterion, recording_date, waiting_registration_percent, mobilization_criterion_percent, volunteer_criterion_percent, contract_criterion_percent, recruitment_id, testrecruitment_id) VALUES (1, 1300000, 1100000, 200000, 0, 0, 0, '2024-08-20', 52, 0, 0, 0, '76e40191-adc7-4f03-84a4-0c29c44961a7', null); - INSERT INTO main_dashboard.waiting_registration (id_waiting_registration, waiting_registration, "waiting_registration_M", "waiting_registration_W", mobilization_criterion, volunteer_criterion, contract_criterion, recording_date, waiting_registration_percent, mobilization_criterion_percent, volunteer_criterion_percent, contract_criterion_percent, recruitment_id, testrecruitment_id) VALUES (69, 0, 0, 0, 0, 0, 0, '2024-12-27', null, 0, 0, 0, null, '48 '); - INSERT INTO main_dashboard.waiting_registration (id_waiting_registration, waiting_registration, "waiting_registration_M", "waiting_registration_W", mobilization_criterion, volunteer_criterion, contract_criterion, recording_date, waiting_registration_percent, mobilization_criterion_percent, volunteer_criterion_percent, contract_criterion_percent, recruitment_id, testrecruitment_id) VALUES (70, 0, 0, 0, 0, 0, 0, '2024-12-27', null, 0, 0, 0, null, '62 '); - INSERT INTO main_dashboard.waiting_registration (id_waiting_registration, waiting_registration, "waiting_registration_M", "waiting_registration_W", mobilization_criterion, volunteer_criterion, contract_criterion, recording_date, waiting_registration_percent, mobilization_criterion_percent, volunteer_criterion_percent, contract_criterion_percent, recruitment_id, testrecruitment_id) VALUES (71, 0, 0, 0, 0, 0, 0, '2024-12-27', null, 0, 0, 0, null, '65 '); - - - \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-08-28--11-drop-column-testrecruitment_id.xml b/backend/src/main/resources/config/v_1.0/2024-08-28--11-drop-column-testrecruitment_id.xml deleted file mode 100644 index af338ed1..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-08-28--11-drop-column-testrecruitment_id.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-08-28--12-drop-column-mil_reg.xml b/backend/src/main/resources/config/v_1.0/2024-08-28--12-drop-column-mil_reg.xml deleted file mode 100644 index 3a6b66ff..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-08-28--12-drop-column-mil_reg.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-08-28--13-reconfigure-fk-recruitment_id-pub_recruitment.id.xml b/backend/src/main/resources/config/v_1.0/2024-08-28--13-reconfigure-fk-recruitment_id-pub_recruitment.id.xml deleted file mode 100644 index 8e5ea659..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-08-28--13-reconfigure-fk-recruitment_id-pub_recruitment.id.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-16--01-add-role.xml b/backend/src/main/resources/config/v_1.0/2024-10-16--01-add-role.xml new file mode 100644 index 00000000..608c86bd --- /dev/null +++ b/backend/src/main/resources/config/v_1.0/2024-10-16--01-add-role.xml @@ -0,0 +1,33 @@ + + + + + + CREATE ROLE "ervu-dashboard" WITH + LOGIN + NOSUPERUSER + INHERIT + NOCREATEDB + NOCREATEROLE + NOREPLICATION + PASSWORD 'ervu-dashboard'; + + + + + + CREATE ROLE postgres WITH + LOGIN + NOSUPERUSER + INHERIT + NOCREATEDB + NOCREATEROLE + NOREPLICATION + PASSWORD 'postgres'; + + + + \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-16--02-core-create-schemes.xml b/backend/src/main/resources/config/v_1.0/2024-10-16--02-core-create-schemes.xml new file mode 100644 index 00000000..de29246f --- /dev/null +++ b/backend/src/main/resources/config/v_1.0/2024-10-16--02-core-create-schemes.xml @@ -0,0 +1,119 @@ + + + + + + CREATE SCHEMA IF NOT EXISTS public; + + + + + + ALTER + SCHEMA public OWNER TO postgres + + + + + + GRANT + ALL + ON SCHEMA public TO "ervu-dashboard"; + + + + + + CREATE SCHEMA appeals; + + + + + + ALTER + SCHEMA appeals OWNER TO "ervu-dashboard"; + + + + + + CREATE SCHEMA IF NOT EXISTS ervu_dashboard; + + + + + + ALTER + SCHEMA ervu_dashboard OWNER TO "ervu-dashboard"; + + + + + + CREATE SCHEMA main_dashboard; + + + + + + ALTER + SCHEMA main_dashboard OWNER TO "ervu-dashboard"; + + + + + + CREATE SCHEMA ratings; + + + + + + ALTER + SCHEMA ratings OWNER TO "ervu-dashboard"; + + + + + + CREATE SCHEMA recruitment_campaign; + + + + + + ALTER + SCHEMA recruitment_campaign OWNER TO "ervu-dashboard"; + + + + + + CREATE SCHEMA space; + + + + + + ALTER + SCHEMA space OWNER TO "ervu-dashboard"; + + + + + + CREATE SCHEMA total_registered; + + + + + + ALTER + SCHEMA total_registered OWNER TO "ervu-dashboard"; + + + + \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-16--03-add-ext-uuid.xml b/backend/src/main/resources/config/v_1.0/2024-10-16--03-add-ext-uuid.xml new file mode 100644 index 00000000..56024f74 --- /dev/null +++ b/backend/src/main/resources/config/v_1.0/2024-10-16--03-add-ext-uuid.xml @@ -0,0 +1,25 @@ + + + + + + CREATE + EXTENSION IF NOT EXISTS "uuid-ossp" WITH SCHEMA ervu_dashboard; + + + + + + CREATE FUNCTION public.uuid_generate_v4() RETURNS uuid + LANGUAGE c STRICT PARALLEL SAFE AS '$libdir/uuid-ossp', 'uuid_generate_v4'; + + + + + + ALTER FUNCTION public.uuid_generate_v4() OWNER TO postgres; + + + \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-16--04-add-obj-type.xml b/backend/src/main/resources/config/v_1.0/2024-10-16--04-add-obj-type.xml new file mode 100644 index 00000000..1a81ad51 --- /dev/null +++ b/backend/src/main/resources/config/v_1.0/2024-10-16--04-add-obj-type.xml @@ -0,0 +1,29 @@ + + + + + + CREATE TYPE public.employer_category_type AS ENUM ( + 'fl', + 'ul', + 'kfh', + 'ip' + ); + + + + + + CREATE TYPE public.type_property_type AS ENUM ( + 'realty', + 'ground_transportation', + 'air_vehicles', + 'water_vehicles' + ); + + + + \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-16--05-create-appeals.xml b/backend/src/main/resources/config/v_1.0/2024-10-16--05-create-appeals.xml new file mode 100644 index 00000000..56b403b9 --- /dev/null +++ b/backend/src/main/resources/config/v_1.0/2024-10-16--05-create-appeals.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-16--06-create-ervu_dashboard.xml b/backend/src/main/resources/config/v_1.0/2024-10-16--06-create-ervu_dashboard.xml new file mode 100644 index 00000000..9fd9b908 --- /dev/null +++ b/backend/src/main/resources/config/v_1.0/2024-10-16--06-create-ervu_dashboard.xml @@ -0,0 +1,564 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-16--07-create-main_dashboard.xml b/backend/src/main/resources/config/v_1.0/2024-10-16--07-create-main_dashboard.xml new file mode 100644 index 00000000..f4abb497 --- /dev/null +++ b/backend/src/main/resources/config/v_1.0/2024-10-16--07-create-main_dashboard.xml @@ -0,0 +1,133 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-17--08-create-public.xml b/backend/src/main/resources/config/v_1.0/2024-10-17--08-create-public.xml new file mode 100644 index 00000000..95deb032 --- /dev/null +++ b/backend/src/main/resources/config/v_1.0/2024-10-17--08-create-public.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-17--09-create-ratings.xml b/backend/src/main/resources/config/v_1.0/2024-10-17--09-create-ratings.xml new file mode 100644 index 00000000..2576f58e --- /dev/null +++ b/backend/src/main/resources/config/v_1.0/2024-10-17--09-create-ratings.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-17--10-create-recruitment_campaign.xml b/backend/src/main/resources/config/v_1.0/2024-10-17--10-create-recruitment_campaign.xml new file mode 100644 index 00000000..ad5ed00e --- /dev/null +++ b/backend/src/main/resources/config/v_1.0/2024-10-17--10-create-recruitment_campaign.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-17--11-create-space.xml b/backend/src/main/resources/config/v_1.0/2024-10-17--11-create-space.xml new file mode 100644 index 00000000..439adbf3 --- /dev/null +++ b/backend/src/main/resources/config/v_1.0/2024-10-17--11-create-space.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-17--12-create-total_registered.xml b/backend/src/main/resources/config/v_1.0/2024-10-17--12-create-total_registered.xml new file mode 100644 index 00000000..6b0fca94 --- /dev/null +++ b/backend/src/main/resources/config/v_1.0/2024-10-17--12-create-total_registered.xml @@ -0,0 +1,303 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-17--13-add-indexes.xml b/backend/src/main/resources/config/v_1.0/2024-10-17--13-add-indexes.xml new file mode 100644 index 00000000..ecdf40fd --- /dev/null +++ b/backend/src/main/resources/config/v_1.0/2024-10-17--13-add-indexes.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/backend/src/main/resources/config/v_1.0/2024-10-17--14-add-fk.xml b/backend/src/main/resources/config/v_1.0/2024-10-17--14-add-fk.xml new file mode 100644 index 00000000..bc37b25f --- /dev/null +++ b/backend/src/main/resources/config/v_1.0/2024-10-17--14-add-fk.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-17--15-insert-data-in-ervu_dashboard.xml b/backend/src/main/resources/config/v_1.0/2024-10-17--15-insert-data-in-ervu_dashboard.xml new file mode 100644 index 00000000..792cedc3 --- /dev/null +++ b/backend/src/main/resources/config/v_1.0/2024-10-17--15-insert-data-in-ervu_dashboard.xml @@ -0,0 +1,29 @@ + + + + + + INSERT INTO ervu_dashboard.pub_recruitment (idm_id, parent_id, military_code, shortname, + fullname, code, id, sort) + VALUES ('0340dea4-bf2d-4591-be09-987f7e79d0b4', '76e40191-adc7-4f03-84a4-0c29c44961a7', + '00012345', 'Сахалинская область', + 'Военный комиссариат Сахалинской области', '65', + '6b56f46a-16e7-4c0f-83a8-05fbddf2e6cb', '4'), + ('3f1d6fb7-c9a8-4692-b292-e7a3732c1aff', '76e40191-adc7-4f03-84a4-0c29c44961a7', + '08400325', 'Рязанская область', + 'Военный комиссариат Рязанской области, г. Рязань', '62', + 'd2e839ef-933c-48df-9a3a-ac1c00663154', '3'), + ('08ce08c9-3595-4c36-bd14-8deda575d822', null, '000000010', 'Российская Федерация', + 'Российская Федерация', '00', + '76e40191-adc7-4f03-84a4-0c29c44961a7', '1'), + ('b16c8334-07a5-43e0-8c6f-bc07830fb096', '76e40191-adc7-4f03-84a4-0c29c44961a7', + '07706878', 'Республика Марий Эл', + 'Военный комиссариат Республики Марий Эл', '12', + '794ed0fa-a25b-4858-b89e-815bb391f2b5', '2'); + + + + \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/changelog-v1.0.xml b/backend/src/main/resources/config/v_1.0/changelog-v1.0.xml index cb1c2e59..ae03fc1e 100644 --- a/backend/src/main/resources/config/v_1.0/changelog-v1.0.xml +++ b/backend/src/main/resources/config/v_1.0/changelog-v1.0.xml @@ -5,4 +5,21 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd"> + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/src/main/resources/liquibase.properties b/backend/src/main/resources/liquibase.properties deleted file mode 100644 index a9378d61..00000000 --- a/backend/src/main/resources/liquibase.properties +++ /dev/null @@ -1,6 +0,0 @@ -changelog-file=config/changelog-master.xml -driver=org.postgresql.Driver -url=jdbc:postgresql://localhost:5432/test -username=root -password=root -defaultSchemaName=public From e9eece533dd004531a514d994d530828989e686e Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Fri, 18 Oct 2024 13:37:32 +0300 Subject: [PATCH 21/49] SUPPORT-8617: change patches and added sql file --- .../config/sql_files/ervu-dashboard-copy.sql | 5631 +++++++++++++++++ .../2024-10-16--02-core-create-schemes.xml | 119 - .../v_1.0/2024-10-16--03-add-ext-uuid.xml | 25 - .../v_1.0/2024-10-16--04-add-obj-type.xml | 29 - .../v_1.0/2024-10-16--05-create-appeals.xml | 106 - .../2024-10-16--06-create-ervu_dashboard.xml | 564 -- .../2024-10-16--07-create-main_dashboard.xml | 133 - .../v_1.0/2024-10-17--08-create-public.xml | 82 - .../v_1.0/2024-10-17--09-create-ratings.xml | 72 - ...-10-17--10-create-recruitment_campaign.xml | 95 - .../v_1.0/2024-10-17--11-create-space.xml | 74 - ...2024-10-17--12-create-total_registered.xml | 303 - .../v_1.0/2024-10-17--13-add-indexes.xml | 116 - .../config/v_1.0/2024-10-17--14-add-fk.xml | 74 - ...xml => 20241016-SUPPORT-8617-add-role.xml} | 4 +- ...RT-8617-insert-data-in-ervu_dashboard.xml} | 2 +- ...17-patch-from-dump-ervu_dashboard_copy.xml | 9 + .../resources/config/v_1.0/changelog-v1.0.xml | 22 +- 18 files changed, 5648 insertions(+), 1812 deletions(-) create mode 100644 backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql delete mode 100644 backend/src/main/resources/config/v_1.0/2024-10-16--02-core-create-schemes.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-10-16--03-add-ext-uuid.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-10-16--04-add-obj-type.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-10-16--05-create-appeals.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-10-16--06-create-ervu_dashboard.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-10-16--07-create-main_dashboard.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-10-17--08-create-public.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-10-17--09-create-ratings.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-10-17--10-create-recruitment_campaign.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-10-17--11-create-space.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-10-17--12-create-total_registered.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-10-17--13-add-indexes.xml delete mode 100644 backend/src/main/resources/config/v_1.0/2024-10-17--14-add-fk.xml rename backend/src/main/resources/config/v_1.0/{2024-10-16--01-add-role.xml => 20241016-SUPPORT-8617-add-role.xml} (85%) rename backend/src/main/resources/config/v_1.0/{2024-10-17--15-insert-data-in-ervu_dashboard.xml => 20241017-SUPPORT-8617-insert-data-in-ervu_dashboard.xml} (95%) create mode 100644 backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-patch-from-dump-ervu_dashboard_copy.xml diff --git a/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql b/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql new file mode 100644 index 00000000..73452c29 --- /dev/null +++ b/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql @@ -0,0 +1,5631 @@ +SET +statement_timeout = 0; +SET +lock_timeout = 0; +SET +idle_in_transaction_session_timeout = 0; +SET +client_encoding = 'UTF8'; +SET +standard_conforming_strings = on; +SELECT pg_catalog.set_config('search_path', '', false); +SET +check_function_bodies = false; +SET +xmloption = content; +SET +client_min_messages = warning; +SET +row_security = off; + + + +CREATE SCHEMA IF NOT EXISTS appeals; + + +ALTER +SCHEMA appeals OWNER TO "ervu-dashboard"; + + + +COMMENT +ON SCHEMA appeals IS 'Обжалования'; + + + +CREATE SCHEMA IF NOT EXISTS ervu_dashboard; + + +ALTER +SCHEMA ervu_dashboard OWNER TO "ervu-dashboard"; + + + +CREATE SCHEMA IF NOT EXISTS main_dashboard; + + +ALTER +SCHEMA main_dashboard OWNER TO "ervu-dashboard"; + + + +CREATE SCHEMA IF NOT EXISTS ratings; + + +ALTER +SCHEMA ratings OWNER TO "ervu-dashboard"; + + + +CREATE SCHEMA IF NOT EXISTS recruitment_campaign; + + +ALTER +SCHEMA recruitment_campaign OWNER TO "ervu-dashboard"; + + + +CREATE SCHEMA IF NOT EXISTS space; + + +ALTER +SCHEMA space OWNER TO "ervu-dashboard"; + + + +CREATE SCHEMA IF NOT EXISTS total_registered; + + +ALTER +SCHEMA total_registered OWNER TO "ervu-dashboard"; + + + +CREATE +EXTENSION IF NOT EXISTS "uuid-ossp" WITH SCHEMA ervu_dashboard; + + + +COMMENT +ON EXTENSION "uuid-ossp" IS 'generate universally unique identifiers (UUIDs)'; + + + +CREATE TYPE public.employer_category_type AS ENUM ( + 'fl', + 'ul', + 'kfh', + 'ip' +); + + +ALTER TYPE public.employer_category_type OWNER TO postgres; + + + +CREATE TYPE public.type_property_type AS ENUM ( + 'realty', + 'ground_transportation', + 'air_vehicles', + 'water_vehicles' +); + + +ALTER TYPE public.type_property_type OWNER TO postgres; + + + +CREATE FUNCTION public.uuid_generate_v4() RETURNS uuid + LANGUAGE c STRICT PARALLEL SAFE + AS '$libdir/uuid-ossp', 'uuid_generate_v4'; + + +ALTER FUNCTION public.uuid_generate_v4() OWNER TO postgres; + +SET +default_tablespace = ''; + +SET +default_table_access_method = heap; + + + +CREATE TABLE IF NOT EXISTS appeals.main_profile +( + id_main_profile + bigint + NOT + NULL, + gender + text, + age + text, + child_min_18 + text, + education + text, + employment + text, + recording_date + date + DEFAULT + now +( +), + recruitment_id character +( + 36 +) + ); + + +ALTER TABLE IF EXISTS appeals.main_profile OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE appeals.main_profile IS 'Основной профиль уровень РФ'; + + + +COMMENT +ON COLUMN appeals.main_profile.gender IS 'Пол'; + + + +COMMENT +ON COLUMN appeals.main_profile.age IS 'Возраст'; + + + +COMMENT +ON COLUMN appeals.main_profile.child_min_18 IS 'Дети до 18 лет'; + + + +COMMENT +ON COLUMN appeals.main_profile.education IS 'Образование'; + + + +COMMENT +ON COLUMN appeals.main_profile.employment IS 'Занятость'; + + + +COMMENT +ON COLUMN appeals.main_profile.recording_date IS 'Дата записи'; + + + +CREATE SEQUENCE appeals.main_profile_id_main_profile_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS appeals.main_profile_id_main_profile_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE appeals.main_profile_id_main_profile_seq OWNED BY appeals.main_profile.id_main_profile; + + + +CREATE TABLE IF NOT EXISTS appeals.reasons_appeal +( + id_reasons_appeal + bigint + NOT + NULL, + appeal + numeric, + incorrect_inf + numeric, + no_data + numeric, + other + numeric, + recording_date + date + DEFAULT + now +( +), + incorrect_inf_percent numeric, + no_data_percent numeric, + other_percent numeric, + recruitment_id character +( + 36 +) + ); + + +ALTER TABLE IF EXISTS appeals.reasons_appeal OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE appeals.reasons_appeal IS 'Причины обжалования уровень РФ'; + + + +COMMENT +ON COLUMN appeals.reasons_appeal.appeal IS 'Обжалования'; + + + +COMMENT +ON COLUMN appeals.reasons_appeal.incorrect_inf IS 'Некорректные сведения'; + + + +COMMENT +ON COLUMN appeals.reasons_appeal.no_data IS 'Нет данных'; + + + +COMMENT +ON COLUMN appeals.reasons_appeal.other IS 'Прочее'; + + + +COMMENT +ON COLUMN appeals.reasons_appeal.recording_date IS 'Дата записи'; + + + +COMMENT +ON COLUMN appeals.reasons_appeal.incorrect_inf_percent IS 'Некорректные сведения в процентах'; + + + +COMMENT +ON COLUMN appeals.reasons_appeal.no_data_percent IS 'Нет данных в процентах'; + + + +COMMENT +ON COLUMN appeals.reasons_appeal.other_percent IS 'Прочее в процентах'; + + + +CREATE SEQUENCE appeals.reasons_appeal_id_reasons_appeal_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS appeals.reasons_appeal_id_reasons_appeal_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE appeals.reasons_appeal_id_reasons_appeal_seq OWNED BY appeals.reasons_appeal.id_reasons_appeal; + + + +CREATE TABLE IF NOT EXISTS appeals.review_rating +( + id_review_rating + bigint + NOT + NULL, + speed + numeric, + rating + numeric, + recording_date + date + DEFAULT + now +( +), + id_region bigint, + recruitment_id uuid + ); + + +ALTER TABLE IF EXISTS appeals.review_rating OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE appeals.review_rating IS 'Рейтинг рассмотрения жалоб уровень РФ'; + + + +COMMENT +ON COLUMN appeals.review_rating.speed IS 'Скорость рассмотрения'; + + + +COMMENT +ON COLUMN appeals.review_rating.rating IS 'Оценка удовлетворенности'; + + + +COMMENT +ON COLUMN appeals.review_rating.recording_date IS 'Дата записи'; + + + +CREATE SEQUENCE appeals.review_rating_id_review_rating_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS appeals.review_rating_id_review_rating_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE appeals.review_rating_id_review_rating_seq OWNED BY appeals.review_rating.id_review_rating; + + + +CREATE TABLE IF NOT EXISTS appeals.topic_appeal +( + id_topic_appeal + bigint + NOT + NULL, + registration + numeric, + sabpoena + numeric, + appear + numeric, + temporary_measures + numeric, + recording_date + date + DEFAULT + now +( +), + registration_percent numeric, + sabpoena_percent numeric, + appear_percent numeric, + temporary_measures_percent numeric, + recruitment_id character +( + 36 +) + ); + + +ALTER TABLE IF EXISTS appeals.topic_appeal OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE appeals.topic_appeal IS 'Тема обжалования уровень РФ'; + + + +COMMENT +ON COLUMN appeals.topic_appeal.registration IS 'Тема обжалования постановка на учет'; + + + +COMMENT +ON COLUMN appeals.topic_appeal.sabpoena IS 'Тема обжалования повестки'; + + + +COMMENT +ON COLUMN appeals.topic_appeal.appear IS 'Тема обжалования явка'; + + + +COMMENT +ON COLUMN appeals.topic_appeal.temporary_measures IS 'Тема обжалования временные меры'; + + + +COMMENT +ON COLUMN appeals.topic_appeal.recording_date IS 'Дата записи'; + + + +COMMENT +ON COLUMN appeals.topic_appeal.registration_percent IS 'Тема обжалования постановка на учет в процентах'; + + + +COMMENT +ON COLUMN appeals.topic_appeal.sabpoena_percent IS 'Тема обжалования повестки в процентах'; + + + +COMMENT +ON COLUMN appeals.topic_appeal.appear_percent IS 'Тема обжалования явка в процентах'; + + + +COMMENT +ON COLUMN appeals.topic_appeal.temporary_measures_percent IS 'Тема обжалования временные меры в процентах'; + + + +CREATE SEQUENCE appeals.topic_appeal_id_topic_appeal_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS appeals.topic_appeal_id_topic_appeal_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE appeals.topic_appeal_id_topic_appeal_seq OWNED BY appeals.topic_appeal.id_topic_appeal; + + + +CREATE TABLE IF NOT EXISTS ervu_dashboard.citizen +( + residence + character + varying, + is_registered + character + varying, + passport_series + character + varying, + passport_number + character + varying, + phone + character + varying, + medical_requirements + character + varying, + deferment_liberation + character + varying, + gender + character + varying, + marital_status + character + varying, + education + character + varying, + employment + character + varying, + reason_registration + character + varying, + driver_license + character + varying, + disability_group + character + varying, + dispensary_registration_code + character + varying, + region_birth + character + varying, + city_birth + character + varying, + right_deferment + boolean, + took_break + boolean, + medic + boolean, + sports_category + boolean, + tractor_license + boolean, + is_wanted + boolean, + is_in_prison + boolean, + acquired_citizenship + boolean, + urgent_service + boolean, + contract_service + boolean, + mobilization + boolean, + full_name + character + varying, + last_name + character + varying, + first_name + character + varying, + middle_name + character + varying, + age + numeric, + birth_place + character + varying, + number_children + numeric, + birth_date + date, + recruit_id + uuid + NOT + NULL, + recruitment_id + uuid, + issue_date + date, + number_children_18_old + numeric +); + + +ALTER TABLE IF EXISTS ervu_dashboard.citizen OWNER TO "ervu-dashboard"; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.residence IS 'Адрес места жительства'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.is_registered IS 'Сведения о воинском учёте'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.passport_series IS 'Серия паспорта'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.passport_number IS 'Номер паспорта'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.phone IS 'Телефон'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.medical_requirements IS 'Медицинские сведения'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.deferment_liberation IS 'Наличие отсрочки или освобождения от военной службы'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.gender IS 'Пол'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.marital_status IS 'Семейное положение'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.education IS 'Образование'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.employment IS 'Занятость'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.reason_registration IS 'Причина постановки на учёт'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.driver_license IS 'Водительское удостоверение'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.disability_group IS 'Группа инвалидности'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.dispensary_registration_code IS 'Код диспансерного учета'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.region_birth IS 'Регион места рождения'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.city_birth IS 'Город места рождения'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.right_deferment IS 'Имеет право на отсрочку'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.took_break IS 'Воспользовался отсрочкой'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.medic IS 'Является медиком'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.sports_category IS 'Имеет спортивный разряд/звание'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.tractor_license IS 'Имеет удостоверение тракториста'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.is_wanted IS 'Находится в розыске'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.is_in_prison IS 'Находится в местах лишения свободы'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.acquired_citizenship IS 'Получивший гражданство'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.urgent_service IS 'Признак критерия срочной службы'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.contract_service IS 'Признак критерия контрактной службы'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.mobilization IS 'Признак критерия службы по мобмлизации'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen.recruit_id IS 'id рекрута из БД ЕРВУ'; + + + +CREATE TABLE IF NOT EXISTS ervu_dashboard.citizen_child +( + citizen_child_id + bigint + NOT + NULL, + recruit_id + uuid + NOT + NULL, + kinship_type + character + varying +( + 50 +), + full_name character varying, + birth_date date, + birth_az_number character varying +( + 50 +), + death_date date, + death_az_number character varying +( + 50 +) + ); + + +ALTER TABLE IF EXISTS ervu_dashboard.citizen_child OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE ervu_dashboard.citizen_child IS 'сведения о детях гражданина'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen_child.recruit_id IS 'ссылка на гражданина (citizen)'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen_child.kinship_type IS 'тип родственной связи: сын/дочь'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen_child.full_name IS 'ФИО'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen_child.birth_az_number IS 'номер актовой записи о рождении'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen_child.death_az_number IS 'номер актовой записи о смерти'; + + + +CREATE SEQUENCE ervu_dashboard.citizen_child_citizen_child_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS ervu_dashboard.citizen_child_citizen_child_id_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE ervu_dashboard.citizen_child_citizen_child_id_seq OWNED BY ervu_dashboard.citizen_child.citizen_child_id; + + + +CREATE TABLE IF NOT EXISTS ervu_dashboard.citizen_guardianship +( + citizen_guardianship_id + bigint + NOT + NULL, + recruit_id + uuid + NOT + NULL, + full_name + character + varying, + birth_date + date, + snils + character + varying +( + 50 +) + ); + + +ALTER TABLE IF EXISTS ervu_dashboard.citizen_guardianship OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE ervu_dashboard.citizen_guardianship IS 'сведения о лице, опекаемом или находящемся на попечении'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen_guardianship.recruit_id IS 'ссылка на гражданина (citizen)'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen_guardianship.full_name IS 'ФИО'; + + + +CREATE SEQUENCE ervu_dashboard.citizen_guardianship_citizen_guardianship_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS ervu_dashboard.citizen_guardianship_citizen_guardianship_id_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE ervu_dashboard.citizen_guardianship_citizen_guardianship_id_seq OWNED BY ervu_dashboard.citizen_guardianship.citizen_guardianship_id; + + + +CREATE TABLE IF NOT EXISTS ervu_dashboard.citizen_spouse +( + citizen_spouse_id + bigint + NOT + NULL, + recruit_id + uuid + NOT + NULL, + kinship_type + character + varying +( + 50 +), + full_name character varying, + birth_date date, + death_az_number character varying +( + 50 +), + death_date date, + marriage_az_number character varying +( + 50 +), + marriage_date date, + divorce_az_number character varying +( + 50 +), + divorce_date date, + information_excluded boolean DEFAULT false + ); + + +ALTER TABLE IF EXISTS ervu_dashboard.citizen_spouse OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE ervu_dashboard.citizen_spouse IS 'сведения о супруге (бывшей/ем супруге) гражданина'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen_spouse.recruit_id IS 'ссылка на гражданина (citizen)'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen_spouse.kinship_type IS 'тип родственной связи: супруг/бывший супруг'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen_spouse.full_name IS 'ФИО'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen_spouse.death_az_number IS 'номер актовой записи о смерти'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen_spouse.marriage_az_number IS 'номер актовой записи о браке'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen_spouse.divorce_az_number IS 'номер актовой записи о расторжении брака'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizen_spouse.information_excluded IS 'сведения о супруге исключены'; + + + +CREATE SEQUENCE ervu_dashboard.citizen_spouse_citizen_spouse_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS ervu_dashboard.citizen_spouse_citizen_spouse_id_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE ervu_dashboard.citizen_spouse_citizen_spouse_id_seq OWNED BY ervu_dashboard.citizen_spouse.citizen_spouse_id; + + + +CREATE TABLE IF NOT EXISTS ervu_dashboard.citizenship +( + citizenship_id + bigint + NOT + NULL, + recruit_id + uuid + NOT + NULL, + acquiring_basis + text, + acquiring_number + character + varying +( + 20 +), + acquiring_date date, + acquiring_authority text, + renunciation_basis text, + renunciation_number character varying +( + 20 +), + renunciation_date date, + renunciation_authority text + ); + + +ALTER TABLE IF EXISTS ervu_dashboard.citizenship OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE ervu_dashboard.citizenship IS 'сведения о гражданстве РФ'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizenship.recruit_id IS 'ссылка на гражданина (citizen)'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizenship.acquiring_basis IS 'основание приобретения гражданства РФ'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizenship.acquiring_number IS 'номер решения о приобретении гражданства РФ'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizenship.acquiring_date IS 'дата решения о приобретении гражданства РФ'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizenship.acquiring_authority IS 'наименование органа, принявшего решение о приобретении гражданства РФ'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizenship.renunciation_basis IS 'основание выхода гражданства РФ'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizenship.renunciation_number IS 'номер решения о выходе из гражданства РФ'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizenship.renunciation_date IS 'дата решения о выходе из гражданства РФ'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizenship.renunciation_authority IS 'наименование органа, принявшего решение о выходе из гражданства РФ'; + + + +CREATE SEQUENCE ervu_dashboard.citizenship_citizenship_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS ervu_dashboard.citizenship_citizenship_id_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE ervu_dashboard.citizenship_citizenship_id_seq OWNED BY ervu_dashboard.citizenship.citizenship_id; + + + +CREATE TABLE IF NOT EXISTS ervu_dashboard.citizenship_foreign +( + citizenship_foreign_id + bigint + NOT + NULL, + recruit_id + uuid + NOT + NULL, + country_name + character + varying +( + 255 +), + residense_right_basis character varying +( + 255 +), + residense_right_date date, + citizenship_basis character varying +( + 255 +), + citizenship_date date + ); + + +ALTER TABLE IF EXISTS ervu_dashboard.citizenship_foreign OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE ervu_dashboard.citizenship_foreign IS 'сведения об иностранном гражданстве'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizenship_foreign.recruit_id IS 'ссылка на гражданина (citizen)'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizenship_foreign.country_name IS 'наименование государства'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizenship_foreign.residense_right_basis IS 'основание получения права на постоянное проживание'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizenship_foreign.residense_right_date IS 'дата возникновения права на постоянное проживание'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizenship_foreign.citizenship_basis IS 'основание получения иностранного гражданства'; + + + +COMMENT +ON COLUMN ervu_dashboard.citizenship_foreign.citizenship_date IS 'дата получения иностранного гражданства'; + + + +CREATE SEQUENCE ervu_dashboard.citizenship_foreign_citizenship_foreign_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS ervu_dashboard.citizenship_foreign_citizenship_foreign_id_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE ervu_dashboard.citizenship_foreign_citizenship_foreign_id_seq OWNED BY ervu_dashboard.citizenship_foreign.citizenship_foreign_id; + + + +CREATE TABLE IF NOT EXISTS ervu_dashboard.decision +( + decision_id + bigint + NOT + NULL, + subpoena_id + uuid, + recruit_id + uuid, + recruitment_id + uuid +); + + +ALTER TABLE IF EXISTS ervu_dashboard.decision OWNER TO "ervu-dashboard"; + + + +CREATE SEQUENCE ervu_dashboard.decision_decision_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS ervu_dashboard.decision_decision_id_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE ervu_dashboard.decision_decision_id_seq OWNED BY ervu_dashboard.decision.decision_id; + + + +CREATE TABLE IF NOT EXISTS ervu_dashboard.deputy +( + deputy_id + bigint + NOT + NULL, + recruit_id + uuid + NOT + NULL, + deputy + boolean + DEFAULT + true, + information + text, + end_date + date, + period_office + character + varying +( + 50 +), + cancellation_date date + ); + + +ALTER TABLE IF EXISTS ervu_dashboard.deputy OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE ervu_dashboard.deputy IS 'сведения о гражданах, избранных депутатами/зарегистрированных кандидатами на участие в выборах'; + + + +COMMENT +ON COLUMN ervu_dashboard.deputy.recruit_id IS 'ссылка на гражданина (citizen)'; + + + +COMMENT +ON COLUMN ervu_dashboard.deputy.deputy IS 'является депутатом(true)/кандидатом на участие в выборах(false)'; + + + +COMMENT +ON COLUMN ervu_dashboard.deputy.information IS 'сведения об избрании гражданина депутатом/сведения о регистрации кандидатом на выборах'; + + + +COMMENT +ON COLUMN ervu_dashboard.deputy.end_date IS 'дата досрочного прекращения полномочий/снятия кандидатуры с выборов'; + + + +COMMENT +ON COLUMN ervu_dashboard.deputy.period_office IS 'срок полномочий'; + + + +COMMENT +ON COLUMN ervu_dashboard.deputy.cancellation_date IS 'дата аннулирования регистрации'; + + + +CREATE SEQUENCE ervu_dashboard.deputy_deputy_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS ervu_dashboard.deputy_deputy_id_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE ervu_dashboard.deputy_deputy_id_seq OWNED BY ervu_dashboard.deputy.deputy_id; + + + +CREATE TABLE IF NOT EXISTS ervu_dashboard.disability +( + disability_id + bigint + NOT + NULL, + recruit_id + uuid + NOT + NULL, + disability + boolean + DEFAULT + false, + organization_name + character + varying +( + 300 +), + start_date date, + close_date date, + confirmation_date date, + re_examination_date date, + disability_group character varying +( + 30 +) + ); + + +ALTER TABLE IF EXISTS ervu_dashboard.disability OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE ervu_dashboard.disability IS 'сведения об инвалидности/недееспособности/ограниченной дееспособности'; + + + +COMMENT +ON COLUMN ervu_dashboard.disability.recruit_id IS 'ссылка на гражданина (citizen)'; + + + +COMMENT +ON COLUMN ervu_dashboard.disability.disability IS 'сведения об инвалидности(true)/недееспособности(false)'; + + + +COMMENT +ON COLUMN ervu_dashboard.disability.organization_name IS 'наименование организации, установившей инвалидность/судебного органа'; + + + +COMMENT +ON COLUMN ervu_dashboard.disability.start_date IS 'дата установления инвалидности/признания гражданина недееспособным'; + + + +COMMENT +ON COLUMN ervu_dashboard.disability.close_date IS 'дата снятия инвалидности/отмены ограничения гражданина в дееспособности'; + + + +COMMENT +ON COLUMN ervu_dashboard.disability.confirmation_date IS 'дата подтверждения инвалидности'; + + + +COMMENT +ON COLUMN ervu_dashboard.disability.re_examination_date IS 'дата переосвидетельствования по инвалидности'; + + + +COMMENT +ON COLUMN ervu_dashboard.disability.disability_group IS 'группа инвалидности'; + + + +CREATE SEQUENCE ervu_dashboard.disability_disability_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS ervu_dashboard.disability_disability_id_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE ervu_dashboard.disability_disability_id_seq OWNED BY ervu_dashboard.disability.disability_id; + + + +CREATE TABLE IF NOT EXISTS ervu_dashboard.disease +( + disease_id + bigint + NOT + NULL, + recruit_id + uuid + NOT + NULL, + code + character + varying, + name + character + varying, + reg_date + date, + registered + boolean + DEFAULT + false +); + + +ALTER TABLE IF EXISTS ervu_dashboard.disease OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE ervu_dashboard.disease IS 'сведения о заболеваниях гражданина'; + + + +COMMENT +ON COLUMN ervu_dashboard.disease.recruit_id IS 'ссылка на гражданина (citizen)'; + + + +COMMENT +ON COLUMN ervu_dashboard.disease.code IS 'код заболевания'; + + + +COMMENT +ON COLUMN ervu_dashboard.disease.name IS 'наименование заболевания'; + + + +COMMENT +ON COLUMN ervu_dashboard.disease.reg_date IS 'дата постановки диагноза'; + + + +COMMENT +ON COLUMN ervu_dashboard.disease.registered IS 'поставлен на учет по заболеванию'; + + + +CREATE SEQUENCE ervu_dashboard.disease_disease_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS ervu_dashboard.disease_disease_id_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE ervu_dashboard.disease_disease_id_seq OWNED BY ervu_dashboard.disease.disease_id; + + + +CREATE TABLE IF NOT EXISTS ervu_dashboard.drivers_licence +( + drivers_licence_id + bigint + NOT + NULL, + recruit_id + uuid + NOT + NULL, + tractor_driver + boolean + DEFAULT + false, + licence_series + character + varying +( + 50 +), + licence_number character varying +( + 50 +), + start_date date, + close_date date, + categories character varying +( + 50 +), + status character varying +( + 50 +), + replacement_date date, + return_date date, + seizure_date date + ); + + +ALTER TABLE IF EXISTS ervu_dashboard.drivers_licence OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE ervu_dashboard.drivers_licence IS 'удостоверение водительское/тракториста-машиниста'; + + + +COMMENT +ON COLUMN ervu_dashboard.drivers_licence.recruit_id IS 'ссылка на гражданина (citizen)'; + + + +COMMENT +ON COLUMN ervu_dashboard.drivers_licence.tractor_driver IS 'удостоверение тракториста'; + + + +COMMENT +ON COLUMN ervu_dashboard.drivers_licence.licence_series IS 'серия'; + + + +COMMENT +ON COLUMN ervu_dashboard.drivers_licence.licence_number IS 'номер'; + + + +COMMENT +ON COLUMN ervu_dashboard.drivers_licence.start_date IS 'дата выдачи'; + + + +COMMENT +ON COLUMN ervu_dashboard.drivers_licence.close_date IS 'дата окончания действия'; + + + +COMMENT +ON COLUMN ervu_dashboard.drivers_licence.categories IS 'категории'; + + + +COMMENT +ON COLUMN ervu_dashboard.drivers_licence.status IS 'статус удостоверения'; + + + +COMMENT +ON COLUMN ervu_dashboard.drivers_licence.replacement_date IS 'дата замены'; + + + +COMMENT +ON COLUMN ervu_dashboard.drivers_licence.return_date IS 'дата возврата'; + + + +COMMENT +ON COLUMN ervu_dashboard.drivers_licence.seizure_date IS 'дата изъятия'; + + + +CREATE SEQUENCE ervu_dashboard.drivers_licence_drivers_licence_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS ervu_dashboard.drivers_licence_drivers_licence_id_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE ervu_dashboard.drivers_licence_drivers_licence_id_seq OWNED BY ervu_dashboard.drivers_licence.drivers_licence_id; + + + +CREATE TABLE IF NOT EXISTS ervu_dashboard.medical_authorities +( + medical_authorities_id + bigint + NOT + NULL, + recruit_id + uuid + NOT + NULL, + start_date + date, + close_date + date, + change_date + date, + hiv + boolean + DEFAULT + false +); + + +ALTER TABLE IF EXISTS ervu_dashboard.medical_authorities OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE ervu_dashboard.medical_authorities IS 'сведения о гражданах, стоящих на учете в ПНД/по ВИЧ'; + + + +COMMENT +ON COLUMN ervu_dashboard.medical_authorities.recruit_id IS 'ссылка на гражданина (citizen)'; + + + +COMMENT +ON COLUMN ervu_dashboard.medical_authorities.start_date IS 'дата постановки на учет'; + + + +COMMENT +ON COLUMN ervu_dashboard.medical_authorities.close_date IS 'дата снятия с учета'; + + + +COMMENT +ON COLUMN ervu_dashboard.medical_authorities.change_date IS 'дата планового срока пересмотра диагноза'; + + + +COMMENT +ON COLUMN ervu_dashboard.medical_authorities.hiv IS 'на учете по ВИЧ(true) или в ПНД(false)'; + + + +CREATE SEQUENCE ervu_dashboard.medical_authorities_medical_authorities_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS ervu_dashboard.medical_authorities_medical_authorities_id_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE ervu_dashboard.medical_authorities_medical_authorities_id_seq OWNED BY ervu_dashboard.medical_authorities.medical_authorities_id; + + + +CREATE TABLE IF NOT EXISTS ervu_dashboard.passport +( + passport_id + bigint + NOT + NULL, + recruit_id + uuid + NOT + NULL, + actual + boolean + DEFAULT + true, + passport_series + character + varying +( + 4 +), + passport_number character varying +( + 6 +), + issue_date date, + organization_name character varying +( + 255 +), + unit_code character varying +( + 7 +) + ); + + +ALTER TABLE IF EXISTS ervu_dashboard.passport OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE ervu_dashboard.passport IS 'сведения о паспорте'; + + + +COMMENT +ON COLUMN ervu_dashboard.passport.recruit_id IS 'ссылка на гражданина (citizen)'; + + + +COMMENT +ON COLUMN ervu_dashboard.passport.actual IS 'статус документа: действительный(true)/недействительный(false)'; + + + +COMMENT +ON COLUMN ervu_dashboard.passport.passport_series IS 'серия паспорта'; + + + +COMMENT +ON COLUMN ervu_dashboard.passport.passport_number IS 'номер паспорта'; + + + +COMMENT +ON COLUMN ervu_dashboard.passport.issue_date IS 'дата выдачи документа'; + + + +COMMENT +ON COLUMN ervu_dashboard.passport.organization_name IS 'наименование органа, выдавшего документ'; + + + +COMMENT +ON COLUMN ervu_dashboard.passport.unit_code IS 'код подразделения'; + + + +CREATE SEQUENCE ervu_dashboard.passport_passport_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS ervu_dashboard.passport_passport_id_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE ervu_dashboard.passport_passport_id_seq OWNED BY ervu_dashboard.passport.passport_id; + + + +CREATE TABLE IF NOT EXISTS ervu_dashboard.property +( + property_id + bigint + NOT + NULL, + recruit_id + uuid + NOT + NULL, + type_property + public + . + type_property_type, + start_date + date, + close_date + date, + vehicle_type + character + varying +( + 100 +), + vehicle_category character varying +( + 100 +), + address text, + kind_right character varying +( + 50 +), + issue_year character varying +( + 4 +), + brand_model character varying +( + 100 +), + reg_plate character varying +( + 100 +), + vin character varying +( + 100 +) + ); + + +ALTER TABLE IF EXISTS ervu_dashboard.property OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE ervu_dashboard.property IS 'сведения об имуществе'; + + + +COMMENT +ON COLUMN ervu_dashboard.property.recruit_id IS 'ссылка на гражданина (citizen)'; + + + +COMMENT +ON COLUMN ervu_dashboard.property.type_property IS 'тип имущества: недвижимое/наземный/воздушный/водный транспорт'; + + + +COMMENT +ON COLUMN ervu_dashboard.property.start_date IS 'дата регистрации права владения'; + + + +COMMENT +ON COLUMN ervu_dashboard.property.close_date IS 'дата прекращения права владения'; + + + +COMMENT +ON COLUMN ervu_dashboard.property.vehicle_type IS 'вид транспортного средства'; + + + +COMMENT +ON COLUMN ervu_dashboard.property.vehicle_category IS 'категория транспортного средства'; + + + +COMMENT +ON COLUMN ervu_dashboard.property.address IS 'адрес объекта недвижимости'; + + + +COMMENT +ON COLUMN ervu_dashboard.property.kind_right IS 'вид права'; + + + +COMMENT +ON COLUMN ervu_dashboard.property.issue_year IS 'год выпуска транспортного средства'; + + + +COMMENT +ON COLUMN ervu_dashboard.property.brand_model IS 'марка, модель транспортного средства'; + + + +COMMENT +ON COLUMN ervu_dashboard.property.reg_plate IS 'регистрационный номер'; + + + +CREATE SEQUENCE ervu_dashboard.property_property_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS ervu_dashboard.property_property_id_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE ervu_dashboard.property_property_id_seq OWNED BY ervu_dashboard.property.property_id; + + + +CREATE TABLE IF NOT EXISTS ervu_dashboard.prosecution +( + prosecution_id + bigint + NOT + NULL, + recruit_id + uuid + NOT + NULL, + kind + character + varying +( + 255 +), + create_date date, + close_date date, + authority_name character varying +( + 255 +), + law_point character varying +( + 100 +), + termination_basis character varying +( + 255 +), + transfer_to_court boolean DEFAULT false, + case_number character varying +( + 50 +), + case_number_court character varying +( + 50 +), + reclassification text + ); + + +ALTER TABLE IF EXISTS ervu_dashboard.prosecution OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE ervu_dashboard.prosecution IS 'сведения об уголовном преследовании'; + + + +COMMENT +ON COLUMN ervu_dashboard.prosecution.recruit_id IS 'ссылка на гражданина (citizen)'; + + + +COMMENT +ON COLUMN ervu_dashboard.prosecution.kind IS 'вид уголовного преследования'; + + + +COMMENT +ON COLUMN ervu_dashboard.prosecution.create_date IS 'дата возбуждения уголовного дела'; + + + +COMMENT +ON COLUMN ervu_dashboard.prosecution.close_date IS 'дата прекращения уголовного преследования'; + + + +COMMENT +ON COLUMN ervu_dashboard.prosecution.authority_name IS 'наименование органа, принявшего решение'; + + + +COMMENT +ON COLUMN ervu_dashboard.prosecution.law_point IS 'пункт, часть, статья УК РФ'; + + + +COMMENT +ON COLUMN ervu_dashboard.prosecution.termination_basis IS 'основание прекращения уголовного преследования'; + + + +COMMENT +ON COLUMN ervu_dashboard.prosecution.transfer_to_court IS 'признак передачи в суд уголовного дела в отношении гражданина'; + + + +COMMENT +ON COLUMN ervu_dashboard.prosecution.case_number IS 'номер уголовного дела (предварительный)'; + + + +COMMENT +ON COLUMN ervu_dashboard.prosecution.case_number_court IS 'номер уголовного дела (судебный)'; + + + +COMMENT +ON COLUMN ervu_dashboard.prosecution.reclassification IS 'сведения о переквалификации деяния'; + + + +CREATE SEQUENCE ervu_dashboard.prosecution_prosecution_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS ervu_dashboard.prosecution_prosecution_id_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE ervu_dashboard.prosecution_prosecution_id_seq OWNED BY ervu_dashboard.prosecution.prosecution_id; + + + +CREATE TABLE IF NOT EXISTS ervu_dashboard.pub_recruitment +( + idm_id + character + varying +( + 256 +), + parent_id character varying, + military_code character varying, + shortname character varying NOT NULL, + fullname character varying NOT NULL, + code character varying +( + 64 +), + id character +( + 36 +) NOT NULL, + sort character varying NOT NULL + ); + + +ALTER TABLE IF EXISTS ervu_dashboard.pub_recruitment OWNER TO "ervu-dashboard"; + + + +CREATE TABLE IF NOT EXISTS ervu_dashboard.punishment +( + punishment_id + bigint + NOT + NULL, + recruit_id + uuid + NOT + NULL, + sentence + character + varying +( + 255 +), + sentence_changed character varying +( + 255 +), + sentense_date date, + authority_name character varying +( + 255 +), + law_point character varying +( + 100 +), + punishment_type character varying +( + 100 +), + punishment_code character varying +( + 5 +), + sentence_place text, + start_date date, + planned_date date, + release_date date, + release_reason character varying +( + 255 +), + mandatory_work boolean DEFAULT false + ); + + +ALTER TABLE IF EXISTS ervu_dashboard.punishment OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE ervu_dashboard.punishment IS 'сведения об уголовном преследовании и вынесенном приговоре'; + + + +COMMENT +ON COLUMN ervu_dashboard.punishment.recruit_id IS 'ссылка на гражданина (citizen)'; + + + +COMMENT +ON COLUMN ervu_dashboard.punishment.sentence IS 'срок или размер наказания'; + + + +COMMENT +ON COLUMN ervu_dashboard.punishment.sentence_changed IS 'изменение срока или размера наказания'; + + + +COMMENT +ON COLUMN ervu_dashboard.punishment.sentense_date IS 'дата вынесения обвинительного приговора'; + + + +COMMENT +ON COLUMN ervu_dashboard.punishment.authority_name IS 'наименование суда, вынесшего приговор'; + + + +COMMENT +ON COLUMN ervu_dashboard.punishment.law_point IS 'пункт, часть, статья УК РФ'; + + + +COMMENT +ON COLUMN ervu_dashboard.punishment.punishment_type IS 'вид наказания'; + + + +COMMENT +ON COLUMN ervu_dashboard.punishment.punishment_code IS 'код вида наказания'; + + + +COMMENT +ON COLUMN ervu_dashboard.punishment.sentence_place IS 'наименование и адрес места отбывания наказания'; + + + +COMMENT +ON COLUMN ervu_dashboard.punishment.start_date IS 'дата начала срока отбывания наказания'; + + + +COMMENT +ON COLUMN ervu_dashboard.punishment.planned_date IS 'плановая дата отбытия'; + + + +COMMENT +ON COLUMN ervu_dashboard.punishment.release_date IS 'дата освобождения'; + + + +COMMENT +ON COLUMN ervu_dashboard.punishment.release_reason IS 'основание освобождения'; + + + +COMMENT +ON COLUMN ervu_dashboard.punishment.mandatory_work IS 'признак отбывания наказания в виде обязательных работ'; + + + +CREATE SEQUENCE ervu_dashboard.punishment_punishment_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS ervu_dashboard.punishment_punishment_id_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE ervu_dashboard.punishment_punishment_id_seq OWNED BY ervu_dashboard.punishment.punishment_id; + + + +CREATE TABLE IF NOT EXISTS ervu_dashboard.recruitment +( + id + character +( + 36 +) NOT NULL, + shortname character +( + 300 +), + idm_id uuid, + code character +( + 300 +), + parent_id character +( + 300 +), + sort bigint NOT NULL + ); + + +ALTER TABLE IF EXISTS ervu_dashboard.recruitment OWNER TO "ervu-dashboard"; + + + +CREATE TABLE IF NOT EXISTS ervu_dashboard.subpoena +( + sub_id + bigint + NOT + NULL, + series + character + varying +( + 16 +), + number character varying +( + 36 +) NOT NULL, + create_date timestamp without time zone DEFAULT now +( +) NOT NULL, + visit_date timestamp + without time zone, + send_date timestamp + with time zone, + reason_cancelled character varying (255), + recruit_id uuid, + department_id uuid, + subpoena_status text, + subpoena_reason text, + fio_commiss text, + track_number text, + recruitment_name text, + address text, + method_sending text, + subpoena_id uuid, + sig_info character varying +( + 255 +), + delivery_fio text, + act_number text, + method_delivery text, + delivery_date timestamp + without time zone, + delivery_status text, + appearance text, + appearance_status text + ); + + +ALTER TABLE IF EXISTS ervu_dashboard.subpoena OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE ervu_dashboard.subpoena IS 'сведения о направлении повестки военного комиссариата'; + + + +COMMENT +ON COLUMN ervu_dashboard.subpoena.series IS 'серия повестки'; + + + +COMMENT +ON COLUMN ervu_dashboard.subpoena.number IS 'номер повестки'; + + + +COMMENT +ON COLUMN ervu_dashboard.subpoena.create_date IS 'дата создания записи'; + + + +COMMENT +ON COLUMN ervu_dashboard.subpoena.visit_date IS 'время и дата явки в ВК'; + + + +COMMENT +ON COLUMN ervu_dashboard.subpoena.send_date IS 'дата направления повестки'; + + + +COMMENT +ON COLUMN ervu_dashboard.subpoena.reason_cancelled IS 'причина отклонения повестки'; + + + +COMMENT +ON COLUMN ervu_dashboard.subpoena.recruit_id IS 'идентификатор рекрута'; + + + +COMMENT +ON COLUMN ervu_dashboard.subpoena.department_id IS 'идентификатор ВК'; + + + +COMMENT +ON COLUMN ervu_dashboard.subpoena.subpoena_status IS 'статус повестки'; + + + +COMMENT +ON COLUMN ervu_dashboard.subpoena.subpoena_reason IS 'причина вызова по повестке'; + + + +COMMENT +ON COLUMN ervu_dashboard.subpoena.fio_commiss IS 'фио комиссара'; + + + +COMMENT +ON COLUMN ervu_dashboard.subpoena.track_number IS 'уникальный номер заказного почтового отправления, которым направлена повестка'; + + + +COMMENT +ON COLUMN ervu_dashboard.subpoena.recruitment_name IS 'наименование ВК, направившего повестку'; + + + +COMMENT +ON COLUMN ervu_dashboard.subpoena.address IS 'адрес, по которому нужно явиться по повестке'; + + + +COMMENT +ON COLUMN ervu_dashboard.subpoena.method_sending IS 'способ направления повестки'; + + + +COMMENT +ON COLUMN ervu_dashboard.subpoena.subpoena_id IS 'идентификатор повестки'; + + + +COMMENT +ON COLUMN ervu_dashboard.subpoena.sig_info IS 'открепленная ЭП'; + + + +COMMENT +ON COLUMN ervu_dashboard.subpoena.delivery_fio IS 'фио лица, оповестившего гражданина о последствиях отказа от получения повестки'; + + + +COMMENT +ON COLUMN ervu_dashboard.subpoena.act_number IS 'номер акта об отказе от получения повестки'; + + + +COMMENT +ON COLUMN ervu_dashboard.subpoena.method_delivery IS 'способ вручения'; + + + +ALTER TABLE IF EXISTS ervu_dashboard.subpoena ALTER COLUMN sub_id ADD GENERATED BY DEFAULT AS IDENTITY ( + SEQUENCE NAME ervu_dashboard.subpoena_subpoena_id_seq + START WITH 2 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1 + ); + + + +CREATE TABLE IF NOT EXISTS ervu_dashboard.temporary_measures +( + temporary_measures_id + bigint + NOT + NULL, + subpoena_id + uuid, + recruit_id + uuid, + recruitment_id + uuid, + status_measure + text, + recruitment_name + text, + cancel_date + timestamp + without + time + zone, + restriction_name + text, + type + text, + decision_number_create + text, + decision_number_cancel + text, + decision_date_create + timestamp + without + time + zone, + decision_date_cancel + timestamp + without + time + zone, + applied_fact + text +); + + +ALTER TABLE IF EXISTS ervu_dashboard.temporary_measures OWNER TO "ervu-dashboard"; + + + +COMMENT +ON COLUMN ervu_dashboard.temporary_measures.status_measure IS 'статус временной меры'; + + + +COMMENT +ON COLUMN ervu_dashboard.temporary_measures.recruitment_name IS 'наименование ВК'; + + + +COMMENT +ON COLUMN ervu_dashboard.temporary_measures.cancel_date IS 'дата, с которой отменена временная мера'; + + + +COMMENT +ON COLUMN ervu_dashboard.temporary_measures.restriction_name IS 'наименование временной меры'; + + + +COMMENT +ON COLUMN ervu_dashboard.temporary_measures.type IS 'тип документа ограничения'; + + + +COMMENT +ON COLUMN ervu_dashboard.temporary_measures.decision_number_create IS 'номер решения о применении временной меры'; + + + +COMMENT +ON COLUMN ervu_dashboard.temporary_measures.decision_number_cancel IS 'номер решения об отмене временной меры'; + + + +COMMENT +ON COLUMN ervu_dashboard.temporary_measures.decision_date_create IS 'дата решения о применении временной меры'; + + + +COMMENT +ON COLUMN ervu_dashboard.temporary_measures.decision_date_cancel IS 'дата решения об отмене временной меры'; + + + +COMMENT +ON COLUMN ervu_dashboard.temporary_measures.applied_fact IS 'факт применения временной меры'; + + + +ALTER TABLE IF EXISTS ervu_dashboard.temporary_measures ALTER COLUMN temporary_measures_id ADD GENERATED BY DEFAULT AS IDENTITY ( + SEQUENCE NAME ervu_dashboard.temporary_measures_temporary_measures_id_seq + START WITH 2 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1 + ); + + + +ALTER TABLE IF EXISTS ervu_dashboard.recruitment ALTER COLUMN sort ADD GENERATED BY DEFAULT AS IDENTITY ( + SEQUENCE NAME ervu_dashboard.testrecruitment_sort_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1 + ); + + + +CREATE TABLE IF NOT EXISTS ervu_dashboard.work +( + work_id + bigint + NOT + NULL, + recruit_id + uuid + NOT + NULL, + employer_category + public + . + employer_category_type, + place + text, + organization_name + character + varying +( + 100 +), + inn character varying +( + 15 +), + kpp character varying +( + 15 +), + ogrnip character varying +( + 20 +), + "position" character varying +( + 150 +), + event_type character varying +( + 50 +), + event_date date + ); + + +ALTER TABLE IF EXISTS ervu_dashboard.work OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE ervu_dashboard.work IS 'сведения об имуществе'; + + + +COMMENT +ON COLUMN ervu_dashboard.work.recruit_id IS 'ссылка на гражданина (citizen)'; + + + +COMMENT +ON COLUMN ervu_dashboard.work.employer_category IS 'категория работодателя: юр лицо/ИП/физ лицо/глава КФХ'; + + + +COMMENT +ON COLUMN ervu_dashboard.work.place IS 'место работы'; + + + +COMMENT +ON COLUMN ervu_dashboard.work.organization_name IS 'наименование организации'; + + + +COMMENT +ON COLUMN ervu_dashboard.work.inn IS 'ИНН'; + + + +COMMENT +ON COLUMN ervu_dashboard.work.kpp IS 'КПП'; + + + +COMMENT +ON COLUMN ervu_dashboard.work.ogrnip IS 'ОГРНИП'; + + + +COMMENT +ON COLUMN ervu_dashboard.work."position" IS 'должность'; + + + +COMMENT +ON COLUMN ervu_dashboard.work.event_type IS 'тип кадрового мероприятия '; + + + +COMMENT +ON COLUMN ervu_dashboard.work.event_date IS 'дата кадрового мероприятия'; + + + +CREATE SEQUENCE ervu_dashboard.work_work_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS ervu_dashboard.work_work_id_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE ervu_dashboard.work_work_id_seq OWNED BY ervu_dashboard.work.work_id; + + + +CREATE TABLE IF NOT EXISTS main_dashboard.appeals +( + total_appeals + numeric, + resolved + numeric, + average_consideration + numeric, + average_rating + numeric, + average_to_face + numeric, + "average_EPGU" + numeric, + recording_date + date + DEFAULT + now +( +) NOT NULL, + average_to_face_percent numeric, + "average_EPGU_percent" numeric, + recruitment_id character +( + 36 +) NOT NULL, + id_appeal bigint NOT NULL + ); + + +ALTER TABLE IF EXISTS main_dashboard.appeals OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE main_dashboard.appeals IS 'Обжалования уровень РФ'; + + + +COMMENT +ON COLUMN main_dashboard.appeals.total_appeals IS 'Всего жалоб'; + + + +COMMENT +ON COLUMN main_dashboard.appeals.resolved IS 'Количество решенных'; + + + +COMMENT +ON COLUMN main_dashboard.appeals.average_consideration IS 'Средний срок рассмотрения'; + + + +COMMENT +ON COLUMN main_dashboard.appeals.average_rating IS 'Оценка удовлетворенности'; + + + +COMMENT +ON COLUMN main_dashboard.appeals.average_to_face IS 'Способ подачи жалоб очно'; + + + +COMMENT +ON COLUMN main_dashboard.appeals."average_EPGU" IS 'Способ подачи ЕПГУ'; + + + +COMMENT +ON COLUMN main_dashboard.appeals.recording_date IS 'Дата записи'; + + + +COMMENT +ON COLUMN main_dashboard.appeals.average_to_face_percent IS 'Способ подачи жалоб очно в процентах'; + + + +COMMENT +ON COLUMN main_dashboard.appeals."average_EPGU_percent" IS 'Способ подачи ЕПГУ в процентах'; + + + +CREATE SEQUENCE main_dashboard.appeals_id_appeal_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS main_dashboard.appeals_id_appeal_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE main_dashboard.appeals_id_appeal_seq OWNED BY main_dashboard.appeals.id_appeal; + + + +CREATE TABLE IF NOT EXISTS main_dashboard.recruitment_campaign +( + new_recruits + numeric, + subpoenas_sent + numeric, + appeared_on_subpoenas + numeric, + not_appeared_on_subpoenas + numeric, + postponement_have_right + numeric, + postponement_granted + numeric, + recording_date + date + DEFAULT + now +( +) NOT NULL, + appeared_on_subpoenas_percent numeric, + not_appeared_on_subpoenas_percent numeric, + postponement_have_right_percent numeric, + postponement_granted_percent numeric, + recruitment_id character +( + 36 +) NOT NULL, + spring_autumn character +( + 36 +) NOT NULL, + id_recruitment_campaign bigint NOT NULL + ); + + +ALTER TABLE IF EXISTS main_dashboard.recruitment_campaign OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE main_dashboard.recruitment_campaign IS 'Призывная кампания уровень РФ'; + + + +COMMENT +ON COLUMN main_dashboard.recruitment_campaign.new_recruits IS 'Подпадающие под призыв'; + + + +COMMENT +ON COLUMN main_dashboard.recruitment_campaign.subpoenas_sent IS 'Направлено повесток'; + + + +COMMENT +ON COLUMN main_dashboard.recruitment_campaign.appeared_on_subpoenas IS 'Явились по повесткам'; + + + +COMMENT +ON COLUMN main_dashboard.recruitment_campaign.not_appeared_on_subpoenas IS 'Не явились по повесткам'; + + + +COMMENT +ON COLUMN main_dashboard.recruitment_campaign.postponement_have_right IS 'Имеют право на отсрочку'; + + + +COMMENT +ON COLUMN main_dashboard.recruitment_campaign.postponement_granted IS 'Предоставлена отсрочка'; + + + +COMMENT +ON COLUMN main_dashboard.recruitment_campaign.recording_date IS 'Дата записи'; + + + +COMMENT +ON COLUMN main_dashboard.recruitment_campaign.appeared_on_subpoenas_percent IS 'Явились по повесткам процент'; + + + +COMMENT +ON COLUMN main_dashboard.recruitment_campaign.not_appeared_on_subpoenas_percent IS 'Не явились по повесткам процент'; + + + +COMMENT +ON COLUMN main_dashboard.recruitment_campaign.postponement_have_right_percent IS 'Имеют право на отсрочку процент'; + + + +COMMENT +ON COLUMN main_dashboard.recruitment_campaign.postponement_granted_percent IS 'Предоставлена отсрочка процент'; + + + +CREATE SEQUENCE main_dashboard.recruitment_campaign_id_recruitment_campaign_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS main_dashboard.recruitment_campaign_id_recruitment_campaign_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE main_dashboard.recruitment_campaign_id_recruitment_campaign_seq OWNED BY main_dashboard.recruitment_campaign.id_recruitment_campaign; + + + +CREATE TABLE IF NOT EXISTS main_dashboard.total_registered +( + total_registered + numeric, + "total_registered_M" + numeric, + "total_registered_W" + numeric, + mobilization_criterion + numeric, + volunteer_criterion + numeric, + contract_criterion + numeric, + recording_date + date + DEFAULT + now +( +) NOT NULL, + mobilization_criterion_percent numeric, + volunteer_criterion_percent numeric, + contract_criterion_percent numeric, + recruitment_id character +( + 36 +) NOT NULL, + id_total_registered bigint NOT NULL + ); + + +ALTER TABLE IF EXISTS main_dashboard.total_registered OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE main_dashboard.total_registered IS 'Всего на учете уровень РФ'; + + + +COMMENT +ON COLUMN main_dashboard.total_registered.total_registered IS 'Всего состоят на учете'; + + + +COMMENT +ON COLUMN main_dashboard.total_registered."total_registered_M" IS 'Всего на учете мужчин'; + + + +COMMENT +ON COLUMN main_dashboard.total_registered."total_registered_W" IS 'Всего на учете женщин'; + + + +COMMENT +ON COLUMN main_dashboard.total_registered.mobilization_criterion IS 'Количество подходящих под критерии мобилизации'; + + + +COMMENT +ON COLUMN main_dashboard.total_registered.volunteer_criterion IS 'Количество подходящих под критерии добровольной службы'; + + + +COMMENT +ON COLUMN main_dashboard.total_registered.contract_criterion IS 'Количество подходящих под критерии контрактной службы'; + + + +COMMENT +ON COLUMN main_dashboard.total_registered.recording_date IS 'дата записи'; + + + +COMMENT +ON COLUMN main_dashboard.total_registered.mobilization_criterion_percent IS 'Процент подходящих под критерии мобилизации'; + + + +COMMENT +ON COLUMN main_dashboard.total_registered.volunteer_criterion_percent IS 'Процент подходящих под критерии добровольной службы'; + + + +COMMENT +ON COLUMN main_dashboard.total_registered.contract_criterion_percent IS 'Процент подходящих под критерии контрактрой службы'; + + + +CREATE SEQUENCE main_dashboard.total_registered_id_total_registered_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS main_dashboard.total_registered_id_total_registered_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE main_dashboard.total_registered_id_total_registered_seq OWNED BY main_dashboard.total_registered.id_total_registered; + + + +CREATE TABLE IF NOT EXISTS main_dashboard.waiting_registration +( + waiting_registration + numeric, + "waiting_registration_M" + numeric, + "waiting_registration_W" + numeric, + mobilization_criterion + numeric, + volunteer_criterion + numeric, + contract_criterion + numeric, + recording_date + date + DEFAULT + now +( +) NOT NULL, + waiting_registration_percent numeric, + mobilization_criterion_percent numeric, + volunteer_criterion_percent numeric, + contract_criterion_percent numeric, + recruitment_id character +( + 36 +) NOT NULL, + id_waiting_registration bigint NOT NULL + ); + + +ALTER TABLE IF EXISTS main_dashboard.waiting_registration OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE main_dashboard.waiting_registration IS 'Подлежат постановке на учет уровень РФ'; + + + +COMMENT +ON COLUMN main_dashboard.waiting_registration.waiting_registration IS 'Всего подлежат постановке на учет'; + + + +COMMENT +ON COLUMN main_dashboard.waiting_registration."waiting_registration_M" IS 'Подлежат постановке мужчины'; + + + +COMMENT +ON COLUMN main_dashboard.waiting_registration."waiting_registration_W" IS 'Подлежат постановке женщины'; + + + +COMMENT +ON COLUMN main_dashboard.waiting_registration.mobilization_criterion IS 'Количество подлежащих под критерии мобилизации'; + + + +COMMENT +ON COLUMN main_dashboard.waiting_registration.volunteer_criterion IS 'Количество подлежащих под критерии добровольной службы'; + + + +COMMENT +ON COLUMN main_dashboard.waiting_registration.contract_criterion IS 'Количество подлежащих под критерии контрактной службы'; + + + +COMMENT +ON COLUMN main_dashboard.waiting_registration.recording_date IS 'Дата записи'; + + + +COMMENT +ON COLUMN main_dashboard.waiting_registration.waiting_registration_percent IS 'Всего подлежат постановке процент'; + + + +COMMENT +ON COLUMN main_dashboard.waiting_registration.mobilization_criterion_percent IS 'Процент подлежащих под критерии мобилизации'; + + + +COMMENT +ON COLUMN main_dashboard.waiting_registration.volunteer_criterion_percent IS 'Процент подлежащих под критерии добровольной службы'; + + + +COMMENT +ON COLUMN main_dashboard.waiting_registration.contract_criterion_percent IS 'Процент подлежащих под критерии контрактной службы'; + + + +CREATE SEQUENCE main_dashboard.waiting_registration_id_waiting_registration_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS main_dashboard.waiting_registration_id_waiting_registration_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE main_dashboard.waiting_registration_id_waiting_registration_seq OWNED BY main_dashboard.waiting_registration.id_waiting_registration; + + + +CREATE TABLE IF NOT EXISTS public.channel_log +( + id_batch + bigint, + channel_id + character +( + 36 +), + log_date date, + logging_object_type character varying, + object_name character varying, + object_copy character varying, + repository_directory character varying, + filename character varying, + object_id character +( + 36 +), + object_version character varying, + object_revision character varying, + parent_channel_id character +( + 36 +), + root_channel_id character +( + 36 +) + ); + + + +CREATE TABLE IF NOT EXISTS public.job_entry_log +( + id_batch + bigint, + channel_id + character +( + 36 +), + log_date date, + transname character varying, + stepname character varying, + lines_read character varying, + lines_written character varying, + lines_updated character varying, + lines_input character varying, + lines_output character varying, + lines_rejected character varying, + errors character varying, + "RESULT" character varying, + nr_result_rows character varying, + nr_result_files character varying + ); + + +ALTER TABLE IF EXISTS public.job_entry_log OWNER TO "ervu-dashboard"; + + + +CREATE TABLE IF NOT EXISTS public.job_log +( + jobname + text, + status + text, + enddate + timestamp + with + time + zone, + depdate + timestamp + with + time + zone, + startdate + timestamp + with + time + zone, + logdate + timestamp + with + time + zone, + channel_id + character + varying, + id_job + bigint + NOT + NULL, + replaydate + timestamp + with + time + zone, + log_field + character + varying, + errors + integer, + lines_rejected + integer, + lines_updated + integer, + lines_input + integer, + lines_output + integer, + lines_written + integer, + lines_read + integer +); + + +ALTER TABLE IF EXISTS public.job_log OWNER TO "ervu-dashboard"; + + + +CREATE SEQUENCE public.job_log_id_job_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS public.job_log_id_job_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE public.job_log_id_job_seq OWNED BY public.job_log.id_job; + + + +CREATE TABLE IF NOT EXISTS public.last_recording_date +( + last_recording_date + date + DEFAULT + now +( +), + entry text + ); + + +ALTER TABLE IF EXISTS public.last_recording_date OWNER TO "ervu-dashboard"; + + + +CREATE TABLE IF NOT EXISTS ratings.appear_subppoena +( + id_appear_subppoena + bigint + NOT + NULL, + id_region + integer, + appear_mil_com + numeric, + recording_date + date, + appear_mil_com_percent + numeric, + recruitment_id + character +( + 36 +) + ); + + +ALTER TABLE IF EXISTS ratings.appear_subppoena OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE ratings.appear_subppoena IS 'Явка по повестке уровень РФ'; + + + +COMMENT +ON COLUMN ratings.appear_subppoena.appear_mil_com IS 'Явка в военкомат'; + + + +COMMENT +ON COLUMN ratings.appear_subppoena.recording_date IS 'Дата записи'; + + + +COMMENT +ON COLUMN ratings.appear_subppoena.appear_mil_com_percent IS 'Явка в военкомат в процентах'; + + + +CREATE SEQUENCE ratings.appear_subppoena_id_appear_subppoena_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS ratings.appear_subppoena_id_appear_subppoena_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE ratings.appear_subppoena_id_appear_subppoena_seq OWNED BY ratings.appear_subppoena.id_appear_subppoena; + + + +CREATE SEQUENCE ratings."ratings.conscription_info_id_ratings.conscription_info_seq" + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS ratings."ratings.conscription_info_id_ratings.conscription_info_seq" OWNER TO "ervu-dashboard"; + + + +CREATE TABLE IF NOT EXISTS ratings.conscription_info +( + conscription_info_id + bigint + DEFAULT + nextval('ratings."ratings.conscription_info_id_ratings.conscription_info_seq"'::regclass) NOT NULL, + id_region integer, + execution numeric, + spring_autumn text, + recording_date date, + execution_percent numeric, + recruitment_id character(36) +); + + +ALTER TABLE IF EXISTS ratings.conscription_info OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE ratings.conscription_info IS 'Призыв уровень РФ'; + + + +COMMENT +ON COLUMN ratings.conscription_info.execution IS 'Исполнение плана призыва'; + + + +COMMENT +ON COLUMN ratings.conscription_info.spring_autumn IS 'Осень/весна'; + + + +COMMENT +ON COLUMN ratings.conscription_info.recording_date IS 'Дата записи'; + + + +COMMENT +ON COLUMN ratings.conscription_info.execution_percent IS 'Исолнение плана призыва в процентах'; + + + +CREATE TABLE IF NOT EXISTS ratings.consideration_complaint +( + id_consideration_complaint + bigint + NOT + NULL, + id_region + integer, + consideration_complaint + numeric, + recording_date + date, + consideration_complaint_percent + numeric, + recruitment_id + character +( + 36 +) + ); + + +ALTER TABLE IF EXISTS ratings.consideration_complaint OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE ratings.consideration_complaint IS 'Рассмотрение жалоб уровень РФ'; + + + +COMMENT +ON COLUMN ratings.consideration_complaint.consideration_complaint IS 'Рассмотрение жалоб'; + + + +COMMENT +ON COLUMN ratings.consideration_complaint.recording_date IS 'Дата записи'; + + + +COMMENT +ON COLUMN ratings.consideration_complaint.consideration_complaint_percent IS 'Рассмотрение жалоб в процентах'; + + + +CREATE SEQUENCE ratings.consideration_complaint_id_consideration_complaint_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS ratings.consideration_complaint_id_consideration_complaint_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE ratings.consideration_complaint_id_consideration_complaint_seq OWNED BY ratings.consideration_complaint.id_consideration_complaint; + + + +CREATE TABLE IF NOT EXISTS recruitment_campaign.appeals +( + total_appeals + numeric, + resolved + numeric, + not_resolved + numeric, + average_consideration + numeric, + average_rating + numeric, + recording_date + date + DEFAULT + now +( +) NOT NULL, + resolved_percent numeric, + not_resolved_percent numeric, + recruitment_id character +( + 36 +) NOT NULL, + spring_autumn character varying NOT NULL + ); + + +ALTER TABLE IF EXISTS recruitment_campaign.appeals OWNER TO "ervu-dashboard"; + + + +COMMENT +ON COLUMN recruitment_campaign.appeals.total_appeals IS 'Получено жалоб'; + + + +COMMENT +ON COLUMN recruitment_campaign.appeals.resolved IS 'Решено'; + + + +COMMENT +ON COLUMN recruitment_campaign.appeals.not_resolved IS 'Не решено'; + + + +COMMENT +ON COLUMN recruitment_campaign.appeals.average_consideration IS 'Время решения'; + + + +COMMENT +ON COLUMN recruitment_campaign.appeals.average_rating IS 'Оценка удовлетворенности'; + + + +COMMENT +ON COLUMN recruitment_campaign.appeals.recording_date IS 'Дата записи'; + + + +COMMENT +ON COLUMN recruitment_campaign.appeals.resolved_percent IS 'Процент решенных'; + + + +COMMENT +ON COLUMN recruitment_campaign.appeals.not_resolved_percent IS 'Процент не решенных'; + + + +CREATE TABLE IF NOT EXISTS recruitment_campaign.postponement_info +( + postponement_info_id + bigint + NOT + NULL, + suitable_recruit + numeric, + postponement_have_right + numeric, + postponement_granted + numeric, + recording_date + date + DEFAULT + now +( +), + postponement_have_right_percent numeric, + postponement_granted_percent numeric, + recruitment_id character +( + 36 +), + testspring_autumn character +( + 36 +) + ); + + +ALTER TABLE IF EXISTS recruitment_campaign.postponement_info OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE recruitment_campaign.postponement_info IS 'статистика по отсрочке и призывам'; + + + +COMMENT +ON COLUMN recruitment_campaign.postponement_info.suitable_recruit IS 'Подходят под призыв'; + + + +COMMENT +ON COLUMN recruitment_campaign.postponement_info.postponement_have_right IS 'Имеют право на отсрочку'; + + + +COMMENT +ON COLUMN recruitment_campaign.postponement_info.postponement_granted IS 'Предоставлена отсрочка'; + + + +COMMENT +ON COLUMN recruitment_campaign.postponement_info.recording_date IS 'Дата записи'; + + + +COMMENT +ON COLUMN recruitment_campaign.postponement_info.postponement_have_right_percent IS 'Процент имеющих право на отсрочку'; + + + +COMMENT +ON COLUMN recruitment_campaign.postponement_info.postponement_granted_percent IS 'Процент предоставленных отсрочек'; + + + +CREATE SEQUENCE recruitment_campaign.recruitment_id_recruitment_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS recruitment_campaign.recruitment_id_recruitment_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE recruitment_campaign.recruitment_id_recruitment_seq OWNED BY recruitment_campaign.postponement_info.postponement_info_id; + + + +CREATE TABLE IF NOT EXISTS recruitment_campaign.subpoenas +( + subpoena + numeric, + appeared + numeric, + not_appeared + numeric, + not_ap_good_reason + numeric, + ap_not_required + numeric, + restrictions_applied + numeric, + recording_date + date + DEFAULT + now +( +) NOT NULL, + appeared_percent numeric, + not_appeared_percent numeric, + not_ap_good_reason_percent numeric, + ap_not_required_percent numeric, + restrictions_applied_percent numeric, + introduced_measures numeric, + introduced_measures_percent numeric, + recruitment_id character +( + 36 +) NOT NULL, + rest numeric, + spring_autumn character +( + 36 +) NOT NULL, + id_subpoena bigint NOT NULL, + count_not_delivery numeric, + appear_date_is_good numeric, + not_delivery_percent numeric, + appear_date_is_good_percent numeric + ); + + +ALTER TABLE IF EXISTS recruitment_campaign.subpoenas OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE recruitment_campaign.subpoenas IS 'Повестки уровень РФ'; + + + +COMMENT +ON COLUMN recruitment_campaign.subpoenas.subpoena IS 'Направлено повесток'; + + + +COMMENT +ON COLUMN recruitment_campaign.subpoenas.appeared IS 'Явились'; + + + +COMMENT +ON COLUMN recruitment_campaign.subpoenas.not_appeared IS 'Не явились'; + + + +COMMENT +ON COLUMN recruitment_campaign.subpoenas.not_ap_good_reason IS 'Не явились по уважительной причине'; + + + +COMMENT +ON COLUMN recruitment_campaign.subpoenas.ap_not_required IS 'Явка не требуется'; + + + +COMMENT +ON COLUMN recruitment_campaign.subpoenas.restrictions_applied IS 'Наложено ограничений'; + + + +COMMENT +ON COLUMN recruitment_campaign.subpoenas.recording_date IS 'Дата записи'; + + + +COMMENT +ON COLUMN recruitment_campaign.subpoenas.appeared_percent IS 'Процент явившихся'; + + + +COMMENT +ON COLUMN recruitment_campaign.subpoenas.not_appeared_percent IS 'Процент не явившихся'; + + + +COMMENT +ON COLUMN recruitment_campaign.subpoenas.not_ap_good_reason_percent IS 'Процент не явившихся по уважительной причине'; + + + +COMMENT +ON COLUMN recruitment_campaign.subpoenas.ap_not_required_percent IS 'Процент тех, где явка не требуется'; + + + +COMMENT +ON COLUMN recruitment_campaign.subpoenas.restrictions_applied_percent IS 'Наложено ограничений'; + + + +COMMENT +ON COLUMN recruitment_campaign.subpoenas.introduced_measures IS 'Введено реализатором мер'; + + + +COMMENT +ON COLUMN recruitment_campaign.subpoenas.introduced_measures_percent IS 'Процент введенных реализатором мер'; + + + +COMMENT +ON COLUMN recruitment_campaign.subpoenas.rest IS 'Остальные'; + + + +COMMENT +ON COLUMN recruitment_campaign.subpoenas.appear_date_is_good IS 'Повестки, дата явки по которым еще не наступила'; + + + +COMMENT +ON COLUMN recruitment_campaign.subpoenas.not_delivery_percent IS 'Процент не врученных повесток'; + + + +COMMENT +ON COLUMN recruitment_campaign.subpoenas.appear_date_is_good_percent IS 'Процент повесток, по которым дата явки еще не наступила'; + + + +CREATE SEQUENCE recruitment_campaign.subpoenas_id_subpoena_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS recruitment_campaign.subpoenas_id_subpoena_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE recruitment_campaign.subpoenas_id_subpoena_seq OWNED BY recruitment_campaign.subpoenas.id_subpoena; + + + +CREATE TABLE IF NOT EXISTS space.military_commissariat +( + id_military_commissariat + bigint + NOT + NULL, + military_commissariat_name + text +); + + +ALTER TABLE IF EXISTS space.military_commissariat OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE space.military_commissariat IS 'Военные комиссариаты'; + + + +COMMENT +ON COLUMN space.military_commissariat.military_commissariat_name IS 'Наименование военного комиссариата'; + + + +CREATE SEQUENCE space.military_commissariat_id_military_commissariat_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS space.military_commissariat_id_military_commissariat_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE space.military_commissariat_id_military_commissariat_seq OWNED BY space.military_commissariat.id_military_commissariat; + + + +CREATE TABLE IF NOT EXISTS space.military_district +( + id_military_district + bigint + NOT + NULL, + military_district_name + text +); + + +ALTER TABLE IF EXISTS space.military_district OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE space.military_district IS 'Военные округа'; + + + +COMMENT +ON COLUMN space.military_district.military_district_name IS 'Наименование военного округа'; + + + +CREATE SEQUENCE space.military_district_id_military_district_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS space.military_district_id_military_district_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE space.military_district_id_military_district_seq OWNED BY space.military_district.id_military_district; + + + +CREATE TABLE IF NOT EXISTS space.region +( + id_region + bigint + NOT + NULL, + region + text +); + + +ALTER TABLE IF EXISTS space.region OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE space.region IS 'Регионы'; + + + +COMMENT +ON COLUMN space.region.region IS 'Наименование региона'; + + + +CREATE SEQUENCE space.region_id_region_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS space.region_id_region_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE space.region_id_region_seq OWNED BY space.region.id_region; + + + +CREATE TABLE IF NOT EXISTS space.testrecruitment +( + id + character +( + 36 +) NOT NULL, + shortname character +( + 300 +), + idm_id character varying +( + 36 +), + code character +( + 300 +), + parent_id character +( + 300 +) + ); + + +ALTER TABLE IF EXISTS space.testrecruitment OWNER TO "ervu-dashboard"; + + + +CREATE TABLE IF NOT EXISTS space.ztestrecruitment +( + id + uuid, + name + text +); + + +ALTER TABLE IF EXISTS space.ztestrecruitment OWNER TO "ervu-dashboard"; + + + +CREATE TABLE IF NOT EXISTS total_registered.age +( + "17_yaers" + numeric, + "18-26_years" + numeric, + "27-30_years" + numeric, + "31-35_years" + numeric, + "36-40_years" + numeric, + "41-45_years" + numeric, + "51+_years" + numeric, + "all_M_W" + character +( + 10 +) NOT NULL, + recording_date date DEFAULT now +( +) NOT NULL, + "46-50_years" numeric, + "17_yaers_percent" numeric, + "18-26_years_percent" numeric, + "27-30_years_percent" numeric, + "31-35_years_percent" numeric, + "36-40_years_percent" numeric, + "41-45_years_percent" numeric, + "46-50_years_percent" numeric, + "51+_years_percent" numeric, + recruitment_id character +( + 36 +) NOT NULL, + registered character +( + 10 +) NOT NULL, + id_age bigint NOT NULL + ); + + +ALTER TABLE IF EXISTS total_registered.age OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE total_registered.age IS 'Возраст состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; + + + +COMMENT +ON COLUMN total_registered.age."17_yaers" IS 'Возраст 17'; + + + +COMMENT +ON COLUMN total_registered.age."18-26_years" IS 'Возраст 18-26'; + + + +COMMENT +ON COLUMN total_registered.age."27-30_years" IS 'Возраст 27-30'; + + + +COMMENT +ON COLUMN total_registered.age."31-35_years" IS 'Возраст 31-35'; + + + +COMMENT +ON COLUMN total_registered.age."36-40_years" IS 'Возраст 36-40'; + + + +COMMENT +ON COLUMN total_registered.age."41-45_years" IS 'Возраст 41-45'; + + + +COMMENT +ON COLUMN total_registered.age."51+_years" IS 'Возраст 51+'; + + + +COMMENT +ON COLUMN total_registered.age."all_M_W" IS 'Все/мужчины/женщины'; + + + +COMMENT +ON COLUMN total_registered.age.recording_date IS 'Дата записи'; + + + +COMMENT +ON COLUMN total_registered.age."46-50_years" IS 'Возраст 46-50'; + + + +COMMENT +ON COLUMN total_registered.age."17_yaers_percent" IS 'Возраст 17 в процентах'; + + + +COMMENT +ON COLUMN total_registered.age."18-26_years_percent" IS 'Возраст 18-26 в процентах'; + + + +COMMENT +ON COLUMN total_registered.age."27-30_years_percent" IS 'Возраст 27-30 в процентах'; + + + +COMMENT +ON COLUMN total_registered.age."31-35_years_percent" IS 'Возраст 31-35 в процентах'; + + + +COMMENT +ON COLUMN total_registered.age."36-40_years_percent" IS 'Возраст 36-40 в процентах'; + + + +COMMENT +ON COLUMN total_registered.age."41-45_years_percent" IS 'Возраст 41-45 в процентах'; + + + +COMMENT +ON COLUMN total_registered.age."46-50_years_percent" IS 'Возраст 46-50 в процентах'; + + + +COMMENT +ON COLUMN total_registered.age."51+_years_percent" IS 'Возраст 51+ в процентах'; + + + +CREATE SEQUENCE total_registered.age_id_age_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS total_registered.age_id_age_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE total_registered.age_id_age_seq OWNED BY total_registered.age.id_age; + + + +CREATE TABLE IF NOT EXISTS total_registered.busyness +( + study + numeric, + work + numeric, + not_work + numeric, + recording_date + date + DEFAULT + now +( +) NOT NULL, + study_percent numeric, + work_percent numeric, + not_work_percent numeric, + recruitment_id character +( + 36 +) NOT NULL, + registered character varying NOT NULL, + "all_M_W" character varying NOT NULL, + busyness numeric + ); + + +ALTER TABLE IF EXISTS total_registered.busyness OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE total_registered.busyness IS 'Занятость состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; + + + +COMMENT +ON COLUMN total_registered.busyness.study IS 'Учатся'; + + + +COMMENT +ON COLUMN total_registered.busyness.work IS 'Работают'; + + + +COMMENT +ON COLUMN total_registered.busyness.not_work IS 'Безработные'; + + + +COMMENT +ON COLUMN total_registered.busyness.recording_date IS 'Дата записи'; + + + +COMMENT +ON COLUMN total_registered.busyness.study_percent IS 'Учатся в процентах'; + + + +COMMENT +ON COLUMN total_registered.busyness.work_percent IS 'Работают в процентах'; + + + +COMMENT +ON COLUMN total_registered.busyness.not_work_percent IS 'Безработные в процентах'; + + + +CREATE TABLE IF NOT EXISTS total_registered.child_minor +( + no_child + numeric, + "1_child" + numeric, + "2_child" + numeric, + "3_child" + numeric, + "4_more_child" + numeric, + "all_M_W" + character +( + 10 +) NOT NULL, + recording_date date DEFAULT now +( +) NOT NULL, + no_child_percent numeric, + "1_child_percent" numeric, + "2_child_percent" numeric, + "3_child_percent" numeric, + "4_more_child_percent" numeric, + recruitment_id character +( + 36 +) NOT NULL, + id_child_minor bigint NOT NULL + ); + + +ALTER TABLE IF EXISTS total_registered.child_minor OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE total_registered.child_minor IS 'Дети то 18 лет состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; + + + +COMMENT +ON COLUMN total_registered.child_minor.no_child IS 'Нет детей'; + + + +COMMENT +ON COLUMN total_registered.child_minor."1_child" IS '1 ребенок'; + + + +COMMENT +ON COLUMN total_registered.child_minor."2_child" IS '2 ребенка'; + + + +COMMENT +ON COLUMN total_registered.child_minor."3_child" IS '3 ребенка'; + + + +COMMENT +ON COLUMN total_registered.child_minor."4_more_child" IS '4 и более'; + + + +COMMENT +ON COLUMN total_registered.child_minor."all_M_W" IS 'Все/Мужчины/Женщины'; + + + +COMMENT +ON COLUMN total_registered.child_minor.recording_date IS 'Дата записи'; + + + +COMMENT +ON COLUMN total_registered.child_minor.no_child_percent IS 'Нет детей в процентах'; + + + +COMMENT +ON COLUMN total_registered.child_minor."1_child_percent" IS '1 ребенок в процентах'; + + + +COMMENT +ON COLUMN total_registered.child_minor."2_child_percent" IS '2 ребенка в процентах'; + + + +COMMENT +ON COLUMN total_registered.child_minor."3_child_percent" IS '3 ребенка в процентах'; + + + +COMMENT +ON COLUMN total_registered.child_minor."4_more_child_percent" IS '4 и более ребенка в процентах'; + + + +CREATE SEQUENCE total_registered.child_minor_id_child_minor_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS total_registered.child_minor_id_child_minor_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE total_registered.child_minor_id_child_minor_seq OWNED BY total_registered.child_minor.id_child_minor; + + + +CREATE TABLE IF NOT EXISTS total_registered.driver_license +( + nope + numeric, + "A" + numeric, + "B" + numeric, + "C" + numeric, + "D" + numeric, + "E" + numeric, + "all_M_W" + character +( + 10 +) NOT NULL, + recording_date date DEFAULT now +( +) NOT NULL, + nope_repcent numeric, + "A_repcent" numeric, + "B_repcent" numeric, + "C_repcent" numeric, + "D_repcent" numeric, + "E_repcent" numeric, + recruitment_id character +( + 36 +) NOT NULL, + id_driver_license bigint NOT NULL + ); + + +ALTER TABLE IF EXISTS total_registered.driver_license OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE total_registered.driver_license IS 'Наличие водительского удостоверения состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; + + + +COMMENT +ON COLUMN total_registered.driver_license.nope IS 'нет водительского удостоверения'; + + + +COMMENT +ON COLUMN total_registered.driver_license."A" IS 'категория A'; + + + +COMMENT +ON COLUMN total_registered.driver_license."B" IS 'категория B'; + + + +COMMENT +ON COLUMN total_registered.driver_license."C" IS 'категория C'; + + + +COMMENT +ON COLUMN total_registered.driver_license."D" IS 'категория D'; + + + +COMMENT +ON COLUMN total_registered.driver_license."E" IS 'категория E'; + + + +COMMENT +ON COLUMN total_registered.driver_license."all_M_W" IS 'Все/Мужчины/Женщины'; + + + +COMMENT +ON COLUMN total_registered.driver_license.recording_date IS 'Дата записи'; + + + +COMMENT +ON COLUMN total_registered.driver_license.nope_repcent IS 'нет водительского удостоверения в процентах'; + + + +COMMENT +ON COLUMN total_registered.driver_license."A_repcent" IS 'категория A в процентах'; + + + +COMMENT +ON COLUMN total_registered.driver_license."B_repcent" IS 'категория B в процентах'; + + + +COMMENT +ON COLUMN total_registered.driver_license."C_repcent" IS 'категория C в процентах'; + + + +COMMENT +ON COLUMN total_registered.driver_license."D_repcent" IS 'категория D в процентах'; + + + +COMMENT +ON COLUMN total_registered.driver_license."E_repcent" IS 'категория E в процентах'; + + + +CREATE SEQUENCE total_registered.driver_license_id_driver_license_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS total_registered.driver_license_id_driver_license_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE total_registered.driver_license_id_driver_license_seq OWNED BY total_registered.driver_license.id_driver_license; + + + +CREATE TABLE IF NOT EXISTS total_registered.education_level +( + higher + numeric, + average + numeric, + "all_M_W" + text + NOT + NULL, + only_general + numeric, + no_data + numeric, + recording_date + date + DEFAULT + now +( +) NOT NULL, + higher_percent numeric, + average_percent numeric, + only_general_percent numeric, + no_data_percent numeric, + recruitment_id character +( + 36 +) NOT NULL, + education_level numeric + ); + + +ALTER TABLE IF EXISTS total_registered.education_level OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE total_registered.education_level IS 'Уровень образования состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; + + + +COMMENT +ON COLUMN total_registered.education_level.higher IS 'Высшее образование'; + + + +COMMENT +ON COLUMN total_registered.education_level.average IS 'Среднее профессиональное'; + + + +COMMENT +ON COLUMN total_registered.education_level."all_M_W" IS 'Все/Мужчины/Женщины'; + + + +COMMENT +ON COLUMN total_registered.education_level.only_general IS 'Только общее'; + + + +COMMENT +ON COLUMN total_registered.education_level.no_data IS 'Нет данных'; + + + +COMMENT +ON COLUMN total_registered.education_level.recording_date IS 'Дата записи'; + + + +COMMENT +ON COLUMN total_registered.education_level.higher_percent IS 'Высшее образование в процентах'; + + + +COMMENT +ON COLUMN total_registered.education_level.average_percent IS 'Среднее профессиональное в процентах'; + + + +COMMENT +ON COLUMN total_registered.education_level.only_general_percent IS 'Только общее в процентах'; + + + +COMMENT +ON COLUMN total_registered.education_level.no_data_percent IS 'Нет данных об образованиии в процентах'; + + + +CREATE TABLE IF NOT EXISTS total_registered.marital_status +( + married + numeric, + not_married + numeric, + "all_M_W" + text + NOT + NULL, + recording_date + date + DEFAULT + now +( +) NOT NULL, + married_percent numeric, + not_married_percent numeric, + recruitment_id character +( + 36 +) NOT NULL, + marital_status numeric + ); + + +ALTER TABLE IF EXISTS total_registered.marital_status OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE total_registered.marital_status IS 'Семейное положение состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; + + + +COMMENT +ON COLUMN total_registered.marital_status.married IS 'В браке'; + + + +COMMENT +ON COLUMN total_registered.marital_status.not_married IS 'Холост'; + + + +COMMENT +ON COLUMN total_registered.marital_status."all_M_W" IS 'Все/Мужчины/Женщины'; + + + +COMMENT +ON COLUMN total_registered.marital_status.recording_date IS 'Дата записи'; + + + +COMMENT +ON COLUMN total_registered.marital_status.married_percent IS 'В браке в процентах'; + + + +COMMENT +ON COLUMN total_registered.marital_status.not_married_percent IS 'Холост в процентах'; + + + +CREATE TABLE IF NOT EXISTS total_registered.reg_mil_cat +( + first_reg_17 + numeric, + first_reg_18 + numeric, + returned_dep_liberty + numeric, + "mil_spec_W" + numeric, + punished + numeric, + received_citizenship + numeric, + recording_date + date + DEFAULT + now +( +) NOT NULL, + first_reg_17_percent numeric, + first_reg_18_percent numeric, + returned_dep_liberty_percent numeric, + "mil_spec_W_percent" numeric, + punished_percent numeric, + received_citizenship_percent numeric, + recruitment_id character +( + 36 +) NOT NULL, + mil_reg numeric NOT NULL, + id_reg_mil_cat bigint NOT NULL + ); + + +ALTER TABLE IF EXISTS total_registered.reg_mil_cat OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE total_registered.reg_mil_cat IS 'Категории постановки на воинский учет состоящих/не состоящих на учете уровень РФ'; + + + +COMMENT +ON COLUMN total_registered.reg_mil_cat.first_reg_17 IS 'Первоначальная постановка на воинский учет граждан от 17 лет'; + + + +COMMENT +ON COLUMN total_registered.reg_mil_cat.first_reg_18 IS 'Первоначальная постановка на воинский учет граждан от 18 лет'; + + + +COMMENT +ON COLUMN total_registered.reg_mil_cat.returned_dep_liberty IS 'Возвратившиеся из мест лишения свободы'; + + + +COMMENT +ON COLUMN total_registered.reg_mil_cat."mil_spec_W" IS 'Женщины, получившие ВУС'; + + + +COMMENT +ON COLUMN total_registered.reg_mil_cat.punished IS 'Отбывающие наказание в местах лишения свободы'; + + + +COMMENT +ON COLUMN total_registered.reg_mil_cat.received_citizenship IS 'Получившие гражданство'; + + + +COMMENT +ON COLUMN total_registered.reg_mil_cat.recording_date IS 'Дата записи'; + + + +COMMENT +ON COLUMN total_registered.reg_mil_cat.first_reg_17_percent IS 'Первоначальная постановка на воинский учет граждан от 17 лет в процентах'; + + + +COMMENT +ON COLUMN total_registered.reg_mil_cat.first_reg_18_percent IS 'Первоначальная постановка на воинский учет граждан от 18 лет в процентах'; + + + +COMMENT +ON COLUMN total_registered.reg_mil_cat.returned_dep_liberty_percent IS 'Возвратившиеся из мест лишения свободы в процентах'; + + + +COMMENT +ON COLUMN total_registered.reg_mil_cat."mil_spec_W_percent" IS 'Женщины, получившие ВУС в процентах'; + + + +COMMENT +ON COLUMN total_registered.reg_mil_cat.punished_percent IS 'Отбывающие наказание в местах лишения свободы в процентах'; + + + +COMMENT +ON COLUMN total_registered.reg_mil_cat.received_citizenship_percent IS 'Получившие гражданство в процентах'; + + + +CREATE SEQUENCE total_registered.reg_mil_cat_id_reg_mil_cat_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS total_registered.reg_mil_cat_id_reg_mil_cat_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE total_registered.reg_mil_cat_id_reg_mil_cat_seq OWNED BY total_registered.reg_mil_cat.id_reg_mil_cat; + + + +CREATE TABLE IF NOT EXISTS total_registered.removed_registry +( + removed_registry + numeric, + deprivation_citizenship + numeric, + age_limit + numeric, + death + numeric, + travel_abroad + numeric, + living_abroad + numeric, + other + numeric, + recording_date + date + DEFAULT + now +( +) NOT NULL, + deprivation_citizen_percents numeric, + age_limit_percent numeric, + death_percent numeric, + travel_abroad_percent numeric, + living_abroad_percent numeric, + other_percent numeric, + recruitment_id character +( + 36 +) NOT NULL, + id_removed_registry bigint NOT NULL + ); + + +ALTER TABLE IF EXISTS total_registered.removed_registry OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE total_registered.removed_registry IS 'Снято с учета уровень РФ'; + + + +COMMENT +ON COLUMN total_registered.removed_registry.removed_registry IS 'Снято с учета'; + + + +COMMENT +ON COLUMN total_registered.removed_registry.deprivation_citizenship IS 'Лишение гражданства'; + + + +COMMENT +ON COLUMN total_registered.removed_registry.age_limit IS 'Наступление предельного возраста'; + + + +COMMENT +ON COLUMN total_registered.removed_registry.death IS 'Смерть'; + + + +COMMENT +ON COLUMN total_registered.removed_registry.travel_abroad IS 'Выезд за границу на срок более 6 месяцев'; + + + +COMMENT +ON COLUMN total_registered.removed_registry.living_abroad IS 'Проживающие за границей'; + + + +COMMENT +ON COLUMN total_registered.removed_registry.other IS 'Прочее'; + + + +COMMENT +ON COLUMN total_registered.removed_registry.recording_date IS 'Дата записи'; + + + +COMMENT +ON COLUMN total_registered.removed_registry.deprivation_citizen_percents IS 'Лишение гражданства в процентах'; + + + +COMMENT +ON COLUMN total_registered.removed_registry.age_limit_percent IS 'Наступление предельного возраста в процентах'; + + + +COMMENT +ON COLUMN total_registered.removed_registry.death_percent IS 'Смерть в процентах'; + + + +COMMENT +ON COLUMN total_registered.removed_registry.travel_abroad_percent IS 'Выезд за границу на срок более 6 месяцев в процентах'; + + + +COMMENT +ON COLUMN total_registered.removed_registry.living_abroad_percent IS 'Проживающие за границей в процентах'; + + + +COMMENT +ON COLUMN total_registered.removed_registry.other_percent IS 'Прочее в процентах'; + + + +CREATE SEQUENCE total_registered.removed_registry_id_removed_registry_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS total_registered.removed_registry_id_removed_registry_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE total_registered.removed_registry_id_removed_registry_seq OWNED BY total_registered.removed_registry.id_removed_registry; + + + +CREATE TABLE IF NOT EXISTS total_registered.subpoenas +( + subpoena + numeric, + average_appeared + numeric, + appeared + numeric, + not_appeared + numeric, + not_ap_good_reason + numeric, + ap_not_required + numeric, + electron + numeric, + paper + numeric, + restrictions_applied + numeric, + introduced_measures + numeric, + recording_date + date + DEFAULT + now +( +) NOT NULL, + appeared_percent numeric, + not_appeared_percent numeric, + not_ap_good_reason_percent numeric, + ap_not_required_percent numeric, + electron_percent numeric, + paper_percent numeric, + restrictions_applied_percent numeric, + introduced_measures_percent numeric, + recruitment_id character +( + 36 +) NOT NULL, + mil_reg numeric NOT NULL, + id_subpoena bigint NOT NULL, + count_not_delivery numeric, + appear_date_is_good numeric, + not_delivery_percent numeric, + appear_date_is_good_percent numeric + ); + + +ALTER TABLE IF EXISTS total_registered.subpoenas OWNER TO "ervu-dashboard"; + + + +COMMENT +ON TABLE total_registered.subpoenas IS 'Повестки состоящих/не состоящих на учете уровень РФ'; + + + +COMMENT +ON COLUMN total_registered.subpoenas.subpoena IS 'Направлено повесток'; + + + +COMMENT +ON COLUMN total_registered.subpoenas.average_appeared IS 'Средний срок явки'; + + + +COMMENT +ON COLUMN total_registered.subpoenas.appeared IS 'Явились'; + + + +COMMENT +ON COLUMN total_registered.subpoenas.not_appeared IS 'Не явились'; + + + +COMMENT +ON COLUMN total_registered.subpoenas.not_ap_good_reason IS 'Не явились по уважительной причине'; + + + +COMMENT +ON COLUMN total_registered.subpoenas.ap_not_required IS 'Явка не требуется'; + + + +COMMENT +ON COLUMN total_registered.subpoenas.electron IS 'Электронно'; + + + +COMMENT +ON COLUMN total_registered.subpoenas.paper IS 'Нарочно'; + + + +COMMENT +ON COLUMN total_registered.subpoenas.restrictions_applied IS 'Применено ограничений'; + + + +COMMENT +ON COLUMN total_registered.subpoenas.introduced_measures IS 'Введено реализатором мер'; + + + +COMMENT +ON COLUMN total_registered.subpoenas.recording_date IS 'Дата записи'; + + + +COMMENT +ON COLUMN total_registered.subpoenas.appeared_percent IS 'Явились в процентах'; + + + +COMMENT +ON COLUMN total_registered.subpoenas.not_appeared_percent IS 'Не явились в процентах'; + + + +COMMENT +ON COLUMN total_registered.subpoenas.not_ap_good_reason_percent IS 'Не явились по уважительной причине в процентах'; + + + +COMMENT +ON COLUMN total_registered.subpoenas.ap_not_required_percent IS 'Явка не требуется в процентах'; + + + +COMMENT +ON COLUMN total_registered.subpoenas.electron_percent IS 'Электронно в процентах'; + + + +COMMENT +ON COLUMN total_registered.subpoenas.paper_percent IS 'Нарочно в процентах'; + + + +COMMENT +ON COLUMN total_registered.subpoenas.restrictions_applied_percent IS 'Применено ограничений в процентах'; + + + +COMMENT +ON COLUMN total_registered.subpoenas.introduced_measures_percent IS 'Введено реализатором мер в процентах'; + + + +COMMENT +ON COLUMN total_registered.subpoenas.count_not_delivery IS 'Количество не врученных повесток'; + + + +COMMENT +ON COLUMN total_registered.subpoenas.appear_date_is_good IS 'Повестки, дата явки по которым еще не наступила'; + + + +COMMENT +ON COLUMN total_registered.subpoenas.not_delivery_percent IS 'Процент не врученных повесток'; + + + +COMMENT +ON COLUMN total_registered.subpoenas.appear_date_is_good_percent IS 'Процент повесток, дата явки по которым еще не наступила'; + + + +CREATE SEQUENCE total_registered.subpoenas_id_subpoena_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; + + +ALTER TABLE IF EXISTS total_registered.subpoenas_id_subpoena_seq OWNER TO "ervu-dashboard"; + + + +ALTER SEQUENCE total_registered.subpoenas_id_subpoena_seq OWNED BY total_registered.subpoenas.id_subpoena; + + + +ALTER TABLE IF EXISTS ONLY appeals.main_profile ALTER COLUMN id_main_profile SET DEFAULT nextval('appeals.main_profile_id_main_profile_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY appeals.reasons_appeal ALTER COLUMN id_reasons_appeal SET DEFAULT nextval('appeals.reasons_appeal_id_reasons_appeal_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY appeals.review_rating ALTER COLUMN id_review_rating SET DEFAULT nextval('appeals.review_rating_id_review_rating_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY appeals.topic_appeal ALTER COLUMN id_topic_appeal SET DEFAULT nextval('appeals.topic_appeal_id_topic_appeal_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_child ALTER COLUMN citizen_child_id SET DEFAULT nextval('ervu_dashboard.citizen_child_citizen_child_id_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_guardianship ALTER COLUMN citizen_guardianship_id SET DEFAULT nextval('ervu_dashboard.citizen_guardianship_citizen_guardianship_id_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_spouse ALTER COLUMN citizen_spouse_id SET DEFAULT nextval('ervu_dashboard.citizen_spouse_citizen_spouse_id_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizenship ALTER COLUMN citizenship_id SET DEFAULT nextval('ervu_dashboard.citizenship_citizenship_id_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizenship_foreign ALTER COLUMN citizenship_foreign_id SET DEFAULT nextval('ervu_dashboard.citizenship_foreign_citizenship_foreign_id_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.decision ALTER COLUMN decision_id SET DEFAULT nextval('ervu_dashboard.decision_decision_id_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.deputy ALTER COLUMN deputy_id SET DEFAULT nextval('ervu_dashboard.deputy_deputy_id_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.disability ALTER COLUMN disability_id SET DEFAULT nextval('ervu_dashboard.disability_disability_id_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.disease ALTER COLUMN disease_id SET DEFAULT nextval('ervu_dashboard.disease_disease_id_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.drivers_licence ALTER COLUMN drivers_licence_id SET DEFAULT nextval('ervu_dashboard.drivers_licence_drivers_licence_id_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.medical_authorities ALTER COLUMN medical_authorities_id SET DEFAULT nextval('ervu_dashboard.medical_authorities_medical_authorities_id_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.passport ALTER COLUMN passport_id SET DEFAULT nextval('ervu_dashboard.passport_passport_id_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.property ALTER COLUMN property_id SET DEFAULT nextval('ervu_dashboard.property_property_id_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.prosecution ALTER COLUMN prosecution_id SET DEFAULT nextval('ervu_dashboard.prosecution_prosecution_id_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.punishment ALTER COLUMN punishment_id SET DEFAULT nextval('ervu_dashboard.punishment_punishment_id_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.work ALTER COLUMN work_id SET DEFAULT nextval('ervu_dashboard.work_work_id_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY main_dashboard.appeals ALTER COLUMN id_appeal SET DEFAULT nextval('main_dashboard.appeals_id_appeal_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY main_dashboard.recruitment_campaign ALTER COLUMN id_recruitment_campaign SET DEFAULT nextval('main_dashboard.recruitment_campaign_id_recruitment_campaign_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY main_dashboard.total_registered ALTER COLUMN id_total_registered SET DEFAULT nextval('main_dashboard.total_registered_id_total_registered_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY main_dashboard.waiting_registration ALTER COLUMN id_waiting_registration SET DEFAULT nextval('main_dashboard.waiting_registration_id_waiting_registration_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY public.job_log ALTER COLUMN id_job SET DEFAULT nextval('public.job_log_id_job_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY ratings.appear_subppoena ALTER COLUMN id_appear_subppoena SET DEFAULT nextval('ratings.appear_subppoena_id_appear_subppoena_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY ratings.consideration_complaint ALTER COLUMN id_consideration_complaint SET DEFAULT nextval('ratings.consideration_complaint_id_consideration_complaint_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY recruitment_campaign.postponement_info ALTER COLUMN postponement_info_id SET DEFAULT nextval('recruitment_campaign.recruitment_id_recruitment_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY recruitment_campaign.subpoenas ALTER COLUMN id_subpoena SET DEFAULT nextval('recruitment_campaign.subpoenas_id_subpoena_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY space.military_commissariat ALTER COLUMN id_military_commissariat SET DEFAULT nextval('space.military_commissariat_id_military_commissariat_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY space.military_district ALTER COLUMN id_military_district SET DEFAULT nextval('space.military_district_id_military_district_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY space.region ALTER COLUMN id_region SET DEFAULT nextval('space.region_id_region_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY total_registered.age ALTER COLUMN id_age SET DEFAULT nextval('total_registered.age_id_age_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY total_registered.child_minor ALTER COLUMN id_child_minor SET DEFAULT nextval('total_registered.child_minor_id_child_minor_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY total_registered.driver_license ALTER COLUMN id_driver_license SET DEFAULT nextval('total_registered.driver_license_id_driver_license_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY total_registered.reg_mil_cat ALTER COLUMN id_reg_mil_cat SET DEFAULT nextval('total_registered.reg_mil_cat_id_reg_mil_cat_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY total_registered.removed_registry ALTER COLUMN id_removed_registry SET DEFAULT nextval('total_registered.removed_registry_id_removed_registry_seq'::regclass); + + + +ALTER TABLE IF EXISTS ONLY total_registered.subpoenas ALTER COLUMN id_subpoena SET DEFAULT nextval('total_registered.subpoenas_id_subpoena_seq'::regclass); + + +SELECT pg_catalog.setval('appeals.main_profile_id_main_profile_seq', 1, false); + + + +SELECT pg_catalog.setval('appeals.reasons_appeal_id_reasons_appeal_seq', 1, true); + + + +SELECT pg_catalog.setval('appeals.review_rating_id_review_rating_seq', 6, true); + + + +SELECT pg_catalog.setval('appeals.topic_appeal_id_topic_appeal_seq', 1, true); + + + +SELECT pg_catalog.setval('ervu_dashboard.citizen_child_citizen_child_id_seq', 132950, true); + + + +SELECT pg_catalog.setval('ervu_dashboard.citizen_guardianship_citizen_guardianship_id_seq', 4653, + true); + + + +SELECT pg_catalog.setval('ervu_dashboard.citizen_spouse_citizen_spouse_id_seq', 229504, true); + + + +SELECT pg_catalog.setval('ervu_dashboard.citizenship_citizenship_id_seq', 69012, true); + + + +SELECT pg_catalog.setval('ervu_dashboard.citizenship_foreign_citizenship_foreign_id_seq', 71568, + true); + + + +SELECT pg_catalog.setval('ervu_dashboard.decision_decision_id_seq', 1, false); + + + +SELECT pg_catalog.setval('ervu_dashboard.deputy_deputy_id_seq', 47, true); + + + +SELECT pg_catalog.setval('ervu_dashboard.disability_disability_id_seq', 94609, true); + + + +SELECT pg_catalog.setval('ervu_dashboard.disease_disease_id_seq', 198170, true); + + + +SELECT pg_catalog.setval('ervu_dashboard.drivers_licence_drivers_licence_id_seq', 7056, true); + + + +SELECT pg_catalog.setval('ervu_dashboard.medical_authorities_medical_authorities_id_seq', 298794, + true); + + + +SELECT pg_catalog.setval('ervu_dashboard.passport_passport_id_seq', 53048, true); + + + +SELECT pg_catalog.setval('ervu_dashboard.property_property_id_seq', 372952, true); + + + +SELECT pg_catalog.setval('ervu_dashboard.prosecution_prosecution_id_seq', 44, true); + + + +SELECT pg_catalog.setval('ervu_dashboard.punishment_punishment_id_seq', 22, true); + + + +SELECT pg_catalog.setval('ervu_dashboard.subpoena_subpoena_id_seq', 27501, true); + + + +SELECT pg_catalog.setval('ervu_dashboard.temporary_measures_temporary_measures_id_seq', 12191, + true); + + + +SELECT pg_catalog.setval('ervu_dashboard.testrecruitment_sort_seq', 90, true); + + + +SELECT pg_catalog.setval('ervu_dashboard.work_work_id_seq', 1, false); + + + +SELECT pg_catalog.setval('main_dashboard.appeals_id_appeal_seq', 796, true); + + + +SELECT pg_catalog.setval('main_dashboard.recruitment_campaign_id_recruitment_campaign_seq', 1522, + true); + + + +SELECT pg_catalog.setval('main_dashboard.total_registered_id_total_registered_seq', 830, true); + + + +SELECT pg_catalog.setval('main_dashboard.waiting_registration_id_waiting_registration_seq', 742, + true); + + + +SELECT pg_catalog.setval('public.job_log_id_job_seq', 1, false); + + + +SELECT pg_catalog.setval('ratings.appear_subppoena_id_appear_subppoena_seq', 6, true); + + + +SELECT pg_catalog.setval('ratings.consideration_complaint_id_consideration_complaint_seq', 6, true); + + + +SELECT pg_catalog.setval('ratings."ratings.conscription_info_id_ratings.conscription_info_seq"', 6, + true); + + + +SELECT pg_catalog.setval('recruitment_campaign.recruitment_id_recruitment_seq', 2, true); + + + +SELECT pg_catalog.setval('recruitment_campaign.subpoenas_id_subpoena_seq', 1111, true); + + + +SELECT pg_catalog.setval('space.military_commissariat_id_military_commissariat_seq', 1, true); + + + +SELECT pg_catalog.setval('space.military_district_id_military_district_seq', 1, true); + + + +SELECT pg_catalog.setval('space.region_id_region_seq', 15, true); + + + +SELECT pg_catalog.setval('total_registered.age_id_age_seq', 2250, true); + + + +SELECT pg_catalog.setval('total_registered.child_minor_id_child_minor_seq', 2124, true); + + + +SELECT pg_catalog.setval('total_registered.driver_license_id_driver_license_seq', 1849, true); + + + +SELECT pg_catalog.setval('total_registered.reg_mil_cat_id_reg_mil_cat_seq', 885, true); + + + +SELECT pg_catalog.setval('total_registered.removed_registry_id_removed_registry_seq', 609, true); + + + +SELECT pg_catalog.setval('total_registered.subpoenas_id_subpoena_seq', 1184, true); + + + +ALTER TABLE IF EXISTS ONLY appeals.main_profile + ADD CONSTRAINT pk_main_profile PRIMARY KEY (id_main_profile); + + + +ALTER TABLE IF EXISTS ONLY appeals.reasons_appeal + ADD CONSTRAINT pk_reasons_appeal PRIMARY KEY (id_reasons_appeal); + + + +ALTER TABLE IF EXISTS ONLY appeals.review_rating + ADD CONSTRAINT pk_review_rating PRIMARY KEY (id_review_rating); + + + +ALTER TABLE IF EXISTS ONLY appeals.topic_appeal + ADD CONSTRAINT pk_topic_appeal PRIMARY KEY (id_topic_appeal); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen + ADD CONSTRAINT citizen_pkey PRIMARY KEY (recruit_id); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.decision + ADD CONSTRAINT decision_pkey PRIMARY KEY (decision_id); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_child + ADD CONSTRAINT pk_citizen_child PRIMARY KEY (citizen_child_id); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_guardianship + ADD CONSTRAINT pk_citizen_guardianship PRIMARY KEY (citizen_guardianship_id); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_spouse + ADD CONSTRAINT pk_citizen_spouse PRIMARY KEY (citizen_spouse_id); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizenship + ADD CONSTRAINT pk_citizenship PRIMARY KEY (citizenship_id); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizenship_foreign + ADD CONSTRAINT pk_citizenship_foreign PRIMARY KEY (citizenship_foreign_id); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.deputy + ADD CONSTRAINT pk_deputy PRIMARY KEY (deputy_id); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.disability + ADD CONSTRAINT pk_disability PRIMARY KEY (disability_id); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.disease + ADD CONSTRAINT pk_disease PRIMARY KEY (disease_id); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.drivers_licence + ADD CONSTRAINT pk_drivers_licence PRIMARY KEY (drivers_licence_id); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.medical_authorities + ADD CONSTRAINT pk_medical_authorities PRIMARY KEY (medical_authorities_id); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.passport + ADD CONSTRAINT pk_passport PRIMARY KEY (passport_id); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.property + ADD CONSTRAINT pk_property PRIMARY KEY (property_id); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.prosecution + ADD CONSTRAINT pk_prosecution PRIMARY KEY (prosecution_id); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.punishment + ADD CONSTRAINT pk_punishment PRIMARY KEY (punishment_id); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.work + ADD CONSTRAINT pk_work PRIMARY KEY (work_id); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.pub_recruitment + ADD CONSTRAINT pub_recruitment_pkey PRIMARY KEY (id); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.pub_recruitment + ADD CONSTRAINT recruitment_idm_id_key UNIQUE (idm_id); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.recruitment + ADD CONSTRAINT recruitment_pkey PRIMARY KEY (id); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.subpoena + ADD CONSTRAINT subpoena_pkey PRIMARY KEY (sub_id); + + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.temporary_measures + ADD CONSTRAINT temporary_measures_pkey PRIMARY KEY (temporary_measures_id); + + + +ALTER TABLE IF EXISTS ONLY main_dashboard.appeals + ADD CONSTRAINT appeals_pkey PRIMARY KEY (recruitment_id, recording_date); + + + +ALTER TABLE IF EXISTS ONLY main_dashboard.recruitment_campaign + ADD CONSTRAINT recruitment_campaign_pkey PRIMARY KEY (spring_autumn, recruitment_id, recording_date); + + + +ALTER TABLE IF EXISTS ONLY main_dashboard.total_registered + ADD CONSTRAINT total_registered_pkey PRIMARY KEY (recruitment_id, recording_date); + + + +ALTER TABLE IF EXISTS ONLY main_dashboard.waiting_registration + ADD CONSTRAINT waiting_registration_pkey PRIMARY KEY (recruitment_id, recording_date); + + + +ALTER TABLE IF EXISTS ONLY public.job_log + ADD CONSTRAINT job_log_pkey PRIMARY KEY (id_job); + + + +ALTER TABLE IF EXISTS ONLY ratings.appear_subppoena + ADD CONSTRAINT pk_appear_subppoena PRIMARY KEY (id_appear_subppoena); + + + +ALTER TABLE IF EXISTS ONLY ratings.conscription_info + ADD CONSTRAINT pk_conscription_info PRIMARY KEY (conscription_info_id); + + + +ALTER TABLE IF EXISTS ONLY ratings.consideration_complaint + ADD CONSTRAINT pk_consideration_complaint PRIMARY KEY (id_consideration_complaint); + + + +ALTER TABLE IF EXISTS ONLY recruitment_campaign.appeals + ADD CONSTRAINT appeals_pkey PRIMARY KEY (recording_date, spring_autumn, recruitment_id); + + + +ALTER TABLE IF EXISTS ONLY recruitment_campaign.postponement_info + ADD CONSTRAINT pk_postponement_info PRIMARY KEY (postponement_info_id); + + + +ALTER TABLE IF EXISTS ONLY recruitment_campaign.subpoenas + ADD CONSTRAINT subpoenas_pkey PRIMARY KEY (spring_autumn, recruitment_id, recording_date); + + + +ALTER TABLE IF EXISTS ONLY space.military_district + ADD CONSTRAINT military_district_pkey PRIMARY KEY (id_military_district); + + + +ALTER TABLE IF EXISTS ONLY space.military_commissariat + ADD CONSTRAINT pk_military_commissariat PRIMARY KEY (id_military_commissariat); + + + +ALTER TABLE IF EXISTS ONLY space.region + ADD CONSTRAINT pk_region PRIMARY KEY (id_region); + + + +ALTER TABLE IF EXISTS ONLY space.testrecruitment + ADD CONSTRAINT testrecruitment_pkey PRIMARY KEY (id); + + + +ALTER TABLE IF EXISTS ONLY total_registered.age + ADD CONSTRAINT age_pkey PRIMARY KEY (registered, recruitment_id, recording_date, "all_M_W"); + + + +ALTER TABLE IF EXISTS ONLY total_registered.busyness + ADD CONSTRAINT busyness_pkey PRIMARY KEY (recording_date, recruitment_id, registered, "all_M_W"); + + + +ALTER TABLE IF EXISTS ONLY total_registered.child_minor + ADD CONSTRAINT child_minor_pkey PRIMARY KEY ("all_M_W", recording_date, recruitment_id); + + + +ALTER TABLE IF EXISTS ONLY total_registered.driver_license + ADD CONSTRAINT driver_license_pkey PRIMARY KEY (recruitment_id, "all_M_W", recording_date); + + + +ALTER TABLE IF EXISTS ONLY total_registered.education_level + ADD CONSTRAINT education_level_pkey PRIMARY KEY ("all_M_W", recording_date, recruitment_id); + + + +ALTER TABLE IF EXISTS ONLY total_registered.marital_status + ADD CONSTRAINT marital_status_pkey PRIMARY KEY (recruitment_id, recording_date, "all_M_W"); + + + +ALTER TABLE IF EXISTS ONLY total_registered.reg_mil_cat + ADD CONSTRAINT reg_mil_cat_pkey PRIMARY KEY (mil_reg, recruitment_id, recording_date); + + + +ALTER TABLE IF EXISTS ONLY total_registered.removed_registry + ADD CONSTRAINT removed_registry_pkey PRIMARY KEY (recruitment_id, recording_date); + + + +ALTER TABLE IF EXISTS ONLY total_registered.subpoenas + ADD CONSTRAINT subpoenas_pkey PRIMARY KEY (mil_reg, recruitment_id, recording_date); + + + +CREATE INDEX fki_main_profile_fk1 ON appeals.main_profile USING btree (recruitment_id); + + + +CREATE INDEX fki_reasons_appeal_fk1 ON appeals.reasons_appeal USING btree (recruitment_id); + + + +CREATE INDEX fki_review_rating_fk1 ON appeals.review_rating USING btree (recruitment_id); + + + +CREATE INDEX fki_topic_appeal_fk1 ON appeals.topic_appeal USING btree (recruitment_id); + + + +CREATE INDEX recruitment_military_code_idx ON ervu_dashboard.pub_recruitment USING btree (military_code); + + + +CREATE INDEX recruitment_parent_idx ON ervu_dashboard.pub_recruitment USING btree (parent_id); + + + +CREATE INDEX subpoena_send_date_idx ON ervu_dashboard.subpoena USING btree (send_date); + + + +CREATE INDEX fki_md_appeals_fk1 ON main_dashboard.appeals USING btree (recruitment_id); + + + +CREATE INDEX fki_recruitment_campaign_fk1 ON main_dashboard.recruitment_campaign USING btree (recruitment_id); + + + +CREATE INDEX fki_total_registered_fk1 ON main_dashboard.total_registered USING btree (recruitment_id); + + + +CREATE INDEX fki_waiting_registration_fk1 ON main_dashboard.waiting_registration USING btree (recruitment_id); + + + +CREATE INDEX fki_appear_subppoena_fk1 ON ratings.appear_subppoena USING btree (recruitment_id); + + + +CREATE INDEX fki_consideration_complaint_fk1 ON ratings.consideration_complaint USING btree (recruitment_id); + + + +CREATE INDEX fki_recruitment_fk1 ON ratings.conscription_info USING btree (recruitment_id); + + + +CREATE INDEX fki_rc_appeals_fk1 ON recruitment_campaign.appeals USING btree (recruitment_id); + + + +CREATE INDEX fki_recruitment_fk1 ON recruitment_campaign.postponement_info USING btree (recruitment_id); + + + +CREATE INDEX fki_subpoenas_fk1 ON recruitment_campaign.subpoenas USING btree (recruitment_id); + + + +CREATE INDEX fki_age_fk1 ON total_registered.age USING btree (recruitment_id); + + + +CREATE INDEX fki_busyness_fk1 ON total_registered.busyness USING btree (recruitment_id); + + + +CREATE INDEX fki_child_minor_fk1 ON total_registered.child_minor USING btree (recruitment_id); + + + +CREATE INDEX fki_driver_license_fk1 ON total_registered.driver_license USING btree (recruitment_id); + + + +CREATE INDEX fki_education_level_fk1 ON total_registered.education_level USING btree (recruitment_id); + + + +CREATE INDEX fki_marital_status_fk1 ON total_registered.marital_status USING btree (recruitment_id); + + + +CREATE INDEX fki_reg_mil_cat_fk1 ON total_registered.reg_mil_cat USING btree (recruitment_id); + + + +CREATE INDEX fki_subpoenas_fk1 ON total_registered.subpoenas USING btree (recruitment_id); + + + +ALTER TABLE IF EXISTS ONLY appeals.review_rating + ADD CONSTRAINT fk_region FOREIGN KEY (id_region) REFERENCES space.region(id_region) NOT VALID; + + + +ALTER TABLE IF EXISTS ONLY appeals.main_profile + ADD CONSTRAINT main_profile_fk1 FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.pub_recruitment(id); + + + +ALTER TABLE IF EXISTS ONLY appeals.reasons_appeal + ADD CONSTRAINT reasons_appeal_fk1 FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.pub_recruitment(id); + + + +ALTER TABLE IF EXISTS ONLY appeals.topic_appeal + ADD CONSTRAINT topic_appeal_fk1 FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.pub_recruitment(id); + + + +ALTER TABLE IF EXISTS ONLY ratings.appear_subppoena + ADD CONSTRAINT appear_subppoena_fk1 FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.recruitment(id); + + + +ALTER TABLE IF EXISTS ONLY ratings.conscription_info + ADD CONSTRAINT conscription_info_fk1 FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.recruitment(id); + + + +ALTER TABLE IF EXISTS ONLY ratings.conscription_info + ADD CONSTRAINT conscription_info_fk2 FOREIGN KEY (id_region) REFERENCES space.region(id_region) NOT VALID; + + + +ALTER TABLE IF EXISTS ONLY ratings.consideration_complaint + ADD CONSTRAINT consideration_complaint_fk1 FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.pub_recruitment(id); + + + +ALTER TABLE IF EXISTS ONLY ratings.appear_subppoena + ADD CONSTRAINT fk_region FOREIGN KEY (id_region) REFERENCES space.region(id_region) NOT VALID; + + + +ALTER TABLE IF EXISTS ONLY ratings.consideration_complaint + ADD CONSTRAINT fk_region FOREIGN KEY (id_region) REFERENCES space.region(id_region) NOT VALID; + + + +ALTER TABLE IF EXISTS ONLY recruitment_campaign.postponement_info + ADD CONSTRAINT postponement_info_fk1 FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.recruitment(id) NOT VALID; + + + +GRANT +ALL +ON SCHEMA public TO "ervu-dashboard"; + + + + + + + + diff --git a/backend/src/main/resources/config/v_1.0/2024-10-16--02-core-create-schemes.xml b/backend/src/main/resources/config/v_1.0/2024-10-16--02-core-create-schemes.xml deleted file mode 100644 index de29246f..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-10-16--02-core-create-schemes.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - CREATE SCHEMA IF NOT EXISTS public; - - - - - - ALTER - SCHEMA public OWNER TO postgres - - - - - - GRANT - ALL - ON SCHEMA public TO "ervu-dashboard"; - - - - - - CREATE SCHEMA appeals; - - - - - - ALTER - SCHEMA appeals OWNER TO "ervu-dashboard"; - - - - - - CREATE SCHEMA IF NOT EXISTS ervu_dashboard; - - - - - - ALTER - SCHEMA ervu_dashboard OWNER TO "ervu-dashboard"; - - - - - - CREATE SCHEMA main_dashboard; - - - - - - ALTER - SCHEMA main_dashboard OWNER TO "ervu-dashboard"; - - - - - - CREATE SCHEMA ratings; - - - - - - ALTER - SCHEMA ratings OWNER TO "ervu-dashboard"; - - - - - - CREATE SCHEMA recruitment_campaign; - - - - - - ALTER - SCHEMA recruitment_campaign OWNER TO "ervu-dashboard"; - - - - - - CREATE SCHEMA space; - - - - - - ALTER - SCHEMA space OWNER TO "ervu-dashboard"; - - - - - - CREATE SCHEMA total_registered; - - - - - - ALTER - SCHEMA total_registered OWNER TO "ervu-dashboard"; - - - - \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-16--03-add-ext-uuid.xml b/backend/src/main/resources/config/v_1.0/2024-10-16--03-add-ext-uuid.xml deleted file mode 100644 index 56024f74..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-10-16--03-add-ext-uuid.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - CREATE - EXTENSION IF NOT EXISTS "uuid-ossp" WITH SCHEMA ervu_dashboard; - - - - - - CREATE FUNCTION public.uuid_generate_v4() RETURNS uuid - LANGUAGE c STRICT PARALLEL SAFE AS '$libdir/uuid-ossp', 'uuid_generate_v4'; - - - - - - ALTER FUNCTION public.uuid_generate_v4() OWNER TO postgres; - - - \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-16--04-add-obj-type.xml b/backend/src/main/resources/config/v_1.0/2024-10-16--04-add-obj-type.xml deleted file mode 100644 index 1a81ad51..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-10-16--04-add-obj-type.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - CREATE TYPE public.employer_category_type AS ENUM ( - 'fl', - 'ul', - 'kfh', - 'ip' - ); - - - - - - CREATE TYPE public.type_property_type AS ENUM ( - 'realty', - 'ground_transportation', - 'air_vehicles', - 'water_vehicles' - ); - - - - \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-16--05-create-appeals.xml b/backend/src/main/resources/config/v_1.0/2024-10-16--05-create-appeals.xml deleted file mode 100644 index 56b403b9..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-10-16--05-create-appeals.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-16--06-create-ervu_dashboard.xml b/backend/src/main/resources/config/v_1.0/2024-10-16--06-create-ervu_dashboard.xml deleted file mode 100644 index 9fd9b908..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-10-16--06-create-ervu_dashboard.xml +++ /dev/null @@ -1,564 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-16--07-create-main_dashboard.xml b/backend/src/main/resources/config/v_1.0/2024-10-16--07-create-main_dashboard.xml deleted file mode 100644 index f4abb497..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-10-16--07-create-main_dashboard.xml +++ /dev/null @@ -1,133 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-17--08-create-public.xml b/backend/src/main/resources/config/v_1.0/2024-10-17--08-create-public.xml deleted file mode 100644 index 95deb032..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-10-17--08-create-public.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-17--09-create-ratings.xml b/backend/src/main/resources/config/v_1.0/2024-10-17--09-create-ratings.xml deleted file mode 100644 index 2576f58e..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-10-17--09-create-ratings.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-17--10-create-recruitment_campaign.xml b/backend/src/main/resources/config/v_1.0/2024-10-17--10-create-recruitment_campaign.xml deleted file mode 100644 index ad5ed00e..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-10-17--10-create-recruitment_campaign.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-17--11-create-space.xml b/backend/src/main/resources/config/v_1.0/2024-10-17--11-create-space.xml deleted file mode 100644 index 439adbf3..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-10-17--11-create-space.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-17--12-create-total_registered.xml b/backend/src/main/resources/config/v_1.0/2024-10-17--12-create-total_registered.xml deleted file mode 100644 index 6b0fca94..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-10-17--12-create-total_registered.xml +++ /dev/null @@ -1,303 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-17--13-add-indexes.xml b/backend/src/main/resources/config/v_1.0/2024-10-17--13-add-indexes.xml deleted file mode 100644 index ecdf40fd..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-10-17--13-add-indexes.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/backend/src/main/resources/config/v_1.0/2024-10-17--14-add-fk.xml b/backend/src/main/resources/config/v_1.0/2024-10-17--14-add-fk.xml deleted file mode 100644 index bc37b25f..00000000 --- a/backend/src/main/resources/config/v_1.0/2024-10-17--14-add-fk.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/2024-10-16--01-add-role.xml b/backend/src/main/resources/config/v_1.0/20241016-SUPPORT-8617-add-role.xml similarity index 85% rename from backend/src/main/resources/config/v_1.0/2024-10-16--01-add-role.xml rename to backend/src/main/resources/config/v_1.0/20241016-SUPPORT-8617-add-role.xml index 608c86bd..4a199bf3 100644 --- a/backend/src/main/resources/config/v_1.0/2024-10-16--01-add-role.xml +++ b/backend/src/main/resources/config/v_1.0/20241016-SUPPORT-8617-add-role.xml @@ -4,7 +4,7 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd"> - + CREATE ROLE "ervu-dashboard" WITH LOGIN @@ -17,7 +17,7 @@ - + CREATE ROLE postgres WITH LOGIN diff --git a/backend/src/main/resources/config/v_1.0/2024-10-17--15-insert-data-in-ervu_dashboard.xml b/backend/src/main/resources/config/v_1.0/20241017-SUPPORT-8617-insert-data-in-ervu_dashboard.xml similarity index 95% rename from backend/src/main/resources/config/v_1.0/2024-10-17--15-insert-data-in-ervu_dashboard.xml rename to backend/src/main/resources/config/v_1.0/20241017-SUPPORT-8617-insert-data-in-ervu_dashboard.xml index 792cedc3..d39169fb 100644 --- a/backend/src/main/resources/config/v_1.0/2024-10-17--15-insert-data-in-ervu_dashboard.xml +++ b/backend/src/main/resources/config/v_1.0/20241017-SUPPORT-8617-insert-data-in-ervu_dashboard.xml @@ -4,7 +4,7 @@ xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd"> - + INSERT INTO ervu_dashboard.pub_recruitment (idm_id, parent_id, military_code, shortname, fullname, code, id, sort) diff --git a/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-patch-from-dump-ervu_dashboard_copy.xml b/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-patch-from-dump-ervu_dashboard_copy.xml new file mode 100644 index 00000000..0e776cb7 --- /dev/null +++ b/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-patch-from-dump-ervu_dashboard_copy.xml @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/changelog-v1.0.xml b/backend/src/main/resources/config/v_1.0/changelog-v1.0.xml index ae03fc1e..f309670d 100644 --- a/backend/src/main/resources/config/v_1.0/changelog-v1.0.xml +++ b/backend/src/main/resources/config/v_1.0/changelog-v1.0.xml @@ -5,21 +5,9 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd"> - - - - - - - - - - - - - - - - - + + + \ No newline at end of file From 2f26e55a9ee949cb287d9d91a5b1cfcc49a1c77c Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Fri, 18 Oct 2024 16:12:17 +0300 Subject: [PATCH 22/49] SUPPORT-8617: fix --- .../config/sql_files/ervu-dashboard-copy.sql | 3047 +++++------------ .../v_1.0/20241016-SUPPORT-8617-add-role.xml | 33 - ...1018-SUPPORT-8617-init-ervu_dashboard.xml} | 38 +- ...17-patch-from-dump-ervu_dashboard_copy.xml | 9 - .../resources/config/v_1.0/changelog-v1.0.xml | 6 +- 5 files changed, 837 insertions(+), 2296 deletions(-) delete mode 100644 backend/src/main/resources/config/v_1.0/20241016-SUPPORT-8617-add-role.xml rename backend/src/main/resources/config/v_1.0/{20241017-SUPPORT-8617-insert-data-in-ervu_dashboard.xml => 20241018-SUPPORT-8617-init-ervu_dashboard.xml} (60%) delete mode 100644 backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-patch-from-dump-ervu_dashboard_copy.xml diff --git a/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql b/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql index 73452c29..fcfd621f 100644 --- a/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql +++ b/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql @@ -1,24 +1,41 @@ SET statement_timeout = 0; + + SET lock_timeout = 0; + + SET idle_in_transaction_session_timeout = 0; + + SET client_encoding = 'UTF8'; + + SET -standard_conforming_strings = on; -SELECT pg_catalog.set_config('search_path', '', false); +standard_conforming_strings = ON; + + +SELECT pg_catalog.set_config('search_path', '', FALSE); + + SET -check_function_bodies = false; +check_function_bodies = FALSE; + + SET xmloption = content; + + SET client_min_messages = warning; -SET -row_security = off; +SET +row_security = OFF; + CREATE SCHEMA IF NOT EXISTS appeals; @@ -26,13 +43,10 @@ CREATE SCHEMA IF NOT EXISTS appeals; ALTER SCHEMA appeals OWNER TO "ervu-dashboard"; - - COMMENT ON SCHEMA appeals IS 'Обжалования'; - CREATE SCHEMA IF NOT EXISTS ervu_dashboard; @@ -40,7 +54,6 @@ ALTER SCHEMA ervu_dashboard OWNER TO "ervu-dashboard"; - CREATE SCHEMA IF NOT EXISTS main_dashboard; @@ -48,7 +61,6 @@ ALTER SCHEMA main_dashboard OWNER TO "ervu-dashboard"; - CREATE SCHEMA IF NOT EXISTS ratings; @@ -56,7 +68,6 @@ ALTER SCHEMA ratings OWNER TO "ervu-dashboard"; - CREATE SCHEMA IF NOT EXISTS recruitment_campaign; @@ -64,13 +75,11 @@ ALTER SCHEMA recruitment_campaign OWNER TO "ervu-dashboard"; - -CREATE SCHEMA IF NOT EXISTS space; +CREATE SCHEMA IF NOT EXISTS SPACE; ALTER -SCHEMA space OWNER TO "ervu-dashboard"; - +SCHEMA SPACE OWNER TO "ervu-dashboard"; CREATE SCHEMA IF NOT EXISTS total_registered; @@ -80,56 +89,47 @@ ALTER SCHEMA total_registered OWNER TO "ervu-dashboard"; - CREATE EXTENSION IF NOT EXISTS "uuid-ossp" WITH SCHEMA ervu_dashboard; - - COMMENT ON EXTENSION "uuid-ossp" IS 'generate universally unique identifiers (UUIDs)'; - -CREATE TYPE public.employer_category_type AS ENUM ( - 'fl', - 'ul', - 'kfh', - 'ip' -); +CREATE TYPE public.employer_category_type AS ENUM ('fl', + 'ul', + 'kfh', + 'ip'); ALTER TYPE public.employer_category_type OWNER TO postgres; - -CREATE TYPE public.type_property_type AS ENUM ( - 'realty', - 'ground_transportation', - 'air_vehicles', - 'water_vehicles' -); +CREATE TYPE public.type_property_type AS ENUM ('realty', + 'ground_transportation', + 'air_vehicles', + 'water_vehicles'); ALTER TYPE public.type_property_type OWNER TO postgres; - -CREATE FUNCTION public.uuid_generate_v4() RETURNS uuid - LANGUAGE c STRICT PARALLEL SAFE - AS '$libdir/uuid-ossp', 'uuid_generate_v4'; +CREATE FUNCTION public.uuid_generate_v4() RETURNS UUID + LANGUAGE c STRICT PARALLEL SAFE AS '$libdir/uuid-ossp', + 'uuid_generate_v4'; ALTER FUNCTION public.uuid_generate_v4() OWNER TO postgres; + SET default_tablespace = ''; + SET default_table_access_method = heap; - CREATE TABLE IF NOT EXISTS appeals.main_profile ( id_main_profile @@ -155,64 +155,43 @@ CREATE TABLE IF NOT EXISTS appeals.main_profile recruitment_id character ( 36 -) - ); +)); ALTER TABLE IF EXISTS appeals.main_profile OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE appeals.main_profile IS 'Основной профиль уровень РФ'; - - COMMENT ON COLUMN appeals.main_profile.gender IS 'Пол'; - - COMMENT ON COLUMN appeals.main_profile.age IS 'Возраст'; - - COMMENT ON COLUMN appeals.main_profile.child_min_18 IS 'Дети до 18 лет'; - - COMMENT ON COLUMN appeals.main_profile.education IS 'Образование'; - - COMMENT ON COLUMN appeals.main_profile.employment IS 'Занятость'; - - COMMENT ON COLUMN appeals.main_profile.recording_date IS 'Дата записи'; - CREATE SEQUENCE appeals.main_profile_id_main_profile_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS appeals.main_profile_id_main_profile_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE appeals.main_profile_id_main_profile_seq OWNED BY appeals.main_profile.id_main_profile; - CREATE TABLE IF NOT EXISTS appeals.reasons_appeal ( id_reasons_appeal @@ -230,83 +209,54 @@ CREATE TABLE IF NOT EXISTS appeals.reasons_appeal recording_date date DEFAULT - now + NOW ( -), - incorrect_inf_percent numeric, - no_data_percent numeric, - other_percent numeric, - recruitment_id character +), incorrect_inf_percent numeric, no_data_percent numeric, other_percent numeric, recruitment_id CHARACTER ( 36 -) - ); +)); ALTER TABLE IF EXISTS appeals.reasons_appeal OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE appeals.reasons_appeal IS 'Причины обжалования уровень РФ'; - - COMMENT ON COLUMN appeals.reasons_appeal.appeal IS 'Обжалования'; - - COMMENT ON COLUMN appeals.reasons_appeal.incorrect_inf IS 'Некорректные сведения'; - - COMMENT ON COLUMN appeals.reasons_appeal.no_data IS 'Нет данных'; - - COMMENT ON COLUMN appeals.reasons_appeal.other IS 'Прочее'; - - COMMENT ON COLUMN appeals.reasons_appeal.recording_date IS 'Дата записи'; - - COMMENT ON COLUMN appeals.reasons_appeal.incorrect_inf_percent IS 'Некорректные сведения в процентах'; - - COMMENT ON COLUMN appeals.reasons_appeal.no_data_percent IS 'Нет данных в процентах'; - - COMMENT ON COLUMN appeals.reasons_appeal.other_percent IS 'Прочее в процентах'; - CREATE SEQUENCE appeals.reasons_appeal_id_reasons_appeal_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS appeals.reasons_appeal_id_reasons_appeal_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE appeals.reasons_appeal_id_reasons_appeal_seq OWNED BY appeals.reasons_appeal.id_reasons_appeal; - CREATE TABLE IF NOT EXISTS appeals.review_rating ( id_review_rating @@ -320,53 +270,36 @@ CREATE TABLE IF NOT EXISTS appeals.review_rating recording_date date DEFAULT - now + NOW ( -), - id_region bigint, - recruitment_id uuid - ); +), id_region bigint, recruitment_id UUID); ALTER TABLE IF EXISTS appeals.review_rating OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE appeals.review_rating IS 'Рейтинг рассмотрения жалоб уровень РФ'; - - COMMENT ON COLUMN appeals.review_rating.speed IS 'Скорость рассмотрения'; - - COMMENT ON COLUMN appeals.review_rating.rating IS 'Оценка удовлетворенности'; - - COMMENT ON COLUMN appeals.review_rating.recording_date IS 'Дата записи'; - CREATE SEQUENCE appeals.review_rating_id_review_rating_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS appeals.review_rating_id_review_rating_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE appeals.review_rating_id_review_rating_seq OWNED BY appeals.review_rating.id_review_rating; - CREATE TABLE IF NOT EXISTS appeals.topic_appeal ( id_topic_appeal @@ -384,141 +317,109 @@ CREATE TABLE IF NOT EXISTS appeals.topic_appeal recording_date date DEFAULT - now + NOW ( -), - registration_percent numeric, - sabpoena_percent numeric, - appear_percent numeric, - temporary_measures_percent numeric, - recruitment_id character +), registration_percent numeric, sabpoena_percent numeric, appear_percent numeric, temporary_measures_percent numeric, recruitment_id CHARACTER ( 36 -) - ); +)); ALTER TABLE IF EXISTS appeals.topic_appeal OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE appeals.topic_appeal IS 'Тема обжалования уровень РФ'; - - COMMENT ON COLUMN appeals.topic_appeal.registration IS 'Тема обжалования постановка на учет'; - - COMMENT ON COLUMN appeals.topic_appeal.sabpoena IS 'Тема обжалования повестки'; - - COMMENT ON COLUMN appeals.topic_appeal.appear IS 'Тема обжалования явка'; - - COMMENT ON COLUMN appeals.topic_appeal.temporary_measures IS 'Тема обжалования временные меры'; - - COMMENT ON COLUMN appeals.topic_appeal.recording_date IS 'Дата записи'; - - COMMENT ON COLUMN appeals.topic_appeal.registration_percent IS 'Тема обжалования постановка на учет в процентах'; - - COMMENT ON COLUMN appeals.topic_appeal.sabpoena_percent IS 'Тема обжалования повестки в процентах'; - - COMMENT ON COLUMN appeals.topic_appeal.appear_percent IS 'Тема обжалования явка в процентах'; - - COMMENT ON COLUMN appeals.topic_appeal.temporary_measures_percent IS 'Тема обжалования временные меры в процентах'; - CREATE SEQUENCE appeals.topic_appeal_id_topic_appeal_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS appeals.topic_appeal_id_topic_appeal_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE appeals.topic_appeal_id_topic_appeal_seq OWNED BY appeals.topic_appeal.id_topic_appeal; - CREATE TABLE IF NOT EXISTS ervu_dashboard.citizen ( residence - character + CHARACTER varying, is_registered - character + CHARACTER varying, passport_series - character + CHARACTER varying, passport_number - character + CHARACTER varying, phone - character + CHARACTER varying, medical_requirements - character + CHARACTER varying, deferment_liberation - character + CHARACTER varying, gender - character + CHARACTER varying, marital_status - character + CHARACTER varying, education - character + CHARACTER varying, employment - character + CHARACTER varying, reason_registration - character + CHARACTER varying, driver_license - character + CHARACTER varying, disability_group - character + CHARACTER varying, dispensary_registration_code - character + CHARACTER varying, region_birth - character + CHARACTER varying, city_birth - character + CHARACTER varying, right_deferment boolean, @@ -543,32 +444,32 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.citizen mobilization boolean, full_name - character + CHARACTER varying, last_name - character + CHARACTER varying, first_name - character + CHARACTER varying, middle_name - character + CHARACTER varying, age numeric, birth_place - character + CHARACTER varying, number_children numeric, birth_date date, recruit_id - uuid + UUID NOT NULL, recruitment_id - uuid, + UUID, issue_date date, number_children_18_old @@ -578,153 +479,94 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.citizen ALTER TABLE IF EXISTS ervu_dashboard.citizen OWNER TO "ervu-dashboard"; - - COMMENT ON COLUMN ervu_dashboard.citizen.residence IS 'Адрес места жительства'; - - COMMENT ON COLUMN ervu_dashboard.citizen.is_registered IS 'Сведения о воинском учёте'; - - COMMENT ON COLUMN ervu_dashboard.citizen.passport_series IS 'Серия паспорта'; - - COMMENT ON COLUMN ervu_dashboard.citizen.passport_number IS 'Номер паспорта'; - - COMMENT ON COLUMN ervu_dashboard.citizen.phone IS 'Телефон'; - - COMMENT ON COLUMN ervu_dashboard.citizen.medical_requirements IS 'Медицинские сведения'; - - COMMENT ON COLUMN ervu_dashboard.citizen.deferment_liberation IS 'Наличие отсрочки или освобождения от военной службы'; - - COMMENT ON COLUMN ervu_dashboard.citizen.gender IS 'Пол'; - - COMMENT ON COLUMN ervu_dashboard.citizen.marital_status IS 'Семейное положение'; - - COMMENT ON COLUMN ervu_dashboard.citizen.education IS 'Образование'; - - COMMENT ON COLUMN ervu_dashboard.citizen.employment IS 'Занятость'; - - COMMENT ON COLUMN ervu_dashboard.citizen.reason_registration IS 'Причина постановки на учёт'; - - COMMENT ON COLUMN ervu_dashboard.citizen.driver_license IS 'Водительское удостоверение'; - - COMMENT ON COLUMN ervu_dashboard.citizen.disability_group IS 'Группа инвалидности'; - - COMMENT ON COLUMN ervu_dashboard.citizen.dispensary_registration_code IS 'Код диспансерного учета'; - - COMMENT ON COLUMN ervu_dashboard.citizen.region_birth IS 'Регион места рождения'; - - COMMENT ON COLUMN ervu_dashboard.citizen.city_birth IS 'Город места рождения'; - - COMMENT ON COLUMN ervu_dashboard.citizen.right_deferment IS 'Имеет право на отсрочку'; - - COMMENT ON COLUMN ervu_dashboard.citizen.took_break IS 'Воспользовался отсрочкой'; - - COMMENT ON COLUMN ervu_dashboard.citizen.medic IS 'Является медиком'; - - COMMENT ON COLUMN ervu_dashboard.citizen.sports_category IS 'Имеет спортивный разряд/звание'; - - COMMENT ON COLUMN ervu_dashboard.citizen.tractor_license IS 'Имеет удостоверение тракториста'; - - COMMENT ON COLUMN ervu_dashboard.citizen.is_wanted IS 'Находится в розыске'; - - COMMENT ON COLUMN ervu_dashboard.citizen.is_in_prison IS 'Находится в местах лишения свободы'; - - COMMENT ON COLUMN ervu_dashboard.citizen.acquired_citizenship IS 'Получивший гражданство'; - - COMMENT ON COLUMN ervu_dashboard.citizen.urgent_service IS 'Признак критерия срочной службы'; - - COMMENT ON COLUMN ervu_dashboard.citizen.contract_service IS 'Признак критерия контрактной службы'; - - COMMENT ON COLUMN ervu_dashboard.citizen.mobilization IS 'Признак критерия службы по мобмлизации'; - - COMMENT ON COLUMN ervu_dashboard.citizen.recruit_id IS 'id рекрута из БД ЕРВУ'; - CREATE TABLE IF NOT EXISTS ervu_dashboard.citizen_child ( citizen_child_id @@ -732,78 +574,56 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.citizen_child NOT NULL, recruit_id - uuid + UUID NOT NULL, kinship_type - character + CHARACTER varying ( 50 ), - full_name character varying, - birth_date date, - birth_az_number character varying + full_name CHARACTER varying, birth_date date, birth_az_number CHARACTER varying ( 50 ), - death_date date, - death_az_number character varying + death_date date, death_az_number CHARACTER varying ( 50 -) - ); +)); ALTER TABLE IF EXISTS ervu_dashboard.citizen_child OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE ervu_dashboard.citizen_child IS 'сведения о детях гражданина'; - - COMMENT ON COLUMN ervu_dashboard.citizen_child.recruit_id IS 'ссылка на гражданина (citizen)'; - - COMMENT ON COLUMN ervu_dashboard.citizen_child.kinship_type IS 'тип родственной связи: сын/дочь'; - - COMMENT ON COLUMN ervu_dashboard.citizen_child.full_name IS 'ФИО'; - - COMMENT ON COLUMN ervu_dashboard.citizen_child.birth_az_number IS 'номер актовой записи о рождении'; - - COMMENT ON COLUMN ervu_dashboard.citizen_child.death_az_number IS 'номер актовой записи о смерти'; - CREATE SEQUENCE ervu_dashboard.citizen_child_citizen_child_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.citizen_child_citizen_child_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.citizen_child_citizen_child_id_seq OWNED BY ervu_dashboard.citizen_child.citizen_child_id; - CREATE TABLE IF NOT EXISTS ervu_dashboard.citizen_guardianship ( citizen_guardianship_id @@ -811,57 +631,44 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.citizen_guardianship NOT NULL, recruit_id - uuid + UUID NOT NULL, full_name - character + CHARACTER varying, birth_date date, snils - character + CHARACTER varying ( 50 -) - ); +)); ALTER TABLE IF EXISTS ervu_dashboard.citizen_guardianship OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE ervu_dashboard.citizen_guardianship IS 'сведения о лице, опекаемом или находящемся на попечении'; - - COMMENT ON COLUMN ervu_dashboard.citizen_guardianship.recruit_id IS 'ссылка на гражданина (citizen)'; - - COMMENT ON COLUMN ervu_dashboard.citizen_guardianship.full_name IS 'ФИО'; - CREATE SEQUENCE ervu_dashboard.citizen_guardianship_citizen_guardianship_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.citizen_guardianship_citizen_guardianship_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.citizen_guardianship_citizen_guardianship_id_seq OWNED BY ervu_dashboard.citizen_guardianship.citizen_guardianship_id; - CREATE TABLE IF NOT EXISTS ervu_dashboard.citizen_spouse ( citizen_spouse_id @@ -869,95 +676,67 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.citizen_spouse NOT NULL, recruit_id - uuid + UUID NOT NULL, kinship_type - character + CHARACTER varying ( 50 ), - full_name character varying, - birth_date date, - death_az_number character varying + full_name CHARACTER varying, birth_date date, death_az_number CHARACTER varying ( 50 ), - death_date date, - marriage_az_number character varying + death_date date, marriage_az_number CHARACTER varying ( 50 ), - marriage_date date, - divorce_az_number character varying + marriage_date date, divorce_az_number CHARACTER varying ( 50 ), - divorce_date date, - information_excluded boolean DEFAULT false - ); + divorce_date date, information_excluded boolean DEFAULT FALSE); ALTER TABLE IF EXISTS ervu_dashboard.citizen_spouse OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE ervu_dashboard.citizen_spouse IS 'сведения о супруге (бывшей/ем супруге) гражданина'; - - COMMENT ON COLUMN ervu_dashboard.citizen_spouse.recruit_id IS 'ссылка на гражданина (citizen)'; - - COMMENT ON COLUMN ervu_dashboard.citizen_spouse.kinship_type IS 'тип родственной связи: супруг/бывший супруг'; - - COMMENT ON COLUMN ervu_dashboard.citizen_spouse.full_name IS 'ФИО'; - - COMMENT ON COLUMN ervu_dashboard.citizen_spouse.death_az_number IS 'номер актовой записи о смерти'; - - COMMENT ON COLUMN ervu_dashboard.citizen_spouse.marriage_az_number IS 'номер актовой записи о браке'; - - COMMENT ON COLUMN ervu_dashboard.citizen_spouse.divorce_az_number IS 'номер актовой записи о расторжении брака'; - - COMMENT ON COLUMN ervu_dashboard.citizen_spouse.information_excluded IS 'сведения о супруге исключены'; - CREATE SEQUENCE ervu_dashboard.citizen_spouse_citizen_spouse_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.citizen_spouse_citizen_spouse_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.citizen_spouse_citizen_spouse_id_seq OWNED BY ervu_dashboard.citizen_spouse.citizen_spouse_id; - CREATE TABLE IF NOT EXISTS ervu_dashboard.citizenship ( citizenship_id @@ -965,98 +744,67 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.citizenship NOT NULL, recruit_id - uuid + UUID NOT NULL, acquiring_basis text, acquiring_number - character + CHARACTER varying ( 20 ), - acquiring_date date, - acquiring_authority text, - renunciation_basis text, - renunciation_number character varying + acquiring_date date, acquiring_authority text, renunciation_basis text, renunciation_number CHARACTER varying ( 20 ), - renunciation_date date, - renunciation_authority text - ); + renunciation_date date, renunciation_authority text); ALTER TABLE IF EXISTS ervu_dashboard.citizenship OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE ervu_dashboard.citizenship IS 'сведения о гражданстве РФ'; - - COMMENT ON COLUMN ervu_dashboard.citizenship.recruit_id IS 'ссылка на гражданина (citizen)'; - - COMMENT ON COLUMN ervu_dashboard.citizenship.acquiring_basis IS 'основание приобретения гражданства РФ'; - - COMMENT ON COLUMN ervu_dashboard.citizenship.acquiring_number IS 'номер решения о приобретении гражданства РФ'; - - COMMENT ON COLUMN ervu_dashboard.citizenship.acquiring_date IS 'дата решения о приобретении гражданства РФ'; - - COMMENT ON COLUMN ervu_dashboard.citizenship.acquiring_authority IS 'наименование органа, принявшего решение о приобретении гражданства РФ'; - - COMMENT ON COLUMN ervu_dashboard.citizenship.renunciation_basis IS 'основание выхода гражданства РФ'; - - COMMENT ON COLUMN ervu_dashboard.citizenship.renunciation_number IS 'номер решения о выходе из гражданства РФ'; - - COMMENT ON COLUMN ervu_dashboard.citizenship.renunciation_date IS 'дата решения о выходе из гражданства РФ'; - - COMMENT ON COLUMN ervu_dashboard.citizenship.renunciation_authority IS 'наименование органа, принявшего решение о выходе из гражданства РФ'; - CREATE SEQUENCE ervu_dashboard.citizenship_citizenship_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.citizenship_citizenship_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.citizenship_citizenship_id_seq OWNED BY ervu_dashboard.citizenship.citizenship_id; - CREATE TABLE IF NOT EXISTS ervu_dashboard.citizenship_foreign ( citizenship_foreign_id @@ -1064,82 +812,60 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.citizenship_foreign NOT NULL, recruit_id - uuid + UUID NOT NULL, country_name - character + CHARACTER varying ( 255 ), - residense_right_basis character varying + residense_right_basis CHARACTER varying ( 255 ), - residense_right_date date, - citizenship_basis character varying + residense_right_date date, citizenship_basis CHARACTER varying ( 255 ), - citizenship_date date - ); + citizenship_date date); ALTER TABLE IF EXISTS ervu_dashboard.citizenship_foreign OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE ervu_dashboard.citizenship_foreign IS 'сведения об иностранном гражданстве'; - - COMMENT ON COLUMN ervu_dashboard.citizenship_foreign.recruit_id IS 'ссылка на гражданина (citizen)'; - - COMMENT ON COLUMN ervu_dashboard.citizenship_foreign.country_name IS 'наименование государства'; - - COMMENT ON COLUMN ervu_dashboard.citizenship_foreign.residense_right_basis IS 'основание получения права на постоянное проживание'; - - COMMENT ON COLUMN ervu_dashboard.citizenship_foreign.residense_right_date IS 'дата возникновения права на постоянное проживание'; - - COMMENT ON COLUMN ervu_dashboard.citizenship_foreign.citizenship_basis IS 'основание получения иностранного гражданства'; - - COMMENT ON COLUMN ervu_dashboard.citizenship_foreign.citizenship_date IS 'дата получения иностранного гражданства'; - CREATE SEQUENCE ervu_dashboard.citizenship_foreign_citizenship_foreign_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.citizenship_foreign_citizenship_foreign_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.citizenship_foreign_citizenship_foreign_id_seq OWNED BY ervu_dashboard.citizenship_foreign.citizenship_foreign_id; - CREATE TABLE IF NOT EXISTS ervu_dashboard.decision ( decision_id @@ -1147,33 +873,27 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.decision NOT NULL, subpoena_id - uuid, + UUID, recruit_id - uuid, + UUID, recruitment_id - uuid + UUID ); ALTER TABLE IF EXISTS ervu_dashboard.decision OWNER TO "ervu-dashboard"; - CREATE SEQUENCE ervu_dashboard.decision_decision_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.decision_decision_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.decision_decision_id_seq OWNED BY ervu_dashboard.decision.decision_id; - CREATE TABLE IF NOT EXISTS ervu_dashboard.deputy ( deputy_id @@ -1181,81 +901,60 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.deputy NOT NULL, recruit_id - uuid + UUID NOT NULL, deputy boolean DEFAULT - true, + TRUE, information text, end_date date, period_office - character + CHARACTER varying ( 50 ), - cancellation_date date - ); + cancellation_date date); ALTER TABLE IF EXISTS ervu_dashboard.deputy OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE ervu_dashboard.deputy IS 'сведения о гражданах, избранных депутатами/зарегистрированных кандидатами на участие в выборах'; - - COMMENT ON COLUMN ervu_dashboard.deputy.recruit_id IS 'ссылка на гражданина (citizen)'; - - COMMENT ON COLUMN ervu_dashboard.deputy.deputy IS 'является депутатом(true)/кандидатом на участие в выборах(false)'; - - COMMENT ON COLUMN ervu_dashboard.deputy.information IS 'сведения об избрании гражданина депутатом/сведения о регистрации кандидатом на выборах'; - - COMMENT ON COLUMN ervu_dashboard.deputy.end_date IS 'дата досрочного прекращения полномочий/снятия кандидатуры с выборов'; - - COMMENT ON COLUMN ervu_dashboard.deputy.period_office IS 'срок полномочий'; - - COMMENT ON COLUMN ervu_dashboard.deputy.cancellation_date IS 'дата аннулирования регистрации'; - CREATE SEQUENCE ervu_dashboard.deputy_deputy_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.deputy_deputy_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.deputy_deputy_id_seq OWNED BY ervu_dashboard.deputy.deputy_id; - CREATE TABLE IF NOT EXISTS ervu_dashboard.disability ( disability_id @@ -1263,94 +962,65 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.disability NOT NULL, recruit_id - uuid + UUID NOT NULL, disability boolean DEFAULT - false, + FALSE, organization_name - character + CHARACTER varying ( 300 ), - start_date date, - close_date date, - confirmation_date date, - re_examination_date date, - disability_group character varying + start_date date, close_date date, confirmation_date date, re_examination_date date, disability_group CHARACTER varying ( 30 -) - ); +)); ALTER TABLE IF EXISTS ervu_dashboard.disability OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE ervu_dashboard.disability IS 'сведения об инвалидности/недееспособности/ограниченной дееспособности'; - - COMMENT ON COLUMN ervu_dashboard.disability.recruit_id IS 'ссылка на гражданина (citizen)'; - - COMMENT ON COLUMN ervu_dashboard.disability.disability IS 'сведения об инвалидности(true)/недееспособности(false)'; - - COMMENT ON COLUMN ervu_dashboard.disability.organization_name IS 'наименование организации, установившей инвалидность/судебного органа'; - - COMMENT ON COLUMN ervu_dashboard.disability.start_date IS 'дата установления инвалидности/признания гражданина недееспособным'; - - COMMENT ON COLUMN ervu_dashboard.disability.close_date IS 'дата снятия инвалидности/отмены ограничения гражданина в дееспособности'; - - COMMENT ON COLUMN ervu_dashboard.disability.confirmation_date IS 'дата подтверждения инвалидности'; - - COMMENT ON COLUMN ervu_dashboard.disability.re_examination_date IS 'дата переосвидетельствования по инвалидности'; - - COMMENT ON COLUMN ervu_dashboard.disability.disability_group IS 'группа инвалидности'; - CREATE SEQUENCE ervu_dashboard.disability_disability_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.disability_disability_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.disability_disability_id_seq OWNED BY ervu_dashboard.disability.disability_id; - CREATE TABLE IF NOT EXISTS ervu_dashboard.disease ( disease_id @@ -1358,73 +1028,55 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.disease NOT NULL, recruit_id - uuid + UUID NOT NULL, code - character + CHARACTER varying, name - character + CHARACTER varying, reg_date date, registered boolean DEFAULT - false + FALSE ); ALTER TABLE IF EXISTS ervu_dashboard.disease OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE ervu_dashboard.disease IS 'сведения о заболеваниях гражданина'; - - COMMENT ON COLUMN ervu_dashboard.disease.recruit_id IS 'ссылка на гражданина (citizen)'; - - COMMENT ON COLUMN ervu_dashboard.disease.code IS 'код заболевания'; - - COMMENT ON COLUMN ervu_dashboard.disease.name IS 'наименование заболевания'; - - COMMENT ON COLUMN ervu_dashboard.disease.reg_date IS 'дата постановки диагноза'; - - COMMENT ON COLUMN ervu_dashboard.disease.registered IS 'поставлен на учет по заболеванию'; - CREATE SEQUENCE ervu_dashboard.disease_disease_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.disease_disease_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.disease_disease_id_seq OWNED BY ervu_dashboard.disease.disease_id; - CREATE TABLE IF NOT EXISTS ervu_dashboard.drivers_licence ( drivers_licence_id @@ -1432,118 +1084,83 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.drivers_licence NOT NULL, recruit_id - uuid + UUID NOT NULL, tractor_driver boolean DEFAULT - false, + FALSE, licence_series - character + CHARACTER varying ( 50 ), - licence_number character varying + licence_number CHARACTER varying ( 50 ), - start_date date, - close_date date, - categories character varying + start_date date, close_date date, categories CHARACTER varying ( 50 ), - status character varying + status CHARACTER varying ( 50 ), - replacement_date date, - return_date date, - seizure_date date - ); + replacement_date date, return_date date, seizure_date date); ALTER TABLE IF EXISTS ervu_dashboard.drivers_licence OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE ervu_dashboard.drivers_licence IS 'удостоверение водительское/тракториста-машиниста'; - - COMMENT ON COLUMN ervu_dashboard.drivers_licence.recruit_id IS 'ссылка на гражданина (citizen)'; - - COMMENT ON COLUMN ervu_dashboard.drivers_licence.tractor_driver IS 'удостоверение тракториста'; - - COMMENT ON COLUMN ervu_dashboard.drivers_licence.licence_series IS 'серия'; - - COMMENT ON COLUMN ervu_dashboard.drivers_licence.licence_number IS 'номер'; - - COMMENT ON COLUMN ervu_dashboard.drivers_licence.start_date IS 'дата выдачи'; - - COMMENT ON COLUMN ervu_dashboard.drivers_licence.close_date IS 'дата окончания действия'; - - COMMENT ON COLUMN ervu_dashboard.drivers_licence.categories IS 'категории'; - - COMMENT ON COLUMN ervu_dashboard.drivers_licence.status IS 'статус удостоверения'; - - COMMENT ON COLUMN ervu_dashboard.drivers_licence.replacement_date IS 'дата замены'; - - COMMENT ON COLUMN ervu_dashboard.drivers_licence.return_date IS 'дата возврата'; - - COMMENT ON COLUMN ervu_dashboard.drivers_licence.seizure_date IS 'дата изъятия'; - CREATE SEQUENCE ervu_dashboard.drivers_licence_drivers_licence_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.drivers_licence_drivers_licence_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.drivers_licence_drivers_licence_id_seq OWNED BY ervu_dashboard.drivers_licence.drivers_licence_id; - CREATE TABLE IF NOT EXISTS ervu_dashboard.medical_authorities ( medical_authorities_id @@ -1551,7 +1168,7 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.medical_authorities NOT NULL, recruit_id - uuid + UUID NOT NULL, start_date @@ -1563,59 +1180,41 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.medical_authorities hiv boolean DEFAULT - false + FALSE ); ALTER TABLE IF EXISTS ervu_dashboard.medical_authorities OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE ervu_dashboard.medical_authorities IS 'сведения о гражданах, стоящих на учете в ПНД/по ВИЧ'; - - COMMENT ON COLUMN ervu_dashboard.medical_authorities.recruit_id IS 'ссылка на гражданина (citizen)'; - - COMMENT ON COLUMN ervu_dashboard.medical_authorities.start_date IS 'дата постановки на учет'; - - COMMENT ON COLUMN ervu_dashboard.medical_authorities.close_date IS 'дата снятия с учета'; - - COMMENT ON COLUMN ervu_dashboard.medical_authorities.change_date IS 'дата планового срока пересмотра диагноза'; - - COMMENT ON COLUMN ervu_dashboard.medical_authorities.hiv IS 'на учете по ВИЧ(true) или в ПНД(false)'; - CREATE SEQUENCE ervu_dashboard.medical_authorities_medical_authorities_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.medical_authorities_medical_authorities_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.medical_authorities_medical_authorities_id_seq OWNED BY ervu_dashboard.medical_authorities.medical_authorities_id; - CREATE TABLE IF NOT EXISTS ervu_dashboard.passport ( passport_id @@ -1623,94 +1222,70 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.passport NOT NULL, recruit_id - uuid + UUID NOT NULL, actual boolean DEFAULT - true, + TRUE, passport_series - character + CHARACTER varying ( 4 ), - passport_number character varying + passport_number CHARACTER varying ( 6 ), - issue_date date, - organization_name character varying + issue_date date, organization_name CHARACTER varying ( 255 ), - unit_code character varying + unit_code CHARACTER varying ( 7 -) - ); +)); ALTER TABLE IF EXISTS ervu_dashboard.passport OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE ervu_dashboard.passport IS 'сведения о паспорте'; - - COMMENT ON COLUMN ervu_dashboard.passport.recruit_id IS 'ссылка на гражданина (citizen)'; - - COMMENT ON COLUMN ervu_dashboard.passport.actual IS 'статус документа: действительный(true)/недействительный(false)'; - - COMMENT ON COLUMN ervu_dashboard.passport.passport_series IS 'серия паспорта'; - - COMMENT ON COLUMN ervu_dashboard.passport.passport_number IS 'номер паспорта'; - - COMMENT ON COLUMN ervu_dashboard.passport.issue_date IS 'дата выдачи документа'; - - COMMENT ON COLUMN ervu_dashboard.passport.organization_name IS 'наименование органа, выдавшего документ'; - - COMMENT ON COLUMN ervu_dashboard.passport.unit_code IS 'код подразделения'; - CREATE SEQUENCE ervu_dashboard.passport_passport_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.passport_passport_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.passport_passport_id_seq OWNED BY ervu_dashboard.passport.passport_id; - CREATE TABLE IF NOT EXISTS ervu_dashboard.property ( property_id @@ -1718,7 +1293,7 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.property NOT NULL, recruit_id - uuid + UUID NOT NULL, type_property @@ -1730,118 +1305,86 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.property close_date date, vehicle_type - character + CHARACTER varying ( 100 ), - vehicle_category character varying + vehicle_category CHARACTER varying ( 100 ), - address text, - kind_right character varying + address text, kind_right CHARACTER varying ( 50 ), - issue_year character varying + issue_year CHARACTER varying ( 4 ), - brand_model character varying + brand_model CHARACTER varying ( 100 ), - reg_plate character varying + reg_plate CHARACTER varying ( 100 ), - vin character varying + vin CHARACTER varying ( 100 -) - ); +)); ALTER TABLE IF EXISTS ervu_dashboard.property OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE ervu_dashboard.property IS 'сведения об имуществе'; - - COMMENT ON COLUMN ervu_dashboard.property.recruit_id IS 'ссылка на гражданина (citizen)'; - - COMMENT ON COLUMN ervu_dashboard.property.type_property IS 'тип имущества: недвижимое/наземный/воздушный/водный транспорт'; - - COMMENT ON COLUMN ervu_dashboard.property.start_date IS 'дата регистрации права владения'; - - COMMENT ON COLUMN ervu_dashboard.property.close_date IS 'дата прекращения права владения'; - - COMMENT ON COLUMN ervu_dashboard.property.vehicle_type IS 'вид транспортного средства'; - - COMMENT ON COLUMN ervu_dashboard.property.vehicle_category IS 'категория транспортного средства'; - - COMMENT ON COLUMN ervu_dashboard.property.address IS 'адрес объекта недвижимости'; - - COMMENT ON COLUMN ervu_dashboard.property.kind_right IS 'вид права'; - - COMMENT ON COLUMN ervu_dashboard.property.issue_year IS 'год выпуска транспортного средства'; - - COMMENT ON COLUMN ervu_dashboard.property.brand_model IS 'марка, модель транспортного средства'; - - COMMENT ON COLUMN ervu_dashboard.property.reg_plate IS 'регистрационный номер'; - CREATE SEQUENCE ervu_dashboard.property_property_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.property_property_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.property_property_id_seq OWNED BY ervu_dashboard.property.property_id; - CREATE TABLE IF NOT EXISTS ervu_dashboard.prosecution ( prosecution_id @@ -1849,149 +1392,112 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.prosecution NOT NULL, recruit_id - uuid + UUID NOT NULL, kind - character + CHARACTER varying ( 255 ), - create_date date, - close_date date, - authority_name character varying + create_date date, close_date date, authority_name CHARACTER varying ( 255 ), - law_point character varying + law_point CHARACTER varying ( 100 ), - termination_basis character varying + termination_basis CHARACTER varying ( 255 ), - transfer_to_court boolean DEFAULT false, - case_number character varying + transfer_to_court boolean DEFAULT FALSE, + case_number CHARACTER varying ( 50 ), - case_number_court character varying + case_number_court CHARACTER varying ( 50 ), - reclassification text - ); + reclassification text); ALTER TABLE IF EXISTS ervu_dashboard.prosecution OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE ervu_dashboard.prosecution IS 'сведения об уголовном преследовании'; - - COMMENT ON COLUMN ervu_dashboard.prosecution.recruit_id IS 'ссылка на гражданина (citizen)'; - - COMMENT ON COLUMN ervu_dashboard.prosecution.kind IS 'вид уголовного преследования'; - - COMMENT ON COLUMN ervu_dashboard.prosecution.create_date IS 'дата возбуждения уголовного дела'; - - COMMENT ON COLUMN ervu_dashboard.prosecution.close_date IS 'дата прекращения уголовного преследования'; - - COMMENT ON COLUMN ervu_dashboard.prosecution.authority_name IS 'наименование органа, принявшего решение'; - - COMMENT ON COLUMN ervu_dashboard.prosecution.law_point IS 'пункт, часть, статья УК РФ'; - - COMMENT ON COLUMN ervu_dashboard.prosecution.termination_basis IS 'основание прекращения уголовного преследования'; - - COMMENT ON COLUMN ervu_dashboard.prosecution.transfer_to_court IS 'признак передачи в суд уголовного дела в отношении гражданина'; - - COMMENT ON COLUMN ervu_dashboard.prosecution.case_number IS 'номер уголовного дела (предварительный)'; - - COMMENT ON COLUMN ervu_dashboard.prosecution.case_number_court IS 'номер уголовного дела (судебный)'; - - COMMENT ON COLUMN ervu_dashboard.prosecution.reclassification IS 'сведения о переквалификации деяния'; - CREATE SEQUENCE ervu_dashboard.prosecution_prosecution_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.prosecution_prosecution_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.prosecution_prosecution_id_seq OWNED BY ervu_dashboard.prosecution.prosecution_id; - CREATE TABLE IF NOT EXISTS ervu_dashboard.pub_recruitment ( idm_id - character + CHARACTER varying ( 256 ), - parent_id character varying, - military_code character varying, - shortname character varying NOT NULL, - fullname character varying NOT NULL, - code character varying + parent_id CHARACTER varying, military_code CHARACTER varying, shortname CHARACTER varying NOT NULL, + fullname CHARACTER varying NOT NULL, + code CHARACTER varying ( 64 ), - id character + id CHARACTER ( 36 ) NOT NULL, - sort character varying NOT NULL - ); + SORT CHARACTER varying NOT NULL); ALTER TABLE IF EXISTS ervu_dashboard.pub_recruitment OWNER TO "ervu-dashboard"; - CREATE TABLE IF NOT EXISTS ervu_dashboard.punishment ( punishment_id @@ -1999,170 +1505,124 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.punishment NOT NULL, recruit_id - uuid + UUID NOT NULL, sentence - character + CHARACTER varying ( 255 ), - sentence_changed character varying + sentence_changed CHARACTER varying ( 255 ), - sentense_date date, - authority_name character varying + sentense_date date, authority_name CHARACTER varying ( 255 ), - law_point character varying + law_point CHARACTER varying ( 100 ), - punishment_type character varying + punishment_type CHARACTER varying ( 100 ), - punishment_code character varying + punishment_code CHARACTER varying ( 5 ), - sentence_place text, - start_date date, - planned_date date, - release_date date, - release_reason character varying + sentence_place text, start_date date, planned_date date, release_date date, release_reason CHARACTER varying ( 255 ), - mandatory_work boolean DEFAULT false - ); + mandatory_work boolean DEFAULT FALSE); ALTER TABLE IF EXISTS ervu_dashboard.punishment OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE ervu_dashboard.punishment IS 'сведения об уголовном преследовании и вынесенном приговоре'; - - COMMENT ON COLUMN ervu_dashboard.punishment.recruit_id IS 'ссылка на гражданина (citizen)'; - - COMMENT ON COLUMN ervu_dashboard.punishment.sentence IS 'срок или размер наказания'; - - COMMENT ON COLUMN ervu_dashboard.punishment.sentence_changed IS 'изменение срока или размера наказания'; - - COMMENT ON COLUMN ervu_dashboard.punishment.sentense_date IS 'дата вынесения обвинительного приговора'; - - COMMENT ON COLUMN ervu_dashboard.punishment.authority_name IS 'наименование суда, вынесшего приговор'; - - COMMENT ON COLUMN ervu_dashboard.punishment.law_point IS 'пункт, часть, статья УК РФ'; - - COMMENT ON COLUMN ervu_dashboard.punishment.punishment_type IS 'вид наказания'; - - COMMENT ON COLUMN ervu_dashboard.punishment.punishment_code IS 'код вида наказания'; - - COMMENT ON COLUMN ervu_dashboard.punishment.sentence_place IS 'наименование и адрес места отбывания наказания'; - - COMMENT ON COLUMN ervu_dashboard.punishment.start_date IS 'дата начала срока отбывания наказания'; - - COMMENT ON COLUMN ervu_dashboard.punishment.planned_date IS 'плановая дата отбытия'; - - COMMENT ON COLUMN ervu_dashboard.punishment.release_date IS 'дата освобождения'; - - COMMENT ON COLUMN ervu_dashboard.punishment.release_reason IS 'основание освобождения'; - - COMMENT ON COLUMN ervu_dashboard.punishment.mandatory_work IS 'признак отбывания наказания в виде обязательных работ'; - CREATE SEQUENCE ervu_dashboard.punishment_punishment_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.punishment_punishment_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.punishment_punishment_id_seq OWNED BY ervu_dashboard.punishment.punishment_id; - CREATE TABLE IF NOT EXISTS ervu_dashboard.recruitment ( id - character + CHARACTER ( 36 ) NOT NULL, - shortname character + shortname CHARACTER +( + 300 +), idm_id UUID, + code CHARACTER +( + 300 +), parent_id CHARACTER ( 300 ), - idm_id uuid, - code character -( - 300 -), - parent_id character -( - 300 -), - sort bigint NOT NULL - ); + SORT bigint NOT NULL); ALTER TABLE IF EXISTS ervu_dashboard.recruitment OWNER TO "ervu-dashboard"; - CREATE TABLE IF NOT EXISTS ervu_dashboard.subpoena ( sub_id @@ -2170,166 +1630,104 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.subpoena NOT NULL, series - character + CHARACTER varying ( 16 -), - number character varying +), number CHARACTER varying ( 36 ) NOT NULL, - create_date timestamp without time zone DEFAULT now + create_date timestamp WITHOUT TIME ZONE DEFAULT NOW ( ) NOT NULL, visit_date timestamp - without time zone, + WITHOUT TIME ZONE, send_date timestamp - with time zone, - reason_cancelled character varying (255), - recruit_id uuid, - department_id uuid, - subpoena_status text, - subpoena_reason text, - fio_commiss text, - track_number text, - recruitment_name text, - address text, - method_sending text, - subpoena_id uuid, - sig_info character varying + WITH TIME ZONE, + reason_cancelled CHARACTER varying (255), + recruit_id UUID, + department_id UUID, + subpoena_status text, subpoena_reason text, fio_commiss text, track_number text, recruitment_name text, address text, method_sending text, subpoena_id UUID, + sig_info CHARACTER varying ( 255 ), - delivery_fio text, - act_number text, - method_delivery text, - delivery_date timestamp - without time zone, - delivery_status text, - appearance text, - appearance_status text - ); + delivery_fio text, act_number text, method_delivery text, delivery_date timestamp + WITHOUT TIME ZONE, + delivery_status text, appearance text, appearance_status text); ALTER TABLE IF EXISTS ervu_dashboard.subpoena OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE ervu_dashboard.subpoena IS 'сведения о направлении повестки военного комиссариата'; - - COMMENT ON COLUMN ervu_dashboard.subpoena.series IS 'серия повестки'; - - COMMENT ON COLUMN ervu_dashboard.subpoena.number IS 'номер повестки'; - - COMMENT ON COLUMN ervu_dashboard.subpoena.create_date IS 'дата создания записи'; - - COMMENT ON COLUMN ervu_dashboard.subpoena.visit_date IS 'время и дата явки в ВК'; - - COMMENT ON COLUMN ervu_dashboard.subpoena.send_date IS 'дата направления повестки'; - - COMMENT ON COLUMN ervu_dashboard.subpoena.reason_cancelled IS 'причина отклонения повестки'; - - COMMENT ON COLUMN ervu_dashboard.subpoena.recruit_id IS 'идентификатор рекрута'; - - COMMENT ON COLUMN ervu_dashboard.subpoena.department_id IS 'идентификатор ВК'; - - COMMENT ON COLUMN ervu_dashboard.subpoena.subpoena_status IS 'статус повестки'; - - COMMENT ON COLUMN ervu_dashboard.subpoena.subpoena_reason IS 'причина вызова по повестке'; - - COMMENT ON COLUMN ervu_dashboard.subpoena.fio_commiss IS 'фио комиссара'; - - COMMENT ON COLUMN ervu_dashboard.subpoena.track_number IS 'уникальный номер заказного почтового отправления, которым направлена повестка'; - - COMMENT ON COLUMN ervu_dashboard.subpoena.recruitment_name IS 'наименование ВК, направившего повестку'; - - COMMENT ON COLUMN ervu_dashboard.subpoena.address IS 'адрес, по которому нужно явиться по повестке'; - - COMMENT ON COLUMN ervu_dashboard.subpoena.method_sending IS 'способ направления повестки'; - - COMMENT ON COLUMN ervu_dashboard.subpoena.subpoena_id IS 'идентификатор повестки'; - - COMMENT ON COLUMN ervu_dashboard.subpoena.sig_info IS 'открепленная ЭП'; - - COMMENT ON COLUMN ervu_dashboard.subpoena.delivery_fio IS 'фио лица, оповестившего гражданина о последствиях отказа от получения повестки'; - - COMMENT ON COLUMN ervu_dashboard.subpoena.act_number IS 'номер акта об отказе от получения повестки'; - - COMMENT ON COLUMN ervu_dashboard.subpoena.method_delivery IS 'способ вручения'; - -ALTER TABLE IF EXISTS ervu_dashboard.subpoena ALTER COLUMN sub_id ADD GENERATED BY DEFAULT AS IDENTITY ( - SEQUENCE NAME ervu_dashboard.subpoena_subpoena_id_seq - START WITH 2 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1 - ); - +ALTER TABLE IF EXISTS ervu_dashboard.subpoena +ALTER +COLUMN sub_id ADD GENERATED BY DEFAULT AS IDENTITY + (SEQUENCE NAME ervu_dashboard.subpoena_subpoena_id_seq START WITH 2 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1); CREATE TABLE IF NOT EXISTS ervu_dashboard.temporary_measures @@ -2339,23 +1737,23 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.temporary_measures NOT NULL, subpoena_id - uuid, + UUID, recruit_id - uuid, + UUID, recruitment_id - uuid, + UUID, status_measure text, recruitment_name text, cancel_date timestamp - without - time - zone, + WITHOUT + TIME + ZONE, restriction_name text, - type + TYPE text, decision_number_create text, @@ -2363,14 +1761,14 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.temporary_measures text, decision_date_create timestamp - without - time - zone, + WITHOUT + TIME + ZONE, decision_date_cancel timestamp - without - time - zone, + WITHOUT + TIME + ZONE, applied_fact text ); @@ -2378,78 +1776,48 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.temporary_measures ALTER TABLE IF EXISTS ervu_dashboard.temporary_measures OWNER TO "ervu-dashboard"; - - COMMENT ON COLUMN ervu_dashboard.temporary_measures.status_measure IS 'статус временной меры'; - - COMMENT ON COLUMN ervu_dashboard.temporary_measures.recruitment_name IS 'наименование ВК'; - - COMMENT ON COLUMN ervu_dashboard.temporary_measures.cancel_date IS 'дата, с которой отменена временная мера'; - - COMMENT ON COLUMN ervu_dashboard.temporary_measures.restriction_name IS 'наименование временной меры'; - - COMMENT ON COLUMN ervu_dashboard.temporary_measures.type IS 'тип документа ограничения'; - - COMMENT ON COLUMN ervu_dashboard.temporary_measures.decision_number_create IS 'номер решения о применении временной меры'; - - COMMENT ON COLUMN ervu_dashboard.temporary_measures.decision_number_cancel IS 'номер решения об отмене временной меры'; - - COMMENT ON COLUMN ervu_dashboard.temporary_measures.decision_date_create IS 'дата решения о применении временной меры'; - - COMMENT ON COLUMN ervu_dashboard.temporary_measures.decision_date_cancel IS 'дата решения об отмене временной меры'; - - COMMENT ON COLUMN ervu_dashboard.temporary_measures.applied_fact IS 'факт применения временной меры'; - -ALTER TABLE IF EXISTS ervu_dashboard.temporary_measures ALTER COLUMN temporary_measures_id ADD GENERATED BY DEFAULT AS IDENTITY ( - SEQUENCE NAME ervu_dashboard.temporary_measures_temporary_measures_id_seq - START WITH 2 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1 - ); +ALTER TABLE IF EXISTS ervu_dashboard.temporary_measures +ALTER +COLUMN temporary_measures_id ADD GENERATED BY DEFAULT AS IDENTITY + (SEQUENCE NAME ervu_dashboard.temporary_measures_temporary_measures_id_seq START WITH 2 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1); - -ALTER TABLE IF EXISTS ervu_dashboard.recruitment ALTER COLUMN sort ADD GENERATED BY DEFAULT AS IDENTITY ( - SEQUENCE NAME ervu_dashboard.testrecruitment_sort_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE - CACHE 1 - ); - +ALTER TABLE IF EXISTS ervu_dashboard.recruitment +ALTER +COLUMN +SORT ADD GENERATED BY DEFAULT AS IDENTITY + (SEQUENCE NAME ervu_dashboard.testrecruitment_sort_seq START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1); CREATE TABLE IF NOT EXISTS ervu_dashboard.work @@ -2459,7 +1827,7 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.work NOT NULL, recruit_id - uuid + UUID NOT NULL, employer_category @@ -2469,109 +1837,80 @@ CREATE TABLE IF NOT EXISTS ervu_dashboard.work place text, organization_name - character + CHARACTER varying ( 100 ), - inn character varying + inn CHARACTER varying ( 15 ), - kpp character varying + kpp CHARACTER varying ( 15 ), - ogrnip character varying + ogrnip CHARACTER varying ( 20 ), - "position" character varying + "position" CHARACTER varying ( 150 ), - event_type character varying + event_type CHARACTER varying ( 50 ), - event_date date - ); + event_date date); ALTER TABLE IF EXISTS ervu_dashboard.work OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE ervu_dashboard.work IS 'сведения об имуществе'; - - COMMENT ON COLUMN ervu_dashboard.work.recruit_id IS 'ссылка на гражданина (citizen)'; - - COMMENT ON COLUMN ervu_dashboard.work.employer_category IS 'категория работодателя: юр лицо/ИП/физ лицо/глава КФХ'; - - COMMENT ON COLUMN ervu_dashboard.work.place IS 'место работы'; - - COMMENT ON COLUMN ervu_dashboard.work.organization_name IS 'наименование организации'; - - COMMENT ON COLUMN ervu_dashboard.work.inn IS 'ИНН'; - - COMMENT ON COLUMN ervu_dashboard.work.kpp IS 'КПП'; - - COMMENT ON COLUMN ervu_dashboard.work.ogrnip IS 'ОГРНИП'; - - COMMENT ON COLUMN ervu_dashboard.work."position" IS 'должность'; - - COMMENT ON COLUMN ervu_dashboard.work.event_type IS 'тип кадрового мероприятия '; - - COMMENT ON COLUMN ervu_dashboard.work.event_date IS 'дата кадрового мероприятия'; - CREATE SEQUENCE ervu_dashboard.work_work_id_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.work_work_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.work_work_id_seq OWNED BY ervu_dashboard.work.work_id; - CREATE TABLE IF NOT EXISTS main_dashboard.appeals ( total_appeals @@ -2589,88 +1928,59 @@ CREATE TABLE IF NOT EXISTS main_dashboard.appeals recording_date date DEFAULT - now + NOW ( ) NOT NULL, - average_to_face_percent numeric, - "average_EPGU_percent" numeric, - recruitment_id character + average_to_face_percent numeric, "average_EPGU_percent" numeric, recruitment_id CHARACTER ( 36 ) NOT NULL, - id_appeal bigint NOT NULL - ); + id_appeal bigint NOT NULL); ALTER TABLE IF EXISTS main_dashboard.appeals OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE main_dashboard.appeals IS 'Обжалования уровень РФ'; - - COMMENT ON COLUMN main_dashboard.appeals.total_appeals IS 'Всего жалоб'; - - COMMENT ON COLUMN main_dashboard.appeals.resolved IS 'Количество решенных'; - - COMMENT ON COLUMN main_dashboard.appeals.average_consideration IS 'Средний срок рассмотрения'; - - COMMENT ON COLUMN main_dashboard.appeals.average_rating IS 'Оценка удовлетворенности'; - - COMMENT ON COLUMN main_dashboard.appeals.average_to_face IS 'Способ подачи жалоб очно'; - - COMMENT ON COLUMN main_dashboard.appeals."average_EPGU" IS 'Способ подачи ЕПГУ'; - - COMMENT ON COLUMN main_dashboard.appeals.recording_date IS 'Дата записи'; - - COMMENT ON COLUMN main_dashboard.appeals.average_to_face_percent IS 'Способ подачи жалоб очно в процентах'; - - COMMENT ON COLUMN main_dashboard.appeals."average_EPGU_percent" IS 'Способ подачи ЕПГУ в процентах'; - CREATE SEQUENCE main_dashboard.appeals_id_appeal_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS main_dashboard.appeals_id_appeal_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE main_dashboard.appeals_id_appeal_seq OWNED BY main_dashboard.appeals.id_appeal; - CREATE TABLE IF NOT EXISTS main_dashboard.recruitment_campaign ( new_recruits @@ -2688,104 +1998,69 @@ CREATE TABLE IF NOT EXISTS main_dashboard.recruitment_campaign recording_date date DEFAULT - now + NOW ( ) NOT NULL, - appeared_on_subpoenas_percent numeric, - not_appeared_on_subpoenas_percent numeric, - postponement_have_right_percent numeric, - postponement_granted_percent numeric, - recruitment_id character + appeared_on_subpoenas_percent numeric, not_appeared_on_subpoenas_percent numeric, postponement_have_right_percent numeric, postponement_granted_percent numeric, recruitment_id CHARACTER ( 36 ) NOT NULL, - spring_autumn character + spring_autumn CHARACTER ( 36 ) NOT NULL, - id_recruitment_campaign bigint NOT NULL - ); + id_recruitment_campaign bigint NOT NULL); ALTER TABLE IF EXISTS main_dashboard.recruitment_campaign OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE main_dashboard.recruitment_campaign IS 'Призывная кампания уровень РФ'; - - COMMENT ON COLUMN main_dashboard.recruitment_campaign.new_recruits IS 'Подпадающие под призыв'; - - COMMENT ON COLUMN main_dashboard.recruitment_campaign.subpoenas_sent IS 'Направлено повесток'; - - COMMENT ON COLUMN main_dashboard.recruitment_campaign.appeared_on_subpoenas IS 'Явились по повесткам'; - - COMMENT ON COLUMN main_dashboard.recruitment_campaign.not_appeared_on_subpoenas IS 'Не явились по повесткам'; - - COMMENT ON COLUMN main_dashboard.recruitment_campaign.postponement_have_right IS 'Имеют право на отсрочку'; - - COMMENT ON COLUMN main_dashboard.recruitment_campaign.postponement_granted IS 'Предоставлена отсрочка'; - - COMMENT ON COLUMN main_dashboard.recruitment_campaign.recording_date IS 'Дата записи'; - - COMMENT ON COLUMN main_dashboard.recruitment_campaign.appeared_on_subpoenas_percent IS 'Явились по повесткам процент'; - - COMMENT ON COLUMN main_dashboard.recruitment_campaign.not_appeared_on_subpoenas_percent IS 'Не явились по повесткам процент'; - - COMMENT ON COLUMN main_dashboard.recruitment_campaign.postponement_have_right_percent IS 'Имеют право на отсрочку процент'; - - COMMENT ON COLUMN main_dashboard.recruitment_campaign.postponement_granted_percent IS 'Предоставлена отсрочка процент'; - CREATE SEQUENCE main_dashboard.recruitment_campaign_id_recruitment_campaign_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS main_dashboard.recruitment_campaign_id_recruitment_campaign_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE main_dashboard.recruitment_campaign_id_recruitment_campaign_seq OWNED BY main_dashboard.recruitment_campaign.id_recruitment_campaign; - CREATE TABLE IF NOT EXISTS main_dashboard.total_registered ( total_registered @@ -2803,94 +2078,62 @@ CREATE TABLE IF NOT EXISTS main_dashboard.total_registered recording_date date DEFAULT - now + NOW ( ) NOT NULL, - mobilization_criterion_percent numeric, - volunteer_criterion_percent numeric, - contract_criterion_percent numeric, - recruitment_id character + mobilization_criterion_percent numeric, volunteer_criterion_percent numeric, contract_criterion_percent numeric, recruitment_id CHARACTER ( 36 ) NOT NULL, - id_total_registered bigint NOT NULL - ); + id_total_registered bigint NOT NULL); ALTER TABLE IF EXISTS main_dashboard.total_registered OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE main_dashboard.total_registered IS 'Всего на учете уровень РФ'; - - COMMENT ON COLUMN main_dashboard.total_registered.total_registered IS 'Всего состоят на учете'; - - COMMENT ON COLUMN main_dashboard.total_registered."total_registered_M" IS 'Всего на учете мужчин'; - - COMMENT ON COLUMN main_dashboard.total_registered."total_registered_W" IS 'Всего на учете женщин'; - - COMMENT ON COLUMN main_dashboard.total_registered.mobilization_criterion IS 'Количество подходящих под критерии мобилизации'; - - COMMENT ON COLUMN main_dashboard.total_registered.volunteer_criterion IS 'Количество подходящих под критерии добровольной службы'; - - COMMENT ON COLUMN main_dashboard.total_registered.contract_criterion IS 'Количество подходящих под критерии контрактной службы'; - - COMMENT ON COLUMN main_dashboard.total_registered.recording_date IS 'дата записи'; - - COMMENT ON COLUMN main_dashboard.total_registered.mobilization_criterion_percent IS 'Процент подходящих под критерии мобилизации'; - - COMMENT ON COLUMN main_dashboard.total_registered.volunteer_criterion_percent IS 'Процент подходящих под критерии добровольной службы'; - - COMMENT ON COLUMN main_dashboard.total_registered.contract_criterion_percent IS 'Процент подходящих под критерии контрактрой службы'; - CREATE SEQUENCE main_dashboard.total_registered_id_total_registered_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS main_dashboard.total_registered_id_total_registered_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE main_dashboard.total_registered_id_total_registered_seq OWNED BY main_dashboard.total_registered.id_total_registered; - CREATE TABLE IF NOT EXISTS main_dashboard.waiting_registration ( waiting_registration @@ -2908,131 +2151,83 @@ CREATE TABLE IF NOT EXISTS main_dashboard.waiting_registration recording_date date DEFAULT - now + NOW ( ) NOT NULL, - waiting_registration_percent numeric, - mobilization_criterion_percent numeric, - volunteer_criterion_percent numeric, - contract_criterion_percent numeric, - recruitment_id character + waiting_registration_percent numeric, mobilization_criterion_percent numeric, volunteer_criterion_percent numeric, contract_criterion_percent numeric, recruitment_id CHARACTER ( 36 ) NOT NULL, - id_waiting_registration bigint NOT NULL - ); + id_waiting_registration bigint NOT NULL); ALTER TABLE IF EXISTS main_dashboard.waiting_registration OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE main_dashboard.waiting_registration IS 'Подлежат постановке на учет уровень РФ'; - - COMMENT ON COLUMN main_dashboard.waiting_registration.waiting_registration IS 'Всего подлежат постановке на учет'; - - COMMENT ON COLUMN main_dashboard.waiting_registration."waiting_registration_M" IS 'Подлежат постановке мужчины'; - - COMMENT ON COLUMN main_dashboard.waiting_registration."waiting_registration_W" IS 'Подлежат постановке женщины'; - - COMMENT ON COLUMN main_dashboard.waiting_registration.mobilization_criterion IS 'Количество подлежащих под критерии мобилизации'; - - COMMENT ON COLUMN main_dashboard.waiting_registration.volunteer_criterion IS 'Количество подлежащих под критерии добровольной службы'; - - COMMENT ON COLUMN main_dashboard.waiting_registration.contract_criterion IS 'Количество подлежащих под критерии контрактной службы'; - - COMMENT ON COLUMN main_dashboard.waiting_registration.recording_date IS 'Дата записи'; - - COMMENT ON COLUMN main_dashboard.waiting_registration.waiting_registration_percent IS 'Всего подлежат постановке процент'; - - COMMENT ON COLUMN main_dashboard.waiting_registration.mobilization_criterion_percent IS 'Процент подлежащих под критерии мобилизации'; - - COMMENT ON COLUMN main_dashboard.waiting_registration.volunteer_criterion_percent IS 'Процент подлежащих под критерии добровольной службы'; - - COMMENT ON COLUMN main_dashboard.waiting_registration.contract_criterion_percent IS 'Процент подлежащих под критерии контрактной службы'; - CREATE SEQUENCE main_dashboard.waiting_registration_id_waiting_registration_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS main_dashboard.waiting_registration_id_waiting_registration_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE main_dashboard.waiting_registration_id_waiting_registration_seq OWNED BY main_dashboard.waiting_registration.id_waiting_registration; - CREATE TABLE IF NOT EXISTS public.channel_log ( id_batch bigint, channel_id - character + CHARACTER ( 36 -), - log_date date, - logging_object_type character varying, - object_name character varying, - object_copy character varying, - repository_directory character varying, - filename character varying, - object_id character +), log_date date, logging_object_type CHARACTER varying, object_name CHARACTER varying, object_copy CHARACTER varying, repository_directory CHARACTER varying, filename CHARACTER varying, object_id CHARACTER ( 36 -), - object_version character varying, - object_revision character varying, - parent_channel_id character +), object_version CHARACTER varying, object_revision CHARACTER varying, parent_channel_id CHARACTER ( 36 -), - root_channel_id character +), root_channel_id CHARACTER ( 36 -) - ); - +)); CREATE TABLE IF NOT EXISTS public.job_entry_log @@ -3040,30 +2235,15 @@ CREATE TABLE IF NOT EXISTS public.job_entry_log id_batch bigint, channel_id - character + CHARACTER ( 36 -), - log_date date, - transname character varying, - stepname character varying, - lines_read character varying, - lines_written character varying, - lines_updated character varying, - lines_input character varying, - lines_output character varying, - lines_rejected character varying, - errors character varying, - "RESULT" character varying, - nr_result_rows character varying, - nr_result_files character varying - ); +), log_date date, transname CHARACTER varying, stepname CHARACTER varying, lines_read CHARACTER varying, lines_written CHARACTER varying, lines_updated CHARACTER varying, lines_input CHARACTER varying, lines_output CHARACTER varying, lines_rejected CHARACTER varying, errors CHARACTER varying, "RESULT" CHARACTER varying, nr_result_rows CHARACTER varying, nr_result_files CHARACTER varying); ALTER TABLE IF EXISTS public.job_entry_log OWNER TO "ervu-dashboard"; - CREATE TABLE IF NOT EXISTS public.job_log ( jobname @@ -3072,26 +2252,26 @@ CREATE TABLE IF NOT EXISTS public.job_log text, enddate timestamp - with - time - zone, + WITH + TIME + ZONE, depdate timestamp - with - time - zone, + WITH + TIME + ZONE, startdate timestamp - with - time - zone, + WITH + TIME + ZONE, logdate timestamp - with - time - zone, + WITH + TIME + ZONE, channel_id - character + CHARACTER varying, id_job bigint @@ -3099,11 +2279,11 @@ CREATE TABLE IF NOT EXISTS public.job_log NULL, replaydate timestamp - with - time - zone, + WITH + TIME + ZONE, log_field - character + CHARACTER varying, errors integer, @@ -3125,38 +2305,29 @@ CREATE TABLE IF NOT EXISTS public.job_log ALTER TABLE IF EXISTS public.job_log OWNER TO "ervu-dashboard"; - CREATE SEQUENCE public.job_log_id_job_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS public.job_log_id_job_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE public.job_log_id_job_seq OWNED BY public.job_log.id_job; - CREATE TABLE IF NOT EXISTS public.last_recording_date ( last_recording_date date DEFAULT - now + NOW ( -), - entry text - ); +), entry text); ALTER TABLE IF EXISTS public.last_recording_date OWNER TO "ervu-dashboard"; - CREATE TABLE IF NOT EXISTS ratings.appear_subppoena ( id_appear_subppoena @@ -3172,107 +2343,80 @@ CREATE TABLE IF NOT EXISTS ratings.appear_subppoena appear_mil_com_percent numeric, recruitment_id - character + CHARACTER ( 36 -) - ); +)); ALTER TABLE IF EXISTS ratings.appear_subppoena OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE ratings.appear_subppoena IS 'Явка по повестке уровень РФ'; - - COMMENT ON COLUMN ratings.appear_subppoena.appear_mil_com IS 'Явка в военкомат'; - - COMMENT ON COLUMN ratings.appear_subppoena.recording_date IS 'Дата записи'; - - COMMENT ON COLUMN ratings.appear_subppoena.appear_mil_com_percent IS 'Явка в военкомат в процентах'; - CREATE SEQUENCE ratings.appear_subppoena_id_appear_subppoena_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ratings.appear_subppoena_id_appear_subppoena_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ratings.appear_subppoena_id_appear_subppoena_seq OWNED BY ratings.appear_subppoena.id_appear_subppoena; - CREATE SEQUENCE ratings."ratings.conscription_info_id_ratings.conscription_info_seq" - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ratings."ratings.conscription_info_id_ratings.conscription_info_seq" OWNER TO "ervu-dashboard"; - CREATE TABLE IF NOT EXISTS ratings.conscription_info ( conscription_info_id bigint DEFAULT - nextval('ratings."ratings.conscription_info_id_ratings.conscription_info_seq"'::regclass) NOT NULL, - id_region integer, - execution numeric, - spring_autumn text, - recording_date date, - execution_percent numeric, - recruitment_id character(36) -); + nextval +( + 'ratings."ratings.conscription_info_id_ratings.conscription_info_seq"' + : + : + regclass +) NOT NULL, + id_region integer, execution numeric, spring_autumn text, recording_date date, execution_percent numeric, recruitment_id CHARACTER +( + 36 +)); ALTER TABLE IF EXISTS ratings.conscription_info OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE ratings.conscription_info IS 'Призыв уровень РФ'; - - COMMENT ON COLUMN ratings.conscription_info.execution IS 'Исполнение плана призыва'; - - COMMENT ON COLUMN ratings.conscription_info.spring_autumn IS 'Осень/весна'; - - COMMENT ON COLUMN ratings.conscription_info.recording_date IS 'Дата записи'; - - COMMENT ON COLUMN ratings.conscription_info.execution_percent IS 'Исолнение плана призыва в процентах'; - CREATE TABLE IF NOT EXISTS ratings.consideration_complaint ( id_consideration_complaint @@ -3288,52 +2432,37 @@ CREATE TABLE IF NOT EXISTS ratings.consideration_complaint consideration_complaint_percent numeric, recruitment_id - character + CHARACTER ( 36 -) - ); +)); ALTER TABLE IF EXISTS ratings.consideration_complaint OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE ratings.consideration_complaint IS 'Рассмотрение жалоб уровень РФ'; - - COMMENT ON COLUMN ratings.consideration_complaint.consideration_complaint IS 'Рассмотрение жалоб'; - - COMMENT ON COLUMN ratings.consideration_complaint.recording_date IS 'Дата записи'; - - COMMENT ON COLUMN ratings.consideration_complaint.consideration_complaint_percent IS 'Рассмотрение жалоб в процентах'; - CREATE SEQUENCE ratings.consideration_complaint_id_consideration_complaint_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ratings.consideration_complaint_id_consideration_complaint_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ratings.consideration_complaint_id_consideration_complaint_seq OWNED BY ratings.consideration_complaint.id_consideration_complaint; - CREATE TABLE IF NOT EXISTS recruitment_campaign.appeals ( total_appeals @@ -3349,63 +2478,43 @@ CREATE TABLE IF NOT EXISTS recruitment_campaign.appeals recording_date date DEFAULT - now + NOW ( ) NOT NULL, - resolved_percent numeric, - not_resolved_percent numeric, - recruitment_id character + resolved_percent numeric, not_resolved_percent numeric, recruitment_id CHARACTER ( 36 ) NOT NULL, - spring_autumn character varying NOT NULL - ); + spring_autumn CHARACTER varying NOT NULL); ALTER TABLE IF EXISTS recruitment_campaign.appeals OWNER TO "ervu-dashboard"; - - COMMENT ON COLUMN recruitment_campaign.appeals.total_appeals IS 'Получено жалоб'; - - COMMENT ON COLUMN recruitment_campaign.appeals.resolved IS 'Решено'; - - COMMENT ON COLUMN recruitment_campaign.appeals.not_resolved IS 'Не решено'; - - COMMENT ON COLUMN recruitment_campaign.appeals.average_consideration IS 'Время решения'; - - COMMENT ON COLUMN recruitment_campaign.appeals.average_rating IS 'Оценка удовлетворенности'; - - COMMENT ON COLUMN recruitment_campaign.appeals.recording_date IS 'Дата записи'; - - COMMENT ON COLUMN recruitment_campaign.appeals.resolved_percent IS 'Процент решенных'; - - COMMENT ON COLUMN recruitment_campaign.appeals.not_resolved_percent IS 'Процент не решенных'; - CREATE TABLE IF NOT EXISTS recruitment_campaign.postponement_info ( postponement_info_id @@ -3421,76 +2530,51 @@ CREATE TABLE IF NOT EXISTS recruitment_campaign.postponement_info recording_date date DEFAULT - now + NOW ( -), - postponement_have_right_percent numeric, - postponement_granted_percent numeric, - recruitment_id character +), postponement_have_right_percent numeric, postponement_granted_percent numeric, recruitment_id CHARACTER ( 36 -), - testspring_autumn character +), testspring_autumn CHARACTER ( 36 -) - ); +)); ALTER TABLE IF EXISTS recruitment_campaign.postponement_info OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE recruitment_campaign.postponement_info IS 'статистика по отсрочке и призывам'; - - COMMENT ON COLUMN recruitment_campaign.postponement_info.suitable_recruit IS 'Подходят под призыв'; - - COMMENT ON COLUMN recruitment_campaign.postponement_info.postponement_have_right IS 'Имеют право на отсрочку'; - - COMMENT ON COLUMN recruitment_campaign.postponement_info.postponement_granted IS 'Предоставлена отсрочка'; - - COMMENT ON COLUMN recruitment_campaign.postponement_info.recording_date IS 'Дата записи'; - - COMMENT ON COLUMN recruitment_campaign.postponement_info.postponement_have_right_percent IS 'Процент имеющих право на отсрочку'; - - COMMENT ON COLUMN recruitment_campaign.postponement_info.postponement_granted_percent IS 'Процент предоставленных отсрочек'; - CREATE SEQUENCE recruitment_campaign.recruitment_id_recruitment_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS recruitment_campaign.recruitment_id_recruitment_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE recruitment_campaign.recruitment_id_recruitment_seq OWNED BY recruitment_campaign.postponement_info.postponement_info_id; - CREATE TABLE IF NOT EXISTS recruitment_campaign.subpoenas ( subpoena @@ -3508,147 +2592,91 @@ CREATE TABLE IF NOT EXISTS recruitment_campaign.subpoenas recording_date date DEFAULT - now + NOW ( ) NOT NULL, - appeared_percent numeric, - not_appeared_percent numeric, - not_ap_good_reason_percent numeric, - ap_not_required_percent numeric, - restrictions_applied_percent numeric, - introduced_measures numeric, - introduced_measures_percent numeric, - recruitment_id character + appeared_percent numeric, not_appeared_percent numeric, not_ap_good_reason_percent numeric, ap_not_required_percent numeric, restrictions_applied_percent numeric, introduced_measures numeric, introduced_measures_percent numeric, recruitment_id CHARACTER ( 36 ) NOT NULL, - rest numeric, - spring_autumn character + rest numeric, spring_autumn CHARACTER ( 36 ) NOT NULL, id_subpoena bigint NOT NULL, - count_not_delivery numeric, - appear_date_is_good numeric, - not_delivery_percent numeric, - appear_date_is_good_percent numeric - ); + count_not_delivery numeric, appear_date_is_good numeric, not_delivery_percent numeric, appear_date_is_good_percent numeric); ALTER TABLE IF EXISTS recruitment_campaign.subpoenas OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE recruitment_campaign.subpoenas IS 'Повестки уровень РФ'; - - COMMENT ON COLUMN recruitment_campaign.subpoenas.subpoena IS 'Направлено повесток'; - - COMMENT ON COLUMN recruitment_campaign.subpoenas.appeared IS 'Явились'; - - COMMENT ON COLUMN recruitment_campaign.subpoenas.not_appeared IS 'Не явились'; - - COMMENT ON COLUMN recruitment_campaign.subpoenas.not_ap_good_reason IS 'Не явились по уважительной причине'; - - COMMENT ON COLUMN recruitment_campaign.subpoenas.ap_not_required IS 'Явка не требуется'; - - COMMENT ON COLUMN recruitment_campaign.subpoenas.restrictions_applied IS 'Наложено ограничений'; - - COMMENT ON COLUMN recruitment_campaign.subpoenas.recording_date IS 'Дата записи'; - - COMMENT ON COLUMN recruitment_campaign.subpoenas.appeared_percent IS 'Процент явившихся'; - - COMMENT ON COLUMN recruitment_campaign.subpoenas.not_appeared_percent IS 'Процент не явившихся'; - - COMMENT ON COLUMN recruitment_campaign.subpoenas.not_ap_good_reason_percent IS 'Процент не явившихся по уважительной причине'; - - COMMENT ON COLUMN recruitment_campaign.subpoenas.ap_not_required_percent IS 'Процент тех, где явка не требуется'; - - COMMENT ON COLUMN recruitment_campaign.subpoenas.restrictions_applied_percent IS 'Наложено ограничений'; - - COMMENT ON COLUMN recruitment_campaign.subpoenas.introduced_measures IS 'Введено реализатором мер'; - - COMMENT ON COLUMN recruitment_campaign.subpoenas.introduced_measures_percent IS 'Процент введенных реализатором мер'; - - COMMENT ON COLUMN recruitment_campaign.subpoenas.rest IS 'Остальные'; - - COMMENT ON COLUMN recruitment_campaign.subpoenas.appear_date_is_good IS 'Повестки, дата явки по которым еще не наступила'; - - COMMENT ON COLUMN recruitment_campaign.subpoenas.not_delivery_percent IS 'Процент не врученных повесток'; - - COMMENT ON COLUMN recruitment_campaign.subpoenas.appear_date_is_good_percent IS 'Процент повесток, по которым дата явки еще не наступила'; - CREATE SEQUENCE recruitment_campaign.subpoenas_id_subpoena_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS recruitment_campaign.subpoenas_id_subpoena_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE recruitment_campaign.subpoenas_id_subpoena_seq OWNED BY recruitment_campaign.subpoenas.id_subpoena; - CREATE TABLE IF NOT EXISTS space.military_commissariat ( id_military_commissariat @@ -3662,33 +2690,23 @@ CREATE TABLE IF NOT EXISTS space.military_commissariat ALTER TABLE IF EXISTS space.military_commissariat OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE space.military_commissariat IS 'Военные комиссариаты'; - - COMMENT ON COLUMN space.military_commissariat.military_commissariat_name IS 'Наименование военного комиссариата'; - CREATE SEQUENCE space.military_commissariat_id_military_commissariat_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS space.military_commissariat_id_military_commissariat_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE space.military_commissariat_id_military_commissariat_seq OWNED BY space.military_commissariat.id_military_commissariat; - CREATE TABLE IF NOT EXISTS space.military_district ( id_military_district @@ -3702,33 +2720,23 @@ CREATE TABLE IF NOT EXISTS space.military_district ALTER TABLE IF EXISTS space.military_district OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE space.military_district IS 'Военные округа'; - - COMMENT ON COLUMN space.military_district.military_district_name IS 'Наименование военного округа'; - CREATE SEQUENCE space.military_district_id_military_district_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS space.military_district_id_military_district_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE space.military_district_id_military_district_seq OWNED BY space.military_district.id_military_district; - CREATE TABLE IF NOT EXISTS space.region ( id_region @@ -3742,67 +2750,53 @@ CREATE TABLE IF NOT EXISTS space.region ALTER TABLE IF EXISTS space.region OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE space.region IS 'Регионы'; - - COMMENT ON COLUMN space.region.region IS 'Наименование региона'; - CREATE SEQUENCE space.region_id_region_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS space.region_id_region_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE space.region_id_region_seq OWNED BY space.region.id_region; - CREATE TABLE IF NOT EXISTS space.testrecruitment ( id - character + CHARACTER ( 36 ) NOT NULL, - shortname character + shortname CHARACTER ( 300 -), - idm_id character varying +), idm_id CHARACTER varying ( 36 ), - code character + code CHARACTER ( 300 -), - parent_id character +), parent_id CHARACTER ( 300 -) - ); +)); ALTER TABLE IF EXISTS space.testrecruitment OWNER TO "ervu-dashboard"; - CREATE TABLE IF NOT EXISTS space.ztestrecruitment ( id - uuid, + UUID, name text ); @@ -3811,7 +2805,6 @@ CREATE TABLE IF NOT EXISTS space.ztestrecruitment ALTER TABLE IF EXISTS space.ztestrecruitment OWNER TO "ervu-dashboard"; - CREATE TABLE IF NOT EXISTS total_registered.age ( "17_yaers" @@ -3829,219 +2822,144 @@ CREATE TABLE IF NOT EXISTS total_registered.age "51+_years" numeric, "all_M_W" - character + CHARACTER ( 10 ) NOT NULL, - recording_date date DEFAULT now + recording_date date DEFAULT NOW ( ) NOT NULL, - "46-50_years" numeric, - "17_yaers_percent" numeric, - "18-26_years_percent" numeric, - "27-30_years_percent" numeric, - "31-35_years_percent" numeric, - "36-40_years_percent" numeric, - "41-45_years_percent" numeric, - "46-50_years_percent" numeric, - "51+_years_percent" numeric, - recruitment_id character + "46-50_years" numeric, "17_yaers_percent" numeric, "18-26_years_percent" numeric, "27-30_years_percent" numeric, "31-35_years_percent" numeric, "36-40_years_percent" numeric, "41-45_years_percent" numeric, "46-50_years_percent" numeric, "51+_years_percent" numeric, recruitment_id CHARACTER ( 36 ) NOT NULL, - registered character + registered CHARACTER ( 10 ) NOT NULL, - id_age bigint NOT NULL - ); + id_age bigint NOT NULL); ALTER TABLE IF EXISTS total_registered.age OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE total_registered.age IS 'Возраст состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; - - COMMENT ON COLUMN total_registered.age."17_yaers" IS 'Возраст 17'; - - COMMENT ON COLUMN total_registered.age."18-26_years" IS 'Возраст 18-26'; - - COMMENT ON COLUMN total_registered.age."27-30_years" IS 'Возраст 27-30'; - - COMMENT ON COLUMN total_registered.age."31-35_years" IS 'Возраст 31-35'; - - COMMENT ON COLUMN total_registered.age."36-40_years" IS 'Возраст 36-40'; - - COMMENT ON COLUMN total_registered.age."41-45_years" IS 'Возраст 41-45'; - - COMMENT ON COLUMN total_registered.age."51+_years" IS 'Возраст 51+'; - - COMMENT ON COLUMN total_registered.age."all_M_W" IS 'Все/мужчины/женщины'; - - COMMENT ON COLUMN total_registered.age.recording_date IS 'Дата записи'; - - COMMENT ON COLUMN total_registered.age."46-50_years" IS 'Возраст 46-50'; - - COMMENT ON COLUMN total_registered.age."17_yaers_percent" IS 'Возраст 17 в процентах'; - - COMMENT ON COLUMN total_registered.age."18-26_years_percent" IS 'Возраст 18-26 в процентах'; - - COMMENT ON COLUMN total_registered.age."27-30_years_percent" IS 'Возраст 27-30 в процентах'; - - COMMENT ON COLUMN total_registered.age."31-35_years_percent" IS 'Возраст 31-35 в процентах'; - - COMMENT ON COLUMN total_registered.age."36-40_years_percent" IS 'Возраст 36-40 в процентах'; - - COMMENT ON COLUMN total_registered.age."41-45_years_percent" IS 'Возраст 41-45 в процентах'; - - COMMENT ON COLUMN total_registered.age."46-50_years_percent" IS 'Возраст 46-50 в процентах'; - - COMMENT ON COLUMN total_registered.age."51+_years_percent" IS 'Возраст 51+ в процентах'; - CREATE SEQUENCE total_registered.age_id_age_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS total_registered.age_id_age_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE total_registered.age_id_age_seq OWNED BY total_registered.age.id_age; - CREATE TABLE IF NOT EXISTS total_registered.busyness ( study numeric, - work + WORK numeric, not_work numeric, recording_date date DEFAULT - now + NOW ( ) NOT NULL, - study_percent numeric, - work_percent numeric, - not_work_percent numeric, - recruitment_id character + study_percent numeric, work_percent numeric, not_work_percent numeric, recruitment_id CHARACTER ( 36 ) NOT NULL, - registered character varying NOT NULL, - "all_M_W" character varying NOT NULL, - busyness numeric - ); + registered CHARACTER varying NOT NULL, + "all_M_W" CHARACTER varying NOT NULL, + busyness numeric); ALTER TABLE IF EXISTS total_registered.busyness OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE total_registered.busyness IS 'Занятость состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; - - COMMENT ON COLUMN total_registered.busyness.study IS 'Учатся'; - - COMMENT ON COLUMN total_registered.busyness.work IS 'Работают'; - - COMMENT ON COLUMN total_registered.busyness.not_work IS 'Безработные'; - - COMMENT ON COLUMN total_registered.busyness.recording_date IS 'Дата записи'; - - COMMENT ON COLUMN total_registered.busyness.study_percent IS 'Учатся в процентах'; - - COMMENT ON COLUMN total_registered.busyness.work_percent IS 'Работают в процентах'; - - COMMENT ON COLUMN total_registered.busyness.not_work_percent IS 'Безработные в процентах'; - CREATE TABLE IF NOT EXISTS total_registered.child_minor ( no_child @@ -4062,103 +2980,65 @@ CREATE TABLE IF NOT EXISTS total_registered.child_minor recording_date date DEFAULT now ( ) NOT NULL, - no_child_percent numeric, - "1_child_percent" numeric, - "2_child_percent" numeric, - "3_child_percent" numeric, - "4_more_child_percent" numeric, - recruitment_id character + no_child_percent numeric, "1_child_percent" numeric, "2_child_percent" numeric, "3_child_percent" numeric, "4_more_child_percent" numeric, recruitment_id character ( 36 ) NOT NULL, - id_child_minor bigint NOT NULL - ); + id_child_minor bigint NOT NULL); ALTER TABLE IF EXISTS total_registered.child_minor OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE total_registered.child_minor IS 'Дети то 18 лет состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; - - COMMENT ON COLUMN total_registered.child_minor.no_child IS 'Нет детей'; - - COMMENT ON COLUMN total_registered.child_minor."1_child" IS '1 ребенок'; - - COMMENT ON COLUMN total_registered.child_minor."2_child" IS '2 ребенка'; - - COMMENT ON COLUMN total_registered.child_minor."3_child" IS '3 ребенка'; - - COMMENT ON COLUMN total_registered.child_minor."4_more_child" IS '4 и более'; - - COMMENT ON COLUMN total_registered.child_minor."all_M_W" IS 'Все/Мужчины/Женщины'; - - COMMENT ON COLUMN total_registered.child_minor.recording_date IS 'Дата записи'; - - COMMENT ON COLUMN total_registered.child_minor.no_child_percent IS 'Нет детей в процентах'; - - COMMENT ON COLUMN total_registered.child_minor."1_child_percent" IS '1 ребенок в процентах'; - - COMMENT ON COLUMN total_registered.child_minor."2_child_percent" IS '2 ребенка в процентах'; - - COMMENT ON COLUMN total_registered.child_minor."3_child_percent" IS '3 ребенка в процентах'; - - COMMENT ON COLUMN total_registered.child_minor."4_more_child_percent" IS '4 и более ребенка в процентах'; - CREATE SEQUENCE total_registered.child_minor_id_child_minor_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS total_registered.child_minor_id_child_minor_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE total_registered.child_minor_id_child_minor_seq OWNED BY total_registered.child_minor.id_child_minor; - CREATE TABLE IF NOT EXISTS total_registered.driver_license ( nope @@ -4181,114 +3061,71 @@ CREATE TABLE IF NOT EXISTS total_registered.driver_license recording_date date DEFAULT now ( ) NOT NULL, - nope_repcent numeric, - "A_repcent" numeric, - "B_repcent" numeric, - "C_repcent" numeric, - "D_repcent" numeric, - "E_repcent" numeric, - recruitment_id character + nope_repcent numeric, "A_repcent" numeric, "B_repcent" numeric, "C_repcent" numeric, "D_repcent" numeric, "E_repcent" numeric, recruitment_id character ( 36 ) NOT NULL, - id_driver_license bigint NOT NULL - ); + id_driver_license bigint NOT NULL); ALTER TABLE IF EXISTS total_registered.driver_license OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE total_registered.driver_license IS 'Наличие водительского удостоверения состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; - - COMMENT ON COLUMN total_registered.driver_license.nope IS 'нет водительского удостоверения'; - - COMMENT ON COLUMN total_registered.driver_license."A" IS 'категория A'; - - COMMENT ON COLUMN total_registered.driver_license."B" IS 'категория B'; - - COMMENT ON COLUMN total_registered.driver_license."C" IS 'категория C'; - - COMMENT ON COLUMN total_registered.driver_license."D" IS 'категория D'; - - COMMENT ON COLUMN total_registered.driver_license."E" IS 'категория E'; - - COMMENT ON COLUMN total_registered.driver_license."all_M_W" IS 'Все/Мужчины/Женщины'; - - COMMENT ON COLUMN total_registered.driver_license.recording_date IS 'Дата записи'; - - COMMENT ON COLUMN total_registered.driver_license.nope_repcent IS 'нет водительского удостоверения в процентах'; - - COMMENT ON COLUMN total_registered.driver_license."A_repcent" IS 'категория A в процентах'; - - COMMENT ON COLUMN total_registered.driver_license."B_repcent" IS 'категория B в процентах'; - - COMMENT ON COLUMN total_registered.driver_license."C_repcent" IS 'категория C в процентах'; - - COMMENT ON COLUMN total_registered.driver_license."D_repcent" IS 'категория D в процентах'; - - COMMENT ON COLUMN total_registered.driver_license."E_repcent" IS 'категория E в процентах'; - CREATE SEQUENCE total_registered.driver_license_id_driver_license_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS total_registered.driver_license_id_driver_license_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE total_registered.driver_license_id_driver_license_seq OWNED BY total_registered.driver_license.id_driver_license; - CREATE TABLE IF NOT EXISTS total_registered.education_level ( higher @@ -4309,77 +3146,49 @@ CREATE TABLE IF NOT EXISTS total_registered.education_level now ( ) NOT NULL, - higher_percent numeric, - average_percent numeric, - only_general_percent numeric, - no_data_percent numeric, - recruitment_id character + higher_percent numeric, average_percent numeric, only_general_percent numeric, no_data_percent numeric, recruitment_id character ( 36 ) NOT NULL, - education_level numeric - ); + education_level numeric); ALTER TABLE IF EXISTS total_registered.education_level OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE total_registered.education_level IS 'Уровень образования состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; - - COMMENT ON COLUMN total_registered.education_level.higher IS 'Высшее образование'; - - COMMENT ON COLUMN total_registered.education_level.average IS 'Среднее профессиональное'; - - COMMENT ON COLUMN total_registered.education_level."all_M_W" IS 'Все/Мужчины/Женщины'; - - COMMENT ON COLUMN total_registered.education_level.only_general IS 'Только общее'; - - COMMENT ON COLUMN total_registered.education_level.no_data IS 'Нет данных'; - - COMMENT ON COLUMN total_registered.education_level.recording_date IS 'Дата записи'; - - COMMENT ON COLUMN total_registered.education_level.higher_percent IS 'Высшее образование в процентах'; - - COMMENT ON COLUMN total_registered.education_level.average_percent IS 'Среднее профессиональное в процентах'; - - COMMENT ON COLUMN total_registered.education_level.only_general_percent IS 'Только общее в процентах'; - - COMMENT ON COLUMN total_registered.education_level.no_data_percent IS 'Нет данных об образованиии в процентах'; - CREATE TABLE IF NOT EXISTS total_registered.marital_status ( married @@ -4396,55 +3205,37 @@ CREATE TABLE IF NOT EXISTS total_registered.marital_status now ( ) NOT NULL, - married_percent numeric, - not_married_percent numeric, - recruitment_id character + married_percent numeric, not_married_percent numeric, recruitment_id character ( 36 ) NOT NULL, - marital_status numeric - ); + marital_status numeric); ALTER TABLE IF EXISTS total_registered.marital_status OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE total_registered.marital_status IS 'Семейное положение состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; - - COMMENT ON COLUMN total_registered.marital_status.married IS 'В браке'; - - COMMENT ON COLUMN total_registered.marital_status.not_married IS 'Холост'; - - COMMENT ON COLUMN total_registered.marital_status."all_M_W" IS 'Все/Мужчины/Женщины'; - - COMMENT ON COLUMN total_registered.marital_status.recording_date IS 'Дата записи'; - - COMMENT ON COLUMN total_registered.marital_status.married_percent IS 'В браке в процентах'; - - COMMENT ON COLUMN total_registered.marital_status.not_married_percent IS 'Холост в процентах'; - CREATE TABLE IF NOT EXISTS total_registered.reg_mil_cat ( first_reg_17 @@ -4465,110 +3256,69 @@ CREATE TABLE IF NOT EXISTS total_registered.reg_mil_cat now ( ) NOT NULL, - first_reg_17_percent numeric, - first_reg_18_percent numeric, - returned_dep_liberty_percent numeric, - "mil_spec_W_percent" numeric, - punished_percent numeric, - received_citizenship_percent numeric, - recruitment_id character + first_reg_17_percent numeric, first_reg_18_percent numeric, returned_dep_liberty_percent numeric, "mil_spec_W_percent" numeric, punished_percent numeric, received_citizenship_percent numeric, recruitment_id character ( 36 ) NOT NULL, mil_reg numeric NOT NULL, - id_reg_mil_cat bigint NOT NULL - ); + id_reg_mil_cat bigint NOT NULL); ALTER TABLE IF EXISTS total_registered.reg_mil_cat OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE total_registered.reg_mil_cat IS 'Категории постановки на воинский учет состоящих/не состоящих на учете уровень РФ'; - - COMMENT ON COLUMN total_registered.reg_mil_cat.first_reg_17 IS 'Первоначальная постановка на воинский учет граждан от 17 лет'; - - COMMENT ON COLUMN total_registered.reg_mil_cat.first_reg_18 IS 'Первоначальная постановка на воинский учет граждан от 18 лет'; - - COMMENT ON COLUMN total_registered.reg_mil_cat.returned_dep_liberty IS 'Возвратившиеся из мест лишения свободы'; - - COMMENT ON COLUMN total_registered.reg_mil_cat."mil_spec_W" IS 'Женщины, получившие ВУС'; - - COMMENT ON COLUMN total_registered.reg_mil_cat.punished IS 'Отбывающие наказание в местах лишения свободы'; - - COMMENT ON COLUMN total_registered.reg_mil_cat.received_citizenship IS 'Получившие гражданство'; - - COMMENT ON COLUMN total_registered.reg_mil_cat.recording_date IS 'Дата записи'; - - COMMENT ON COLUMN total_registered.reg_mil_cat.first_reg_17_percent IS 'Первоначальная постановка на воинский учет граждан от 17 лет в процентах'; - - COMMENT ON COLUMN total_registered.reg_mil_cat.first_reg_18_percent IS 'Первоначальная постановка на воинский учет граждан от 18 лет в процентах'; - - COMMENT ON COLUMN total_registered.reg_mil_cat.returned_dep_liberty_percent IS 'Возвратившиеся из мест лишения свободы в процентах'; - - COMMENT ON COLUMN total_registered.reg_mil_cat."mil_spec_W_percent" IS 'Женщины, получившие ВУС в процентах'; - - COMMENT ON COLUMN total_registered.reg_mil_cat.punished_percent IS 'Отбывающие наказание в местах лишения свободы в процентах'; - - COMMENT ON COLUMN total_registered.reg_mil_cat.received_citizenship_percent IS 'Получившие гражданство в процентах'; - CREATE SEQUENCE total_registered.reg_mil_cat_id_reg_mil_cat_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS total_registered.reg_mil_cat_id_reg_mil_cat_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE total_registered.reg_mil_cat_id_reg_mil_cat_seq OWNED BY total_registered.reg_mil_cat.id_reg_mil_cat; - CREATE TABLE IF NOT EXISTS total_registered.removed_registry ( removed_registry @@ -4591,114 +3341,71 @@ CREATE TABLE IF NOT EXISTS total_registered.removed_registry now ( ) NOT NULL, - deprivation_citizen_percents numeric, - age_limit_percent numeric, - death_percent numeric, - travel_abroad_percent numeric, - living_abroad_percent numeric, - other_percent numeric, - recruitment_id character + deprivation_citizen_percents numeric, age_limit_percent numeric, death_percent numeric, travel_abroad_percent numeric, living_abroad_percent numeric, other_percent numeric, recruitment_id character ( 36 ) NOT NULL, - id_removed_registry bigint NOT NULL - ); + id_removed_registry bigint NOT NULL); ALTER TABLE IF EXISTS total_registered.removed_registry OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE total_registered.removed_registry IS 'Снято с учета уровень РФ'; - - COMMENT ON COLUMN total_registered.removed_registry.removed_registry IS 'Снято с учета'; - - COMMENT ON COLUMN total_registered.removed_registry.deprivation_citizenship IS 'Лишение гражданства'; - - COMMENT ON COLUMN total_registered.removed_registry.age_limit IS 'Наступление предельного возраста'; - - COMMENT ON COLUMN total_registered.removed_registry.death IS 'Смерть'; - - COMMENT ON COLUMN total_registered.removed_registry.travel_abroad IS 'Выезд за границу на срок более 6 месяцев'; - - COMMENT ON COLUMN total_registered.removed_registry.living_abroad IS 'Проживающие за границей'; - - COMMENT ON COLUMN total_registered.removed_registry.other IS 'Прочее'; - - COMMENT ON COLUMN total_registered.removed_registry.recording_date IS 'Дата записи'; - - COMMENT ON COLUMN total_registered.removed_registry.deprivation_citizen_percents IS 'Лишение гражданства в процентах'; - - COMMENT ON COLUMN total_registered.removed_registry.age_limit_percent IS 'Наступление предельного возраста в процентах'; - - COMMENT ON COLUMN total_registered.removed_registry.death_percent IS 'Смерть в процентах'; - - COMMENT ON COLUMN total_registered.removed_registry.travel_abroad_percent IS 'Выезд за границу на срок более 6 месяцев в процентах'; - - COMMENT ON COLUMN total_registered.removed_registry.living_abroad_percent IS 'Проживающие за границей в процентах'; - - COMMENT ON COLUMN total_registered.removed_registry.other_percent IS 'Прочее в процентах'; - CREATE SEQUENCE total_registered.removed_registry_id_removed_registry_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS total_registered.removed_registry_id_removed_registry_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE total_registered.removed_registry_id_removed_registry_seq OWNED BY total_registered.removed_registry.id_removed_registry; - CREATE TABLE IF NOT EXISTS total_registered.subpoenas ( subpoena @@ -4727,905 +3434,757 @@ CREATE TABLE IF NOT EXISTS total_registered.subpoenas now ( ) NOT NULL, - appeared_percent numeric, - not_appeared_percent numeric, - not_ap_good_reason_percent numeric, - ap_not_required_percent numeric, - electron_percent numeric, - paper_percent numeric, - restrictions_applied_percent numeric, - introduced_measures_percent numeric, - recruitment_id character + appeared_percent numeric, not_appeared_percent numeric, not_ap_good_reason_percent numeric, ap_not_required_percent numeric, electron_percent numeric, paper_percent numeric, restrictions_applied_percent numeric, introduced_measures_percent numeric, recruitment_id character ( 36 ) NOT NULL, mil_reg numeric NOT NULL, id_subpoena bigint NOT NULL, - count_not_delivery numeric, - appear_date_is_good numeric, - not_delivery_percent numeric, - appear_date_is_good_percent numeric - ); + count_not_delivery numeric, appear_date_is_good numeric, not_delivery_percent numeric, appear_date_is_good_percent numeric); ALTER TABLE IF EXISTS total_registered.subpoenas OWNER TO "ervu-dashboard"; - - COMMENT ON TABLE total_registered.subpoenas IS 'Повестки состоящих/не состоящих на учете уровень РФ'; - - COMMENT ON COLUMN total_registered.subpoenas.subpoena IS 'Направлено повесток'; - - COMMENT ON COLUMN total_registered.subpoenas.average_appeared IS 'Средний срок явки'; - - COMMENT ON COLUMN total_registered.subpoenas.appeared IS 'Явились'; - - COMMENT ON COLUMN total_registered.subpoenas.not_appeared IS 'Не явились'; - - COMMENT ON COLUMN total_registered.subpoenas.not_ap_good_reason IS 'Не явились по уважительной причине'; - - COMMENT ON COLUMN total_registered.subpoenas.ap_not_required IS 'Явка не требуется'; - - COMMENT ON COLUMN total_registered.subpoenas.electron IS 'Электронно'; - - COMMENT ON COLUMN total_registered.subpoenas.paper IS 'Нарочно'; - - COMMENT ON COLUMN total_registered.subpoenas.restrictions_applied IS 'Применено ограничений'; - - COMMENT ON COLUMN total_registered.subpoenas.introduced_measures IS 'Введено реализатором мер'; - - COMMENT ON COLUMN total_registered.subpoenas.recording_date IS 'Дата записи'; - - COMMENT ON COLUMN total_registered.subpoenas.appeared_percent IS 'Явились в процентах'; - - COMMENT ON COLUMN total_registered.subpoenas.not_appeared_percent IS 'Не явились в процентах'; - - COMMENT ON COLUMN total_registered.subpoenas.not_ap_good_reason_percent IS 'Не явились по уважительной причине в процентах'; - - COMMENT ON COLUMN total_registered.subpoenas.ap_not_required_percent IS 'Явка не требуется в процентах'; - - COMMENT ON COLUMN total_registered.subpoenas.electron_percent IS 'Электронно в процентах'; - - COMMENT ON COLUMN total_registered.subpoenas.paper_percent IS 'Нарочно в процентах'; - - COMMENT ON COLUMN total_registered.subpoenas.restrictions_applied_percent IS 'Применено ограничений в процентах'; - - COMMENT ON COLUMN total_registered.subpoenas.introduced_measures_percent IS 'Введено реализатором мер в процентах'; - - COMMENT ON COLUMN total_registered.subpoenas.count_not_delivery IS 'Количество не врученных повесток'; - - COMMENT ON COLUMN total_registered.subpoenas.appear_date_is_good IS 'Повестки, дата явки по которым еще не наступила'; - - COMMENT ON COLUMN total_registered.subpoenas.not_delivery_percent IS 'Процент не врученных повесток'; - - COMMENT ON COLUMN total_registered.subpoenas.appear_date_is_good_percent IS 'Процент повесток, дата явки по которым еще не наступила'; - CREATE SEQUENCE total_registered.subpoenas_id_subpoena_seq - START WITH 1 - INCREMENT BY 1 - NO MINVALUE - NO MAXVALUE CACHE 1; + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS total_registered.subpoenas_id_subpoena_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE total_registered.subpoenas_id_subpoena_seq OWNED BY total_registered.subpoenas.id_subpoena; - -ALTER TABLE IF EXISTS ONLY appeals.main_profile ALTER COLUMN id_main_profile SET DEFAULT nextval('appeals.main_profile_id_main_profile_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY appeals.reasons_appeal ALTER COLUMN id_reasons_appeal SET DEFAULT nextval('appeals.reasons_appeal_id_reasons_appeal_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY appeals.review_rating ALTER COLUMN id_review_rating SET DEFAULT nextval('appeals.review_rating_id_review_rating_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY appeals.topic_appeal ALTER COLUMN id_topic_appeal SET DEFAULT nextval('appeals.topic_appeal_id_topic_appeal_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_child ALTER COLUMN citizen_child_id SET DEFAULT nextval('ervu_dashboard.citizen_child_citizen_child_id_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_guardianship ALTER COLUMN citizen_guardianship_id SET DEFAULT nextval('ervu_dashboard.citizen_guardianship_citizen_guardianship_id_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_spouse ALTER COLUMN citizen_spouse_id SET DEFAULT nextval('ervu_dashboard.citizen_spouse_citizen_spouse_id_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizenship ALTER COLUMN citizenship_id SET DEFAULT nextval('ervu_dashboard.citizenship_citizenship_id_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizenship_foreign ALTER COLUMN citizenship_foreign_id SET DEFAULT nextval('ervu_dashboard.citizenship_foreign_citizenship_foreign_id_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.decision ALTER COLUMN decision_id SET DEFAULT nextval('ervu_dashboard.decision_decision_id_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.deputy ALTER COLUMN deputy_id SET DEFAULT nextval('ervu_dashboard.deputy_deputy_id_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.disability ALTER COLUMN disability_id SET DEFAULT nextval('ervu_dashboard.disability_disability_id_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.disease ALTER COLUMN disease_id SET DEFAULT nextval('ervu_dashboard.disease_disease_id_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.drivers_licence ALTER COLUMN drivers_licence_id SET DEFAULT nextval('ervu_dashboard.drivers_licence_drivers_licence_id_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.medical_authorities ALTER COLUMN medical_authorities_id SET DEFAULT nextval('ervu_dashboard.medical_authorities_medical_authorities_id_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.passport ALTER COLUMN passport_id SET DEFAULT nextval('ervu_dashboard.passport_passport_id_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.property ALTER COLUMN property_id SET DEFAULT nextval('ervu_dashboard.property_property_id_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.prosecution ALTER COLUMN prosecution_id SET DEFAULT nextval('ervu_dashboard.prosecution_prosecution_id_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.punishment ALTER COLUMN punishment_id SET DEFAULT nextval('ervu_dashboard.punishment_punishment_id_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.work ALTER COLUMN work_id SET DEFAULT nextval('ervu_dashboard.work_work_id_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY main_dashboard.appeals ALTER COLUMN id_appeal SET DEFAULT nextval('main_dashboard.appeals_id_appeal_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY main_dashboard.recruitment_campaign ALTER COLUMN id_recruitment_campaign SET DEFAULT nextval('main_dashboard.recruitment_campaign_id_recruitment_campaign_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY main_dashboard.total_registered ALTER COLUMN id_total_registered SET DEFAULT nextval('main_dashboard.total_registered_id_total_registered_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY main_dashboard.waiting_registration ALTER COLUMN id_waiting_registration SET DEFAULT nextval('main_dashboard.waiting_registration_id_waiting_registration_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY public.job_log ALTER COLUMN id_job SET DEFAULT nextval('public.job_log_id_job_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY ratings.appear_subppoena ALTER COLUMN id_appear_subppoena SET DEFAULT nextval('ratings.appear_subppoena_id_appear_subppoena_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY ratings.consideration_complaint ALTER COLUMN id_consideration_complaint SET DEFAULT nextval('ratings.consideration_complaint_id_consideration_complaint_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY recruitment_campaign.postponement_info ALTER COLUMN postponement_info_id SET DEFAULT nextval('recruitment_campaign.recruitment_id_recruitment_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY recruitment_campaign.subpoenas ALTER COLUMN id_subpoena SET DEFAULT nextval('recruitment_campaign.subpoenas_id_subpoena_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY space.military_commissariat ALTER COLUMN id_military_commissariat SET DEFAULT nextval('space.military_commissariat_id_military_commissariat_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY space.military_district ALTER COLUMN id_military_district SET DEFAULT nextval('space.military_district_id_military_district_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY space.region ALTER COLUMN id_region SET DEFAULT nextval('space.region_id_region_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY total_registered.age ALTER COLUMN id_age SET DEFAULT nextval('total_registered.age_id_age_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY total_registered.child_minor ALTER COLUMN id_child_minor SET DEFAULT nextval('total_registered.child_minor_id_child_minor_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY total_registered.driver_license ALTER COLUMN id_driver_license SET DEFAULT nextval('total_registered.driver_license_id_driver_license_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY total_registered.reg_mil_cat ALTER COLUMN id_reg_mil_cat SET DEFAULT nextval('total_registered.reg_mil_cat_id_reg_mil_cat_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY total_registered.removed_registry ALTER COLUMN id_removed_registry SET DEFAULT nextval('total_registered.removed_registry_id_removed_registry_seq'::regclass); - - - -ALTER TABLE IF EXISTS ONLY total_registered.subpoenas ALTER COLUMN id_subpoena SET DEFAULT nextval('total_registered.subpoenas_id_subpoena_seq'::regclass); - - -SELECT pg_catalog.setval('appeals.main_profile_id_main_profile_seq', 1, false); - - - -SELECT pg_catalog.setval('appeals.reasons_appeal_id_reasons_appeal_seq', 1, true); - - - -SELECT pg_catalog.setval('appeals.review_rating_id_review_rating_seq', 6, true); - - - -SELECT pg_catalog.setval('appeals.topic_appeal_id_topic_appeal_seq', 1, true); - - - -SELECT pg_catalog.setval('ervu_dashboard.citizen_child_citizen_child_id_seq', 132950, true); - - - -SELECT pg_catalog.setval('ervu_dashboard.citizen_guardianship_citizen_guardianship_id_seq', 4653, - true); - - - -SELECT pg_catalog.setval('ervu_dashboard.citizen_spouse_citizen_spouse_id_seq', 229504, true); - - - -SELECT pg_catalog.setval('ervu_dashboard.citizenship_citizenship_id_seq', 69012, true); - - - -SELECT pg_catalog.setval('ervu_dashboard.citizenship_foreign_citizenship_foreign_id_seq', 71568, - true); - - - -SELECT pg_catalog.setval('ervu_dashboard.decision_decision_id_seq', 1, false); - - - -SELECT pg_catalog.setval('ervu_dashboard.deputy_deputy_id_seq', 47, true); - - - -SELECT pg_catalog.setval('ervu_dashboard.disability_disability_id_seq', 94609, true); - - - -SELECT pg_catalog.setval('ervu_dashboard.disease_disease_id_seq', 198170, true); - - - -SELECT pg_catalog.setval('ervu_dashboard.drivers_licence_drivers_licence_id_seq', 7056, true); - - - -SELECT pg_catalog.setval('ervu_dashboard.medical_authorities_medical_authorities_id_seq', 298794, - true); - - - -SELECT pg_catalog.setval('ervu_dashboard.passport_passport_id_seq', 53048, true); - - - -SELECT pg_catalog.setval('ervu_dashboard.property_property_id_seq', 372952, true); - - - -SELECT pg_catalog.setval('ervu_dashboard.prosecution_prosecution_id_seq', 44, true); - - - -SELECT pg_catalog.setval('ervu_dashboard.punishment_punishment_id_seq', 22, true); - - - -SELECT pg_catalog.setval('ervu_dashboard.subpoena_subpoena_id_seq', 27501, true); - - - -SELECT pg_catalog.setval('ervu_dashboard.temporary_measures_temporary_measures_id_seq', 12191, - true); - - - -SELECT pg_catalog.setval('ervu_dashboard.testrecruitment_sort_seq', 90, true); - - - -SELECT pg_catalog.setval('ervu_dashboard.work_work_id_seq', 1, false); - - - -SELECT pg_catalog.setval('main_dashboard.appeals_id_appeal_seq', 796, true); - - - -SELECT pg_catalog.setval('main_dashboard.recruitment_campaign_id_recruitment_campaign_seq', 1522, - true); - - - -SELECT pg_catalog.setval('main_dashboard.total_registered_id_total_registered_seq', 830, true); - - - -SELECT pg_catalog.setval('main_dashboard.waiting_registration_id_waiting_registration_seq', 742, - true); - - - -SELECT pg_catalog.setval('public.job_log_id_job_seq', 1, false); - - - -SELECT pg_catalog.setval('ratings.appear_subppoena_id_appear_subppoena_seq', 6, true); - - - -SELECT pg_catalog.setval('ratings.consideration_complaint_id_consideration_complaint_seq', 6, true); - - - -SELECT pg_catalog.setval('ratings."ratings.conscription_info_id_ratings.conscription_info_seq"', 6, - true); - - - -SELECT pg_catalog.setval('recruitment_campaign.recruitment_id_recruitment_seq', 2, true); - - - -SELECT pg_catalog.setval('recruitment_campaign.subpoenas_id_subpoena_seq', 1111, true); - - - -SELECT pg_catalog.setval('space.military_commissariat_id_military_commissariat_seq', 1, true); - - - -SELECT pg_catalog.setval('space.military_district_id_military_district_seq', 1, true); - - - -SELECT pg_catalog.setval('space.region_id_region_seq', 15, true); - - - -SELECT pg_catalog.setval('total_registered.age_id_age_seq', 2250, true); - - - -SELECT pg_catalog.setval('total_registered.child_minor_id_child_minor_seq', 2124, true); - - - -SELECT pg_catalog.setval('total_registered.driver_license_id_driver_license_seq', 1849, true); - - - -SELECT pg_catalog.setval('total_registered.reg_mil_cat_id_reg_mil_cat_seq', 885, true); - - - -SELECT pg_catalog.setval('total_registered.removed_registry_id_removed_registry_seq', 609, true); - - - -SELECT pg_catalog.setval('total_registered.subpoenas_id_subpoena_seq', 1184, true); - - - ALTER TABLE IF EXISTS ONLY appeals.main_profile - ADD CONSTRAINT pk_main_profile PRIMARY KEY (id_main_profile); - +ALTER +COLUMN id_main_profile +SET DEFAULT nextval('appeals.main_profile_id_main_profile_seq'::regclass); ALTER TABLE IF EXISTS ONLY appeals.reasons_appeal - ADD CONSTRAINT pk_reasons_appeal PRIMARY KEY (id_reasons_appeal); - +ALTER +COLUMN id_reasons_appeal +SET DEFAULT nextval('appeals.reasons_appeal_id_reasons_appeal_seq'::regclass); ALTER TABLE IF EXISTS ONLY appeals.review_rating - ADD CONSTRAINT pk_review_rating PRIMARY KEY (id_review_rating); - +ALTER +COLUMN id_review_rating +SET DEFAULT nextval('appeals.review_rating_id_review_rating_seq'::regclass); ALTER TABLE IF EXISTS ONLY appeals.topic_appeal - ADD CONSTRAINT pk_topic_appeal PRIMARY KEY (id_topic_appeal); - - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen - ADD CONSTRAINT citizen_pkey PRIMARY KEY (recruit_id); - - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.decision - ADD CONSTRAINT decision_pkey PRIMARY KEY (decision_id); - +ALTER +COLUMN id_topic_appeal +SET DEFAULT nextval('appeals.topic_appeal_id_topic_appeal_seq'::regclass); ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_child - ADD CONSTRAINT pk_citizen_child PRIMARY KEY (citizen_child_id); - +ALTER +COLUMN citizen_child_id +SET DEFAULT nextval('ervu_dashboard.citizen_child_citizen_child_id_seq'::regclass); ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_guardianship - ADD CONSTRAINT pk_citizen_guardianship PRIMARY KEY (citizen_guardianship_id); - +ALTER +COLUMN citizen_guardianship_id +SET DEFAULT nextval('ervu_dashboard.citizen_guardianship_citizen_guardianship_id_seq'::regclass); ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_spouse - ADD CONSTRAINT pk_citizen_spouse PRIMARY KEY (citizen_spouse_id); - +ALTER +COLUMN citizen_spouse_id +SET DEFAULT nextval('ervu_dashboard.citizen_spouse_citizen_spouse_id_seq'::regclass); ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizenship - ADD CONSTRAINT pk_citizenship PRIMARY KEY (citizenship_id); - +ALTER +COLUMN citizenship_id +SET DEFAULT nextval('ervu_dashboard.citizenship_citizenship_id_seq'::regclass); ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizenship_foreign - ADD CONSTRAINT pk_citizenship_foreign PRIMARY KEY (citizenship_foreign_id); +ALTER +COLUMN citizenship_foreign_id +SET DEFAULT nextval('ervu_dashboard.citizenship_foreign_citizenship_foreign_id_seq'::regclass); +ALTER TABLE IF EXISTS ONLY ervu_dashboard.decision +ALTER +COLUMN decision_id +SET DEFAULT nextval('ervu_dashboard.decision_decision_id_seq'::regclass); + ALTER TABLE IF EXISTS ONLY ervu_dashboard.deputy - ADD CONSTRAINT pk_deputy PRIMARY KEY (deputy_id); - +ALTER +COLUMN deputy_id +SET DEFAULT nextval('ervu_dashboard.deputy_deputy_id_seq'::regclass); ALTER TABLE IF EXISTS ONLY ervu_dashboard.disability - ADD CONSTRAINT pk_disability PRIMARY KEY (disability_id); - +ALTER +COLUMN disability_id +SET DEFAULT nextval('ervu_dashboard.disability_disability_id_seq'::regclass); ALTER TABLE IF EXISTS ONLY ervu_dashboard.disease - ADD CONSTRAINT pk_disease PRIMARY KEY (disease_id); - +ALTER +COLUMN disease_id +SET DEFAULT nextval('ervu_dashboard.disease_disease_id_seq'::regclass); ALTER TABLE IF EXISTS ONLY ervu_dashboard.drivers_licence - ADD CONSTRAINT pk_drivers_licence PRIMARY KEY (drivers_licence_id); - +ALTER +COLUMN drivers_licence_id +SET DEFAULT nextval('ervu_dashboard.drivers_licence_drivers_licence_id_seq'::regclass); ALTER TABLE IF EXISTS ONLY ervu_dashboard.medical_authorities - ADD CONSTRAINT pk_medical_authorities PRIMARY KEY (medical_authorities_id); - +ALTER +COLUMN medical_authorities_id +SET DEFAULT nextval('ervu_dashboard.medical_authorities_medical_authorities_id_seq'::regclass); ALTER TABLE IF EXISTS ONLY ervu_dashboard.passport - ADD CONSTRAINT pk_passport PRIMARY KEY (passport_id); - +ALTER +COLUMN passport_id +SET DEFAULT nextval('ervu_dashboard.passport_passport_id_seq'::regclass); ALTER TABLE IF EXISTS ONLY ervu_dashboard.property - ADD CONSTRAINT pk_property PRIMARY KEY (property_id); - +ALTER +COLUMN property_id +SET DEFAULT nextval('ervu_dashboard.property_property_id_seq'::regclass); ALTER TABLE IF EXISTS ONLY ervu_dashboard.prosecution - ADD CONSTRAINT pk_prosecution PRIMARY KEY (prosecution_id); - +ALTER +COLUMN prosecution_id +SET DEFAULT nextval('ervu_dashboard.prosecution_prosecution_id_seq'::regclass); ALTER TABLE IF EXISTS ONLY ervu_dashboard.punishment - ADD CONSTRAINT pk_punishment PRIMARY KEY (punishment_id); - +ALTER +COLUMN punishment_id +SET DEFAULT nextval('ervu_dashboard.punishment_punishment_id_seq'::regclass); ALTER TABLE IF EXISTS ONLY ervu_dashboard.work - ADD CONSTRAINT pk_work PRIMARY KEY (work_id); - - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.pub_recruitment - ADD CONSTRAINT pub_recruitment_pkey PRIMARY KEY (id); - - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.pub_recruitment - ADD CONSTRAINT recruitment_idm_id_key UNIQUE (idm_id); - - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.recruitment - ADD CONSTRAINT recruitment_pkey PRIMARY KEY (id); - - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.subpoena - ADD CONSTRAINT subpoena_pkey PRIMARY KEY (sub_id); - - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.temporary_measures - ADD CONSTRAINT temporary_measures_pkey PRIMARY KEY (temporary_measures_id); - +ALTER +COLUMN work_id +SET DEFAULT nextval('ervu_dashboard.work_work_id_seq'::regclass); ALTER TABLE IF EXISTS ONLY main_dashboard.appeals - ADD CONSTRAINT appeals_pkey PRIMARY KEY (recruitment_id, recording_date); - +ALTER +COLUMN id_appeal +SET DEFAULT nextval('main_dashboard.appeals_id_appeal_seq'::regclass); ALTER TABLE IF EXISTS ONLY main_dashboard.recruitment_campaign - ADD CONSTRAINT recruitment_campaign_pkey PRIMARY KEY (spring_autumn, recruitment_id, recording_date); - +ALTER +COLUMN id_recruitment_campaign +SET DEFAULT nextval('main_dashboard.recruitment_campaign_id_recruitment_campaign_seq'::regclass); ALTER TABLE IF EXISTS ONLY main_dashboard.total_registered - ADD CONSTRAINT total_registered_pkey PRIMARY KEY (recruitment_id, recording_date); - +ALTER +COLUMN id_total_registered +SET DEFAULT nextval('main_dashboard.total_registered_id_total_registered_seq'::regclass); ALTER TABLE IF EXISTS ONLY main_dashboard.waiting_registration - ADD CONSTRAINT waiting_registration_pkey PRIMARY KEY (recruitment_id, recording_date); - +ALTER +COLUMN id_waiting_registration +SET DEFAULT nextval('main_dashboard.waiting_registration_id_waiting_registration_seq'::regclass); ALTER TABLE IF EXISTS ONLY public.job_log - ADD CONSTRAINT job_log_pkey PRIMARY KEY (id_job); - +ALTER +COLUMN id_job +SET DEFAULT nextval('public.job_log_id_job_seq'::regclass); ALTER TABLE IF EXISTS ONLY ratings.appear_subppoena - ADD CONSTRAINT pk_appear_subppoena PRIMARY KEY (id_appear_subppoena); - - - -ALTER TABLE IF EXISTS ONLY ratings.conscription_info - ADD CONSTRAINT pk_conscription_info PRIMARY KEY (conscription_info_id); - +ALTER +COLUMN id_appear_subppoena +SET DEFAULT nextval('ratings.appear_subppoena_id_appear_subppoena_seq'::regclass); ALTER TABLE IF EXISTS ONLY ratings.consideration_complaint - ADD CONSTRAINT pk_consideration_complaint PRIMARY KEY (id_consideration_complaint); - - - -ALTER TABLE IF EXISTS ONLY recruitment_campaign.appeals - ADD CONSTRAINT appeals_pkey PRIMARY KEY (recording_date, spring_autumn, recruitment_id); - +ALTER +COLUMN id_consideration_complaint +SET DEFAULT nextval('ratings.consideration_complaint_id_consideration_complaint_seq'::regclass); ALTER TABLE IF EXISTS ONLY recruitment_campaign.postponement_info - ADD CONSTRAINT pk_postponement_info PRIMARY KEY (postponement_info_id); - +ALTER +COLUMN postponement_info_id +SET DEFAULT nextval('recruitment_campaign.recruitment_id_recruitment_seq'::regclass); ALTER TABLE IF EXISTS ONLY recruitment_campaign.subpoenas - ADD CONSTRAINT subpoenas_pkey PRIMARY KEY (spring_autumn, recruitment_id, recording_date); - - - -ALTER TABLE IF EXISTS ONLY space.military_district - ADD CONSTRAINT military_district_pkey PRIMARY KEY (id_military_district); - +ALTER +COLUMN id_subpoena +SET DEFAULT nextval('recruitment_campaign.subpoenas_id_subpoena_seq'::regclass); ALTER TABLE IF EXISTS ONLY space.military_commissariat - ADD CONSTRAINT pk_military_commissariat PRIMARY KEY (id_military_commissariat); +ALTER +COLUMN id_military_commissariat +SET DEFAULT nextval('space.military_commissariat_id_military_commissariat_seq'::regclass); +ALTER TABLE IF EXISTS ONLY space.military_district +ALTER +COLUMN id_military_district +SET DEFAULT nextval('space.military_district_id_military_district_seq'::regclass); + ALTER TABLE IF EXISTS ONLY space.region - ADD CONSTRAINT pk_region PRIMARY KEY (id_region); - - - -ALTER TABLE IF EXISTS ONLY space.testrecruitment - ADD CONSTRAINT testrecruitment_pkey PRIMARY KEY (id); - +ALTER +COLUMN id_region +SET DEFAULT nextval('space.region_id_region_seq'::regclass); ALTER TABLE IF EXISTS ONLY total_registered.age - ADD CONSTRAINT age_pkey PRIMARY KEY (registered, recruitment_id, recording_date, "all_M_W"); - - - -ALTER TABLE IF EXISTS ONLY total_registered.busyness - ADD CONSTRAINT busyness_pkey PRIMARY KEY (recording_date, recruitment_id, registered, "all_M_W"); - +ALTER +COLUMN id_age +SET DEFAULT nextval('total_registered.age_id_age_seq'::regclass); ALTER TABLE IF EXISTS ONLY total_registered.child_minor - ADD CONSTRAINT child_minor_pkey PRIMARY KEY ("all_M_W", recording_date, recruitment_id); - +ALTER +COLUMN id_child_minor +SET DEFAULT nextval('total_registered.child_minor_id_child_minor_seq'::regclass); ALTER TABLE IF EXISTS ONLY total_registered.driver_license - ADD CONSTRAINT driver_license_pkey PRIMARY KEY (recruitment_id, "all_M_W", recording_date); - - - -ALTER TABLE IF EXISTS ONLY total_registered.education_level - ADD CONSTRAINT education_level_pkey PRIMARY KEY ("all_M_W", recording_date, recruitment_id); - - - -ALTER TABLE IF EXISTS ONLY total_registered.marital_status - ADD CONSTRAINT marital_status_pkey PRIMARY KEY (recruitment_id, recording_date, "all_M_W"); - +ALTER +COLUMN id_driver_license +SET DEFAULT nextval('total_registered.driver_license_id_driver_license_seq'::regclass); ALTER TABLE IF EXISTS ONLY total_registered.reg_mil_cat - ADD CONSTRAINT reg_mil_cat_pkey PRIMARY KEY (mil_reg, recruitment_id, recording_date); - +ALTER +COLUMN id_reg_mil_cat +SET DEFAULT nextval('total_registered.reg_mil_cat_id_reg_mil_cat_seq'::regclass); ALTER TABLE IF EXISTS ONLY total_registered.removed_registry - ADD CONSTRAINT removed_registry_pkey PRIMARY KEY (recruitment_id, recording_date); - +ALTER +COLUMN id_removed_registry +SET DEFAULT nextval('total_registered.removed_registry_id_removed_registry_seq'::regclass); ALTER TABLE IF EXISTS ONLY total_registered.subpoenas - ADD CONSTRAINT subpoenas_pkey PRIMARY KEY (mil_reg, recruitment_id, recording_date); +ALTER +COLUMN id_subpoena +SET DEFAULT nextval('total_registered.subpoenas_id_subpoena_seq'::regclass); +SELECT pg_catalog.setval('appeals.main_profile_id_main_profile_seq', 1, FALSE); + + +SELECT pg_catalog.setval('appeals.reasons_appeal_id_reasons_appeal_seq', 1, TRUE); + + +SELECT pg_catalog.setval('appeals.review_rating_id_review_rating_seq', 6, TRUE); + + +SELECT pg_catalog.setval('appeals.topic_appeal_id_topic_appeal_seq', 1, TRUE); + + +SELECT pg_catalog.setval('ervu_dashboard.citizen_child_citizen_child_id_seq', 132950, TRUE); + + +SELECT pg_catalog.setval('ervu_dashboard.citizen_guardianship_citizen_guardianship_id_seq', 4653, + TRUE); + + +SELECT pg_catalog.setval('ervu_dashboard.citizen_spouse_citizen_spouse_id_seq', 229504, TRUE); + + +SELECT pg_catalog.setval('ervu_dashboard.citizenship_citizenship_id_seq', 69012, TRUE); + + +SELECT pg_catalog.setval('ervu_dashboard.citizenship_foreign_citizenship_foreign_id_seq', 71568, + TRUE); + + +SELECT pg_catalog.setval('ervu_dashboard.decision_decision_id_seq', 1, FALSE); + + +SELECT pg_catalog.setval('ervu_dashboard.deputy_deputy_id_seq', 47, TRUE); + + +SELECT pg_catalog.setval('ervu_dashboard.disability_disability_id_seq', 94609, TRUE); + + +SELECT pg_catalog.setval('ervu_dashboard.disease_disease_id_seq', 198170, TRUE); + + +SELECT pg_catalog.setval('ervu_dashboard.drivers_licence_drivers_licence_id_seq', 7056, TRUE); + + +SELECT pg_catalog.setval('ervu_dashboard.medical_authorities_medical_authorities_id_seq', 298794, + TRUE); + + +SELECT pg_catalog.setval('ervu_dashboard.passport_passport_id_seq', 53048, TRUE); + + +SELECT pg_catalog.setval('ervu_dashboard.property_property_id_seq', 372952, TRUE); + + +SELECT pg_catalog.setval('ervu_dashboard.prosecution_prosecution_id_seq', 44, TRUE); + + +SELECT pg_catalog.setval('ervu_dashboard.punishment_punishment_id_seq', 22, TRUE); + + +SELECT pg_catalog.setval('ervu_dashboard.subpoena_subpoena_id_seq', 27501, TRUE); + + +SELECT pg_catalog.setval('ervu_dashboard.temporary_measures_temporary_measures_id_seq', 12191, + TRUE); + + +SELECT pg_catalog.setval('ervu_dashboard.testrecruitment_sort_seq', 90, TRUE); + + +SELECT pg_catalog.setval('ervu_dashboard.work_work_id_seq', 1, FALSE); + + +SELECT pg_catalog.setval('main_dashboard.appeals_id_appeal_seq', 796, TRUE); + + +SELECT pg_catalog.setval('main_dashboard.recruitment_campaign_id_recruitment_campaign_seq', 1522, + TRUE); + + +SELECT pg_catalog.setval('main_dashboard.total_registered_id_total_registered_seq', 830, TRUE); + + +SELECT pg_catalog.setval('main_dashboard.waiting_registration_id_waiting_registration_seq', 742, + TRUE); + + +SELECT pg_catalog.setval('public.job_log_id_job_seq', 1, FALSE); + + +SELECT pg_catalog.setval('ratings.appear_subppoena_id_appear_subppoena_seq', 6, TRUE); + + +SELECT pg_catalog.setval('ratings.consideration_complaint_id_consideration_complaint_seq', 6, TRUE); + + +SELECT pg_catalog.setval('ratings."ratings.conscription_info_id_ratings.conscription_info_seq"', 6, + TRUE); + + +SELECT pg_catalog.setval('recruitment_campaign.recruitment_id_recruitment_seq', 2, TRUE); + + +SELECT pg_catalog.setval('recruitment_campaign.subpoenas_id_subpoena_seq', 1111, TRUE); + + +SELECT pg_catalog.setval('space.military_commissariat_id_military_commissariat_seq', 1, TRUE); + + +SELECT pg_catalog.setval('space.military_district_id_military_district_seq', 1, TRUE); + + +SELECT pg_catalog.setval('space.region_id_region_seq', 15, TRUE); + + +SELECT pg_catalog.setval('total_registered.age_id_age_seq', 2250, TRUE); + + +SELECT pg_catalog.setval('total_registered.child_minor_id_child_minor_seq', 2124, TRUE); + + +SELECT pg_catalog.setval('total_registered.driver_license_id_driver_license_seq', 1849, TRUE); + + +SELECT pg_catalog.setval('total_registered.reg_mil_cat_id_reg_mil_cat_seq', 885, TRUE); + + +SELECT pg_catalog.setval('total_registered.removed_registry_id_removed_registry_seq', 609, TRUE); + + +SELECT pg_catalog.setval('total_registered.subpoenas_id_subpoena_seq', 1184, TRUE); + + +ALTER TABLE IF EXISTS ONLY appeals.main_profile ADD CONSTRAINT pk_main_profile PRIMARY KEY (id_main_profile); + + +ALTER TABLE IF EXISTS ONLY appeals.reasons_appeal ADD CONSTRAINT pk_reasons_appeal PRIMARY KEY (id_reasons_appeal); + + +ALTER TABLE IF EXISTS ONLY appeals.review_rating ADD CONSTRAINT pk_review_rating PRIMARY KEY (id_review_rating); + + +ALTER TABLE IF EXISTS ONLY appeals.topic_appeal ADD CONSTRAINT pk_topic_appeal PRIMARY KEY (id_topic_appeal); + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen ADD CONSTRAINT citizen_pkey PRIMARY KEY (recruit_id); + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.decision ADD CONSTRAINT decision_pkey PRIMARY KEY (decision_id); + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_child ADD CONSTRAINT pk_citizen_child PRIMARY KEY (citizen_child_id); + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_guardianship ADD CONSTRAINT pk_citizen_guardianship PRIMARY KEY (citizen_guardianship_id); + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_spouse ADD CONSTRAINT pk_citizen_spouse PRIMARY KEY (citizen_spouse_id); + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizenship ADD CONSTRAINT pk_citizenship PRIMARY KEY (citizenship_id); + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizenship_foreign ADD CONSTRAINT pk_citizenship_foreign PRIMARY KEY (citizenship_foreign_id); + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.deputy ADD CONSTRAINT pk_deputy PRIMARY KEY (deputy_id); + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.disability ADD CONSTRAINT pk_disability PRIMARY KEY (disability_id); + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.disease ADD CONSTRAINT pk_disease PRIMARY KEY (disease_id); + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.drivers_licence ADD CONSTRAINT pk_drivers_licence PRIMARY KEY (drivers_licence_id); + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.medical_authorities ADD CONSTRAINT pk_medical_authorities PRIMARY KEY (medical_authorities_id); + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.passport ADD CONSTRAINT pk_passport PRIMARY KEY (passport_id); + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.property ADD CONSTRAINT pk_property PRIMARY KEY (property_id); + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.prosecution ADD CONSTRAINT pk_prosecution PRIMARY KEY (prosecution_id); + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.punishment ADD CONSTRAINT pk_punishment PRIMARY KEY (punishment_id); + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.work ADD CONSTRAINT pk_work PRIMARY KEY (work_id); + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.pub_recruitment ADD CONSTRAINT pub_recruitment_pkey PRIMARY KEY (id); + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.pub_recruitment ADD CONSTRAINT recruitment_idm_id_key UNIQUE (idm_id); + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.recruitment ADD CONSTRAINT recruitment_pkey PRIMARY KEY (id); + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.subpoena ADD CONSTRAINT subpoena_pkey PRIMARY KEY (sub_id); + + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.temporary_measures ADD CONSTRAINT temporary_measures_pkey PRIMARY KEY (temporary_measures_id); + + +ALTER TABLE IF EXISTS ONLY main_dashboard.appeals ADD CONSTRAINT appeals_pkey PRIMARY KEY (recruitment_id, + recording_date); + + +ALTER TABLE IF EXISTS ONLY main_dashboard.recruitment_campaign ADD CONSTRAINT recruitment_campaign_pkey PRIMARY KEY (spring_autumn, + recruitment_id, + recording_date); + + +ALTER TABLE IF EXISTS ONLY main_dashboard.total_registered ADD CONSTRAINT total_registered_pkey PRIMARY KEY (recruitment_id, + recording_date); + + +ALTER TABLE IF EXISTS ONLY main_dashboard.waiting_registration ADD CONSTRAINT waiting_registration_pkey PRIMARY KEY (recruitment_id, + recording_date); + + +ALTER TABLE IF EXISTS ONLY public.job_log ADD CONSTRAINT job_log_pkey PRIMARY KEY (id_job); + + +ALTER TABLE IF EXISTS ONLY ratings.appear_subppoena ADD CONSTRAINT pk_appear_subppoena PRIMARY KEY (id_appear_subppoena); + + +ALTER TABLE IF EXISTS ONLY ratings.conscription_info ADD CONSTRAINT pk_conscription_info PRIMARY KEY (conscription_info_id); + + +ALTER TABLE IF EXISTS ONLY ratings.consideration_complaint ADD CONSTRAINT pk_consideration_complaint PRIMARY KEY (id_consideration_complaint); + + +ALTER TABLE IF EXISTS ONLY recruitment_campaign.appeals ADD CONSTRAINT appeals_pkey PRIMARY KEY (recording_date, + spring_autumn, + recruitment_id); + + +ALTER TABLE IF EXISTS ONLY recruitment_campaign.postponement_info ADD CONSTRAINT pk_postponement_info PRIMARY KEY (postponement_info_id); + + +ALTER TABLE IF EXISTS ONLY recruitment_campaign.subpoenas ADD CONSTRAINT subpoenas_pkey PRIMARY KEY (spring_autumn, + recruitment_id, + recording_date); + + +ALTER TABLE IF EXISTS ONLY space.military_district ADD CONSTRAINT military_district_pkey PRIMARY KEY (id_military_district); + + +ALTER TABLE IF EXISTS ONLY space.military_commissariat ADD CONSTRAINT pk_military_commissariat PRIMARY KEY (id_military_commissariat); + + +ALTER TABLE IF EXISTS ONLY space.region ADD CONSTRAINT pk_region PRIMARY KEY (id_region); + + +ALTER TABLE IF EXISTS ONLY space.testrecruitment ADD CONSTRAINT testrecruitment_pkey PRIMARY KEY (id); + + +ALTER TABLE IF EXISTS ONLY total_registered.age ADD CONSTRAINT age_pkey PRIMARY KEY (registered, + recruitment_id, + recording_date, + "all_M_W"); + + +ALTER TABLE IF EXISTS ONLY total_registered.busyness ADD CONSTRAINT busyness_pkey PRIMARY KEY (recording_date, + recruitment_id, + registered, + "all_M_W"); + + +ALTER TABLE IF EXISTS ONLY total_registered.child_minor ADD CONSTRAINT child_minor_pkey PRIMARY KEY ("all_M_W", + recording_date, + recruitment_id); + + +ALTER TABLE IF EXISTS ONLY total_registered.driver_license ADD CONSTRAINT driver_license_pkey PRIMARY KEY (recruitment_id, + "all_M_W", + recording_date); + + +ALTER TABLE IF EXISTS ONLY total_registered.education_level ADD CONSTRAINT education_level_pkey PRIMARY KEY ("all_M_W", + recording_date, + recruitment_id); + + +ALTER TABLE IF EXISTS ONLY total_registered.marital_status ADD CONSTRAINT marital_status_pkey PRIMARY KEY (recruitment_id, + recording_date, + "all_M_W"); + + +ALTER TABLE IF EXISTS ONLY total_registered.reg_mil_cat ADD CONSTRAINT reg_mil_cat_pkey PRIMARY KEY (mil_reg, + recruitment_id, + recording_date); + + +ALTER TABLE IF EXISTS ONLY total_registered.removed_registry ADD CONSTRAINT removed_registry_pkey PRIMARY KEY (recruitment_id, + recording_date); + + +ALTER TABLE IF EXISTS ONLY total_registered.subpoenas ADD CONSTRAINT subpoenas_pkey PRIMARY KEY (mil_reg, + recruitment_id, + recording_date); + CREATE INDEX fki_main_profile_fk1 ON appeals.main_profile USING btree (recruitment_id); - CREATE INDEX fki_reasons_appeal_fk1 ON appeals.reasons_appeal USING btree (recruitment_id); - CREATE INDEX fki_review_rating_fk1 ON appeals.review_rating USING btree (recruitment_id); - CREATE INDEX fki_topic_appeal_fk1 ON appeals.topic_appeal USING btree (recruitment_id); - CREATE INDEX recruitment_military_code_idx ON ervu_dashboard.pub_recruitment USING btree (military_code); - CREATE INDEX recruitment_parent_idx ON ervu_dashboard.pub_recruitment USING btree (parent_id); - CREATE INDEX subpoena_send_date_idx ON ervu_dashboard.subpoena USING btree (send_date); - CREATE INDEX fki_md_appeals_fk1 ON main_dashboard.appeals USING btree (recruitment_id); - CREATE INDEX fki_recruitment_campaign_fk1 ON main_dashboard.recruitment_campaign USING btree (recruitment_id); - CREATE INDEX fki_total_registered_fk1 ON main_dashboard.total_registered USING btree (recruitment_id); - CREATE INDEX fki_waiting_registration_fk1 ON main_dashboard.waiting_registration USING btree (recruitment_id); - CREATE INDEX fki_appear_subppoena_fk1 ON ratings.appear_subppoena USING btree (recruitment_id); - CREATE INDEX fki_consideration_complaint_fk1 ON ratings.consideration_complaint USING btree (recruitment_id); - CREATE INDEX fki_recruitment_fk1 ON ratings.conscription_info USING btree (recruitment_id); - CREATE INDEX fki_rc_appeals_fk1 ON recruitment_campaign.appeals USING btree (recruitment_id); - CREATE INDEX fki_recruitment_fk1 ON recruitment_campaign.postponement_info USING btree (recruitment_id); - CREATE INDEX fki_subpoenas_fk1 ON recruitment_campaign.subpoenas USING btree (recruitment_id); - CREATE INDEX fki_age_fk1 ON total_registered.age USING btree (recruitment_id); - CREATE INDEX fki_busyness_fk1 ON total_registered.busyness USING btree (recruitment_id); - CREATE INDEX fki_child_minor_fk1 ON total_registered.child_minor USING btree (recruitment_id); - CREATE INDEX fki_driver_license_fk1 ON total_registered.driver_license USING btree (recruitment_id); - CREATE INDEX fki_education_level_fk1 ON total_registered.education_level USING btree (recruitment_id); - CREATE INDEX fki_marital_status_fk1 ON total_registered.marital_status USING btree (recruitment_id); - CREATE INDEX fki_reg_mil_cat_fk1 ON total_registered.reg_mil_cat USING btree (recruitment_id); - CREATE INDEX fki_subpoenas_fk1 ON total_registered.subpoenas USING btree (recruitment_id); - -ALTER TABLE IF EXISTS ONLY appeals.review_rating - ADD CONSTRAINT fk_region FOREIGN KEY (id_region) REFERENCES space.region(id_region) NOT VALID; +ALTER TABLE IF EXISTS ONLY appeals.review_rating ADD CONSTRAINT fk_region + FOREIGN KEY (id_region) REFERENCES space.region(id_region) NOT VALID; - -ALTER TABLE IF EXISTS ONLY appeals.main_profile - ADD CONSTRAINT main_profile_fk1 FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.pub_recruitment(id); +ALTER TABLE IF EXISTS ONLY appeals.main_profile ADD CONSTRAINT main_profile_fk1 + FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.pub_recruitment(id); - -ALTER TABLE IF EXISTS ONLY appeals.reasons_appeal - ADD CONSTRAINT reasons_appeal_fk1 FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.pub_recruitment(id); +ALTER TABLE IF EXISTS ONLY appeals.reasons_appeal ADD CONSTRAINT reasons_appeal_fk1 + FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.pub_recruitment(id); - -ALTER TABLE IF EXISTS ONLY appeals.topic_appeal - ADD CONSTRAINT topic_appeal_fk1 FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.pub_recruitment(id); +ALTER TABLE IF EXISTS ONLY appeals.topic_appeal ADD CONSTRAINT topic_appeal_fk1 + FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.pub_recruitment(id); - -ALTER TABLE IF EXISTS ONLY ratings.appear_subppoena - ADD CONSTRAINT appear_subppoena_fk1 FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.recruitment(id); +ALTER TABLE IF EXISTS ONLY ratings.appear_subppoena ADD CONSTRAINT appear_subppoena_fk1 + FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.recruitment(id); - -ALTER TABLE IF EXISTS ONLY ratings.conscription_info - ADD CONSTRAINT conscription_info_fk1 FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.recruitment(id); +ALTER TABLE IF EXISTS ONLY ratings.conscription_info ADD CONSTRAINT conscription_info_fk1 + FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.recruitment(id); - -ALTER TABLE IF EXISTS ONLY ratings.conscription_info - ADD CONSTRAINT conscription_info_fk2 FOREIGN KEY (id_region) REFERENCES space.region(id_region) NOT VALID; +ALTER TABLE IF EXISTS ONLY ratings.conscription_info ADD CONSTRAINT conscription_info_fk2 + FOREIGN KEY (id_region) REFERENCES space.region(id_region) NOT VALID; - -ALTER TABLE IF EXISTS ONLY ratings.consideration_complaint - ADD CONSTRAINT consideration_complaint_fk1 FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.pub_recruitment(id); +ALTER TABLE IF EXISTS ONLY ratings.consideration_complaint ADD CONSTRAINT consideration_complaint_fk1 + FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.pub_recruitment(id); - -ALTER TABLE IF EXISTS ONLY ratings.appear_subppoena - ADD CONSTRAINT fk_region FOREIGN KEY (id_region) REFERENCES space.region(id_region) NOT VALID; +ALTER TABLE IF EXISTS ONLY ratings.appear_subppoena ADD CONSTRAINT fk_region + FOREIGN KEY (id_region) REFERENCES space.region(id_region) NOT VALID; - -ALTER TABLE IF EXISTS ONLY ratings.consideration_complaint - ADD CONSTRAINT fk_region FOREIGN KEY (id_region) REFERENCES space.region(id_region) NOT VALID; - - - -ALTER TABLE IF EXISTS ONLY recruitment_campaign.postponement_info - ADD CONSTRAINT postponement_info_fk1 FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.recruitment(id) NOT VALID; +ALTER TABLE IF EXISTS ONLY ratings.consideration_complaint ADD CONSTRAINT fk_region + FOREIGN KEY (id_region) REFERENCES space.region(id_region) NOT VALID; +ALTER TABLE IF EXISTS ONLY recruitment_campaign.postponement_info ADD CONSTRAINT postponement_info_fk1 + FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.recruitment(id) NOT VALID; GRANT ALL -ON SCHEMA public TO "ervu-dashboard"; - - - - - - - - +ON SCHEMA PUBLIC TO "ervu-dashboard"; \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/20241016-SUPPORT-8617-add-role.xml b/backend/src/main/resources/config/v_1.0/20241016-SUPPORT-8617-add-role.xml deleted file mode 100644 index 4a199bf3..00000000 --- a/backend/src/main/resources/config/v_1.0/20241016-SUPPORT-8617-add-role.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - CREATE ROLE "ervu-dashboard" WITH - LOGIN - NOSUPERUSER - INHERIT - NOCREATEDB - NOCREATEROLE - NOREPLICATION - PASSWORD 'ervu-dashboard'; - - - - - - CREATE ROLE postgres WITH - LOGIN - NOSUPERUSER - INHERIT - NOCREATEDB - NOCREATEROLE - NOREPLICATION - PASSWORD 'postgres'; - - - - \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/20241017-SUPPORT-8617-insert-data-in-ervu_dashboard.xml b/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml similarity index 60% rename from backend/src/main/resources/config/v_1.0/20241017-SUPPORT-8617-insert-data-in-ervu_dashboard.xml rename to backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml index d39169fb..e9869f61 100644 --- a/backend/src/main/resources/config/v_1.0/20241017-SUPPORT-8617-insert-data-in-ervu_dashboard.xml +++ b/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml @@ -1,10 +1,39 @@ - + + + CREATE ROLE "ervu-dashboard" WITH + LOGIN + NOSUPERUSER + INHERIT + NOCREATEDB + NOCREATEROLE + NOREPLICATION + PASSWORD 'ervu-dashboard'; + + + + + + CREATE ROLE postgres WITH + LOGIN + NOSUPERUSER + INHERIT + NOCREATEDB + NOCREATEROLE + NOREPLICATION + PASSWORD 'postgres'; + + + + + + + + INSERT INTO ervu_dashboard.pub_recruitment (idm_id, parent_id, military_code, shortname, fullname, code, id, sort) @@ -25,5 +54,4 @@ '794ed0fa-a25b-4858-b89e-815bb391f2b5', '2'); - \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-patch-from-dump-ervu_dashboard_copy.xml b/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-patch-from-dump-ervu_dashboard_copy.xml deleted file mode 100644 index 0e776cb7..00000000 --- a/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-patch-from-dump-ervu_dashboard_copy.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/changelog-v1.0.xml b/backend/src/main/resources/config/v_1.0/changelog-v1.0.xml index f309670d..c647d3dd 100644 --- a/backend/src/main/resources/config/v_1.0/changelog-v1.0.xml +++ b/backend/src/main/resources/config/v_1.0/changelog-v1.0.xml @@ -5,9 +5,5 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd"> - - - + \ No newline at end of file From ee1a266a6a81f5f2a26b376e2f98d17e1eb670b8 Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Fri, 18 Oct 2024 17:07:57 +0300 Subject: [PATCH 23/49] SUPPORT-8617: refactor sql file --- .../config/sql_files/ervu-dashboard-copy.sql | 4756 ++++++----------- 1 file changed, 1599 insertions(+), 3157 deletions(-) diff --git a/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql b/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql index fcfd621f..113b55cc 100644 --- a/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql +++ b/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql @@ -1,4190 +1,2632 @@ -SET -statement_timeout = 0; - - -SET -lock_timeout = 0; - - -SET -idle_in_transaction_session_timeout = 0; - - -SET -client_encoding = 'UTF8'; - - -SET -standard_conforming_strings = ON; - - -SELECT pg_catalog.set_config('search_path', '', FALSE); - - -SET -check_function_bodies = FALSE; - - -SET -xmloption = content; - - -SET -client_min_messages = warning; - - -SET -row_security = OFF; - +SET statement_timeout = 0; +SET lock_timeout = 0; +SET idle_in_transaction_session_timeout = 0; +SET client_encoding = 'UTF8'; +SET standard_conforming_strings = on; +SELECT pg_catalog.set_config('search_path', '', false); +SET check_function_bodies = false; +SET xmloption = content; +SET client_min_messages = warning; +SET row_security = off; CREATE SCHEMA IF NOT EXISTS appeals; +ALTER SCHEMA appeals OWNER TO "ervu-dashboard"; -ALTER -SCHEMA appeals OWNER TO "ervu-dashboard"; - -COMMENT -ON SCHEMA appeals IS 'Обжалования'; - +COMMENT ON SCHEMA appeals IS 'Обжалования'; CREATE SCHEMA IF NOT EXISTS ervu_dashboard; - -ALTER -SCHEMA ervu_dashboard OWNER TO "ervu-dashboard"; - +ALTER SCHEMA ervu_dashboard OWNER TO "ervu-dashboard"; CREATE SCHEMA IF NOT EXISTS main_dashboard; - -ALTER -SCHEMA main_dashboard OWNER TO "ervu-dashboard"; - +ALTER SCHEMA main_dashboard OWNER TO "ervu-dashboard"; CREATE SCHEMA IF NOT EXISTS ratings; - -ALTER -SCHEMA ratings OWNER TO "ervu-dashboard"; - +ALTER SCHEMA ratings OWNER TO "ervu-dashboard"; CREATE SCHEMA IF NOT EXISTS recruitment_campaign; +ALTER SCHEMA recruitment_campaign OWNER TO "ervu-dashboard"; -ALTER -SCHEMA recruitment_campaign OWNER TO "ervu-dashboard"; - - -CREATE SCHEMA IF NOT EXISTS SPACE; - - -ALTER -SCHEMA SPACE OWNER TO "ervu-dashboard"; +CREATE SCHEMA IF NOT EXISTS space; +ALTER SCHEMA space OWNER TO "ervu-dashboard"; CREATE SCHEMA IF NOT EXISTS total_registered; +ALTER SCHEMA total_registered OWNER TO "ervu-dashboard"; -ALTER -SCHEMA total_registered OWNER TO "ervu-dashboard"; +CREATE EXTENSION IF NOT EXISTS "uuid-ossp" WITH SCHEMA ervu_dashboard; +COMMENT ON EXTENSION "uuid-ossp" IS 'generate universally unique identifiers (UUIDs)'; -CREATE -EXTENSION IF NOT EXISTS "uuid-ossp" WITH SCHEMA ervu_dashboard; - -COMMENT -ON EXTENSION "uuid-ossp" IS 'generate universally unique identifiers (UUIDs)'; - - -CREATE TYPE public.employer_category_type AS ENUM ('fl', - 'ul', - 'kfh', - 'ip'); - +CREATE TYPE public.employer_category_type AS ENUM ( + 'fl', + 'ul', + 'kfh', + 'ip' +); ALTER TYPE public.employer_category_type OWNER TO postgres; - -CREATE TYPE public.type_property_type AS ENUM ('realty', - 'ground_transportation', - 'air_vehicles', - 'water_vehicles'); - +CREATE TYPE public.type_property_type AS ENUM ( + 'realty', + 'ground_transportation', + 'air_vehicles', + 'water_vehicles' +); ALTER TYPE public.type_property_type OWNER TO postgres; - -CREATE FUNCTION public.uuid_generate_v4() RETURNS UUID - LANGUAGE c STRICT PARALLEL SAFE AS '$libdir/uuid-ossp', - 'uuid_generate_v4'; - - +CREATE FUNCTION public.uuid_generate_v4() RETURNS uuid + LANGUAGE c STRICT PARALLEL SAFE + AS '$libdir/uuid-ossp', 'uuid_generate_v4'; ALTER FUNCTION public.uuid_generate_v4() OWNER TO postgres; +SET default_tablespace = ''; -SET -default_tablespace = ''; - - -SET -default_table_access_method = heap; - +SET default_table_access_method = heap; CREATE TABLE IF NOT EXISTS appeals.main_profile ( - id_main_profile - bigint - NOT - NULL, - gender - text, - age - text, - child_min_18 - text, - education - text, - employment - text, - recording_date - date - DEFAULT - now -( -), - recruitment_id character -( - 36 -)); - + id_main_profile bigint NOT NULL, + gender text, + age text, + child_min_18 text, + education text, + employment text, + recording_date date DEFAULT now(), + recruitment_id character(36) +); ALTER TABLE IF EXISTS appeals.main_profile OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE appeals.main_profile IS 'Основной профиль уровень РФ'; +COMMENT ON TABLE appeals.main_profile IS 'Основной профиль уровень РФ'; -COMMENT -ON COLUMN appeals.main_profile.gender IS 'Пол'; +COMMENT ON COLUMN appeals.main_profile.gender IS 'Пол'; -COMMENT -ON COLUMN appeals.main_profile.age IS 'Возраст'; +COMMENT ON COLUMN appeals.main_profile.age IS 'Возраст'; -COMMENT -ON COLUMN appeals.main_profile.child_min_18 IS 'Дети до 18 лет'; +COMMENT ON COLUMN appeals.main_profile.child_min_18 IS 'Дети до 18 лет'; -COMMENT -ON COLUMN appeals.main_profile.education IS 'Образование'; +COMMENT ON COLUMN appeals.main_profile.education IS 'Образование'; -COMMENT -ON COLUMN appeals.main_profile.employment IS 'Занятость'; - -COMMENT -ON COLUMN appeals.main_profile.recording_date IS 'Дата записи'; +COMMENT ON COLUMN appeals.main_profile.employment IS 'Занятость'; +COMMENT ON COLUMN appeals.main_profile.recording_date IS 'Дата записи'; CREATE SEQUENCE appeals.main_profile_id_main_profile_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS appeals.main_profile_id_main_profile_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE appeals.main_profile_id_main_profile_seq OWNED BY appeals.main_profile.id_main_profile; - CREATE TABLE IF NOT EXISTS appeals.reasons_appeal ( - id_reasons_appeal - bigint - NOT - NULL, - appeal - numeric, - incorrect_inf - numeric, - no_data - numeric, - other - numeric, - recording_date - date - DEFAULT - NOW -( -), incorrect_inf_percent numeric, no_data_percent numeric, other_percent numeric, recruitment_id CHARACTER -( - 36 -)); + id_reasons_appeal bigint NOT NULL, + appeal numeric, + incorrect_inf numeric, + no_data numeric, + other numeric, + recording_date date DEFAULT now(), -- Исправлено + incorrect_inf_percent numeric, + no_data_percent numeric, + other_percent numeric, + recruitment_id character(36) +); ALTER TABLE IF EXISTS appeals.reasons_appeal OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE appeals.reasons_appeal IS 'Причины обжалования уровень РФ'; +COMMENT ON TABLE appeals.reasons_appeal IS 'Причины обжалования уровень РФ'; -COMMENT -ON COLUMN appeals.reasons_appeal.appeal IS 'Обжалования'; +COMMENT ON COLUMN appeals.reasons_appeal.appeal IS 'Обжалования'; -COMMENT -ON COLUMN appeals.reasons_appeal.incorrect_inf IS 'Некорректные сведения'; +COMMENT ON COLUMN appeals.reasons_appeal.incorrect_inf IS 'Некорректные сведения'; -COMMENT -ON COLUMN appeals.reasons_appeal.no_data IS 'Нет данных'; +COMMENT ON COLUMN appeals.reasons_appeal.no_data IS 'Нет данных'; -COMMENT -ON COLUMN appeals.reasons_appeal.other IS 'Прочее'; +COMMENT ON COLUMN appeals.reasons_appeal.other IS 'Прочее'; -COMMENT -ON COLUMN appeals.reasons_appeal.recording_date IS 'Дата записи'; +COMMENT ON COLUMN appeals.reasons_appeal.recording_date IS 'Дата записи'; -COMMENT -ON COLUMN appeals.reasons_appeal.incorrect_inf_percent IS 'Некорректные сведения в процентах'; +COMMENT ON COLUMN appeals.reasons_appeal.incorrect_inf_percent IS 'Некорректные сведения в процентах'; -COMMENT -ON COLUMN appeals.reasons_appeal.no_data_percent IS 'Нет данных в процентах'; - -COMMENT -ON COLUMN appeals.reasons_appeal.other_percent IS 'Прочее в процентах'; +COMMENT ON COLUMN appeals.reasons_appeal.no_data_percent IS 'Нет данных в процентах'; +COMMENT ON COLUMN appeals.reasons_appeal.other_percent IS 'Прочее в процентах'; CREATE SEQUENCE appeals.reasons_appeal_id_reasons_appeal_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS appeals.reasons_appeal_id_reasons_appeal_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE appeals.reasons_appeal_id_reasons_appeal_seq OWNED BY appeals.reasons_appeal.id_reasons_appeal; - -CREATE TABLE IF NOT EXISTS appeals.review_rating -( - id_review_rating - bigint - NOT - NULL, - speed - numeric, - rating - numeric, - recording_date - date - DEFAULT - NOW -( -), id_region bigint, recruitment_id UUID); - +CREATE TABLE IF NOT EXISTS appeals.review_rating ( + id_review_rating bigint NOT NULL, + speed numeric, + rating numeric, + recording_date date DEFAULT now(), + id_region bigint, + recruitment_id uuid +); ALTER TABLE IF EXISTS appeals.review_rating OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE appeals.review_rating IS 'Рейтинг рассмотрения жалоб уровень РФ'; +COMMENT ON TABLE appeals.review_rating IS 'Рейтинг рассмотрения жалоб уровень РФ'; -COMMENT -ON COLUMN appeals.review_rating.speed IS 'Скорость рассмотрения'; +COMMENT ON COLUMN appeals.review_rating.speed IS 'Скорость рассмотрения'; -COMMENT -ON COLUMN appeals.review_rating.rating IS 'Оценка удовлетворенности'; - -COMMENT -ON COLUMN appeals.review_rating.recording_date IS 'Дата записи'; +COMMENT ON COLUMN appeals.review_rating.rating IS 'Оценка удовлетворенности'; +COMMENT ON COLUMN appeals.review_rating.recording_date IS 'Дата записи'; CREATE SEQUENCE appeals.review_rating_id_review_rating_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS appeals.review_rating_id_review_rating_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE appeals.review_rating_id_review_rating_seq OWNED BY appeals.review_rating.id_review_rating; - -CREATE TABLE IF NOT EXISTS appeals.topic_appeal -( - id_topic_appeal - bigint - NOT - NULL, - registration - numeric, - sabpoena - numeric, - appear - numeric, - temporary_measures - numeric, - recording_date - date - DEFAULT - NOW -( -), registration_percent numeric, sabpoena_percent numeric, appear_percent numeric, temporary_measures_percent numeric, recruitment_id CHARACTER -( - 36 -)); - +CREATE TABLE IF NOT EXISTS appeals.topic_appeal ( + id_topic_appeal bigint NOT NULL, + registration numeric, + sabpoena numeric, + appear numeric, + temporary_measures numeric, + recording_date date DEFAULT now(), + registration_percent numeric, + sabpoena_percent numeric, + appear_percent numeric, + temporary_measures_percent numeric, + recruitment_id character(36) +); ALTER TABLE IF EXISTS appeals.topic_appeal OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE appeals.topic_appeal IS 'Тема обжалования уровень РФ'; +COMMENT ON TABLE appeals.topic_appeal IS 'Тема обжалования уровень РФ'; -COMMENT -ON COLUMN appeals.topic_appeal.registration IS 'Тема обжалования постановка на учет'; +COMMENT ON COLUMN appeals.topic_appeal.registration IS 'Тема обжалования постановка на учет'; -COMMENT -ON COLUMN appeals.topic_appeal.sabpoena IS 'Тема обжалования повестки'; +COMMENT ON COLUMN appeals.topic_appeal.sabpoena IS 'Тема обжалования повестки'; -COMMENT -ON COLUMN appeals.topic_appeal.appear IS 'Тема обжалования явка'; +COMMENT ON COLUMN appeals.topic_appeal.appear IS 'Тема обжалования явка'; -COMMENT -ON COLUMN appeals.topic_appeal.temporary_measures IS 'Тема обжалования временные меры'; +COMMENT ON COLUMN appeals.topic_appeal.temporary_measures IS 'Тема обжалования временные меры'; -COMMENT -ON COLUMN appeals.topic_appeal.recording_date IS 'Дата записи'; +COMMENT ON COLUMN appeals.topic_appeal.recording_date IS 'Дата записи'; -COMMENT -ON COLUMN appeals.topic_appeal.registration_percent IS 'Тема обжалования постановка на учет в процентах'; +COMMENT ON COLUMN appeals.topic_appeal.registration_percent IS 'Тема обжалования постановка на учет в процентах'; -COMMENT -ON COLUMN appeals.topic_appeal.sabpoena_percent IS 'Тема обжалования повестки в процентах'; +COMMENT ON COLUMN appeals.topic_appeal.sabpoena_percent IS 'Тема обжалования повестки в процентах'; -COMMENT -ON COLUMN appeals.topic_appeal.appear_percent IS 'Тема обжалования явка в процентах'; - -COMMENT -ON COLUMN appeals.topic_appeal.temporary_measures_percent IS 'Тема обжалования временные меры в процентах'; +COMMENT ON COLUMN appeals.topic_appeal.appear_percent IS 'Тема обжалования явка в процентах'; +COMMENT ON COLUMN appeals.topic_appeal.temporary_measures_percent IS 'Тема обжалования временные меры в процентах'; CREATE SEQUENCE appeals.topic_appeal_id_topic_appeal_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS appeals.topic_appeal_id_topic_appeal_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE appeals.topic_appeal_id_topic_appeal_seq OWNED BY appeals.topic_appeal.id_topic_appeal; - -CREATE TABLE IF NOT EXISTS ervu_dashboard.citizen -( - residence - CHARACTER - varying, - is_registered - CHARACTER - varying, - passport_series - CHARACTER - varying, - passport_number - CHARACTER - varying, - phone - CHARACTER - varying, - medical_requirements - CHARACTER - varying, - deferment_liberation - CHARACTER - varying, - gender - CHARACTER - varying, - marital_status - CHARACTER - varying, - education - CHARACTER - varying, - employment - CHARACTER - varying, - reason_registration - CHARACTER - varying, - driver_license - CHARACTER - varying, - disability_group - CHARACTER - varying, - dispensary_registration_code - CHARACTER - varying, - region_birth - CHARACTER - varying, - city_birth - CHARACTER - varying, - right_deferment - boolean, - took_break - boolean, - medic - boolean, - sports_category - boolean, - tractor_license - boolean, - is_wanted - boolean, - is_in_prison - boolean, - acquired_citizenship - boolean, - urgent_service - boolean, - contract_service - boolean, - mobilization - boolean, - full_name - CHARACTER - varying, - last_name - CHARACTER - varying, - first_name - CHARACTER - varying, - middle_name - CHARACTER - varying, - age - numeric, - birth_place - CHARACTER - varying, - number_children - numeric, - birth_date - date, - recruit_id - UUID - NOT - NULL, - recruitment_id - UUID, - issue_date - date, - number_children_18_old - numeric +CREATE TABLE IF NOT EXISTS ervu_dashboard.citizen ( + residence character varying, + is_registered character varying, + passport_series character varying, + passport_number character varying, + phone character varying, + medical_requirements character varying, + deferment_liberation character varying, + gender character varying, + marital_status character varying, + education character varying, + employment character varying, + reason_registration character varying, + driver_license character varying, + disability_group character varying, + dispensary_registration_code character varying, + region_birth character varying, + city_birth character varying, + right_deferment boolean, + took_break boolean, + medic boolean, + sports_category boolean, + tractor_license boolean, + is_wanted boolean, + is_in_prison boolean, + acquired_citizenship boolean, + urgent_service boolean, + contract_service boolean, + mobilization boolean, + full_name character varying, + last_name character varying, + first_name character varying, + middle_name character varying, + age numeric, + birth_place character varying, + number_children numeric, + birth_date date, + recruit_id uuid NOT NULL, + recruitment_id uuid, + issue_date date, + number_children_18_old numeric ); - ALTER TABLE IF EXISTS ervu_dashboard.citizen OWNER TO "ervu-dashboard"; -COMMENT -ON COLUMN ervu_dashboard.citizen.residence IS 'Адрес места жительства'; +COMMENT ON COLUMN ervu_dashboard.citizen.residence IS 'Адрес места жительства'; -COMMENT -ON COLUMN ervu_dashboard.citizen.is_registered IS 'Сведения о воинском учёте'; +COMMENT ON COLUMN ervu_dashboard.citizen.is_registered IS 'Сведения о воинском учёте'; -COMMENT -ON COLUMN ervu_dashboard.citizen.passport_series IS 'Серия паспорта'; +COMMENT ON COLUMN ervu_dashboard.citizen.passport_series IS 'Серия паспорта'; -COMMENT -ON COLUMN ervu_dashboard.citizen.passport_number IS 'Номер паспорта'; +COMMENT ON COLUMN ervu_dashboard.citizen.passport_number IS 'Номер паспорта'; -COMMENT -ON COLUMN ervu_dashboard.citizen.phone IS 'Телефон'; +COMMENT ON COLUMN ervu_dashboard.citizen.phone IS 'Телефон'; -COMMENT -ON COLUMN ervu_dashboard.citizen.medical_requirements IS 'Медицинские сведения'; +COMMENT ON COLUMN ervu_dashboard.citizen.medical_requirements IS 'Медицинские сведения'; -COMMENT -ON COLUMN ervu_dashboard.citizen.deferment_liberation IS 'Наличие отсрочки или освобождения от военной службы'; +COMMENT ON COLUMN ervu_dashboard.citizen.deferment_liberation IS 'Наличие отсрочки или освобождения от военной службы'; -COMMENT -ON COLUMN ervu_dashboard.citizen.gender IS 'Пол'; +COMMENT ON COLUMN ervu_dashboard.citizen.gender IS 'Пол'; -COMMENT -ON COLUMN ervu_dashboard.citizen.marital_status IS 'Семейное положение'; +COMMENT ON COLUMN ervu_dashboard.citizen.marital_status IS 'Семейное положение'; -COMMENT -ON COLUMN ervu_dashboard.citizen.education IS 'Образование'; +COMMENT ON COLUMN ervu_dashboard.citizen.education IS 'Образование'; -COMMENT -ON COLUMN ervu_dashboard.citizen.employment IS 'Занятость'; +COMMENT ON COLUMN ervu_dashboard.citizen.employment IS 'Занятость'; -COMMENT -ON COLUMN ervu_dashboard.citizen.reason_registration IS 'Причина постановки на учёт'; +COMMENT ON COLUMN ervu_dashboard.citizen.reason_registration IS 'Причина постановки на учёт'; -COMMENT -ON COLUMN ervu_dashboard.citizen.driver_license IS 'Водительское удостоверение'; +COMMENT ON COLUMN ervu_dashboard.citizen.driver_license IS 'Водительское удостоверение'; -COMMENT -ON COLUMN ervu_dashboard.citizen.disability_group IS 'Группа инвалидности'; +COMMENT ON COLUMN ervu_dashboard.citizen.disability_group IS 'Группа инвалидности'; -COMMENT -ON COLUMN ervu_dashboard.citizen.dispensary_registration_code IS 'Код диспансерного учета'; +COMMENT ON COLUMN ervu_dashboard.citizen.dispensary_registration_code IS 'Код диспансерного учета'; -COMMENT -ON COLUMN ervu_dashboard.citizen.region_birth IS 'Регион места рождения'; +COMMENT ON COLUMN ervu_dashboard.citizen.region_birth IS 'Регион места рождения'; -COMMENT -ON COLUMN ervu_dashboard.citizen.city_birth IS 'Город места рождения'; +COMMENT ON COLUMN ervu_dashboard.citizen.city_birth IS 'Город места рождения'; -COMMENT -ON COLUMN ervu_dashboard.citizen.right_deferment IS 'Имеет право на отсрочку'; +COMMENT ON COLUMN ervu_dashboard.citizen.right_deferment IS 'Имеет право на отсрочку'; -COMMENT -ON COLUMN ervu_dashboard.citizen.took_break IS 'Воспользовался отсрочкой'; +COMMENT ON COLUMN ervu_dashboard.citizen.took_break IS 'Воспользовался отсрочкой'; -COMMENT -ON COLUMN ervu_dashboard.citizen.medic IS 'Является медиком'; +COMMENT ON COLUMN ervu_dashboard.citizen.medic IS 'Является медиком'; -COMMENT -ON COLUMN ervu_dashboard.citizen.sports_category IS 'Имеет спортивный разряд/звание'; +COMMENT ON COLUMN ervu_dashboard.citizen.sports_category IS 'Имеет спортивный разряд/звание'; -COMMENT -ON COLUMN ervu_dashboard.citizen.tractor_license IS 'Имеет удостоверение тракториста'; +COMMENT ON COLUMN ervu_dashboard.citizen.tractor_license IS 'Имеет удостоверение тракториста'; -COMMENT -ON COLUMN ervu_dashboard.citizen.is_wanted IS 'Находится в розыске'; +COMMENT ON COLUMN ervu_dashboard.citizen.is_wanted IS 'Находится в розыске'; -COMMENT -ON COLUMN ervu_dashboard.citizen.is_in_prison IS 'Находится в местах лишения свободы'; +COMMENT ON COLUMN ervu_dashboard.citizen.is_in_prison IS 'Находится в местах лишения свободы'; -COMMENT -ON COLUMN ervu_dashboard.citizen.acquired_citizenship IS 'Получивший гражданство'; +COMMENT ON COLUMN ervu_dashboard.citizen.acquired_citizenship IS 'Получивший гражданство'; -COMMENT -ON COLUMN ervu_dashboard.citizen.urgent_service IS 'Признак критерия срочной службы'; +COMMENT ON COLUMN ervu_dashboard.citizen.urgent_service IS 'Признак критерия срочной службы'; -COMMENT -ON COLUMN ervu_dashboard.citizen.contract_service IS 'Признак критерия контрактной службы'; +COMMENT ON COLUMN ervu_dashboard.citizen.contract_service IS 'Признак критерия контрактной службы'; -COMMENT -ON COLUMN ervu_dashboard.citizen.mobilization IS 'Признак критерия службы по мобмлизации'; +COMMENT ON COLUMN ervu_dashboard.citizen.mobilization IS 'Признак критерия службы по мобмлизации'; -COMMENT -ON COLUMN ervu_dashboard.citizen.recruit_id IS 'id рекрута из БД ЕРВУ'; - - -CREATE TABLE IF NOT EXISTS ervu_dashboard.citizen_child -( - citizen_child_id - bigint - NOT - NULL, - recruit_id - UUID - NOT - NULL, - kinship_type - CHARACTER - varying -( - 50 -), - full_name CHARACTER varying, birth_date date, birth_az_number CHARACTER varying -( - 50 -), - death_date date, death_az_number CHARACTER varying -( - 50 -)); +COMMENT ON COLUMN ervu_dashboard.citizen.recruit_id IS 'id рекрута из БД ЕРВУ'; +CREATE TABLE IF NOT EXISTS ervu_dashboard.citizen_child ( + citizen_child_id bigint NOT NULL, + recruit_id uuid NOT NULL, + kinship_type character varying(50), + full_name character varying, + birth_date date, + birth_az_number character varying(50), + death_date date, + death_az_number character varying(50) +); ALTER TABLE IF EXISTS ervu_dashboard.citizen_child OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE ervu_dashboard.citizen_child IS 'сведения о детях гражданина'; +COMMENT ON TABLE ervu_dashboard.citizen_child IS 'сведения о детях гражданина'; -COMMENT -ON COLUMN ervu_dashboard.citizen_child.recruit_id IS 'ссылка на гражданина (citizen)'; +COMMENT ON COLUMN ervu_dashboard.citizen_child.recruit_id IS 'ссылка на гражданина (citizen)'; -COMMENT -ON COLUMN ervu_dashboard.citizen_child.kinship_type IS 'тип родственной связи: сын/дочь'; +COMMENT ON COLUMN ervu_dashboard.citizen_child.kinship_type IS 'тип родственной связи: сын/дочь'; -COMMENT -ON COLUMN ervu_dashboard.citizen_child.full_name IS 'ФИО'; +COMMENT ON COLUMN ervu_dashboard.citizen_child.full_name IS 'ФИО'; -COMMENT -ON COLUMN ervu_dashboard.citizen_child.birth_az_number IS 'номер актовой записи о рождении'; - -COMMENT -ON COLUMN ervu_dashboard.citizen_child.death_az_number IS 'номер актовой записи о смерти'; +COMMENT ON COLUMN ervu_dashboard.citizen_child.birth_az_number IS 'номер актовой записи о рождении'; +COMMENT ON COLUMN ervu_dashboard.citizen_child.death_az_number IS 'номер актовой записи о смерти'; CREATE SEQUENCE ervu_dashboard.citizen_child_citizen_child_id_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.citizen_child_citizen_child_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.citizen_child_citizen_child_id_seq OWNED BY ervu_dashboard.citizen_child.citizen_child_id; - -CREATE TABLE IF NOT EXISTS ervu_dashboard.citizen_guardianship -( - citizen_guardianship_id - bigint - NOT - NULL, - recruit_id - UUID - NOT - NULL, - full_name - CHARACTER - varying, - birth_date - date, - snils - CHARACTER - varying -( - 50 -)); - +CREATE TABLE IF NOT EXISTS ervu_dashboard.citizen_guardianship ( + citizen_guardianship_id bigint NOT NULL, + recruit_id uuid NOT NULL, + full_name character varying, + birth_date date, + snils character varying(50) +); ALTER TABLE IF EXISTS ervu_dashboard.citizen_guardianship OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE ervu_dashboard.citizen_guardianship IS 'сведения о лице, опекаемом или находящемся на попечении'; +COMMENT ON TABLE ervu_dashboard.citizen_guardianship IS 'сведения о лице, опекаемом или находящемся на попечении'; -COMMENT -ON COLUMN ervu_dashboard.citizen_guardianship.recruit_id IS 'ссылка на гражданина (citizen)'; - -COMMENT -ON COLUMN ervu_dashboard.citizen_guardianship.full_name IS 'ФИО'; +COMMENT ON COLUMN ervu_dashboard.citizen_guardianship.recruit_id IS 'ссылка на гражданина (citizen)'; +COMMENT ON COLUMN ervu_dashboard.citizen_guardianship.full_name IS 'ФИО'; CREATE SEQUENCE ervu_dashboard.citizen_guardianship_citizen_guardianship_id_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.citizen_guardianship_citizen_guardianship_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.citizen_guardianship_citizen_guardianship_id_seq OWNED BY ervu_dashboard.citizen_guardianship.citizen_guardianship_id; - -CREATE TABLE IF NOT EXISTS ervu_dashboard.citizen_spouse -( - citizen_spouse_id - bigint - NOT - NULL, - recruit_id - UUID - NOT - NULL, - kinship_type - CHARACTER - varying -( - 50 -), - full_name CHARACTER varying, birth_date date, death_az_number CHARACTER varying -( - 50 -), - death_date date, marriage_az_number CHARACTER varying -( - 50 -), - marriage_date date, divorce_az_number CHARACTER varying -( - 50 -), - divorce_date date, information_excluded boolean DEFAULT FALSE); - +CREATE TABLE IF NOT EXISTS ervu_dashboard.citizen_spouse ( + citizen_spouse_id bigint NOT NULL, + recruit_id uuid NOT NULL, + kinship_type character varying(50), + full_name character varying, + birth_date date, + death_az_number character varying(50), + death_date date, + marriage_az_number character varying(50), + marriage_date date, + divorce_az_number character varying(50), + divorce_date date, + information_excluded boolean DEFAULT false +); ALTER TABLE IF EXISTS ervu_dashboard.citizen_spouse OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE ervu_dashboard.citizen_spouse IS 'сведения о супруге (бывшей/ем супруге) гражданина'; +COMMENT ON TABLE ervu_dashboard.citizen_spouse IS 'сведения о супруге (бывшей/ем супруге) гражданина'; -COMMENT -ON COLUMN ervu_dashboard.citizen_spouse.recruit_id IS 'ссылка на гражданина (citizen)'; +COMMENT ON COLUMN ervu_dashboard.citizen_spouse.recruit_id IS 'ссылка на гражданина (citizen)'; -COMMENT -ON COLUMN ervu_dashboard.citizen_spouse.kinship_type IS 'тип родственной связи: супруг/бывший супруг'; +COMMENT ON COLUMN ervu_dashboard.citizen_spouse.kinship_type IS 'тип родственной связи: супруг/бывший супруг'; -COMMENT -ON COLUMN ervu_dashboard.citizen_spouse.full_name IS 'ФИО'; +COMMENT ON COLUMN ervu_dashboard.citizen_spouse.full_name IS 'ФИО'; -COMMENT -ON COLUMN ervu_dashboard.citizen_spouse.death_az_number IS 'номер актовой записи о смерти'; +COMMENT ON COLUMN ervu_dashboard.citizen_spouse.death_az_number IS 'номер актовой записи о смерти'; -COMMENT -ON COLUMN ervu_dashboard.citizen_spouse.marriage_az_number IS 'номер актовой записи о браке'; +COMMENT ON COLUMN ervu_dashboard.citizen_spouse.marriage_az_number IS 'номер актовой записи о браке'; -COMMENT -ON COLUMN ervu_dashboard.citizen_spouse.divorce_az_number IS 'номер актовой записи о расторжении брака'; - -COMMENT -ON COLUMN ervu_dashboard.citizen_spouse.information_excluded IS 'сведения о супруге исключены'; +COMMENT ON COLUMN ervu_dashboard.citizen_spouse.divorce_az_number IS 'номер актовой записи о расторжении брака'; +COMMENT ON COLUMN ervu_dashboard.citizen_spouse.information_excluded IS 'сведения о супруге исключены'; CREATE SEQUENCE ervu_dashboard.citizen_spouse_citizen_spouse_id_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.citizen_spouse_citizen_spouse_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.citizen_spouse_citizen_spouse_id_seq OWNED BY ervu_dashboard.citizen_spouse.citizen_spouse_id; - -CREATE TABLE IF NOT EXISTS ervu_dashboard.citizenship -( - citizenship_id - bigint - NOT - NULL, - recruit_id - UUID - NOT - NULL, - acquiring_basis - text, - acquiring_number - CHARACTER - varying -( - 20 -), - acquiring_date date, acquiring_authority text, renunciation_basis text, renunciation_number CHARACTER varying -( - 20 -), - renunciation_date date, renunciation_authority text); - +CREATE TABLE IF NOT EXISTS ervu_dashboard.citizenship ( + citizenship_id bigint NOT NULL, + recruit_id uuid NOT NULL, + acquiring_basis text, + acquiring_number character varying(20), + acquiring_date date, + acquiring_authority text, + renunciation_basis text, + renunciation_number character varying(20), + renunciation_date date, + renunciation_authority text +); ALTER TABLE IF EXISTS ervu_dashboard.citizenship OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE ervu_dashboard.citizenship IS 'сведения о гражданстве РФ'; +COMMENT ON TABLE ervu_dashboard.citizenship IS 'сведения о гражданстве РФ'; -COMMENT -ON COLUMN ervu_dashboard.citizenship.recruit_id IS 'ссылка на гражданина (citizen)'; +COMMENT ON COLUMN ervu_dashboard.citizenship.recruit_id IS 'ссылка на гражданина (citizen)'; -COMMENT -ON COLUMN ervu_dashboard.citizenship.acquiring_basis IS 'основание приобретения гражданства РФ'; +COMMENT ON COLUMN ervu_dashboard.citizenship.acquiring_basis IS 'основание приобретения гражданства РФ'; -COMMENT -ON COLUMN ervu_dashboard.citizenship.acquiring_number IS 'номер решения о приобретении гражданства РФ'; +COMMENT ON COLUMN ervu_dashboard.citizenship.acquiring_number IS 'номер решения о приобретении гражданства РФ'; -COMMENT -ON COLUMN ervu_dashboard.citizenship.acquiring_date IS 'дата решения о приобретении гражданства РФ'; +COMMENT ON COLUMN ervu_dashboard.citizenship.acquiring_date IS 'дата решения о приобретении гражданства РФ'; -COMMENT -ON COLUMN ervu_dashboard.citizenship.acquiring_authority IS 'наименование органа, принявшего решение о приобретении гражданства РФ'; +COMMENT ON COLUMN ervu_dashboard.citizenship.acquiring_authority IS 'наименование органа, принявшего решение о приобретении гражданства РФ'; -COMMENT -ON COLUMN ervu_dashboard.citizenship.renunciation_basis IS 'основание выхода гражданства РФ'; +COMMENT ON COLUMN ervu_dashboard.citizenship.renunciation_basis IS 'основание выхода гражданства РФ'; -COMMENT -ON COLUMN ervu_dashboard.citizenship.renunciation_number IS 'номер решения о выходе из гражданства РФ'; +COMMENT ON COLUMN ervu_dashboard.citizenship.renunciation_number IS 'номер решения о выходе из гражданства РФ'; -COMMENT -ON COLUMN ervu_dashboard.citizenship.renunciation_date IS 'дата решения о выходе из гражданства РФ'; - -COMMENT -ON COLUMN ervu_dashboard.citizenship.renunciation_authority IS 'наименование органа, принявшего решение о выходе из гражданства РФ'; +COMMENT ON COLUMN ervu_dashboard.citizenship.renunciation_date IS 'дата решения о выходе из гражданства РФ'; +COMMENT ON COLUMN ervu_dashboard.citizenship.renunciation_authority IS 'наименование органа, принявшего решение о выходе из гражданства РФ'; CREATE SEQUENCE ervu_dashboard.citizenship_citizenship_id_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.citizenship_citizenship_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.citizenship_citizenship_id_seq OWNED BY ervu_dashboard.citizenship.citizenship_id; - -CREATE TABLE IF NOT EXISTS ervu_dashboard.citizenship_foreign -( - citizenship_foreign_id - bigint - NOT - NULL, - recruit_id - UUID - NOT - NULL, - country_name - CHARACTER - varying -( - 255 -), - residense_right_basis CHARACTER varying -( - 255 -), - residense_right_date date, citizenship_basis CHARACTER varying -( - 255 -), - citizenship_date date); - +CREATE TABLE IF NOT EXISTS ervu_dashboard.citizenship_foreign ( + citizenship_foreign_id bigint NOT NULL, + recruit_id uuid NOT NULL, + country_name character varying(255), + residense_right_basis character varying(255), + residense_right_date date, + citizenship_basis character varying(255), + citizenship_date date +); ALTER TABLE IF EXISTS ervu_dashboard.citizenship_foreign OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE ervu_dashboard.citizenship_foreign IS 'сведения об иностранном гражданстве'; +COMMENT ON TABLE ervu_dashboard.citizenship_foreign IS 'сведения об иностранном гражданстве'; -COMMENT -ON COLUMN ervu_dashboard.citizenship_foreign.recruit_id IS 'ссылка на гражданина (citizen)'; +COMMENT ON COLUMN ervu_dashboard.citizenship_foreign.recruit_id IS 'ссылка на гражданина (citizen)'; -COMMENT -ON COLUMN ervu_dashboard.citizenship_foreign.country_name IS 'наименование государства'; +COMMENT ON COLUMN ervu_dashboard.citizenship_foreign.country_name IS 'наименование государства'; -COMMENT -ON COLUMN ervu_dashboard.citizenship_foreign.residense_right_basis IS 'основание получения права на постоянное проживание'; +COMMENT ON COLUMN ervu_dashboard.citizenship_foreign.residense_right_basis IS 'основание получения права на постоянное проживание'; -COMMENT -ON COLUMN ervu_dashboard.citizenship_foreign.residense_right_date IS 'дата возникновения права на постоянное проживание'; +COMMENT ON COLUMN ervu_dashboard.citizenship_foreign.residense_right_date IS 'дата возникновения права на постоянное проживание'; -COMMENT -ON COLUMN ervu_dashboard.citizenship_foreign.citizenship_basis IS 'основание получения иностранного гражданства'; - -COMMENT -ON COLUMN ervu_dashboard.citizenship_foreign.citizenship_date IS 'дата получения иностранного гражданства'; +COMMENT ON COLUMN ervu_dashboard.citizenship_foreign.citizenship_basis IS 'основание получения иностранного гражданства'; +COMMENT ON COLUMN ervu_dashboard.citizenship_foreign.citizenship_date IS 'дата получения иностранного гражданства'; CREATE SEQUENCE ervu_dashboard.citizenship_foreign_citizenship_foreign_id_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.citizenship_foreign_citizenship_foreign_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.citizenship_foreign_citizenship_foreign_id_seq OWNED BY ervu_dashboard.citizenship_foreign.citizenship_foreign_id; - -CREATE TABLE IF NOT EXISTS ervu_dashboard.decision -( - decision_id - bigint - NOT - NULL, - subpoena_id - UUID, - recruit_id - UUID, - recruitment_id - UUID +CREATE TABLE IF NOT EXISTS ervu_dashboard.decision ( + decision_id bigint NOT NULL, + subpoena_id uuid, + recruit_id uuid, + recruitment_id uuid ); - ALTER TABLE IF EXISTS ervu_dashboard.decision OWNER TO "ervu-dashboard"; - CREATE SEQUENCE ervu_dashboard.decision_decision_id_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.decision_decision_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.decision_decision_id_seq OWNED BY ervu_dashboard.decision.decision_id; - -CREATE TABLE IF NOT EXISTS ervu_dashboard.deputy -( - deputy_id - bigint - NOT - NULL, - recruit_id - UUID - NOT - NULL, - deputy - boolean - DEFAULT - TRUE, - information - text, - end_date - date, - period_office - CHARACTER - varying -( - 50 -), - cancellation_date date); - +CREATE TABLE IF NOT EXISTS ervu_dashboard.deputy ( + deputy_id bigint NOT NULL, + recruit_id uuid NOT NULL, + deputy boolean DEFAULT true, + information text, + end_date date, + period_office character varying(50), + cancellation_date date +); ALTER TABLE IF EXISTS ervu_dashboard.deputy OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE ervu_dashboard.deputy IS 'сведения о гражданах, избранных депутатами/зарегистрированных кандидатами на участие в выборах'; +COMMENT ON TABLE ervu_dashboard.deputy IS 'сведения о гражданах, избранных депутатами/зарегистрированных кандидатами на участие в выборах'; -COMMENT -ON COLUMN ervu_dashboard.deputy.recruit_id IS 'ссылка на гражданина (citizen)'; +COMMENT ON COLUMN ervu_dashboard.deputy.recruit_id IS 'ссылка на гражданина (citizen)'; -COMMENT -ON COLUMN ervu_dashboard.deputy.deputy IS 'является депутатом(true)/кандидатом на участие в выборах(false)'; +COMMENT ON COLUMN ervu_dashboard.deputy.deputy IS 'является депутатом(true)/кандидатом на участие в выборах(false)'; -COMMENT -ON COLUMN ervu_dashboard.deputy.information IS 'сведения об избрании гражданина депутатом/сведения о регистрации кандидатом на выборах'; +COMMENT ON COLUMN ervu_dashboard.deputy.information IS 'сведения об избрании гражданина депутатом/сведения о регистрации кандидатом на выборах'; -COMMENT -ON COLUMN ervu_dashboard.deputy.end_date IS 'дата досрочного прекращения полномочий/снятия кандидатуры с выборов'; +COMMENT ON COLUMN ervu_dashboard.deputy.end_date IS 'дата досрочного прекращения полномочий/снятия кандидатуры с выборов'; -COMMENT -ON COLUMN ervu_dashboard.deputy.period_office IS 'срок полномочий'; - -COMMENT -ON COLUMN ervu_dashboard.deputy.cancellation_date IS 'дата аннулирования регистрации'; +COMMENT ON COLUMN ervu_dashboard.deputy.period_office IS 'срок полномочий'; +COMMENT ON COLUMN ervu_dashboard.deputy.cancellation_date IS 'дата аннулирования регистрации'; CREATE SEQUENCE ervu_dashboard.deputy_deputy_id_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.deputy_deputy_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.deputy_deputy_id_seq OWNED BY ervu_dashboard.deputy.deputy_id; - -CREATE TABLE IF NOT EXISTS ervu_dashboard.disability -( - disability_id - bigint - NOT - NULL, - recruit_id - UUID - NOT - NULL, - disability - boolean - DEFAULT - FALSE, - organization_name - CHARACTER - varying -( - 300 -), - start_date date, close_date date, confirmation_date date, re_examination_date date, disability_group CHARACTER varying -( - 30 -)); - +CREATE TABLE IF NOT EXISTS ervu_dashboard.disability ( + disability_id bigint NOT NULL, + recruit_id uuid NOT NULL, + disability boolean DEFAULT false, + organization_name character varying(300), + start_date date, + close_date date, + confirmation_date date, + re_examination_date date, + disability_group character varying(30) +); ALTER TABLE IF EXISTS ervu_dashboard.disability OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE ervu_dashboard.disability IS 'сведения об инвалидности/недееспособности/ограниченной дееспособности'; +COMMENT ON TABLE ervu_dashboard.disability IS 'сведения об инвалидности/недееспособности/ограниченной дееспособности'; -COMMENT -ON COLUMN ervu_dashboard.disability.recruit_id IS 'ссылка на гражданина (citizen)'; +COMMENT ON COLUMN ervu_dashboard.disability.recruit_id IS 'ссылка на гражданина (citizen)'; -COMMENT -ON COLUMN ervu_dashboard.disability.disability IS 'сведения об инвалидности(true)/недееспособности(false)'; +COMMENT ON COLUMN ervu_dashboard.disability.disability IS 'сведения об инвалидности(true)/недееспособности(false)'; -COMMENT -ON COLUMN ervu_dashboard.disability.organization_name IS 'наименование организации, установившей инвалидность/судебного органа'; +COMMENT ON COLUMN ervu_dashboard.disability.organization_name IS 'наименование организации, установившей инвалидность/судебного органа'; -COMMENT -ON COLUMN ervu_dashboard.disability.start_date IS 'дата установления инвалидности/признания гражданина недееспособным'; +COMMENT ON COLUMN ervu_dashboard.disability.start_date IS 'дата установления инвалидности/признания гражданина недееспособным'; -COMMENT -ON COLUMN ervu_dashboard.disability.close_date IS 'дата снятия инвалидности/отмены ограничения гражданина в дееспособности'; +COMMENT ON COLUMN ervu_dashboard.disability.close_date IS 'дата снятия инвалидности/отмены ограничения гражданина в дееспособности'; -COMMENT -ON COLUMN ervu_dashboard.disability.confirmation_date IS 'дата подтверждения инвалидности'; +COMMENT ON COLUMN ervu_dashboard.disability.confirmation_date IS 'дата подтверждения инвалидности'; -COMMENT -ON COLUMN ervu_dashboard.disability.re_examination_date IS 'дата переосвидетельствования по инвалидности'; - -COMMENT -ON COLUMN ervu_dashboard.disability.disability_group IS 'группа инвалидности'; +COMMENT ON COLUMN ervu_dashboard.disability.re_examination_date IS 'дата переосвидетельствования по инвалидности'; +COMMENT ON COLUMN ervu_dashboard.disability.disability_group IS 'группа инвалидности'; CREATE SEQUENCE ervu_dashboard.disability_disability_id_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.disability_disability_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.disability_disability_id_seq OWNED BY ervu_dashboard.disability.disability_id; - -CREATE TABLE IF NOT EXISTS ervu_dashboard.disease -( - disease_id - bigint - NOT - NULL, - recruit_id - UUID - NOT - NULL, - code - CHARACTER - varying, - name - CHARACTER - varying, - reg_date - date, - registered - boolean - DEFAULT - FALSE +CREATE TABLE IF NOT EXISTS ervu_dashboard.disease ( + disease_id bigint NOT NULL, + recruit_id uuid NOT NULL, + code character varying, + name character varying, + reg_date date, + registered boolean DEFAULT false ); - ALTER TABLE IF EXISTS ervu_dashboard.disease OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE ervu_dashboard.disease IS 'сведения о заболеваниях гражданина'; +COMMENT ON TABLE ervu_dashboard.disease IS 'сведения о заболеваниях гражданина'; -COMMENT -ON COLUMN ervu_dashboard.disease.recruit_id IS 'ссылка на гражданина (citizen)'; +COMMENT ON COLUMN ervu_dashboard.disease.recruit_id IS 'ссылка на гражданина (citizen)'; -COMMENT -ON COLUMN ervu_dashboard.disease.code IS 'код заболевания'; +COMMENT ON COLUMN ervu_dashboard.disease.code IS 'код заболевания'; -COMMENT -ON COLUMN ervu_dashboard.disease.name IS 'наименование заболевания'; +COMMENT ON COLUMN ervu_dashboard.disease.name IS 'наименование заболевания'; -COMMENT -ON COLUMN ervu_dashboard.disease.reg_date IS 'дата постановки диагноза'; - -COMMENT -ON COLUMN ervu_dashboard.disease.registered IS 'поставлен на учет по заболеванию'; +COMMENT ON COLUMN ervu_dashboard.disease.reg_date IS 'дата постановки диагноза'; +COMMENT ON COLUMN ervu_dashboard.disease.registered IS 'поставлен на учет по заболеванию'; CREATE SEQUENCE ervu_dashboard.disease_disease_id_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.disease_disease_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.disease_disease_id_seq OWNED BY ervu_dashboard.disease.disease_id; - -CREATE TABLE IF NOT EXISTS ervu_dashboard.drivers_licence -( - drivers_licence_id - bigint - NOT - NULL, - recruit_id - UUID - NOT - NULL, - tractor_driver - boolean - DEFAULT - FALSE, - licence_series - CHARACTER - varying -( - 50 -), - licence_number CHARACTER varying -( - 50 -), - start_date date, close_date date, categories CHARACTER varying -( - 50 -), - status CHARACTER varying -( - 50 -), - replacement_date date, return_date date, seizure_date date); - +CREATE TABLE IF NOT EXISTS ervu_dashboard.drivers_licence ( + drivers_licence_id bigint NOT NULL, + recruit_id uuid NOT NULL, + tractor_driver boolean DEFAULT false, + licence_series character varying(50), + licence_number character varying(50), + start_date date, + close_date date, + categories character varying(50), + status character varying(50), + replacement_date date, + return_date date, + seizure_date date +); ALTER TABLE IF EXISTS ervu_dashboard.drivers_licence OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE ervu_dashboard.drivers_licence IS 'удостоверение водительское/тракториста-машиниста'; +COMMENT ON TABLE ervu_dashboard.drivers_licence IS 'удостоверение водительское/тракториста-машиниста'; -COMMENT -ON COLUMN ervu_dashboard.drivers_licence.recruit_id IS 'ссылка на гражданина (citizen)'; +COMMENT ON COLUMN ervu_dashboard.drivers_licence.recruit_id IS 'ссылка на гражданина (citizen)'; -COMMENT -ON COLUMN ervu_dashboard.drivers_licence.tractor_driver IS 'удостоверение тракториста'; +COMMENT ON COLUMN ervu_dashboard.drivers_licence.tractor_driver IS 'удостоверение тракториста'; -COMMENT -ON COLUMN ervu_dashboard.drivers_licence.licence_series IS 'серия'; +COMMENT ON COLUMN ervu_dashboard.drivers_licence.licence_series IS 'серия'; -COMMENT -ON COLUMN ervu_dashboard.drivers_licence.licence_number IS 'номер'; +COMMENT ON COLUMN ervu_dashboard.drivers_licence.licence_number IS 'номер'; -COMMENT -ON COLUMN ervu_dashboard.drivers_licence.start_date IS 'дата выдачи'; +COMMENT ON COLUMN ervu_dashboard.drivers_licence.start_date IS 'дата выдачи'; -COMMENT -ON COLUMN ervu_dashboard.drivers_licence.close_date IS 'дата окончания действия'; +COMMENT ON COLUMN ervu_dashboard.drivers_licence.close_date IS 'дата окончания действия'; -COMMENT -ON COLUMN ervu_dashboard.drivers_licence.categories IS 'категории'; +COMMENT ON COLUMN ervu_dashboard.drivers_licence.categories IS 'категории'; -COMMENT -ON COLUMN ervu_dashboard.drivers_licence.status IS 'статус удостоверения'; +COMMENT ON COLUMN ervu_dashboard.drivers_licence.status IS 'статус удостоверения'; -COMMENT -ON COLUMN ervu_dashboard.drivers_licence.replacement_date IS 'дата замены'; +COMMENT ON COLUMN ervu_dashboard.drivers_licence.replacement_date IS 'дата замены'; -COMMENT -ON COLUMN ervu_dashboard.drivers_licence.return_date IS 'дата возврата'; - -COMMENT -ON COLUMN ervu_dashboard.drivers_licence.seizure_date IS 'дата изъятия'; +COMMENT ON COLUMN ervu_dashboard.drivers_licence.return_date IS 'дата возврата'; +COMMENT ON COLUMN ervu_dashboard.drivers_licence.seizure_date IS 'дата изъятия'; CREATE SEQUENCE ervu_dashboard.drivers_licence_drivers_licence_id_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.drivers_licence_drivers_licence_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.drivers_licence_drivers_licence_id_seq OWNED BY ervu_dashboard.drivers_licence.drivers_licence_id; - -CREATE TABLE IF NOT EXISTS ervu_dashboard.medical_authorities -( - medical_authorities_id - bigint - NOT - NULL, - recruit_id - UUID - NOT - NULL, - start_date - date, - close_date - date, - change_date - date, - hiv - boolean - DEFAULT - FALSE +CREATE TABLE IF NOT EXISTS ervu_dashboard.medical_authorities ( + medical_authorities_id bigint NOT NULL, + recruit_id uuid NOT NULL, + start_date date, + close_date date, + change_date date, + hiv boolean DEFAULT false ); - ALTER TABLE IF EXISTS ervu_dashboard.medical_authorities OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE ervu_dashboard.medical_authorities IS 'сведения о гражданах, стоящих на учете в ПНД/по ВИЧ'; +COMMENT ON TABLE ervu_dashboard.medical_authorities IS 'сведения о гражданах, стоящих на учете в ПНД/по ВИЧ'; -COMMENT -ON COLUMN ervu_dashboard.medical_authorities.recruit_id IS 'ссылка на гражданина (citizen)'; +COMMENT ON COLUMN ervu_dashboard.medical_authorities.recruit_id IS 'ссылка на гражданина (citizen)'; -COMMENT -ON COLUMN ervu_dashboard.medical_authorities.start_date IS 'дата постановки на учет'; +COMMENT ON COLUMN ervu_dashboard.medical_authorities.start_date IS 'дата постановки на учет'; -COMMENT -ON COLUMN ervu_dashboard.medical_authorities.close_date IS 'дата снятия с учета'; +COMMENT ON COLUMN ervu_dashboard.medical_authorities.close_date IS 'дата снятия с учета'; -COMMENT -ON COLUMN ervu_dashboard.medical_authorities.change_date IS 'дата планового срока пересмотра диагноза'; - -COMMENT -ON COLUMN ervu_dashboard.medical_authorities.hiv IS 'на учете по ВИЧ(true) или в ПНД(false)'; +COMMENT ON COLUMN ervu_dashboard.medical_authorities.change_date IS 'дата планового срока пересмотра диагноза'; +COMMENT ON COLUMN ervu_dashboard.medical_authorities.hiv IS 'на учете по ВИЧ(true) или в ПНД(false)'; CREATE SEQUENCE ervu_dashboard.medical_authorities_medical_authorities_id_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.medical_authorities_medical_authorities_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.medical_authorities_medical_authorities_id_seq OWNED BY ervu_dashboard.medical_authorities.medical_authorities_id; - -CREATE TABLE IF NOT EXISTS ervu_dashboard.passport -( - passport_id - bigint - NOT - NULL, - recruit_id - UUID - NOT - NULL, - actual - boolean - DEFAULT - TRUE, - passport_series - CHARACTER - varying -( - 4 -), - passport_number CHARACTER varying -( - 6 -), - issue_date date, organization_name CHARACTER varying -( - 255 -), - unit_code CHARACTER varying -( - 7 -)); - +CREATE TABLE IF NOT EXISTS ervu_dashboard.passport ( + passport_id bigint NOT NULL, + recruit_id uuid NOT NULL, + actual boolean DEFAULT true, + passport_series character varying(4), + passport_number character varying(6), + issue_date date, + organization_name character varying(255), + unit_code character varying(7) +); ALTER TABLE IF EXISTS ervu_dashboard.passport OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE ervu_dashboard.passport IS 'сведения о паспорте'; +COMMENT ON TABLE ervu_dashboard.passport IS 'сведения о паспорте'; -COMMENT -ON COLUMN ervu_dashboard.passport.recruit_id IS 'ссылка на гражданина (citizen)'; +COMMENT ON COLUMN ervu_dashboard.passport.recruit_id IS 'ссылка на гражданина (citizen)'; -COMMENT -ON COLUMN ervu_dashboard.passport.actual IS 'статус документа: действительный(true)/недействительный(false)'; +COMMENT ON COLUMN ervu_dashboard.passport.actual IS 'статус документа: действительный(true)/недействительный(false)'; -COMMENT -ON COLUMN ervu_dashboard.passport.passport_series IS 'серия паспорта'; +COMMENT ON COLUMN ervu_dashboard.passport.passport_series IS 'серия паспорта'; -COMMENT -ON COLUMN ervu_dashboard.passport.passport_number IS 'номер паспорта'; +COMMENT ON COLUMN ervu_dashboard.passport.passport_number IS 'номер паспорта'; -COMMENT -ON COLUMN ervu_dashboard.passport.issue_date IS 'дата выдачи документа'; +COMMENT ON COLUMN ervu_dashboard.passport.issue_date IS 'дата выдачи документа'; -COMMENT -ON COLUMN ervu_dashboard.passport.organization_name IS 'наименование органа, выдавшего документ'; - -COMMENT -ON COLUMN ervu_dashboard.passport.unit_code IS 'код подразделения'; +COMMENT ON COLUMN ervu_dashboard.passport.organization_name IS 'наименование органа, выдавшего документ'; +COMMENT ON COLUMN ervu_dashboard.passport.unit_code IS 'код подразделения'; CREATE SEQUENCE ervu_dashboard.passport_passport_id_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.passport_passport_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.passport_passport_id_seq OWNED BY ervu_dashboard.passport.passport_id; - -CREATE TABLE IF NOT EXISTS ervu_dashboard.property -( - property_id - bigint - NOT - NULL, - recruit_id - UUID - NOT - NULL, - type_property - public - . - type_property_type, - start_date - date, - close_date - date, - vehicle_type - CHARACTER - varying -( - 100 -), - vehicle_category CHARACTER varying -( - 100 -), - address text, kind_right CHARACTER varying -( - 50 -), - issue_year CHARACTER varying -( - 4 -), - brand_model CHARACTER varying -( - 100 -), - reg_plate CHARACTER varying -( - 100 -), - vin CHARACTER varying -( - 100 -)); - +CREATE TABLE IF NOT EXISTS ervu_dashboard.property ( + property_id bigint NOT NULL, + recruit_id uuid NOT NULL, + type_property public.type_property_type, + start_date date, + close_date date, + vehicle_type character varying(100), + vehicle_category character varying(100), + address text, + kind_right character varying(50), + issue_year character varying(4), + brand_model character varying(100), + reg_plate character varying(100), + vin character varying(100) +); ALTER TABLE IF EXISTS ervu_dashboard.property OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE ervu_dashboard.property IS 'сведения об имуществе'; +COMMENT ON TABLE ervu_dashboard.property IS 'сведения об имуществе'; -COMMENT -ON COLUMN ervu_dashboard.property.recruit_id IS 'ссылка на гражданина (citizen)'; +COMMENT ON COLUMN ervu_dashboard.property.recruit_id IS 'ссылка на гражданина (citizen)'; -COMMENT -ON COLUMN ervu_dashboard.property.type_property IS 'тип имущества: недвижимое/наземный/воздушный/водный транспорт'; +COMMENT ON COLUMN ervu_dashboard.property.type_property IS 'тип имущества: недвижимое/наземный/воздушный/водный транспорт'; -COMMENT -ON COLUMN ervu_dashboard.property.start_date IS 'дата регистрации права владения'; +COMMENT ON COLUMN ervu_dashboard.property.start_date IS 'дата регистрации права владения'; -COMMENT -ON COLUMN ervu_dashboard.property.close_date IS 'дата прекращения права владения'; +COMMENT ON COLUMN ervu_dashboard.property.close_date IS 'дата прекращения права владения'; -COMMENT -ON COLUMN ervu_dashboard.property.vehicle_type IS 'вид транспортного средства'; +COMMENT ON COLUMN ervu_dashboard.property.vehicle_type IS 'вид транспортного средства'; -COMMENT -ON COLUMN ervu_dashboard.property.vehicle_category IS 'категория транспортного средства'; +COMMENT ON COLUMN ervu_dashboard.property.vehicle_category IS 'категория транспортного средства'; -COMMENT -ON COLUMN ervu_dashboard.property.address IS 'адрес объекта недвижимости'; +COMMENT ON COLUMN ervu_dashboard.property.address IS 'адрес объекта недвижимости'; -COMMENT -ON COLUMN ervu_dashboard.property.kind_right IS 'вид права'; +COMMENT ON COLUMN ervu_dashboard.property.kind_right IS 'вид права'; -COMMENT -ON COLUMN ervu_dashboard.property.issue_year IS 'год выпуска транспортного средства'; +COMMENT ON COLUMN ervu_dashboard.property.issue_year IS 'год выпуска транспортного средства'; -COMMENT -ON COLUMN ervu_dashboard.property.brand_model IS 'марка, модель транспортного средства'; - -COMMENT -ON COLUMN ervu_dashboard.property.reg_plate IS 'регистрационный номер'; +COMMENT ON COLUMN ervu_dashboard.property.brand_model IS 'марка, модель транспортного средства'; +COMMENT ON COLUMN ervu_dashboard.property.reg_plate IS 'регистрационный номер'; CREATE SEQUENCE ervu_dashboard.property_property_id_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.property_property_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.property_property_id_seq OWNED BY ervu_dashboard.property.property_id; - -CREATE TABLE IF NOT EXISTS ervu_dashboard.prosecution -( - prosecution_id - bigint - NOT - NULL, - recruit_id - UUID - NOT - NULL, - kind - CHARACTER - varying -( - 255 -), - create_date date, close_date date, authority_name CHARACTER varying -( - 255 -), - law_point CHARACTER varying -( - 100 -), - termination_basis CHARACTER varying -( - 255 -), - transfer_to_court boolean DEFAULT FALSE, - case_number CHARACTER varying -( - 50 -), - case_number_court CHARACTER varying -( - 50 -), - reclassification text); - +CREATE TABLE IF NOT EXISTS ervu_dashboard.prosecution ( + prosecution_id bigint NOT NULL, + recruit_id uuid NOT NULL, + kind character varying(255), + create_date date, + close_date date, + authority_name character varying(255), + law_point character varying(100), + termination_basis character varying(255), + transfer_to_court boolean DEFAULT false, + case_number character varying(50), + case_number_court character varying(50), + reclassification text +); ALTER TABLE IF EXISTS ervu_dashboard.prosecution OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE ervu_dashboard.prosecution IS 'сведения об уголовном преследовании'; +COMMENT ON TABLE ervu_dashboard.prosecution IS 'сведения об уголовном преследовании'; -COMMENT -ON COLUMN ervu_dashboard.prosecution.recruit_id IS 'ссылка на гражданина (citizen)'; +COMMENT ON COLUMN ervu_dashboard.prosecution.recruit_id IS 'ссылка на гражданина (citizen)'; -COMMENT -ON COLUMN ervu_dashboard.prosecution.kind IS 'вид уголовного преследования'; +COMMENT ON COLUMN ervu_dashboard.prosecution.kind IS 'вид уголовного преследования'; -COMMENT -ON COLUMN ervu_dashboard.prosecution.create_date IS 'дата возбуждения уголовного дела'; +COMMENT ON COLUMN ervu_dashboard.prosecution.create_date IS 'дата возбуждения уголовного дела'; -COMMENT -ON COLUMN ervu_dashboard.prosecution.close_date IS 'дата прекращения уголовного преследования'; +COMMENT ON COLUMN ervu_dashboard.prosecution.close_date IS 'дата прекращения уголовного преследования'; -COMMENT -ON COLUMN ervu_dashboard.prosecution.authority_name IS 'наименование органа, принявшего решение'; +COMMENT ON COLUMN ervu_dashboard.prosecution.authority_name IS 'наименование органа, принявшего решение'; -COMMENT -ON COLUMN ervu_dashboard.prosecution.law_point IS 'пункт, часть, статья УК РФ'; +COMMENT ON COLUMN ervu_dashboard.prosecution.law_point IS 'пункт, часть, статья УК РФ'; -COMMENT -ON COLUMN ervu_dashboard.prosecution.termination_basis IS 'основание прекращения уголовного преследования'; +COMMENT ON COLUMN ervu_dashboard.prosecution.termination_basis IS 'основание прекращения уголовного преследования'; -COMMENT -ON COLUMN ervu_dashboard.prosecution.transfer_to_court IS 'признак передачи в суд уголовного дела в отношении гражданина'; +COMMENT ON COLUMN ervu_dashboard.prosecution.transfer_to_court IS 'признак передачи в суд уголовного дела в отношении гражданина'; -COMMENT -ON COLUMN ervu_dashboard.prosecution.case_number IS 'номер уголовного дела (предварительный)'; +COMMENT ON COLUMN ervu_dashboard.prosecution.case_number IS 'номер уголовного дела (предварительный)'; -COMMENT -ON COLUMN ervu_dashboard.prosecution.case_number_court IS 'номер уголовного дела (судебный)'; - -COMMENT -ON COLUMN ervu_dashboard.prosecution.reclassification IS 'сведения о переквалификации деяния'; +COMMENT ON COLUMN ervu_dashboard.prosecution.case_number_court IS 'номер уголовного дела (судебный)'; +COMMENT ON COLUMN ervu_dashboard.prosecution.reclassification IS 'сведения о переквалификации деяния'; CREATE SEQUENCE ervu_dashboard.prosecution_prosecution_id_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.prosecution_prosecution_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.prosecution_prosecution_id_seq OWNED BY ervu_dashboard.prosecution.prosecution_id; - -CREATE TABLE IF NOT EXISTS ervu_dashboard.pub_recruitment -( - idm_id - CHARACTER - varying -( - 256 -), - parent_id CHARACTER varying, military_code CHARACTER varying, shortname CHARACTER varying NOT NULL, - fullname CHARACTER varying NOT NULL, - code CHARACTER varying -( - 64 -), - id CHARACTER -( - 36 -) NOT NULL, - SORT CHARACTER varying NOT NULL); - +CREATE TABLE IF NOT EXISTS ervu_dashboard.pub_recruitment ( + idm_id character varying(256), + parent_id character varying, + military_code character varying, + shortname character varying NOT NULL, + fullname character varying NOT NULL, + code character varying(64), + id character(36) NOT NULL, + sort character varying NOT NULL +); ALTER TABLE IF EXISTS ervu_dashboard.pub_recruitment OWNER TO "ervu-dashboard"; - -CREATE TABLE IF NOT EXISTS ervu_dashboard.punishment -( - punishment_id - bigint - NOT - NULL, - recruit_id - UUID - NOT - NULL, - sentence - CHARACTER - varying -( - 255 -), - sentence_changed CHARACTER varying -( - 255 -), - sentense_date date, authority_name CHARACTER varying -( - 255 -), - law_point CHARACTER varying -( - 100 -), - punishment_type CHARACTER varying -( - 100 -), - punishment_code CHARACTER varying -( - 5 -), - sentence_place text, start_date date, planned_date date, release_date date, release_reason CHARACTER varying -( - 255 -), - mandatory_work boolean DEFAULT FALSE); - +CREATE TABLE IF NOT EXISTS ervu_dashboard.punishment ( + punishment_id bigint NOT NULL, + recruit_id uuid NOT NULL, + sentence character varying(255), + sentence_changed character varying(255), + sentense_date date, + authority_name character varying(255), + law_point character varying(100), + punishment_type character varying(100), + punishment_code character varying(5), + sentence_place text, + start_date date, + planned_date date, + release_date date, + release_reason character varying(255), + mandatory_work boolean DEFAULT false +); ALTER TABLE IF EXISTS ervu_dashboard.punishment OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE ervu_dashboard.punishment IS 'сведения об уголовном преследовании и вынесенном приговоре'; +COMMENT ON TABLE ervu_dashboard.punishment IS 'сведения об уголовном преследовании и вынесенном приговоре'; -COMMENT -ON COLUMN ervu_dashboard.punishment.recruit_id IS 'ссылка на гражданина (citizen)'; +COMMENT ON COLUMN ervu_dashboard.punishment.recruit_id IS 'ссылка на гражданина (citizen)'; -COMMENT -ON COLUMN ervu_dashboard.punishment.sentence IS 'срок или размер наказания'; +COMMENT ON COLUMN ervu_dashboard.punishment.sentence IS 'срок или размер наказания'; -COMMENT -ON COLUMN ervu_dashboard.punishment.sentence_changed IS 'изменение срока или размера наказания'; +COMMENT ON COLUMN ervu_dashboard.punishment.sentence_changed IS 'изменение срока или размера наказания'; -COMMENT -ON COLUMN ervu_dashboard.punishment.sentense_date IS 'дата вынесения обвинительного приговора'; +COMMENT ON COLUMN ervu_dashboard.punishment.sentense_date IS 'дата вынесения обвинительного приговора'; -COMMENT -ON COLUMN ervu_dashboard.punishment.authority_name IS 'наименование суда, вынесшего приговор'; +COMMENT ON COLUMN ervu_dashboard.punishment.authority_name IS 'наименование суда, вынесшего приговор'; -COMMENT -ON COLUMN ervu_dashboard.punishment.law_point IS 'пункт, часть, статья УК РФ'; +COMMENT ON COLUMN ervu_dashboard.punishment.law_point IS 'пункт, часть, статья УК РФ'; -COMMENT -ON COLUMN ervu_dashboard.punishment.punishment_type IS 'вид наказания'; +COMMENT ON COLUMN ervu_dashboard.punishment.punishment_type IS 'вид наказания'; -COMMENT -ON COLUMN ervu_dashboard.punishment.punishment_code IS 'код вида наказания'; +COMMENT ON COLUMN ervu_dashboard.punishment.punishment_code IS 'код вида наказания'; -COMMENT -ON COLUMN ervu_dashboard.punishment.sentence_place IS 'наименование и адрес места отбывания наказания'; +COMMENT ON COLUMN ervu_dashboard.punishment.sentence_place IS 'наименование и адрес места отбывания наказания'; -COMMENT -ON COLUMN ervu_dashboard.punishment.start_date IS 'дата начала срока отбывания наказания'; +COMMENT ON COLUMN ervu_dashboard.punishment.start_date IS 'дата начала срока отбывания наказания'; -COMMENT -ON COLUMN ervu_dashboard.punishment.planned_date IS 'плановая дата отбытия'; +COMMENT ON COLUMN ervu_dashboard.punishment.planned_date IS 'плановая дата отбытия'; -COMMENT -ON COLUMN ervu_dashboard.punishment.release_date IS 'дата освобождения'; +COMMENT ON COLUMN ervu_dashboard.punishment.release_date IS 'дата освобождения'; -COMMENT -ON COLUMN ervu_dashboard.punishment.release_reason IS 'основание освобождения'; - -COMMENT -ON COLUMN ervu_dashboard.punishment.mandatory_work IS 'признак отбывания наказания в виде обязательных работ'; +COMMENT ON COLUMN ervu_dashboard.punishment.release_reason IS 'основание освобождения'; +COMMENT ON COLUMN ervu_dashboard.punishment.mandatory_work IS 'признак отбывания наказания в виде обязательных работ'; CREATE SEQUENCE ervu_dashboard.punishment_punishment_id_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.punishment_punishment_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.punishment_punishment_id_seq OWNED BY ervu_dashboard.punishment.punishment_id; - -CREATE TABLE IF NOT EXISTS ervu_dashboard.recruitment -( - id - CHARACTER -( - 36 -) NOT NULL, - shortname CHARACTER -( - 300 -), idm_id UUID, - code CHARACTER -( - 300 -), parent_id CHARACTER -( - 300 -), - SORT bigint NOT NULL); - +CREATE TABLE IF NOT EXISTS ervu_dashboard.recruitment ( + id character(36) NOT NULL, + shortname character(300), + idm_id uuid, + code character(300), + parent_id character(300), + sort bigint NOT NULL +); ALTER TABLE IF EXISTS ervu_dashboard.recruitment OWNER TO "ervu-dashboard"; - -CREATE TABLE IF NOT EXISTS ervu_dashboard.subpoena -( - sub_id - bigint - NOT - NULL, - series - CHARACTER - varying -( - 16 -), number CHARACTER varying -( - 36 -) NOT NULL, - create_date timestamp WITHOUT TIME ZONE DEFAULT NOW -( -) NOT NULL, - visit_date timestamp - WITHOUT TIME ZONE, - send_date timestamp - WITH TIME ZONE, - reason_cancelled CHARACTER varying (255), - recruit_id UUID, - department_id UUID, - subpoena_status text, subpoena_reason text, fio_commiss text, track_number text, recruitment_name text, address text, method_sending text, subpoena_id UUID, - sig_info CHARACTER varying -( - 255 -), - delivery_fio text, act_number text, method_delivery text, delivery_date timestamp - WITHOUT TIME ZONE, - delivery_status text, appearance text, appearance_status text); - +CREATE TABLE IF NOT EXISTS ervu_dashboard.subpoena ( + sub_id bigint NOT NULL, + series character varying(16), + number character varying(36) NOT NULL, + create_date timestamp without time zone DEFAULT now() NOT NULL, + visit_date timestamp without time zone, + send_date timestamp with time zone, + reason_cancelled character varying(255), + recruit_id uuid, + department_id uuid, + subpoena_status text, + subpoena_reason text, + fio_commiss text, + track_number text, + recruitment_name text, + address text, + method_sending text, + subpoena_id uuid, + sig_info character varying(255), + delivery_fio text, + act_number text, + method_delivery text, + delivery_date timestamp without time zone, + delivery_status text, + appearance text, + appearance_status text +); ALTER TABLE IF EXISTS ervu_dashboard.subpoena OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE ervu_dashboard.subpoena IS 'сведения о направлении повестки военного комиссариата'; +COMMENT ON TABLE ervu_dashboard.subpoena IS 'сведения о направлении повестки военного комиссариата'; -COMMENT -ON COLUMN ervu_dashboard.subpoena.series IS 'серия повестки'; +COMMENT ON COLUMN ervu_dashboard.subpoena.series IS 'серия повестки'; -COMMENT -ON COLUMN ervu_dashboard.subpoena.number IS 'номер повестки'; +COMMENT ON COLUMN ervu_dashboard.subpoena.number IS 'номер повестки'; -COMMENT -ON COLUMN ervu_dashboard.subpoena.create_date IS 'дата создания записи'; +COMMENT ON COLUMN ervu_dashboard.subpoena.create_date IS 'дата создания записи'; -COMMENT -ON COLUMN ervu_dashboard.subpoena.visit_date IS 'время и дата явки в ВК'; +COMMENT ON COLUMN ervu_dashboard.subpoena.visit_date IS 'время и дата явки в ВК'; -COMMENT -ON COLUMN ervu_dashboard.subpoena.send_date IS 'дата направления повестки'; +COMMENT ON COLUMN ervu_dashboard.subpoena.send_date IS 'дата направления повестки'; -COMMENT -ON COLUMN ervu_dashboard.subpoena.reason_cancelled IS 'причина отклонения повестки'; +COMMENT ON COLUMN ervu_dashboard.subpoena.reason_cancelled IS 'причина отклонения повестки'; -COMMENT -ON COLUMN ervu_dashboard.subpoena.recruit_id IS 'идентификатор рекрута'; +COMMENT ON COLUMN ervu_dashboard.subpoena.recruit_id IS 'идентификатор рекрута'; -COMMENT -ON COLUMN ervu_dashboard.subpoena.department_id IS 'идентификатор ВК'; +COMMENT ON COLUMN ervu_dashboard.subpoena.department_id IS 'идентификатор ВК'; -COMMENT -ON COLUMN ervu_dashboard.subpoena.subpoena_status IS 'статус повестки'; +COMMENT ON COLUMN ervu_dashboard.subpoena.subpoena_status IS 'статус повестки'; -COMMENT -ON COLUMN ervu_dashboard.subpoena.subpoena_reason IS 'причина вызова по повестке'; +COMMENT ON COLUMN ervu_dashboard.subpoena.subpoena_reason IS 'причина вызова по повестке'; -COMMENT -ON COLUMN ervu_dashboard.subpoena.fio_commiss IS 'фио комиссара'; +COMMENT ON COLUMN ervu_dashboard.subpoena.fio_commiss IS 'фио комиссара'; -COMMENT -ON COLUMN ervu_dashboard.subpoena.track_number IS 'уникальный номер заказного почтового отправления, которым направлена повестка'; +COMMENT ON COLUMN ervu_dashboard.subpoena.track_number IS 'уникальный номер заказного почтового отправления, которым направлена повестка'; -COMMENT -ON COLUMN ervu_dashboard.subpoena.recruitment_name IS 'наименование ВК, направившего повестку'; +COMMENT ON COLUMN ervu_dashboard.subpoena.recruitment_name IS 'наименование ВК, направившего повестку'; -COMMENT -ON COLUMN ervu_dashboard.subpoena.address IS 'адрес, по которому нужно явиться по повестке'; +COMMENT ON COLUMN ervu_dashboard.subpoena.address IS 'адрес, по которому нужно явиться по повестке'; -COMMENT -ON COLUMN ervu_dashboard.subpoena.method_sending IS 'способ направления повестки'; +COMMENT ON COLUMN ervu_dashboard.subpoena.method_sending IS 'способ направления повестки'; -COMMENT -ON COLUMN ervu_dashboard.subpoena.subpoena_id IS 'идентификатор повестки'; +COMMENT ON COLUMN ervu_dashboard.subpoena.subpoena_id IS 'идентификатор повестки'; -COMMENT -ON COLUMN ervu_dashboard.subpoena.sig_info IS 'открепленная ЭП'; +COMMENT ON COLUMN ervu_dashboard.subpoena.sig_info IS 'открепленная ЭП'; -COMMENT -ON COLUMN ervu_dashboard.subpoena.delivery_fio IS 'фио лица, оповестившего гражданина о последствиях отказа от получения повестки'; +COMMENT ON COLUMN ervu_dashboard.subpoena.delivery_fio IS 'фио лица, оповестившего гражданина о последствиях отказа от получения повестки'; -COMMENT -ON COLUMN ervu_dashboard.subpoena.act_number IS 'номер акта об отказе от получения повестки'; +COMMENT ON COLUMN ervu_dashboard.subpoena.act_number IS 'номер акта об отказе от получения повестки'; -COMMENT -ON COLUMN ervu_dashboard.subpoena.method_delivery IS 'способ вручения'; +COMMENT ON COLUMN ervu_dashboard.subpoena.method_delivery IS 'способ вручения'; +ALTER TABLE IF EXISTS ervu_dashboard.subpoena ALTER COLUMN sub_id ADD GENERATED BY DEFAULT AS IDENTITY ( + SEQUENCE NAME ervu_dashboard.subpoena_subpoena_id_seq + START WITH 2 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1 + ); -ALTER TABLE IF EXISTS ervu_dashboard.subpoena -ALTER -COLUMN sub_id ADD GENERATED BY DEFAULT AS IDENTITY - (SEQUENCE NAME ervu_dashboard.subpoena_subpoena_id_seq START WITH 2 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1); - - -CREATE TABLE IF NOT EXISTS ervu_dashboard.temporary_measures -( - temporary_measures_id - bigint - NOT - NULL, - subpoena_id - UUID, - recruit_id - UUID, - recruitment_id - UUID, - status_measure - text, - recruitment_name - text, - cancel_date - timestamp - WITHOUT - TIME - ZONE, - restriction_name - text, - TYPE - text, - decision_number_create - text, - decision_number_cancel - text, - decision_date_create - timestamp - WITHOUT - TIME - ZONE, - decision_date_cancel - timestamp - WITHOUT - TIME - ZONE, - applied_fact - text +CREATE TABLE IF NOT EXISTS ervu_dashboard.temporary_measures ( + temporary_measures_id bigint NOT NULL, + subpoena_id uuid, + recruit_id uuid, + recruitment_id uuid, + status_measure text, + recruitment_name text, + cancel_date timestamp without time zone, + restriction_name text, + type text, + decision_number_create text, + decision_number_cancel text, + decision_date_create timestamp without time zone, + decision_date_cancel timestamp without time zone, + applied_fact text ); - ALTER TABLE IF EXISTS ervu_dashboard.temporary_measures OWNER TO "ervu-dashboard"; -COMMENT -ON COLUMN ervu_dashboard.temporary_measures.status_measure IS 'статус временной меры'; +COMMENT ON COLUMN ervu_dashboard.temporary_measures.status_measure IS 'статус временной меры'; -COMMENT -ON COLUMN ervu_dashboard.temporary_measures.recruitment_name IS 'наименование ВК'; +COMMENT ON COLUMN ervu_dashboard.temporary_measures.recruitment_name IS 'наименование ВК'; -COMMENT -ON COLUMN ervu_dashboard.temporary_measures.cancel_date IS 'дата, с которой отменена временная мера'; +COMMENT ON COLUMN ervu_dashboard.temporary_measures.cancel_date IS 'дата, с которой отменена временная мера'; -COMMENT -ON COLUMN ervu_dashboard.temporary_measures.restriction_name IS 'наименование временной меры'; +COMMENT ON COLUMN ervu_dashboard.temporary_measures.restriction_name IS 'наименование временной меры'; -COMMENT -ON COLUMN ervu_dashboard.temporary_measures.type IS 'тип документа ограничения'; +COMMENT ON COLUMN ervu_dashboard.temporary_measures.type IS 'тип документа ограничения'; -COMMENT -ON COLUMN ervu_dashboard.temporary_measures.decision_number_create IS 'номер решения о применении временной меры'; +COMMENT ON COLUMN ervu_dashboard.temporary_measures.decision_number_create IS 'номер решения о применении временной меры'; -COMMENT -ON COLUMN ervu_dashboard.temporary_measures.decision_number_cancel IS 'номер решения об отмене временной меры'; +COMMENT ON COLUMN ervu_dashboard.temporary_measures.decision_number_cancel IS 'номер решения об отмене временной меры'; -COMMENT -ON COLUMN ervu_dashboard.temporary_measures.decision_date_create IS 'дата решения о применении временной меры'; +COMMENT ON COLUMN ervu_dashboard.temporary_measures.decision_date_create IS 'дата решения о применении временной меры'; -COMMENT -ON COLUMN ervu_dashboard.temporary_measures.decision_date_cancel IS 'дата решения об отмене временной меры'; +COMMENT ON COLUMN ervu_dashboard.temporary_measures.decision_date_cancel IS 'дата решения об отмене временной меры'; -COMMENT -ON COLUMN ervu_dashboard.temporary_measures.applied_fact IS 'факт применения временной меры'; +COMMENT ON COLUMN ervu_dashboard.temporary_measures.applied_fact IS 'факт применения временной меры'; +ALTER TABLE IF EXISTS ervu_dashboard.temporary_measures ALTER COLUMN temporary_measures_id ADD GENERATED BY DEFAULT AS IDENTITY ( + SEQUENCE NAME ervu_dashboard.temporary_measures_temporary_measures_id_seq + START WITH 2 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1 + ); -ALTER TABLE IF EXISTS ervu_dashboard.temporary_measures -ALTER -COLUMN temporary_measures_id ADD GENERATED BY DEFAULT AS IDENTITY - (SEQUENCE NAME ervu_dashboard.temporary_measures_temporary_measures_id_seq START WITH 2 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1); - - -ALTER TABLE IF EXISTS ervu_dashboard.recruitment -ALTER -COLUMN -SORT ADD GENERATED BY DEFAULT AS IDENTITY - (SEQUENCE NAME ervu_dashboard.testrecruitment_sort_seq START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1); - - -CREATE TABLE IF NOT EXISTS ervu_dashboard.work -( - work_id - bigint - NOT - NULL, - recruit_id - UUID - NOT - NULL, - employer_category - public - . - employer_category_type, - place - text, - organization_name - CHARACTER - varying -( - 100 -), - inn CHARACTER varying -( - 15 -), - kpp CHARACTER varying -( - 15 -), - ogrnip CHARACTER varying -( - 20 -), - "position" CHARACTER varying -( - 150 -), - event_type CHARACTER varying -( - 50 -), - event_date date); +ALTER TABLE IF EXISTS ervu_dashboard.recruitment ALTER COLUMN sort ADD GENERATED BY DEFAULT AS IDENTITY ( + SEQUENCE NAME ervu_dashboard.testrecruitment_sort_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1 + ); +CREATE TABLE IF NOT EXISTS ervu_dashboard.work ( + work_id bigint NOT NULL, + recruit_id uuid NOT NULL, + employer_category public.employer_category_type, + place text, + organization_name character varying(100), + inn character varying(15), + kpp character varying(15), + ogrnip character varying(20), + "position" character varying(150), + event_type character varying(50), + event_date date +); ALTER TABLE IF EXISTS ervu_dashboard.work OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE ervu_dashboard.work IS 'сведения об имуществе'; +COMMENT ON TABLE ervu_dashboard.work IS 'сведения об имуществе'; -COMMENT -ON COLUMN ervu_dashboard.work.recruit_id IS 'ссылка на гражданина (citizen)'; +COMMENT ON COLUMN ervu_dashboard.work.recruit_id IS 'ссылка на гражданина (citizen)'; -COMMENT -ON COLUMN ervu_dashboard.work.employer_category IS 'категория работодателя: юр лицо/ИП/физ лицо/глава КФХ'; +COMMENT ON COLUMN ervu_dashboard.work.employer_category IS 'категория работодателя: юр лицо/ИП/физ лицо/глава КФХ'; -COMMENT -ON COLUMN ervu_dashboard.work.place IS 'место работы'; +COMMENT ON COLUMN ervu_dashboard.work.place IS 'место работы'; -COMMENT -ON COLUMN ervu_dashboard.work.organization_name IS 'наименование организации'; +COMMENT ON COLUMN ervu_dashboard.work.organization_name IS 'наименование организации'; -COMMENT -ON COLUMN ervu_dashboard.work.inn IS 'ИНН'; +COMMENT ON COLUMN ervu_dashboard.work.inn IS 'ИНН'; -COMMENT -ON COLUMN ervu_dashboard.work.kpp IS 'КПП'; +COMMENT ON COLUMN ervu_dashboard.work.kpp IS 'КПП'; -COMMENT -ON COLUMN ervu_dashboard.work.ogrnip IS 'ОГРНИП'; +COMMENT ON COLUMN ervu_dashboard.work.ogrnip IS 'ОГРНИП'; -COMMENT -ON COLUMN ervu_dashboard.work."position" IS 'должность'; +COMMENT ON COLUMN ervu_dashboard.work."position" IS 'должность'; -COMMENT -ON COLUMN ervu_dashboard.work.event_type IS 'тип кадрового мероприятия '; - -COMMENT -ON COLUMN ervu_dashboard.work.event_date IS 'дата кадрового мероприятия'; +COMMENT ON COLUMN ervu_dashboard.work.event_type IS 'тип кадрового мероприятия '; +COMMENT ON COLUMN ervu_dashboard.work.event_date IS 'дата кадрового мероприятия'; CREATE SEQUENCE ervu_dashboard.work_work_id_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ervu_dashboard.work_work_id_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ervu_dashboard.work_work_id_seq OWNED BY ervu_dashboard.work.work_id; - -CREATE TABLE IF NOT EXISTS main_dashboard.appeals -( - total_appeals - numeric, - resolved - numeric, - average_consideration - numeric, - average_rating - numeric, - average_to_face - numeric, - "average_EPGU" - numeric, - recording_date - date - DEFAULT - NOW -( -) NOT NULL, - average_to_face_percent numeric, "average_EPGU_percent" numeric, recruitment_id CHARACTER -( - 36 -) NOT NULL, - id_appeal bigint NOT NULL); - +CREATE TABLE IF NOT EXISTS main_dashboard.appeals ( + total_appeals numeric, + resolved numeric, + average_consideration numeric, + average_rating numeric, + average_to_face numeric, + "average_EPGU" numeric, + recording_date date DEFAULT now() NOT NULL, + average_to_face_percent numeric, + "average_EPGU_percent" numeric, + recruitment_id character(36) NOT NULL, + id_appeal bigint NOT NULL +); ALTER TABLE IF EXISTS main_dashboard.appeals OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE main_dashboard.appeals IS 'Обжалования уровень РФ'; +COMMENT ON TABLE main_dashboard.appeals IS 'Обжалования уровень РФ'; -COMMENT -ON COLUMN main_dashboard.appeals.total_appeals IS 'Всего жалоб'; +COMMENT ON COLUMN main_dashboard.appeals.total_appeals IS 'Всего жалоб'; -COMMENT -ON COLUMN main_dashboard.appeals.resolved IS 'Количество решенных'; +COMMENT ON COLUMN main_dashboard.appeals.resolved IS 'Количество решенных'; -COMMENT -ON COLUMN main_dashboard.appeals.average_consideration IS 'Средний срок рассмотрения'; +COMMENT ON COLUMN main_dashboard.appeals.average_consideration IS 'Средний срок рассмотрения'; -COMMENT -ON COLUMN main_dashboard.appeals.average_rating IS 'Оценка удовлетворенности'; +COMMENT ON COLUMN main_dashboard.appeals.average_rating IS 'Оценка удовлетворенности'; -COMMENT -ON COLUMN main_dashboard.appeals.average_to_face IS 'Способ подачи жалоб очно'; +COMMENT ON COLUMN main_dashboard.appeals.average_to_face IS 'Способ подачи жалоб очно'; -COMMENT -ON COLUMN main_dashboard.appeals."average_EPGU" IS 'Способ подачи ЕПГУ'; +COMMENT ON COLUMN main_dashboard.appeals."average_EPGU" IS 'Способ подачи ЕПГУ'; -COMMENT -ON COLUMN main_dashboard.appeals.recording_date IS 'Дата записи'; +COMMENT ON COLUMN main_dashboard.appeals.recording_date IS 'Дата записи'; -COMMENT -ON COLUMN main_dashboard.appeals.average_to_face_percent IS 'Способ подачи жалоб очно в процентах'; - -COMMENT -ON COLUMN main_dashboard.appeals."average_EPGU_percent" IS 'Способ подачи ЕПГУ в процентах'; +COMMENT ON COLUMN main_dashboard.appeals.average_to_face_percent IS 'Способ подачи жалоб очно в процентах'; +COMMENT ON COLUMN main_dashboard.appeals."average_EPGU_percent" IS 'Способ подачи ЕПГУ в процентах'; CREATE SEQUENCE main_dashboard.appeals_id_appeal_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS main_dashboard.appeals_id_appeal_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE main_dashboard.appeals_id_appeal_seq OWNED BY main_dashboard.appeals.id_appeal; - -CREATE TABLE IF NOT EXISTS main_dashboard.recruitment_campaign -( - new_recruits - numeric, - subpoenas_sent - numeric, - appeared_on_subpoenas - numeric, - not_appeared_on_subpoenas - numeric, - postponement_have_right - numeric, - postponement_granted - numeric, - recording_date - date - DEFAULT - NOW -( -) NOT NULL, - appeared_on_subpoenas_percent numeric, not_appeared_on_subpoenas_percent numeric, postponement_have_right_percent numeric, postponement_granted_percent numeric, recruitment_id CHARACTER -( - 36 -) NOT NULL, - spring_autumn CHARACTER -( - 36 -) NOT NULL, - id_recruitment_campaign bigint NOT NULL); - +CREATE TABLE IF NOT EXISTS main_dashboard.recruitment_campaign ( + new_recruits numeric, + subpoenas_sent numeric, + appeared_on_subpoenas numeric, + not_appeared_on_subpoenas numeric, + postponement_have_right numeric, + postponement_granted numeric, + recording_date date DEFAULT now() NOT NULL, + appeared_on_subpoenas_percent numeric, + not_appeared_on_subpoenas_percent numeric, + postponement_have_right_percent numeric, + postponement_granted_percent numeric, + recruitment_id character(36) NOT NULL, + spring_autumn character(36) NOT NULL, + id_recruitment_campaign bigint NOT NULL +); ALTER TABLE IF EXISTS main_dashboard.recruitment_campaign OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE main_dashboard.recruitment_campaign IS 'Призывная кампания уровень РФ'; +COMMENT ON TABLE main_dashboard.recruitment_campaign IS 'Призывная кампания уровень РФ'; -COMMENT -ON COLUMN main_dashboard.recruitment_campaign.new_recruits IS 'Подпадающие под призыв'; +COMMENT ON COLUMN main_dashboard.recruitment_campaign.new_recruits IS 'Подпадающие под призыв'; -COMMENT -ON COLUMN main_dashboard.recruitment_campaign.subpoenas_sent IS 'Направлено повесток'; +COMMENT ON COLUMN main_dashboard.recruitment_campaign.subpoenas_sent IS 'Направлено повесток'; -COMMENT -ON COLUMN main_dashboard.recruitment_campaign.appeared_on_subpoenas IS 'Явились по повесткам'; +COMMENT ON COLUMN main_dashboard.recruitment_campaign.appeared_on_subpoenas IS 'Явились по повесткам'; -COMMENT -ON COLUMN main_dashboard.recruitment_campaign.not_appeared_on_subpoenas IS 'Не явились по повесткам'; +COMMENT ON COLUMN main_dashboard.recruitment_campaign.not_appeared_on_subpoenas IS 'Не явились по повесткам'; -COMMENT -ON COLUMN main_dashboard.recruitment_campaign.postponement_have_right IS 'Имеют право на отсрочку'; +COMMENT ON COLUMN main_dashboard.recruitment_campaign.postponement_have_right IS 'Имеют право на отсрочку'; -COMMENT -ON COLUMN main_dashboard.recruitment_campaign.postponement_granted IS 'Предоставлена отсрочка'; +COMMENT ON COLUMN main_dashboard.recruitment_campaign.postponement_granted IS 'Предоставлена отсрочка'; -COMMENT -ON COLUMN main_dashboard.recruitment_campaign.recording_date IS 'Дата записи'; +COMMENT ON COLUMN main_dashboard.recruitment_campaign.recording_date IS 'Дата записи'; -COMMENT -ON COLUMN main_dashboard.recruitment_campaign.appeared_on_subpoenas_percent IS 'Явились по повесткам процент'; +COMMENT ON COLUMN main_dashboard.recruitment_campaign.appeared_on_subpoenas_percent IS 'Явились по повесткам процент'; -COMMENT -ON COLUMN main_dashboard.recruitment_campaign.not_appeared_on_subpoenas_percent IS 'Не явились по повесткам процент'; +COMMENT ON COLUMN main_dashboard.recruitment_campaign.not_appeared_on_subpoenas_percent IS 'Не явились по повесткам процент'; -COMMENT -ON COLUMN main_dashboard.recruitment_campaign.postponement_have_right_percent IS 'Имеют право на отсрочку процент'; - -COMMENT -ON COLUMN main_dashboard.recruitment_campaign.postponement_granted_percent IS 'Предоставлена отсрочка процент'; +COMMENT ON COLUMN main_dashboard.recruitment_campaign.postponement_have_right_percent IS 'Имеют право на отсрочку процент'; +COMMENT ON COLUMN main_dashboard.recruitment_campaign.postponement_granted_percent IS 'Предоставлена отсрочка процент'; CREATE SEQUENCE main_dashboard.recruitment_campaign_id_recruitment_campaign_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS main_dashboard.recruitment_campaign_id_recruitment_campaign_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE main_dashboard.recruitment_campaign_id_recruitment_campaign_seq OWNED BY main_dashboard.recruitment_campaign.id_recruitment_campaign; - -CREATE TABLE IF NOT EXISTS main_dashboard.total_registered -( - total_registered - numeric, - "total_registered_M" - numeric, - "total_registered_W" - numeric, - mobilization_criterion - numeric, - volunteer_criterion - numeric, - contract_criterion - numeric, - recording_date - date - DEFAULT - NOW -( -) NOT NULL, - mobilization_criterion_percent numeric, volunteer_criterion_percent numeric, contract_criterion_percent numeric, recruitment_id CHARACTER -( - 36 -) NOT NULL, - id_total_registered bigint NOT NULL); - +CREATE TABLE IF NOT EXISTS main_dashboard.total_registered ( + total_registered numeric, + "total_registered_M" numeric, + "total_registered_W" numeric, + mobilization_criterion numeric, + volunteer_criterion numeric, + contract_criterion numeric, + recording_date date DEFAULT now() NOT NULL, + mobilization_criterion_percent numeric, + volunteer_criterion_percent numeric, + contract_criterion_percent numeric, + recruitment_id character(36) NOT NULL, + id_total_registered bigint NOT NULL +); ALTER TABLE IF EXISTS main_dashboard.total_registered OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE main_dashboard.total_registered IS 'Всего на учете уровень РФ'; +COMMENT ON TABLE main_dashboard.total_registered IS 'Всего на учете уровень РФ'; -COMMENT -ON COLUMN main_dashboard.total_registered.total_registered IS 'Всего состоят на учете'; +COMMENT ON COLUMN main_dashboard.total_registered.total_registered IS 'Всего состоят на учете'; -COMMENT -ON COLUMN main_dashboard.total_registered."total_registered_M" IS 'Всего на учете мужчин'; +COMMENT ON COLUMN main_dashboard.total_registered."total_registered_M" IS 'Всего на учете мужчин'; -COMMENT -ON COLUMN main_dashboard.total_registered."total_registered_W" IS 'Всего на учете женщин'; +COMMENT ON COLUMN main_dashboard.total_registered."total_registered_W" IS 'Всего на учете женщин'; -COMMENT -ON COLUMN main_dashboard.total_registered.mobilization_criterion IS 'Количество подходящих под критерии мобилизации'; +COMMENT ON COLUMN main_dashboard.total_registered.mobilization_criterion IS 'Количество подходящих под критерии мобилизации'; -COMMENT -ON COLUMN main_dashboard.total_registered.volunteer_criterion IS 'Количество подходящих под критерии добровольной службы'; +COMMENT ON COLUMN main_dashboard.total_registered.volunteer_criterion IS 'Количество подходящих под критерии добровольной службы'; -COMMENT -ON COLUMN main_dashboard.total_registered.contract_criterion IS 'Количество подходящих под критерии контрактной службы'; +COMMENT ON COLUMN main_dashboard.total_registered.contract_criterion IS 'Количество подходящих под критерии контрактной службы'; -COMMENT -ON COLUMN main_dashboard.total_registered.recording_date IS 'дата записи'; +COMMENT ON COLUMN main_dashboard.total_registered.recording_date IS 'дата записи'; -COMMENT -ON COLUMN main_dashboard.total_registered.mobilization_criterion_percent IS 'Процент подходящих под критерии мобилизации'; +COMMENT ON COLUMN main_dashboard.total_registered.mobilization_criterion_percent IS 'Процент подходящих под критерии мобилизации'; -COMMENT -ON COLUMN main_dashboard.total_registered.volunteer_criterion_percent IS 'Процент подходящих под критерии добровольной службы'; - -COMMENT -ON COLUMN main_dashboard.total_registered.contract_criterion_percent IS 'Процент подходящих под критерии контрактрой службы'; +COMMENT ON COLUMN main_dashboard.total_registered.volunteer_criterion_percent IS 'Процент подходящих под критерии добровольной службы'; +COMMENT ON COLUMN main_dashboard.total_registered.contract_criterion_percent IS 'Процент подходящих под критерии контрактрой службы'; CREATE SEQUENCE main_dashboard.total_registered_id_total_registered_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS main_dashboard.total_registered_id_total_registered_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE main_dashboard.total_registered_id_total_registered_seq OWNED BY main_dashboard.total_registered.id_total_registered; - -CREATE TABLE IF NOT EXISTS main_dashboard.waiting_registration -( - waiting_registration - numeric, - "waiting_registration_M" - numeric, - "waiting_registration_W" - numeric, - mobilization_criterion - numeric, - volunteer_criterion - numeric, - contract_criterion - numeric, - recording_date - date - DEFAULT - NOW -( -) NOT NULL, - waiting_registration_percent numeric, mobilization_criterion_percent numeric, volunteer_criterion_percent numeric, contract_criterion_percent numeric, recruitment_id CHARACTER -( - 36 -) NOT NULL, - id_waiting_registration bigint NOT NULL); - +CREATE TABLE IF NOT EXISTS main_dashboard.waiting_registration ( + waiting_registration numeric, + "waiting_registration_M" numeric, + "waiting_registration_W" numeric, + mobilization_criterion numeric, + volunteer_criterion numeric, + contract_criterion numeric, + recording_date date DEFAULT now() NOT NULL, + waiting_registration_percent numeric, + mobilization_criterion_percent numeric, + volunteer_criterion_percent numeric, + contract_criterion_percent numeric, + recruitment_id character(36) NOT NULL, + id_waiting_registration bigint NOT NULL +); ALTER TABLE IF EXISTS main_dashboard.waiting_registration OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE main_dashboard.waiting_registration IS 'Подлежат постановке на учет уровень РФ'; +COMMENT ON TABLE main_dashboard.waiting_registration IS 'Подлежат постановке на учет уровень РФ'; -COMMENT -ON COLUMN main_dashboard.waiting_registration.waiting_registration IS 'Всего подлежат постановке на учет'; +COMMENT ON COLUMN main_dashboard.waiting_registration.waiting_registration IS 'Всего подлежат постановке на учет'; -COMMENT -ON COLUMN main_dashboard.waiting_registration."waiting_registration_M" IS 'Подлежат постановке мужчины'; +COMMENT ON COLUMN main_dashboard.waiting_registration."waiting_registration_M" IS 'Подлежат постановке мужчины'; -COMMENT -ON COLUMN main_dashboard.waiting_registration."waiting_registration_W" IS 'Подлежат постановке женщины'; +COMMENT ON COLUMN main_dashboard.waiting_registration."waiting_registration_W" IS 'Подлежат постановке женщины'; -COMMENT -ON COLUMN main_dashboard.waiting_registration.mobilization_criterion IS 'Количество подлежащих под критерии мобилизации'; +COMMENT ON COLUMN main_dashboard.waiting_registration.mobilization_criterion IS 'Количество подлежащих под критерии мобилизации'; -COMMENT -ON COLUMN main_dashboard.waiting_registration.volunteer_criterion IS 'Количество подлежащих под критерии добровольной службы'; +COMMENT ON COLUMN main_dashboard.waiting_registration.volunteer_criterion IS 'Количество подлежащих под критерии добровольной службы'; -COMMENT -ON COLUMN main_dashboard.waiting_registration.contract_criterion IS 'Количество подлежащих под критерии контрактной службы'; +COMMENT ON COLUMN main_dashboard.waiting_registration.contract_criterion IS 'Количество подлежащих под критерии контрактной службы'; -COMMENT -ON COLUMN main_dashboard.waiting_registration.recording_date IS 'Дата записи'; +COMMENT ON COLUMN main_dashboard.waiting_registration.recording_date IS 'Дата записи'; -COMMENT -ON COLUMN main_dashboard.waiting_registration.waiting_registration_percent IS 'Всего подлежат постановке процент'; +COMMENT ON COLUMN main_dashboard.waiting_registration.waiting_registration_percent IS 'Всего подлежат постановке процент'; -COMMENT -ON COLUMN main_dashboard.waiting_registration.mobilization_criterion_percent IS 'Процент подлежащих под критерии мобилизации'; +COMMENT ON COLUMN main_dashboard.waiting_registration.mobilization_criterion_percent IS 'Процент подлежащих под критерии мобилизации'; -COMMENT -ON COLUMN main_dashboard.waiting_registration.volunteer_criterion_percent IS 'Процент подлежащих под критерии добровольной службы'; - -COMMENT -ON COLUMN main_dashboard.waiting_registration.contract_criterion_percent IS 'Процент подлежащих под критерии контрактной службы'; +COMMENT ON COLUMN main_dashboard.waiting_registration.volunteer_criterion_percent IS 'Процент подлежащих под критерии добровольной службы'; +COMMENT ON COLUMN main_dashboard.waiting_registration.contract_criterion_percent IS 'Процент подлежащих под критерии контрактной службы'; CREATE SEQUENCE main_dashboard.waiting_registration_id_waiting_registration_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS main_dashboard.waiting_registration_id_waiting_registration_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE main_dashboard.waiting_registration_id_waiting_registration_seq OWNED BY main_dashboard.waiting_registration.id_waiting_registration; +CREATE TABLE IF NOT EXISTS public.channel_log ( + id_batch bigint, + channel_id character(36), + log_date date, + logging_object_type character varying, + object_name character varying, + object_copy character varying, + repository_directory character varying, + filename character varying, + object_id character(36), + object_version character varying, + object_revision character varying, + parent_channel_id character(36), + root_channel_id character(36) +); -CREATE TABLE IF NOT EXISTS public.channel_log -( - id_batch - bigint, - channel_id - CHARACTER -( - 36 -), log_date date, logging_object_type CHARACTER varying, object_name CHARACTER varying, object_copy CHARACTER varying, repository_directory CHARACTER varying, filename CHARACTER varying, object_id CHARACTER -( - 36 -), object_version CHARACTER varying, object_revision CHARACTER varying, parent_channel_id CHARACTER -( - 36 -), root_channel_id CHARACTER -( - 36 -)); - - -CREATE TABLE IF NOT EXISTS public.job_entry_log -( - id_batch - bigint, - channel_id - CHARACTER -( - 36 -), log_date date, transname CHARACTER varying, stepname CHARACTER varying, lines_read CHARACTER varying, lines_written CHARACTER varying, lines_updated CHARACTER varying, lines_input CHARACTER varying, lines_output CHARACTER varying, lines_rejected CHARACTER varying, errors CHARACTER varying, "RESULT" CHARACTER varying, nr_result_rows CHARACTER varying, nr_result_files CHARACTER varying); - +CREATE TABLE IF NOT EXISTS public.job_entry_log ( + id_batch bigint, + channel_id character(36), + log_date date, + transname character varying, + stepname character varying, + lines_read character varying, + lines_written character varying, + lines_updated character varying, + lines_input character varying, + lines_output character varying, + lines_rejected character varying, + errors character varying, + "RESULT" character varying, + nr_result_rows character varying, + nr_result_files character varying +); ALTER TABLE IF EXISTS public.job_entry_log OWNER TO "ervu-dashboard"; - -CREATE TABLE IF NOT EXISTS public.job_log -( - jobname - text, - status - text, - enddate - timestamp - WITH - TIME - ZONE, - depdate - timestamp - WITH - TIME - ZONE, - startdate - timestamp - WITH - TIME - ZONE, - logdate - timestamp - WITH - TIME - ZONE, - channel_id - CHARACTER - varying, - id_job - bigint - NOT - NULL, - replaydate - timestamp - WITH - TIME - ZONE, - log_field - CHARACTER - varying, - errors - integer, - lines_rejected - integer, - lines_updated - integer, - lines_input - integer, - lines_output - integer, - lines_written - integer, - lines_read - integer +CREATE TABLE IF NOT EXISTS public.job_log ( + jobname text, + status text, + enddate timestamp with time zone, + depdate timestamp with time zone, + startdate timestamp with time zone, + logdate timestamp with time zone, + channel_id character varying, + id_job bigint NOT NULL, + replaydate timestamp with time zone, + log_field character varying, + errors integer, + lines_rejected integer, + lines_updated integer, + lines_input integer, + lines_output integer, + lines_written integer, + lines_read integer ); - ALTER TABLE IF EXISTS public.job_log OWNER TO "ervu-dashboard"; - CREATE SEQUENCE public.job_log_id_job_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS public.job_log_id_job_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE public.job_log_id_job_seq OWNED BY public.job_log.id_job; - -CREATE TABLE IF NOT EXISTS public.last_recording_date -( - last_recording_date - date - DEFAULT - NOW -( -), entry text); - +CREATE TABLE IF NOT EXISTS public.last_recording_date ( + last_recording_date date DEFAULT now(), + entry text +); ALTER TABLE IF EXISTS public.last_recording_date OWNER TO "ervu-dashboard"; - -CREATE TABLE IF NOT EXISTS ratings.appear_subppoena -( - id_appear_subppoena - bigint - NOT - NULL, - id_region - integer, - appear_mil_com - numeric, - recording_date - date, - appear_mil_com_percent - numeric, - recruitment_id - CHARACTER -( - 36 -)); - +CREATE TABLE IF NOT EXISTS ratings.appear_subppoena ( + id_appear_subppoena bigint NOT NULL, + id_region integer, + appear_mil_com numeric, + recording_date date, + appear_mil_com_percent numeric, + recruitment_id character(36) +); ALTER TABLE IF EXISTS ratings.appear_subppoena OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE ratings.appear_subppoena IS 'Явка по повестке уровень РФ'; +COMMENT ON TABLE ratings.appear_subppoena IS 'Явка по повестке уровень РФ'; -COMMENT -ON COLUMN ratings.appear_subppoena.appear_mil_com IS 'Явка в военкомат'; +COMMENT ON COLUMN ratings.appear_subppoena.appear_mil_com IS 'Явка в военкомат'; -COMMENT -ON COLUMN ratings.appear_subppoena.recording_date IS 'Дата записи'; - -COMMENT -ON COLUMN ratings.appear_subppoena.appear_mil_com_percent IS 'Явка в военкомат в процентах'; +COMMENT ON COLUMN ratings.appear_subppoena.recording_date IS 'Дата записи'; +COMMENT ON COLUMN ratings.appear_subppoena.appear_mil_com_percent IS 'Явка в военкомат в процентах'; CREATE SEQUENCE ratings.appear_subppoena_id_appear_subppoena_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ratings.appear_subppoena_id_appear_subppoena_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ratings.appear_subppoena_id_appear_subppoena_seq OWNED BY ratings.appear_subppoena.id_appear_subppoena; - CREATE SEQUENCE ratings."ratings.conscription_info_id_ratings.conscription_info_seq" - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ratings."ratings.conscription_info_id_ratings.conscription_info_seq" OWNER TO "ervu-dashboard"; - -CREATE TABLE IF NOT EXISTS ratings.conscription_info -( - conscription_info_id - bigint - DEFAULT - nextval -( - 'ratings."ratings.conscription_info_id_ratings.conscription_info_seq"' - : - : - regclass -) NOT NULL, - id_region integer, execution numeric, spring_autumn text, recording_date date, execution_percent numeric, recruitment_id CHARACTER -( - 36 -)); - +CREATE TABLE IF NOT EXISTS ratings.conscription_info ( + conscription_info_id bigint DEFAULT nextval('ratings."ratings.conscription_info_id_ratings.conscription_info_seq"'::regclass) NOT NULL, + id_region integer, + execution numeric, + spring_autumn text, + recording_date date, + execution_percent numeric, + recruitment_id character(36) +); ALTER TABLE IF EXISTS ratings.conscription_info OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE ratings.conscription_info IS 'Призыв уровень РФ'; +COMMENT ON TABLE ratings.conscription_info IS 'Призыв уровень РФ'; -COMMENT -ON COLUMN ratings.conscription_info.execution IS 'Исполнение плана призыва'; +COMMENT ON COLUMN ratings.conscription_info.execution IS 'Исполнение плана призыва'; -COMMENT -ON COLUMN ratings.conscription_info.spring_autumn IS 'Осень/весна'; +COMMENT ON COLUMN ratings.conscription_info.spring_autumn IS 'Осень/весна'; -COMMENT -ON COLUMN ratings.conscription_info.recording_date IS 'Дата записи'; +COMMENT ON COLUMN ratings.conscription_info.recording_date IS 'Дата записи'; -COMMENT -ON COLUMN ratings.conscription_info.execution_percent IS 'Исолнение плана призыва в процентах'; - - -CREATE TABLE IF NOT EXISTS ratings.consideration_complaint -( - id_consideration_complaint - bigint - NOT - NULL, - id_region - integer, - consideration_complaint - numeric, - recording_date - date, - consideration_complaint_percent - numeric, - recruitment_id - CHARACTER -( - 36 -)); +COMMENT ON COLUMN ratings.conscription_info.execution_percent IS 'Исолнение плана призыва в процентах'; +CREATE TABLE IF NOT EXISTS ratings.consideration_complaint ( + id_consideration_complaint bigint NOT NULL, + id_region integer, + consideration_complaint numeric, + recording_date date, + consideration_complaint_percent numeric, + recruitment_id character(36) +); ALTER TABLE IF EXISTS ratings.consideration_complaint OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE ratings.consideration_complaint IS 'Рассмотрение жалоб уровень РФ'; +COMMENT ON TABLE ratings.consideration_complaint IS 'Рассмотрение жалоб уровень РФ'; -COMMENT -ON COLUMN ratings.consideration_complaint.consideration_complaint IS 'Рассмотрение жалоб'; +COMMENT ON COLUMN ratings.consideration_complaint.consideration_complaint IS 'Рассмотрение жалоб'; -COMMENT -ON COLUMN ratings.consideration_complaint.recording_date IS 'Дата записи'; - -COMMENT -ON COLUMN ratings.consideration_complaint.consideration_complaint_percent IS 'Рассмотрение жалоб в процентах'; +COMMENT ON COLUMN ratings.consideration_complaint.recording_date IS 'Дата записи'; +COMMENT ON COLUMN ratings.consideration_complaint.consideration_complaint_percent IS 'Рассмотрение жалоб в процентах'; CREATE SEQUENCE ratings.consideration_complaint_id_consideration_complaint_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS ratings.consideration_complaint_id_consideration_complaint_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE ratings.consideration_complaint_id_consideration_complaint_seq OWNED BY ratings.consideration_complaint.id_consideration_complaint; - -CREATE TABLE IF NOT EXISTS recruitment_campaign.appeals -( - total_appeals - numeric, - resolved - numeric, - not_resolved - numeric, - average_consideration - numeric, - average_rating - numeric, - recording_date - date - DEFAULT - NOW -( -) NOT NULL, - resolved_percent numeric, not_resolved_percent numeric, recruitment_id CHARACTER -( - 36 -) NOT NULL, - spring_autumn CHARACTER varying NOT NULL); - +CREATE TABLE IF NOT EXISTS recruitment_campaign.appeals ( + total_appeals numeric, + resolved numeric, + not_resolved numeric, + average_consideration numeric, + average_rating numeric, + recording_date date DEFAULT now() NOT NULL, + resolved_percent numeric, + not_resolved_percent numeric, + recruitment_id character(36) NOT NULL, + spring_autumn character varying NOT NULL +); ALTER TABLE IF EXISTS recruitment_campaign.appeals OWNER TO "ervu-dashboard"; -COMMENT -ON COLUMN recruitment_campaign.appeals.total_appeals IS 'Получено жалоб'; +COMMENT ON COLUMN recruitment_campaign.appeals.total_appeals IS 'Получено жалоб'; -COMMENT -ON COLUMN recruitment_campaign.appeals.resolved IS 'Решено'; +COMMENT ON COLUMN recruitment_campaign.appeals.resolved IS 'Решено'; -COMMENT -ON COLUMN recruitment_campaign.appeals.not_resolved IS 'Не решено'; +COMMENT ON COLUMN recruitment_campaign.appeals.not_resolved IS 'Не решено'; -COMMENT -ON COLUMN recruitment_campaign.appeals.average_consideration IS 'Время решения'; +COMMENT ON COLUMN recruitment_campaign.appeals.average_consideration IS 'Время решения'; -COMMENT -ON COLUMN recruitment_campaign.appeals.average_rating IS 'Оценка удовлетворенности'; +COMMENT ON COLUMN recruitment_campaign.appeals.average_rating IS 'Оценка удовлетворенности'; -COMMENT -ON COLUMN recruitment_campaign.appeals.recording_date IS 'Дата записи'; +COMMENT ON COLUMN recruitment_campaign.appeals.recording_date IS 'Дата записи'; -COMMENT -ON COLUMN recruitment_campaign.appeals.resolved_percent IS 'Процент решенных'; +COMMENT ON COLUMN recruitment_campaign.appeals.resolved_percent IS 'Процент решенных'; -COMMENT -ON COLUMN recruitment_campaign.appeals.not_resolved_percent IS 'Процент не решенных'; - - -CREATE TABLE IF NOT EXISTS recruitment_campaign.postponement_info -( - postponement_info_id - bigint - NOT - NULL, - suitable_recruit - numeric, - postponement_have_right - numeric, - postponement_granted - numeric, - recording_date - date - DEFAULT - NOW -( -), postponement_have_right_percent numeric, postponement_granted_percent numeric, recruitment_id CHARACTER -( - 36 -), testspring_autumn CHARACTER -( - 36 -)); +COMMENT ON COLUMN recruitment_campaign.appeals.not_resolved_percent IS 'Процент не решенных'; +CREATE TABLE IF NOT EXISTS recruitment_campaign.postponement_info ( + postponement_info_id bigint NOT NULL, + suitable_recruit numeric, + postponement_have_right numeric, + postponement_granted numeric, + recording_date date DEFAULT now(), + postponement_have_right_percent numeric, + postponement_granted_percent numeric, + recruitment_id character(36), + testspring_autumn character(36) +); ALTER TABLE IF EXISTS recruitment_campaign.postponement_info OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE recruitment_campaign.postponement_info IS 'статистика по отсрочке и призывам'; +COMMENT ON TABLE recruitment_campaign.postponement_info IS 'статистика по отсрочке и призывам'; -COMMENT -ON COLUMN recruitment_campaign.postponement_info.suitable_recruit IS 'Подходят под призыв'; +COMMENT ON COLUMN recruitment_campaign.postponement_info.suitable_recruit IS 'Подходят под призыв'; -COMMENT -ON COLUMN recruitment_campaign.postponement_info.postponement_have_right IS 'Имеют право на отсрочку'; +COMMENT ON COLUMN recruitment_campaign.postponement_info.postponement_have_right IS 'Имеют право на отсрочку'; -COMMENT -ON COLUMN recruitment_campaign.postponement_info.postponement_granted IS 'Предоставлена отсрочка'; +COMMENT ON COLUMN recruitment_campaign.postponement_info.postponement_granted IS 'Предоставлена отсрочка'; -COMMENT -ON COLUMN recruitment_campaign.postponement_info.recording_date IS 'Дата записи'; +COMMENT ON COLUMN recruitment_campaign.postponement_info.recording_date IS 'Дата записи'; -COMMENT -ON COLUMN recruitment_campaign.postponement_info.postponement_have_right_percent IS 'Процент имеющих право на отсрочку'; - -COMMENT -ON COLUMN recruitment_campaign.postponement_info.postponement_granted_percent IS 'Процент предоставленных отсрочек'; +COMMENT ON COLUMN recruitment_campaign.postponement_info.postponement_have_right_percent IS 'Процент имеющих право на отсрочку'; +COMMENT ON COLUMN recruitment_campaign.postponement_info.postponement_granted_percent IS 'Процент предоставленных отсрочек'; CREATE SEQUENCE recruitment_campaign.recruitment_id_recruitment_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS recruitment_campaign.recruitment_id_recruitment_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE recruitment_campaign.recruitment_id_recruitment_seq OWNED BY recruitment_campaign.postponement_info.postponement_info_id; - -CREATE TABLE IF NOT EXISTS recruitment_campaign.subpoenas -( - subpoena - numeric, - appeared - numeric, - not_appeared - numeric, - not_ap_good_reason - numeric, - ap_not_required - numeric, - restrictions_applied - numeric, - recording_date - date - DEFAULT - NOW -( -) NOT NULL, - appeared_percent numeric, not_appeared_percent numeric, not_ap_good_reason_percent numeric, ap_not_required_percent numeric, restrictions_applied_percent numeric, introduced_measures numeric, introduced_measures_percent numeric, recruitment_id CHARACTER -( - 36 -) NOT NULL, - rest numeric, spring_autumn CHARACTER -( - 36 -) NOT NULL, +CREATE TABLE IF NOT EXISTS recruitment_campaign.subpoenas ( + subpoena numeric, + appeared numeric, + not_appeared numeric, + not_ap_good_reason numeric, + ap_not_required numeric, + restrictions_applied numeric, + recording_date date DEFAULT now() NOT NULL, + appeared_percent numeric, + not_appeared_percent numeric, + not_ap_good_reason_percent numeric, + ap_not_required_percent numeric, + restrictions_applied_percent numeric, + introduced_measures numeric, + introduced_measures_percent numeric, + recruitment_id character(36) NOT NULL, + rest numeric, + spring_autumn character(36) NOT NULL, id_subpoena bigint NOT NULL, - count_not_delivery numeric, appear_date_is_good numeric, not_delivery_percent numeric, appear_date_is_good_percent numeric); - + count_not_delivery numeric, + appear_date_is_good numeric, + not_delivery_percent numeric, + appear_date_is_good_percent numeric +); ALTER TABLE IF EXISTS recruitment_campaign.subpoenas OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE recruitment_campaign.subpoenas IS 'Повестки уровень РФ'; +COMMENT ON TABLE recruitment_campaign.subpoenas IS 'Повестки уровень РФ'; -COMMENT -ON COLUMN recruitment_campaign.subpoenas.subpoena IS 'Направлено повесток'; +COMMENT ON COLUMN recruitment_campaign.subpoenas.subpoena IS 'Направлено повесток'; -COMMENT -ON COLUMN recruitment_campaign.subpoenas.appeared IS 'Явились'; +COMMENT ON COLUMN recruitment_campaign.subpoenas.appeared IS 'Явились'; -COMMENT -ON COLUMN recruitment_campaign.subpoenas.not_appeared IS 'Не явились'; +COMMENT ON COLUMN recruitment_campaign.subpoenas.not_appeared IS 'Не явились'; -COMMENT -ON COLUMN recruitment_campaign.subpoenas.not_ap_good_reason IS 'Не явились по уважительной причине'; +COMMENT ON COLUMN recruitment_campaign.subpoenas.not_ap_good_reason IS 'Не явились по уважительной причине'; -COMMENT -ON COLUMN recruitment_campaign.subpoenas.ap_not_required IS 'Явка не требуется'; +COMMENT ON COLUMN recruitment_campaign.subpoenas.ap_not_required IS 'Явка не требуется'; -COMMENT -ON COLUMN recruitment_campaign.subpoenas.restrictions_applied IS 'Наложено ограничений'; +COMMENT ON COLUMN recruitment_campaign.subpoenas.restrictions_applied IS 'Наложено ограничений'; -COMMENT -ON COLUMN recruitment_campaign.subpoenas.recording_date IS 'Дата записи'; +COMMENT ON COLUMN recruitment_campaign.subpoenas.recording_date IS 'Дата записи'; -COMMENT -ON COLUMN recruitment_campaign.subpoenas.appeared_percent IS 'Процент явившихся'; +COMMENT ON COLUMN recruitment_campaign.subpoenas.appeared_percent IS 'Процент явившихся'; -COMMENT -ON COLUMN recruitment_campaign.subpoenas.not_appeared_percent IS 'Процент не явившихся'; +COMMENT ON COLUMN recruitment_campaign.subpoenas.not_appeared_percent IS 'Процент не явившихся'; -COMMENT -ON COLUMN recruitment_campaign.subpoenas.not_ap_good_reason_percent IS 'Процент не явившихся по уважительной причине'; +COMMENT ON COLUMN recruitment_campaign.subpoenas.not_ap_good_reason_percent IS 'Процент не явившихся по уважительной причине'; -COMMENT -ON COLUMN recruitment_campaign.subpoenas.ap_not_required_percent IS 'Процент тех, где явка не требуется'; +COMMENT ON COLUMN recruitment_campaign.subpoenas.ap_not_required_percent IS 'Процент тех, где явка не требуется'; -COMMENT -ON COLUMN recruitment_campaign.subpoenas.restrictions_applied_percent IS 'Наложено ограничений'; +COMMENT ON COLUMN recruitment_campaign.subpoenas.restrictions_applied_percent IS 'Наложено ограничений'; -COMMENT -ON COLUMN recruitment_campaign.subpoenas.introduced_measures IS 'Введено реализатором мер'; +COMMENT ON COLUMN recruitment_campaign.subpoenas.introduced_measures IS 'Введено реализатором мер'; -COMMENT -ON COLUMN recruitment_campaign.subpoenas.introduced_measures_percent IS 'Процент введенных реализатором мер'; +COMMENT ON COLUMN recruitment_campaign.subpoenas.introduced_measures_percent IS 'Процент введенных реализатором мер'; -COMMENT -ON COLUMN recruitment_campaign.subpoenas.rest IS 'Остальные'; +COMMENT ON COLUMN recruitment_campaign.subpoenas.rest IS 'Остальные'; -COMMENT -ON COLUMN recruitment_campaign.subpoenas.appear_date_is_good IS 'Повестки, дата явки по которым еще не наступила'; +COMMENT ON COLUMN recruitment_campaign.subpoenas.appear_date_is_good IS 'Повестки, дата явки по которым еще не наступила'; -COMMENT -ON COLUMN recruitment_campaign.subpoenas.not_delivery_percent IS 'Процент не врученных повесток'; - -COMMENT -ON COLUMN recruitment_campaign.subpoenas.appear_date_is_good_percent IS 'Процент повесток, по которым дата явки еще не наступила'; +COMMENT ON COLUMN recruitment_campaign.subpoenas.not_delivery_percent IS 'Процент не врученных повесток'; +COMMENT ON COLUMN recruitment_campaign.subpoenas.appear_date_is_good_percent IS 'Процент повесток, по которым дата явки еще не наступила'; CREATE SEQUENCE recruitment_campaign.subpoenas_id_subpoena_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS recruitment_campaign.subpoenas_id_subpoena_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE recruitment_campaign.subpoenas_id_subpoena_seq OWNED BY recruitment_campaign.subpoenas.id_subpoena; - -CREATE TABLE IF NOT EXISTS space.military_commissariat -( - id_military_commissariat - bigint - NOT - NULL, - military_commissariat_name - text +CREATE TABLE IF NOT EXISTS space.military_commissariat ( + id_military_commissariat bigint NOT NULL, + military_commissariat_name text ); - ALTER TABLE IF EXISTS space.military_commissariat OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE space.military_commissariat IS 'Военные комиссариаты'; - -COMMENT -ON COLUMN space.military_commissariat.military_commissariat_name IS 'Наименование военного комиссариата'; +COMMENT ON TABLE space.military_commissariat IS 'Военные комиссариаты'; +COMMENT ON COLUMN space.military_commissariat.military_commissariat_name IS 'Наименование военного комиссариата'; CREATE SEQUENCE space.military_commissariat_id_military_commissariat_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS space.military_commissariat_id_military_commissariat_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE space.military_commissariat_id_military_commissariat_seq OWNED BY space.military_commissariat.id_military_commissariat; - -CREATE TABLE IF NOT EXISTS space.military_district -( - id_military_district - bigint - NOT - NULL, - military_district_name - text +CREATE TABLE IF NOT EXISTS space.military_district ( + id_military_district bigint NOT NULL, + military_district_name text ); - ALTER TABLE IF EXISTS space.military_district OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE space.military_district IS 'Военные округа'; - -COMMENT -ON COLUMN space.military_district.military_district_name IS 'Наименование военного округа'; +COMMENT ON TABLE space.military_district IS 'Военные округа'; +COMMENT ON COLUMN space.military_district.military_district_name IS 'Наименование военного округа'; CREATE SEQUENCE space.military_district_id_military_district_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS space.military_district_id_military_district_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE space.military_district_id_military_district_seq OWNED BY space.military_district.id_military_district; - -CREATE TABLE IF NOT EXISTS space.region -( - id_region - bigint - NOT - NULL, - region - text +CREATE TABLE IF NOT EXISTS space.region ( + id_region bigint NOT NULL, + region text ); - ALTER TABLE IF EXISTS space.region OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE space.region IS 'Регионы'; - -COMMENT -ON COLUMN space.region.region IS 'Наименование региона'; +COMMENT ON TABLE space.region IS 'Регионы'; +COMMENT ON COLUMN space.region.region IS 'Наименование региона'; CREATE SEQUENCE space.region_id_region_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS space.region_id_region_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE space.region_id_region_seq OWNED BY space.region.id_region; - -CREATE TABLE IF NOT EXISTS space.testrecruitment -( - id - CHARACTER -( - 36 -) NOT NULL, - shortname CHARACTER -( - 300 -), idm_id CHARACTER varying -( - 36 -), - code CHARACTER -( - 300 -), parent_id CHARACTER -( - 300 -)); - +CREATE TABLE IF NOT EXISTS space.testrecruitment ( + id character(36) NOT NULL, + shortname character(300), + idm_id character varying(36), + code character(300), + parent_id character(300) +); ALTER TABLE IF EXISTS space.testrecruitment OWNER TO "ervu-dashboard"; - -CREATE TABLE IF NOT EXISTS space.ztestrecruitment -( - id - UUID, - name - text +CREATE TABLE IF NOT EXISTS space.ztestrecruitment ( + id uuid, + name text ); - ALTER TABLE IF EXISTS space.ztestrecruitment OWNER TO "ervu-dashboard"; - -CREATE TABLE IF NOT EXISTS total_registered.age -( - "17_yaers" - numeric, - "18-26_years" - numeric, - "27-30_years" - numeric, - "31-35_years" - numeric, - "36-40_years" - numeric, - "41-45_years" - numeric, - "51+_years" - numeric, - "all_M_W" - CHARACTER -( - 10 -) NOT NULL, - recording_date date DEFAULT NOW -( -) NOT NULL, - "46-50_years" numeric, "17_yaers_percent" numeric, "18-26_years_percent" numeric, "27-30_years_percent" numeric, "31-35_years_percent" numeric, "36-40_years_percent" numeric, "41-45_years_percent" numeric, "46-50_years_percent" numeric, "51+_years_percent" numeric, recruitment_id CHARACTER -( - 36 -) NOT NULL, - registered CHARACTER -( - 10 -) NOT NULL, - id_age bigint NOT NULL); - +CREATE TABLE IF NOT EXISTS total_registered.age ( + "17_years" numeric, + "18-26_years" numeric, + "27-30_years" numeric, + "31-35_years" numeric, + "36-40_years" numeric, + "41-45_years" numeric, + "46-50_years" numeric, + "51+_years" numeric, + "all_M_W" character(10) NOT NULL, + recording_date date DEFAULT now() NOT NULL, + "17_years_percent" numeric, + "18-26_years_percent" numeric, + "27-30_years_percent" numeric, + "31-35_years_percent" numeric, + "36-40_years_percent" numeric, + "41-45_years_percent" numeric, + "46-50_years_percent" numeric, + "51+_years_percent" numeric, + recruitment_id character(36) NOT NULL, + registered character(10) NOT NULL, + id_age bigint NOT NULL +); ALTER TABLE IF EXISTS total_registered.age OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE total_registered.age IS 'Возраст состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; +COMMENT ON TABLE total_registered.age IS 'Возраст состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; -COMMENT -ON COLUMN total_registered.age."17_yaers" IS 'Возраст 17'; +COMMENT ON COLUMN total_registered.age."17_yaers" IS 'Возраст 17'; -COMMENT -ON COLUMN total_registered.age."18-26_years" IS 'Возраст 18-26'; +COMMENT ON COLUMN total_registered.age."18-26_years" IS 'Возраст 18-26'; -COMMENT -ON COLUMN total_registered.age."27-30_years" IS 'Возраст 27-30'; +COMMENT ON COLUMN total_registered.age."27-30_years" IS 'Возраст 27-30'; -COMMENT -ON COLUMN total_registered.age."31-35_years" IS 'Возраст 31-35'; +COMMENT ON COLUMN total_registered.age."31-35_years" IS 'Возраст 31-35'; -COMMENT -ON COLUMN total_registered.age."36-40_years" IS 'Возраст 36-40'; +COMMENT ON COLUMN total_registered.age."36-40_years" IS 'Возраст 36-40'; -COMMENT -ON COLUMN total_registered.age."41-45_years" IS 'Возраст 41-45'; +COMMENT ON COLUMN total_registered.age."41-45_years" IS 'Возраст 41-45'; -COMMENT -ON COLUMN total_registered.age."51+_years" IS 'Возраст 51+'; +COMMENT ON COLUMN total_registered.age."51+_years" IS 'Возраст 51+'; -COMMENT -ON COLUMN total_registered.age."all_M_W" IS 'Все/мужчины/женщины'; +COMMENT ON COLUMN total_registered.age."all_M_W" IS 'Все/мужчины/женщины'; -COMMENT -ON COLUMN total_registered.age.recording_date IS 'Дата записи'; +COMMENT ON COLUMN total_registered.age.recording_date IS 'Дата записи'; -COMMENT -ON COLUMN total_registered.age."46-50_years" IS 'Возраст 46-50'; +COMMENT ON COLUMN total_registered.age."46-50_years" IS 'Возраст 46-50'; -COMMENT -ON COLUMN total_registered.age."17_yaers_percent" IS 'Возраст 17 в процентах'; +COMMENT ON COLUMN total_registered.age."17_yaers_percent" IS 'Возраст 17 в процентах'; -COMMENT -ON COLUMN total_registered.age."18-26_years_percent" IS 'Возраст 18-26 в процентах'; +COMMENT ON COLUMN total_registered.age."18-26_years_percent" IS 'Возраст 18-26 в процентах'; -COMMENT -ON COLUMN total_registered.age."27-30_years_percent" IS 'Возраст 27-30 в процентах'; +COMMENT ON COLUMN total_registered.age."27-30_years_percent" IS 'Возраст 27-30 в процентах'; -COMMENT -ON COLUMN total_registered.age."31-35_years_percent" IS 'Возраст 31-35 в процентах'; +COMMENT ON COLUMN total_registered.age."31-35_years_percent" IS 'Возраст 31-35 в процентах'; -COMMENT -ON COLUMN total_registered.age."36-40_years_percent" IS 'Возраст 36-40 в процентах'; +COMMENT ON COLUMN total_registered.age."36-40_years_percent" IS 'Возраст 36-40 в процентах'; -COMMENT -ON COLUMN total_registered.age."41-45_years_percent" IS 'Возраст 41-45 в процентах'; +COMMENT ON COLUMN total_registered.age."41-45_years_percent" IS 'Возраст 41-45 в процентах'; -COMMENT -ON COLUMN total_registered.age."46-50_years_percent" IS 'Возраст 46-50 в процентах'; - -COMMENT -ON COLUMN total_registered.age."51+_years_percent" IS 'Возраст 51+ в процентах'; +COMMENT ON COLUMN total_registered.age."46-50_years_percent" IS 'Возраст 46-50 в процентах'; +COMMENT ON COLUMN total_registered.age."51+_years_percent" IS 'Возраст 51+ в процентах'; CREATE SEQUENCE total_registered.age_id_age_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS total_registered.age_id_age_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE total_registered.age_id_age_seq OWNED BY total_registered.age.id_age; - -CREATE TABLE IF NOT EXISTS total_registered.busyness -( - study - numeric, - WORK - numeric, - not_work - numeric, - recording_date - date - DEFAULT - NOW -( -) NOT NULL, - study_percent numeric, work_percent numeric, not_work_percent numeric, recruitment_id CHARACTER -( - 36 -) NOT NULL, - registered CHARACTER varying NOT NULL, - "all_M_W" CHARACTER varying NOT NULL, - busyness numeric); - +CREATE TABLE IF NOT EXISTS total_registered.busyness ( + study numeric, + work numeric, + not_work numeric, + recording_date date DEFAULT now() NOT NULL, + study_percent numeric, + work_percent numeric, + not_work_percent numeric, + recruitment_id character(36) NOT NULL, + registered character varying NOT NULL, + "all_M_W" character varying NOT NULL, + busyness numeric +); ALTER TABLE IF EXISTS total_registered.busyness OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE total_registered.busyness IS 'Занятость состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; +COMMENT ON TABLE total_registered.busyness IS 'Занятость состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; -COMMENT -ON COLUMN total_registered.busyness.study IS 'Учатся'; +COMMENT ON COLUMN total_registered.busyness.study IS 'Учатся'; -COMMENT -ON COLUMN total_registered.busyness.work IS 'Работают'; +COMMENT ON COLUMN total_registered.busyness.work IS 'Работают'; -COMMENT -ON COLUMN total_registered.busyness.not_work IS 'Безработные'; +COMMENT ON COLUMN total_registered.busyness.not_work IS 'Безработные'; -COMMENT -ON COLUMN total_registered.busyness.recording_date IS 'Дата записи'; +COMMENT ON COLUMN total_registered.busyness.recording_date IS 'Дата записи'; -COMMENT -ON COLUMN total_registered.busyness.study_percent IS 'Учатся в процентах'; +COMMENT ON COLUMN total_registered.busyness.study_percent IS 'Учатся в процентах'; -COMMENT -ON COLUMN total_registered.busyness.work_percent IS 'Работают в процентах'; - -COMMENT -ON COLUMN total_registered.busyness.not_work_percent IS 'Безработные в процентах'; +COMMENT ON COLUMN total_registered.busyness.work_percent IS 'Работают в процентах'; +COMMENT ON COLUMN total_registered.busyness.not_work_percent IS 'Безработные в процентах'; CREATE TABLE IF NOT EXISTS total_registered.child_minor ( - no_child - numeric, - "1_child" - numeric, - "2_child" - numeric, - "3_child" - numeric, - "4_more_child" - numeric, - "all_M_W" - character -( - 10 -) NOT NULL, - recording_date date DEFAULT now -( -) NOT NULL, - no_child_percent numeric, "1_child_percent" numeric, "2_child_percent" numeric, "3_child_percent" numeric, "4_more_child_percent" numeric, recruitment_id character -( - 36 -) NOT NULL, - id_child_minor bigint NOT NULL); - + no_child numeric, + "1_child" numeric, + "2_child" numeric, + "3_child" numeric, + "4_more_child" numeric, + "all_M_W" character(10) NOT NULL, + recording_date date DEFAULT now() NOT NULL, + no_child_percent numeric, + "1_child_percent" numeric, + "2_child_percent" numeric, + "3_child_percent" numeric, + "4_more_child_percent" numeric, + recruitment_id character(36) NOT NULL, + id_child_minor bigint NOT NULL +); ALTER TABLE IF EXISTS total_registered.child_minor OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE total_registered.child_minor IS 'Дети то 18 лет состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; +COMMENT ON TABLE total_registered.child_minor IS 'Дети то 18 лет состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; -COMMENT -ON COLUMN total_registered.child_minor.no_child IS 'Нет детей'; +COMMENT ON COLUMN total_registered.child_minor.no_child IS 'Нет детей'; -COMMENT -ON COLUMN total_registered.child_minor."1_child" IS '1 ребенок'; +COMMENT ON COLUMN total_registered.child_minor."1_child" IS '1 ребенок'; -COMMENT -ON COLUMN total_registered.child_minor."2_child" IS '2 ребенка'; +COMMENT ON COLUMN total_registered.child_minor."2_child" IS '2 ребенка'; -COMMENT -ON COLUMN total_registered.child_minor."3_child" IS '3 ребенка'; +COMMENT ON COLUMN total_registered.child_minor."3_child" IS '3 ребенка'; -COMMENT -ON COLUMN total_registered.child_minor."4_more_child" IS '4 и более'; +COMMENT ON COLUMN total_registered.child_minor."4_more_child" IS '4 и более'; -COMMENT -ON COLUMN total_registered.child_minor."all_M_W" IS 'Все/Мужчины/Женщины'; +COMMENT ON COLUMN total_registered.child_minor."all_M_W" IS 'Все/Мужчины/Женщины'; -COMMENT -ON COLUMN total_registered.child_minor.recording_date IS 'Дата записи'; +COMMENT ON COLUMN total_registered.child_minor.recording_date IS 'Дата записи'; -COMMENT -ON COLUMN total_registered.child_minor.no_child_percent IS 'Нет детей в процентах'; +COMMENT ON COLUMN total_registered.child_minor.no_child_percent IS 'Нет детей в процентах'; -COMMENT -ON COLUMN total_registered.child_minor."1_child_percent" IS '1 ребенок в процентах'; +COMMENT ON COLUMN total_registered.child_minor."1_child_percent" IS '1 ребенок в процентах'; -COMMENT -ON COLUMN total_registered.child_minor."2_child_percent" IS '2 ребенка в процентах'; +COMMENT ON COLUMN total_registered.child_minor."2_child_percent" IS '2 ребенка в процентах'; -COMMENT -ON COLUMN total_registered.child_minor."3_child_percent" IS '3 ребенка в процентах'; - -COMMENT -ON COLUMN total_registered.child_minor."4_more_child_percent" IS '4 и более ребенка в процентах'; +COMMENT ON COLUMN total_registered.child_minor."3_child_percent" IS '3 ребенка в процентах'; +COMMENT ON COLUMN total_registered.child_minor."4_more_child_percent" IS '4 и более ребенка в процентах'; CREATE SEQUENCE total_registered.child_minor_id_child_minor_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS total_registered.child_minor_id_child_minor_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE total_registered.child_minor_id_child_minor_seq OWNED BY total_registered.child_minor.id_child_minor; - CREATE TABLE IF NOT EXISTS total_registered.driver_license ( - nope - numeric, - "A" - numeric, - "B" - numeric, - "C" - numeric, - "D" - numeric, - "E" - numeric, - "all_M_W" - character -( - 10 -) NOT NULL, - recording_date date DEFAULT now -( -) NOT NULL, - nope_repcent numeric, "A_repcent" numeric, "B_repcent" numeric, "C_repcent" numeric, "D_repcent" numeric, "E_repcent" numeric, recruitment_id character -( - 36 -) NOT NULL, - id_driver_license bigint NOT NULL); - + nope numeric, + "A" numeric, + "B" numeric, + "C" numeric, + "D" numeric, + "E" numeric, + "all_M_W" character(10) NOT NULL, + recording_date date DEFAULT now() NOT NULL, + nope_repcent numeric, + "A_repcent" numeric, + "B_repcent" numeric, + "C_repcent" numeric, + "D_repcent" numeric, + "E_repcent" numeric, + recruitment_id character(36) NOT NULL, + id_driver_license bigint NOT NULL +); ALTER TABLE IF EXISTS total_registered.driver_license OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE total_registered.driver_license IS 'Наличие водительского удостоверения состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; +COMMENT ON TABLE total_registered.driver_license IS 'Наличие водительского удостоверения состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; -COMMENT -ON COLUMN total_registered.driver_license.nope IS 'нет водительского удостоверения'; +COMMENT ON COLUMN total_registered.driver_license.nope IS 'нет водительского удостоверения'; -COMMENT -ON COLUMN total_registered.driver_license."A" IS 'категория A'; +COMMENT ON COLUMN total_registered.driver_license."A" IS 'категория A'; -COMMENT -ON COLUMN total_registered.driver_license."B" IS 'категория B'; +COMMENT ON COLUMN total_registered.driver_license."B" IS 'категория B'; -COMMENT -ON COLUMN total_registered.driver_license."C" IS 'категория C'; +COMMENT ON COLUMN total_registered.driver_license."C" IS 'категория C'; -COMMENT -ON COLUMN total_registered.driver_license."D" IS 'категория D'; +COMMENT ON COLUMN total_registered.driver_license."D" IS 'категория D'; -COMMENT -ON COLUMN total_registered.driver_license."E" IS 'категория E'; +COMMENT ON COLUMN total_registered.driver_license."E" IS 'категория E'; -COMMENT -ON COLUMN total_registered.driver_license."all_M_W" IS 'Все/Мужчины/Женщины'; +COMMENT ON COLUMN total_registered.driver_license."all_M_W" IS 'Все/Мужчины/Женщины'; -COMMENT -ON COLUMN total_registered.driver_license.recording_date IS 'Дата записи'; +COMMENT ON COLUMN total_registered.driver_license.recording_date IS 'Дата записи'; -COMMENT -ON COLUMN total_registered.driver_license.nope_repcent IS 'нет водительского удостоверения в процентах'; +COMMENT ON COLUMN total_registered.driver_license.nope_repcent IS 'нет водительского удостоверения в процентах'; -COMMENT -ON COLUMN total_registered.driver_license."A_repcent" IS 'категория A в процентах'; +COMMENT ON COLUMN total_registered.driver_license."A_repcent" IS 'категория A в процентах'; -COMMENT -ON COLUMN total_registered.driver_license."B_repcent" IS 'категория B в процентах'; +COMMENT ON COLUMN total_registered.driver_license."B_repcent" IS 'категория B в процентах'; -COMMENT -ON COLUMN total_registered.driver_license."C_repcent" IS 'категория C в процентах'; +COMMENT ON COLUMN total_registered.driver_license."C_repcent" IS 'категория C в процентах'; -COMMENT -ON COLUMN total_registered.driver_license."D_repcent" IS 'категория D в процентах'; - -COMMENT -ON COLUMN total_registered.driver_license."E_repcent" IS 'категория E в процентах'; +COMMENT ON COLUMN total_registered.driver_license."D_repcent" IS 'категория D в процентах'; +COMMENT ON COLUMN total_registered.driver_license."E_repcent" IS 'категория E в процентах'; CREATE SEQUENCE total_registered.driver_license_id_driver_license_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS total_registered.driver_license_id_driver_license_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE total_registered.driver_license_id_driver_license_seq OWNED BY total_registered.driver_license.id_driver_license; - CREATE TABLE IF NOT EXISTS total_registered.education_level ( - higher - numeric, - average - numeric, - "all_M_W" - text - NOT - NULL, - only_general - numeric, - no_data - numeric, - recording_date - date - DEFAULT - now -( -) NOT NULL, - higher_percent numeric, average_percent numeric, only_general_percent numeric, no_data_percent numeric, recruitment_id character -( - 36 -) NOT NULL, - education_level numeric); - + higher numeric, + average numeric, + "all_M_W" text NOT NULL, + only_general numeric, + no_data numeric, + recording_date date DEFAULT now() NOT NULL, + higher_percent numeric, + average_percent numeric, + only_general_percent numeric, + no_data_percent numeric, + recruitment_id character(36) NOT NULL, + education_level numeric +); ALTER TABLE IF EXISTS total_registered.education_level OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE total_registered.education_level IS 'Уровень образования состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; +COMMENT ON TABLE total_registered.education_level IS 'Уровень образования состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; -COMMENT -ON COLUMN total_registered.education_level.higher IS 'Высшее образование'; +COMMENT ON COLUMN total_registered.education_level.higher IS 'Высшее образование'; -COMMENT -ON COLUMN total_registered.education_level.average IS 'Среднее профессиональное'; +COMMENT ON COLUMN total_registered.education_level.average IS 'Среднее профессиональное'; -COMMENT -ON COLUMN total_registered.education_level."all_M_W" IS 'Все/Мужчины/Женщины'; +COMMENT ON COLUMN total_registered.education_level."all_M_W" IS 'Все/Мужчины/Женщины'; -COMMENT -ON COLUMN total_registered.education_level.only_general IS 'Только общее'; +COMMENT ON COLUMN total_registered.education_level.only_general IS 'Только общее'; -COMMENT -ON COLUMN total_registered.education_level.no_data IS 'Нет данных'; +COMMENT ON COLUMN total_registered.education_level.no_data IS 'Нет данных'; -COMMENT -ON COLUMN total_registered.education_level.recording_date IS 'Дата записи'; +COMMENT ON COLUMN total_registered.education_level.recording_date IS 'Дата записи'; -COMMENT -ON COLUMN total_registered.education_level.higher_percent IS 'Высшее образование в процентах'; +COMMENT ON COLUMN total_registered.education_level.higher_percent IS 'Высшее образование в процентах'; -COMMENT -ON COLUMN total_registered.education_level.average_percent IS 'Среднее профессиональное в процентах'; +COMMENT ON COLUMN total_registered.education_level.average_percent IS 'Среднее профессиональное в процентах'; -COMMENT -ON COLUMN total_registered.education_level.only_general_percent IS 'Только общее в процентах'; - -COMMENT -ON COLUMN total_registered.education_level.no_data_percent IS 'Нет данных об образованиии в процентах'; +COMMENT ON COLUMN total_registered.education_level.only_general_percent IS 'Только общее в процентах'; +COMMENT ON COLUMN total_registered.education_level.no_data_percent IS 'Нет данных об образованиии в процентах'; CREATE TABLE IF NOT EXISTS total_registered.marital_status ( - married - numeric, - not_married - numeric, - "all_M_W" - text - NOT - NULL, - recording_date - date - DEFAULT - now -( -) NOT NULL, - married_percent numeric, not_married_percent numeric, recruitment_id character -( - 36 -) NOT NULL, - marital_status numeric); - + married numeric, + not_married numeric, + "all_M_W" text NOT NULL, + recording_date date DEFAULT now() NOT NULL, + married_percent numeric, + not_married_percent numeric, + recruitment_id character(36) NOT NULL, + marital_status numeric +); ALTER TABLE IF EXISTS total_registered.marital_status OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE total_registered.marital_status IS 'Семейное положение состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; +COMMENT ON TABLE total_registered.marital_status IS 'Семейное положение состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; -COMMENT -ON COLUMN total_registered.marital_status.married IS 'В браке'; +COMMENT ON COLUMN total_registered.marital_status.married IS 'В браке'; -COMMENT -ON COLUMN total_registered.marital_status.not_married IS 'Холост'; +COMMENT ON COLUMN total_registered.marital_status.not_married IS 'Холост'; -COMMENT -ON COLUMN total_registered.marital_status."all_M_W" IS 'Все/Мужчины/Женщины'; +COMMENT ON COLUMN total_registered.marital_status."all_M_W" IS 'Все/Мужчины/Женщины'; -COMMENT -ON COLUMN total_registered.marital_status.recording_date IS 'Дата записи'; +COMMENT ON COLUMN total_registered.marital_status.recording_date IS 'Дата записи'; -COMMENT -ON COLUMN total_registered.marital_status.married_percent IS 'В браке в процентах'; - -COMMENT -ON COLUMN total_registered.marital_status.not_married_percent IS 'Холост в процентах'; +COMMENT ON COLUMN total_registered.marital_status.married_percent IS 'В браке в процентах'; +COMMENT ON COLUMN total_registered.marital_status.not_married_percent IS 'Холост в процентах'; CREATE TABLE IF NOT EXISTS total_registered.reg_mil_cat ( - first_reg_17 - numeric, - first_reg_18 - numeric, - returned_dep_liberty - numeric, - "mil_spec_W" - numeric, - punished - numeric, - received_citizenship - numeric, - recording_date - date - DEFAULT - now -( -) NOT NULL, - first_reg_17_percent numeric, first_reg_18_percent numeric, returned_dep_liberty_percent numeric, "mil_spec_W_percent" numeric, punished_percent numeric, received_citizenship_percent numeric, recruitment_id character -( - 36 -) NOT NULL, + first_reg_17 numeric, + first_reg_18 numeric, + returned_dep_liberty numeric, + "mil_spec_W" numeric, + punished numeric, + received_citizenship numeric, + recording_date date DEFAULT now() NOT NULL, + first_reg_17_percent numeric, + first_reg_18_percent numeric, + returned_dep_liberty_percent numeric, + "mil_spec_W_percent" numeric, + punished_percent numeric, + received_citizenship_percent numeric, + recruitment_id character(36) NOT NULL, mil_reg numeric NOT NULL, - id_reg_mil_cat bigint NOT NULL); - + id_reg_mil_cat bigint NOT NULL +); ALTER TABLE IF EXISTS total_registered.reg_mil_cat OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE total_registered.reg_mil_cat IS 'Категории постановки на воинский учет состоящих/не состоящих на учете уровень РФ'; +COMMENT ON TABLE total_registered.reg_mil_cat IS 'Категории постановки на воинский учет состоящих/не состоящих на учете уровень РФ'; -COMMENT -ON COLUMN total_registered.reg_mil_cat.first_reg_17 IS 'Первоначальная постановка на воинский учет граждан от 17 лет'; +COMMENT ON COLUMN total_registered.reg_mil_cat.first_reg_17 IS 'Первоначальная постановка на воинский учет граждан от 17 лет'; -COMMENT -ON COLUMN total_registered.reg_mil_cat.first_reg_18 IS 'Первоначальная постановка на воинский учет граждан от 18 лет'; +COMMENT ON COLUMN total_registered.reg_mil_cat.first_reg_18 IS 'Первоначальная постановка на воинский учет граждан от 18 лет'; -COMMENT -ON COLUMN total_registered.reg_mil_cat.returned_dep_liberty IS 'Возвратившиеся из мест лишения свободы'; +COMMENT ON COLUMN total_registered.reg_mil_cat.returned_dep_liberty IS 'Возвратившиеся из мест лишения свободы'; -COMMENT -ON COLUMN total_registered.reg_mil_cat."mil_spec_W" IS 'Женщины, получившие ВУС'; +COMMENT ON COLUMN total_registered.reg_mil_cat."mil_spec_W" IS 'Женщины, получившие ВУС'; -COMMENT -ON COLUMN total_registered.reg_mil_cat.punished IS 'Отбывающие наказание в местах лишения свободы'; +COMMENT ON COLUMN total_registered.reg_mil_cat.punished IS 'Отбывающие наказание в местах лишения свободы'; -COMMENT -ON COLUMN total_registered.reg_mil_cat.received_citizenship IS 'Получившие гражданство'; +COMMENT ON COLUMN total_registered.reg_mil_cat.received_citizenship IS 'Получившие гражданство'; -COMMENT -ON COLUMN total_registered.reg_mil_cat.recording_date IS 'Дата записи'; +COMMENT ON COLUMN total_registered.reg_mil_cat.recording_date IS 'Дата записи'; -COMMENT -ON COLUMN total_registered.reg_mil_cat.first_reg_17_percent IS 'Первоначальная постановка на воинский учет граждан от 17 лет в процентах'; +COMMENT ON COLUMN total_registered.reg_mil_cat.first_reg_17_percent IS 'Первоначальная постановка на воинский учет граждан от 17 лет в процентах'; -COMMENT -ON COLUMN total_registered.reg_mil_cat.first_reg_18_percent IS 'Первоначальная постановка на воинский учет граждан от 18 лет в процентах'; +COMMENT ON COLUMN total_registered.reg_mil_cat.first_reg_18_percent IS 'Первоначальная постановка на воинский учет граждан от 18 лет в процентах'; -COMMENT -ON COLUMN total_registered.reg_mil_cat.returned_dep_liberty_percent IS 'Возвратившиеся из мест лишения свободы в процентах'; +COMMENT ON COLUMN total_registered.reg_mil_cat.returned_dep_liberty_percent IS 'Возвратившиеся из мест лишения свободы в процентах'; -COMMENT -ON COLUMN total_registered.reg_mil_cat."mil_spec_W_percent" IS 'Женщины, получившие ВУС в процентах'; +COMMENT ON COLUMN total_registered.reg_mil_cat."mil_spec_W_percent" IS 'Женщины, получившие ВУС в процентах'; -COMMENT -ON COLUMN total_registered.reg_mil_cat.punished_percent IS 'Отбывающие наказание в местах лишения свободы в процентах'; - -COMMENT -ON COLUMN total_registered.reg_mil_cat.received_citizenship_percent IS 'Получившие гражданство в процентах'; +COMMENT ON COLUMN total_registered.reg_mil_cat.punished_percent IS 'Отбывающие наказание в местах лишения свободы в процентах'; +COMMENT ON COLUMN total_registered.reg_mil_cat.received_citizenship_percent IS 'Получившие гражданство в процентах'; CREATE SEQUENCE total_registered.reg_mil_cat_id_reg_mil_cat_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS total_registered.reg_mil_cat_id_reg_mil_cat_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE total_registered.reg_mil_cat_id_reg_mil_cat_seq OWNED BY total_registered.reg_mil_cat.id_reg_mil_cat; - CREATE TABLE IF NOT EXISTS total_registered.removed_registry ( - removed_registry - numeric, - deprivation_citizenship - numeric, - age_limit - numeric, - death - numeric, - travel_abroad - numeric, - living_abroad - numeric, - other - numeric, - recording_date - date - DEFAULT - now -( -) NOT NULL, - deprivation_citizen_percents numeric, age_limit_percent numeric, death_percent numeric, travel_abroad_percent numeric, living_abroad_percent numeric, other_percent numeric, recruitment_id character -( - 36 -) NOT NULL, - id_removed_registry bigint NOT NULL); - + removed_registry numeric, + deprivation_citizenship numeric, + age_limit numeric, + death numeric, + travel_abroad numeric, + living_abroad numeric, + other numeric, + recording_date date DEFAULT now() NOT NULL, + deprivation_citizen_percents numeric, + age_limit_percent numeric, + death_percent numeric, + travel_abroad_percent numeric, + living_abroad_percent numeric, + other_percent numeric, + recruitment_id character(36) NOT NULL, + id_removed_registry bigint NOT NULL +); ALTER TABLE IF EXISTS total_registered.removed_registry OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE total_registered.removed_registry IS 'Снято с учета уровень РФ'; +COMMENT ON TABLE total_registered.removed_registry IS 'Снято с учета уровень РФ'; -COMMENT -ON COLUMN total_registered.removed_registry.removed_registry IS 'Снято с учета'; +COMMENT ON COLUMN total_registered.removed_registry.removed_registry IS 'Снято с учета'; -COMMENT -ON COLUMN total_registered.removed_registry.deprivation_citizenship IS 'Лишение гражданства'; +COMMENT ON COLUMN total_registered.removed_registry.deprivation_citizenship IS 'Лишение гражданства'; -COMMENT -ON COLUMN total_registered.removed_registry.age_limit IS 'Наступление предельного возраста'; +COMMENT ON COLUMN total_registered.removed_registry.age_limit IS 'Наступление предельного возраста'; -COMMENT -ON COLUMN total_registered.removed_registry.death IS 'Смерть'; +COMMENT ON COLUMN total_registered.removed_registry.death IS 'Смерть'; -COMMENT -ON COLUMN total_registered.removed_registry.travel_abroad IS 'Выезд за границу на срок более 6 месяцев'; +COMMENT ON COLUMN total_registered.removed_registry.travel_abroad IS 'Выезд за границу на срок более 6 месяцев'; -COMMENT -ON COLUMN total_registered.removed_registry.living_abroad IS 'Проживающие за границей'; +COMMENT ON COLUMN total_registered.removed_registry.living_abroad IS 'Проживающие за границей'; -COMMENT -ON COLUMN total_registered.removed_registry.other IS 'Прочее'; +COMMENT ON COLUMN total_registered.removed_registry.other IS 'Прочее'; -COMMENT -ON COLUMN total_registered.removed_registry.recording_date IS 'Дата записи'; +COMMENT ON COLUMN total_registered.removed_registry.recording_date IS 'Дата записи'; -COMMENT -ON COLUMN total_registered.removed_registry.deprivation_citizen_percents IS 'Лишение гражданства в процентах'; +COMMENT ON COLUMN total_registered.removed_registry.deprivation_citizen_percents IS 'Лишение гражданства в процентах'; -COMMENT -ON COLUMN total_registered.removed_registry.age_limit_percent IS 'Наступление предельного возраста в процентах'; +COMMENT ON COLUMN total_registered.removed_registry.age_limit_percent IS 'Наступление предельного возраста в процентах'; -COMMENT -ON COLUMN total_registered.removed_registry.death_percent IS 'Смерть в процентах'; +COMMENT ON COLUMN total_registered.removed_registry.death_percent IS 'Смерть в процентах'; -COMMENT -ON COLUMN total_registered.removed_registry.travel_abroad_percent IS 'Выезд за границу на срок более 6 месяцев в процентах'; +COMMENT ON COLUMN total_registered.removed_registry.travel_abroad_percent IS 'Выезд за границу на срок более 6 месяцев в процентах'; -COMMENT -ON COLUMN total_registered.removed_registry.living_abroad_percent IS 'Проживающие за границей в процентах'; - -COMMENT -ON COLUMN total_registered.removed_registry.other_percent IS 'Прочее в процентах'; +COMMENT ON COLUMN total_registered.removed_registry.living_abroad_percent IS 'Проживающие за границей в процентах'; +COMMENT ON COLUMN total_registered.removed_registry.other_percent IS 'Прочее в процентах'; CREATE SEQUENCE total_registered.removed_registry_id_removed_registry_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS total_registered.removed_registry_id_removed_registry_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE total_registered.removed_registry_id_removed_registry_seq OWNED BY total_registered.removed_registry.id_removed_registry; - CREATE TABLE IF NOT EXISTS total_registered.subpoenas ( - subpoena - numeric, - average_appeared - numeric, - appeared - numeric, - not_appeared - numeric, - not_ap_good_reason - numeric, - ap_not_required - numeric, - electron - numeric, - paper - numeric, - restrictions_applied - numeric, - introduced_measures - numeric, - recording_date - date - DEFAULT - now -( -) NOT NULL, - appeared_percent numeric, not_appeared_percent numeric, not_ap_good_reason_percent numeric, ap_not_required_percent numeric, electron_percent numeric, paper_percent numeric, restrictions_applied_percent numeric, introduced_measures_percent numeric, recruitment_id character -( - 36 -) NOT NULL, + subpoena numeric, + average_appeared numeric, + appeared numeric, + not_appeared numeric, + not_ap_good_reason numeric, + ap_not_required numeric, + electron numeric, + paper numeric, + restrictions_applied numeric, + introduced_measures numeric, + recording_date date DEFAULT now() NOT NULL, + appeared_percent numeric, + not_appeared_percent numeric, + not_ap_good_reason_percent numeric, + ap_not_required_percent numeric, + electron_percent numeric, + paper_percent numeric, + restrictions_applied_percent numeric, + introduced_measures_percent numeric, + recruitment_id character(36) NOT NULL, mil_reg numeric NOT NULL, id_subpoena bigint NOT NULL, - count_not_delivery numeric, appear_date_is_good numeric, not_delivery_percent numeric, appear_date_is_good_percent numeric); - + count_not_delivery numeric, + appear_date_is_good numeric, + not_delivery_percent numeric, + appear_date_is_good_percent numeric +); ALTER TABLE IF EXISTS total_registered.subpoenas OWNER TO "ervu-dashboard"; -COMMENT -ON TABLE total_registered.subpoenas IS 'Повестки состоящих/не состоящих на учете уровень РФ'; +COMMENT ON TABLE total_registered.subpoenas IS 'Повестки состоящих/не состоящих на учете уровень РФ'; -COMMENT -ON COLUMN total_registered.subpoenas.subpoena IS 'Направлено повесток'; +COMMENT ON COLUMN total_registered.subpoenas.subpoena IS 'Направлено повесток'; -COMMENT -ON COLUMN total_registered.subpoenas.average_appeared IS 'Средний срок явки'; +COMMENT ON COLUMN total_registered.subpoenas.average_appeared IS 'Средний срок явки'; -COMMENT -ON COLUMN total_registered.subpoenas.appeared IS 'Явились'; +COMMENT ON COLUMN total_registered.subpoenas.appeared IS 'Явились'; -COMMENT -ON COLUMN total_registered.subpoenas.not_appeared IS 'Не явились'; +COMMENT ON COLUMN total_registered.subpoenas.not_appeared IS 'Не явились'; -COMMENT -ON COLUMN total_registered.subpoenas.not_ap_good_reason IS 'Не явились по уважительной причине'; +COMMENT ON COLUMN total_registered.subpoenas.not_ap_good_reason IS 'Не явились по уважительной причине'; -COMMENT -ON COLUMN total_registered.subpoenas.ap_not_required IS 'Явка не требуется'; +COMMENT ON COLUMN total_registered.subpoenas.ap_not_required IS 'Явка не требуется'; -COMMENT -ON COLUMN total_registered.subpoenas.electron IS 'Электронно'; +COMMENT ON COLUMN total_registered.subpoenas.electron IS 'Электронно'; -COMMENT -ON COLUMN total_registered.subpoenas.paper IS 'Нарочно'; +COMMENT ON COLUMN total_registered.subpoenas.paper IS 'Нарочно'; -COMMENT -ON COLUMN total_registered.subpoenas.restrictions_applied IS 'Применено ограничений'; +COMMENT ON COLUMN total_registered.subpoenas.restrictions_applied IS 'Применено ограничений'; -COMMENT -ON COLUMN total_registered.subpoenas.introduced_measures IS 'Введено реализатором мер'; +COMMENT ON COLUMN total_registered.subpoenas.introduced_measures IS 'Введено реализатором мер'; -COMMENT -ON COLUMN total_registered.subpoenas.recording_date IS 'Дата записи'; +COMMENT ON COLUMN total_registered.subpoenas.recording_date IS 'Дата записи'; -COMMENT -ON COLUMN total_registered.subpoenas.appeared_percent IS 'Явились в процентах'; +COMMENT ON COLUMN total_registered.subpoenas.appeared_percent IS 'Явились в процентах'; -COMMENT -ON COLUMN total_registered.subpoenas.not_appeared_percent IS 'Не явились в процентах'; +COMMENT ON COLUMN total_registered.subpoenas.not_appeared_percent IS 'Не явились в процентах'; -COMMENT -ON COLUMN total_registered.subpoenas.not_ap_good_reason_percent IS 'Не явились по уважительной причине в процентах'; +COMMENT ON COLUMN total_registered.subpoenas.not_ap_good_reason_percent IS 'Не явились по уважительной причине в процентах'; -COMMENT -ON COLUMN total_registered.subpoenas.ap_not_required_percent IS 'Явка не требуется в процентах'; +COMMENT ON COLUMN total_registered.subpoenas.ap_not_required_percent IS 'Явка не требуется в процентах'; -COMMENT -ON COLUMN total_registered.subpoenas.electron_percent IS 'Электронно в процентах'; +COMMENT ON COLUMN total_registered.subpoenas.electron_percent IS 'Электронно в процентах'; -COMMENT -ON COLUMN total_registered.subpoenas.paper_percent IS 'Нарочно в процентах'; +COMMENT ON COLUMN total_registered.subpoenas.paper_percent IS 'Нарочно в процентах'; -COMMENT -ON COLUMN total_registered.subpoenas.restrictions_applied_percent IS 'Применено ограничений в процентах'; +COMMENT ON COLUMN total_registered.subpoenas.restrictions_applied_percent IS 'Применено ограничений в процентах'; -COMMENT -ON COLUMN total_registered.subpoenas.introduced_measures_percent IS 'Введено реализатором мер в процентах'; +COMMENT ON COLUMN total_registered.subpoenas.introduced_measures_percent IS 'Введено реализатором мер в процентах'; -COMMENT -ON COLUMN total_registered.subpoenas.count_not_delivery IS 'Количество не врученных повесток'; +COMMENT ON COLUMN total_registered.subpoenas.count_not_delivery IS 'Количество не врученных повесток'; -COMMENT -ON COLUMN total_registered.subpoenas.appear_date_is_good IS 'Повестки, дата явки по которым еще не наступила'; +COMMENT ON COLUMN total_registered.subpoenas.appear_date_is_good IS 'Повестки, дата явки по которым еще не наступила'; -COMMENT -ON COLUMN total_registered.subpoenas.not_delivery_percent IS 'Процент не врученных повесток'; - -COMMENT -ON COLUMN total_registered.subpoenas.appear_date_is_good_percent IS 'Процент повесток, дата явки по которым еще не наступила'; +COMMENT ON COLUMN total_registered.subpoenas.not_delivery_percent IS 'Процент не врученных повесток'; +COMMENT ON COLUMN total_registered.subpoenas.appear_date_is_good_percent IS 'Процент повесток, дата явки по которым еще не наступила'; CREATE SEQUENCE total_registered.subpoenas_id_subpoena_seq - START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE CACHE 1; - + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE CACHE 1; ALTER TABLE IF EXISTS total_registered.subpoenas_id_subpoena_seq OWNER TO "ervu-dashboard"; - ALTER SEQUENCE total_registered.subpoenas_id_subpoena_seq OWNED BY total_registered.subpoenas.id_subpoena; +ALTER TABLE IF EXISTS ONLY appeals.main_profile ALTER COLUMN id_main_profile SET DEFAULT nextval('appeals.main_profile_id_main_profile_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY appeals.reasons_appeal ALTER COLUMN id_reasons_appeal SET DEFAULT nextval('appeals.reasons_appeal_id_reasons_appeal_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY appeals.review_rating ALTER COLUMN id_review_rating SET DEFAULT nextval('appeals.review_rating_id_review_rating_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY appeals.topic_appeal ALTER COLUMN id_topic_appeal SET DEFAULT nextval('appeals.topic_appeal_id_topic_appeal_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_child ALTER COLUMN citizen_child_id SET DEFAULT nextval('ervu_dashboard.citizen_child_citizen_child_id_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_guardianship ALTER COLUMN citizen_guardianship_id SET DEFAULT nextval('ervu_dashboard.citizen_guardianship_citizen_guardianship_id_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_spouse ALTER COLUMN citizen_spouse_id SET DEFAULT nextval('ervu_dashboard.citizen_spouse_citizen_spouse_id_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizenship ALTER COLUMN citizenship_id SET DEFAULT nextval('ervu_dashboard.citizenship_citizenship_id_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizenship_foreign ALTER COLUMN citizenship_foreign_id SET DEFAULT nextval('ervu_dashboard.citizenship_foreign_citizenship_foreign_id_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.decision ALTER COLUMN decision_id SET DEFAULT nextval('ervu_dashboard.decision_decision_id_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.deputy ALTER COLUMN deputy_id SET DEFAULT nextval('ervu_dashboard.deputy_deputy_id_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.disability ALTER COLUMN disability_id SET DEFAULT nextval('ervu_dashboard.disability_disability_id_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.disease ALTER COLUMN disease_id SET DEFAULT nextval('ervu_dashboard.disease_disease_id_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.drivers_licence ALTER COLUMN drivers_licence_id SET DEFAULT nextval('ervu_dashboard.drivers_licence_drivers_licence_id_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.medical_authorities ALTER COLUMN medical_authorities_id SET DEFAULT nextval('ervu_dashboard.medical_authorities_medical_authorities_id_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.passport ALTER COLUMN passport_id SET DEFAULT nextval('ervu_dashboard.passport_passport_id_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.property ALTER COLUMN property_id SET DEFAULT nextval('ervu_dashboard.property_property_id_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.prosecution ALTER COLUMN prosecution_id SET DEFAULT nextval('ervu_dashboard.prosecution_prosecution_id_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.punishment ALTER COLUMN punishment_id SET DEFAULT nextval('ervu_dashboard.punishment_punishment_id_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.work ALTER COLUMN work_id SET DEFAULT nextval('ervu_dashboard.work_work_id_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY main_dashboard.appeals ALTER COLUMN id_appeal SET DEFAULT nextval('main_dashboard.appeals_id_appeal_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY main_dashboard.recruitment_campaign ALTER COLUMN id_recruitment_campaign SET DEFAULT nextval('main_dashboard.recruitment_campaign_id_recruitment_campaign_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY main_dashboard.total_registered ALTER COLUMN id_total_registered SET DEFAULT nextval('main_dashboard.total_registered_id_total_registered_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY main_dashboard.waiting_registration ALTER COLUMN id_waiting_registration SET DEFAULT nextval('main_dashboard.waiting_registration_id_waiting_registration_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY public.job_log ALTER COLUMN id_job SET DEFAULT nextval('public.job_log_id_job_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY ratings.appear_subppoena ALTER COLUMN id_appear_subppoena SET DEFAULT nextval('ratings.appear_subppoena_id_appear_subppoena_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY ratings.consideration_complaint ALTER COLUMN id_consideration_complaint SET DEFAULT nextval('ratings.consideration_complaint_id_consideration_complaint_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY recruitment_campaign.postponement_info ALTER COLUMN postponement_info_id SET DEFAULT nextval('recruitment_campaign.recruitment_id_recruitment_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY recruitment_campaign.subpoenas ALTER COLUMN id_subpoena SET DEFAULT nextval('recruitment_campaign.subpoenas_id_subpoena_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY space.military_commissariat ALTER COLUMN id_military_commissariat SET DEFAULT nextval('space.military_commissariat_id_military_commissariat_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY space.military_district ALTER COLUMN id_military_district SET DEFAULT nextval('space.military_district_id_military_district_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY space.region ALTER COLUMN id_region SET DEFAULT nextval('space.region_id_region_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY total_registered.age ALTER COLUMN id_age SET DEFAULT nextval('total_registered.age_id_age_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY total_registered.child_minor ALTER COLUMN id_child_minor SET DEFAULT nextval('total_registered.child_minor_id_child_minor_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY total_registered.driver_license ALTER COLUMN id_driver_license SET DEFAULT nextval('total_registered.driver_license_id_driver_license_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY total_registered.reg_mil_cat ALTER COLUMN id_reg_mil_cat SET DEFAULT nextval('total_registered.reg_mil_cat_id_reg_mil_cat_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY total_registered.removed_registry ALTER COLUMN id_removed_registry SET DEFAULT nextval('total_registered.removed_registry_id_removed_registry_seq'::regclass); + +ALTER TABLE IF EXISTS ONLY total_registered.subpoenas ALTER COLUMN id_subpoena SET DEFAULT nextval('total_registered.subpoenas_id_subpoena_seq'::regclass); + +SELECT pg_catalog.setval('appeals.main_profile_id_main_profile_seq', 1, false); + +SELECT pg_catalog.setval('appeals.reasons_appeal_id_reasons_appeal_seq', 1, true); + +SELECT pg_catalog.setval('appeals.review_rating_id_review_rating_seq', 6, true); + +SELECT pg_catalog.setval('appeals.topic_appeal_id_topic_appeal_seq', 1, true); + +SELECT pg_catalog.setval('ervu_dashboard.citizen_child_citizen_child_id_seq', 132950, true); + +SELECT pg_catalog.setval('ervu_dashboard.citizen_guardianship_citizen_guardianship_id_seq', 4653, true); + +SELECT pg_catalog.setval('ervu_dashboard.citizen_spouse_citizen_spouse_id_seq', 229504, true); + +SELECT pg_catalog.setval('ervu_dashboard.citizenship_citizenship_id_seq', 69012, true); + +SELECT pg_catalog.setval('ervu_dashboard.citizenship_foreign_citizenship_foreign_id_seq', 71568, true); + +SELECT pg_catalog.setval('ervu_dashboard.decision_decision_id_seq', 1, false); + +SELECT pg_catalog.setval('ervu_dashboard.deputy_deputy_id_seq', 47, true); + +SELECT pg_catalog.setval('ervu_dashboard.disability_disability_id_seq', 94609, true); + +SELECT pg_catalog.setval('ervu_dashboard.disease_disease_id_seq', 198170, true); + +SELECT pg_catalog.setval('ervu_dashboard.drivers_licence_drivers_licence_id_seq', 7056, true); + +SELECT pg_catalog.setval('ervu_dashboard.medical_authorities_medical_authorities_id_seq', 298794, true); + +SELECT pg_catalog.setval('ervu_dashboard.passport_passport_id_seq', 53048, true); + +SELECT pg_catalog.setval('ervu_dashboard.property_property_id_seq', 372952, true); + +SELECT pg_catalog.setval('ervu_dashboard.prosecution_prosecution_id_seq', 44, true); + +SELECT pg_catalog.setval('ervu_dashboard.punishment_punishment_id_seq', 22, true); + +SELECT pg_catalog.setval('ervu_dashboard.subpoena_subpoena_id_seq', 27501, true); + +SELECT pg_catalog.setval('ervu_dashboard.temporary_measures_temporary_measures_id_seq', 12191, true); + +SELECT pg_catalog.setval('ervu_dashboard.testrecruitment_sort_seq', 90, true); + +SELECT pg_catalog.setval('ervu_dashboard.work_work_id_seq', 1, false); + +SELECT pg_catalog.setval('main_dashboard.appeals_id_appeal_seq', 796, true); + +SELECT pg_catalog.setval('main_dashboard.recruitment_campaign_id_recruitment_campaign_seq', 1522, true); + +SELECT pg_catalog.setval('main_dashboard.total_registered_id_total_registered_seq', 830, true); + +SELECT pg_catalog.setval('main_dashboard.waiting_registration_id_waiting_registration_seq', 742, true); + +SELECT pg_catalog.setval('public.job_log_id_job_seq', 1, false); + +SELECT pg_catalog.setval('ratings.appear_subppoena_id_appear_subppoena_seq', 6, true); + +SELECT pg_catalog.setval('ratings.consideration_complaint_id_consideration_complaint_seq', 6, true); + +SELECT pg_catalog.setval('ratings."ratings.conscription_info_id_ratings.conscription_info_seq"', 6, true); + +SELECT pg_catalog.setval('recruitment_campaign.recruitment_id_recruitment_seq', 2, true); + +SELECT pg_catalog.setval('recruitment_campaign.subpoenas_id_subpoena_seq', 1111, true); + +SELECT pg_catalog.setval('space.military_commissariat_id_military_commissariat_seq', 1, true); + +SELECT pg_catalog.setval('space.military_district_id_military_district_seq', 1, true); + +SELECT pg_catalog.setval('space.region_id_region_seq', 15, true); + +SELECT pg_catalog.setval('total_registered.age_id_age_seq', 2250, true); + +SELECT pg_catalog.setval('total_registered.child_minor_id_child_minor_seq', 2124, true); + +SELECT pg_catalog.setval('total_registered.driver_license_id_driver_license_seq', 1849, true); + +SELECT pg_catalog.setval('total_registered.reg_mil_cat_id_reg_mil_cat_seq', 885, true); + +SELECT pg_catalog.setval('total_registered.removed_registry_id_removed_registry_seq', 609, true); + +SELECT pg_catalog.setval('total_registered.subpoenas_id_subpoena_seq', 1184, true); ALTER TABLE IF EXISTS ONLY appeals.main_profile -ALTER -COLUMN id_main_profile -SET DEFAULT nextval('appeals.main_profile_id_main_profile_seq'::regclass); - + ADD CONSTRAINT pk_main_profile PRIMARY KEY (id_main_profile); ALTER TABLE IF EXISTS ONLY appeals.reasons_appeal -ALTER -COLUMN id_reasons_appeal -SET DEFAULT nextval('appeals.reasons_appeal_id_reasons_appeal_seq'::regclass); - + ADD CONSTRAINT pk_reasons_appeal PRIMARY KEY (id_reasons_appeal); ALTER TABLE IF EXISTS ONLY appeals.review_rating -ALTER -COLUMN id_review_rating -SET DEFAULT nextval('appeals.review_rating_id_review_rating_seq'::regclass); - + ADD CONSTRAINT pk_review_rating PRIMARY KEY (id_review_rating); ALTER TABLE IF EXISTS ONLY appeals.topic_appeal -ALTER -COLUMN id_topic_appeal -SET DEFAULT nextval('appeals.topic_appeal_id_topic_appeal_seq'::regclass); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_child -ALTER -COLUMN citizen_child_id -SET DEFAULT nextval('ervu_dashboard.citizen_child_citizen_child_id_seq'::regclass); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_guardianship -ALTER -COLUMN citizen_guardianship_id -SET DEFAULT nextval('ervu_dashboard.citizen_guardianship_citizen_guardianship_id_seq'::regclass); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_spouse -ALTER -COLUMN citizen_spouse_id -SET DEFAULT nextval('ervu_dashboard.citizen_spouse_citizen_spouse_id_seq'::regclass); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizenship -ALTER -COLUMN citizenship_id -SET DEFAULT nextval('ervu_dashboard.citizenship_citizenship_id_seq'::regclass); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizenship_foreign -ALTER -COLUMN citizenship_foreign_id -SET DEFAULT nextval('ervu_dashboard.citizenship_foreign_citizenship_foreign_id_seq'::regclass); + ADD CONSTRAINT pk_topic_appeal PRIMARY KEY (id_topic_appeal); +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen + ADD CONSTRAINT citizen_pkey PRIMARY KEY (recruit_id); ALTER TABLE IF EXISTS ONLY ervu_dashboard.decision -ALTER -COLUMN decision_id -SET DEFAULT nextval('ervu_dashboard.decision_decision_id_seq'::regclass); + ADD CONSTRAINT decision_pkey PRIMARY KEY (decision_id); +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_child + ADD CONSTRAINT pk_citizen_child PRIMARY KEY (citizen_child_id); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_guardianship + ADD CONSTRAINT pk_citizen_guardianship PRIMARY KEY (citizen_guardianship_id); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_spouse + ADD CONSTRAINT pk_citizen_spouse PRIMARY KEY (citizen_spouse_id); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizenship + ADD CONSTRAINT pk_citizenship PRIMARY KEY (citizenship_id); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizenship_foreign + ADD CONSTRAINT pk_citizenship_foreign PRIMARY KEY (citizenship_foreign_id); ALTER TABLE IF EXISTS ONLY ervu_dashboard.deputy -ALTER -COLUMN deputy_id -SET DEFAULT nextval('ervu_dashboard.deputy_deputy_id_seq'::regclass); - + ADD CONSTRAINT pk_deputy PRIMARY KEY (deputy_id); ALTER TABLE IF EXISTS ONLY ervu_dashboard.disability -ALTER -COLUMN disability_id -SET DEFAULT nextval('ervu_dashboard.disability_disability_id_seq'::regclass); - + ADD CONSTRAINT pk_disability PRIMARY KEY (disability_id); ALTER TABLE IF EXISTS ONLY ervu_dashboard.disease -ALTER -COLUMN disease_id -SET DEFAULT nextval('ervu_dashboard.disease_disease_id_seq'::regclass); - + ADD CONSTRAINT pk_disease PRIMARY KEY (disease_id); ALTER TABLE IF EXISTS ONLY ervu_dashboard.drivers_licence -ALTER -COLUMN drivers_licence_id -SET DEFAULT nextval('ervu_dashboard.drivers_licence_drivers_licence_id_seq'::regclass); - + ADD CONSTRAINT pk_drivers_licence PRIMARY KEY (drivers_licence_id); ALTER TABLE IF EXISTS ONLY ervu_dashboard.medical_authorities -ALTER -COLUMN medical_authorities_id -SET DEFAULT nextval('ervu_dashboard.medical_authorities_medical_authorities_id_seq'::regclass); - + ADD CONSTRAINT pk_medical_authorities PRIMARY KEY (medical_authorities_id); ALTER TABLE IF EXISTS ONLY ervu_dashboard.passport -ALTER -COLUMN passport_id -SET DEFAULT nextval('ervu_dashboard.passport_passport_id_seq'::regclass); - + ADD CONSTRAINT pk_passport PRIMARY KEY (passport_id); ALTER TABLE IF EXISTS ONLY ervu_dashboard.property -ALTER -COLUMN property_id -SET DEFAULT nextval('ervu_dashboard.property_property_id_seq'::regclass); - + ADD CONSTRAINT pk_property PRIMARY KEY (property_id); ALTER TABLE IF EXISTS ONLY ervu_dashboard.prosecution -ALTER -COLUMN prosecution_id -SET DEFAULT nextval('ervu_dashboard.prosecution_prosecution_id_seq'::regclass); - + ADD CONSTRAINT pk_prosecution PRIMARY KEY (prosecution_id); ALTER TABLE IF EXISTS ONLY ervu_dashboard.punishment -ALTER -COLUMN punishment_id -SET DEFAULT nextval('ervu_dashboard.punishment_punishment_id_seq'::regclass); - + ADD CONSTRAINT pk_punishment PRIMARY KEY (punishment_id); ALTER TABLE IF EXISTS ONLY ervu_dashboard.work -ALTER -COLUMN work_id -SET DEFAULT nextval('ervu_dashboard.work_work_id_seq'::regclass); + ADD CONSTRAINT pk_work PRIMARY KEY (work_id); +ALTER TABLE IF EXISTS ONLY ervu_dashboard.pub_recruitment + ADD CONSTRAINT pub_recruitment_pkey PRIMARY KEY (id); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.pub_recruitment + ADD CONSTRAINT recruitment_idm_id_key UNIQUE (idm_id); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.recruitment + ADD CONSTRAINT recruitment_pkey PRIMARY KEY (id); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.subpoena + ADD CONSTRAINT subpoena_pkey PRIMARY KEY (sub_id); + +ALTER TABLE IF EXISTS ONLY ervu_dashboard.temporary_measures + ADD CONSTRAINT temporary_measures_pkey PRIMARY KEY (temporary_measures_id); ALTER TABLE IF EXISTS ONLY main_dashboard.appeals -ALTER -COLUMN id_appeal -SET DEFAULT nextval('main_dashboard.appeals_id_appeal_seq'::regclass); - + ADD CONSTRAINT appeals_pkey PRIMARY KEY (recruitment_id, recording_date); ALTER TABLE IF EXISTS ONLY main_dashboard.recruitment_campaign -ALTER -COLUMN id_recruitment_campaign -SET DEFAULT nextval('main_dashboard.recruitment_campaign_id_recruitment_campaign_seq'::regclass); - + ADD CONSTRAINT recruitment_campaign_pkey PRIMARY KEY (spring_autumn, recruitment_id, recording_date); ALTER TABLE IF EXISTS ONLY main_dashboard.total_registered -ALTER -COLUMN id_total_registered -SET DEFAULT nextval('main_dashboard.total_registered_id_total_registered_seq'::regclass); - + ADD CONSTRAINT total_registered_pkey PRIMARY KEY (recruitment_id, recording_date); ALTER TABLE IF EXISTS ONLY main_dashboard.waiting_registration -ALTER -COLUMN id_waiting_registration -SET DEFAULT nextval('main_dashboard.waiting_registration_id_waiting_registration_seq'::regclass); - + ADD CONSTRAINT waiting_registration_pkey PRIMARY KEY (recruitment_id, recording_date); ALTER TABLE IF EXISTS ONLY public.job_log -ALTER -COLUMN id_job -SET DEFAULT nextval('public.job_log_id_job_seq'::regclass); - + ADD CONSTRAINT job_log_pkey PRIMARY KEY (id_job); ALTER TABLE IF EXISTS ONLY ratings.appear_subppoena -ALTER -COLUMN id_appear_subppoena -SET DEFAULT nextval('ratings.appear_subppoena_id_appear_subppoena_seq'::regclass); + ADD CONSTRAINT pk_appear_subppoena PRIMARY KEY (id_appear_subppoena); +ALTER TABLE IF EXISTS ONLY ratings.conscription_info + ADD CONSTRAINT pk_conscription_info PRIMARY KEY (conscription_info_id); ALTER TABLE IF EXISTS ONLY ratings.consideration_complaint -ALTER -COLUMN id_consideration_complaint -SET DEFAULT nextval('ratings.consideration_complaint_id_consideration_complaint_seq'::regclass); + ADD CONSTRAINT pk_consideration_complaint PRIMARY KEY (id_consideration_complaint); +ALTER TABLE IF EXISTS ONLY recruitment_campaign.appeals + ADD CONSTRAINT appeals_pkey PRIMARY KEY (recording_date, spring_autumn, recruitment_id); ALTER TABLE IF EXISTS ONLY recruitment_campaign.postponement_info -ALTER -COLUMN postponement_info_id -SET DEFAULT nextval('recruitment_campaign.recruitment_id_recruitment_seq'::regclass); - + ADD CONSTRAINT pk_postponement_info PRIMARY KEY (postponement_info_id); ALTER TABLE IF EXISTS ONLY recruitment_campaign.subpoenas -ALTER -COLUMN id_subpoena -SET DEFAULT nextval('recruitment_campaign.subpoenas_id_subpoena_seq'::regclass); - - -ALTER TABLE IF EXISTS ONLY space.military_commissariat -ALTER -COLUMN id_military_commissariat -SET DEFAULT nextval('space.military_commissariat_id_military_commissariat_seq'::regclass); - + ADD CONSTRAINT subpoenas_pkey PRIMARY KEY (spring_autumn, recruitment_id, recording_date); ALTER TABLE IF EXISTS ONLY space.military_district -ALTER -COLUMN id_military_district -SET DEFAULT nextval('space.military_district_id_military_district_seq'::regclass); + ADD CONSTRAINT military_district_pkey PRIMARY KEY (id_military_district); +ALTER TABLE IF EXISTS ONLY space.military_commissariat + ADD CONSTRAINT pk_military_commissariat PRIMARY KEY (id_military_commissariat); ALTER TABLE IF EXISTS ONLY space.region -ALTER -COLUMN id_region -SET DEFAULT nextval('space.region_id_region_seq'::regclass); + ADD CONSTRAINT pk_region PRIMARY KEY (id_region); +ALTER TABLE IF EXISTS ONLY space.testrecruitment + ADD CONSTRAINT testrecruitment_pkey PRIMARY KEY (id); ALTER TABLE IF EXISTS ONLY total_registered.age -ALTER -COLUMN id_age -SET DEFAULT nextval('total_registered.age_id_age_seq'::regclass); + ADD CONSTRAINT age_pkey PRIMARY KEY (registered, recruitment_id, recording_date, "all_M_W"); +ALTER TABLE IF EXISTS ONLY total_registered.busyness + ADD CONSTRAINT busyness_pkey PRIMARY KEY (recording_date, recruitment_id, registered, "all_M_W"); ALTER TABLE IF EXISTS ONLY total_registered.child_minor -ALTER -COLUMN id_child_minor -SET DEFAULT nextval('total_registered.child_minor_id_child_minor_seq'::regclass); - + ADD CONSTRAINT child_minor_pkey PRIMARY KEY ("all_M_W", recording_date, recruitment_id); ALTER TABLE IF EXISTS ONLY total_registered.driver_license -ALTER -COLUMN id_driver_license -SET DEFAULT nextval('total_registered.driver_license_id_driver_license_seq'::regclass); + ADD CONSTRAINT driver_license_pkey PRIMARY KEY (recruitment_id, "all_M_W", recording_date); +ALTER TABLE IF EXISTS ONLY total_registered.education_level + ADD CONSTRAINT education_level_pkey PRIMARY KEY ("all_M_W", recording_date, recruitment_id); + +ALTER TABLE IF EXISTS ONLY total_registered.marital_status + ADD CONSTRAINT marital_status_pkey PRIMARY KEY (recruitment_id, recording_date, "all_M_W"); ALTER TABLE IF EXISTS ONLY total_registered.reg_mil_cat -ALTER -COLUMN id_reg_mil_cat -SET DEFAULT nextval('total_registered.reg_mil_cat_id_reg_mil_cat_seq'::regclass); - + ADD CONSTRAINT reg_mil_cat_pkey PRIMARY KEY (mil_reg, recruitment_id, recording_date); ALTER TABLE IF EXISTS ONLY total_registered.removed_registry -ALTER -COLUMN id_removed_registry -SET DEFAULT nextval('total_registered.removed_registry_id_removed_registry_seq'::regclass); - + ADD CONSTRAINT removed_registry_pkey PRIMARY KEY (recruitment_id, recording_date); ALTER TABLE IF EXISTS ONLY total_registered.subpoenas -ALTER -COLUMN id_subpoena -SET DEFAULT nextval('total_registered.subpoenas_id_subpoena_seq'::regclass); - - -SELECT pg_catalog.setval('appeals.main_profile_id_main_profile_seq', 1, FALSE); - - -SELECT pg_catalog.setval('appeals.reasons_appeal_id_reasons_appeal_seq', 1, TRUE); - - -SELECT pg_catalog.setval('appeals.review_rating_id_review_rating_seq', 6, TRUE); - - -SELECT pg_catalog.setval('appeals.topic_appeal_id_topic_appeal_seq', 1, TRUE); - - -SELECT pg_catalog.setval('ervu_dashboard.citizen_child_citizen_child_id_seq', 132950, TRUE); - - -SELECT pg_catalog.setval('ervu_dashboard.citizen_guardianship_citizen_guardianship_id_seq', 4653, - TRUE); - - -SELECT pg_catalog.setval('ervu_dashboard.citizen_spouse_citizen_spouse_id_seq', 229504, TRUE); - - -SELECT pg_catalog.setval('ervu_dashboard.citizenship_citizenship_id_seq', 69012, TRUE); - - -SELECT pg_catalog.setval('ervu_dashboard.citizenship_foreign_citizenship_foreign_id_seq', 71568, - TRUE); - - -SELECT pg_catalog.setval('ervu_dashboard.decision_decision_id_seq', 1, FALSE); - - -SELECT pg_catalog.setval('ervu_dashboard.deputy_deputy_id_seq', 47, TRUE); - - -SELECT pg_catalog.setval('ervu_dashboard.disability_disability_id_seq', 94609, TRUE); - - -SELECT pg_catalog.setval('ervu_dashboard.disease_disease_id_seq', 198170, TRUE); - - -SELECT pg_catalog.setval('ervu_dashboard.drivers_licence_drivers_licence_id_seq', 7056, TRUE); - - -SELECT pg_catalog.setval('ervu_dashboard.medical_authorities_medical_authorities_id_seq', 298794, - TRUE); - - -SELECT pg_catalog.setval('ervu_dashboard.passport_passport_id_seq', 53048, TRUE); - - -SELECT pg_catalog.setval('ervu_dashboard.property_property_id_seq', 372952, TRUE); - - -SELECT pg_catalog.setval('ervu_dashboard.prosecution_prosecution_id_seq', 44, TRUE); - - -SELECT pg_catalog.setval('ervu_dashboard.punishment_punishment_id_seq', 22, TRUE); - - -SELECT pg_catalog.setval('ervu_dashboard.subpoena_subpoena_id_seq', 27501, TRUE); - - -SELECT pg_catalog.setval('ervu_dashboard.temporary_measures_temporary_measures_id_seq', 12191, - TRUE); - - -SELECT pg_catalog.setval('ervu_dashboard.testrecruitment_sort_seq', 90, TRUE); - - -SELECT pg_catalog.setval('ervu_dashboard.work_work_id_seq', 1, FALSE); - - -SELECT pg_catalog.setval('main_dashboard.appeals_id_appeal_seq', 796, TRUE); - - -SELECT pg_catalog.setval('main_dashboard.recruitment_campaign_id_recruitment_campaign_seq', 1522, - TRUE); - - -SELECT pg_catalog.setval('main_dashboard.total_registered_id_total_registered_seq', 830, TRUE); - - -SELECT pg_catalog.setval('main_dashboard.waiting_registration_id_waiting_registration_seq', 742, - TRUE); - - -SELECT pg_catalog.setval('public.job_log_id_job_seq', 1, FALSE); - - -SELECT pg_catalog.setval('ratings.appear_subppoena_id_appear_subppoena_seq', 6, TRUE); - - -SELECT pg_catalog.setval('ratings.consideration_complaint_id_consideration_complaint_seq', 6, TRUE); - - -SELECT pg_catalog.setval('ratings."ratings.conscription_info_id_ratings.conscription_info_seq"', 6, - TRUE); - - -SELECT pg_catalog.setval('recruitment_campaign.recruitment_id_recruitment_seq', 2, TRUE); - - -SELECT pg_catalog.setval('recruitment_campaign.subpoenas_id_subpoena_seq', 1111, TRUE); - - -SELECT pg_catalog.setval('space.military_commissariat_id_military_commissariat_seq', 1, TRUE); - - -SELECT pg_catalog.setval('space.military_district_id_military_district_seq', 1, TRUE); - - -SELECT pg_catalog.setval('space.region_id_region_seq', 15, TRUE); - - -SELECT pg_catalog.setval('total_registered.age_id_age_seq', 2250, TRUE); - - -SELECT pg_catalog.setval('total_registered.child_minor_id_child_minor_seq', 2124, TRUE); - - -SELECT pg_catalog.setval('total_registered.driver_license_id_driver_license_seq', 1849, TRUE); - - -SELECT pg_catalog.setval('total_registered.reg_mil_cat_id_reg_mil_cat_seq', 885, TRUE); - - -SELECT pg_catalog.setval('total_registered.removed_registry_id_removed_registry_seq', 609, TRUE); - - -SELECT pg_catalog.setval('total_registered.subpoenas_id_subpoena_seq', 1184, TRUE); - - -ALTER TABLE IF EXISTS ONLY appeals.main_profile ADD CONSTRAINT pk_main_profile PRIMARY KEY (id_main_profile); - - -ALTER TABLE IF EXISTS ONLY appeals.reasons_appeal ADD CONSTRAINT pk_reasons_appeal PRIMARY KEY (id_reasons_appeal); - - -ALTER TABLE IF EXISTS ONLY appeals.review_rating ADD CONSTRAINT pk_review_rating PRIMARY KEY (id_review_rating); - - -ALTER TABLE IF EXISTS ONLY appeals.topic_appeal ADD CONSTRAINT pk_topic_appeal PRIMARY KEY (id_topic_appeal); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen ADD CONSTRAINT citizen_pkey PRIMARY KEY (recruit_id); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.decision ADD CONSTRAINT decision_pkey PRIMARY KEY (decision_id); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_child ADD CONSTRAINT pk_citizen_child PRIMARY KEY (citizen_child_id); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_guardianship ADD CONSTRAINT pk_citizen_guardianship PRIMARY KEY (citizen_guardianship_id); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizen_spouse ADD CONSTRAINT pk_citizen_spouse PRIMARY KEY (citizen_spouse_id); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizenship ADD CONSTRAINT pk_citizenship PRIMARY KEY (citizenship_id); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.citizenship_foreign ADD CONSTRAINT pk_citizenship_foreign PRIMARY KEY (citizenship_foreign_id); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.deputy ADD CONSTRAINT pk_deputy PRIMARY KEY (deputy_id); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.disability ADD CONSTRAINT pk_disability PRIMARY KEY (disability_id); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.disease ADD CONSTRAINT pk_disease PRIMARY KEY (disease_id); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.drivers_licence ADD CONSTRAINT pk_drivers_licence PRIMARY KEY (drivers_licence_id); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.medical_authorities ADD CONSTRAINT pk_medical_authorities PRIMARY KEY (medical_authorities_id); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.passport ADD CONSTRAINT pk_passport PRIMARY KEY (passport_id); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.property ADD CONSTRAINT pk_property PRIMARY KEY (property_id); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.prosecution ADD CONSTRAINT pk_prosecution PRIMARY KEY (prosecution_id); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.punishment ADD CONSTRAINT pk_punishment PRIMARY KEY (punishment_id); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.work ADD CONSTRAINT pk_work PRIMARY KEY (work_id); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.pub_recruitment ADD CONSTRAINT pub_recruitment_pkey PRIMARY KEY (id); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.pub_recruitment ADD CONSTRAINT recruitment_idm_id_key UNIQUE (idm_id); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.recruitment ADD CONSTRAINT recruitment_pkey PRIMARY KEY (id); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.subpoena ADD CONSTRAINT subpoena_pkey PRIMARY KEY (sub_id); - - -ALTER TABLE IF EXISTS ONLY ervu_dashboard.temporary_measures ADD CONSTRAINT temporary_measures_pkey PRIMARY KEY (temporary_measures_id); - - -ALTER TABLE IF EXISTS ONLY main_dashboard.appeals ADD CONSTRAINT appeals_pkey PRIMARY KEY (recruitment_id, - recording_date); - - -ALTER TABLE IF EXISTS ONLY main_dashboard.recruitment_campaign ADD CONSTRAINT recruitment_campaign_pkey PRIMARY KEY (spring_autumn, - recruitment_id, - recording_date); - - -ALTER TABLE IF EXISTS ONLY main_dashboard.total_registered ADD CONSTRAINT total_registered_pkey PRIMARY KEY (recruitment_id, - recording_date); - - -ALTER TABLE IF EXISTS ONLY main_dashboard.waiting_registration ADD CONSTRAINT waiting_registration_pkey PRIMARY KEY (recruitment_id, - recording_date); - - -ALTER TABLE IF EXISTS ONLY public.job_log ADD CONSTRAINT job_log_pkey PRIMARY KEY (id_job); - - -ALTER TABLE IF EXISTS ONLY ratings.appear_subppoena ADD CONSTRAINT pk_appear_subppoena PRIMARY KEY (id_appear_subppoena); - - -ALTER TABLE IF EXISTS ONLY ratings.conscription_info ADD CONSTRAINT pk_conscription_info PRIMARY KEY (conscription_info_id); - - -ALTER TABLE IF EXISTS ONLY ratings.consideration_complaint ADD CONSTRAINT pk_consideration_complaint PRIMARY KEY (id_consideration_complaint); - - -ALTER TABLE IF EXISTS ONLY recruitment_campaign.appeals ADD CONSTRAINT appeals_pkey PRIMARY KEY (recording_date, - spring_autumn, - recruitment_id); - - -ALTER TABLE IF EXISTS ONLY recruitment_campaign.postponement_info ADD CONSTRAINT pk_postponement_info PRIMARY KEY (postponement_info_id); - - -ALTER TABLE IF EXISTS ONLY recruitment_campaign.subpoenas ADD CONSTRAINT subpoenas_pkey PRIMARY KEY (spring_autumn, - recruitment_id, - recording_date); - - -ALTER TABLE IF EXISTS ONLY space.military_district ADD CONSTRAINT military_district_pkey PRIMARY KEY (id_military_district); - - -ALTER TABLE IF EXISTS ONLY space.military_commissariat ADD CONSTRAINT pk_military_commissariat PRIMARY KEY (id_military_commissariat); - - -ALTER TABLE IF EXISTS ONLY space.region ADD CONSTRAINT pk_region PRIMARY KEY (id_region); - - -ALTER TABLE IF EXISTS ONLY space.testrecruitment ADD CONSTRAINT testrecruitment_pkey PRIMARY KEY (id); - - -ALTER TABLE IF EXISTS ONLY total_registered.age ADD CONSTRAINT age_pkey PRIMARY KEY (registered, - recruitment_id, - recording_date, - "all_M_W"); - - -ALTER TABLE IF EXISTS ONLY total_registered.busyness ADD CONSTRAINT busyness_pkey PRIMARY KEY (recording_date, - recruitment_id, - registered, - "all_M_W"); - - -ALTER TABLE IF EXISTS ONLY total_registered.child_minor ADD CONSTRAINT child_minor_pkey PRIMARY KEY ("all_M_W", - recording_date, - recruitment_id); - - -ALTER TABLE IF EXISTS ONLY total_registered.driver_license ADD CONSTRAINT driver_license_pkey PRIMARY KEY (recruitment_id, - "all_M_W", - recording_date); - - -ALTER TABLE IF EXISTS ONLY total_registered.education_level ADD CONSTRAINT education_level_pkey PRIMARY KEY ("all_M_W", - recording_date, - recruitment_id); - - -ALTER TABLE IF EXISTS ONLY total_registered.marital_status ADD CONSTRAINT marital_status_pkey PRIMARY KEY (recruitment_id, - recording_date, - "all_M_W"); - - -ALTER TABLE IF EXISTS ONLY total_registered.reg_mil_cat ADD CONSTRAINT reg_mil_cat_pkey PRIMARY KEY (mil_reg, - recruitment_id, - recording_date); - - -ALTER TABLE IF EXISTS ONLY total_registered.removed_registry ADD CONSTRAINT removed_registry_pkey PRIMARY KEY (recruitment_id, - recording_date); - - -ALTER TABLE IF EXISTS ONLY total_registered.subpoenas ADD CONSTRAINT subpoenas_pkey PRIMARY KEY (mil_reg, - recruitment_id, - recording_date); - + ADD CONSTRAINT subpoenas_pkey PRIMARY KEY (mil_reg, recruitment_id, recording_date); CREATE INDEX fki_main_profile_fk1 ON appeals.main_profile USING btree (recruitment_id); - CREATE INDEX fki_reasons_appeal_fk1 ON appeals.reasons_appeal USING btree (recruitment_id); - CREATE INDEX fki_review_rating_fk1 ON appeals.review_rating USING btree (recruitment_id); - CREATE INDEX fki_topic_appeal_fk1 ON appeals.topic_appeal USING btree (recruitment_id); - CREATE INDEX recruitment_military_code_idx ON ervu_dashboard.pub_recruitment USING btree (military_code); - CREATE INDEX recruitment_parent_idx ON ervu_dashboard.pub_recruitment USING btree (parent_id); - CREATE INDEX subpoena_send_date_idx ON ervu_dashboard.subpoena USING btree (send_date); - CREATE INDEX fki_md_appeals_fk1 ON main_dashboard.appeals USING btree (recruitment_id); - CREATE INDEX fki_recruitment_campaign_fk1 ON main_dashboard.recruitment_campaign USING btree (recruitment_id); - CREATE INDEX fki_total_registered_fk1 ON main_dashboard.total_registered USING btree (recruitment_id); - CREATE INDEX fki_waiting_registration_fk1 ON main_dashboard.waiting_registration USING btree (recruitment_id); - CREATE INDEX fki_appear_subppoena_fk1 ON ratings.appear_subppoena USING btree (recruitment_id); - CREATE INDEX fki_consideration_complaint_fk1 ON ratings.consideration_complaint USING btree (recruitment_id); - CREATE INDEX fki_recruitment_fk1 ON ratings.conscription_info USING btree (recruitment_id); - CREATE INDEX fki_rc_appeals_fk1 ON recruitment_campaign.appeals USING btree (recruitment_id); - CREATE INDEX fki_recruitment_fk1 ON recruitment_campaign.postponement_info USING btree (recruitment_id); - CREATE INDEX fki_subpoenas_fk1 ON recruitment_campaign.subpoenas USING btree (recruitment_id); - CREATE INDEX fki_age_fk1 ON total_registered.age USING btree (recruitment_id); - CREATE INDEX fki_busyness_fk1 ON total_registered.busyness USING btree (recruitment_id); - CREATE INDEX fki_child_minor_fk1 ON total_registered.child_minor USING btree (recruitment_id); - CREATE INDEX fki_driver_license_fk1 ON total_registered.driver_license USING btree (recruitment_id); - CREATE INDEX fki_education_level_fk1 ON total_registered.education_level USING btree (recruitment_id); - CREATE INDEX fki_marital_status_fk1 ON total_registered.marital_status USING btree (recruitment_id); - CREATE INDEX fki_reg_mil_cat_fk1 ON total_registered.reg_mil_cat USING btree (recruitment_id); - CREATE INDEX fki_subpoenas_fk1 ON total_registered.subpoenas USING btree (recruitment_id); +ALTER TABLE IF EXISTS ONLY appeals.review_rating + ADD CONSTRAINT fk_region FOREIGN KEY (id_region) REFERENCES space.region(id_region) NOT VALID; -ALTER TABLE IF EXISTS ONLY appeals.review_rating ADD CONSTRAINT fk_region - FOREIGN KEY (id_region) REFERENCES space.region(id_region) NOT VALID; +ALTER TABLE IF EXISTS ONLY appeals.main_profile + ADD CONSTRAINT main_profile_fk1 FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.pub_recruitment(id); + +ALTER TABLE IF EXISTS ONLY appeals.reasons_appeal + ADD CONSTRAINT reasons_appeal_fk1 FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.pub_recruitment(id); + +ALTER TABLE IF EXISTS ONLY appeals.topic_appeal + ADD CONSTRAINT topic_appeal_fk1 FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.pub_recruitment(id); + +ALTER TABLE IF EXISTS ONLY ratings.appear_subppoena + ADD CONSTRAINT appear_subppoena_fk1 FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.recruitment(id); + +ALTER TABLE IF EXISTS ONLY ratings.conscription_info + ADD CONSTRAINT conscription_info_fk1 FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.recruitment(id); + +ALTER TABLE IF EXISTS ONLY ratings.conscription_info + ADD CONSTRAINT conscription_info_fk2 FOREIGN KEY (id_region) REFERENCES space.region(id_region) NOT VALID; + +ALTER TABLE IF EXISTS ONLY ratings.consideration_complaint + ADD CONSTRAINT consideration_complaint_fk1 FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.pub_recruitment(id); + +ALTER TABLE IF EXISTS ONLY ratings.appear_subppoena + ADD CONSTRAINT fk_region FOREIGN KEY (id_region) REFERENCES space.region(id_region) NOT VALID; + +ALTER TABLE IF EXISTS ONLY ratings.consideration_complaint + ADD CONSTRAINT fk_region FOREIGN KEY (id_region) REFERENCES space.region(id_region) NOT VALID; + +ALTER TABLE IF EXISTS ONLY recruitment_campaign.postponement_info + ADD CONSTRAINT postponement_info_fk1 FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.recruitment(id) NOT VALID; + +GRANT ALL ON SCHEMA public TO "ervu-dashboard"; -ALTER TABLE IF EXISTS ONLY appeals.main_profile ADD CONSTRAINT main_profile_fk1 - FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.pub_recruitment(id); - - -ALTER TABLE IF EXISTS ONLY appeals.reasons_appeal ADD CONSTRAINT reasons_appeal_fk1 - FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.pub_recruitment(id); - - -ALTER TABLE IF EXISTS ONLY appeals.topic_appeal ADD CONSTRAINT topic_appeal_fk1 - FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.pub_recruitment(id); - - -ALTER TABLE IF EXISTS ONLY ratings.appear_subppoena ADD CONSTRAINT appear_subppoena_fk1 - FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.recruitment(id); - - -ALTER TABLE IF EXISTS ONLY ratings.conscription_info ADD CONSTRAINT conscription_info_fk1 - FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.recruitment(id); - - -ALTER TABLE IF EXISTS ONLY ratings.conscription_info ADD CONSTRAINT conscription_info_fk2 - FOREIGN KEY (id_region) REFERENCES space.region(id_region) NOT VALID; - - -ALTER TABLE IF EXISTS ONLY ratings.consideration_complaint ADD CONSTRAINT consideration_complaint_fk1 - FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.pub_recruitment(id); - - -ALTER TABLE IF EXISTS ONLY ratings.appear_subppoena ADD CONSTRAINT fk_region - FOREIGN KEY (id_region) REFERENCES space.region(id_region) NOT VALID; - - -ALTER TABLE IF EXISTS ONLY ratings.consideration_complaint ADD CONSTRAINT fk_region - FOREIGN KEY (id_region) REFERENCES space.region(id_region) NOT VALID; - - -ALTER TABLE IF EXISTS ONLY recruitment_campaign.postponement_info ADD CONSTRAINT postponement_info_fk1 - FOREIGN KEY (recruitment_id) REFERENCES ervu_dashboard.recruitment(id) NOT VALID; - -GRANT -ALL -ON SCHEMA PUBLIC TO "ervu-dashboard"; \ No newline at end of file From f999ea41145a3ab8f7af7b56e2d3c788840307f4 Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Fri, 18 Oct 2024 17:10:56 +0300 Subject: [PATCH 24/49] SUPPORT-8617: fix --- .../main/resources/config/sql_files/ervu-dashboard-copy.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql b/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql index 113b55cc..ef2c332e 100644 --- a/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql +++ b/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql @@ -1031,7 +1031,7 @@ COMMENT ON COLUMN ervu_dashboard.subpoena.method_delivery IS 'способ вр ALTER TABLE IF EXISTS ervu_dashboard.subpoena ALTER COLUMN sub_id ADD GENERATED BY DEFAULT AS IDENTITY ( SEQUENCE NAME ervu_dashboard.subpoena_subpoena_id_seq - START WITH 2 + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE @@ -1079,7 +1079,7 @@ COMMENT ON COLUMN ervu_dashboard.temporary_measures.applied_fact IS 'факт п ALTER TABLE IF EXISTS ervu_dashboard.temporary_measures ALTER COLUMN temporary_measures_id ADD GENERATED BY DEFAULT AS IDENTITY ( SEQUENCE NAME ervu_dashboard.temporary_measures_temporary_measures_id_seq - START WITH 2 + START WITH 1 INCREMENT BY 1 NO MINVALUE NO MAXVALUE From 3c9a9add890dd3900eb1643554d4a469213b8eea Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Fri, 18 Oct 2024 17:20:43 +0300 Subject: [PATCH 25/49] SUPPORT-8617: fix --- .../src/main/resources/config/sql_files/ervu-dashboard-copy.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql b/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql index ef2c332e..d7051782 100644 --- a/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql +++ b/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql @@ -1758,7 +1758,7 @@ ALTER TABLE IF EXISTS total_registered.age OWNER TO "ervu-dashboard"; COMMENT ON TABLE total_registered.age IS 'Возраст состоящих/не состоящих, мужчин/женщин/всех на учете уровень РФ'; -COMMENT ON COLUMN total_registered.age."17_yaers" IS 'Возраст 17'; +COMMENT ON COLUMN total_registered.age."17_years" IS 'Возраст 17'; COMMENT ON COLUMN total_registered.age."18-26_years" IS 'Возраст 18-26'; From 2f6424f1a0ae1d758ae3303c2d2fe4bd7da909c3 Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Fri, 18 Oct 2024 17:21:44 +0300 Subject: [PATCH 26/49] SUPPORT-8617: fix --- .../src/main/resources/config/sql_files/ervu-dashboard-copy.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql b/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql index d7051782..cb99bdac 100644 --- a/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql +++ b/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql @@ -1778,7 +1778,7 @@ COMMENT ON COLUMN total_registered.age.recording_date IS 'Дата записи' COMMENT ON COLUMN total_registered.age."46-50_years" IS 'Возраст 46-50'; -COMMENT ON COLUMN total_registered.age."17_yaers_percent" IS 'Возраст 17 в процентах'; +COMMENT ON COLUMN total_registered.age."17_years_percent" IS 'Возраст 17 в процентах'; COMMENT ON COLUMN total_registered.age."18-26_years_percent" IS 'Возраст 18-26 в процентах'; From 56d5196ca7428ef391dc1b328b81ca5916d80ff6 Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Mon, 21 Oct 2024 10:40:19 +0300 Subject: [PATCH 27/49] SUPPORT-8617: add preconditions --- ...41018-SUPPORT-8617-init-ervu_dashboard.xml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml b/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml index e9869f61..04df13f7 100644 --- a/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml +++ b/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml @@ -4,6 +4,11 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd"> + + + SELECT COUNT(*) FROM pg_roles WHERE rolname = 'ervu_dashboard'; + + CREATE ROLE "ervu-dashboard" WITH LOGIN @@ -17,6 +22,11 @@ + + + SELECT COUNT(*) FROM pg_roles WHERE rolname = 'postgres'; + + CREATE ROLE postgres WITH LOGIN @@ -30,10 +40,20 @@ + + + SELECT COUNT(*) FROM information_schema.schemata WHERE schema_name = 'ervu_dashboard'; + + + + + SELECT COUNT(*) FROM ervu_dashboard.pub_recruitment; + + INSERT INTO ervu_dashboard.pub_recruitment (idm_id, parent_id, military_code, shortname, fullname, code, id, sort) From 20a0685d9d81ba0c9afaad692d30e4a939291763 Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Mon, 21 Oct 2024 10:41:08 +0300 Subject: [PATCH 28/49] Revert "SUPPORT-8617: add preconditions" This reverts commit 56d5196ca7428ef391dc1b328b81ca5916d80ff6. --- ...41018-SUPPORT-8617-init-ervu_dashboard.xml | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml b/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml index 04df13f7..e9869f61 100644 --- a/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml +++ b/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml @@ -4,11 +4,6 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd"> - - - SELECT COUNT(*) FROM pg_roles WHERE rolname = 'ervu_dashboard'; - - CREATE ROLE "ervu-dashboard" WITH LOGIN @@ -22,11 +17,6 @@ - - - SELECT COUNT(*) FROM pg_roles WHERE rolname = 'postgres'; - - CREATE ROLE postgres WITH LOGIN @@ -40,20 +30,10 @@ - - - SELECT COUNT(*) FROM information_schema.schemata WHERE schema_name = 'ervu_dashboard'; - - - - - SELECT COUNT(*) FROM ervu_dashboard.pub_recruitment; - - INSERT INTO ervu_dashboard.pub_recruitment (idm_id, parent_id, military_code, shortname, fullname, code, id, sort) From f5667bd88079625df44a14db8c6e4cf89bd3e3bf Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Mon, 21 Oct 2024 10:59:13 +0300 Subject: [PATCH 29/49] SUPPORT-8617: add preconditions --- ...41018-SUPPORT-8617-init-ervu_dashboard.xml | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml b/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml index e9869f61..dd8ae386 100644 --- a/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml +++ b/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml @@ -4,6 +4,11 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd"> + + + SELECT COUNT(*) FROM pg_roles WHERE rolname = 'ervu-dashboard'; + + CREATE ROLE "ervu-dashboard" WITH LOGIN @@ -17,6 +22,11 @@ + + + SELECT COUNT(*) FROM pg_roles WHERE rolname = 'postgres'; + + CREATE ROLE postgres WITH LOGIN @@ -30,10 +40,38 @@ + + + SELECT COUNT(*) FROM information_schema.schemata WHERE schema_name = 'ervu_dashboard'; + + + SELECT COUNT(*) FROM information_schema.schemata WHERE schema_name = 'appeals'; + + + SELECT COUNT(*) FROM information_schema.schemata WHERE schema_name = 'main_dashboard'; + + + SELECT COUNT(*) FROM information_schema.schemata WHERE schema_name = 'ratings'; + + + SELECT COUNT(*) FROM information_schema.schemata WHERE schema_name = 'recruitment_campaign'; + + + SELECT COUNT(*) FROM information_schema.schemata WHERE schema_name = 'space'; + + + SELECT COUNT(*) FROM information_schema.schemata WHERE schema_name = 'total_registered'; + + + + + SELECT COUNT(*) FROM ervu_dashboard.pub_recruitment; + + INSERT INTO ervu_dashboard.pub_recruitment (idm_id, parent_id, military_code, shortname, fullname, code, id, sort) From 50e898a191405e27561828e85d00596c751a60bc Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Mon, 21 Oct 2024 11:50:52 +0300 Subject: [PATCH 30/49] SUPPORT-8617: fix preconditions --- ...41018-SUPPORT-8617-init-ervu_dashboard.xml | 41 ++----------------- 1 file changed, 3 insertions(+), 38 deletions(-) diff --git a/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml b/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml index dd8ae386..32a5a184 100644 --- a/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml +++ b/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml @@ -24,49 +24,14 @@ - SELECT COUNT(*) FROM pg_roles WHERE rolname = 'postgres'; - - - - CREATE ROLE postgres WITH - LOGIN - NOSUPERUSER - INHERIT - NOCREATEDB - NOCREATEROLE - NOREPLICATION - PASSWORD 'postgres'; - - - - - - - SELECT COUNT(*) FROM information_schema.schemata WHERE schema_name = 'ervu_dashboard'; - - - SELECT COUNT(*) FROM information_schema.schemata WHERE schema_name = 'appeals'; - - - SELECT COUNT(*) FROM information_schema.schemata WHERE schema_name = 'main_dashboard'; - - - SELECT COUNT(*) FROM information_schema.schemata WHERE schema_name = 'ratings'; - - - SELECT COUNT(*) FROM information_schema.schemata WHERE schema_name = 'recruitment_campaign'; - - - SELECT COUNT(*) FROM information_schema.schemata WHERE schema_name = 'space'; - - - SELECT COUNT(*) FROM information_schema.schemata WHERE schema_name = 'total_registered'; + SELECT COUNT(*) FROM information_schema.schemata WHERE schema_name IN('ervu_dashboard', 'appeals', 'main_dashboard', + 'ratings', 'recruitment_campaign', 'space', 'total_registered'); - + SELECT COUNT(*) FROM ervu_dashboard.pub_recruitment; From cf80bc4af4ed3390e4c2c99b1b678d2d0d983031 Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Mon, 21 Oct 2024 13:06:41 +0300 Subject: [PATCH 31/49] SUPPORT-8617: fix dumb file --- .../config/sql_files/ervu-dashboard-copy.sql | 84 ------------------- 1 file changed, 84 deletions(-) diff --git a/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql b/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql index cb99bdac..86295d88 100644 --- a/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql +++ b/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql @@ -2310,90 +2310,6 @@ ALTER TABLE IF EXISTS ONLY total_registered.removed_registry ALTER COLUMN id_rem ALTER TABLE IF EXISTS ONLY total_registered.subpoenas ALTER COLUMN id_subpoena SET DEFAULT nextval('total_registered.subpoenas_id_subpoena_seq'::regclass); -SELECT pg_catalog.setval('appeals.main_profile_id_main_profile_seq', 1, false); - -SELECT pg_catalog.setval('appeals.reasons_appeal_id_reasons_appeal_seq', 1, true); - -SELECT pg_catalog.setval('appeals.review_rating_id_review_rating_seq', 6, true); - -SELECT pg_catalog.setval('appeals.topic_appeal_id_topic_appeal_seq', 1, true); - -SELECT pg_catalog.setval('ervu_dashboard.citizen_child_citizen_child_id_seq', 132950, true); - -SELECT pg_catalog.setval('ervu_dashboard.citizen_guardianship_citizen_guardianship_id_seq', 4653, true); - -SELECT pg_catalog.setval('ervu_dashboard.citizen_spouse_citizen_spouse_id_seq', 229504, true); - -SELECT pg_catalog.setval('ervu_dashboard.citizenship_citizenship_id_seq', 69012, true); - -SELECT pg_catalog.setval('ervu_dashboard.citizenship_foreign_citizenship_foreign_id_seq', 71568, true); - -SELECT pg_catalog.setval('ervu_dashboard.decision_decision_id_seq', 1, false); - -SELECT pg_catalog.setval('ervu_dashboard.deputy_deputy_id_seq', 47, true); - -SELECT pg_catalog.setval('ervu_dashboard.disability_disability_id_seq', 94609, true); - -SELECT pg_catalog.setval('ervu_dashboard.disease_disease_id_seq', 198170, true); - -SELECT pg_catalog.setval('ervu_dashboard.drivers_licence_drivers_licence_id_seq', 7056, true); - -SELECT pg_catalog.setval('ervu_dashboard.medical_authorities_medical_authorities_id_seq', 298794, true); - -SELECT pg_catalog.setval('ervu_dashboard.passport_passport_id_seq', 53048, true); - -SELECT pg_catalog.setval('ervu_dashboard.property_property_id_seq', 372952, true); - -SELECT pg_catalog.setval('ervu_dashboard.prosecution_prosecution_id_seq', 44, true); - -SELECT pg_catalog.setval('ervu_dashboard.punishment_punishment_id_seq', 22, true); - -SELECT pg_catalog.setval('ervu_dashboard.subpoena_subpoena_id_seq', 27501, true); - -SELECT pg_catalog.setval('ervu_dashboard.temporary_measures_temporary_measures_id_seq', 12191, true); - -SELECT pg_catalog.setval('ervu_dashboard.testrecruitment_sort_seq', 90, true); - -SELECT pg_catalog.setval('ervu_dashboard.work_work_id_seq', 1, false); - -SELECT pg_catalog.setval('main_dashboard.appeals_id_appeal_seq', 796, true); - -SELECT pg_catalog.setval('main_dashboard.recruitment_campaign_id_recruitment_campaign_seq', 1522, true); - -SELECT pg_catalog.setval('main_dashboard.total_registered_id_total_registered_seq', 830, true); - -SELECT pg_catalog.setval('main_dashboard.waiting_registration_id_waiting_registration_seq', 742, true); - -SELECT pg_catalog.setval('public.job_log_id_job_seq', 1, false); - -SELECT pg_catalog.setval('ratings.appear_subppoena_id_appear_subppoena_seq', 6, true); - -SELECT pg_catalog.setval('ratings.consideration_complaint_id_consideration_complaint_seq', 6, true); - -SELECT pg_catalog.setval('ratings."ratings.conscription_info_id_ratings.conscription_info_seq"', 6, true); - -SELECT pg_catalog.setval('recruitment_campaign.recruitment_id_recruitment_seq', 2, true); - -SELECT pg_catalog.setval('recruitment_campaign.subpoenas_id_subpoena_seq', 1111, true); - -SELECT pg_catalog.setval('space.military_commissariat_id_military_commissariat_seq', 1, true); - -SELECT pg_catalog.setval('space.military_district_id_military_district_seq', 1, true); - -SELECT pg_catalog.setval('space.region_id_region_seq', 15, true); - -SELECT pg_catalog.setval('total_registered.age_id_age_seq', 2250, true); - -SELECT pg_catalog.setval('total_registered.child_minor_id_child_minor_seq', 2124, true); - -SELECT pg_catalog.setval('total_registered.driver_license_id_driver_license_seq', 1849, true); - -SELECT pg_catalog.setval('total_registered.reg_mil_cat_id_reg_mil_cat_seq', 885, true); - -SELECT pg_catalog.setval('total_registered.removed_registry_id_removed_registry_seq', 609, true); - -SELECT pg_catalog.setval('total_registered.subpoenas_id_subpoena_seq', 1184, true); - ALTER TABLE IF EXISTS ONLY appeals.main_profile ADD CONSTRAINT pk_main_profile PRIMARY KEY (id_main_profile); From 18fb4ac54dca0ed300d898549e823e1c5bb3590e Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Mon, 21 Oct 2024 15:09:48 +0300 Subject: [PATCH 32/49] SUPPORT-8617: fix --- .../config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml b/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml index 32a5a184..2f5a06c2 100644 --- a/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml +++ b/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml @@ -24,7 +24,7 @@ - SELECT COUNT(*) FROM information_schema.schemata WHERE schema_name IN('ervu_dashboard', 'appeals', 'main_dashboard', + SELECT COUNT(*) FROM information_schema.schemata WHERE schema_name IN ('ervu_dashboard', 'appeals', 'main_dashboard', 'ratings', 'recruitment_campaign', 'space', 'total_registered'); From bf7fe433ff18c0dec74c9ac51430d165ad5de02d Mon Sep 17 00:00:00 2001 From: "adel.kalimullin" Date: Mon, 21 Oct 2024 16:45:55 +0300 Subject: [PATCH 33/49] SUPPORT-8500: fix page --- resources/src/main/resources/business-model/citizencard.page | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/resources/src/main/resources/business-model/citizencard.page b/resources/src/main/resources/business-model/citizencard.page index 335062d3..4604fd41 100644 --- a/resources/src/main/resources/business-model/citizencard.page +++ b/resources/src/main/resources/business-model/citizencard.page @@ -697,7 +697,6 @@ d0322950-9802-44a1-a888-cf8e540ee2d8 Горизонтальный контейнер true - false false @@ -1109,7 +1108,7 @@ replaceModels - + @@ -1125,7 +1124,7 @@ - ReplaceValueTextFormatter + PhoneNumberTextFormatter ervu-dashboard.formatter From 86bef6413fe27de7ab01b836e4ae3c9e06ae3035 Mon Sep 17 00:00:00 2001 From: "adel.kalimullin" Date: Mon, 21 Oct 2024 16:52:40 +0300 Subject: [PATCH 34/49] SUPPORT-8500: fix page (1) --- resources/src/main/resources/business-model/citizencard.page | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/src/main/resources/business-model/citizencard.page b/resources/src/main/resources/business-model/citizencard.page index 4604fd41..e6bc4163 100644 --- a/resources/src/main/resources/business-model/citizencard.page +++ b/resources/src/main/resources/business-model/citizencard.page @@ -697,6 +697,7 @@ d0322950-9802-44a1-a888-cf8e540ee2d8 Горизонтальный контейнер true + false false From 2c85df34ba61158f2d2b46736862849233b4cfdc Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Tue, 22 Oct 2024 10:46:21 +0300 Subject: [PATCH 35/49] SUPPORT-8508: add pages --- .../resources/business-model/citizen.page | 118 +++++++++++++++++- .../resources/business-model/citizencard.page | 105 ++-------------- 2 files changed, 123 insertions(+), 100 deletions(-) diff --git a/resources/src/main/resources/business-model/citizen.page b/resources/src/main/resources/business-model/citizen.page index 914d7859..dee2fc5e 100644 --- a/resources/src/main/resources/business-model/citizen.page +++ b/resources/src/main/resources/business-model/citizen.page @@ -601,7 +601,6 @@ 922d5930-d22f-4b74-9912-17543cbc8493 VB - фильтры true - false false @@ -1809,6 +1808,7 @@ 729b8d97-8ae5-4171-9908-d2a96faf39ef Возраст false + false false @@ -1844,6 +1844,32 @@ + + + BirthDateRageCalculator + ervu-dashboard + + true + true + + + endDate + + + {"objectId":"126a154c-6a60-4b23-86d0-69a6cf814bdf","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + + startDate + + + {"objectId":"69dd912e-16cf-4e16-b0d6-21eadbbafe3e","packageName":"component.field","className":"DateTimePicker","type":"TS"} + + + + + 887d2044-9e34-46a5-852c-e9ce07b42f30 @@ -2314,6 +2340,92 @@ + + 55d6266e-c441-4aa8-9ba0-02a64dc7f6fc + 69dd912e-16cf-4e16-b0d6-21eadbbafe3e + Start Birth Date time picker (filter) + false + false + false + + + + visible + + false + + + + + + + + operation + + "GREATER_OR_EQUAL" + + + + + + + + columnForFilter + + + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"birth_date"} + + + + + + + + + + + 55d6266e-c441-4aa8-9ba0-02a64dc7f6fc + 126a154c-6a60-4b23-86d0-69a6cf814bdf + End Birth Date time picker (filter) + false + false + false + + + + visible + + false + + + + + + + + operation + + "LESS_OR_EQUAL" + + + + + + + + columnForFilter + + + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"birth_date"} + + + + + + + + + cec9ebf4-4f6a-4e51-a0a3-759e39dd610e 0e8dce19-ede6-40b3-8178-ae246d3ff737 @@ -4378,7 +4490,9 @@ field - {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"age"} + + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"birth_date"} + diff --git a/resources/src/main/resources/business-model/citizencard.page b/resources/src/main/resources/business-model/citizencard.page index 68a2aa0f..3fdc0cfb 100644 --- a/resources/src/main/resources/business-model/citizencard.page +++ b/resources/src/main/resources/business-model/citizencard.page @@ -593,7 +593,6 @@ 67120d9a-602f-44a1-9ede-88a2e797a295 Вертикальный контейнер - сведения о гражданине true - false false @@ -698,7 +697,6 @@ d0322950-9802-44a1-a888-cf8e540ee2d8 Горизонтальный контейнер true - false false @@ -788,53 +786,20 @@ - + - TextBuilder - component.util + UnionAgeAndBirthDateTextScript + ervu-dashboard true true - parts + inputBirthDate - - - - - inputControl - -{"objectId":"09eff769-24bc-4c27-a983-f9c6d1520b21","packageName":"component","className":"Text","type":"TS"} - - - - postfix - -null - - - - - - - - - - inputControl - -{"objectId":"388794dd-34e0-41c3-8ddb-83ecb4b5f1b6","packageName":"component","className":"Text","type":"TS"} - - - - prefix - -", " - - - - - + + {"objectId":"388794dd-34e0-41c3-8ddb-83ecb4b5f1b6","packageName":"component","className":"Text","type":"TS"} + @@ -16282,20 +16247,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 @@ -16611,13 +16562,6 @@ - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - fcec512d-4ee7-4a68-8d06-e7ba3c67b993 - Hbox - true - true - ba24d307-0b91-4299-ba82-9d0b52384ff2 405ddccd-4227-41a1-904b-9d15cd3917e5 @@ -16992,20 +16936,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 @@ -17308,13 +17238,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 +17305,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 +17799,6 @@ - - - d7d54cfb-26b5-4dba-b56f-b6247183c24d - b83acf9a-3acc-4fb8-a429-b62eec53b6f0 - Hbox - true - true From dffa068a82040e6a38f3d56aece577219b903e38 Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Tue, 22 Oct 2024 12:26:30 +0300 Subject: [PATCH 36/49] SUPPORT-8508: fix --- .../UnionAgeAndBirthDateTextScript.ts | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/frontend/src/ts/ervu-dashboard/UnionAgeAndBirthDateTextScript.ts b/frontend/src/ts/ervu-dashboard/UnionAgeAndBirthDateTextScript.ts index cd671fb5..96372232 100644 --- a/frontend/src/ts/ervu-dashboard/UnionAgeAndBirthDateTextScript.ts +++ b/frontend/src/ts/ervu-dashboard/UnionAgeAndBirthDateTextScript.ts @@ -2,13 +2,10 @@ import { AnalyticalScope, Behavior, ControlWithValue, - DateTimeUtil, NotNull, ObjectRef, Text } from "@webbpm/base-package"; -import moment = require("moment"); -import {Moment} from "moment"; @AnalyticalScope(Text) export class UnionAgeAndBirthDateTextScript extends Behavior { @@ -20,8 +17,8 @@ export class UnionAgeAndBirthDateTextScript extends Behavior { private text: Text; private readonly onChangeFunction = () => { if (this.text) { - const birthDate = moment(this.inputBirthDate.getTextValue()); - this.text.setValue(this.format(birthDate)); + const birthDate = this.parseToIsoFormat(this.inputBirthDate.getTextValue()); + this.text.setValue(this.format(new Date(birthDate))); } } @@ -40,10 +37,10 @@ export class UnionAgeAndBirthDateTextScript extends Behavior { this.inputBirthDate.removeChangeListener(this.onChangeFunction); } - private format(birthdate: Moment): string { + private format(birthdate: Date): string { const age = this.calculateAge(birthdate) const ageString = this.getTextAge(age); - const strBirthDate = DateTimeUtil.formatToDate(birthdate); + const strBirthDate = birthdate.getFullYear(); return `${age} ${ageString}, ${strBirthDate}`; } @@ -58,16 +55,20 @@ export class UnionAgeAndBirthDateTextScript extends Behavior { } } - private calculateAge(birthDate: Moment) { + private calculateAge(birthDate: Date) { const currentDate = new Date(); - const date = birthDate.toDate(); - let age = currentDate.getFullYear() - date.getFullYear(); + let age = currentDate.getFullYear() - birthDate.getFullYear(); - const difMonthValue = currentDate.getMonth() - date.getMonth(); - if (difMonthValue < 0 || (difMonthValue === 0 && currentDate.getDate() < date.getDate())) { + const difMonthValue = currentDate.getMonth() - birthDate.getMonth(); + if (difMonthValue < 0 || (difMonthValue === 0 && currentDate.getDate() < birthDate.getDate())) { age--; } return age; } + + private parseToIsoFormat(date: string): string { + let strings = date.split('.'); + return `${strings[2]}-${1}-${strings[0]}`; + } } \ No newline at end of file From bb00d1ee9870c861fa99b6e2e28401826a7c3dc7 Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Tue, 22 Oct 2024 13:49:21 +0300 Subject: [PATCH 37/49] SUPPORT-8617: fix changeSet --- .../v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml b/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml index 2f5a06c2..e6108dbe 100644 --- a/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml +++ b/backend/src/main/resources/config/v_1.0/20241018-SUPPORT-8617-init-ervu_dashboard.xml @@ -23,8 +23,11 @@ + + SELECT COUNT(*) FROM information_schema.schemata WHERE schema_name LIKE 'ervu_dashboard'; + - SELECT COUNT(*) FROM information_schema.schemata WHERE schema_name IN ('ervu_dashboard', 'appeals', 'main_dashboard', + SELECT COUNT(*) FROM information_schema.schemata WHERE schema_name IN ('appeals', 'main_dashboard', 'ratings', 'recruitment_campaign', 'space', 'total_registered'); From 328d0c2cbc95d3e8308dc05638f340a6a0e2dd68 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: Tue, 22 Oct 2024 16:58:34 +0300 Subject: [PATCH 38/49] DB_APP_NAME=ervu-dashboard to DB_APP_NAME=test-liq_ed --- config/micord.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/micord.env b/config/micord.env index 757a80c9..395243b8 100644 --- a/config/micord.env +++ b/config/micord.env @@ -4,4 +4,4 @@ DB_APP_USERNAME=ervu-dashboard DB_APP_PASSWORD=ervu-dashboard DB_APP_HOST=10.10.31.119 DB_APP_PORT=5432 -DB_APP_NAME=ervu-dashboard +DB_APP_NAME=test-liq_ed From 97bca589468fdb0c261cee103946795c87748f92 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: Tue, 22 Oct 2024 17:34:41 +0300 Subject: [PATCH 39/49] DB_APP_NAME=test-liq_ed to DB_APP_NAME=test-liq_ed_filled --- config/micord.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/micord.env b/config/micord.env index 395243b8..bf88a95e 100644 --- a/config/micord.env +++ b/config/micord.env @@ -4,4 +4,4 @@ DB_APP_USERNAME=ervu-dashboard DB_APP_PASSWORD=ervu-dashboard DB_APP_HOST=10.10.31.119 DB_APP_PORT=5432 -DB_APP_NAME=test-liq_ed +DB_APP_NAME=test-liq_ed_filled From 44ddac90c19d14dddb3c716169fb80e107534698 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: Tue, 22 Oct 2024 17:50:20 +0300 Subject: [PATCH 40/49] DB_APP_NAME=test-liq_ed_filled to DB_APP_NAME=ed_full --- config/micord.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/micord.env b/config/micord.env index bf88a95e..4e45d910 100644 --- a/config/micord.env +++ b/config/micord.env @@ -4,4 +4,4 @@ DB_APP_USERNAME=ervu-dashboard DB_APP_PASSWORD=ervu-dashboard DB_APP_HOST=10.10.31.119 DB_APP_PORT=5432 -DB_APP_NAME=test-liq_ed_filled +DB_APP_NAME=ed_full \ No newline at end of file From df40d7564c8e18511fb845581763acfae790d4e1 Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Tue, 22 Oct 2024 20:36:51 +0300 Subject: [PATCH 41/49] SUPPORT-8617: fix sql file --- .../resources/config/sql_files/ervu-dashboard-copy.sql | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql b/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql index 86295d88..74f853ca 100644 --- a/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql +++ b/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql @@ -9,6 +9,10 @@ SET xmloption = content; SET client_min_messages = warning; SET row_security = off; +CREATE SCHEMA IF NOT EXISTS public; + +ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL PRIVILEGES ON TABLES TO "ervu-dashboard"; + CREATE SCHEMA IF NOT EXISTS appeals; ALTER SCHEMA appeals OWNER TO "ervu-dashboard"; @@ -50,7 +54,7 @@ CREATE TYPE public.employer_category_type AS ENUM ( 'ip' ); -ALTER TYPE public.employer_category_type OWNER TO postgres; +ALTER TYPE public.employer_category_type OWNER TO "ervu-dashboard"; CREATE TYPE public.type_property_type AS ENUM ( 'realty', @@ -59,12 +63,12 @@ CREATE TYPE public.type_property_type AS ENUM ( 'water_vehicles' ); -ALTER TYPE public.type_property_type OWNER TO postgres; +ALTER TYPE public.type_property_type OWNER TO "ervu-dashboard"; CREATE FUNCTION public.uuid_generate_v4() RETURNS uuid LANGUAGE c STRICT PARALLEL SAFE AS '$libdir/uuid-ossp', 'uuid_generate_v4'; -ALTER FUNCTION public.uuid_generate_v4() OWNER TO postgres; +ALTER FUNCTION public.uuid_generate_v4() OWNER TO "ervu-dashboard"; SET default_tablespace = ''; From f6667f9297786f6871c0b40ee7713d0e671aabf8 Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Wed, 23 Oct 2024 09:15:41 +0300 Subject: [PATCH 42/49] SUPPORT-8617: fix sql file --- .../config/sql_files/ervu-dashboard-copy.sql | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql b/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql index 74f853ca..5b8aa3aa 100644 --- a/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql +++ b/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql @@ -47,27 +47,18 @@ CREATE EXTENSION IF NOT EXISTS "uuid-ossp" WITH SCHEMA ervu_dashboard; COMMENT ON EXTENSION "uuid-ossp" IS 'generate universally unique identifiers (UUIDs)'; -CREATE TYPE public.employer_category_type AS ENUM ( - 'fl', - 'ul', - 'kfh', - 'ip' -); +CREATE TYPE ervu_dashboard.employer_category_type AS ENUM ('fl', 'ul', 'kfh', 'ip'); -ALTER TYPE public.employer_category_type OWNER TO "ervu-dashboard"; +ALTER TYPE ervu_dashboard.employer_category_type OWNER TO "ervu-dashboard"; -CREATE TYPE public.type_property_type AS ENUM ( - 'realty', - 'ground_transportation', - 'air_vehicles', - 'water_vehicles' -); +CREATE TYPE ervu_dashboard.type_property_type AS ENUM ('realty', 'ground_transportation', 'air_vehicles', 'water_vehicles'); -ALTER TYPE public.type_property_type OWNER TO "ervu-dashboard"; +ALTER TYPE ervu_dashboard.type_property_type OWNER TO "ervu-dashboard"; CREATE FUNCTION public.uuid_generate_v4() RETURNS uuid LANGUAGE c STRICT PARALLEL SAFE AS '$libdir/uuid-ossp', 'uuid_generate_v4'; + ALTER FUNCTION public.uuid_generate_v4() OWNER TO "ervu-dashboard"; SET default_tablespace = ''; @@ -777,7 +768,7 @@ ALTER SEQUENCE ervu_dashboard.passport_passport_id_seq OWNED BY ervu_dashboard.p CREATE TABLE IF NOT EXISTS ervu_dashboard.property ( property_id bigint NOT NULL, recruit_id uuid NOT NULL, - type_property public.type_property_type, + type_property ervu_dashboard.type_property_type, start_date date, close_date date, vehicle_type character varying(100), @@ -1102,7 +1093,7 @@ ALTER TABLE IF EXISTS ervu_dashboard.recruitment ALTER COLUMN sort ADD GENERATED CREATE TABLE IF NOT EXISTS ervu_dashboard.work ( work_id bigint NOT NULL, recruit_id uuid NOT NULL, - employer_category public.employer_category_type, + employer_category ervu_dashboard.employer_category_type, place text, organization_name character varying(100), inn character varying(15), From 27b803821076f03488af97906d236f11eb868417 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: Wed, 23 Oct 2024 11:10:11 +0300 Subject: [PATCH 43/49] DB_APP_NAME=ed_full to DB_APP_NAME=ed_empty --- config/micord.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/micord.env b/config/micord.env index 4e45d910..e01a454d 100644 --- a/config/micord.env +++ b/config/micord.env @@ -4,4 +4,4 @@ DB_APP_USERNAME=ervu-dashboard DB_APP_PASSWORD=ervu-dashboard DB_APP_HOST=10.10.31.119 DB_APP_PORT=5432 -DB_APP_NAME=ed_full \ No newline at end of file +DB_APP_NAME=ed_empty \ No newline at end of file From 9ee36ac33ba0d6ecac007e55d10afcc019b857ad Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Wed, 23 Oct 2024 13:00:04 +0300 Subject: [PATCH 44/49] SUPPORT-8617: fix function --- .../config/sql_files/ervu-dashboard-copy.sql | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql b/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql index 5b8aa3aa..af262e91 100644 --- a/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql +++ b/backend/src/main/resources/config/sql_files/ervu-dashboard-copy.sql @@ -11,7 +11,7 @@ SET row_security = off; CREATE SCHEMA IF NOT EXISTS public; -ALTER DEFAULT PRIVILEGES IN SCHEMA public GRANT ALL PRIVILEGES ON TABLES TO "ervu-dashboard"; +ALTER SCHEMA public OWNER TO "ervu-dashboard"; CREATE SCHEMA IF NOT EXISTS appeals; @@ -55,11 +55,10 @@ CREATE TYPE ervu_dashboard.type_property_type AS ENUM ('realty', 'ground_transpo ALTER TYPE ervu_dashboard.type_property_type OWNER TO "ervu-dashboard"; -CREATE FUNCTION public.uuid_generate_v4() RETURNS uuid - LANGUAGE c STRICT PARALLEL SAFE - AS '$libdir/uuid-ossp', 'uuid_generate_v4'; - -ALTER FUNCTION public.uuid_generate_v4() OWNER TO "ervu-dashboard"; +-- If this function is not required anywhere, remove it +-- CREATE FUNCTION ervu_dashboard.uuid_generate_v4() RETURNS uuid LANGUAGE c STRICT PARALLEL SAFE AS '$libdir/uuid-ossp', 'uuid_generate_v4'; +-- +-- ALTER FUNCTION ervu_dashboard.uuid_generate_v4() OWNER TO "ervu-dashboard"; SET default_tablespace = ''; From 20b1c48e9dd970bc4787bf150ce3fb0dece2c194 Mon Sep 17 00:00:00 2001 From: "r.gaztdinov" Date: Mon, 28 Oct 2024 16:55:42 +0300 Subject: [PATCH 45/49] open filters --- .../resources/business-model/citizen.page | 226 ++++++++++-------- 1 file changed, 122 insertions(+), 104 deletions(-) diff --git a/resources/src/main/resources/business-model/citizen.page b/resources/src/main/resources/business-model/citizen.page index bbbdc704..97bc2def 100644 --- a/resources/src/main/resources/business-model/citizen.page +++ b/resources/src/main/resources/business-model/citizen.page @@ -1864,17 +1864,13 @@ endDate - - {"objectId":"126a154c-6a60-4b23-86d0-69a6cf814bdf","packageName":"component.field","className":"DateTimePicker","type":"TS"} - + {"objectId":"126a154c-6a60-4b23-86d0-69a6cf814bdf","packageName":"component.field","className":"DateTimePicker","type":"TS"} startDate - - {"objectId":"69dd912e-16cf-4e16-b0d6-21eadbbafe3e","packageName":"component.field","className":"DateTimePicker","type":"TS"} - + {"objectId":"69dd912e-16cf-4e16-b0d6-21eadbbafe3e","packageName":"component.field","className":"DateTimePicker","type":"TS"} @@ -1961,6 +1957,123 @@ + + 887d2044-9e34-46a5-852c-e9ce07b42f30 + 136b0424-18e0-4bcb-9b54-d5a42cac1890 + Семейное положение Static combobox (filter) + false + false + + + + label + + "Семейное положение" + + + + values + + + + + + label + + "Вдова/Вдовец" + + + + value + + "Вдова/Вдовец" + + + + + + + + + + label + + "В браке" + + + + value + + "В браке" + + + + + + + + + + label + + "В разводе" + + + + value + + "В разводе" + + + + + + + + + + label + + "Нет информации" + + + + value + + "Нет информации" + + + + + + + + + + + + + operation + + "EQUAL" + + + + + + + + columnForFilter + + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"marital_status"} + + + + + + + + 3a00a919-c6aa-4fbf-951e-b6f2dbc24764 7cc3cc7e-e571-463d-bfa6-ed392bdb3789 @@ -1975,47 +2088,6 @@ false true - - 4d981f15-5535-45f7-882b-3647b251ad05 - 7dede8e6-df0a-464f-886b-cc05d2bc3d0d - Семейное положение - false - false - - - - label - - "Семейное положение" - - - - - - - - operation - - "CONTAINS" - - - - - - - - columnForFilter - - {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"marital_status"} - - - - - - - - - 3a00a919-c6aa-4fbf-951e-b6f2dbc24764 3ed34335-621b-434a-bec6-8511fe3804cb @@ -2381,9 +2453,7 @@ columnForFilter - - {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"birth_date"} - + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"birth_date"} @@ -2424,9 +2494,7 @@ columnForFilter - - {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"birth_date"} - + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"birth_date"} @@ -2485,12 +2553,6 @@ false - - disabled - - true - - label @@ -2539,12 +2601,6 @@ false - - disabled - - true - - label @@ -2856,12 +2912,6 @@ - - disabled - - true - - initialValue @@ -2953,12 +3003,6 @@ - - disabled - - true - - initialValue @@ -3050,12 +3094,6 @@ - - disabled - - true - - initialValue @@ -3521,12 +3559,6 @@ - - disabled - - true - - initialValue @@ -3618,12 +3650,6 @@ - - disabled - - true - - initialValue @@ -3715,12 +3741,6 @@ - - disabled - - true - - initialValue @@ -4493,9 +4513,7 @@ field - - {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"birth_date"} - + {"schema":"ervu_dashboard","table":"citizen","entity":"citizen","name":"age"} From efaa916df102b69b8c5f55bcd966a3cea1fc6516 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, 28 Oct 2024 17:24:06 +0300 Subject: [PATCH 46/49] micord.env --- config/micord.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/micord.env b/config/micord.env index e01a454d..9b471d5f 100644 --- a/config/micord.env +++ b/config/micord.env @@ -4,4 +4,4 @@ DB_APP_USERNAME=ervu-dashboard DB_APP_PASSWORD=ervu-dashboard DB_APP_HOST=10.10.31.119 DB_APP_PORT=5432 -DB_APP_NAME=ed_empty \ No newline at end of file +DB_APP_NAME=ervu-dashboard \ No newline at end of file From b70bfef7dcaa4a1bf6377916d32df831cd2cf4b1 Mon Sep 17 00:00:00 2001 From: "r.gaztdinov" Date: Tue, 29 Oct 2024 10:02:02 +0300 Subject: [PATCH 47/49] age, db --- .../ervu_dashboard/ErvuDashboard.java | 14 + .../db_beans/ervu_dashboard/Keys.java | 7 + .../db_beans/ervu_dashboard/Tables.java | 12 + .../enums/EmployerCategoryType.java | 6 +- .../enums/TypePropertyType.java | 6 +- .../ervu_dashboard/tables/OkopfRecords.java | 237 ++++++++++++ .../ervu_dashboard/tables/Property.java | 2 +- .../ervu_dashboard/tables/Shedlock.java | 234 ++++++++++++ .../db_beans/ervu_dashboard/tables/Work.java | 2 +- .../tables/records/OkopfRecordsRecord.java | 94 +++++ .../tables/records/PropertyRecord.java | 2 +- .../tables/records/ShedlockRecord.java | 111 ++++++ .../tables/records/WorkRecord.java | 2 +- .../ervu_dashboard/db_beans/public_/Keys.java | 6 + .../db_beans/public_/Public.java | 23 +- .../db_beans/public_/Tables.java | 18 + .../db_beans/public_/tables/ActionLogs.java | 315 ++++++++++++++++ .../public_/tables/InteractionLog.java | 263 ++++++++++++++ .../db_beans/public_/tables/WorkflowLogs.java | 280 +++++++++++++++ .../tables/records/ActionLogsRecord.java | 336 ++++++++++++++++++ .../tables/records/InteractionLogRecord.java | 191 ++++++++++ .../tables/records/WorkflowLogsRecord.java | 231 ++++++++++++ .../tables/Subpoenas.java | 11 +- .../tables/records/SubpoenasRecord.java | 10 +- .../db_beans/total_registered/tables/Age.java | 8 +- .../total_registered/tables/Subpoenas.java | 12 +- .../tables/records/AgeRecord.java | 22 +- .../tables/records/SubpoenasRecord.java | 8 + .../business-model/milregistration.page | 21 +- .../business-model/notregistered.page | 22 +- 30 files changed, 2447 insertions(+), 59 deletions(-) rename backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/{public_ => ervu_dashboard}/enums/EmployerCategoryType.java (85%) rename backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/{public_ => ervu_dashboard}/enums/TypePropertyType.java (86%) create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/OkopfRecords.java create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Shedlock.java create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/OkopfRecordsRecord.java create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/ShedlockRecord.java create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/ActionLogs.java create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/InteractionLog.java create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/WorkflowLogs.java create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/records/ActionLogsRecord.java create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/records/InteractionLogRecord.java create mode 100644 backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/records/WorkflowLogsRecord.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 3590f2d5..b2d5742e 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,12 +19,14 @@ 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.OkopfRecords; 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; 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.Shedlock; 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; @@ -121,6 +123,11 @@ public class ErvuDashboard extends SchemaImpl { */ public final MedicalAuthorities MEDICAL_AUTHORITIES = MedicalAuthorities.MEDICAL_AUTHORITIES; + /** + * The table ervu_dashboard.okopf_records. + */ + public final OkopfRecords OKOPF_RECORDS = OkopfRecords.OKOPF_RECORDS; + /** * сведения о паспорте */ @@ -151,6 +158,11 @@ public class ErvuDashboard extends SchemaImpl { */ public final Recruitment RECRUITMENT = Recruitment.RECRUITMENT; + /** + * The table ervu_dashboard.shedlock. + */ + public final Shedlock SHEDLOCK = Shedlock.SHEDLOCK; + /** * сведения о направлении повестки военного комиссариата */ @@ -196,12 +208,14 @@ public class ErvuDashboard extends SchemaImpl { Disease.DISEASE, DriversLicence.DRIVERS_LICENCE, MedicalAuthorities.MEDICAL_AUTHORITIES, + OkopfRecords.OKOPF_RECORDS, Passport.PASSPORT, Property.PROPERTY, Prosecution.PROSECUTION, PubRecruitment.PUB_RECRUITMENT, Punishment.PUNISHMENT, Recruitment.RECRUITMENT, + Shedlock.SHEDLOCK, Subpoena.SUBPOENA, 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 b2010943..08e2a8d9 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,12 +17,14 @@ 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.OkopfRecords; 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; 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.Shedlock; 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; @@ -39,12 +41,14 @@ 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.OkopfRecordsRecord; 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; 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.ShedlockRecord; 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; @@ -79,6 +83,8 @@ 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 OKOPF_RECORDS_NAME_KEY = Internal.createUniqueKey(OkopfRecords.OKOPF_RECORDS, DSL.name("okopf_records_name_key"), new TableField[] { OkopfRecords.OKOPF_RECORDS.NAME }, true); + public static final UniqueKey OKOPF_RECORDS_PKEY = Internal.createUniqueKey(OkopfRecords.OKOPF_RECORDS, DSL.name("okopf_records_pkey"), new TableField[] { OkopfRecords.OKOPF_RECORDS.OKOPF_RECORDS_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); @@ -86,6 +92,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 SHEDLOCK_PK = Internal.createUniqueKey(Shedlock.SHEDLOCK, DSL.name("shedlock_pk"), new TableField[] { Shedlock.SHEDLOCK.NAME }, 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 5472f66c..6476132c 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,12 +18,14 @@ 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.OkopfRecords; 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; 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.Shedlock; 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; @@ -106,6 +108,11 @@ public class Tables { */ public static final MedicalAuthorities MEDICAL_AUTHORITIES = MedicalAuthorities.MEDICAL_AUTHORITIES; + /** + * The table ervu_dashboard.okopf_records. + */ + public static final OkopfRecords OKOPF_RECORDS = OkopfRecords.OKOPF_RECORDS; + /** * сведения о паспорте */ @@ -136,6 +143,11 @@ public class Tables { */ public static final Recruitment RECRUITMENT = Recruitment.RECRUITMENT; + /** + * The table ervu_dashboard.shedlock. + */ + public static final Shedlock SHEDLOCK = Shedlock.SHEDLOCK; + /** * сведения о направлении повестки военного комиссариата */ 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/ervu_dashboard/enums/EmployerCategoryType.java similarity index 85% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/enums/EmployerCategoryType.java rename to backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/enums/EmployerCategoryType.java index 46cc5b28..a48ac9d1 100644 --- 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/ervu_dashboard/enums/EmployerCategoryType.java @@ -1,10 +1,10 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.public_.enums; +package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.enums; -import ervu_dashboard.ervu_dashboard.db_beans.public_.Public; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard; import org.jooq.Catalog; import org.jooq.EnumType; @@ -38,7 +38,7 @@ public enum EmployerCategoryType implements EnumType { @Override public Schema getSchema() { - return Public.PUBLIC; + return ErvuDashboard.ERVU_DASHBOARD; } @Override diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/enums/TypePropertyType.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/enums/TypePropertyType.java similarity index 86% rename from backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/enums/TypePropertyType.java rename to backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/enums/TypePropertyType.java index bfea470f..5a0059ec 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/enums/TypePropertyType.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/enums/TypePropertyType.java @@ -1,10 +1,10 @@ /* * This file is generated by jOOQ. */ -package ervu_dashboard.ervu_dashboard.db_beans.public_.enums; +package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.enums; -import ervu_dashboard.ervu_dashboard.db_beans.public_.Public; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.ErvuDashboard; import org.jooq.Catalog; import org.jooq.EnumType; @@ -38,7 +38,7 @@ public enum TypePropertyType implements EnumType { @Override public Schema getSchema() { - return Public.PUBLIC; + return ErvuDashboard.ERVU_DASHBOARD; } @Override diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/OkopfRecords.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/OkopfRecords.java new file mode 100644 index 00000000..b6ce6c22 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/OkopfRecords.java @@ -0,0 +1,237 @@ +/* + * 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.OkopfRecordsRecord; + +import java.util.Arrays; +import java.util.Collection; +import java.util.List; + +import org.jooq.Condition; +import org.jooq.Field; +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 OkopfRecords extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of ervu_dashboard.okopf_records + */ + public static final OkopfRecords OKOPF_RECORDS = new OkopfRecords(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return OkopfRecordsRecord.class; + } + + /** + * The column ervu_dashboard.okopf_records.okopf_records_id. + */ + public final TableField OKOPF_RECORDS_ID = createField(DSL.name("okopf_records_id"), SQLDataType.VARCHAR.nullable(false), this, ""); + + /** + * The column ervu_dashboard.okopf_records.name. + */ + public final TableField NAME = createField(DSL.name("name"), SQLDataType.VARCHAR.nullable(false), this, ""); + + /** + * The column ervu_dashboard.okopf_records.version. + */ + public final TableField VERSION = createField(DSL.name("version"), SQLDataType.INTEGER.nullable(false), this, ""); + + private OkopfRecords(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private OkopfRecords(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where); + } + + /** + * Create an aliased ervu_dashboard.okopf_records table + * reference + */ + public OkopfRecords(String alias) { + this(DSL.name(alias), OKOPF_RECORDS); + } + + /** + * Create an aliased ervu_dashboard.okopf_records table + * reference + */ + public OkopfRecords(Name alias) { + this(alias, OKOPF_RECORDS); + } + + /** + * Create a ervu_dashboard.okopf_records table reference + */ + public OkopfRecords() { + this(DSL.name("okopf_records"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD; + } + + @Override + public UniqueKey getPrimaryKey() { + return Keys.OKOPF_RECORDS_PKEY; + } + + @Override + public List> getUniqueKeys() { + return Arrays.asList(Keys.OKOPF_RECORDS_NAME_KEY); + } + + @Override + public OkopfRecords as(String alias) { + return new OkopfRecords(DSL.name(alias), this); + } + + @Override + public OkopfRecords as(Name alias) { + return new OkopfRecords(alias, this); + } + + @Override + public OkopfRecords as(Table alias) { + return new OkopfRecords(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public OkopfRecords rename(String name) { + return new OkopfRecords(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public OkopfRecords rename(Name name) { + return new OkopfRecords(name, null); + } + + /** + * Rename this table + */ + @Override + public OkopfRecords rename(Table name) { + return new OkopfRecords(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public OkopfRecords where(Condition condition) { + return new OkopfRecords(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public OkopfRecords where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public OkopfRecords where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public OkopfRecords where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public OkopfRecords where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public OkopfRecords where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public OkopfRecords where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public OkopfRecords where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public OkopfRecords whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public OkopfRecords whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Property.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Property.java index 7247fc8c..cc357620 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Property.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Property.java @@ -6,8 +6,8 @@ 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.enums.TypePropertyType; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records.PropertyRecord; -import ervu_dashboard.ervu_dashboard.db_beans.public_.enums.TypePropertyType; import java.sql.Date; import java.util.Collection; diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Shedlock.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Shedlock.java new file mode 100644 index 00000000..c103f899 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/Shedlock.java @@ -0,0 +1,234 @@ +/* + * 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.ShedlockRecord; + +import java.sql.Timestamp; +import java.util.Collection; + +import org.jooq.Condition; +import org.jooq.Field; +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 Shedlock extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of ervu_dashboard.shedlock + */ + public static final Shedlock SHEDLOCK = new Shedlock(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return ShedlockRecord.class; + } + + /** + * The column ervu_dashboard.shedlock.name. + */ + public final TableField NAME = createField(DSL.name("name"), SQLDataType.VARCHAR(255).nullable(false), this, ""); + + /** + * The column ervu_dashboard.shedlock.lock_until. + */ + public final TableField LOCK_UNTIL = createField(DSL.name("lock_until"), SQLDataType.TIMESTAMP(0), this, ""); + + /** + * The column ervu_dashboard.shedlock.locked_at. + */ + public final TableField LOCKED_AT = createField(DSL.name("locked_at"), SQLDataType.TIMESTAMP(0), this, ""); + + /** + * The column ervu_dashboard.shedlock.locked_by. + */ + public final TableField LOCKED_BY = createField(DSL.name("locked_by"), SQLDataType.VARCHAR(255), this, ""); + + private Shedlock(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private Shedlock(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where); + } + + /** + * Create an aliased ervu_dashboard.shedlock table reference + */ + public Shedlock(String alias) { + this(DSL.name(alias), SHEDLOCK); + } + + /** + * Create an aliased ervu_dashboard.shedlock table reference + */ + public Shedlock(Name alias) { + this(alias, SHEDLOCK); + } + + /** + * Create a ervu_dashboard.shedlock table reference + */ + public Shedlock() { + this(DSL.name("shedlock"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : ErvuDashboard.ERVU_DASHBOARD; + } + + @Override + public UniqueKey getPrimaryKey() { + return Keys.SHEDLOCK_PK; + } + + @Override + public Shedlock as(String alias) { + return new Shedlock(DSL.name(alias), this); + } + + @Override + public Shedlock as(Name alias) { + return new Shedlock(alias, this); + } + + @Override + public Shedlock as(Table alias) { + return new Shedlock(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public Shedlock rename(String name) { + return new Shedlock(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public Shedlock rename(Name name) { + return new Shedlock(name, null); + } + + /** + * Rename this table + */ + @Override + public Shedlock rename(Table name) { + return new Shedlock(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Shedlock where(Condition condition) { + return new Shedlock(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Shedlock where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Shedlock where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Shedlock where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Shedlock where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Shedlock where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Shedlock where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public Shedlock where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Shedlock whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public Shedlock whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} 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 index f9360b1b..4e31adb7 100644 --- 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 @@ -6,8 +6,8 @@ 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.enums.EmployerCategoryType; 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; diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/OkopfRecordsRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/OkopfRecordsRecord.java new file mode 100644 index 00000000..22633ea9 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/OkopfRecordsRecord.java @@ -0,0 +1,94 @@ +/* + * 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.OkopfRecords; + +import org.jooq.Record1; +import org.jooq.impl.UpdatableRecordImpl; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class OkopfRecordsRecord extends UpdatableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for ervu_dashboard.okopf_records.okopf_records_id. + */ + public void setOkopfRecordsId(String value) { + set(0, value); + } + + /** + * Getter for ervu_dashboard.okopf_records.okopf_records_id. + */ + public String getOkopfRecordsId() { + return (String) get(0); + } + + /** + * Setter for ervu_dashboard.okopf_records.name. + */ + public void setName(String value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.okopf_records.name. + */ + public String getName() { + return (String) get(1); + } + + /** + * Setter for ervu_dashboard.okopf_records.version. + */ + public void setVersion(Integer value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.okopf_records.version. + */ + public Integer getVersion() { + return (Integer) get(2); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 key() { + return (Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached OkopfRecordsRecord + */ + public OkopfRecordsRecord() { + super(OkopfRecords.OKOPF_RECORDS); + } + + /** + * Create a detached, initialised OkopfRecordsRecord + */ + public OkopfRecordsRecord(String okopfRecordsId, String name, Integer version) { + super(OkopfRecords.OKOPF_RECORDS); + + setOkopfRecordsId(okopfRecordsId); + setName(name); + setVersion(version); + resetChangedOnNotNull(); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/PropertyRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/PropertyRecord.java index b2a0f841..584ccd4e 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/PropertyRecord.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/PropertyRecord.java @@ -4,8 +4,8 @@ package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.enums.TypePropertyType; import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.Property; -import ervu_dashboard.ervu_dashboard.db_beans.public_.enums.TypePropertyType; import java.sql.Date; import java.util.UUID; diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/ShedlockRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/ShedlockRecord.java new file mode 100644 index 00000000..8bccb1d3 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/ervu_dashboard/tables/records/ShedlockRecord.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.Shedlock; + +import java.sql.Timestamp; + +import org.jooq.Record1; +import org.jooq.impl.UpdatableRecordImpl; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class ShedlockRecord extends UpdatableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for ervu_dashboard.shedlock.name. + */ + public void setName(String value) { + set(0, value); + } + + /** + * Getter for ervu_dashboard.shedlock.name. + */ + public String getName() { + return (String) get(0); + } + + /** + * Setter for ervu_dashboard.shedlock.lock_until. + */ + public void setLockUntil(Timestamp value) { + set(1, value); + } + + /** + * Getter for ervu_dashboard.shedlock.lock_until. + */ + public Timestamp getLockUntil() { + return (Timestamp) get(1); + } + + /** + * Setter for ervu_dashboard.shedlock.locked_at. + */ + public void setLockedAt(Timestamp value) { + set(2, value); + } + + /** + * Getter for ervu_dashboard.shedlock.locked_at. + */ + public Timestamp getLockedAt() { + return (Timestamp) get(2); + } + + /** + * Setter for ervu_dashboard.shedlock.locked_by. + */ + public void setLockedBy(String value) { + set(3, value); + } + + /** + * Getter for ervu_dashboard.shedlock.locked_by. + */ + public String getLockedBy() { + return (String) get(3); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 key() { + return (Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached ShedlockRecord + */ + public ShedlockRecord() { + super(Shedlock.SHEDLOCK); + } + + /** + * Create a detached, initialised ShedlockRecord + */ + public ShedlockRecord(String name, Timestamp lockUntil, Timestamp lockedAt, String lockedBy) { + super(Shedlock.SHEDLOCK); + + setName(name); + setLockUntil(lockUntil); + setLockedAt(lockedAt); + setLockedBy(lockedBy); + resetChangedOnNotNull(); + } +} 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 index fc86a5f5..67898b9b 100644 --- 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 @@ -4,8 +4,8 @@ package ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.tables.records; +import ervu_dashboard.ervu_dashboard.db_beans.ervu_dashboard.enums.EmployerCategoryType; 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; diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/Keys.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/Keys.java index 67d2ece1..ff27d74c 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/Keys.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/Keys.java @@ -4,10 +4,14 @@ package ervu_dashboard.ervu_dashboard.db_beans.public_; +import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.ActionLogs; import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.Databasechangeloglock; import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.JobLog; +import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.WorkflowLogs; +import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records.ActionLogsRecord; import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records.DatabasechangeloglockRecord; import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records.JobLogRecord; +import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records.WorkflowLogsRecord; import org.jooq.TableField; import org.jooq.UniqueKey; @@ -26,6 +30,8 @@ public class Keys { // UNIQUE and PRIMARY KEY definitions // ------------------------------------------------------------------------- + public static final UniqueKey ACTION_LOGS_PKEY = Internal.createUniqueKey(ActionLogs.ACTION_LOGS, DSL.name("action_logs_pkey"), new TableField[] { ActionLogs.ACTION_LOGS.ACTION_LOG_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 JOB_LOG_PKEY = Internal.createUniqueKey(JobLog.JOB_LOG, DSL.name("job_log_pkey"), new TableField[] { JobLog.JOB_LOG.ID_JOB }, true); + public static final UniqueKey WORKFLOW_LOGS_PKEY = Internal.createUniqueKey(WorkflowLogs.WORKFLOW_LOGS, DSL.name("workflow_logs_pkey"), new TableField[] { WorkflowLogs.WORKFLOW_LOGS.LOGGING_ID }, true); } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/Public.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/Public.java index 176ffb90..c706b994 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/Public.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/Public.java @@ -5,12 +5,15 @@ package ervu_dashboard.ervu_dashboard.db_beans.public_; import ervu_dashboard.ervu_dashboard.db_beans.DefaultCatalog; +import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.ActionLogs; import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.ChannelLog; import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.Databasechangelog; import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.Databasechangeloglock; +import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.InteractionLog; import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.JobEntryLog; import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.JobLog; import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.LastRecordingDate; +import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.WorkflowLogs; import java.util.Arrays; import java.util.List; @@ -33,6 +36,11 @@ public class Public extends SchemaImpl { */ public static final Public PUBLIC = new Public(); + /** + * The table public.action_logs. + */ + public final ActionLogs ACTION_LOGS = ActionLogs.ACTION_LOGS; + /** * The table public.channel_log. */ @@ -48,6 +56,11 @@ public class Public extends SchemaImpl { */ public final Databasechangeloglock DATABASECHANGELOGLOCK = Databasechangeloglock.DATABASECHANGELOGLOCK; + /** + * The table public.interaction_log. + */ + public final InteractionLog INTERACTION_LOG = InteractionLog.INTERACTION_LOG; + /** * The table public.job_entry_log. */ @@ -63,6 +76,11 @@ public class Public extends SchemaImpl { */ public final LastRecordingDate LAST_RECORDING_DATE = LastRecordingDate.LAST_RECORDING_DATE; + /** + * The table public.workflow_logs. + */ + public final WorkflowLogs WORKFLOW_LOGS = WorkflowLogs.WORKFLOW_LOGS; + /** * No further instances allowed */ @@ -79,12 +97,15 @@ public class Public extends SchemaImpl { @Override public final List> getTables() { return Arrays.asList( + ActionLogs.ACTION_LOGS, ChannelLog.CHANNEL_LOG, Databasechangelog.DATABASECHANGELOG, Databasechangeloglock.DATABASECHANGELOGLOCK, + InteractionLog.INTERACTION_LOG, JobEntryLog.JOB_ENTRY_LOG, JobLog.JOB_LOG, - LastRecordingDate.LAST_RECORDING_DATE + LastRecordingDate.LAST_RECORDING_DATE, + WorkflowLogs.WORKFLOW_LOGS ); } } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/Tables.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/Tables.java index c74f1a9a..0a4bb8e2 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/Tables.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/Tables.java @@ -4,12 +4,15 @@ package ervu_dashboard.ervu_dashboard.db_beans.public_; +import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.ActionLogs; import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.ChannelLog; import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.Databasechangelog; import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.Databasechangeloglock; +import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.InteractionLog; import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.JobEntryLog; import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.JobLog; import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.LastRecordingDate; +import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.WorkflowLogs; /** @@ -18,6 +21,11 @@ import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.LastRecordingDate; @SuppressWarnings({ "all", "unchecked", "rawtypes" }) public class Tables { + /** + * The table public.action_logs. + */ + public static final ActionLogs ACTION_LOGS = ActionLogs.ACTION_LOGS; + /** * The table public.channel_log. */ @@ -33,6 +41,11 @@ public class Tables { */ public static final Databasechangeloglock DATABASECHANGELOGLOCK = Databasechangeloglock.DATABASECHANGELOGLOCK; + /** + * The table public.interaction_log. + */ + public static final InteractionLog INTERACTION_LOG = InteractionLog.INTERACTION_LOG; + /** * The table public.job_entry_log. */ @@ -47,4 +60,9 @@ public class Tables { * The table public.last_recording_date. */ public static final LastRecordingDate LAST_RECORDING_DATE = LastRecordingDate.LAST_RECORDING_DATE; + + /** + * The table public.workflow_logs. + */ + public static final WorkflowLogs WORKFLOW_LOGS = WorkflowLogs.WORKFLOW_LOGS; } diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/ActionLogs.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/ActionLogs.java new file mode 100644 index 00000000..e24bc2bc --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/ActionLogs.java @@ -0,0 +1,315 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.public_.tables; + + +import ervu_dashboard.ervu_dashboard.db_beans.public_.Keys; +import ervu_dashboard.ervu_dashboard.db_beans.public_.Public; +import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records.ActionLogsRecord; + +import java.sql.Timestamp; +import java.util.Collection; + +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 ActionLogs extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of public.action_logs + */ + public static final ActionLogs ACTION_LOGS = new ActionLogs(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return ActionLogsRecord.class; + } + + /** + * The column public.action_logs.action_log_id. + */ + public final TableField ACTION_LOG_ID = createField(DSL.name("action_log_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + /** + * The column public.action_logs.loggingdate. + */ + public final TableField LOGGINGDATE = createField(DSL.name("loggingdate"), SQLDataType.TIMESTAMP(0), this, ""); + + /** + * The column public.action_logs.workflowname. + */ + public final TableField WORKFLOWNAME = createField(DSL.name("workflowname"), SQLDataType.CLOB, this, ""); + + /** + * The column public.action_logs.workflowfilename. + */ + public final TableField WORKFLOWFILENAME = createField(DSL.name("workflowfilename"), SQLDataType.CLOB, this, ""); + + /** + * The column public.action_logs.workflowlogchannelid. + */ + public final TableField WORKFLOWLOGCHANNELID = createField(DSL.name("workflowlogchannelid"), SQLDataType.CLOB, this, ""); + + /** + * The column public.action_logs.workflowparentlogchannelid. + */ + public final TableField WORKFLOWPARENTLOGCHANNELID = createField(DSL.name("workflowparentlogchannelid"), SQLDataType.CLOB, this, ""); + + /** + * The column public.action_logs.actionname. + */ + public final TableField ACTIONNAME = createField(DSL.name("actionname"), SQLDataType.CLOB, this, ""); + + /** + * The column public.action_logs.actionnr. + */ + public final TableField ACTIONNR = createField(DSL.name("actionnr"), SQLDataType.INTEGER, this, ""); + + /** + * The column public.action_logs.actionresult. + */ + public final TableField ACTIONRESULT = createField(DSL.name("actionresult"), SQLDataType.BOOLEAN, this, ""); + + /** + * The column public.action_logs.actionlogchannelid. + */ + public final TableField ACTIONLOGCHANNELID = createField(DSL.name("actionlogchannelid"), SQLDataType.CLOB, this, ""); + + /** + * The column public.action_logs.actionloggingtext. + */ + public final TableField ACTIONLOGGINGTEXT = createField(DSL.name("actionloggingtext"), SQLDataType.CLOB, this, ""); + + /** + * The column public.action_logs.actionerrors. + */ + public final TableField ACTIONERRORS = createField(DSL.name("actionerrors"), SQLDataType.INTEGER, this, ""); + + /** + * The column public.action_logs.actionlogdate. + */ + public final TableField ACTIONLOGDATE = createField(DSL.name("actionlogdate"), SQLDataType.TIMESTAMP(0), this, ""); + + /** + * The column public.action_logs.actionduration. + */ + public final TableField ACTIONDURATION = createField(DSL.name("actionduration"), SQLDataType.INTEGER, this, ""); + + /** + * The column public.action_logs.actionexitstatus. + */ + public final TableField ACTIONEXITSTATUS = createField(DSL.name("actionexitstatus"), SQLDataType.INTEGER, this, ""); + + /** + * The column public.action_logs.actionnrfilesretrieved. + */ + public final TableField ACTIONNRFILESRETRIEVED = createField(DSL.name("actionnrfilesretrieved"), SQLDataType.INTEGER, this, ""); + + /** + * The column public.action_logs.actionfilename. + */ + public final TableField ACTIONFILENAME = createField(DSL.name("actionfilename"), SQLDataType.CLOB, this, ""); + + /** + * The column public.action_logs.actioncomment. + */ + public final TableField ACTIONCOMMENT = createField(DSL.name("actioncomment"), SQLDataType.CLOB, this, ""); + + /** + * The column public.action_logs.actionreason. + */ + public final TableField ACTIONREASON = createField(DSL.name("actionreason"), SQLDataType.CLOB, this, ""); + + private ActionLogs(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private ActionLogs(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where); + } + + /** + * Create an aliased public.action_logs table reference + */ + public ActionLogs(String alias) { + this(DSL.name(alias), ACTION_LOGS); + } + + /** + * Create an aliased public.action_logs table reference + */ + public ActionLogs(Name alias) { + this(alias, ACTION_LOGS); + } + + /** + * Create a public.action_logs table reference + */ + public ActionLogs() { + this(DSL.name("action_logs"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : Public.PUBLIC; + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public UniqueKey getPrimaryKey() { + return Keys.ACTION_LOGS_PKEY; + } + + @Override + public ActionLogs as(String alias) { + return new ActionLogs(DSL.name(alias), this); + } + + @Override + public ActionLogs as(Name alias) { + return new ActionLogs(alias, this); + } + + @Override + public ActionLogs as(Table alias) { + return new ActionLogs(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public ActionLogs rename(String name) { + return new ActionLogs(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public ActionLogs rename(Name name) { + return new ActionLogs(name, null); + } + + /** + * Rename this table + */ + @Override + public ActionLogs rename(Table name) { + return new ActionLogs(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ActionLogs where(Condition condition) { + return new ActionLogs(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ActionLogs where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ActionLogs where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ActionLogs where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public ActionLogs where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public ActionLogs where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public ActionLogs where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public ActionLogs where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ActionLogs whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public ActionLogs whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/InteractionLog.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/InteractionLog.java new file mode 100644 index 00000000..46881b30 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/InteractionLog.java @@ -0,0 +1,263 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.public_.tables; + + +import ervu_dashboard.ervu_dashboard.db_beans.public_.Public; +import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records.InteractionLogRecord; + +import java.sql.Timestamp; +import java.util.Collection; + +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.impl.DSL; +import org.jooq.impl.SQLDataType; +import org.jooq.impl.TableImpl; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class InteractionLog extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of public.interaction_log + */ + public static final InteractionLog INTERACTION_LOG = new InteractionLog(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return InteractionLogRecord.class; + } + + /** + * The column public.interaction_log.id. + */ + public final TableField ID = createField(DSL.name("id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + /** + * The column public.interaction_log.sent_date. + */ + public final TableField SENT_DATE = createField(DSL.name("sent_date"), SQLDataType.TIMESTAMP(0), this, ""); + + /** + * The column public.interaction_log.form. + */ + public final TableField FORM = createField(DSL.name("form"), SQLDataType.CLOB, this, ""); + + /** + * The column public.interaction_log.sender. + */ + public final TableField SENDER = createField(DSL.name("sender"), SQLDataType.CLOB, this, ""); + + /** + * The column public.interaction_log.status. + */ + public final TableField STATUS = createField(DSL.name("status"), SQLDataType.CLOB, this, ""); + + /** + * The column public.interaction_log.file_name. + */ + public final TableField FILE_NAME = createField(DSL.name("file_name"), SQLDataType.CLOB, this, ""); + + /** + * The column public.interaction_log.records_sent. + */ + public final TableField RECORDS_SENT = createField(DSL.name("records_sent"), SQLDataType.INTEGER, this, ""); + + /** + * The column public.interaction_log.records_accepted. + */ + public final TableField RECORDS_ACCEPTED = createField(DSL.name("records_accepted"), SQLDataType.INTEGER, this, ""); + + /** + * The column public.interaction_log.file_id. + */ + public final TableField FILE_ID = createField(DSL.name("file_id"), SQLDataType.VARCHAR(36), this, ""); + + /** + * The column public.interaction_log.ervu_id. + */ + public final TableField ERVU_ID = createField(DSL.name("ervu_id"), SQLDataType.VARCHAR(36), this, ""); + + private InteractionLog(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private InteractionLog(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where); + } + + /** + * Create an aliased public.interaction_log table reference + */ + public InteractionLog(String alias) { + this(DSL.name(alias), INTERACTION_LOG); + } + + /** + * Create an aliased public.interaction_log table reference + */ + public InteractionLog(Name alias) { + this(alias, INTERACTION_LOG); + } + + /** + * Create a public.interaction_log table reference + */ + public InteractionLog() { + this(DSL.name("interaction_log"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : Public.PUBLIC; + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public InteractionLog as(String alias) { + return new InteractionLog(DSL.name(alias), this); + } + + @Override + public InteractionLog as(Name alias) { + return new InteractionLog(alias, this); + } + + @Override + public InteractionLog as(Table alias) { + return new InteractionLog(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public InteractionLog rename(String name) { + return new InteractionLog(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public InteractionLog rename(Name name) { + return new InteractionLog(name, null); + } + + /** + * Rename this table + */ + @Override + public InteractionLog rename(Table name) { + return new InteractionLog(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public InteractionLog where(Condition condition) { + return new InteractionLog(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public InteractionLog where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public InteractionLog where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public InteractionLog where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public InteractionLog where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public InteractionLog where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public InteractionLog where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public InteractionLog where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public InteractionLog whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public InteractionLog whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/WorkflowLogs.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/WorkflowLogs.java new file mode 100644 index 00000000..b7e8a489 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/WorkflowLogs.java @@ -0,0 +1,280 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.public_.tables; + + +import ervu_dashboard.ervu_dashboard.db_beans.public_.Keys; +import ervu_dashboard.ervu_dashboard.db_beans.public_.Public; +import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records.WorkflowLogsRecord; + +import java.sql.Timestamp; +import java.util.Collection; + +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 WorkflowLogs extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of public.workflow_logs + */ + public static final WorkflowLogs WORKFLOW_LOGS = new WorkflowLogs(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return WorkflowLogsRecord.class; + } + + /** + * The column public.workflow_logs.logging_id. + */ + public final TableField LOGGING_ID = createField(DSL.name("logging_id"), SQLDataType.BIGINT.nullable(false).identity(true), this, ""); + + /** + * The column public.workflow_logs.loggingdate. + */ + public final TableField LOGGINGDATE = createField(DSL.name("loggingdate"), SQLDataType.TIMESTAMP(0), this, ""); + + /** + * The column public.workflow_logs.loggingphase. + */ + public final TableField LOGGINGPHASE = createField(DSL.name("loggingphase"), SQLDataType.CLOB, this, ""); + + /** + * The column public.workflow_logs.workflowname. + */ + public final TableField WORKFLOWNAME = createField(DSL.name("workflowname"), SQLDataType.CLOB, this, ""); + + /** + * The column public.workflow_logs.workflowfilename. + */ + public final TableField WORKFLOWFILENAME = createField(DSL.name("workflowfilename"), SQLDataType.CLOB, this, ""); + + /** + * The column public.workflow_logs.workflowstart. + */ + public final TableField WORKFLOWSTART = createField(DSL.name("workflowstart"), SQLDataType.TIMESTAMP(0), this, ""); + + /** + * The column public.workflow_logs.workflowend. + */ + public final TableField WORKFLOWEND = createField(DSL.name("workflowend"), SQLDataType.TIMESTAMP(0), this, ""); + + /** + * The column public.workflow_logs.workflowlogchannelid. + */ + public final TableField WORKFLOWLOGCHANNELID = createField(DSL.name("workflowlogchannelid"), SQLDataType.CLOB, this, ""); + + /** + * The column public.workflow_logs.workflowparentlogchannelid. + */ + public final TableField WORKFLOWPARENTLOGCHANNELID = createField(DSL.name("workflowparentlogchannelid"), SQLDataType.CLOB, this, ""); + + /** + * The column public.workflow_logs.workflowlogging. + */ + public final TableField WORKFLOWLOGGING = createField(DSL.name("workflowlogging"), SQLDataType.CLOB, this, ""); + + /** + * The column public.workflow_logs.workflowerrorcount. + */ + public final TableField WORKFLOWERRORCOUNT = createField(DSL.name("workflowerrorcount"), SQLDataType.INTEGER, this, ""); + + /** + * The column public.workflow_logs.workflowstatusdescription. + */ + public final TableField WORKFLOWSTATUSDESCRIPTION = createField(DSL.name("workflowstatusdescription"), SQLDataType.CLOB, this, ""); + + private WorkflowLogs(Name alias, Table aliased) { + this(alias, aliased, (Field[]) null, null); + } + + private WorkflowLogs(Name alias, Table aliased, Field[] parameters, Condition where) { + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table(), where); + } + + /** + * Create an aliased public.workflow_logs table reference + */ + public WorkflowLogs(String alias) { + this(DSL.name(alias), WORKFLOW_LOGS); + } + + /** + * Create an aliased public.workflow_logs table reference + */ + public WorkflowLogs(Name alias) { + this(alias, WORKFLOW_LOGS); + } + + /** + * Create a public.workflow_logs table reference + */ + public WorkflowLogs() { + this(DSL.name("workflow_logs"), null); + } + + @Override + public Schema getSchema() { + return aliased() ? null : Public.PUBLIC; + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public UniqueKey getPrimaryKey() { + return Keys.WORKFLOW_LOGS_PKEY; + } + + @Override + public WorkflowLogs as(String alias) { + return new WorkflowLogs(DSL.name(alias), this); + } + + @Override + public WorkflowLogs as(Name alias) { + return new WorkflowLogs(alias, this); + } + + @Override + public WorkflowLogs as(Table alias) { + return new WorkflowLogs(alias.getQualifiedName(), this); + } + + /** + * Rename this table + */ + @Override + public WorkflowLogs rename(String name) { + return new WorkflowLogs(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public WorkflowLogs rename(Name name) { + return new WorkflowLogs(name, null); + } + + /** + * Rename this table + */ + @Override + public WorkflowLogs rename(Table name) { + return new WorkflowLogs(name.getQualifiedName(), null); + } + + /** + * Create an inline derived table from this table + */ + @Override + public WorkflowLogs where(Condition condition) { + return new WorkflowLogs(getQualifiedName(), aliased() ? this : null, null, condition); + } + + /** + * Create an inline derived table from this table + */ + @Override + public WorkflowLogs where(Collection conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public WorkflowLogs where(Condition... conditions) { + return where(DSL.and(conditions)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public WorkflowLogs where(Field condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public WorkflowLogs where(SQL condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public WorkflowLogs where(@Stringly.SQL String condition) { + return where(DSL.condition(condition)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public WorkflowLogs where(@Stringly.SQL String condition, Object... binds) { + return where(DSL.condition(condition, binds)); + } + + /** + * Create an inline derived table from this table + */ + @Override + @PlainSQL + public WorkflowLogs where(@Stringly.SQL String condition, QueryPart... parts) { + return where(DSL.condition(condition, parts)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public WorkflowLogs whereExists(Select select) { + return where(DSL.exists(select)); + } + + /** + * Create an inline derived table from this table + */ + @Override + public WorkflowLogs whereNotExists(Select select) { + return where(DSL.notExists(select)); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/records/ActionLogsRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/records/ActionLogsRecord.java new file mode 100644 index 00000000..c5010f06 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/records/ActionLogsRecord.java @@ -0,0 +1,336 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records; + + +import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.ActionLogs; + +import java.sql.Timestamp; + +import org.jooq.Record1; +import org.jooq.impl.UpdatableRecordImpl; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class ActionLogsRecord extends UpdatableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for public.action_logs.action_log_id. + */ + public void setActionLogId(Long value) { + set(0, value); + } + + /** + * Getter for public.action_logs.action_log_id. + */ + public Long getActionLogId() { + return (Long) get(0); + } + + /** + * Setter for public.action_logs.loggingdate. + */ + public void setLoggingdate(Timestamp value) { + set(1, value); + } + + /** + * Getter for public.action_logs.loggingdate. + */ + public Timestamp getLoggingdate() { + return (Timestamp) get(1); + } + + /** + * Setter for public.action_logs.workflowname. + */ + public void setWorkflowname(String value) { + set(2, value); + } + + /** + * Getter for public.action_logs.workflowname. + */ + public String getWorkflowname() { + return (String) get(2); + } + + /** + * Setter for public.action_logs.workflowfilename. + */ + public void setWorkflowfilename(String value) { + set(3, value); + } + + /** + * Getter for public.action_logs.workflowfilename. + */ + public String getWorkflowfilename() { + return (String) get(3); + } + + /** + * Setter for public.action_logs.workflowlogchannelid. + */ + public void setWorkflowlogchannelid(String value) { + set(4, value); + } + + /** + * Getter for public.action_logs.workflowlogchannelid. + */ + public String getWorkflowlogchannelid() { + return (String) get(4); + } + + /** + * Setter for public.action_logs.workflowparentlogchannelid. + */ + public void setWorkflowparentlogchannelid(String value) { + set(5, value); + } + + /** + * Getter for public.action_logs.workflowparentlogchannelid. + */ + public String getWorkflowparentlogchannelid() { + return (String) get(5); + } + + /** + * Setter for public.action_logs.actionname. + */ + public void setActionname(String value) { + set(6, value); + } + + /** + * Getter for public.action_logs.actionname. + */ + public String getActionname() { + return (String) get(6); + } + + /** + * Setter for public.action_logs.actionnr. + */ + public void setActionnr(Integer value) { + set(7, value); + } + + /** + * Getter for public.action_logs.actionnr. + */ + public Integer getActionnr() { + return (Integer) get(7); + } + + /** + * Setter for public.action_logs.actionresult. + */ + public void setActionresult(Boolean value) { + set(8, value); + } + + /** + * Getter for public.action_logs.actionresult. + */ + public Boolean getActionresult() { + return (Boolean) get(8); + } + + /** + * Setter for public.action_logs.actionlogchannelid. + */ + public void setActionlogchannelid(String value) { + set(9, value); + } + + /** + * Getter for public.action_logs.actionlogchannelid. + */ + public String getActionlogchannelid() { + return (String) get(9); + } + + /** + * Setter for public.action_logs.actionloggingtext. + */ + public void setActionloggingtext(String value) { + set(10, value); + } + + /** + * Getter for public.action_logs.actionloggingtext. + */ + public String getActionloggingtext() { + return (String) get(10); + } + + /** + * Setter for public.action_logs.actionerrors. + */ + public void setActionerrors(Integer value) { + set(11, value); + } + + /** + * Getter for public.action_logs.actionerrors. + */ + public Integer getActionerrors() { + return (Integer) get(11); + } + + /** + * Setter for public.action_logs.actionlogdate. + */ + public void setActionlogdate(Timestamp value) { + set(12, value); + } + + /** + * Getter for public.action_logs.actionlogdate. + */ + public Timestamp getActionlogdate() { + return (Timestamp) get(12); + } + + /** + * Setter for public.action_logs.actionduration. + */ + public void setActionduration(Integer value) { + set(13, value); + } + + /** + * Getter for public.action_logs.actionduration. + */ + public Integer getActionduration() { + return (Integer) get(13); + } + + /** + * Setter for public.action_logs.actionexitstatus. + */ + public void setActionexitstatus(Integer value) { + set(14, value); + } + + /** + * Getter for public.action_logs.actionexitstatus. + */ + public Integer getActionexitstatus() { + return (Integer) get(14); + } + + /** + * Setter for public.action_logs.actionnrfilesretrieved. + */ + public void setActionnrfilesretrieved(Integer value) { + set(15, value); + } + + /** + * Getter for public.action_logs.actionnrfilesretrieved. + */ + public Integer getActionnrfilesretrieved() { + return (Integer) get(15); + } + + /** + * Setter for public.action_logs.actionfilename. + */ + public void setActionfilename(String value) { + set(16, value); + } + + /** + * Getter for public.action_logs.actionfilename. + */ + public String getActionfilename() { + return (String) get(16); + } + + /** + * Setter for public.action_logs.actioncomment. + */ + public void setActioncomment(String value) { + set(17, value); + } + + /** + * Getter for public.action_logs.actioncomment. + */ + public String getActioncomment() { + return (String) get(17); + } + + /** + * Setter for public.action_logs.actionreason. + */ + public void setActionreason(String value) { + set(18, value); + } + + /** + * Getter for public.action_logs.actionreason. + */ + public String getActionreason() { + return (String) get(18); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 key() { + return (Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached ActionLogsRecord + */ + public ActionLogsRecord() { + super(ActionLogs.ACTION_LOGS); + } + + /** + * Create a detached, initialised ActionLogsRecord + */ + public ActionLogsRecord(Long actionLogId, Timestamp loggingdate, String workflowname, String workflowfilename, String workflowlogchannelid, String workflowparentlogchannelid, String actionname, Integer actionnr, Boolean actionresult, String actionlogchannelid, String actionloggingtext, Integer actionerrors, Timestamp actionlogdate, Integer actionduration, Integer actionexitstatus, Integer actionnrfilesretrieved, String actionfilename, String actioncomment, String actionreason) { + super(ActionLogs.ACTION_LOGS); + + setActionLogId(actionLogId); + setLoggingdate(loggingdate); + setWorkflowname(workflowname); + setWorkflowfilename(workflowfilename); + setWorkflowlogchannelid(workflowlogchannelid); + setWorkflowparentlogchannelid(workflowparentlogchannelid); + setActionname(actionname); + setActionnr(actionnr); + setActionresult(actionresult); + setActionlogchannelid(actionlogchannelid); + setActionloggingtext(actionloggingtext); + setActionerrors(actionerrors); + setActionlogdate(actionlogdate); + setActionduration(actionduration); + setActionexitstatus(actionexitstatus); + setActionnrfilesretrieved(actionnrfilesretrieved); + setActionfilename(actionfilename); + setActioncomment(actioncomment); + setActionreason(actionreason); + resetChangedOnNotNull(); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/records/InteractionLogRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/records/InteractionLogRecord.java new file mode 100644 index 00000000..4e836c22 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/records/InteractionLogRecord.java @@ -0,0 +1,191 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records; + + +import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.InteractionLog; + +import java.sql.Timestamp; + +import org.jooq.impl.TableRecordImpl; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class InteractionLogRecord extends TableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for public.interaction_log.id. + */ + public void setId(Long value) { + set(0, value); + } + + /** + * Getter for public.interaction_log.id. + */ + public Long getId() { + return (Long) get(0); + } + + /** + * Setter for public.interaction_log.sent_date. + */ + public void setSentDate(Timestamp value) { + set(1, value); + } + + /** + * Getter for public.interaction_log.sent_date. + */ + public Timestamp getSentDate() { + return (Timestamp) get(1); + } + + /** + * Setter for public.interaction_log.form. + */ + public void setForm(String value) { + set(2, value); + } + + /** + * Getter for public.interaction_log.form. + */ + public String getForm() { + return (String) get(2); + } + + /** + * Setter for public.interaction_log.sender. + */ + public void setSender(String value) { + set(3, value); + } + + /** + * Getter for public.interaction_log.sender. + */ + public String getSender() { + return (String) get(3); + } + + /** + * Setter for public.interaction_log.status. + */ + public void setStatus(String value) { + set(4, value); + } + + /** + * Getter for public.interaction_log.status. + */ + public String getStatus() { + return (String) get(4); + } + + /** + * Setter for public.interaction_log.file_name. + */ + public void setFileName(String value) { + set(5, value); + } + + /** + * Getter for public.interaction_log.file_name. + */ + public String getFileName() { + return (String) get(5); + } + + /** + * Setter for public.interaction_log.records_sent. + */ + public void setRecordsSent(Integer value) { + set(6, value); + } + + /** + * Getter for public.interaction_log.records_sent. + */ + public Integer getRecordsSent() { + return (Integer) get(6); + } + + /** + * Setter for public.interaction_log.records_accepted. + */ + public void setRecordsAccepted(Integer value) { + set(7, value); + } + + /** + * Getter for public.interaction_log.records_accepted. + */ + public Integer getRecordsAccepted() { + return (Integer) get(7); + } + + /** + * Setter for public.interaction_log.file_id. + */ + public void setFileId(String value) { + set(8, value); + } + + /** + * Getter for public.interaction_log.file_id. + */ + public String getFileId() { + return (String) get(8); + } + + /** + * Setter for public.interaction_log.ervu_id. + */ + public void setErvuId(String value) { + set(9, value); + } + + /** + * Getter for public.interaction_log.ervu_id. + */ + public String getErvuId() { + return (String) get(9); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached InteractionLogRecord + */ + public InteractionLogRecord() { + super(InteractionLog.INTERACTION_LOG); + } + + /** + * Create a detached, initialised InteractionLogRecord + */ + public InteractionLogRecord(Long id, Timestamp sentDate, String form, String sender, String status, String fileName, Integer recordsSent, Integer recordsAccepted, String fileId, String ervuId) { + super(InteractionLog.INTERACTION_LOG); + + setId(id); + setSentDate(sentDate); + setForm(form); + setSender(sender); + setStatus(status); + setFileName(fileName); + setRecordsSent(recordsSent); + setRecordsAccepted(recordsAccepted); + setFileId(fileId); + setErvuId(ervuId); + resetChangedOnNotNull(); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/records/WorkflowLogsRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/records/WorkflowLogsRecord.java new file mode 100644 index 00000000..707b42a5 --- /dev/null +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/public_/tables/records/WorkflowLogsRecord.java @@ -0,0 +1,231 @@ +/* + * This file is generated by jOOQ. + */ +package ervu_dashboard.ervu_dashboard.db_beans.public_.tables.records; + + +import ervu_dashboard.ervu_dashboard.db_beans.public_.tables.WorkflowLogs; + +import java.sql.Timestamp; + +import org.jooq.Record1; +import org.jooq.impl.UpdatableRecordImpl; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class WorkflowLogsRecord extends UpdatableRecordImpl { + + private static final long serialVersionUID = 1L; + + /** + * Setter for public.workflow_logs.logging_id. + */ + public void setLoggingId(Long value) { + set(0, value); + } + + /** + * Getter for public.workflow_logs.logging_id. + */ + public Long getLoggingId() { + return (Long) get(0); + } + + /** + * Setter for public.workflow_logs.loggingdate. + */ + public void setLoggingdate(Timestamp value) { + set(1, value); + } + + /** + * Getter for public.workflow_logs.loggingdate. + */ + public Timestamp getLoggingdate() { + return (Timestamp) get(1); + } + + /** + * Setter for public.workflow_logs.loggingphase. + */ + public void setLoggingphase(String value) { + set(2, value); + } + + /** + * Getter for public.workflow_logs.loggingphase. + */ + public String getLoggingphase() { + return (String) get(2); + } + + /** + * Setter for public.workflow_logs.workflowname. + */ + public void setWorkflowname(String value) { + set(3, value); + } + + /** + * Getter for public.workflow_logs.workflowname. + */ + public String getWorkflowname() { + return (String) get(3); + } + + /** + * Setter for public.workflow_logs.workflowfilename. + */ + public void setWorkflowfilename(String value) { + set(4, value); + } + + /** + * Getter for public.workflow_logs.workflowfilename. + */ + public String getWorkflowfilename() { + return (String) get(4); + } + + /** + * Setter for public.workflow_logs.workflowstart. + */ + public void setWorkflowstart(Timestamp value) { + set(5, value); + } + + /** + * Getter for public.workflow_logs.workflowstart. + */ + public Timestamp getWorkflowstart() { + return (Timestamp) get(5); + } + + /** + * Setter for public.workflow_logs.workflowend. + */ + public void setWorkflowend(Timestamp value) { + set(6, value); + } + + /** + * Getter for public.workflow_logs.workflowend. + */ + public Timestamp getWorkflowend() { + return (Timestamp) get(6); + } + + /** + * Setter for public.workflow_logs.workflowlogchannelid. + */ + public void setWorkflowlogchannelid(String value) { + set(7, value); + } + + /** + * Getter for public.workflow_logs.workflowlogchannelid. + */ + public String getWorkflowlogchannelid() { + return (String) get(7); + } + + /** + * Setter for public.workflow_logs.workflowparentlogchannelid. + */ + public void setWorkflowparentlogchannelid(String value) { + set(8, value); + } + + /** + * Getter for public.workflow_logs.workflowparentlogchannelid. + */ + public String getWorkflowparentlogchannelid() { + return (String) get(8); + } + + /** + * Setter for public.workflow_logs.workflowlogging. + */ + public void setWorkflowlogging(String value) { + set(9, value); + } + + /** + * Getter for public.workflow_logs.workflowlogging. + */ + public String getWorkflowlogging() { + return (String) get(9); + } + + /** + * Setter for public.workflow_logs.workflowerrorcount. + */ + public void setWorkflowerrorcount(Integer value) { + set(10, value); + } + + /** + * Getter for public.workflow_logs.workflowerrorcount. + */ + public Integer getWorkflowerrorcount() { + return (Integer) get(10); + } + + /** + * Setter for public.workflow_logs.workflowstatusdescription. + */ + public void setWorkflowstatusdescription(String value) { + set(11, value); + } + + /** + * Getter for public.workflow_logs.workflowstatusdescription. + */ + public String getWorkflowstatusdescription() { + return (String) get(11); + } + + // ------------------------------------------------------------------------- + // Primary key information + // ------------------------------------------------------------------------- + + @Override + public Record1 key() { + return (Record1) super.key(); + } + + // ------------------------------------------------------------------------- + // Constructors + // ------------------------------------------------------------------------- + + /** + * Create a detached WorkflowLogsRecord + */ + public WorkflowLogsRecord() { + super(WorkflowLogs.WORKFLOW_LOGS); + } + + /** + * Create a detached, initialised WorkflowLogsRecord + */ + public WorkflowLogsRecord(Long loggingId, Timestamp loggingdate, String loggingphase, String workflowname, String workflowfilename, Timestamp workflowstart, Timestamp workflowend, String workflowlogchannelid, String workflowparentlogchannelid, String workflowlogging, Integer workflowerrorcount, String workflowstatusdescription) { + super(WorkflowLogs.WORKFLOW_LOGS); + + setLoggingId(loggingId); + setLoggingdate(loggingdate); + setLoggingphase(loggingphase); + setWorkflowname(workflowname); + setWorkflowfilename(workflowfilename); + setWorkflowstart(workflowstart); + setWorkflowend(workflowend); + setWorkflowlogchannelid(workflowlogchannelid); + setWorkflowparentlogchannelid(workflowparentlogchannelid); + setWorkflowlogging(workflowlogging); + setWorkflowerrorcount(workflowerrorcount); + setWorkflowstatusdescription(workflowstatusdescription); + resetChangedOnNotNull(); + } +} diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/Subpoenas.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/Subpoenas.java index 11522a81..08d87bd5 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/Subpoenas.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/Subpoenas.java @@ -172,20 +172,23 @@ public class Subpoenas extends TableImpl { /** * The column * recruitment_campaign.subpoenas.appear_date_is_good. + * Повестки, дата явки по которым еще не наступила */ - public final TableField APPEAR_DATE_IS_GOOD = createField(DSL.name("appear_date_is_good"), SQLDataType.NUMERIC, this, ""); + public final TableField APPEAR_DATE_IS_GOOD = createField(DSL.name("appear_date_is_good"), SQLDataType.NUMERIC, this, "Повестки, дата явки по которым еще не наступила"); /** * The column - * recruitment_campaign.subpoenas.not_delivery_percent. + * recruitment_campaign.subpoenas.not_delivery_percent. Процент + * не врученных повесток */ - public final TableField NOT_DELIVERY_PERCENT = createField(DSL.name("not_delivery_percent"), SQLDataType.NUMERIC, this, ""); + public final TableField NOT_DELIVERY_PERCENT = createField(DSL.name("not_delivery_percent"), SQLDataType.NUMERIC, this, "Процент не врученных повесток"); /** * The column * recruitment_campaign.subpoenas.appear_date_is_good_percent. + * Процент повесток, по которым дата явки еще не наступила */ - public final TableField APPEAR_DATE_IS_GOOD_PERCENT = createField(DSL.name("appear_date_is_good_percent"), SQLDataType.NUMERIC, this, ""); + public final TableField APPEAR_DATE_IS_GOOD_PERCENT = createField(DSL.name("appear_date_is_good_percent"), SQLDataType.NUMERIC, this, "Процент повесток, по которым дата явки еще не наступила"); private Subpoenas(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/records/SubpoenasRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/records/SubpoenasRecord.java index e046bef9..3ea214c7 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/records/SubpoenasRecord.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/recruitment_campaign/tables/records/SubpoenasRecord.java @@ -334,6 +334,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl { /** * Setter for * recruitment_campaign.subpoenas.appear_date_is_good. + * Повестки, дата явки по которым еще не наступила */ public void setAppearDateIsGood(BigDecimal value) { set(19, value); @@ -342,6 +343,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl { /** * Getter for * recruitment_campaign.subpoenas.appear_date_is_good. + * Повестки, дата явки по которым еще не наступила */ public BigDecimal getAppearDateIsGood() { return (BigDecimal) get(19); @@ -349,7 +351,8 @@ public class SubpoenasRecord extends UpdatableRecordImpl { /** * Setter for - * recruitment_campaign.subpoenas.not_delivery_percent. + * recruitment_campaign.subpoenas.not_delivery_percent. Процент + * не врученных повесток */ public void setNotDeliveryPercent(BigDecimal value) { set(20, value); @@ -357,7 +360,8 @@ public class SubpoenasRecord extends UpdatableRecordImpl { /** * Getter for - * recruitment_campaign.subpoenas.not_delivery_percent. + * recruitment_campaign.subpoenas.not_delivery_percent. Процент + * не врученных повесток */ public BigDecimal getNotDeliveryPercent() { return (BigDecimal) get(20); @@ -366,6 +370,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl { /** * Setter for * recruitment_campaign.subpoenas.appear_date_is_good_percent. + * Процент повесток, по которым дата явки еще не наступила */ public void setAppearDateIsGoodPercent(BigDecimal value) { set(21, value); @@ -374,6 +379,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl { /** * Getter for * recruitment_campaign.subpoenas.appear_date_is_good_percent. + * Процент повесток, по которым дата явки еще не наступила */ public BigDecimal getAppearDateIsGoodPercent() { return (BigDecimal) get(21); diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/Age.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/Age.java index 002a063a..0b91e130 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/Age.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/Age.java @@ -53,9 +53,9 @@ public class Age extends TableImpl { } /** - * The column total_registered.age.17_yaers. Возраст 17 + * The column total_registered.age.17_years. Возраст 17 */ - public final TableField _17_YAERS = createField(DSL.name("17_yaers"), SQLDataType.NUMERIC, this, "Возраст 17"); + public final TableField _17_YEARS = createField(DSL.name("17_years"), SQLDataType.NUMERIC, this, "Возраст 17"); /** * The column total_registered.age.18-26_years. Возраст 18-26 @@ -103,10 +103,10 @@ public class Age extends TableImpl { public final TableField _46_50_YEARS = createField(DSL.name("46-50_years"), SQLDataType.NUMERIC, this, "Возраст 46-50"); /** - * The column total_registered.age.17_yaers_percent. Возраст 17 + * The column total_registered.age.17_years_percent. Возраст 17 * в процентах */ - public final TableField _17_YAERS_PERCENT = createField(DSL.name("17_yaers_percent"), SQLDataType.NUMERIC, this, "Возраст 17 в процентах"); + public final TableField _17_YEARS_PERCENT = createField(DSL.name("17_years_percent"), SQLDataType.NUMERIC, this, "Возраст 17 в процентах"); /** * The column total_registered.age.18-26_years_percent. Возраст diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/Subpoenas.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/Subpoenas.java index 66df1acb..cf85cd55 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/Subpoenas.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/Subpoenas.java @@ -184,24 +184,28 @@ public class Subpoenas extends TableImpl { /** * The column total_registered.subpoenas.count_not_delivery. + * Количество не врученных повесток */ - public final TableField COUNT_NOT_DELIVERY = createField(DSL.name("count_not_delivery"), SQLDataType.NUMERIC, this, ""); + public final TableField COUNT_NOT_DELIVERY = createField(DSL.name("count_not_delivery"), SQLDataType.NUMERIC, this, "Количество не врученных повесток"); /** * The column total_registered.subpoenas.appear_date_is_good. + * Повестки, дата явки по которым еще не наступила */ - public final TableField APPEAR_DATE_IS_GOOD = createField(DSL.name("appear_date_is_good"), SQLDataType.NUMERIC, this, ""); + public final TableField APPEAR_DATE_IS_GOOD = createField(DSL.name("appear_date_is_good"), SQLDataType.NUMERIC, this, "Повестки, дата явки по которым еще не наступила"); /** * The column total_registered.subpoenas.not_delivery_percent. + * Процент не врученных повесток */ - public final TableField NOT_DELIVERY_PERCENT = createField(DSL.name("not_delivery_percent"), SQLDataType.NUMERIC, this, ""); + public final TableField NOT_DELIVERY_PERCENT = createField(DSL.name("not_delivery_percent"), SQLDataType.NUMERIC, this, "Процент не врученных повесток"); /** * The column * total_registered.subpoenas.appear_date_is_good_percent. + * Процент повесток, дата явки по которым еще не наступила */ - public final TableField APPEAR_DATE_IS_GOOD_PERCENT = createField(DSL.name("appear_date_is_good_percent"), SQLDataType.NUMERIC, this, ""); + public final TableField APPEAR_DATE_IS_GOOD_PERCENT = createField(DSL.name("appear_date_is_good_percent"), SQLDataType.NUMERIC, this, "Процент повесток, дата явки по которым еще не наступила"); private Subpoenas(Name alias, Table aliased) { this(alias, aliased, (Field[]) null, null); diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/records/AgeRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/records/AgeRecord.java index 1ee76e14..10c02d46 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/records/AgeRecord.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/records/AgeRecord.java @@ -22,16 +22,16 @@ public class AgeRecord extends UpdatableRecordImpl { private static final long serialVersionUID = 1L; /** - * Setter for total_registered.age.17_yaers. Возраст 17 + * Setter for total_registered.age.17_years. Возраст 17 */ - public void set_17Yaers(BigDecimal value) { + public void set_17Years(BigDecimal value) { set(0, value); } /** - * Getter for total_registered.age.17_yaers. Возраст 17 + * Getter for total_registered.age.17_years. Возраст 17 */ - public BigDecimal get_17Yaers() { + public BigDecimal get_17Years() { return (BigDecimal) get(0); } @@ -162,18 +162,18 @@ public class AgeRecord extends UpdatableRecordImpl { } /** - * Setter for total_registered.age.17_yaers_percent. Возраст 17 + * Setter for total_registered.age.17_years_percent. Возраст 17 * в процентах */ - public void set_17YaersPercent(BigDecimal value) { + public void set_17YearsPercent(BigDecimal value) { set(10, value); } /** - * Getter for total_registered.age.17_yaers_percent. Возраст 17 + * Getter for total_registered.age.17_years_percent. Возраст 17 * в процентах */ - public BigDecimal get_17YaersPercent() { + public BigDecimal get_17YearsPercent() { return (BigDecimal) get(10); } @@ -354,10 +354,10 @@ public class AgeRecord extends UpdatableRecordImpl { /** * Create a detached, initialised AgeRecord */ - public AgeRecord(BigDecimal _17Yaers, BigDecimal _18_26Years, BigDecimal _27_30Years, BigDecimal _31_35Years, BigDecimal _36_40Years, BigDecimal _41_45Years, BigDecimal _51_2bYears, String allMW, Date recordingDate, BigDecimal _46_50Years, BigDecimal _17YaersPercent, BigDecimal _18_26YearsPercent, BigDecimal _27_30YearsPercent, BigDecimal _31_35YearsPercent, BigDecimal _36_40YearsPercent, BigDecimal _41_45YearsPercent, BigDecimal _46_50YearsPercent, BigDecimal _51_2bYearsPercent, String recruitmentId, String registered, Long idAge) { + public AgeRecord(BigDecimal _17Years, BigDecimal _18_26Years, BigDecimal _27_30Years, BigDecimal _31_35Years, BigDecimal _36_40Years, BigDecimal _41_45Years, BigDecimal _51_2bYears, String allMW, Date recordingDate, BigDecimal _46_50Years, BigDecimal _17YearsPercent, BigDecimal _18_26YearsPercent, BigDecimal _27_30YearsPercent, BigDecimal _31_35YearsPercent, BigDecimal _36_40YearsPercent, BigDecimal _41_45YearsPercent, BigDecimal _46_50YearsPercent, BigDecimal _51_2bYearsPercent, String recruitmentId, String registered, Long idAge) { super(Age.AGE); - set_17Yaers(_17Yaers); + set_17Years(_17Years); set_18_26Years(_18_26Years); set_27_30Years(_27_30Years); set_31_35Years(_31_35Years); @@ -367,7 +367,7 @@ public class AgeRecord extends UpdatableRecordImpl { setAllMW(allMW); setRecordingDate(recordingDate); set_46_50Years(_46_50Years); - set_17YaersPercent(_17YaersPercent); + set_17YearsPercent(_17YearsPercent); set_18_26YearsPercent(_18_26YearsPercent); set_27_30YearsPercent(_27_30YearsPercent); set_31_35YearsPercent(_31_35YearsPercent); diff --git a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/records/SubpoenasRecord.java b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/records/SubpoenasRecord.java index c4254a9b..26063d0d 100644 --- a/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/records/SubpoenasRecord.java +++ b/backend/src/main/java/ervu_dashboard/ervu_dashboard/db_beans/total_registered/tables/records/SubpoenasRecord.java @@ -371,6 +371,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl { /** * Setter for total_registered.subpoenas.count_not_delivery. + * Количество не врученных повесток */ public void setCountNotDelivery(BigDecimal value) { set(22, value); @@ -378,6 +379,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl { /** * Getter for total_registered.subpoenas.count_not_delivery. + * Количество не врученных повесток */ public BigDecimal getCountNotDelivery() { return (BigDecimal) get(22); @@ -385,6 +387,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl { /** * Setter for total_registered.subpoenas.appear_date_is_good. + * Повестки, дата явки по которым еще не наступила */ public void setAppearDateIsGood(BigDecimal value) { set(23, value); @@ -392,6 +395,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl { /** * Getter for total_registered.subpoenas.appear_date_is_good. + * Повестки, дата явки по которым еще не наступила */ public BigDecimal getAppearDateIsGood() { return (BigDecimal) get(23); @@ -399,6 +403,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl { /** * Setter for total_registered.subpoenas.not_delivery_percent. + * Процент не врученных повесток */ public void setNotDeliveryPercent(BigDecimal value) { set(24, value); @@ -406,6 +411,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl { /** * Getter for total_registered.subpoenas.not_delivery_percent. + * Процент не врученных повесток */ public BigDecimal getNotDeliveryPercent() { return (BigDecimal) get(24); @@ -414,6 +420,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl { /** * Setter for * total_registered.subpoenas.appear_date_is_good_percent. + * Процент повесток, дата явки по которым еще не наступила */ public void setAppearDateIsGoodPercent(BigDecimal value) { set(25, value); @@ -422,6 +429,7 @@ public class SubpoenasRecord extends UpdatableRecordImpl { /** * Getter for * total_registered.subpoenas.appear_date_is_good_percent. + * Процент повесток, дата явки по которым еще не наступила */ public BigDecimal getAppearDateIsGoodPercent() { return (BigDecimal) get(25); diff --git a/resources/src/main/resources/business-model/milregistration.page b/resources/src/main/resources/business-model/milregistration.page index 584b4ed3..028a1c46 100644 --- a/resources/src/main/resources/business-model/milregistration.page +++ b/resources/src/main/resources/business-model/milregistration.page @@ -717,6 +717,7 @@ 3cd1c88a-a967-4ede-8090-685369098604 Всего состоят на учете true + false false @@ -3153,7 +3154,6 @@ ec7e0341-cba8-4c6a-a472-6ff1dd337054 Возраст и Дети до 18лет true - false false @@ -3165,7 +3165,6 @@ af7000dd-283a-45b6-acbf-6e1de7f22f88 Возраст true - false false @@ -3291,7 +3290,6 @@ 3e8b4bbd-131d-49c9-b8e3-d5e22172ea04 Вертикальный контейнер true - false false @@ -3562,7 +3560,7 @@ defaultValueColumn - {"schema":"total_registered","table":"age","entity":"age","name":"17_yaers_percent"} + {"schema":"total_registered","table":"age","entity":"age","name":"17_years_percent"} @@ -3584,7 +3582,7 @@ valueByEventColumn - {"schema":"total_registered","table":"age","entity":"age","name":"17_yaers_percent"} + {"schema":"total_registered","table":"age","entity":"age","name":"17_years_percent"} @@ -4812,7 +4810,6 @@ e04e6e4c-5cfe-4e0f-ac3b-2b813e28467b Вертикальный контейнер true - false false @@ -4975,7 +4972,6 @@ 18881013-e791-4242-bb7b-506ae5447efd Горизонтальный контейнер true - false false @@ -5084,7 +5080,7 @@ defaultValueColumn - {"schema":"total_registered","table":"age","entity":"age","name":"17_yaers_percent"} + {"schema":"total_registered","table":"age","entity":"age","name":"17_years_percent"} @@ -5106,7 +5102,7 @@ valueByEventColumn - {"schema":"total_registered","table":"age","entity":"age","name":"17_yaers_percent"} + {"schema":"total_registered","table":"age","entity":"age","name":"17_years_percent"} @@ -6337,7 +6333,6 @@ 68a1a089-0a7c-488c-9f99-39e975563747 Вертикальный контейнер true - false false @@ -6608,7 +6603,7 @@ defaultValueColumn - {"schema":"total_registered","table":"age","entity":"age","name":"17_yaers_percent"} + {"schema":"total_registered","table":"age","entity":"age","name":"17_years_percent"} @@ -6630,7 +6625,7 @@ valueByEventColumn - {"schema":"total_registered","table":"age","entity":"age","name":"17_yaers_percent"} + {"schema":"total_registered","table":"age","entity":"age","name":"17_years_percent"} @@ -7829,6 +7824,7 @@ 79fc57e0-9c07-425f-9139-9a95f9987d2d Дети до 18 лет true + false false @@ -12777,6 +12773,7 @@ c8256eda-0d42-4abb-89e4-d582b973df82 VB - Семейное положение и Занятость true + false false diff --git a/resources/src/main/resources/business-model/notregistered.page b/resources/src/main/resources/business-model/notregistered.page index f91ca5a7..25b1951c 100644 --- a/resources/src/main/resources/business-model/notregistered.page +++ b/resources/src/main/resources/business-model/notregistered.page @@ -697,6 +697,7 @@ 62ad92df-92a4-456b-9c72-c4e133f621f9 VB - Подлежат постановке на учет true + false false @@ -3218,7 +3219,6 @@ 76298b31-e12e-4ce4-b510-3e2378cb672c VB - Возраст и занятость true - false false @@ -3230,7 +3230,6 @@ 90815563-92e7-462e-9799-94bc6347c6b1 Возраст true - false false @@ -3356,7 +3355,6 @@ 8d39fc55-1ee7-4bc5-b824-dc89cc10e7bf Вертикальный контейнер true - false false @@ -3566,6 +3564,7 @@ dc986cf9-10a7-482f-b62a-3c3e17822506 Текст false + false false @@ -3627,7 +3626,7 @@ defaultValueColumn - {"schema":"total_registered","table":"age","entity":"age","name":"17_yaers_percent"} + {"schema":"total_registered","table":"age","entity":"age","name":"17_years_percent"} @@ -3649,7 +3648,7 @@ valueByEventColumn - {"schema":"total_registered","table":"age","entity":"age","name":"17_yaers_percent"} + {"schema":"total_registered","table":"age","entity":"age","name":"17_years_percent"} @@ -3856,6 +3855,7 @@ 76313132-73d0-416d-a0b4-cf0018ce7a84 Текст false + false false @@ -4846,6 +4846,7 @@ d9dc1dc0-e6bf-4e9c-b95e-55204f2a9a5f Мужчины true + false false @@ -4877,7 +4878,6 @@ 80ea199c-2e7c-4d48-a173-cfa5cae98859 Вертикальный контейнер true - false false @@ -5148,7 +5148,7 @@ defaultValueColumn - {"schema":"total_registered","table":"age","entity":"age","name":"17_yaers_percent"} + {"schema":"total_registered","table":"age","entity":"age","name":"17_years_percent"} @@ -5170,7 +5170,7 @@ valueByEventColumn - {"schema":"total_registered","table":"age","entity":"age","name":"17_yaers_percent"} + {"schema":"total_registered","table":"age","entity":"age","name":"17_years_percent"} @@ -6367,6 +6367,7 @@ 9773b35b-30ac-4228-ae30-07544fd3535b Женщины true + false false @@ -6398,7 +6399,6 @@ 3efa4de5-c9dd-48ad-827f-3f9d4af06c43 Вертикальный контейнер true - false false @@ -6669,7 +6669,7 @@ defaultValueColumn - {"schema":"total_registered","table":"age","entity":"age","name":"17_yaers_percent"} + {"schema":"total_registered","table":"age","entity":"age","name":"17_years_percent"} @@ -6691,7 +6691,7 @@ valueByEventColumn - {"schema":"total_registered","table":"age","entity":"age","name":"17_yaers_percent"} + {"schema":"total_registered","table":"age","entity":"age","name":"17_years_percent"} From 6730db6379020c4f019c8c50b846354bdc1f33ad Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Tue, 29 Oct 2024 11:16:09 +0300 Subject: [PATCH 48/49] SUPPORT-8606: add new changeSet --- .../v_1.0/20241029-SUPPORT-8617-fix-column.xml | 18 ++++++++++++++++++ .../resources/config/v_1.0/changelog-v1.0.xml | 1 + 2 files changed, 19 insertions(+) create mode 100644 backend/src/main/resources/config/v_1.0/20241029-SUPPORT-8617-fix-column.xml diff --git a/backend/src/main/resources/config/v_1.0/20241029-SUPPORT-8617-fix-column.xml b/backend/src/main/resources/config/v_1.0/20241029-SUPPORT-8617-fix-column.xml new file mode 100644 index 00000000..7f1433f0 --- /dev/null +++ b/backend/src/main/resources/config/v_1.0/20241029-SUPPORT-8617-fix-column.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + ALTER TABLE total_registered.age RENAME COLUMN "17_yaers_percent" TO "17_years_percent"; + + + \ No newline at end of file diff --git a/backend/src/main/resources/config/v_1.0/changelog-v1.0.xml b/backend/src/main/resources/config/v_1.0/changelog-v1.0.xml index c647d3dd..a38859f6 100644 --- a/backend/src/main/resources/config/v_1.0/changelog-v1.0.xml +++ b/backend/src/main/resources/config/v_1.0/changelog-v1.0.xml @@ -6,4 +6,5 @@ http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd"> + \ No newline at end of file From 6d85c9f9839b7f98b0bcc53247f6f857be1eb334 Mon Sep 17 00:00:00 2001 From: Artyom Hackimullin Date: Tue, 29 Oct 2024 11:28:49 +0300 Subject: [PATCH 49/49] SUPPORT-8606: add new changSet to rename column --- .../v_1.0/20241029-SUPPORT-8617-fix-column.xml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/backend/src/main/resources/config/v_1.0/20241029-SUPPORT-8617-fix-column.xml b/backend/src/main/resources/config/v_1.0/20241029-SUPPORT-8617-fix-column.xml index 7f1433f0..eea9dfb3 100644 --- a/backend/src/main/resources/config/v_1.0/20241029-SUPPORT-8617-fix-column.xml +++ b/backend/src/main/resources/config/v_1.0/20241029-SUPPORT-8617-fix-column.xml @@ -7,7 +7,7 @@ - + @@ -15,4 +15,14 @@ ALTER TABLE total_registered.age RENAME COLUMN "17_yaers_percent" TO "17_years_percent"; + + + + + + + + ALTER TABLE total_registered.age RENAME COLUMN "17_yaers" TO "17_years"; + + \ No newline at end of file