#869 | Display selected date and time in 12 hour format everywhere

Author: mahalakshme

packages/openchs-android/package-lock.json

@@ -50,7 +50,7 @@
     "lodash": "4.17.21",
     "moment": "2.29.4",
     "native-base": "3.4.9",
-    "openchs-models": "1.27.24",
+    "openchs-models": "1.27.25",
     "prop-types": "15.8.1",
     "react": "18.2.0",
     "react-native": "0.69.7",

packages/openchs-android/package.json

@@ -73,6 +73,14 @@ class General {
       return `${General.toTwoChars(date.getDate())}-${General.toTwoChars(date.getMonth() + 1)}-${date.getFullYear()} ${hour}:${minutes}`;
     }
 
+    static to12HourDateTimeFormat(dateTime) {
+        return moment(dateTime).format("lll");
+    }
+
+    static to12HourDateFormat(dateTime) {
+        return moment(dateTime).format("ll");
+    }
+
     static isoFormat(date) {
         return `${date.getFullYear()}-${General.toTwoChars(date.getMonth() + 1)}-${General.toTwoChars(date.getDate())}`;
     }

packages/openchs-android/src/utility/General.js

@@ -33,8 +33,8 @@ class DatePicker extends AbstractComponent {
         return _.isNil(date)
             ? this.I18n.t(noDateMessageKey)
             : (this.props.pickTime && !(General.hoursAndMinutesOfDateAreZero(date)))
-                ? General.formatDateTime(date)
-                : General.formatDate(date);
+                ? General.to12HourDateTimeFormat(date)
+                : General.to12HourDateFormat(date);
     }
 
     showDatePicker() {

packages/openchs-android/src/views/primitives/DatePicker.js

@@ -65,7 +65,7 @@ class TimePicker extends AbstractComponent {
 
     timeDisplay() {
         return _.isNil(this.props.timeValue)
-            ? this.I18n.t(this.noTimeMessageKey) : this.props.timeValue;
+            ? this.I18n.t(this.noTimeMessageKey) : General.toDisplayTime(this.props.timeValue);
     }
 
     showTimePicker(options) {