minDate property of datepicker is not set to undefined anymore

Added loader to template and a min-height to loader screens Added API documentation of the new get available dates method
hmartos · Nov 12, 2017 · a1053e4 · a1053e4
1 parent 1a212d5
commit a1053e4
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 11 deletions.
diff --git a/APIDocs.md b/APIDocs.md
@@ -1,9 +1,41 @@
 REST API SPECIFICATION
 ===
 
+**Get available dates**
+----
+  _If the module is configured to load available dates from an API (see the [docs](https://hmartos.github.io/angular-reservation/#!#docs)), 
+  this method is called._
+
+* **URL**
+  _/availableDates_
+
+* **Method:**
+  `GET`
+
+*  **URL Params**
+
+   * **No params**
+
+* **Success Response:**
+  _Returns an array with available dates, a SUCCESS status and a message. <br/>**IMPORTANT**: Available dates should be in [ISO 8601](https://www.w3.org/TR/NOTE-datetime) 
+  format to work with an out of the box install of angular-reservation<br/> 
+  You can use status to return a 200 code response with an error and an optional message to explain what has happened._
+  * **Code:** 200 <br />
+    **Content:** 
+```json
+{
+	"availableDates": [
+	  "2017-11-24",
+	  "2017-11-27"
+	],
+	"status": "SUCCESS",
+	"message": ""
+}
+```
+
 **Get available hours for selected date**
 ----
-  _Called on select date, return the list of available hours for selected date._
+  _Called on date select, return the list of available hours for selected date._
 
 * **URL**
   _/availableHours_

diff --git a/dist/angular-reservation.js b/dist/angular-reservation.js
diff --git a/dist/angular-reservation.min.css b/dist/angular-reservation.min.css
diff --git a/dist/angular-reservation.min.js b/dist/angular-reservation.min.js
diff --git a/src/css/style.css b/src/css/style.css
@@ -39,4 +39,8 @@
 .angular-reservation-clientForm {
     margin-top: 2em;
     margin-bottom: 2em;
+}
+
+.angular-reservation-loader-min-height {
+    min-height: 500px;
 }
diff --git a/src/js/controller.js b/src/js/controller.js
@@ -37,9 +37,8 @@
         if (vm.getAvailableDatesFromAPI) {
             vm.availableDates = [];
             getAvailableDates();
-            //Disable not available dates in datepicker and clean minDate option
+            //Disable not available dates in datepicker
             vm.datepickerOptions.dateDisabled = disableDates;
-            vm.datepickerOptions.minDate = undefined;
         }
 
 

diff --git a/src/templates/index.html b/src/templates/index.html
@@ -7,7 +7,9 @@ <h5 ng-if="reservationCtrl.secondTabLocked">{{"date" | translate}}</h5>
                 <h5 ng-if="!reservationCtrl.secondTabLocked">{{reservationCtrl.selectedDate | date: reservationCtrl.dateFormat}}</h5>
             </uib-tab-heading>
 
-            <div ng-include="reservationCtrl.datepickerTemplate"></div>
+            <div ng-include="'loader.html'" class="text-center" style="min-height: 250px" ng-if="reservationCtrl.loader"></div>
+
+            <div ng-include="reservationCtrl.datepickerTemplate" ng-if="!reservationCtrl.loader"></div>
         </uib-tab>
 
         <uib-tab index="1" disable="reservationCtrl.secondTabLocked">
@@ -17,7 +19,7 @@ <h5 ng-if="reservationCtrl.thirdTabLocked">{{"time" | translate}}</h5>
                 <h5 ng-if="!reservationCtrl.thirdTabLocked">{{reservationCtrl.selectedHour}}</h5>
             </uib-tab-heading>
 
-            <div ng-include="'loader.html'" class="text-center" ng-if="reservationCtrl.loader"></div>
+            <div ng-include="'loader.html'" class="text-center" style="min-height: 250px" ng-if="reservationCtrl.loader"></div>
 
             <div class="angular-reservation-availableHour" ng-if="!reservationCtrl.loader && reservationCtrl.availableHours.length > 0">
                 <div ng-include="reservationCtrl.availableHoursTemplate"></div>
@@ -36,7 +38,7 @@ <h5>{{"client" | translate}}</h5>
 
             <form class="form-horizontal" name="reserveForm" novalidate
                   ng-submit="reserveForm.$valid && reservationCtrl.reserve(reservationCtrl.selectedDate, reservationCtrl.selectedHour, reservationCtrl.userData)">
-                <div ng-include="'loader.html'" class="text-center" ng-if="reservationCtrl.loader"></div>
+                <div ng-include="'loader.html'" class="text-center" style="min-height: 250px" ng-if="reservationCtrl.loader"></div>
 
                 <fieldset ng-if="!reservationCtrl.loader">
                     <div ng-include="reservationCtrl.clientFormTemplate"></div>