diff --git a/app/global-translations/locale-en.json b/app/global-translations/locale-en.json
index 52b70c05..ceeb7498 100644
--- a/app/global-translations/locale-en.json
+++ b/app/global-translations/locale-en.json
@@ -717,6 +717,7 @@
"table.heading.dueasof":"Due as of",
"table.heading.calculationtype":"Calculation type",
"label.select.saving.product":"--Select saving product--",
+ "label.centerclosed":"Center Closed",
"#Account Transfers":".........",
"label.heading.view.accounttransfer.details":"View Account Transfers Details",
diff --git a/app/scripts/controllers/centers/EditCenterController.js b/app/scripts/controllers/centers/EditCenterController.js
index 9a2cc0a9..be0f32fa 100644
--- a/app/scripts/controllers/centers/EditCenterController.js
+++ b/app/scripts/controllers/centers/EditCenterController.js
@@ -3,7 +3,6 @@
EditCenterController: function(scope, resourceFactory,location, routeParams,dateFilter ) {
scope.managecode = routeParams.managecode;
scope.first = {};
- scope.first.date = new Date();
resourceFactory.centerResource.get({centerId: routeParams.id,template: 'true'} , function(data) {
scope.edit = data;
scope.staffs = data.staffOptions;
@@ -12,7 +11,10 @@
externalId:data.externalId,
staffId:data.staffId
};
+ var newDate = dateFilter(data.activationDate,'dd MMMM yyyy');
+ scope.first.date = new Date(newDate);
});
+
scope.updateGroup = function(){
var reqDate = dateFilter(scope.first.date,'dd MMMM yyyy');
this.formData.activationDate = reqDate;
diff --git a/app/scripts/controllers/centers/ViewCenterController.js b/app/scripts/controllers/centers/ViewCenterController.js
index 972a8fe0..2cdd8acd 100644
--- a/app/scripts/controllers/centers/ViewCenterController.js
+++ b/app/scripts/controllers/centers/ViewCenterController.js
@@ -31,7 +31,7 @@
scope.unassignStaff = function(id){
var staffData = new Object();
staffData.staffId = id;
- resourceFactory.centerResource.save({centerId: routeParams.id,command: 'unassignStaff'}, staffData, function(data) {
+ resourceFactory.groupResource.save({centerId: routeParams.id,anotherresource: 'unassignStaff'}, staffData, function(data) {
resourceFactory.centerResource.get({centerId: routeParams.id}, function(data){
route.reload();
});
diff --git a/app/scripts/controllers/groups/AttachMeetingController.js b/app/scripts/controllers/groups/AttachMeetingController.js
index 476feac4..99ad8029 100644
--- a/app/scripts/controllers/groups/AttachMeetingController.js
+++ b/app/scripts/controllers/groups/AttachMeetingController.js
@@ -5,7 +5,6 @@
templateSource : 'template'}, function(data) {
scope.groupCenterData = data;
scope.first = {};
- scope.first.date = new Date();
//to display default in select boxes
scope.formData = {
repeating :'true',
diff --git a/app/scripts/controllers/groups/EditGroupController.js b/app/scripts/controllers/groups/EditGroupController.js
index 213752df..2960757c 100644
--- a/app/scripts/controllers/groups/EditGroupController.js
+++ b/app/scripts/controllers/groups/EditGroupController.js
@@ -2,7 +2,6 @@
mifosX.controllers = _.extend(module, {
EditGroupController: function(scope, resourceFactory,location, routeParams,dateFilter ) {
scope.first = {};
- scope.first.date = new Date();
scope.managecode = routeParams.managecode;
resourceFactory.groupResource.get({groupId: routeParams.id,associations:'clientMembers',template:'true'} , function(data) {
scope.editGroup = data;
@@ -11,6 +10,11 @@
externalId:data.externalId,
staffId:data.staffId
};
+ if(data.activationDate){
+ var actDate = dateFilter(data.activationDate,'dd MMMM yyyy');
+ scope.first.date = new Date(actDate);
+
+ }
});
scope.updateGroup = function(){
var reqDate = dateFilter(scope.first.date,'dd MMMM yyyy');
diff --git a/app/scripts/controllers/loanAccount/NewLoanAccAppController.js b/app/scripts/controllers/loanAccount/NewLoanAccAppController.js
index 4a0d3932..43514fe6 100644
--- a/app/scripts/controllers/loanAccount/NewLoanAccAppController.js
+++ b/app/scripts/controllers/loanAccount/NewLoanAccAppController.js
@@ -10,12 +10,7 @@
scope.collateralFormData = {}; //For collaterals
scope.inparams = {resourceType : 'template'};
scope.date = {};
- scope.date.first = new Date();
- scope.date.second = new Date();
- scope.date.third = new Date();
- scope.date.fourth = new Date();
- scope.date.fifth = new Date();
- if (scope.clientId) {
+ if (scope.clientId) {
scope.inparams.clientId = scope.clientId;
scope.formData.clientId = scope.clientId;
}
@@ -125,8 +120,6 @@
var reqSecondDate = dateFilter(scope.date.second,'dd MMMM yyyy');
var reqThirdDate = dateFilter(scope.date.third,'dd MMMM yyyy');
var reqFourthDate = dateFilter(scope.date.fourth,'dd MMMM yyyy');
- var reqFifthDate = dateFilter(scope.date.fifth,'dd MMMM yyyy');
-
if (scope.charges.length > 0) {
scope.formData.charges = [];
for (var i in scope.charges) {
diff --git a/app/scripts/controllers/loanAccount/ViewLoanDetailsController.js b/app/scripts/controllers/loanAccount/ViewLoanDetailsController.js
index 32c9e02c..0065d3e1 100644
--- a/app/scripts/controllers/loanAccount/ViewLoanDetailsController.js
+++ b/app/scripts/controllers/loanAccount/ViewLoanDetailsController.js
@@ -68,13 +68,14 @@
location.path('/guarantor/' + accountId);
}
};
-
resourceFactory.LoanAccountResource.getLoanAccountDetails({loanId: routeParams.id, associations: 'all'}, function(data) {
scope.loandetails = data;
-
+ scope.status = data.status.value;
scope.$broadcast('LoanAccountDataLoadingCompleteEvent');
-
- if (data.status.value == "Submitted and pending approval") {
+ if(scope.status=="Submitted and pending approval" || scope.status=="Active" || scope.status=="Approved" ){
+ scope.choice = true;
+ }
+ if (data.status.value == "Submitted and pending approval") {
scope.buttons = { singlebuttons : [{
name:"button.addloancharge",
icon :"icon-plus-sign"
diff --git a/app/scripts/controllers/savings/ViewSavingDetailsController.js b/app/scripts/controllers/savings/ViewSavingDetailsController.js
index 0e7cdb34..2274ea4c 100644
--- a/app/scripts/controllers/savings/ViewSavingDetailsController.js
+++ b/app/scripts/controllers/savings/ViewSavingDetailsController.js
@@ -70,6 +70,10 @@
resourceFactory.savingsResource.get({accountId: routeParams.id, associations: 'all'}, function(data) {
scope.savingaccountdetails = data;
+ scope.status = data.status.value;
+ if(scope.status=="Submitted and pending approval" || scope.status=="Active" || scope.status=="Approved" ){
+ scope.choice = true;
+ }
if(scope.savingaccountdetails.charges) {
scope.charges = scope.savingaccountdetails.charges;
scope.chargeTableShow = true;
diff --git a/app/views/centers/viewcenter.html b/app/views/centers/viewcenter.html
index f2307ca3..c4ec7114 100644
--- a/app/views/centers/viewcenter.html
+++ b/app/views/centers/viewcenter.html
@@ -197,10 +197,12 @@
- {{'button.deleteall' | translate}}
-
- {{'button.add' | translate}}
-
+
+ {{'button.deleteall' | translate}}
+
+ {{'button.add' | translate}}
+
+
| {{column.columnName}} |
diff --git a/app/views/groups/viewgroup.html b/app/views/groups/viewgroup.html
index 43552b22..a26e1920 100644
--- a/app/views/groups/viewgroup.html
+++ b/app/views/groups/viewgroup.html
@@ -254,10 +254,12 @@
- {{'button.deleteall' | translate}}
-
- {{'button.add' | translate}}
-
+
+ {{'button.deleteall' | translate}}
+
+ {{'button.add' | translate}}
+
+
| {{column.columnName}} |
diff --git a/app/views/loans/viewloanaccountdetails.html b/app/views/loans/viewloanaccountdetails.html
index 5fdba548..8c28ff6e 100644
--- a/app/views/loans/viewloanaccountdetails.html
+++ b/app/views/loans/viewloanaccountdetails.html
@@ -301,7 +301,7 @@
-