diff --git a/app/global-translations/locale-en.json b/app/global-translations/locale-en.json index d6a2641f..2dff3bd8 100755 --- a/app/global-translations/locale-en.json +++ b/app/global-translations/locale-en.json @@ -555,8 +555,7 @@ "label.heading.repeatdetails": "Repeat Details", "label.heading.creategroup": "Create Group", "label.heading.editgroup": "Edit Group", - "label.heading.associatemembers": "Associate Members", - "label.heading.disassociatemembers": "Dissociate Members", + "label.heading.managemembers": "Manage Members", "label.heading.transferclientsbetweengroups": "Transfer Client between Groups", "label.heading.destinationgroupdetails": "Destination Group Details", "label.heading.nextmeetingon": "Next Meeting on", @@ -598,8 +597,7 @@ "label.button.groupsavingapplication": "Group Saving Application", "label.button.grouploanapplication": "Group Loan Application", "label.button.jlgloanapplication": "JLG Loan Application", - "label.button.disassociatemember": "Dissociate Member", - "label.button.associatemember": "Associate Member", + "label.button.managemembers": "Manage Members", "label.button.transferclients": "Transfer Clients", "label.button.attachmeeting": "Attach Meeting", @@ -2016,6 +2014,7 @@ "label.anchor.schedulerjobs": "Scheduler Jobs", "label.anchor.configuration": "Configurations", "label.anchor.addcodevalue":"Add Code Value", + "label.anchor.managemembers":"Manage Members", "#Inputs": "..", "label.input.entity": "Entity", diff --git a/app/scripts/controllers/groups/MemberManageController.js b/app/scripts/controllers/groups/MemberManageController.js index e9b7c805..2565c45f 100644 --- a/app/scripts/controllers/groups/MemberManageController.js +++ b/app/scripts/controllers/groups/MemberManageController.js @@ -2,8 +2,13 @@ mifosX.controllers = _.extend(module, { MemberManageController: function (scope, routeParams, route, location, resourceFactory) { scope.group = []; - scope.managecode = routeParams.managecode; + scope.addedClients = []; + scope.formData = {}; + scope.viewClient = function (item) { + scope.client = item; + }; + resourceFactory.groupResource.get({groupId: routeParams.id, associations: 'all'}, function (data) { scope.group = data; }); @@ -13,19 +18,49 @@ scope.allMembers = data.clientMembers; }); - scope.associate = function () { - resourceFactory.groupResource.save({groupId: routeParams.id, command: 'associateClients'}, this.formData, function (data) { - location.path('/viewgroup/' + data.groupId); - }); + + scope.add = function () { + if(scope.available != ""){ + var temp = {}; + temp.id = scope.available.id; + temp.displayName = scope.available.displayName; + scope.addedClients.push(temp); + } }; - scope.disassociate = function () { - var disassociateMembers = new Object(); - disassociateMembers.clientMembers = this.formData.clientMembers; - resourceFactory.groupResource.save({groupId: routeParams.id, command: 'disassociateClients'}, disassociateMembers, function (data) { - location.path('/viewgroup/' + data.groupId); + scope.sub = function (id) { + for (var i = 0; i < scope.addedClients.length; i++) { + if (scope.addedClients[i].id == id) { + scope.addedClients.splice(i, 1); + break; + } + } + }; + + scope.remove = function (id) { + scope.disassociate = {}; + scope.disassociate.clientMembers = []; + scope.disassociate.clientMembers.push(id); + console.log(scope.disassociate); + resourceFactory.groupResource.save({groupId: routeParams.id, command: 'disassociateClients'}, scope.disassociate, function (data) { + scope.allMembers.splice(0, 1); }); }; + + scope.submit = function () { + scope.formData.clientMembers = []; + if(scope.addedClients.length > 0){ + for (var i in scope.addedClients) { + scope.formData.clientMembers[i] = scope.addedClients[i].id; + } + resourceFactory.groupResource.save({groupId: routeParams.id, command: 'associateClients'}, scope.formData, function (data) { + location.path('/viewgroup/' + scope.group.id); + }); + } else { + location.path('/viewgroup/' + scope.group.id); + } + }; + } }); mifosX.ng.application.controller('MemberManageController', ['$scope', '$routeParams', '$route', '$location', 'ResourceFactory', mifosX.controllers.MemberManageController]).run(function ($log) { diff --git a/app/styles/app.css b/app/styles/app.css index 9de918cd..a3b7a40e 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -1280,4 +1280,10 @@ h3.bolder { .lang-dropdown{ right: 0; left: initial; +} +.meeting{ + margin-left: -7px +} +.meeting th:first-child{ + padding-left: 0px; } \ No newline at end of file diff --git a/app/views/groups/membermanage.html b/app/views/groups/membermanage.html index 3e660309..d69e173b 100644 --- a/app/views/groups/membermanage.html +++ b/app/views/groups/membermanage.html @@ -1,50 +1,79 @@ -
+
+ -
-
-
-

{{ 'label.heading.associatemembers' | translate }}

- -
- - + +
+ {{'label.heading.managemembers' | translate}} +
+
+
+
+ +
+
+ +
+
+
+
+

{{'label.heading.groupdetails' | translate}}

+ + + + + + + + + + + + + +
{{'label.heading.name' | translate}}{{client.displayName}}
{{ 'label.heading.id' | translate }}{{client.id}}
{{ 'label.heading.office' | translate }}{{client.officeName}}
+
+
-
- -
- {{ 'label.button.cancel' | translate }} - +
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+
-
- -
-
-

{{ 'label.heading.disassociatemembers' | translate }}

- -
- - -
-
- -
- {{ 'label.button.cancel' | translate }} - -
+
+
+ {{ 'label.button.cancel' | translate }} +
-
- -
+
+
\ No newline at end of file diff --git a/app/views/groups/viewgroup.html b/app/views/groups/viewgroup.html index c33957a4..57b27b16 100644 --- a/app/views/groups/viewgroup.html +++ b/app/views/groups/viewgroup.html @@ -53,12 +53,10 @@ 'label.button.activate' | translate }} {{ 'label.button.edit' | translate }} - {{'label.button.attendance' | translate }} {{ 'label.button.groupsavingapplication' | translate }} + class="icon-file icon-white">{{ 'label.button.groupsavingapplication' | translate }} {{ 'label.button.grouploanapplication' | translate }} @@ -67,6 +65,10 @@