From 82487ae4bbc8d489c03bcbbefea701164759d154 Mon Sep 17 00:00:00 2001 From: Gaurav Saini Date: Fri, 8 Aug 2014 14:28:35 +0530 Subject: [PATCH] Groups changes for MIFOSX-1482 --- app/global-translations/locale-en.json | 4 + .../groups/MemberManageController.js | 63 +++++----- app/styles/app.css | 3 + app/views/groups/membermanage.html | 49 ++++---- app/views/groups/viewgroup.html | 112 +++++++++--------- 5 files changed, 114 insertions(+), 117 deletions(-) diff --git a/app/global-translations/locale-en.json b/app/global-translations/locale-en.json index 9ee267ed..b1502bf6 100755 --- a/app/global-translations/locale-en.json +++ b/app/global-translations/locale-en.json @@ -153,6 +153,7 @@ "label.button.undotransfer": "Undo Transfer", "label.button.deleteall": "Delete All", "label.button.add": "Add", + "label.button.back": "Back", "label.button.attendance": "Attendance", "label.button.unassign": "Unassign", "label.button.advancesearch": "Advance Search", @@ -557,6 +558,8 @@ "label.heading.creategroup": "Create Group", "label.heading.editgroup": "Edit Group", "label.heading.managemembers": "Manage Members", + "label.heading.associatenewmembers": "Associate New Members", + "label.heading.groupmembers": "Group Members", "label.heading.transferclientsbetweengroups": "Transfer Client between Groups", "label.heading.destinationgroupdetails": "Destination Group Details", "label.heading.nextmeetingon": "Next Meeting on", @@ -592,6 +595,7 @@ "label.input.selectedclients": "Selected clients", "label.input.inheritgrouploanofficer": "Inherit group loan officer", "label.input.destinationgroup": "Destination group", + "label.input.searchformember": "Search for a Member", "#Buttons": "..", "label.button.creategroup": "Create Group", diff --git a/app/scripts/controllers/groups/MemberManageController.js b/app/scripts/controllers/groups/MemberManageController.js index 2565c45f..b37b0ee4 100644 --- a/app/scripts/controllers/groups/MemberManageController.js +++ b/app/scripts/controllers/groups/MemberManageController.js @@ -1,9 +1,7 @@ (function (module) { mifosX.controllers = _.extend(module, { - MemberManageController: function (scope, routeParams, route, location, resourceFactory) { + MemberManageController: function (scope, routeParams, route, location, resourceFactory, $modal) { scope.group = []; - scope.addedClients = []; - scope.formData = {}; scope.viewClient = function (item) { scope.client = item; @@ -17,53 +15,46 @@ scope.allClients = data.clientOptions; scope.allMembers = data.clientMembers; }); - scope.add = function () { - if(scope.available != ""){ - var temp = {}; - temp.id = scope.available.id; - temp.displayName = scope.available.displayName; - scope.addedClients.push(temp); - } + if(scope.available != ""){ + scope.associate = {}; + scope.associate.clientMembers = []; + scope.associate.clientMembers[0] = scope.available.id; + console.log(scope.associate); + resourceFactory.groupResource.save({groupId: routeParams.id, command: 'associateClients'}, scope.associate, function (data) { + var temp = {}; + temp.id = scope.available.id; + temp.displayName = scope.available.displayName; + scope.allMembers.push(temp); + }); + } }; - 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) { + $modal.open({ + templateUrl: 'delete.html', + controller: MemberDeleteCtrl + }); 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); + var MemberDeleteCtrl = function ($scope, $modalInstance) { + $scope.delete = function () { + resourceFactory.groupResource.save({groupId: routeParams.id, command: 'disassociateClients'}, scope.disassociate, function (data) { + scope.allMembers.splice(0, 1); + $modalInstance.close('activate'); }); - } else { - location.path('/viewgroup/' + scope.group.id); - } + }; + $scope.cancel = function () { + $modalInstance.dismiss('cancel'); + }; }; - } }); - mifosX.ng.application.controller('MemberManageController', ['$scope', '$routeParams', '$route', '$location', 'ResourceFactory', mifosX.controllers.MemberManageController]).run(function ($log) { + mifosX.ng.application.controller('MemberManageController', ['$scope', '$routeParams', '$route', '$location', 'ResourceFactory', '$modal', mifosX.controllers.MemberManageController]).run(function ($log) { $log.info("MemberManageController initialized"); }); }(mifosX.controllers || {})); diff --git a/app/styles/app.css b/app/styles/app.css index fc3a3224..101eec25 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -1306,4 +1306,7 @@ h3.bolder { } .meeting th:first-child{ padding-left: 0px; +} +.thumbnail.row h4 { + text-align: center; } \ No newline at end of file diff --git a/app/views/groups/membermanage.html b/app/views/groups/membermanage.html index d69e173b..9d928f3c 100644 --- a/app/views/groups/membermanage.html +++ b/app/views/groups/membermanage.html @@ -4,30 +4,43 @@
  • {{'label.anchor.viewgroup' | translate}}
  • {{'label.anchor.managemembers' | translate}}
    • +
    - {{'label.heading.managemembers' | translate}}
    -
    +
    + {{'label.heading.associatenewmembers' | translate}}
    -
    + +
    + {{ 'label.button.add' | translate }} +
    -
    +

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

    - - + + @@ -41,10 +54,11 @@ -
    +
    + {{'label.heading.groupmembers' | translate}}
    -
    @@ -53,26 +67,11 @@
    -
    -
    - -
    -
    - -
    -
    -

    - {{ 'label.button.cancel' | translate }} - + {{ 'label.button.back' | translate }}
    diff --git a/app/views/groups/viewgroup.html b/app/views/groups/viewgroup.html index 8789bd55..699617fd 100644 --- a/app/views/groups/viewgroup.html +++ b/app/views/groups/viewgroup.html @@ -58,7 +58,7 @@ {{ 'label.button.grouploanapplication' | translate }}{{ 'label.button.bulkjlgloanapplication' | translate }} + class="icon-copy icon-white">{{ 'label.button.bulkjlgloanapplication' | translate }} {{ 'label.button.more' | translate}} @@ -350,61 +350,61 @@
    -

    {{group.name}}

    -
    {{'label.heading.name' | translate}}{{client.displayName}}{{'label.heading.name' | translate}}{{client.displayName}}
    {{ 'label.heading.id' | translate }}
    - - - - - - - - - - - - - - - - -
    {{ 'label.heading.activationdate' | translate }}{{group.activationDate | DateFormat}}
    {{ 'label.heading.staff' | translate }}{{group.staffName}} -
    {{ 'label.input.externalid' | translate }}{{group.externalId}} -
    {{ 'label.heading.center' | translate }}{{group.centerName}} -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    {{ 'label.heading.summary' | translate }}
    {{ 'label.numofactiveclient' | translate }}{{summary.activeClients}}
    {{ 'label.numofactivegrouploans' | translate }}{{summary.activeGroupLoans}}
    {{ 'label.numofactiveclientloans' | translate }}{{summary.activeClientLoans}}
    {{ 'label.numofactivegroupborrowers' | translate }}{{summary.activeGroupBorrowers}}
    {{ 'label.numofactiveclientborrowers' | translate }}{{summary.activeClientBorrowers}}
    {{ 'label.numofactiveoverduegrouploans' | translate }}{{summary.overdueGroupLoans}}
    {{ 'label.numofactiveoverdueclientloans' | translate }}{{summary.overdueClientLoans}}
    +
    +

    {{group.name}} {{ 'label.heading.details' | translate }}

    + + + + + + + + + + + + + + + + + +
    {{ 'label.heading.activationdate' | translate }}{{group.activationDate | DateFormat}}
    {{ 'label.heading.staff' | translate }}{{group.staffName}} +
    {{ 'label.input.externalid' | translate }}{{group.externalId}} +
    {{ 'label.heading.center' | translate }}{{group.centerName}} +
    +

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

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {{ 'label.numofactiveclient' | translate }}{{summary.activeClients}}
    {{ 'label.numofactivegrouploans' | translate }}{{summary.activeGroupLoans}}
    {{ 'label.numofactiveclientloans' | translate }}{{summary.activeClientLoans}}
    {{ 'label.numofactivegroupborrowers' | translate }}{{summary.activeGroupBorrowers}}
    {{ 'label.numofactiveclientborrowers' | translate }}{{summary.activeClientBorrowers}}
    {{ 'label.numofactiveoverduegrouploans' | translate }}{{summary.overdueGroupLoans}}
    {{ 'label.numofactiveoverdueclientloans' | translate }}{{summary.overdueClientLoans}}
    +