@dhis2/analytics 29.4.0 → 29.4.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/cjs/api/analytics/AnalyticsRequest.js +4 -4
- package/build/cjs/components/DataDimension/Calculation/DndContext.js +4 -4
- package/build/cjs/components/DataDimension/Info/DataElementOperandInfo.js +1 -1
- package/build/cjs/components/DataDimension/ItemOptionsSelector/ItemOptionsSelector.js +1 -1
- package/build/cjs/components/DataDimension/ItemSelector/ItemSelector.js +1 -1
- package/build/cjs/components/FileMenu/DeleteDialog.js +1 -1
- package/build/cjs/components/RichText/Editor/Editor.js +2 -2
- package/build/cjs/components/TranslationDialog/TranslationModal/TranslationForm.js +1 -0
- package/build/cjs/components/UserMention/useUserSearchResults.js +1 -1
- package/build/cjs/locales/en/translations.json +0 -12
- package/build/cjs/locales/id/translations.json +6 -6
- package/build/cjs/locales/index.js +86 -41
- package/build/cjs/locales/km/translations.json +6 -6
- package/build/cjs/locales/lo/translations.json +6 -6
- package/build/cjs/locales/my/translations.json +6 -6
- package/build/cjs/locales/tet/translations.json +6 -6
- package/build/cjs/locales/th/translations.json +6 -6
- package/build/cjs/locales/vi/translations.json +6 -6
- package/build/cjs/locales/zh/translations.json +6 -6
- package/build/cjs/locales/zh_CN/translations.json +6 -6
- package/build/cjs/modules/legends.js +1 -1
- package/build/cjs/modules/pivotTable/applyLegendSet.js +4 -4
- package/build/cjs/modules/pivotTable/useScrollPosition.js +2 -2
- package/build/cjs/modules/utils.js +1 -0
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/events/loadCustomSVG/singleValue/index.js +3 -3
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/index.js +2 -2
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/series/index.js +1 -1
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/subtitle/index.js +3 -3
- package/build/cjs/visualizations/config/adapters/dhis_highcharts/title/index.js +3 -3
- package/build/cjs/visualizations/config/generators/highcharts/index.js +2 -2
- package/build/cjs/visualizations/store/adapters/dhis_highcharts/yearOnYear.js +1 -1
- package/build/es/api/analytics/AnalyticsRequest.js +4 -4
- package/build/es/components/DataDimension/Calculation/DndContext.js +4 -4
- package/build/es/components/DataDimension/Info/DataElementOperandInfo.js +1 -1
- package/build/es/components/DataDimension/ItemOptionsSelector/ItemOptionsSelector.js +1 -1
- package/build/es/components/DataDimension/ItemSelector/ItemSelector.js +1 -1
- package/build/es/components/FileMenu/DeleteDialog.js +1 -1
- package/build/es/components/RichText/Editor/Editor.js +2 -2
- package/build/es/components/TranslationDialog/TranslationModal/TranslationForm.js +1 -0
- package/build/es/components/UserMention/useUserSearchResults.js +2 -2
- package/build/es/locales/en/translations.json +0 -12
- package/build/es/locales/id/translations.json +6 -6
- package/build/es/locales/index.js +86 -41
- package/build/es/locales/km/translations.json +6 -6
- package/build/es/locales/lo/translations.json +6 -6
- package/build/es/locales/my/translations.json +6 -6
- package/build/es/locales/tet/translations.json +6 -6
- package/build/es/locales/th/translations.json +6 -6
- package/build/es/locales/vi/translations.json +6 -6
- package/build/es/locales/zh/translations.json +6 -6
- package/build/es/locales/zh_CN/translations.json +6 -6
- package/build/es/modules/legends.js +1 -1
- package/build/es/modules/pivotTable/applyLegendSet.js +4 -4
- package/build/es/modules/pivotTable/useScrollPosition.js +3 -3
- package/build/es/modules/utils.js +1 -0
- package/build/es/visualizations/config/adapters/dhis_highcharts/events/loadCustomSVG/singleValue/index.js +3 -3
- package/build/es/visualizations/config/adapters/dhis_highcharts/index.js +2 -2
- package/build/es/visualizations/config/adapters/dhis_highcharts/series/index.js +1 -1
- package/build/es/visualizations/config/adapters/dhis_highcharts/subtitle/index.js +3 -3
- package/build/es/visualizations/config/adapters/dhis_highcharts/title/index.js +3 -3
- package/build/es/visualizations/config/generators/highcharts/index.js +2 -2
- package/build/es/visualizations/store/adapters/dhis_highcharts/yearOnYear.js +1 -1
- package/package.json +2 -2
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
"Last updated {{time}}": "",
|
|
10
10
|
"Created {{time}} by {{author}}": "",
|
|
11
11
|
"Created {{time}}": "",
|
|
12
|
-
"Viewed {{count}}
|
|
12
|
+
"Viewed {{count}} times_0": "",
|
|
13
13
|
"Notifications": "",
|
|
14
14
|
"You're subscribed and getting updates about new interpretations.": "",
|
|
15
15
|
"Unsubscribe": "",
|
|
@@ -186,7 +186,7 @@
|
|
|
186
186
|
"Error loading interpretations": "",
|
|
187
187
|
"Could not load interpretations": "",
|
|
188
188
|
"Reply": "ឆ្លើយតប",
|
|
189
|
-
"{{count}}
|
|
189
|
+
"{{count}} replies_0": "",
|
|
190
190
|
"View replies": "",
|
|
191
191
|
"Unlike": "",
|
|
192
192
|
"Like": "",
|
|
@@ -236,9 +236,9 @@
|
|
|
236
236
|
"No line lists found. Try adjusting your search or filter options to find what you're looking for.": "",
|
|
237
237
|
"New line list": "",
|
|
238
238
|
"Hide": "លាក់",
|
|
239
|
-
"{{count}} org
|
|
240
|
-
"{{count}}
|
|
241
|
-
"{{count}}
|
|
239
|
+
"{{count}} org units_0": "",
|
|
240
|
+
"{{count}} levels_0": "",
|
|
241
|
+
"{{count}} groups_0": "",
|
|
242
242
|
"Selected: {{commaSeparatedListOfOrganisationUnits}}": "",
|
|
243
243
|
"Nothing selected": "",
|
|
244
244
|
"User organisation unit": "មូលដ្ឋានសុខាភិបាល របស់អ្នកប្រើប្រាស់",
|
|
@@ -467,6 +467,6 @@
|
|
|
467
467
|
"Target": "",
|
|
468
468
|
"Base": "",
|
|
469
469
|
"Axis {{axisId}}": "អ័ក្ស {{axisId}}",
|
|
470
|
-
"{{count}}
|
|
470
|
+
"{{count}} items_0": "",
|
|
471
471
|
"Reset zoom": ""
|
|
472
472
|
}
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
"Last updated {{time}}": "ແກ້ໄຂລ່າສຸດ {{time}}",
|
|
10
10
|
"Created {{time}} by {{author}}": "ສ້າງ {{time}} ໂດຍ {{author}}",
|
|
11
11
|
"Created {{time}}": "ສ້າງ {{time}}",
|
|
12
|
-
"Viewed {{count}}
|
|
12
|
+
"Viewed {{count}} times_0": "ກວດເບິ່ງ {{count}} ຄັ້ງ",
|
|
13
13
|
"Notifications": "ການແຈ້ງເຕືອນ",
|
|
14
14
|
"You're subscribed and getting updates about new interpretations.": "ທ່ານກົດປູ່ມສະໜັກ ເພື່ອຈະໄດ້ອັບເດດ ແລະ ຮັບຂໍ້ມູນໃໝ່",
|
|
15
15
|
"Unsubscribe": "ຍົກເລີກການສະໝັກ",
|
|
@@ -186,7 +186,7 @@
|
|
|
186
186
|
"Error loading interpretations": "",
|
|
187
187
|
"Could not load interpretations": "",
|
|
188
188
|
"Reply": "ຕອບກັບ",
|
|
189
|
-
"{{count}}
|
|
189
|
+
"{{count}} replies_0": "{{count}} ການຕອບກັບ",
|
|
190
190
|
"View replies": "ເບິ່ງການຕອບກັບ",
|
|
191
191
|
"Unlike": "ບໍ່ມັກ",
|
|
192
192
|
"Like": "ມັກ",
|
|
@@ -236,9 +236,9 @@
|
|
|
236
236
|
"No line lists found. Try adjusting your search or filter options to find what you're looking for.": "ບໍ່ພົບບັນຊີລາຍຊື່. ລອງປັບຕົວເລືອກການຄົ້ນຫາ ຫຼື ຕົວກອງເພື່ອສິ່ງທີ່ທ່ານກໍາລັງຄົ້ນຫາ.",
|
|
237
237
|
"New line list": "ເພີ່ມບັນຊີລາຍຊື່ໃໝ່",
|
|
238
238
|
"Hide": "ເຊື່ອງ",
|
|
239
|
-
"{{count}} org
|
|
240
|
-
"{{count}}
|
|
241
|
-
"{{count}}
|
|
239
|
+
"{{count}} org units_0": "{{count}} ໜ່ວຍງານອົງການ",
|
|
240
|
+
"{{count}} levels_0": "{{count}} ຂັ້ນ",
|
|
241
|
+
"{{count}} groups_0": "{{count}} ກຸ່ມ",
|
|
242
242
|
"Selected: {{commaSeparatedListOfOrganisationUnits}}": "ເລືອກ {{commaSeparatedListOfOrganisationUnits}}",
|
|
243
243
|
"Nothing selected": "ບໍ່ມີຫຍັງເລືອກ",
|
|
244
244
|
"User organisation unit": "ຫນ່ວຍງານການຈັດຕັ້ງຂອງຜູ້ໃຊ້",
|
|
@@ -467,6 +467,6 @@
|
|
|
467
467
|
"Target": "ເປົ້າໝາຍ",
|
|
468
468
|
"Base": "ຖານ",
|
|
469
469
|
"Axis {{axisId}}": "ແກນ {{axisId}}",
|
|
470
|
-
"{{count}}
|
|
470
|
+
"{{count}} items_0": "{{count}} ລາຍການ",
|
|
471
471
|
"Reset zoom": "ຣີເຊັດຊູມ"
|
|
472
472
|
}
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
"Last updated {{time}}": "",
|
|
10
10
|
"Created {{time}} by {{author}}": "",
|
|
11
11
|
"Created {{time}}": "",
|
|
12
|
-
"Viewed {{count}}
|
|
12
|
+
"Viewed {{count}} times_0": "",
|
|
13
13
|
"Notifications": "",
|
|
14
14
|
"You're subscribed and getting updates about new interpretations.": "",
|
|
15
15
|
"Unsubscribe": "",
|
|
@@ -179,7 +179,7 @@
|
|
|
179
179
|
"Post interpretation": "",
|
|
180
180
|
"Interpretations": "ဘာသာပြန်ခြင်းများ",
|
|
181
181
|
"Reply": "အကြောင်းပြန်သည်",
|
|
182
|
-
"{{count}}
|
|
182
|
+
"{{count}} replies_0": "",
|
|
183
183
|
"View replies": "",
|
|
184
184
|
"Unlike": "Больше не нравится",
|
|
185
185
|
"Like": "Нравится",
|
|
@@ -227,9 +227,9 @@
|
|
|
227
227
|
"No line lists found. Try adjusting your search or filter options to find what you're looking for.": "",
|
|
228
228
|
"New line list": "",
|
|
229
229
|
"Hide": "",
|
|
230
|
-
"{{count}} org
|
|
231
|
-
"{{count}}
|
|
232
|
-
"{{count}}
|
|
230
|
+
"{{count}} org units_0": "",
|
|
231
|
+
"{{count}} levels_0": "",
|
|
232
|
+
"{{count}} groups_0": "",
|
|
233
233
|
"Selected: {{commaSeparatedListOfOrganisationUnits}}": "",
|
|
234
234
|
"Nothing selected": "",
|
|
235
235
|
"User organisation unit": "",
|
|
@@ -458,6 +458,6 @@
|
|
|
458
458
|
"Target": "ပစ်မှတ်/ ဦးတည်ချက်",
|
|
459
459
|
"Base": "အခြေ",
|
|
460
460
|
"Axis {{axisId}}": "",
|
|
461
|
-
"{{count}}
|
|
461
|
+
"{{count}} items_0": "",
|
|
462
462
|
"Reset zoom": ""
|
|
463
463
|
}
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
"Last updated {{time}}": "",
|
|
10
10
|
"Created {{time}} by {{author}}": "",
|
|
11
11
|
"Created {{time}}": "",
|
|
12
|
-
"Viewed {{count}}
|
|
12
|
+
"Viewed {{count}} times_0": "",
|
|
13
13
|
"Notifications": "",
|
|
14
14
|
"You're subscribed and getting updates about new interpretations.": "",
|
|
15
15
|
"Unsubscribe": "",
|
|
@@ -186,7 +186,7 @@
|
|
|
186
186
|
"Error loading interpretations": "",
|
|
187
187
|
"Could not load interpretations": "",
|
|
188
188
|
"Reply": "Hatán",
|
|
189
|
-
"{{count}}
|
|
189
|
+
"{{count}} replies_0": "",
|
|
190
190
|
"View replies": "",
|
|
191
191
|
"Unlike": "",
|
|
192
192
|
"Like": "",
|
|
@@ -236,9 +236,9 @@
|
|
|
236
236
|
"No line lists found. Try adjusting your search or filter options to find what you're looking for.": "",
|
|
237
237
|
"New line list": "",
|
|
238
238
|
"Hide": "Subar",
|
|
239
|
-
"{{count}} org
|
|
240
|
-
"{{count}}
|
|
241
|
-
"{{count}}
|
|
239
|
+
"{{count}} org units_0": "",
|
|
240
|
+
"{{count}} levels_0": "",
|
|
241
|
+
"{{count}} groups_0": "",
|
|
242
242
|
"Selected: {{commaSeparatedListOfOrganisationUnits}}": "",
|
|
243
243
|
"Nothing selected": "",
|
|
244
244
|
"User organisation unit": "",
|
|
@@ -467,6 +467,6 @@
|
|
|
467
467
|
"Target": "Alvu",
|
|
468
468
|
"Base": "Baze",
|
|
469
469
|
"Axis {{axisId}}": "",
|
|
470
|
-
"{{count}}
|
|
470
|
+
"{{count}} items_0": "",
|
|
471
471
|
"Reset zoom": ""
|
|
472
472
|
}
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
"Last updated {{time}}": "",
|
|
10
10
|
"Created {{time}} by {{author}}": "",
|
|
11
11
|
"Created {{time}}": "",
|
|
12
|
-
"Viewed {{count}}
|
|
12
|
+
"Viewed {{count}} times_0": "",
|
|
13
13
|
"Notifications": "",
|
|
14
14
|
"You're subscribed and getting updates about new interpretations.": "",
|
|
15
15
|
"Unsubscribe": "",
|
|
@@ -122,7 +122,7 @@
|
|
|
122
122
|
"Post interpretation": "",
|
|
123
123
|
"Interpretations": "",
|
|
124
124
|
"Reply": "",
|
|
125
|
-
"{{count}}
|
|
125
|
+
"{{count}} replies_0": "",
|
|
126
126
|
"View replies": "",
|
|
127
127
|
"Unlike": "",
|
|
128
128
|
"Like": "",
|
|
@@ -184,9 +184,9 @@
|
|
|
184
184
|
"New line list": "",
|
|
185
185
|
"Options": "",
|
|
186
186
|
"Hide": "",
|
|
187
|
-
"{{count}} org
|
|
188
|
-
"{{count}}
|
|
189
|
-
"{{count}}
|
|
187
|
+
"{{count}} org units_0": "",
|
|
188
|
+
"{{count}} levels_0": "",
|
|
189
|
+
"{{count}} groups_0": "",
|
|
190
190
|
"Selected: {{commaSeparatedListOfOrganisationUnits}}": "",
|
|
191
191
|
"Nothing selected": "",
|
|
192
192
|
"User organisation unit": "",
|
|
@@ -379,6 +379,6 @@
|
|
|
379
379
|
"Target": "",
|
|
380
380
|
"Base": "",
|
|
381
381
|
"Axis {{axisId}}": "",
|
|
382
|
-
"{{count}}
|
|
382
|
+
"{{count}} items_0": "",
|
|
383
383
|
"Reset zoom": ""
|
|
384
384
|
}
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
"Last updated {{time}}": "Cập nhật lần cuối {{time}}",
|
|
10
10
|
"Created {{time}} by {{author}}": "Được tạo {{time}}bởi {{author}}",
|
|
11
11
|
"Created {{time}}": "Được tạo {{time}}",
|
|
12
|
-
"Viewed {{count}}
|
|
12
|
+
"Viewed {{count}} times_0": "Đã xem {{count}}lần",
|
|
13
13
|
"Notifications": "Thông báo",
|
|
14
14
|
"You're subscribed and getting updates about new interpretations.": "Bạn đã đăng ký và đang nhận thông tin cập nhật về những diễn giải mới.",
|
|
15
15
|
"Unsubscribe": "Hủy đăng ký",
|
|
@@ -186,7 +186,7 @@
|
|
|
186
186
|
"Error loading interpretations": "",
|
|
187
187
|
"Could not load interpretations": "",
|
|
188
188
|
"Reply": "Trả lời",
|
|
189
|
-
"{{count}}
|
|
189
|
+
"{{count}} replies_0": "{{count}} câu trả lời",
|
|
190
190
|
"View replies": "Xem trả lời",
|
|
191
191
|
"Unlike": "Không thích",
|
|
192
192
|
"Like": "Thích",
|
|
@@ -236,9 +236,9 @@
|
|
|
236
236
|
"No line lists found. Try adjusting your search or filter options to find what you're looking for.": "Không tìm thấy danh sách dòng nào. Hãy thử điều chỉnh tùy chọn tìm kiếm hoặc bộ lọc để tìm những gì bạn đang tìm kiếm.",
|
|
237
237
|
"New line list": "Danh sách dòng mới",
|
|
238
238
|
"Hide": "Ẩn",
|
|
239
|
-
"{{count}} org
|
|
240
|
-
"{{count}}
|
|
241
|
-
"{{count}}
|
|
239
|
+
"{{count}} org units_0": "{{count}} đơn vị",
|
|
240
|
+
"{{count}} levels_0": "{{count}} cấp độ",
|
|
241
|
+
"{{count}} groups_0": "{{count}} nhóm",
|
|
242
242
|
"Selected: {{commaSeparatedListOfOrganisationUnits}}": "Đã chọn: {{commaSeparatedListOfOrganisationUnits}}",
|
|
243
243
|
"Nothing selected": "Không có gì được chọn",
|
|
244
244
|
"User organisation unit": "Đơn vị người dùng",
|
|
@@ -467,6 +467,6 @@
|
|
|
467
467
|
"Target": "Mục tiêu",
|
|
468
468
|
"Base": "Đường đáy",
|
|
469
469
|
"Axis {{axisId}}": "Trục {{axisId}}",
|
|
470
|
-
"{{count}}
|
|
470
|
+
"{{count}} items_0": "{{count}}mục",
|
|
471
471
|
"Reset zoom": "Đặt lại thu phóng"
|
|
472
472
|
}
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
"Last updated {{time}}": "最后更新 {{time}}",
|
|
10
10
|
"Created {{time}} by {{author}}": "由 {{author}} 在 {{time}} 创建",
|
|
11
11
|
"Created {{time}}": "已创建 {{time}}",
|
|
12
|
-
"Viewed {{count}}
|
|
12
|
+
"Viewed {{count}} times_0": "查看了 {{count}} 条",
|
|
13
13
|
"Notifications": "通知",
|
|
14
14
|
"You're subscribed and getting updates about new interpretations.": "您已订阅并获取有关新解释的更新。",
|
|
15
15
|
"Unsubscribe": "退订",
|
|
@@ -186,7 +186,7 @@
|
|
|
186
186
|
"Error loading interpretations": "",
|
|
187
187
|
"Could not load interpretations": "",
|
|
188
188
|
"Reply": "应答",
|
|
189
|
-
"{{count}}
|
|
189
|
+
"{{count}} replies_0": "{{count}}条回复",
|
|
190
190
|
"View replies": "查看回复",
|
|
191
191
|
"Unlike": "不喜欢",
|
|
192
192
|
"Like": "喜欢",
|
|
@@ -236,9 +236,9 @@
|
|
|
236
236
|
"No line lists found. Try adjusting your search or filter options to find what you're looking for.": "未找到行列表。尝试调整您的搜索或过滤选项以找到您要查找的内容。",
|
|
237
237
|
"New line list": "新行列表",
|
|
238
238
|
"Hide": "隐藏",
|
|
239
|
-
"{{count}} org
|
|
240
|
-
"{{count}}
|
|
241
|
-
"{{count}}
|
|
239
|
+
"{{count}} org units_0": "{{count}} 个组织单位",
|
|
240
|
+
"{{count}} levels_0": "{{count}} 级",
|
|
241
|
+
"{{count}} groups_0": "{{count}} 组",
|
|
242
242
|
"Selected: {{commaSeparatedListOfOrganisationUnits}}": "已选择:{{commaSeparatedListOfOrganisationUnits}}",
|
|
243
243
|
"Nothing selected": "未选择任何内容",
|
|
244
244
|
"User organisation unit": "用户所在机构",
|
|
@@ -467,6 +467,6 @@
|
|
|
467
467
|
"Target": "目标",
|
|
468
468
|
"Base": "基",
|
|
469
469
|
"Axis {{axisId}}": "轴{{axisId}}",
|
|
470
|
-
"{{count}}
|
|
470
|
+
"{{count}} items_0": "{{count}} 个条目",
|
|
471
471
|
"Reset zoom": "重设缩放"
|
|
472
472
|
}
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
"Last updated {{time}}": "最近更新的{{time}}",
|
|
10
10
|
"Created {{time}} by {{author}}": "",
|
|
11
11
|
"Created {{time}}": "",
|
|
12
|
-
"Viewed {{count}}
|
|
12
|
+
"Viewed {{count}} times_0": "",
|
|
13
13
|
"Notifications": "通知",
|
|
14
14
|
"You're subscribed and getting updates about new interpretations.": "",
|
|
15
15
|
"Unsubscribe": "",
|
|
@@ -186,7 +186,7 @@
|
|
|
186
186
|
"Error loading interpretations": "",
|
|
187
187
|
"Could not load interpretations": "",
|
|
188
188
|
"Reply": "回复",
|
|
189
|
-
"{{count}}
|
|
189
|
+
"{{count}} replies_0": "",
|
|
190
190
|
"View replies": "",
|
|
191
191
|
"Unlike": "不喜欢",
|
|
192
192
|
"Like": "Like",
|
|
@@ -236,9 +236,9 @@
|
|
|
236
236
|
"No line lists found. Try adjusting your search or filter options to find what you're looking for.": "",
|
|
237
237
|
"New line list": "",
|
|
238
238
|
"Hide": "隐藏",
|
|
239
|
-
"{{count}} org
|
|
240
|
-
"{{count}}
|
|
241
|
-
"{{count}}
|
|
239
|
+
"{{count}} org units_0": "",
|
|
240
|
+
"{{count}} levels_0": "",
|
|
241
|
+
"{{count}} groups_0": "",
|
|
242
242
|
"Selected: {{commaSeparatedListOfOrganisationUnits}}": "已选择:{{commaSeparatedListOfOrganisationUnits}}",
|
|
243
243
|
"Nothing selected": "未选择任何内容",
|
|
244
244
|
"User organisation unit": "用户所在机构",
|
|
@@ -467,6 +467,6 @@
|
|
|
467
467
|
"Target": "目标",
|
|
468
468
|
"Base": "基",
|
|
469
469
|
"Axis {{axisId}}": "轴{{axisId}}",
|
|
470
|
-
"{{count}}
|
|
470
|
+
"{{count}} items_0": "",
|
|
471
471
|
"Reset zoom": ""
|
|
472
472
|
}
|
|
@@ -4,7 +4,7 @@ export const LEGEND_DISPLAY_STYLE_FILL = 'FILL';
|
|
|
4
4
|
export const LEGEND_DISPLAY_STYLE_TEXT = 'TEXT';
|
|
5
5
|
export const getLegendByValueFromLegendSet = (legendSet, value) => {
|
|
6
6
|
var _legendSet$legends;
|
|
7
|
-
return Number.isInteger(parseInt(value)) ? legendSet === null || legendSet === void 0
|
|
7
|
+
return Number.isInteger(parseInt(value)) ? legendSet === null || legendSet === void 0 || (_legendSet$legends = legendSet.legends) === null || _legendSet$legends === void 0 ? void 0 : _legendSet$legends.find(legend => value >= legend.startValue && value < legend.endValue // TODO: Confirm inclusive/exclusive bounds
|
|
8
8
|
) : null;
|
|
9
9
|
};
|
|
10
10
|
export const getColorByValueFromLegendSet = (legendSet, value) => {
|
|
@@ -2,7 +2,7 @@ import { colors } from '@dhis2/ui';
|
|
|
2
2
|
import { getColorByValueFromLegendSet, LEGEND_DISPLAY_STRATEGY_BY_DATA_ITEM, LEGEND_DISPLAY_STRATEGY_FIXED, LEGEND_DISPLAY_STYLE_TEXT, LEGEND_DISPLAY_STYLE_FILL } from '../legends.js';
|
|
3
3
|
import { isColorBright } from './isColorBright.js';
|
|
4
4
|
const getLegendSet = (engine, dxDimension) => {
|
|
5
|
-
var _engine$visualization, _engine$visualization2
|
|
5
|
+
var _engine$visualization, _engine$visualization2;
|
|
6
6
|
let legendSetId;
|
|
7
7
|
switch ((_engine$visualization = engine.visualization.legend) === null || _engine$visualization === void 0 ? void 0 : _engine$visualization.strategy) {
|
|
8
8
|
case LEGEND_DISPLAY_STRATEGY_BY_DATA_ITEM:
|
|
@@ -12,15 +12,15 @@ const getLegendSet = (engine, dxDimension) => {
|
|
|
12
12
|
break;
|
|
13
13
|
case LEGEND_DISPLAY_STRATEGY_FIXED:
|
|
14
14
|
default:
|
|
15
|
-
legendSetId = (_engine$visualization2 = engine.visualization.legend) === null || _engine$visualization2 === void 0
|
|
15
|
+
legendSetId = (_engine$visualization2 = engine.visualization.legend) === null || _engine$visualization2 === void 0 || (_engine$visualization2 = _engine$visualization2.set) === null || _engine$visualization2 === void 0 ? void 0 : _engine$visualization2.id;
|
|
16
16
|
break;
|
|
17
17
|
}
|
|
18
18
|
return engine.legendSets[legendSetId];
|
|
19
19
|
};
|
|
20
20
|
const buildStyleObject = (legendColor, engine) => {
|
|
21
|
-
var _engine$
|
|
21
|
+
var _engine$visualization3;
|
|
22
22
|
const style = {};
|
|
23
|
-
switch ((_engine$
|
|
23
|
+
switch ((_engine$visualization3 = engine.visualization.legend) === null || _engine$visualization3 === void 0 ? void 0 : _engine$visualization3.style) {
|
|
24
24
|
case LEGEND_DISPLAY_STYLE_TEXT:
|
|
25
25
|
style.color = legendColor;
|
|
26
26
|
break;
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import debounce from 'lodash/debounce';
|
|
2
|
-
import { useState,
|
|
2
|
+
import { useState, useMemo, useEffect } from 'react';
|
|
3
3
|
export const useScrollPosition = (containerRef, debounceWait = 10) => {
|
|
4
4
|
const [scrollPosition, setScrollPosition] = useState({
|
|
5
5
|
x: 0,
|
|
6
6
|
y: 0
|
|
7
7
|
});
|
|
8
|
-
const onScroll =
|
|
8
|
+
const onScroll = useMemo(() => debounce(() => {
|
|
9
9
|
const scroll = {
|
|
10
10
|
x: containerRef.current.scrollLeft,
|
|
11
11
|
y: containerRef.current.scrollTop
|
|
12
12
|
};
|
|
13
13
|
setScrollPosition(scroll);
|
|
14
|
-
}, debounceWait));
|
|
14
|
+
}, debounceWait), [containerRef, debounceWait]);
|
|
15
15
|
useEffect(() => {
|
|
16
16
|
const currentRef = containerRef.current;
|
|
17
17
|
if (!currentRef) {
|
|
@@ -28,11 +28,11 @@ export default function loadSingleValueSVG() {
|
|
|
28
28
|
while (!fitsWithinContainer && dynamicStyles.hasNext()) {
|
|
29
29
|
styles = dynamicStyles.next();
|
|
30
30
|
valueElement.attr(styles.value);
|
|
31
|
-
subTextElement === null || subTextElement === void 0
|
|
31
|
+
subTextElement === null || subTextElement === void 0 || subTextElement.attr(styles.subText);
|
|
32
32
|
fitsWithinContainer = checkIfFitsWithinContainer(getAvailableSpace.call(this, styles.spacing.valueTop), valueElement, subTextElement, icon, subText, styles.spacing);
|
|
33
33
|
}
|
|
34
34
|
positionElements.call(this, valueElement, subTextElement, iconElement, styles.spacing);
|
|
35
35
|
valueElement.attr('visibility', 'visible');
|
|
36
|
-
iconElement === null || iconElement === void 0
|
|
37
|
-
subTextElement === null || subTextElement === void 0
|
|
36
|
+
iconElement === null || iconElement === void 0 || iconElement.attr('visibility', 'visible');
|
|
37
|
+
subTextElement === null || subTextElement === void 0 || subTextElement.attr('visibility', 'visible');
|
|
38
38
|
}
|
|
@@ -40,7 +40,7 @@ export default function ({
|
|
|
40
40
|
extraConfig,
|
|
41
41
|
extraOptions
|
|
42
42
|
}) {
|
|
43
|
-
var _layout$legend, _layout$seriesKey, _layout$seriesKey2,
|
|
43
|
+
var _layout$legend, _layout$seriesKey, _layout$seriesKey2, _config$xAxis;
|
|
44
44
|
const _layout = getTransformedLayout(layout);
|
|
45
45
|
const _extraOptions = getTransformedExtraOptions(extraOptions);
|
|
46
46
|
const stacked = isStacked(_layout.type);
|
|
@@ -83,7 +83,7 @@ export default function ({
|
|
|
83
83
|
// legend
|
|
84
84
|
legend: getLegend({
|
|
85
85
|
isHidden: (_layout$seriesKey = _layout.seriesKey) === null || _layout$seriesKey === void 0 ? void 0 : _layout$seriesKey.hidden,
|
|
86
|
-
fontStyle: (_layout$seriesKey2 = _layout.seriesKey) === null || _layout$seriesKey2 === void 0
|
|
86
|
+
fontStyle: (_layout$seriesKey2 = _layout.seriesKey) === null || _layout$seriesKey2 === void 0 || (_layout$seriesKey2 = _layout$seriesKey2.label) === null || _layout$seriesKey2 === void 0 ? void 0 : _layout$seriesKey2.fontStyle,
|
|
87
87
|
visType: _layout.type,
|
|
88
88
|
dashboard: _extraOptions.dashboard
|
|
89
89
|
}),
|
|
@@ -185,7 +185,7 @@ export default function ({
|
|
|
185
185
|
displayStrategy
|
|
186
186
|
});
|
|
187
187
|
}
|
|
188
|
-
(_series = series) === null || _series === void 0
|
|
188
|
+
(_series = series) === null || _series === void 0 || _series.forEach(seriesObj => {
|
|
189
189
|
// animation
|
|
190
190
|
seriesObj.animation = extraOptions.dashboard ? false : {
|
|
191
191
|
duration: getAnimation(extraOptions.animation, DEFAULT_ANIMATION_DURATION)
|
|
@@ -69,9 +69,9 @@ export default function subtitle(series, layout, metaData, extraOptions) {
|
|
|
69
69
|
switch (layout.type) {
|
|
70
70
|
case VIS_TYPE_SINGLE_VALUE:
|
|
71
71
|
{
|
|
72
|
-
var _defaultFontStyle$FON, _layout$fontStyle
|
|
73
|
-
const defaultColor = defaultFontStyle === null || defaultFontStyle === void 0
|
|
74
|
-
const customColor = layout === null || layout === void 0
|
|
72
|
+
var _defaultFontStyle$FON, _layout$fontStyle;
|
|
73
|
+
const defaultColor = defaultFontStyle === null || defaultFontStyle === void 0 || (_defaultFontStyle$FON = defaultFontStyle[FONT_STYLE_VISUALIZATION_SUBTITLE]) === null || _defaultFontStyle$FON === void 0 ? void 0 : _defaultFontStyle$FON[FONT_STYLE_OPTION_TEXT_COLOR];
|
|
74
|
+
const customColor = layout === null || layout === void 0 || (_layout$fontStyle = layout.fontStyle) === null || _layout$fontStyle === void 0 || (_layout$fontStyle = _layout$fontStyle[FONT_STYLE_VISUALIZATION_SUBTITLE]) === null || _layout$fontStyle === void 0 ? void 0 : _layout$fontStyle[FONT_STYLE_OPTION_TEXT_COLOR];
|
|
75
75
|
subtitle.style.color = getSingleValueSubtitleColor(customColor, defaultColor, series[0], legendOptions, legendSets);
|
|
76
76
|
if (dashboard) {
|
|
77
77
|
// Single value subtitle text should be multiline
|
|
@@ -76,9 +76,9 @@ export default function (layout, metaData, extraOptions, series) {
|
|
|
76
76
|
switch (layout.type) {
|
|
77
77
|
case VIS_TYPE_SINGLE_VALUE:
|
|
78
78
|
{
|
|
79
|
-
var _defaultFontStyle$FON, _layout$fontStyle
|
|
80
|
-
const defaultColor = defaultFontStyle === null || defaultFontStyle === void 0
|
|
81
|
-
const customColor = layout === null || layout === void 0
|
|
79
|
+
var _defaultFontStyle$FON, _layout$fontStyle;
|
|
80
|
+
const defaultColor = defaultFontStyle === null || defaultFontStyle === void 0 || (_defaultFontStyle$FON = defaultFontStyle[FONT_STYLE_VISUALIZATION_TITLE]) === null || _defaultFontStyle$FON === void 0 ? void 0 : _defaultFontStyle$FON[FONT_STYLE_OPTION_TEXT_COLOR];
|
|
81
|
+
const customColor = layout === null || layout === void 0 || (_layout$fontStyle = layout.fontStyle) === null || _layout$fontStyle === void 0 || (_layout$fontStyle = _layout$fontStyle[FONT_STYLE_VISUALIZATION_TITLE]) === null || _layout$fontStyle === void 0 ? void 0 : _layout$fontStyle[FONT_STYLE_OPTION_TEXT_COLOR];
|
|
82
82
|
title.style.color = getSingleValueTitleColor(customColor, defaultColor, series[0], legendOptions, legendSets);
|
|
83
83
|
if (dashboard) {
|
|
84
84
|
// TODO: is this always what we want?
|
|
@@ -34,9 +34,9 @@ H.patterns.forEach((pattern, i) => {
|
|
|
34
34
|
function drawLegendSymbolWrap() {
|
|
35
35
|
const pick = H.pick;
|
|
36
36
|
H.wrap(H.seriesTypes.column.prototype, 'drawLegendSymbol', function (proceed, legend, item) {
|
|
37
|
-
var _this$options$legendS
|
|
37
|
+
var _this$options$legendS;
|
|
38
38
|
const legendItem = item.legendItem;
|
|
39
|
-
if ((_this$options$legendS = this.options.legendSet) !== null && _this$options$legendS !== void 0 && (_this$options$
|
|
39
|
+
if ((_this$options$legendS = this.options.legendSet) !== null && _this$options$legendS !== void 0 && (_this$options$legendS = _this$options$legendS.legends) !== null && _this$options$legendS !== void 0 && _this$options$legendS.length) {
|
|
40
40
|
const ys = legend.baseline - legend.symbolHeight + 1,
|
|
41
41
|
// y start
|
|
42
42
|
x = legend.symbolWidth / 2 > 8 ? legend.symbolWidth / 2 : 8,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export default function (acc, series, categories, idValueMap, metaData, extraOptions) {
|
|
2
2
|
var _extraOptions$xAxisLa;
|
|
3
3
|
const seriesData = Array.from({
|
|
4
|
-
length: (extraOptions === null || extraOptions === void 0
|
|
4
|
+
length: (extraOptions === null || extraOptions === void 0 || (_extraOptions$xAxisLa = extraOptions.xAxisLabels) === null || _extraOptions$xAxisLa === void 0 ? void 0 : _extraOptions$xAxisLa.length) || 0
|
|
5
5
|
}, () => null);
|
|
6
6
|
categories[0].forEach(categoryItemId => {
|
|
7
7
|
const position = extraOptions.periodKeyAxisIndexMap[categoryItemId];
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dhis2/analytics",
|
|
3
|
-
"version": "29.4.
|
|
3
|
+
"version": "29.4.2",
|
|
4
4
|
"main": "./build/cjs/index.js",
|
|
5
5
|
"module": "./build/es/index.js",
|
|
6
6
|
"exports": {
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
},
|
|
32
32
|
"devDependencies": {
|
|
33
33
|
"@dhis2/app-runtime": "^3.14.1",
|
|
34
|
-
"@dhis2/cli-app-scripts": "^12.
|
|
34
|
+
"@dhis2/cli-app-scripts": "^12.11.0",
|
|
35
35
|
"@dhis2/cli-style": "^10.7.9",
|
|
36
36
|
"@dhis2/d2-i18n": "^1.1.0",
|
|
37
37
|
"@dhis2/ui": "^10.12.7",
|