Commit graph

590 commits

Author SHA1 Message Date
Рауф Латыпов
069579743f Merge branch 'feature/SUPPORT-8945_year_formatter' into test/SUPPORT-8945_year_formatter
# Conflicts:
#	frontend/src/ts/ervu-dashboard/component/chart/plugin/DarkBackgroundColorChartPlugin.ts
2025-03-05 15:55:19 +03:00
Рауф Латыпов
014c0057f9 SUPPORT-8945: plugin optimized 2025-03-05 15:43:05 +03:00
adel.ka
ed42ed6785 Merge remote-tracking branch 'origin/develop' into feature/SUPPORT-8638 2025-03-05 13:26:13 +03:00
Рауф Латыпов
6fa29a4cb8 Merge branch 'feature/SUPPORT-8904_sync_chart_with_business_metrics' into feature/SUPPORT-8904_for_merge_to_develop
# Conflicts:
#	frontend/src/ts/ervu-dashboard/component/chart/model/ChartBarSettings.ts
2025-03-05 00:25:45 +03:00
Халтобин Евгений
e31f54552f updated platform version to 3.185.5 2025-03-04 21:09:56 +03:00
Рауф Латыпов
33de2cdbc3 Merge branch 'feature/SUPPORT-8904_for_develop' into feature/SUPPORT-8904_for_merge_to_develop
# Conflicts:
#	frontend/src/ts/ervu-dashboard/component/chart/ErvuChartV2.ts
#	frontend/src/ts/ervu-dashboard/component/chart/plugin/DarkBackgroundColorChartPlugin.ts
2025-03-04 10:59:46 +03:00
Рауф Латыпов
928958f969 update base package up to version 3.185.4 2025-03-04 10:56:17 +03:00
Рауф Латыпов
8ee3dc40a5 Merge branch 'forecast_v1_ERVU-266' into develop
# Conflicts:
#	backend/src/main/java/ru/micord/ervu_dashboard/db_beans/total_registered/Keys.java
2025-03-04 10:36:44 +03:00
Булат Хайруллин
e6bf7249ae Merge branch 'convicts' into develop 2025-02-28 23:44:22 +03:00
m.epshtein
c2e375c086 input fix 2025-02-28 16:18:01 +03:00
m.epshtein
a4d99e2ca0 / 2025-02-28 16:14:25 +03:00
m.epshtein
11cf5e708e // 2025-02-28 16:07:32 +03:00
m.epshtein
25441ee1aa fix input 2025-02-28 15:58:37 +03:00
Рауф Латыпов
2f2346892b SUPPORT-8927: chart plugin for rounding bar middle borders (2)
from SUPPORT-8904
2025-02-28 00:30:36 +03:00
m.epshtein
67ea99e323 SUPPORT-8959 2025-02-26 11:01:44 +03:00
Рауф Латыпов
cfe37c5a1e SUPPORT-8945: end of period on parsing date 2025-02-25 22:30:21 +03:00
Рауф Латыпов
6238f00102 SUPPORT-8945: end of period on parsing date 2025-02-25 15:57:44 +03:00
Булат Хайруллин
3a2da358c6 страница Осужденные 2025-02-23 19:18:28 +03:00
Рауф Латыпов
e3ca6be743 SUPPORT-8904: fix for review (2) 2025-02-21 20:29:51 +03:00
Рауф Латыпов
7c2207bb54 SUPPORT-8904: fix for review (1) 2025-02-20 20:16:21 +03:00
Рауф Латыпов
93687dd179 SUPPORT-8904: все доработки по задаче 2025-02-20 14:06:08 +03:00
Рауф Латыпов
498f4c729d SUPPORT-8904: new plugin "DarkBackgroundColorChartPlugin.ts" 2025-02-19 20:25:58 +03:00
Рауф Латыпов
34f89408d6 SUPPORT-8927: chart plugin for rounding bar middle borders 2025-02-19 14:23:23 +03:00
m.epshtein
fc26363be1 ERVU-285 пунктир 2025-02-18 15:54:17 +03:00
Foat Saliakhov
93d5dca7cb Merge remote-tracking branch 'origin/develop' into forecast_v1_ERVU-266 2025-02-17 16:21:27 +03:00
m.epshtein
f3c80f7e9b fix 2025-02-17 16:15:41 +03:00
Foat Saliakhov
a3d2fb384c Merge remote-tracking branch 'origin/develop' into forecast_v1_ERVU-266 2025-02-17 14:51:30 +03:00
m.epshtein
0c1920365b ERVU-285 new diagram colors 2025-02-17 09:36:07 +03:00
Рауф Латыпов
f2918d3f2a SUPPORT-8904: background color plugin;
+ tiks color parameter
2025-02-14 21:50:06 +03:00
m.epshtein
acf47d74a7 ERVU-279 1b-fix 2025-02-14 15:27:24 +03:00
m.epshtein
d2ec136976 // 2025-02-14 15:04:17 +03:00
m.epshtein
7c47c413c7 ERVU-279 1a-fix 2025-02-14 14:51:59 +03:00
Рауф Латыпов
0db7281a81 SUPPORT-8927: new chart plugin "Bar Stack Middle Border Rounding" 2025-02-14 04:35:04 +03:00
Рауф Латыпов
2fb0ea3d78 SUPPORT-8904: remove bar indexes; + new parameters 2025-02-13 03:33:59 +03:00
Рауф Латыпов
2b52f0ce5d Merge branch 'develop' into test/SUPPORT-8904_chart
# Conflicts:
#	backend/src/main/resources/config/v_1.9.2/changelog-1.9.2.xml
2025-02-12 14:32:41 +03:00
Рауф Латыпов
9c4eff09ae SUPPORT-8904: sync chart with business-metrics 2025-02-12 03:08:03 +03:00
Рауф Латыпов
7391a45e0d update base package up to 3.185.1 2025-02-12 03:06:49 +03:00
m.epshtein
7a22a745b8 Merge branch 'feature/fix-size' into develop 2025-02-06 19:20:43 +03:00
m.epshtein
b8bf9a18ee fix title size 2025-02-06 18:38:06 +03:00
m.epshtein
02c27fb284 // 2025-02-06 14:00:26 +03:00
m.epshtein
ad235184cd fix 2025-02-06 11:37:30 +03:00
m.epshtein
a35825ba61 // 2025-02-06 10:12:47 +03:00
adel.ka
88892192f4 Merge branch 'feature/SUPPORT-8547_save_tree_value' into develop 2025-02-05 16:56:14 +03:00
adel.ka
8d32bbd122 SUPPORT-8547:fixes 2025-02-05 16:51:59 +03:00
adel.ka
c068c96050 SUPPORT-8547: fixes 2025-02-05 16:11:15 +03:00
m.epshtein
8cdac03664 ERVU-268 2025-02-05 14:29:58 +03:00
Фоат Саляхов
89227ae0b8 Тестовый прогнозный график 2025-02-05 11:47:33 +03:00
adel.ka
8887c1e9a7 SUPPORT-8547: fixes 2025-02-05 10:35:24 +03:00
adel.ka
a618a0c719 SUPPORT-8547: fixes 2025-02-05 10:34:02 +03:00
adel.ka
117da855f3 SUPPORT-8547: fixes 2025-02-05 10:29:12 +03:00