Updated date and time widgets to display default values

dimagi · Jun 24, 2024 · f3da6fb · f3da6fb
1 parent 0f3cad3
commit f3da6fb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/corehq/apps/cloudcare/static/cloudcare/js/utils.js b/corehq/apps/cloudcare/static/cloudcare/js/utils.js
@@ -403,7 +403,7 @@ hqDefine('cloudcare/js/utils', [
             useCurrent: true,
         };
         if (date.isValid()) {
-            options.viewDate = new hqTempusDominus.tempusDominus.DateTime(date.format(timeFormat));
+            options.viewDate = new hqTempusDominus.tempusDominus.DateTime(date.format(dateFormat + ' ' + timeFormat));
         }
         hqTempusDominus.createTimePicker($el.get(0), options);
     };

diff --git a/corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js b/corehq/apps/hqwebapp/static/hqwebapp/js/tempus_dominus.js
@@ -20,7 +20,7 @@ hqDefine("hqwebapp/js/tempus_dominus", [
     window.Popper = Popper;
 
     let createDatePicker = function (el, options) {
-        return new tempusDominus.TempusDominus(el, _addDefaultOptions(options, {
+        let picker = new tempusDominus.TempusDominus(el, _addDefaultOptions(options, {
             display: {
                 theme: 'light',
                 components: {
@@ -31,6 +31,9 @@ hqDefine("hqwebapp/js/tempus_dominus", [
                 format: 'yyyy-MM-dd',
             }),
         }));
+        if (options.viewDate) {
+            picker.dates.setValue(options.viewDate);
+        }
     };
 
     // This replaces createBootstrap3DefaultDateRangePicker in hqwebapp/js/daterangepicker.config
@@ -71,7 +74,7 @@ hqDefine("hqwebapp/js/tempus_dominus", [
     };
 
     let createTimePicker = function (el, options) {
-        return new tempusDominus.TempusDominus(el, _addDefaultOptions(options, {
+        var picker = new tempusDominus.TempusDominus(el, _addDefaultOptions(options, {
             display: {
                 theme: 'light',
                 components: {
@@ -83,6 +86,9 @@ hqDefine("hqwebapp/js/tempus_dominus", [
                 format: 'H:mm',
             }),
         }));
+        if (options.viewDate) {
+            picker.dates.setValue(options.viewDate);
+        }
     };
 
     // Combine user-passed TD options with default options.