Commit Graph

57 Commits

Author SHA1 Message Date
fd69b5378f GeoGSON 2025-09-17 07:34:15 +05:00
7fdf572d19 GeoJSON by HTTP 2025-09-16 17:08:40 +05:00
11d8e00bbc Update files to new version QGIS 2025-09-15 17:00:39 +05:00
5a7b8a5932 New SMAP file 2025-09-15 07:23:26 +05:00
da1d3e1098 add resources 2025-09-14 15:04:12 +05:00
a949b49b35 Merge branch 'develop' of https://git.ccalm.org/igor/org.ccalm.main into develop 2025-09-14 14:48:46 +05:00
9837e3a5b9 JSON log 2025-09-14 14:48:36 +05:00
e01edc7224 Add locust type 2025-09-09 17:12:31 +05:00
c2762414c2 Merge branch 'develop' of https://git.ccalm.org/igor/org.ccalm.main into develop
# Conflicts:
#	src/main/resources/templates/engine/index.html
2025-09-08 18:11:23 +05:00
52f3b89664 SMAP 2025-09-08 12:15:57 +05:00
83ff9cba16 add getJsonData function 2025-09-08 07:30:55 +05:00
340be124d6 Modif "uploadFILE" function to ASDC 2025-09-04 15:42:19 +05:00
72a862ea23 Add save "efficacy_impact_type" 2025-09-04 07:36:19 +05:00
66b1f78745 import repair 2025-08-25 07:37:35 +05:00
9f67439db3 SendWarning 2025-08-12 17:15:44 +05:00
f9e83b1f0e +lon lat send in warnings 2025-08-12 07:45:12 +05:00
8a28b58513 Merge branch 'develop' of https://git.ccalm.org/igor/org.ccalm.main into develop 2025-08-11 15:26:20 +05:00
93383c8c23 v16 2025-08-11 15:26:08 +05:00
9f06a550fc Repair send threshold warnings for soil and air temperature 2025-08-11 07:20:50 +05:00
e423647a59 Delete Excel import 2025-08-08 07:22:40 +05:00
53e7c7e158 Merge branch 'develop' of https://git.mesh.kz/igor/org.ccalm.main into develop
# Conflicts:
#	src/main/java/org/ccalm/main/AcceptJSON.java
2025-07-30 08:58:58 +05:00
d4bfe17898 get fito 2025-07-30 08:54:13 +05:00
fab0c34ffb AcceptJSON_RUS model 2025-07-23 07:37:24 +05:00
e3f93fed10 Update "/api/locust/v01/AcceptJSON_KAZ" 2025-07-20 19:45:59 +05:00
884d3ceb62 import kaz 2025-07-17 07:12:10 +05:00
686109361f Import mod 2025-07-15 07:40:21 +05:00
914b2aae03 add throw 2025-07-14 17:34:41 +05:00
d254140b91 Download reports repair 2025-07-14 15:07:32 +05:00
d2c1f9c7da UZB Update 2025-07-14 11:58:43 +05:00
3c44dac29e UZB integration 2025-07-14 07:37:34 +05:00
39db27fca1 repair warn_air 2025-07-04 07:27:49 +05:00
6e4c74c426 Repair warning 2025-07-03 17:55:01 +05:00
91a1e86415 IVI modif 2025-07-03 07:35:02 +05:00
36783d2de7 Testing /api/locust/v01/SendWarning 2025-06-30 07:27:44 +05:00
7d8ab90e49 Merge branch 'develop' of https://git.mesh.kz/igor/org.ccalm.main into develop
# Conflicts:
#	src/main/java/org/ccalm/main/AcceptJSON.java
#	src/main/java/org/ccalm/main/SendWarning.java
#	src/main/java/org/ccalm/main/engine/EngineController.java
#	src/main/java/org/ccalm/main/login/LoginController.java
#	src/main/java/org/ccalm/main/utils/LTools.java
2025-06-24 23:22:38 +05:00
ed14a3fa9e Preparing for the transition to REST API 2025-06-24 23:08:38 +05:00
9f45e71b59 Exception message + exception object save to log 2025-05-20 13:03:53 +05:00
3e0ba9279b Local tools 2025-03-28 15:33:36 +05:00
1722d20e8e Merge branch 'develop' of https://git.dirt.kz/igor/org.ccalm.main into develop 2025-03-28 13:22:57 +05:00
76ebe97f24 dbFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true); 2025-03-28 13:22:42 +05:00
0de815893f import from usbekistan 2025-03-28 07:45:54 +05:00
afd6abd9e3 + 2025-03-19 07:26:54 +05:00
721b4cac26 + 2025-03-18 07:33:39 +05:00
43185b31ea Импорт анкет из узбекистана 2025-03-17 07:28:52 +05:00
da13dd3c6e Объединение 2025-03-13 20:50:58 +05:00
f9f0da3d2e Сообщение на главной странице 2025-03-13 19:49:52 +05:00
ff82f35c3a + 2025-02-21 21:19:59 +05:00
92d8be6682 Merge branch 'main' of https://git.istt.kz/locust/org.ccalm.main
# Conflicts:
#	org_ccalm_main.yml
2025-02-04 18:54:04 +05:00
8e2f2042e9 предупреждение по прознозу 2025-02-04 18:52:22 +05:00
caec0fccca TCTable удалил 2025-02-03 20:53:39 +05:00