fix(reports): invalid date format

polonel · Jan 15, 2019 · 808a740 · 808a740
1 parent c252b81
commit 808a740
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 49 deletions.
diff --git a/src/public/js/angularjs/controllers/reports.js b/src/public/js/angularjs/controllers/reports.js
@@ -12,9 +12,17 @@
 
  **/
 
-define(['angular', 'underscore', 'jquery', 'moment', 'modules/helpers', 'history'], function(angular, _, $, moment, helpers) {
+define(['angular', 'underscore', 'jquery', 'moment', 'modules/helpers', 'formvalidator', 'history'], function(angular, _, $, moment, helpers) {
     return angular.module('trudesk.controllers.reports', [])
         .controller('reportsCtrl', function($scope, $http, $log, $timeout, $window) {
+            $.formUtils.addValidator({
+                name: 'shortDate',
+                validatorFunction: function(value) {
+                    return moment(value, helpers.getShortDateFormat(), true).isValid();
+                },
+                errorMessage: 'Invalid Date (' + helpers.getShortDateFormat() + ')',
+                errorMessageKey: 'invalidShortDate'
+            });
 
             var $filterDateStart = $('.filterDate_Start');
             $filterDateStart.each(function(index, element) {

diff --git a/src/views/subviews/reports/generate_partials/report_TicketsByGroup.hbs b/src/views/subviews/reports/generate_partials/report_TicketsByGroup.hbs
@@ -21,18 +21,14 @@
                 <div class="uk-grid uk-grid-collapse uk-margin-medium-bottom">
                     <div class="uk-width-1-2" style="padding: 0 15px 0 0;">
                         <label for="filterDate_Start" class="uk-form-label nopadding nomargin">Date Start</label>
-                        <input id="filterDate_Start" class="filterDate_Start md-input label-fixed" name="filterDate_Start" type="text" data-uk-datepicker="{format:'YYYY-MM-DD'}"
-                               data-validation="date"
-                               data-validation-format="YYYY-MM-DD"
-                               data-validation-error-msg="Please enter a valid Date"
+                        <input id="filterDate_Start" class="filterDate_Start md-input label-fixed" name="filterDate_Start" type="text" data-uk-datepicker="{format:'{{data.common.shortDateFormat}}'}"
+                               data-validation="shortDate"
                         />
                     </div>
                     <div class="uk-width-1-2" style="padding: 0 0 0 15px;">
                         <label for="filterDate_End" class="uk-form-label nopadding nomargin">Date End</label>
-                        <input id="filterDate_End" class="filterDate_End md-input label-fixed" name="filterDate_End" type="text" data-uk-datepicker="{format:'YYYY-MM-DD'}" value="{{formatDate now data.common.shortDateFormat}}"
-                               data-validation="date"
-                               data-validation-format="YYYY-MM-DD"
-                               data-validation-error-msg="Please enter a valid Date"
+                        <input id="filterDate_End" class="filterDate_End md-input label-fixed" name="filterDate_End" type="text" data-uk-datepicker="{format:'{{data.common.shortDateFormat}}'}" value="{{formatDate now data.common.shortDateFormat}}"
+                               data-validation="shortDate"
                         />
                     </div>
                 </div>

diff --git a/src/views/subviews/reports/generate_partials/report_TicketsByPriorities.hbs b/src/views/subviews/reports/generate_partials/report_TicketsByPriorities.hbs
@@ -21,18 +21,14 @@
                 <div class="uk-grid uk-grid-collapse uk-margin-medium-bottom">
                     <div class="uk-width-1-2" style="padding: 0 15px 0 0;">
                         <label for="filterDate_Start" class="uk-form-label nopadding nomargin">Date Start</label>
-                        <input id="filterDate_Start" class="filterDate_Start md-input label-fixed" name="filterDate_Start" type="text" data-uk-datepicker="{format:'YYYY-MM-DD'}"
-                               data-validation="date"
-                               data-validation-format="YYYY-MM-DD"
-                               data-validation-error-msg="Please enter a valid Date"
+                        <input id="filterDate_Start" class="filterDate_Start md-input label-fixed" name="filterDate_Start" type="text" data-uk-datepicker="{format:'{{data.common.shortDateFormat}}'}"
+                               data-validation="shortDate"
                         />
                     </div>
                     <div class="uk-width-1-2" style="padding: 0 0 0 15px;">
                         <label for="filterDate_End" class="uk-form-label nopadding nomargin">Date End</label>
-                        <input id="filterDate_End" class="filterDate_End md-input label-fixed" name="filterDate_End" type="text" data-uk-datepicker="{format:'YYYY-MM-DD'}" value="{{formatDate now data.common.shortDateFormat}}"
-                               data-validation="date"
-                               data-validation-format="YYYY-MM-DD"
-                               data-validation-error-msg="Please enter a valid Date"
+                        <input id="filterDate_End" class="filterDate_End md-input label-fixed" name="filterDate_End" type="text" data-uk-datepicker="{format:'{{data.common.shortDateFormat}}'}" value="{{formatDate now data.common.shortDateFormat}}"
+                               data-validation="shortDate"
                         />
                     </div>
                 </div>

diff --git a/src/views/subviews/reports/generate_partials/report_TicketsByStatus.hbs b/src/views/subviews/reports/generate_partials/report_TicketsByStatus.hbs
@@ -21,18 +21,14 @@
                 <div class="uk-grid uk-grid-collapse uk-margin-medium-bottom">
                     <div class="uk-width-1-2" style="padding: 0 15px 0 0;">
                         <label for="filterDate_Start" class="uk-form-label nopadding nomargin">Date Start</label>
-                        <input id="filterDate_Start" class="filterDate_Start md-input label-fixed" name="filterDate_Start" type="text" data-uk-datepicker="{format:'YYYY-MM-DD'}"
-                               data-validation="date"
-                               data-validation-format="YYYY-MM-DD"
-                               data-validation-error-msg="Please enter a valid Date"
+                        <input id="filterDate_Start" class="filterDate_Start md-input label-fixed" name="filterDate_Start" type="text" data-uk-datepicker="{format:'{{data.common.shortDateFormat}}'}"
+                               data-validation="shortDate"
                         />
                     </div>
                     <div class="uk-width-1-2" style="padding: 0 0 0 15px;">
                         <label for="filterDate_End" class="uk-form-label nopadding nomargin">Date End</label>
-                        <input id="filterDate_End" class="filterDate_End md-input label-fixed" name="filterDate_End" type="text" data-uk-datepicker="{format:'YYYY-MM-DD'}" value="{{formatDate now data.common.shortDateFormat}}"
-                               data-validation="date"
-                               data-validation-format="YYYY-MM-DD"
-                               data-validation-error-msg="Please enter a valid Date"
+                        <input id="filterDate_End" class="filterDate_End md-input label-fixed" name="filterDate_End" type="text" data-uk-datepicker="{format:'{{data.common.shortDateFormat}}'}" value="{{formatDate now data.common.shortDateFormat}}"
+                               data-validation="shortDate"
                         />
                     </div>
                 </div>

diff --git a/src/views/subviews/reports/generate_partials/report_TicketsByTags.hbs b/src/views/subviews/reports/generate_partials/report_TicketsByTags.hbs
@@ -21,18 +21,14 @@
                 <div class="uk-grid uk-grid-collapse uk-margin-medium-bottom">
                     <div class="uk-width-1-2" style="padding: 0 15px 0 0;">
                         <label for="filterDate_Start" class="uk-form-label nopadding nomargin">Date Start</label>
-                        <input id="filterDate_Start" class="filterDate_Start md-input label-fixed" name="filterDate_Start" type="text" data-uk-datepicker="{format:'YYYY-MM-DD'}"
-                               data-validation="date"
-                               data-validation-format="YYYY-MM-DD"
-                               data-validation-error-msg="Please enter a valid Date"
+                        <input id="filterDate_Start" class="filterDate_Start md-input label-fixed" name="filterDate_Start" type="text" data-uk-datepicker="{format:'{{data.common.shortDateFormat}}'}"
+                               data-validation="shortDate"
                         />
                     </div>
                     <div class="uk-width-1-2" style="padding: 0 0 0 15px;">
                         <label for="filterDate_End" class="uk-form-label nopadding nomargin">Date End</label>
-                        <input id="filterDate_End" class="filterDate_End md-input label-fixed" name="filterDate_End" type="text" data-uk-datepicker="{format:'YYYY-MM-DD'}" value="{{formatDate now data.common.shortDateFormat}}"
-                               data-validation="date"
-                               data-validation-format="YYYY-MM-DD"
-                               data-validation-error-msg="Please enter a valid Date"
+                        <input id="filterDate_End" class="filterDate_End md-input label-fixed" name="filterDate_End" type="text" data-uk-datepicker="{format:'{{data.common.shortDateFormat}}'}" value="{{formatDate now data.common.shortDateFormat}}"
+                               data-validation="shortDate"
                         />
                     </div>
                 </div>

diff --git a/src/views/subviews/reports/generate_partials/report_TicketsByTypes.hbs b/src/views/subviews/reports/generate_partials/report_TicketsByTypes.hbs
@@ -21,18 +21,14 @@
                 <div class="uk-grid uk-grid-collapse uk-margin-medium-bottom">
                     <div class="uk-width-1-2" style="padding: 0 15px 0 0;">
                         <label for="filterDate_Start" class="uk-form-label nopadding nomargin">Date Start</label>
-                        <input id="filterDate_Start" class="filterDate_Start md-input label-fixed" name="filterDate_Start" type="text" data-uk-datepicker="{format:'YYYY-MM-DD'}"
-                               data-validation="date"
-                               data-validation-format="YYYY-MM-DD"
-                               data-validation-error-msg="Please enter a valid Date"
+                        <input id="filterDate_Start" class="filterDate_Start md-input label-fixed" name="filterDate_Start" type="text" data-uk-datepicker="{format:'{{data.common.shortDateFormat}}'}"
+                               data-validation="shortDate"
                         />
                     </div>
                     <div class="uk-width-1-2" style="padding: 0 0 0 15px;">
                         <label for="filterDate_End" class="uk-form-label nopadding nomargin">Date End</label>
-                        <input id="filterDate_End" class="filterDate_End md-input label-fixed" name="filterDate_End" type="text" data-uk-datepicker="{format:'YYYY-MM-DD'}" value="{{formatDate now data.common.shortDateFormat}}"
-                               data-validation="date"
-                               data-validation-format="YYYY-MM-DD"
-                               data-validation-error-msg="Please enter a valid Date"
+                        <input id="filterDate_End" class="filterDate_End md-input label-fixed" name="filterDate_End" type="text" data-uk-datepicker="{format:'{{data.common.shortDateFormat}}'}" value="{{formatDate now data.common.shortDateFormat}}"
+                               data-validation="shortDate"
                         />
                     </div>
                 </div>

diff --git a/src/views/subviews/reports/generate_partials/report_TicketsByUsers.hbs b/src/views/subviews/reports/generate_partials/report_TicketsByUsers.hbs
@@ -21,18 +21,14 @@
                 <div class="uk-grid uk-grid-collapse uk-margin-medium-bottom">
                     <div class="uk-width-1-2" style="padding: 0 15px 0 0;">
                         <label for="filterDate_Start" class="uk-form-label nopadding nomargin">Date Start</label>
-                        <input id="filterDate_Start" class="filterDate_Start md-input label-fixed" name="filterDate_Start" type="text" data-uk-datepicker="{format:'YYYY-MM-DD'}"
-                               data-validation="date"
-                               data-validation-format="YYYY-MM-DD"
-                               data-validation-error-msg="Please enter a valid Date"
+                        <input id="filterDate_Start" class="filterDate_Start md-input label-fixed" name="filterDate_Start" type="text" data-uk-datepicker="{format:'{{data.common.shortDateFormat}}'}"
+                               data-validation="shortDate"
                         />
                     </div>
                     <div class="uk-width-1-2" style="padding: 0 0 0 15px;">
                         <label for="filterDate_End" class="uk-form-label nopadding nomargin">Date End</label>
-                        <input id="filterDate_End" class="filterDate_End md-input label-fixed" name="filterDate_End" type="text" data-uk-datepicker="{format:'YYYY-MM-DD'}" value="{{formatDate now data.common.shortDateFormat}}"
-                               data-validation="date"
-                               data-validation-format="YYYY-MM-DD"
-                               data-validation-error-msg="Please enter a valid Date"
+                        <input id="filterDate_End" class="filterDate_End md-input label-fixed" name="filterDate_End" type="text" data-uk-datepicker="{format:'{{data.common.shortDateFormat}}'}" value="{{formatDate now data.common.shortDateFormat}}"
+                               data-validation="shortDate"
                         />
                     </div>
                 </div>