From 8a5dd054b5962b29d9433296471005dabbb15da4 Mon Sep 17 00:00:00 2001
From: jeremielodi <jeremielod@gmail.com>
Date: Mon, 14 Aug 2017 11:10:14 +0100
Subject: [PATCH 1/2] unify date component, patient registry

---
 .../src/modules/templates/bhPeriodSelect.tmpl.html | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/client/src/modules/templates/bhPeriodSelect.tmpl.html b/client/src/modules/templates/bhPeriodSelect.tmpl.html
index 0f2ab9a858..4d5bd72354 100644
--- a/client/src/modules/templates/bhPeriodSelect.tmpl.html
+++ b/client/src/modules/templates/bhPeriodSelect.tmpl.html
@@ -61,14 +61,12 @@
   </div>
   <div ng-show="$ctrl.customExpanded">
     <div class="row">
-      <div class="col-md-6">
-        <label translate>PERIODS.CUSTOM_FROM</label>
-        <input class="form-control" ng-model="$ctrl.customSelection.from" type="date">
-      </div>
-      <div class="col-md-6">
-        <label translate>PERIODS.CUSTOM_TO</label>
-        <input class="form-control" ng-model="$ctrl.customSelection.to" type="date">
-      </div>
+
+       <bh-date-interval
+        date-id="date" date-from="$ctrl.customSelection.from" date-to="$ctrl.customSelection.to" mode="clean">
+      </bh-date-interval>
+
+
     </div>
 
     <div class="row" style="margin-top : 5px">

From dbd6ef2e9e97fd323cc63af7358ee12e22544caa Mon Sep 17 00:00:00 2001
From: jeremielodi <jeremielod@gmail.com>
Date: Mon, 14 Aug 2017 11:33:31 +0100
Subject: [PATCH 2/2] using simple ui-datepicker instead of bh-date-interval

---
 .../templates/bhPeriodSelect.tmpl.html        | 53 +++++++++++++++++--
 1 file changed, 50 insertions(+), 3 deletions(-)

diff --git a/client/src/modules/templates/bhPeriodSelect.tmpl.html b/client/src/modules/templates/bhPeriodSelect.tmpl.html
index 4d5bd72354..46f00e795b 100644
--- a/client/src/modules/templates/bhPeriodSelect.tmpl.html
+++ b/client/src/modules/templates/bhPeriodSelect.tmpl.html
@@ -60,11 +60,58 @@
     </div>
   </div>
   <div ng-show="$ctrl.customExpanded">
+
     <div class="row">
+      <div class="col-md-5">
+        <div class="input-group">
+          <input
+            id="modal-date-from"
+            name="dateFrom"
+            type="text"
+            class="form-control"
+            uib-datepicker-popup="{{ $ctrl.dateFormat }}"
+            datepicker-options="$ctrl.pickerOptions"
+            is-open="$ctrl.dateFromIsOpen"
+            show-button-bar="false"
+            ng-model="$ctrl.customSelection.from"
+            ng-change="$ctrl.onChange"
+            ng-required="$ctrl.required">
+            <span class="input-group-btn">
+              <button class="btn btn-default" type="button" ng-click="$ctrl.dateFromIsOpen =! $ctrl.dateFromIsOpen">
+                <i class="fa fa-calendar-plus-o"></i>
+              </button>
+            </span>
+        </div>
+      </div>
+      <div class="col-md-2">
 
-       <bh-date-interval
-        date-id="date" date-from="$ctrl.customSelection.from" date-to="$ctrl.customSelection.to" mode="clean">
-      </bh-date-interval>
+      </div>
+      <div class="col-md-5">
+        <div class="input-group">
+        <input
+          id="modal-date-to"
+          name="dateTo"
+          type="text"
+          class="form-control"
+          uib-datepicker-popup="{{ $ctrl.dateFormat }}"
+          datepicker-options="$ctrl.pickerOptions"
+          is-open="$ctrl.dateToIsOpen"
+          show-button-bar="false"
+          ng-model="$ctrl.customSelection.to"
+          ng-change="$ctrl.onChange"
+          ng-required="$ctrl.required"
+          >
+          <span class="input-group-btn">
+            <button class="btn btn-default" type="button" ng-click="$ctrl.dateToIsOpen =! $ctrl.dateToIsOpen">
+              <i class="fa fa-calendar-plus-o"></i>
+            </button>
+          </span>
+      </div>
+      <div class="help-block" ng-messages="DateIntervalForm.dateTo.$error" ng-show="$ctrl.validationTrigger && DateIntervalForm.dateTo.$invalid">
+        <div ng-messages-include="modules/templates/messages.tmpl.html"></div>
+      </div>
+
+      </div>
 
 
     </div>