Refactor the date transformations to a service

gzsombor · May 28, 2015 · 3d78486 · 3d78486 · deepu105 · May 31, 2015
1 parent 7b8ccd7
commit 3d78486
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 16 deletions.
diff --git a/app/index.js b/app/index.js
@@ -813,6 +813,7 @@ JhipsterGenerator.prototype.app = function app() {
     this.template(webappDir + '/scripts/components/util/_base64.service.js', webappDir + 'scripts/components/util/base64.service.js', this, {});
     this.template(webappDir + '/scripts/components/util/_parse-links.service.js', webappDir + 'scripts/components/util/parse-links.service.js', this, {});
     this.template(webappDir + '/scripts/components/util/_truncate.filter.js', webappDir + 'scripts/components/util/truncate.filter.js', this, {});
+    this.template(webappDir + '/scripts/components/util/_dateutil.service.js', webappDir + 'scripts/components/util/dateutil.service.js', this, {});
 
     // Client App
     this.template(webappDir + '/scripts/app/account/_account.js', webappDir + 'scripts/app/account/account.js', this, {});

diff --git a/app/templates/src/main/webapp/scripts/components/util/_dateutil.service.js b/app/templates/src/main/webapp/scripts/components/util/_dateutil.service.js
@@ -0,0 +1,30 @@
+'use strict';
+
+angular.module('<%=angularAppName%>')
+    .service('DateUtils', function () {
+      this.convertLocaleDateToServer = function(date) {
+        if (date) {
+          var utcDate = new Date();
+          utcDate.setUTCDate(date.getDate());
+          utcDate.setUTCMonth(date.getMonth());
+          utcDate.setUTCFullYear(date.getFullYear());
+          return utcDate;
+        } else {
+          return null;
+        }
+      };
+      this.convertLocaleDateFromServer = function(date) {
+        if (date) {
+          var dateString = date.split("-");
+          return new Date(dateString[0], dateString[1] - 1, dateString[2]);
+        }
+        return null;
+      };
+      this.convertDateTimeFromServer = function(date) {
+        if (date) {
+          return new Date(date);   
+        } else {
+          return null;
+        }
+      }
+    });
diff --git a/entity/templates/src/main/webapp/components/_entity-service.js b/entity/templates/src/main/webapp/components/_entity-service.js
@@ -1,40 +1,29 @@
 'use strict';
 
 angular.module('<%=angularAppName%>')
-    .factory('<%= entityClass %>', function ($resource) {
+    .factory('<%= entityClass %>', function ($resource, DateUtils) {
         return $resource('api/<%= entityInstance %>s/:id', {}, {
             'query': { method: 'GET', isArray: true},
             'get': {
                 method: 'GET',
                 transformResponse: function (data) {
                     data = angular.fromJson(data);<% for (fieldId in fields) { if (fields[fieldId].fieldType == 'LocalDate') { %>
-                    if (data.<%=fields[fieldId].fieldName%> != null){
-                        var <%=fields[fieldId].fieldName%>From = data.<%=fields[fieldId].fieldName%>.split("-");
-                        data.<%=fields[fieldId].fieldName%> = new Date(new Date(<%=fields[fieldId].fieldName%>From[0], <%=fields[fieldId].fieldName%>From[1] - 1, <%=fields[fieldId].fieldName%>From[2]));
-                    }<% }if (fields[fieldId].fieldType == 'DateTime') { %>
-                    if (data.<%=fields[fieldId].fieldName%> != null) data.<%=fields[fieldId].fieldName%> = new Date(data.<%=fields[fieldId].fieldName%>);<% } }%>
+                    data.<%=fields[fieldId].fieldName%> = DateUtils.convertLocaleDateFromServer(data.<%=fields[fieldId].fieldName%>);<% }if (fields[fieldId].fieldType == 'DateTime') { %>
+                    data.<%=fields[fieldId].fieldName%> = DateUtils.convertDateTimeFromServer(data.<%=fields[fieldId].fieldName%>);<% } }%>
                     return data;
                 }
             },<% if (fieldsContainLocalDate == true) { %>
             'update': {
                 method: 'PUT',
                 transformRequest: function (data) {<% for (fieldId in fields) { if (fields[fieldId].fieldType == 'LocalDate') { %>
-                    var <%=fields[fieldId].fieldName%> = new Date();
-                    <%=fields[fieldId].fieldName%>.setUTCDate(data.<%=fields[fieldId].fieldName%>.getDate());
-                    <%=fields[fieldId].fieldName%>.setUTCMonth(data.<%=fields[fieldId].fieldName%>.getMonth());
-                    <%=fields[fieldId].fieldName%>.setUTCFullYear(data.<%=fields[fieldId].fieldName%>.getFullYear());
-                    data.<%=fields[fieldId].fieldName%> = <%=fields[fieldId].fieldName%>;<% } }%>
+                    data.<%=fields[fieldId].fieldName%> = DateUtils.convertLocaleDateToServer(data.<%=fields[fieldId].fieldName%>);<% } }%>
                     return angular.toJson(data);
                 }
             },
             'save': {
                 method: 'POST',
                 transformRequest: function (data) {<% for (fieldId in fields) { if (fields[fieldId].fieldType == 'LocalDate') { %>
-                    var <%=fields[fieldId].fieldName%> = new Date();
-                    <%=fields[fieldId].fieldName%>.setUTCDate(data.<%=fields[fieldId].fieldName%>.getDate());
-                    <%=fields[fieldId].fieldName%>.setUTCMonth(data.<%=fields[fieldId].fieldName%>.getMonth());
-                    <%=fields[fieldId].fieldName%>.setUTCFullYear(data.<%=fields[fieldId].fieldName%>.getFullYear());
-                    data.<%=fields[fieldId].fieldName%> = <%=fields[fieldId].fieldName%>;<% } }%>
+                    data.<%=fields[fieldId].fieldName%> = DateUtils.convertLocaleDateToServer(data.<%=fields[fieldId].fieldName%>);<% } }%>
                     return angular.toJson(data);
                 }
             }<% } else { %>