micord/ervu-business-metrics
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/ervu/tmp_makets' into ervu/tmp_makets

Browse source 
* origin/ervu/tmp_makets:
  panel-btn-fixed-right
  Выпадающий список регионы
  fix changeset
This commit is contained in:
Фоат Саляхов 2025-01-16 11:18:38 +03:00
commit 8834b9de9f
3 changed files with 166 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
backend/src/main/resources/config/v_1.0/20250114-ERVU-db_changes.xml
View file

@ -17,7 +17,8 @@
info_date date NOT NULL,
count_arrived_death_reason int8 DEFAULT 0 NOT NULL,
count_arrived_age_limit int8 DEFAULT 0 NOT NULL,
CONSTRAINT decisions_signing_pkey PRIMARY KEY (decisions_signing_id)
CONSTRAINT decisions_signing_pkey PRIMARY KEY (decisions_signing_id),
CONSTRAINT fk_decisions_signing_recruitment_id FOREIGN KEY (recruitment_id) REFERENCES metrics.recruitment(id)
);
CREATE INDEX IF NOT EXISTS idx_decisions_signing_date ON deregistration.decisions_signing USING btree (info_date);
CREATE INDEX IF NOT EXISTS idx_decisions_signing_recr ON deregistration.decisions_signing USING btree (recruitment_id);
@ -29,8 +30,6 @@
ALTER TABLE IF EXISTS deregistration.decisions_signing OWNER TO ervu_business_metrics;
ALTER TABLE IF EXISTS deregistration.decisions_signing ADD CONSTRAINT fk_decisions_signing_recruitment_id FOREIGN KEY (recruitment_id) REFERENCES metrics.recruitment(id);
CREATE OR REPLACE VIEW deregistration.view_decisions_signing
AS SELECT decisions_signing.decisions_signing_id,
decisions_signing.count_arrived_death_reason + decisions_signing.count_arrived_age_limit AS count_arrived_all,

4
frontend/src/resources/css/components-business-metrics.css
View file

