diff --git a/app/scripts/controllers/centers/ViewCenterController.js b/app/scripts/controllers/centers/ViewCenterController.js index c921bae5..068b5ec2 100644 --- a/app/scripts/controllers/centers/ViewCenterController.js +++ b/app/scripts/controllers/centers/ViewCenterController.js @@ -3,6 +3,7 @@ ViewCenterController: function (scope, routeParams, route, location, resourceFactory, $modal) { scope.center = []; scope.staffData = {}; + scope.formData = {}; resourceFactory.centerResource.get({centerId: routeParams.id, associations: 'groupMembers,collectionMeetingCalendar'}, function (data) { scope.center = data; scope.staffData.staffId = data.staffId; @@ -72,6 +73,14 @@ scope.centerdatatables = data; }); + scope.viewDataTable = function (registeredTableName,data){ + var locationURI = "/viewdatatableentry/"+registeredTableName+"/"+scope.center.id+"/"; + if (scope.datatabledetails.isMultirow) { + locationURI = locationURI + data.row[0]; + }; + location.path(locationURI); + }; + scope.dataTableChange = function (datatable) { resourceFactory.DataTablesResource.getTableDetails({datatablename: datatable.registeredTableName, entityId: routeParams.id, genericResultSet: 'true'}, function (data) { scope.datatabledetails = data; diff --git a/app/scripts/controllers/client/ViewClientController.js b/app/scripts/controllers/client/ViewClientController.js index 2e83dc56..3a32643e 100644 --- a/app/scripts/controllers/client/ViewClientController.js +++ b/app/scripts/controllers/client/ViewClientController.js @@ -6,6 +6,7 @@ scope.buttons = []; scope.clientdocuments = []; scope.staffData = {}; + scope.formData = {}; scope.openLoan = true; scope.openSaving = true; scope.routeToLoan = function (id) { @@ -27,7 +28,7 @@ }); } - var clientStatus = new mifosX.models.ClientStatus() + var clientStatus = new mifosX.models.ClientStatus(); if (clientStatus.statusKnown(data.status.value)) { scope.buttons = clientStatus.getStatus(data.status.value); @@ -242,6 +243,14 @@ }); }; + scope.viewDataTable = function (registeredTableName,data){ + var locationURI = "/viewdatatableentry/"+registeredTableName+"/"+scope.client.id+"/"; + if (scope.datatabledetails.isMultirow) { + locationURI = locationURI + data.row[0]; + }; + location.path(locationURI); + }; + scope.downloadDocument = function (documentId) { resourceFactory.clientDocumentsResource.get({clientId: routeParams.id, documentId: documentId}, '', function (data) { scope.clientdocuments.splice(index, 1); diff --git a/app/scripts/controllers/groups/ViewGroupController.js b/app/scripts/controllers/groups/ViewGroupController.js index 4712b3f2..8c29c56f 100644 --- a/app/scripts/controllers/groups/ViewGroupController.js +++ b/app/scripts/controllers/groups/ViewGroupController.js @@ -3,6 +3,7 @@ ViewGroupController: function (scope, routeParams, route, location, resourceFactory, dateFilter, $modal) { scope.group = []; scope.template = []; + scope.formData = {}; scope.choice = 0; scope.staffData = {}; scope.openLoan = true; @@ -75,6 +76,13 @@ route.reload(); }); }; + scope.viewDataTable = function (registeredTableName,data){ + var locationURI = "/viewdatatableentry/"+registeredTableName+"/"+scope.group.id+"/"; + if (scope.datatabledetails.isMultirow) { + locationURI = locationURI + data.row[0]; + }; + location.path(locationURI); + }; scope.saveNote = function () { resourceFactory.groupResource.save({groupId: routeParams.id, anotherresource: 'notes'}, this.formData, function (data) { var today = new Date(); diff --git a/app/scripts/controllers/main/LoginFormController.js b/app/scripts/controllers/main/LoginFormController.js index cfe8724d..70d78189 100644 --- a/app/scripts/controllers/main/LoginFormController.js +++ b/app/scripts/controllers/main/LoginFormController.js @@ -10,17 +10,18 @@ delete scope.loginCredentials.password; }; + /*This logic is no longer required as enter button is binded with text field for submit. $('#pwd').keypress(function (e) { if (e.which == 13) { scope.login(); } - }); + });*/ - $('#repeatPassword').keypress(function (e) { + /*$('#repeatPassword').keypress(function (e) { if (e.which == 13) { scope.updatePassword(); } - }); + });*/ scope.$on("UserAuthenticationFailureEvent", function (data) { scope.authenticationFailed = true; diff --git a/app/styles/app.css b/app/styles/app.css index 6f8fcb58..9efec3ff 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -239,7 +239,12 @@ td.graybg { hr.marginbottom { margin-bottom: 8px; } - +.marginbottom0 { + margin-bottom: 0px; +} +.overflowhidden{ + overflow: hidden; +} .primarydiv { background-color: #0f82f5; *background-color: #0072e6; @@ -1129,6 +1134,9 @@ input#search:-ms-input-placeholder { .modalwidth600{ width: 600px; } +.width450px{ + width: 450px; +} .displayinlineblock{ display: inline-block; } @@ -1156,3 +1164,10 @@ body * { visibility: hidden; } #printcontent * { visibility: visible; } #printcontent { position: absolute; top: 100px; left: 100px; width: 160%;height: 100%;} } +.boldlabel{ + font-size: 20px; + margin-left: 15px; +} +.marginleftn7px{ + margin-left: -7px; +} \ No newline at end of file diff --git a/app/views/centers/viewcenter.html b/app/views/centers/viewcenter.html index 8300a541..78e331e6 100644 --- a/app/views/centers/viewcenter.html +++ b/app/views/centers/viewcenter.html @@ -24,7 +24,7 @@
- +
@@ -111,8 +111,7 @@ {{center.collectionMeetingCalendar.nextTenRecurringDates[0] | DateFormat}}  - {{ 'label.unassigned' | translate }} + {{ 'label.unassigned' | translate }} @@ -166,8 +165,8 @@
-
- +
+ {{'label.heading.savingsaccoverview' | translate }}
@@ -206,23 +205,23 @@ 'label.button.attendance' | translate }}
+ + + + + + + + + + + + + +
{{'label.heading.name' | translate}}{{'label.heading.office' | translate}}{{ 'label.heading.status' | translate }}
{{group.name}}{{group.officeName}}{{group.status.value}} +
- - - - - - - - - - - - - -
{{'label.heading.name' | translate}}{{'label.heading.office' | translate}}{{ 'label.heading.status' | translate }}
{{group.name}}{{group.officeName}}{{group.status.value}} -

@@ -272,22 +271,14 @@ {{column.columnName}} - - - - {{row}} - {{row}} - - {{row}} - - + + {{row}} + - +
- +
{{value.key}}{{value.key}} {{value.value}}
diff --git a/app/views/clients/viewclient.html b/app/views/clients/viewclient.html index 5220e115..e73e0414 100644 --- a/app/views/clients/viewclient.html +++ b/app/views/clients/viewclient.html @@ -23,7 +23,7 @@
- +
@@ -139,7 +139,7 @@ {{ 'label.unassigned' | translate }} - {{group.name}} {{group.name}} {{ 'label.unassigned' | translate }}| @@ -158,7 +158,7 @@
- +
@@ -189,54 +189,36 @@
- - - - - - - - + + + +
-
- +
+ {{ 'label.heading.loanaccoverview' | translate }}

{{ 'label.heading.performancehistory' | translate }}
- - - + + + - - + + -
{{'label.heading.loanaccount' | translate}}{{'label.heading.accnum' | translate}}{{'label.heading.type' | translate}}{{'label.heading.loanaccount' | translate}}{{'label.heading.accnum' | translate}}{{'label.heading.type' | translate}} {{'label.heading.status' | translate}}
- - {{loanaccount.productName}} - - - - {{loanaccount.accountNo}} - - {{loanaccount.productName}}{{loanaccount.accountNo}} {{loanaccount.loanType.value}} -   {{loanaccount.status.value}} + + +    + {{loanaccount.status.value}}
@@ -263,17 +245,27 @@
-
- - {{'label.heading.savingsaccoverview' | translate }} - +
+ + + + +
+
+ + {{'label.heading.savingsaccoverview' | translate }} +

- - - + + +
- {{'label.button.upload' - | translate}} + + {{'label.button.upload' | translate}}

{{'label.heading.savingaccount' | translate}}{{'label.heading.accnum' | translate}}{{'label.heading.balance' | translate}}{{'label.heading.savingaccount' | translate}}{{'label.heading.accnum' | translate}}{{'label.heading.balance' | translate}} {{'label.heading.status' | translate}}
@@ -398,22 +390,14 @@ - - - + + +
{{column.columnName}}
- - {{row}} - {{row}} - - {{row}} -
{{row}}
- +
- +
{{value.key}}{{value.key}} {{value.value}}
diff --git a/app/views/groups/viewgroup.html b/app/views/groups/viewgroup.html index 2fb67427..57d50fd1 100644 --- a/app/views/groups/viewgroup.html +++ b/app/views/groups/viewgroup.html @@ -28,7 +28,7 @@
- +
@@ -129,8 +129,7 @@ {{group.collectionMeetingCalendar.nextTenRecurringDates[0] | DateFormat}}  - {{ 'label.unassigned' | translate }} + {{ 'label.unassigned' | translate }} @@ -139,7 +138,7 @@ {{ 'label.heading.center' | translate }} - {{group.centerName}} + {{group.centerName}} @@ -206,8 +205,8 @@
-
- +
+ {{ 'label.heading.loanaccoverview' | translate }}
@@ -215,9 +214,9 @@ - - - + + + @@ -238,9 +237,9 @@
{{ 'label.heading.products' | translate }}{{'label.heading.accnum' | translate}}{{'label.heading.type' | translate}}{{ 'label.heading.products' | translate }}{{'label.heading.accnum' | translate}}{{'label.heading.type' | translate}} {{ 'label.heading.status' | translate }}
- - - + + + @@ -258,8 +257,8 @@
{{ 'label.heading.products' | translate }}{{'label.heading.accnum' | translate}}{{'label.heading.type' | translate}}{{ 'label.heading.products' | translate }}{{'label.heading.accnum' | translate}}{{'label.heading.type' | translate}} {{ 'label.heading.status' | translate }}
-
- +
+ {{'label.heading.savingsaccoverview' | translate }}
@@ -267,9 +266,9 @@ - - - + + + @@ -289,8 +288,8 @@
{{ 'label.heading.products' | translate }}{{ 'label.heading.accnum' | translate }}{{ 'label.heading.balance' | translate }}{{ 'label.heading.products' | translate }}{{ 'label.heading.accnum' | translate }}{{ 'label.heading.balance' | translate }} {{ 'label.heading.status' | translate }}
- - + + @@ -312,35 +311,31 @@
- {{ 'label.button.add' | translate }} - {{ - 'label.button.disassociatemember' | translate }} - {{ - 'label.button.associatemember' | translate }} - {{ - 'label.button.attendance' | translate }} - {{ - 'label.button.transferclients' | translate }} + + {{ 'label.button.add' | translate }} + {{'label.button.disassociatemember' | translate }} + {{'label.button.associatemember' | translate }} + {{'label.button.attendance' | translate }} + {{'label.button.transferclients' | translate }}
+
{{ 'label.heading.products' | translate }}{{ 'label.heading.accnum' | translate }}{{ 'label.heading.products' | translate }}{{ 'label.heading.accnum' | translate }} {{ 'label.heading.status' | translate }}
+ + + + + + + + + + + + +
{{'label.heading.accnum' | translate}}{{'label.heading.name' | translate}}{{ 'label.heading.status' | translate }}
{{member.accountNo}}{{member.displayName}}{{member.status.value}} +
- - - - - - - - - - - - - -
{{'label.heading.accnum' | translate}}{{'label.heading.name' | translate}}{{ 'label.heading.status' | translate }}
{{member.accountNo}}{{member.displayName}}{{member.status.value}} -

@@ -380,29 +375,29 @@ {{ 'label.button.add' | translate }}
+ + + + + + + + + + + + + + + + + +
{{ 'label.heading.role' | translate }}{{ 'label.heading.name' | translate }}{{ 'label.heading.clientid' | translate }}
{{grouprole.role.name}}{{grouprole.clientName}}{{grouprole.clientId}} + +
- - - - - - - - - - - - - - - - - -
{{ 'label.heading.role' | translate }}{{ 'label.heading.name' | translate }}{{ 'label.heading.clientid' | translate }}
{{grouprole.role.name}}{{grouprole.clientName}}{{grouprole.clientId}} - -
@@ -412,8 +407,7 @@ | translate}} {{'label.button.add' | - translate}} + class="btn btn-primary">{{'label.button.add' | translate}}
@@ -421,22 +415,14 @@ - - - + + +
{{column.columnName}}
- - {{row}} - {{row}} - - {{row}} -
{{row}}
- +
- +
{{value.key}}{{value.key}} {{value.value}}