Using bhConstans for the render the Date format

IMA-WorldHealth · May 16, 2017 · 09a1253 · 09a1253
1 parent 306be3e
commit 09a1253
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/client/src/js/components/bhPeriodSelect.js b/client/src/js/components/bhPeriodSelect.js
@@ -8,9 +8,9 @@ angular.module('bhima.components')
   controller : PeriodSelect
 });
 
-PeriodSelect.$inject = ['PeriodService'];
+PeriodSelect.$inject = ['PeriodService', 'bhConstants'];
 
-function PeriodSelect(Periods) {
+function PeriodSelect(Periods, bhConstants) {
   var ctrl = this;
   var DEFAULT_PERIOD = 'today';
 
@@ -27,6 +27,8 @@ function PeriodSelect(Periods) {
     to : new Date()
   };
 
+  ctrl.dateFormat = bhConstants.dates.format;
+
   ctrl.$onInit = function onInit() {
     ctrl.periodKey = ctrl.defaultPeriod || DEFAULT_PERIOD;
     ctrl.period = Periods.definition(ctrl.periodKey);

diff --git a/client/src/modules/templates/bhPeriodSelect.tmpl.html b/client/src/modules/templates/bhPeriodSelect.tmpl.html
@@ -9,7 +9,7 @@
   </span>
 
   <span ng-if="$ctrl.period.customPeriodStart && $ctrl.period.customPeriodEnd">
-    ({{ $ctrl.period.customPeriodStart | date: 'dd/mm/yyyy' }}) - ({{ $ctrl.period.customPeriodEnd | date: 'dd/mm/yyyy' }})
+    ({{ $ctrl.period.customPeriodStart | date: $ctrl.dateFormat }}) - ({{ $ctrl.period.customPeriodEnd | date: $ctrl.dateFormat }})
   </span>
 </p>