@ -239,7 +239,7 @@
.webbpm.ervu_business_metrics .group-section + .group-section {
margin-top: var(--indent-mini);
}
.webbpm.ervu_business_metrics .block-panel .panel-btn-fixed .btn {
.webbpm.ervu_business_metrics .block-panel .panel-btn-fixed-right .btn {
padding-right: 64px;
}
@ -391,8 +391,6 @@
width: min(11vw, 13.75rem) !important; /*220px*/
height: min(11vw, 13.75rem) !important; /*220px*/
}
.webbpm.ervu_business_metrics .graph-donut-large .chart-content {
}
.webbpm.ervu_business_metrics [class*="graph-legend"] * {
margin-bottom: 0;

165
resources/src/main/resources/business-model/ervu-business-metrics/register_subpoenas.page
View file

@ -75,10 +75,140 @@
</properties>
</scripts>
<scripts id="3171b2e1-b4af-4335-95fa-1b2592604b84"/>
<children id="77ed2116-8a9e-4480-93d7-43ccf7b7aa7a">
<prototypeId>630accd8-3776-4fc1-a87c-3a0f05274678</prototypeId>
<componentRootId>77ed2116-8a9e-4480-93d7-43ccf7b7aa7a</componentRootId>
<name>DropdownTreeView 2</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="e1d0d895-79ee-4230-a47c-e4086b8dbfdb">
<properties>
<entry>
<key>collapseLevel</key>
<value>
<simple>1.0</simple>
</value>
</entry>
<entry>
<key>maxHeight</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>style</key>
<value>
<complex>
<entry>
<key>height</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>maxHeight</key>
<value>
<simple>null</simple>
</value>
</entry>
</complex>
</value>
</entry>
</properties>
</scripts>
<scripts id="bba43bd6-32d0-4039-bd0c-2d70871a2649">
<properties>
<entry>
<key>treeItemService</key>
<value>
<complex>
<entry>
<key>businessIdColumn</key>
<value>
<simple>{"schema":"metrics","table":"region","entity":"region","name":"region_id"}</simple>
</value>
</entry>
<entry>
<key>idColumn</key>
<value>
<simple>{"schema":"metrics","table":"region","entity":"region","name":"region_id"}</simple>
</value>
</entry>
<entry>
<key>labelColumn</key>
<value>
<simple>{"schema":"metrics","table":"region","entity":"region","name":"subject_name"}</simple>
</value>
</entry>
<entry>
<key>loadDao</key>
<value>
<complex>
<entry>
<key>graph</key>
<value>
<simple>{"conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"nodeByIndex":{"0":{"tableName":"region","schemaName":"metrics","x":318.0,"y":110.0,"alias":"region","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"nodes":[{"tableName":"region","schemaName":"metrics","x":318.0,"y":110.0,"alias":"region","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}],"nodeByEntityName":{"region":{"tableName":"region","schemaName":"metrics","x":318.0,"y":110.0,"alias":"region","conditionGroup":{"operator":"AND","conditions":[],"groups":[]},"emptyEntityAction":"IGNORE_OR_DELETE"}},"matrix":[[null]],"mainNodeIndex":0}</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>parentIdColumn</key>
<value>
<simple>{"schema":"metrics","table":"region","entity":"region","name":"region_id"}</simple>
</value>
</entry>
<entry>
<key>sortColumn</key>
<value>
<simple>{"schema":"metrics","table":"region","entity":"region","name":"region_id"}</simple>
</value>
</entry>
<entry>
<key>sortOrder</key>
<value>
<simple>"ASC"</simple>
</value>
</entry>
</complex>
</value>
</entry>
</properties>
</scripts>
<scripts id="3c7faf24-c429-4b32-941a-8fcb931b36ac">
<classRef type="TS">
<className>FilterComponent</className>
<packageName>component.filter</packageName>
</classRef>
</scripts>
<scripts id="8e3e86de-54c2-48c5-b105-28ecb59d845e">
<classRef type="TS">
<className>DropdownTreeViewFilterComponent</className>
<packageName>ervu_business_metrics.component.filter</packageName>
</classRef>
<enabled>true</enabled>
<expanded>true</expanded>
<properties>
<entry>
<key>isBusinessId</key>
<value>
<simple>true</simple>
</value>
</entry>
<entry>
<key>operation</key>
<value>
<simple>"EQUAL"</simple>
</value>
</entry>
</properties>
</scripts>
</children>
<children id="7085eb05-5251-41dd-8484-8d24ee839f76">
<prototypeId>b310f98a-69c6-4e7b-8cdb-f1ab9f9c0d94</prototypeId>
<componentRootId>7085eb05-5251-41dd-8484-8d24ee839f76</componentRootId>
<name>Выпадающий список РФ</name>
<name>Выпадающий список РФ(удалить)</name>
<container>false</container>
<childrenReordered>false</childrenReordered>
<scripts id="23992f0e-94ed-4fb4-b4d1-dc6ad7f13227">
@ -101,6 +231,37 @@
<simple>null</simple>
</value>
</entry>
<entry>
<key>scrollGravity</key>
<value>
<simple>null</simple>
</value>
</entry>
<entry>
<key>style</key>
<value>
<complex>
<entry>
<key>height</key>
<value>
<simple>"400"</simple>
</value>
</entry>
<entry>
<key>maxHeight</key>
<value>
<simple>null</simple>
</value>
</entry>
</complex>
</value>
</entry>
<entry>
<key>visible</key>
<value>
<simple>false</simple>
</value>
</entry>
</properties>
</scripts>
<scripts id="efb0fec7-9951-4b36-bbda-fa17aa002d74">
@ -3470,7 +3631,6 @@
<componentRootId>18ecb7c6-2148-4eb0-a18c-97af5e73cac7</componentRootId>
<name>ГК Второй ряд</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>
@ -8472,6 +8632,7 @@
<componentRootId>d1069ca8-24fc-4368-9465-cc0a70928fae</componentRootId>
<name>ГК Третий ряд</name>
<container>true</container>
<expanded>false</expanded>
<childrenReordered>false</childrenReordered>
<scripts id="bf098f19-480e-44e4-9084-aa42955c4d0f">
<properties>