From a37f054047501e6fd264162cdfed7ce5b48cdec8 Mon Sep 17 00:00:00 2001 From: Madhukar Date: Sat, 9 Nov 2013 12:28:36 +0530 Subject: [PATCH] Add server side error handling Add directive for serverside validation --- app/global-translations/locale-en.json | 61 ++++++++++++- .../organization/CreateRoleController.js | 1 + .../directives/ApiValidationDirective.js | 26 ++++++ app/scripts/mifosXComponents.js | 3 +- app/views/accounting/accounting_coa.html | 6 +- app/views/accounting/add_acc_rule.html | 6 +- app/views/accounting/createclosure.html | 6 +- app/views/accounting/createglaccounting.html | 6 +- app/views/accounting/edit_acc_rule.html | 6 +- app/views/accounting/editglaccounting.html | 6 +- app/views/accounting/freqposting.html | 10 +-- .../accounting/journalentry_posting.html | 6 +- .../make_accounttransfer.html | 11 +-- app/views/administration/addrole.html | 5 +- app/views/administration/createuser.html | 5 +- app/views/administration/editpermissions.html | 1 + app/views/administration/edituser.html | 7 +- app/views/administration/userFormDialog.html | 10 +-- app/views/centers/addgroup.html | 5 +- app/views/centers/closecenter.html | 5 +- app/views/centers/createcenter.html | 11 +-- app/views/centers/editcenter.html | 9 +- app/views/clients/addclientdocument.html | 6 +- app/views/clients/addclientidentifier.html | 6 +- .../clients/addclientidentifierdocument.html | 6 +- app/views/clients/clientactions.html | 6 +- app/views/clients/createclient.html | 6 +- app/views/clients/editclient.html | 6 +- app/views/clients/transferclient.html | 6 +- .../collection/entercollectionsheet.html | 8 +- app/views/groups/addmember.html | 11 ++- app/views/groups/addrole.html | 6 +- app/views/groups/assignstaff.html | 3 +- app/views/groups/attachmeeting.html | 3 +- app/views/groups/closegroup.html | 5 +- app/views/groups/creategroup.html | 15 ++-- app/views/groups/editgroup.html | 9 +- app/views/groups/groupattendance.html | 1 + app/views/groups/membermanage.html | 1 + app/views/groups/transferclients.html | 1 + app/views/loans/addloancharge.html | 7 +- app/views/loans/addloancollateral.html | 5 +- app/views/loans/addloandocument.html | 7 +- app/views/loans/assignloanofficer.html | 5 +- app/views/loans/editguarantor.html | 19 +++-- app/views/loans/editloanaccount.html | 58 ++++++------- app/views/loans/editloancharge.html | 4 +- app/views/loans/editloancollateral.html | 5 +- app/views/loans/guarantor.html | 21 ++--- app/views/loans/loanaccountactions.html | 21 ++--- app/views/loans/newjlgloanaccount.html | 55 ++++++------ app/views/loans/newloanaccount.html | 57 ++++++------- app/views/organization/bulkloan.html | 7 +- app/views/organization/createemployee.html | 3 +- app/views/organization/createholiday.html | 13 +-- app/views/organization/createoffice.html | 9 +- app/views/organization/editemployee.html | 3 +- app/views/organization/editoffice.html | 7 +- app/views/products/createcharge.html | 14 +-- app/views/products/createloanproduct.html | 85 ++++++++++--------- app/views/products/createsavingproduct.html | 58 ++++++------- app/views/products/editcharge.html | 11 +-- app/views/products/editloanproduct.html | 85 ++++++++++--------- app/views/products/editsavingproduct.html | 58 ++++++------- .../products/productmix/addproductmix.html | 7 +- .../products/productmix/editproductmix.html | 3 +- app/views/reports/run_reports.html | 5 +- app/views/savings/addnewsavingscharge.html | 12 +-- .../edit_saving_account_application.html | 27 +++--- .../new_saving_account_application.html | 27 +++--- app/views/savings/saving_account_actions.html | 23 ++--- app/views/system/addcode.html | 1 + app/views/system/createdatatable.html | 5 +- app/views/system/createreport.html | 13 +-- app/views/system/editcode.html | 3 +- app/views/system/editdatatable.html | 6 +- app/views/system/editreport.html | 5 +- app/views/system/editschedulerjob.html | 5 +- app/views/system/makedatatableentry.html | 4 +- app/views/templates/createtemplate.html | 9 +- app/views/templates/edittemplate.html | 7 +- 81 files changed, 580 insertions(+), 516 deletions(-) create mode 100644 app/scripts/directives/ApiValidationDirective.js diff --git a/app/global-translations/locale-en.json b/app/global-translations/locale-en.json index c32bda05..a129e2b1 100644 --- a/app/global-translations/locale-en.json +++ b/app/global-translations/locale-en.json @@ -2,7 +2,7 @@ "app lebels start" :"", "label.product.title" : "Mifos X Client", "label.change.language" : "Change language:", - "label.username" : "UserName", + "label.username" : "Username", "label.password" : "Password", "label.signin":"Sign In", "label.systemid": "System Id :", @@ -1130,6 +1130,63 @@ "label.viewcheckerinbox":"View Checker Inbox", "label.searchbytransaction":"Search by transaction #", "label.searchbyuser":"Search by user", - "label.advancesearch":"Advanced Search" + "label.advancesearch":"Advanced Search", + "label.error" : "Errors:", + "validation.msg.loan.expectedDisbursementDate.cannot.be.blank":"Expected disbursementDate cannot be blank", + "validation.msg.loan.submittedOnDate.cannot.be.blank":"Loan submitial date cannot be blank", + "validation.msg.loan.principal.not.greater.than.zero":"Principal should be a positive amount", + "validation.msg.user.username.cannot.be.blank" : "User userName cannot be blank", + "validation.msg.user.firstname.cannot.be.blank" : "User firstName cannot be blank", + "validation.msg.user.lastname.cannot.be.blank" : "User lastName cannot be blank", + "validation.msg.user.email.cannot.be.blank" : "User email cannot be blank", + "validation.msg.user.roles.cannot.be.empty" : "User should have atleast one role", + "validation.msg.center.closureDate.cannot.be.blank":"Closure date cannot be blank", + "validation.msg.group.activationDate.cannot.be.blank":"Activation date cannot be blank", + "validation.msg.client.activationDate.cannot.be.blank":"Activation date cannot be blank", + "validation.msg.center.name.cannot.be.blank":"Center name cannot be blank", + + "Clients":"Error Messages", + "validation.msg.client.officeId.cannot.be.blank":"Office is mandatory.", + "validation.msg.client.id.no.name.details.passed":"Details related to the clients name are mandatory and none have been provided.", + "validation.msg.client.firstname.cannot.be.blank":"First name is mandatory.", + "validation.msg.client.lastname.cannot.be.blank":"Last name is mandatory.", + "validation.msg.client.fullname.cannot.be.blank":"Fullname is mandatory.", + + "validation.msg.client.active.must.be.true.or.false":"Active is mandatory. Its value must be true or false.", + "validation.msg.client.active.pending.status.not.allowed":"Configuration does not allow client's to be created as `Pending`. ", + "validation.msg.client.activationDate.cannot.be.blank":"Activation date is mandatory to create `Active` client.", + + "validation.msg.client.fullname.cannot.also.be.provided.when.firstname.is.populated":"You cannot provide both `fullname or business name` and `firstname` details.", + "validation.msg.client.fullname.cannot.also.be.provided.when.middlename.is.populated":"You cannot provide both `fullname or business name` and `middlename` details.", + "validation.msg.client.fullname.cannot.also.be.provided.when.lastname.is.populated":"You cannot provide both `fullname or business name` and `lastname` details.", + "validation.msg.client.firstname.cannot.also.be.provided.when.fullname.is.populated":"You cannot provide both `fullname or business name` and `firstname` details.", + "validation.msg.client.middlename.cannot.also.be.provided.when.fullname.is.populated":"You cannot provide both `fullname or business name` and `middlename` details.", + "validation.msg.client.lastname.cannot.also.be.provided.when.fullname.is.populated":"You cannot provide both `fullname or business name` and `lastname` details.", + "validation.msg.client.no.parameters.for.update":"Nothing has changed. Press Cancel.", + "validation.msg.client.staffId.cannot.be.blank":"Please Select staff.", + + "error.msg.client.member.of.group.and.cannot.update.office":"The client is a member of a group so you must update the office of the group.", + "error.msg.clients.activationDate.cannot.be.before.office.activation.date":"Client activation date cannot be a date before the office opening date.", + "error.msg.client.duplicate.externalId":"A client with external id is already exists.", + "error.msg.client.duplicate.accountNo":"A client with account no is already exists.", + "error.msg.client.id.invalid":"Client does not exist.", + "error.msg.client.not.active.exception":"The Client is not active.", + + "validation.msg.clientIdentifier.documentKey.cannot.be.blank":"Identification # is mandatory.", + "validation.msg.clientIdentifier.documentTypeId.cannot.be.blank":"Identity document type is mandatory.", + "error.msg.clientIdentifier.type.duplicate":"Client identity document of type is already exists for this client.", + + "error.msg.image.type.upload":"Only files of type GIF,PNG or JPG are allowed.", + "validation.msg.clientImage.cannot.be.blank":"Please select an image to upload.", + + "validation.msg.note.note.cannot.be.blank":"Note is mandatory.", + "validation.msg.note.note.exceeds.max.length":"The note text is too long.", + + "validation.msg.client.closureDate.cannot.be.blank":"The Closure date cannot be blank.", + "error.msg.client.close.date.cannot.before.loan.closed.date":"The Client closing date cannot be before the closed loan date.", + "error.msg.client.close.loan.non-closed":"Client cannot be closed because of non-closed loans.", + "error.msg.client.close.non-closed.savings.account":"Client cannot be closed because of non-closed savings.", + "error.msg.client.close.date.cannot.before.client.actvation.date":"The Client closing date cannot be before the client activation date.", + "error.msg.client.close.is.under.transfer":"Client under Transfer cannot be closed" } diff --git a/app/scripts/controllers/organization/CreateRoleController.js b/app/scripts/controllers/organization/CreateRoleController.js index 43d7a64a..ba7d7e54 100644 --- a/app/scripts/controllers/organization/CreateRoleController.js +++ b/app/scripts/controllers/organization/CreateRoleController.js @@ -1,6 +1,7 @@ (function(module) { mifosX.controllers = _.extend(module, { CreateRoleController: function(scope, location, resourceFactory) { + scope.formData = {}; scope.submit = function() { resourceFactory.roleResource.save(this.formData, function(data) { location.path("/admin/viewrole/"+data.resourceId); diff --git a/app/scripts/directives/ApiValidationDirective.js b/app/scripts/directives/ApiValidationDirective.js new file mode 100644 index 00000000..c99946d5 --- /dev/null +++ b/app/scripts/directives/ApiValidationDirective.js @@ -0,0 +1,26 @@ +(function(module) { + mifosX.directives = _.extend(module, { + ApiValidationDirective: function($compile) { + return { + restrict: 'E', + require: '?ngmodel', + link: function(scope, elm, attr, ctrl) { + var template = '
'+ + ''+ + ''+ + '
'; + + elm.html('').append($compile(template)(scope)); + } + }; + } + }); +}(mifosX.directives || {})); + +mifosX.ng.application.directive("apiValidate", ['$compile', mifosX.directives.ApiValidationDirective]).run(function($log) { + $log.info("ApiValidationDirective initialized"); +}); \ No newline at end of file diff --git a/app/scripts/mifosXComponents.js b/app/scripts/mifosXComponents.js index dbc1a18e..03c0d0e3 100644 --- a/app/scripts/mifosXComponents.js +++ b/app/scripts/mifosXComponents.js @@ -171,7 +171,8 @@ define(['underscore', 'mifosX'], function() { 'AutofocusDirective', 'SummaryDirective', 'FormValidateDirective', - 'FormSubmitValidateDirective' + 'FormSubmitValidateDirective', + 'ApiValidationDirective' ] }; diff --git a/app/views/accounting/accounting_coa.html b/app/views/accounting/accounting_coa.html index 5df2963a..b88f8214 100644 --- a/app/views/accounting/accounting_coa.html +++ b/app/views/accounting/accounting_coa.html @@ -6,11 +6,7 @@
-
- - - -
+
{{'label.listview' | translate}} {{'label.treeview' | translate}} diff --git a/app/views/accounting/add_acc_rule.html b/app/views/accounting/add_acc_rule.html index 412092cc..a9f943a5 100644 --- a/app/views/accounting/add_acc_rule.html +++ b/app/views/accounting/add_acc_rule.html @@ -5,11 +5,7 @@
  • {{'button.addrule' | translate}}
    • -
    - - - -
    +
    {{ 'label.accounting.rule.title' | translate }} diff --git a/app/views/accounting/createclosure.html b/app/views/accounting/createclosure.html index 157f130f..7dd72a88 100644 --- a/app/views/accounting/createclosure.html +++ b/app/views/accounting/createclosure.html @@ -6,11 +6,7 @@
    -
    - - - -
    + {{ 'label.accounting.closure' | translate }}
    diff --git a/app/views/accounting/createglaccounting.html b/app/views/accounting/createglaccounting.html index 5acff762..d4f58a00 100644 --- a/app/views/accounting/createglaccounting.html +++ b/app/views/accounting/createglaccounting.html @@ -7,11 +7,7 @@
    -
    - - - -
    +
    {{'label.createglaccount' | translate}} diff --git a/app/views/accounting/edit_acc_rule.html b/app/views/accounting/edit_acc_rule.html index 7f2ca580..43a0a784 100644 --- a/app/views/accounting/edit_acc_rule.html +++ b/app/views/accounting/edit_acc_rule.html @@ -7,11 +7,7 @@
  • {{'label.accounting.rule.edit.title' | translate}}
    • -
    - - - -
    +
    {{ 'label.accounting.rule.edit.title' | translate }} diff --git a/app/views/accounting/editglaccounting.html b/app/views/accounting/editglaccounting.html index 3757d6c4..4adc6371 100644 --- a/app/views/accounting/editglaccounting.html +++ b/app/views/accounting/editglaccounting.html @@ -7,11 +7,7 @@
  • {{'label.editglaccount' | translate}}
    • -
    - - - -
    +
    {{'label.editglaccount' | translate}} diff --git a/app/views/accounting/freqposting.html b/app/views/accounting/freqposting.html index 23166335..ce2f3316 100644 --- a/app/views/accounting/freqposting.html +++ b/app/views/accounting/freqposting.html @@ -6,11 +6,7 @@ -
    - - - -
    +
    {{ 'label.journalentry.posting.title' | translate }}
    @@ -65,7 +61,7 @@
    - {{allowDebitEntries}} + {{allowDebitEntries}}  
    @@ -83,7 +79,7 @@
    - +  
    diff --git a/app/views/accounting/journalentry_posting.html b/app/views/accounting/journalentry_posting.html index cb633b9a..fec73fac 100644 --- a/app/views/accounting/journalentry_posting.html +++ b/app/views/accounting/journalentry_posting.html @@ -5,11 +5,7 @@
    -
    - - - -
    +
    {{ 'label.journalentry.posting.title' | translate }}
    diff --git a/app/views/accounttransfers/make_accounttransfer.html b/app/views/accounttransfers/make_accounttransfer.html index 49b8524c..4d189589 100644 --- a/app/views/accounttransfers/make_accounttransfer.html +++ b/app/views/accounttransfers/make_accounttransfer.html @@ -5,6 +5,7 @@
  • {{'legend.heading.account.transfers' | translate}}
    • +
    {{ 'legend.heading.account.transfers' | translate }} @@ -35,7 +36,7 @@
    - @@ -44,7 +45,7 @@
    - @@ -53,7 +54,7 @@
    - @@ -63,7 +64,7 @@
    - @@ -79,7 +80,7 @@
    - +
    diff --git a/app/views/administration/addrole.html b/app/views/administration/addrole.html index fb84e609..0d23b4a4 100644 --- a/app/views/administration/addrole.html +++ b/app/views/administration/addrole.html @@ -7,13 +7,14 @@
    +
    {{'label.addrole' | translate}}
    - +
    @@ -21,7 +22,7 @@
    - +
    - +
    diff --git a/app/views/loans/assignloanofficer.html b/app/views/loans/assignloanofficer.html index b7c4664b..8a667b62 100644 --- a/app/views/loans/assignloanofficer.html +++ b/app/views/loans/assignloanofficer.html @@ -6,19 +6,20 @@
    +
    {{ 'label.assign.loan.officer' | translate }}
    - +
    - +
    diff --git a/app/views/loans/editguarantor.html b/app/views/loans/editguarantor.html index 6ea5c72a..77dfa01a 100644 --- a/app/views/loans/editguarantor.html +++ b/app/views/loans/editguarantor.html @@ -1,10 +1,11 @@ +
    {{'label.guarantor' | translate}}
    - +
    @@ -16,44 +17,44 @@
    - +
    - +
    -
    - +
    +
    - +
    - +
    - +
    - +
    diff --git a/app/views/loans/editloanaccount.html b/app/views/loans/editloanaccount.html index 6068062b..b6050e1e 100644 --- a/app/views/loans/editloanaccount.html +++ b/app/views/loans/editloanaccount.html @@ -1,4 +1,5 @@ +
    {{'form.legend.edit.loan.account' | translate }}
    @@ -13,7 +14,7 @@ - @@ -21,26 +22,26 @@ - - + - - @@ -80,41 +81,40 @@ - + {{loanaccountinfo.currency.displaySymbol}} - - + + - - + - + + @@ -132,50 +132,50 @@ - - - {{formData.displaySymbol}} - + {{loanaccountinfo.currency.displaySymbol}} - - - + + - + - + - + @@ -205,10 +205,10 @@ {{charge.name}},{{charge.currency.displaySymbol}} {{charge.chargeCalculationType.value}} - + {{charge.chargeTimeType.value}} - + @@ -237,8 +237,8 @@ - - + + diff --git a/app/views/loans/editloancharge.html b/app/views/loans/editloancharge.html index c543e528..77f9c9f0 100644 --- a/app/views/loans/editloancharge.html +++ b/app/views/loans/editloancharge.html @@ -6,13 +6,13 @@
    +
    {{ 'label.edit.loan.charge' | translate }} -
    - + Required Field diff --git a/app/views/loans/editloancollateral.html b/app/views/loans/editloancollateral.html index d710c868..21fff063 100644 --- a/app/views/loans/editloancollateral.html +++ b/app/views/loans/editloancollateral.html @@ -7,19 +7,20 @@
    +
    {{ 'label.edit.loan.collateral' | translate }}
    - +
    - +
    diff --git a/app/views/loans/guarantor.html b/app/views/loans/guarantor.html index 38f2f87b..2a0d6eb6 100644 --- a/app/views/loans/guarantor.html +++ b/app/views/loans/guarantor.html @@ -1,4 +1,5 @@ +
    {{'label.guarantor' | translate}}
    @@ -18,7 +19,7 @@
    -
    @@ -28,7 +29,7 @@
    -
    @@ -42,44 +43,44 @@
    - +
    - +
    -
    - +
    +
    - +
    - +
    - +
    - +
    diff --git a/app/views/loans/loanaccountactions.html b/app/views/loans/loanaccountactions.html index 14f6ce55..6df046e3 100644 --- a/app/views/loans/loanaccountactions.html +++ b/app/views/loans/loanaccountactions.html @@ -5,6 +5,7 @@
  • {{action}}
    • +
    {{ title | translate}} @@ -12,14 +13,14 @@
    - +
    - +
    @@ -28,7 +29,7 @@
    - +
    @@ -44,31 +45,31 @@
    - +
    - +
    - +
    - +
    - +
    @@ -77,7 +78,7 @@
    - +
    @@ -94,4 +95,4 @@
    -
    +
    \ No newline at end of file diff --git a/app/views/loans/newjlgloanaccount.html b/app/views/loans/newjlgloanaccount.html index 60c3dc80..3ec579cb 100644 --- a/app/views/loans/newjlgloanaccount.html +++ b/app/views/loans/newjlgloanaccount.html @@ -1,4 +1,5 @@
    +
    {{ 'form.legend.new.jlg.loan.application' | translate }}
    @@ -11,7 +12,7 @@ - @@ -61,25 +62,25 @@ - - + - - @@ -119,33 +120,33 @@ - + - - + + - + - - + + - - + + @@ -165,50 +166,50 @@ - - - {{formData.displaySymbol}} - + {{loanaccountinfo.currency.displaySymbol}} - - - + + - + - + - + @@ -239,10 +240,10 @@ {{charge.name}},{{charge.currency.displaySymbol}} {{charge.chargeCalculationType.value}} - + {{charge.chargeTimeType.value}} - + @@ -271,8 +272,8 @@ - - + + diff --git a/app/views/loans/newloanaccount.html b/app/views/loans/newloanaccount.html index 07ca2216..990f1e9d 100644 --- a/app/views/loans/newloanaccount.html +++ b/app/views/loans/newloanaccount.html @@ -6,11 +6,7 @@
  • {{'label.loan.application' | translate}}
    • -
    - - - -
    +
    {{ 'form.legend.new.loan.application' | translate }} @@ -26,7 +22,7 @@ - @@ -40,7 +36,7 @@ - @@ -53,12 +49,13 @@ - + - @@ -104,29 +101,29 @@ - - + + - - + - + + + + + {{loanaccountinfo.currency.displaySymbol}} - - - + + - + - + - + @@ -223,10 +220,10 @@ {{charge.name}},{{charge.currency.displaySymbol}} {{charge.chargeCalculationType.value}} - + {{charge.chargeTimeType.value}} - + @@ -255,8 +252,8 @@ - - + + diff --git a/app/views/organization/bulkloan.html b/app/views/organization/bulkloan.html index 12271486..37ce520a 100644 --- a/app/views/organization/bulkloan.html +++ b/app/views/organization/bulkloan.html @@ -5,6 +5,7 @@
    +
    {{'label.bulkloanreassignment' | translate}} @@ -25,7 +26,7 @@
    - +
    @@ -35,7 +36,7 @@
    -
    @@ -45,7 +46,7 @@
    -
    diff --git a/app/views/organization/createemployee.html b/app/views/organization/createemployee.html index fe31cf68..0b176d2d 100644 --- a/app/views/organization/createemployee.html +++ b/app/views/organization/createemployee.html @@ -6,13 +6,14 @@
    +
    {{'label.createemployee' | translate}}
    -
    diff --git a/app/views/organization/createholiday.html b/app/views/organization/createholiday.html index f74d8c48..0a968c2f 100644 --- a/app/views/organization/createholiday.html +++ b/app/views/organization/createholiday.html @@ -6,6 +6,7 @@
    +
    {{'label.createholiday' | translate}}
    @@ -14,7 +15,7 @@
    - +
    @@ -25,7 +26,7 @@
    - @@ -40,12 +41,12 @@
    - +
    - +
    @@ -57,7 +58,7 @@
    - +
    @@ -67,7 +68,7 @@
    - +
    diff --git a/app/views/organization/createoffice.html b/app/views/organization/createoffice.html index 91067dc7..0c7c4739 100644 --- a/app/views/organization/createoffice.html +++ b/app/views/organization/createoffice.html @@ -6,6 +6,7 @@
    +
    {{'label.createoffice' | translate}}
    @@ -14,7 +15,7 @@
    - +
    @@ -25,7 +26,7 @@
    - +
    @@ -35,7 +36,7 @@
    - +
    @@ -45,7 +46,7 @@
    - +
    diff --git a/app/views/organization/editemployee.html b/app/views/organization/editemployee.html index d7e52867..fcf9901a 100644 --- a/app/views/organization/editemployee.html +++ b/app/views/organization/editemployee.html @@ -8,13 +8,14 @@ +
    {{'label.editemployee' | translate}}
    -
    diff --git a/app/views/organization/editoffice.html b/app/views/organization/editoffice.html index cb03fc56..4791310b 100644 --- a/app/views/organization/editoffice.html +++ b/app/views/organization/editoffice.html @@ -6,6 +6,7 @@ +
    @@ -13,7 +14,7 @@
    - +
    @@ -24,7 +25,7 @@
    - +
    @@ -34,7 +35,7 @@
    - +
    diff --git a/app/views/products/createcharge.html b/app/views/products/createcharge.html index 17e9cdce..7a95582a 100644 --- a/app/views/products/createcharge.html +++ b/app/views/products/createcharge.html @@ -1,9 +1,10 @@ +
    - @@ -21,7 +22,7 @@
    - @@ -31,7 +32,8 @@
    - + @@ -40,7 +42,7 @@
    - @@ -49,7 +51,7 @@
    - @@ -58,7 +60,7 @@
    - +
    diff --git a/app/views/products/createloanproduct.html b/app/views/products/createloanproduct.html index b75dfb6f..15833eb5 100644 --- a/app/views/products/createloanproduct.html +++ b/app/views/products/createloanproduct.html @@ -6,6 +6,7 @@
    +
    @@ -17,7 +18,7 @@ @@ -44,11 +45,11 @@ @@ -78,18 +79,18 @@ @@ -102,13 +103,13 @@ @@ -132,13 +133,13 @@ @@ -159,8 +160,8 @@ @@ -171,16 +172,16 @@ @@ -215,38 +216,38 @@ @@ -383,7 +384,7 @@ @@ -447,12 +448,12 @@ @@ -480,12 +481,12 @@ @@ -513,12 +514,12 @@ diff --git a/app/views/products/createsavingproduct.html b/app/views/products/createsavingproduct.html index 1fbbe922..310d1e2b 100644 --- a/app/views/products/createsavingproduct.html +++ b/app/views/products/createsavingproduct.html @@ -6,6 +6,7 @@ +
    - + @@ -34,7 +35,7 @@
    -
    - + - +
    - - +
    - +
    -   +   -   +   - +
    -   +   -    +    - +
    -   -   +
    -   +   -   +   - + -
    - -
    - - + {{formData.principalCurrencyCode}}
    - @@ -263,7 +264,7 @@
    -   +   -   +  
    - +
    @@ -278,7 +279,7 @@     		- @@ -345,14 +346,14 @@
    -
    - @@ -361,7 +362,7 @@
    - @@ -375,7 +376,7 @@
    -
    - @@ -392,7 +393,7 @@
    - @@ -406,14 +407,14 @@
    -
    -
    - -
    - -
    - -
    @@ -17,7 +18,7 @@ @@ -81,7 +82,7 @@ @@ -89,12 +90,12 @@ @@ -111,7 +112,7 @@ @@ -119,8 +120,8 @@ @@ -128,7 +129,7 @@ @@ -210,7 +211,7 @@ @@ -225,14 +226,14 @@ @@ -265,7 +266,7 @@ @@ -343,12 +344,12 @@ @@ -376,12 +377,12 @@ @@ -402,7 +403,4 @@ - - - - + \ No newline at end of file diff --git a/app/views/products/editcharge.html b/app/views/products/editcharge.html index aff1d1cf..987379c8 100644 --- a/app/views/products/editcharge.html +++ b/app/views/products/editcharge.html @@ -1,8 +1,9 @@
    +
    -
    @@ -20,28 +21,28 @@
    -
    -
    -
    -
    diff --git a/app/views/products/editloanproduct.html b/app/views/products/editloanproduct.html index 7fa4a5be..2edaf13d 100644 --- a/app/views/products/editloanproduct.html +++ b/app/views/products/editloanproduct.html @@ -7,6 +7,7 @@
  • {{'label.editloanproduct' | translate}}
    • +
    - + @@ -26,7 +27,7 @@
    - + @@ -50,30 +51,30 @@
    - - +
    - + - +
    -
    -
    - -
    - +
    -   -   +
    - +
    -
    -
    - @@ -249,7 +250,7 @@
    -
    - @@ -274,7 +275,7 @@
    - @@ -310,12 +311,12 @@
    - -
    - -
    - -
    @@ -19,7 +20,7 @@ @@ -36,7 +37,7 @@ @@ -46,18 +47,18 @@ @@ -80,18 +81,18 @@ @@ -104,13 +105,13 @@ @@ -134,13 +135,13 @@ @@ -161,8 +162,8 @@ @@ -173,16 +174,16 @@ @@ -217,39 +218,39 @@ @@ -56,7 +57,7 @@ @@ -101,12 +102,12 @@ @@ -143,9 +144,9 @@ - + - {{charge.feeOnMonthDay}} + {{charge.feeOnMonthDay}} diff --git a/app/views/savings/new_saving_account_application.html b/app/views/savings/new_saving_account_application.html index 9825ecd3..72b5c708 100644 --- a/app/views/savings/new_saving_account_application.html +++ b/app/views/savings/new_saving_account_application.html @@ -7,6 +7,7 @@
  • {{'label.saving.application' | translate}}
    • +
    {{ 'label.saving.application' | translate }} @@ -20,7 +21,7 @@
    @@ -31,13 +32,13 @@ @@ -60,7 +61,7 @@ @@ -105,12 +106,12 @@ @@ -147,9 +148,9 @@ - + - + diff --git a/app/views/savings/saving_account_actions.html b/app/views/savings/saving_account_actions.html index cd8e8681..aa303617 100644 --- a/app/views/savings/saving_account_actions.html +++ b/app/views/savings/saving_account_actions.html @@ -6,13 +6,14 @@ +
    {{ title | translate}}
    - +
    @@ -20,14 +21,14 @@
    - +
    -
    @@ -45,31 +46,31 @@
    - +
    - +
    - +
    - +
    - +
    @@ -77,7 +78,7 @@
    - + Required Field @@ -88,14 +89,14 @@
    - +
    - +
    diff --git a/app/views/system/addcode.html b/app/views/system/addcode.html index f20553f2..079dacc5 100644 --- a/app/views/system/addcode.html +++ b/app/views/system/addcode.html @@ -6,6 +6,7 @@
    +
    {{'label.addcode' | translate}}
    diff --git a/app/views/system/createdatatable.html b/app/views/system/createdatatable.html index 689e561a..ae28b1d7 100644 --- a/app/views/system/createdatatable.html +++ b/app/views/system/createdatatable.html @@ -6,19 +6,20 @@
    +
    {{ 'label.create.datatable' | translate }}
    - +
    - diff --git a/app/views/system/createreport.html b/app/views/system/createreport.html index 79dc1f3d..266a7253 100644 --- a/app/views/system/createreport.html +++ b/app/views/system/createreport.html @@ -6,6 +6,7 @@
    +
    - + @@ -28,7 +29,7 @@
    - +
    -
    - + - +
    - - +
    - +
    -   +   -   +   - +
    -   +   -    +    - +
    -   -   +
    -   +   -   +   - + -
    - -
    - {{formData.displaySymbol}} - + {{formData.principalCurrencyCode}}
    - @@ -266,7 +267,7 @@ @@ -347,14 +348,14 @@ @@ -385,7 +386,7 @@ @@ -477,12 +478,12 @@ @@ -510,12 +511,12 @@ diff --git a/app/views/products/editsavingproduct.html b/app/views/products/editsavingproduct.html index f2875f8e..a19eb2f8 100644 --- a/app/views/products/editsavingproduct.html +++ b/app/views/products/editsavingproduct.html @@ -8,6 +8,7 @@ +
    -   +   -   +  
    - +
    -
    - @@ -363,7 +364,7 @@
    - @@ -377,7 +378,7 @@
    -
    - @@ -394,7 +395,7 @@
    - @@ -408,7 +409,7 @@
    - @@ -444,12 +445,12 @@
    - -
    - -
    - -
    @@ -19,7 +20,7 @@ @@ -83,7 +84,7 @@ @@ -91,12 +92,12 @@ @@ -113,7 +114,7 @@ @@ -121,8 +122,8 @@ @@ -130,7 +131,7 @@ @@ -212,7 +213,7 @@ @@ -227,14 +228,14 @@ @@ -267,7 +268,7 @@ @@ -345,12 +346,12 @@ @@ -378,12 +379,12 @@ @@ -405,7 +406,4 @@ - - - - + \ No newline at end of file diff --git a/app/views/products/productmix/addproductmix.html b/app/views/products/productmix/addproductmix.html index ae334470..8013d406 100644 --- a/app/views/products/productmix/addproductmix.html +++ b/app/views/products/productmix/addproductmix.html @@ -1,10 +1,11 @@ +
    {{'label.addproductmix' | translate}}
    - @@ -35,6 +36,4 @@
    - - - + \ No newline at end of file diff --git a/app/views/products/productmix/editproductmix.html b/app/views/products/productmix/editproductmix.html index 5f1742e8..c406a915 100644 --- a/app/views/products/productmix/editproductmix.html +++ b/app/views/products/productmix/editproductmix.html @@ -1,4 +1,5 @@ +

    {{ 'label.editproductmix' | translate }}

    @@ -25,4 +26,4 @@
    - + \ No newline at end of file diff --git a/app/views/reports/run_reports.html b/app/views/reports/run_reports.html index 17118a9c..8b9195ce 100644 --- a/app/views/reports/run_reports.html +++ b/app/views/reports/run_reports.html @@ -1,4 +1,5 @@
    +

    {{reportName}} 

    @@ -8,7 +9,7 @@
    - @@ -17,7 +18,7 @@
    - +
    diff --git a/app/views/savings/addnewsavingscharge.html b/app/views/savings/addnewsavingscharge.html index 6461c33a..db76b828 100644 --- a/app/views/savings/addnewsavingscharge.html +++ b/app/views/savings/addnewsavingscharge.html @@ -4,12 +4,12 @@
    +
    -
    - @@ -20,7 +20,7 @@
    - + Required Field @@ -32,7 +32,7 @@
    -
    @@ -40,7 +40,7 @@
    -
    @@ -48,7 +48,7 @@
    - +
    diff --git a/app/views/savings/edit_saving_account_application.html b/app/views/savings/edit_saving_account_application.html index 88b9c7cb..8e30ef5d 100644 --- a/app/views/savings/edit_saving_account_application.html +++ b/app/views/savings/edit_saving_account_application.html @@ -5,6 +5,7 @@
  • {{'label.edit.saving.application' | translate}}
    • +
    {{ 'label.edit.saving.application' | translate }} @@ -18,7 +19,7 @@
    - + @@ -28,7 +29,7 @@
    - + @@ -52,30 +53,30 @@
    - - +
    - + - +
    -
    -
    - -
    - +
    -   -   +
    - +
    -
    -
    - @@ -251,7 +252,7 @@
    -
    - @@ -276,7 +277,7 @@
    - @@ -312,12 +313,12 @@
    - -
    - -
    - -
    - +
    @@ -27,13 +28,13 @@
    - - +
    - + @@ -67,24 +68,24 @@
    - -
    - -
    - + -   -   +
    {{charge.name}},{{charge.currency.displaySymbol}} {{charge.chargeCalculationType.value}} {{charge.chargeTimeType.value}}
    -
    - - +
    - + @@ -71,24 +72,24 @@
    - -
    - -
    - + -   -   +
    {{charge.name}},{{charge.currency.displaySymbol}} {{charge.chargeCalculationType.value}} {{charge.chargeTimeType.value}}
    @@ -17,17 +18,17 @@ @@ -35,7 +36,7 @@ @@ -49,7 +50,7 @@ @@ -71,7 +72,7 @@
    - + - -
    - +
    - +
    - + diff --git a/app/views/system/editcode.html b/app/views/system/editcode.html index c59bcccb..bbfa0ad5 100644 --- a/app/views/system/editcode.html +++ b/app/views/system/editcode.html @@ -7,6 +7,7 @@
  • {{'label.editcode' | translate}}
    • +

    {{'label.editcode' | translate}}

       @@ -26,4 +27,4 @@

    {{ 'error.delete.failed' | translate }}

    - \ No newline at end of file + diff --git a/app/views/system/editdatatable.html b/app/views/system/editdatatable.html index ff83ccf2..4a0784f3 100644 --- a/app/views/system/editdatatable.html +++ b/app/views/system/editdatatable.html @@ -8,19 +8,19 @@
    - +
    {{ 'label.edit.datatable' | translate }}
    - +
    - diff --git a/app/views/system/editreport.html b/app/views/system/editreport.html index 3dd9f67b..0914ff0b 100644 --- a/app/views/system/editreport.html +++ b/app/views/system/editreport.html @@ -6,6 +6,7 @@
    +
    @@ -17,12 +18,12 @@ @@ -80,4 +81,4 @@ - + \ No newline at end of file diff --git a/app/views/templates/edittemplate.html b/app/views/templates/edittemplate.html index c05748de..b476e49e 100644 --- a/app/views/templates/edittemplate.html +++ b/app/views/templates/edittemplate.html @@ -6,6 +6,7 @@
  • {{'label.edittemplate' | translate}}
    • +
    @@ -15,17 +16,17 @@
    - + - diff --git a/app/views/system/editschedulerjob.html b/app/views/system/editschedulerjob.html index 95cbf549..b731fd0d 100644 --- a/app/views/system/editschedulerjob.html +++ b/app/views/system/editschedulerjob.html @@ -7,19 +7,20 @@
  • {{'label.editschedulerjob' | translate}}
    • +
    - +
    - +
    diff --git a/app/views/system/makedatatableentry.html b/app/views/system/makedatatableentry.html index 1d5f3bac..a1cdb92f 100644 --- a/app/views/system/makedatatableentry.html +++ b/app/views/system/makedatatableentry.html @@ -6,8 +6,8 @@
    - - + +
    diff --git a/app/views/templates/createtemplate.html b/app/views/templates/createtemplate.html index 008fd333..16249fe9 100644 --- a/app/views/templates/createtemplate.html +++ b/app/views/templates/createtemplate.html @@ -5,6 +5,7 @@
    +
    @@ -13,17 +14,17 @@
    - + - +
    - +
    - + - +
    - +