Updated Ethiopian calendar entry

dimagi · Mar 12, 2024 · a9f8b0b · a9f8b0b
1 parent 2406101
commit a9f8b0b
Show file tree

Hide file tree

Showing 5 changed files with 81 additions and 10 deletions.
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js b/corehq/apps/cloudcare/static/cloudcare/js/form_entry/entries.js
@@ -14,6 +14,7 @@ hqDefine("cloudcare/js/form_entry/entries", [
     'cloudcare/js/form_entry/utils',
     'signature_pad/dist/signature_pad.umd.min',
     'mapbox.js/dist/mapbox',
+    'cloudcare/js/formplayer/utils/calendar-picker-translations',   // EthiopianDateEntry
     'select2/dist/js/select2.full.min',
 ], function (
     $,

diff --git a/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/calendar-picker-translations.js b/corehq/apps/cloudcare/static/cloudcare/js/formplayer/utils/calendar-picker-translations.js
@@ -1,5 +1,15 @@
 'use strict';
-(function ($) {
+hqDefine('cloudcare/js/formplayer/utils/calendar-picker-translations', [
+    'jquery',
+    'calendars/dist/js/jquery.calendars.picker',
+    'calendars/dist/js/jquery.calendars.ethiopian',
+    'calendars/dist/js/jquery.calendars.plus',
+    'calendars/dist/js/jquery.calendars-am',
+    'calendars/dist/js/jquery.calendars.picker-am',
+    'calendars/dist/js/jquery.calendars.ethiopian-am',
+], function (
+    $
+) {
     // English
     $.calendarsPicker.regionalOptions[''] = { // Default regional settings - English/US
         renderer: $.calendarsPicker.regionalOptions[''].renderer, // this.defaultRenderer
@@ -331,4 +341,4 @@
         firstDay: 0,
         isRTL: false,
     };
-})(window.jQuery);
+});
diff --git a/corehq/apps/cloudcare/templates/formplayer/dependencies.html b/corehq/apps/cloudcare/templates/formplayer/dependencies.html
@@ -2,14 +2,6 @@
 {% load hq_shared_tags %}
 
 {% compress js %}
-  <script src="{% static 'calendars/dist/js/jquery.calendars.js' %}"></script>
-  <script src="{% static 'calendars/dist/js/jquery.calendars-am.js' %}"></script>
-  <script src="{% static 'calendars/dist/js/jquery.calendars.plus.js' %}"></script>
-  <script src="{% static 'calendars/dist/js/jquery.plugin.js' %}"></script>
-  <script src="{% static 'calendars/dist/js/jquery.calendars.picker.js' %}"></script>
-  <script src="{% static 'calendars/dist/js/jquery.calendars.picker-am.js' %}"></script>
-  <script src="{% static 'calendars/dist/js/jquery.calendars.ethiopian.js' %}"></script>
-  <script src="{% static 'calendars/dist/js/jquery.calendars.ethiopian-am.js' %}"></script>
 {% endcompress %}
 
   <link

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/requirejs_config.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap3/requirejs_config.js
@@ -24,6 +24,40 @@ requirejs.config({
         "At.js/dist/js/jquery.atwho": { deps: ['jquery', 'Caret.js/dist/jquery.caret'] },
         "backbone": { exports: "backbone" },
         "bootstrap": { deps: ['jquery'] },
+        "calendars/dist/js/jquery.calendars.picker": {
+            deps: [
+                "calendars/dist/js/jquery.plugin",
+                "calendars/dist/js/jquery.calendars",
+            ],
+        },
+        "calendars/dist/js/jquery.calendars.ethiopian": {
+            deps: [
+                "calendars/dist/js/jquery.calendars",
+            ],
+        },
+        "calendars/dist/js/jquery.calendars.plus": {
+            deps: [
+                "calendars/dist/js/jquery.calendars",
+            ],
+        },
+        "calendars/dist/js/jquery.calendars-am": {
+            deps: [
+                "calendars/dist/js/jquery.calendars.picker",
+                "calendars/dist/js/jquery.calendars",
+            ],
+        },
+        "calendars/dist/js/jquery.calendars.picker-am": {
+            deps: [
+                "calendars/dist/js/jquery.calendars.picker",
+                "calendars/dist/js/jquery.calendars",
+            ],
+        },
+        "calendars/dist/js/jquery.calendars.ethiopian-am": {
+            deps: [
+                "calendars/dist/js/jquery.calendars.picker",
+                "calendars/dist/js/jquery.calendars.ethiopian",
+            ],
+        },
         "datatables.bootstrap": { deps: ['datatables'] },
         "d3/d3.min": {
             "exports": "d3",

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/requirejs_config.js b/corehq/apps/hqwebapp/static/hqwebapp/js/bootstrap5/requirejs_config.js
@@ -31,6 +31,40 @@ requirejs.config({
         "ace-builds/src-min-noconflict/ext-searchbox": { deps: ["ace-builds/src-min-noconflict/ace"] },
         "At.js/dist/js/jquery.atwho": { deps: ['jquery', 'Caret.js/dist/jquery.caret'] },
         "backbone": { exports: "backbone" },
+        "calendars/dist/js/jquery.calendars.picker": {
+            deps: [
+                "calendars/dist/js/jquery.plugin",
+                "calendars/dist/js/jquery.calendars",
+            ],
+        },
+        "calendars/dist/js/jquery.calendars.ethiopian": {
+            deps: [
+                "calendars/dist/js/jquery.calendars",
+            ],
+        },
+        "calendars/dist/js/jquery.calendars.plus": {
+            deps: [
+                "calendars/dist/js/jquery.calendars",
+            ],
+        },
+        "calendars/dist/js/jquery.calendars-am": {
+            deps: [
+                "calendars/dist/js/jquery.calendars.picker",
+                "calendars/dist/js/jquery.calendars",
+            ],
+        },
+        "calendars/dist/js/jquery.calendars.picker-am": {
+            deps: [
+                "calendars/dist/js/jquery.calendars.picker",
+                "calendars/dist/js/jquery.calendars",
+            ],
+        },
+        "calendars/dist/js/jquery.calendars.ethiopian-am": {
+            deps: [
+                "calendars/dist/js/jquery.calendars.picker",
+                "calendars/dist/js/jquery.calendars.ethiopian",
+            ],
+        },
         "datatables.bootstrap": { deps: ['datatables'] },
         "datatables.fixedColumns.bootstrap": { deps: ['datatables.fixedColumns'] },
         "datetimepicker": {