diff --git a/app/scripts/controllers/groups/CreateGroupController.js b/app/scripts/controllers/groups/CreateGroupController.js index a6a24e59..5f72cc45 100644 --- a/app/scripts/controllers/groups/CreateGroupController.js +++ b/app/scripts/controllers/groups/CreateGroupController.js @@ -167,8 +167,7 @@ scope.formData.clientMembers[i] = scope.addedClients[i].id; } if (this.formData.active) { - var reqDate = dateFilter(scope.first.date, scope.df); - this.formData.activationDate = reqDate; + this.formData.activationDate = dateFilter(scope.first.date, scope.df); } if (routeParams.centerId) { this.formData.centerId = routeParams.centerId; @@ -177,8 +176,7 @@ this.formData.officeId = routeParams.officeId; } if (scope.first.submitondate) { - reqDat = dateFilter(scope.first.submitondate, scope.df); - this.formData.submittedOnDate = reqDat; + this.formData.submittedOnDate = dateFilter(scope.first.submitondate, scope.df); } this.formData.locale = scope.optlang.code; this.formData.dateFormat = scope.df; diff --git a/app/scripts/controllers/groups/EditGroupController.js b/app/scripts/controllers/groups/EditGroupController.js index 36d685c2..2d2f9b3b 100644 --- a/app/scripts/controllers/groups/EditGroupController.js +++ b/app/scripts/controllers/groups/EditGroupController.js @@ -117,12 +117,13 @@ resourceFactory.groupResource.get({groupId: routeParams.id}, function (data) { if (data.timeline.submittedOnDate) { scope.mindate = new Date(data.timeline.submittedOnDate); + scope.first.submitondate = new Date(dateFilter(data.timeline.submittedOnDate, scope.df)); } }); scope.updateGroup = function () { - var reqDate = dateFilter(scope.first.date, scope.df); - this.formData.activationDate = reqDate; + this.formData.submittedOnDate = dateFilter(scope.first.submitondate, scope.df); + this.formData.activationDate = dateFilter(scope.first.date, scope.df); this.formData.locale = scope.optlang.code; this.formData.dateFormat = scope.df; resourceFactory.groupResource.update({groupId: routeParams.id}, this.formData, function (data) { diff --git a/app/views/groups/editgroup.html b/app/views/groups/editgroup.html index 94ffb8f8..bca4f080 100644 --- a/app/views/groups/editgroup.html +++ b/app/views/groups/editgroup.html @@ -43,6 +43,14 @@ +
+ + +
+ +
+