Merge branch '3.37'

Author: sachsk

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.23",
+    "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,15 +33,15 @@ 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() {
         const datePickerOptions = {
             mode: 'date',
             display: _.isNil(this.props.datePickerMode) ? 'calendar' : this.props.datePickerMode,
-            is24Hour: true,
+            is24Hour: false,
             onChange: (event, date) => this.onDateChange(event, date),
             value: _.isNil(this.props.dateValue) ? new Date() : this.props.dateValue
         };
@@ -72,7 +72,7 @@ class DatePicker extends AbstractComponent {
         const timePickerOptions = {
             mode: 'time',
             display: timePickerDisplay,
-            is24Hour: true,
+            is24Hour: false,
             onChange: (event, date) => this.onTimeChange(event, date),
             value: date
         };

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

@@ -33,7 +33,7 @@ class TimePicker extends AbstractComponent {
         const options = {
             mode: "time",
             display: timePickerDisplay,
-            is24Hour: true,
+            is24Hour: false,
             onChange: (event, date) => this.onTimeChange(event, date),
             value: _.isNil(this.props.timeValue) ? new Date() : General.toDateFromTime(this.props.timeValue)
         };
@@ -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) {

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

@@ -26,38 +26,38 @@ class GrowthChartView extends AbstractComponent {
 
     settings = {
         SD3neg: {
-            label: "Grade 3",
+            label: this.I18n.t('Grade 3'),
             config: {
                 color: processColor("red"),
                 fillColor: processColor("red"),
                 fillAlpha: 150
             }
         },
         SD2neg: {
-            label: "Grade 2",
+            label: this.I18n.t('Grade 2'),
             config: {
                 color: processColor("orange"),
                 fillColor: processColor("orange"),
                 fillAlpha: 150
             }
         },
         SD0: {
-            label: "Grade 1",
+            label: this.I18n.t('Grade 1'),
             config: {
                 color: processColor("green"),
                 fillColor: processColor("green"),
                 fillAlpha: 30
             }
         },
         SD2: {
-            label: "Grade 1",
+            label: this.I18n.t('Grade 1'),
             config: {
                 color: processColor("green"),
                 fillColor: processColor("green"),
             }
         },
         SD3: {
-            label: "Grade 1",
+            label: this.I18n.t('Grade 1'),
             config: {
                 color: processColor("green"),
                 fillColor: processColor("green"),
@@ -242,7 +242,7 @@ class GrowthChartView extends AbstractComponent {
             maxSizePercent: 0.5,
             custom: {
                 colors: [processColor('black'), processColor('green'), processColor("orange"), processColor("red")],
-                labels: [this.getLegendLabel(), "Grade 1", "Grade 2", "Grade 3"]
+                labels: [this.I18n.t(this.getLegendLabel()), this.I18n.t('Grade 1'), this.I18n.t('Grade 2'), this.I18n.t('Grade 3')]
             }
         };
         const marker = {
@@ -272,23 +272,25 @@ class GrowthChartView extends AbstractComponent {
                             style={[GrowthChartView.style.graphButton.self, wfaStyle.self]}
                             _text={wfaStyle.text}
                             onPress={() => this.onGraphSelected(this.states.weightForAge)}>
-                            {this.states.weightForAge}
+                            {this.I18n.t(this.states.weightForAge)}
                         </Button>
 
                         <Button
                             style={[GrowthChartView.style.graphButton.self, hfaStyle.self]}
                             _text={hfaStyle.text}
-                            onPress={() => this.onGraphSelected(this.states.heightForAge)}>{this.states.heightForAge}
+                            onPress={() => this.onGraphSelected(this.states.heightForAge)}>
+                            {this.I18n.t(this.states.heightForAge)}
                         </Button>
 
                         <Button
                             style={[GrowthChartView.style.graphButton.self, wfhStyle.self]}
                             _text={wfhStyle.text}
-                            onPress={() => this.onGraphSelected(this.states.weightForHeight)}>{this.states.weightForHeight}
+                            onPress={() => this.onGraphSelected(this.states.weightForHeight)}>
+                            {this.I18n.t(this.states.weightForHeight)}
                         </Button>
                     </View>
 
-                    <Text style={[Styles.formGroupLabel, {paddingLeft: 4}]}>{this.state.title}</Text>
+                    <Text style={[Styles.formGroupLabel, {paddingLeft: 4}]}>{this.I18n.t(this.state.title)}</Text>
 
                     <View style={styles.container}>
                         <LineChart

packages/openchs-android/src/views/program/GrowthChartView.js

@@ -66,7 +66,7 @@ class TaskCard extends AbstractComponent {
         const dateOptions = {
             mode: 'date', //To only enable date selection
             display: 'calendar', //Type of DatePicker
-            is24Hour: true,
+            is24Hour: false,
             onChange: (event, date) => this.onDateChange(event, date, task),
             value: task.scheduledOn
         };