From 0fcadc2a359badfddb32db845c981f3cc12664e5 Mon Sep 17 00:00:00 2001 From: Madhukar Date: Wed, 23 Apr 2014 15:53:01 +0530 Subject: [PATCH] UI Alignment fixes --- app/global-translations/locale-en.json | 14 ++ .../groups/EditMeetingController.js | 10 +- .../system/DataTableEntryController.js | 15 +++ app/styles/app.css | 2 +- app/styles/bootstrap-ext.css | 1 + app/views/administration/roles.html | 5 +- app/views/centers/closecenter.html | 19 +-- app/views/centers/viewcenter.html | 2 +- .../clients/addclientidentifierdocument.html | 4 +- app/views/clients/editclient.html | 1 - app/views/groups/closegroup.html | 15 ++- app/views/groups/editmeeting.html | 31 ++--- app/views/groups/transferclients.html | 2 +- app/views/groups/viewgroup.html | 10 +- app/views/loans/addloandocument.html | 4 +- app/views/loans/editloanaccount.html | 56 ++++---- app/views/loans/newloanaccount.html | 38 +++--- app/views/organization/createholiday.html | 37 +++-- app/views/private/home_superuser.html | 8 +- app/views/products/createloanproduct.html | 8 +- .../products/productmix/editproductmix.html | 3 +- app/views/products/productmix/productmix.html | 7 +- .../products/productmix/viewproductmix.html | 21 +-- app/views/search/advsearch.html | 2 +- app/views/system/audit.html | 127 +++++++----------- app/views/system/codes.html | 8 +- app/views/system/createdatatable.html | 34 ++--- app/views/system/createreport.html | 89 ++++++------ app/views/system/editdatatable.html | 42 +++--- app/views/system/editreport.html | 89 ++++++------ app/views/system/viewdatatableentry.html | 30 ++--- app/views/templates/createtemplate.html | 61 +++++---- app/views/templates/edittemplate.html | 32 ++--- app/views/templates/templates.html | 4 +- 34 files changed, 429 insertions(+), 402 deletions(-) diff --git a/app/global-translations/locale-en.json b/app/global-translations/locale-en.json index 182db7b3..c4ed1d4e 100755 --- a/app/global-translations/locale-en.json +++ b/app/global-translations/locale-en.json @@ -244,6 +244,7 @@ "error.msg.invalid.recurring.rule": "The calendar recurring rule : `{{params[0].value}}` is not valid.", "error.msg.recurring.rule.parsing.error": "Error in parsing the Recurring Rule value: `{{params[0].value}}`", "error.msg.calendar.loan.actual.disbursement.date.not.valid.recurring.date": "Actual disbursement date `{{params[0].value}}` does not fall on a meeting date.", + "error.msg.calendar.collectionsheet.not.valid.recurring.date":"Selected calendar date is not a valid recurrence date", "validation.msg.loan.calendarId.not.greater.than.zero": "Meeting Calendar is mandatory.", "validation.msg.collectionsheet.groupId.not.greater.than.zero": "Group is mandatory to generate collection sheet.", "validation.msg.collectionsheet.dueDate.cannot.be.blank": "Date of transaction is mandatory to generate collection sheet.", @@ -541,11 +542,13 @@ "label.heading.role": "Role", "label.heading.center":"Center", "label.heading.attachmeeting": "Attach Meeting", + "label.heading.editmeeting": "Edit Meeting", "#Menu Links": "..", "label.menu.selectoffice": "Select Office", "label.menu.selectstaff": "Select Staff", "label.menu.selectgroup": "Select Group", + "label.menu.gender": "Select Gender", "#Anchors": "..", "label.anchor.groups": "Groups", @@ -637,6 +640,7 @@ "error.msg.center.activate.date.cannot.be.before.office.activation.date": "The center activation date cannot be before the office activation date.", "error.msg.center.not.active.exception": "The Center with id `{{params[0].value}}` is not active.", "error.msg.Center.close.active.groups.exist":"Cannot close. Active groups exists", + "validation.msg.calendar.cannot.be.before.centers.activation.date":"Meeting date cannot be before center activation date", "------------": "------------", @@ -1555,6 +1559,7 @@ "validation.msg.savingsaccount.lockinPeriodFrequency.cannot.be.blank": "Locked in for frequency is mandatory.", "validation.msg.savingsaccount.lockinPeriodFrequency.not.greater.than.zero": "Locked in for frequency must be greater than zero if provided.", "validation.msg.savingsaccount.lockinPeriodFrequencyType.cannot.be.blank": "Locked in for period type is mandatory.", + "validation.msg.savingsaccountPAY_CHARGE.results.in.balance.going.negative": "Insufficient balance to pay savings charge.", "error.msg.product.savings.invalid.lockin.settings": "Lock-in settings are invalid.", "validation.msg.savingsaccount.close.results.in.balance.not.zero": " for closing savings account, balance must be zero.", "validation.msg.savingsaccount.closedOnDate.cannot.be.blank": "Close date is mandatory.", @@ -1787,6 +1792,7 @@ "error.msg.holiday.duplicate.name": "holiday name `{{params[0].value}}` already exists.", "error.msg.holiday.repayments.rescheduled.date.should.be.before.from.date.or.after.to.date": "Repayments rescheduled to date should be before from date or after to date.", "error.msg.holiday.repayments.rescheduled.date.should.not.fall.on.non.working.day": "Repayments rescheduled to date should not fall on non working days.", + "validation.msg.holiday.offices.cannot.be.blank":"Please select atleast one office", "--------------": "------------", @@ -2091,6 +2097,8 @@ "label.anchor.editloanproduct": "Edit Loan Product", "label.anchor.editsavingproduct": "Edit Saving Product", "label.anchor.productsmix": "Products Mix", + "label.anchor.productmix": "Product Mix", + "label.anchor.viewproductmix": "View Product Mix", "label.anchor.fixeddepositproducts": "Fixed Deposit Products", "label.anchor.interestratechartviewedit":"View / Edit Interest Rate Charts", "label.anchor.interestratecharts":"Interest Rate Charts", @@ -2596,6 +2604,12 @@ "reportsall":"Reports", "loanscreenreport":"Loan Screen Report", "clientscreenreport":"Client Screen Report", + "createstandinginstructionfromsavings":"Create Standing Instruction", + "liststandinginstructions":"View Standing Instructions", + "viewstandinginstruction":"View Standing Instruction", + "listaccounttransactions":"View Account Transactions", + "editstandinginstructionlist":"Edit Standing Instruction", + "new_client_saving_application":"New Saving Application", "-----------------------------":"--------------------", diff --git a/app/scripts/controllers/groups/EditMeetingController.js b/app/scripts/controllers/groups/EditMeetingController.js index fceb8f48..97673aea 100644 --- a/app/scripts/controllers/groups/EditMeetingController.js +++ b/app/scripts/controllers/groups/EditMeetingController.js @@ -15,14 +15,20 @@ {id: 3, value: "monthly"}, {id: 4, value: "yearly"} ]; - scope.repeatsEveryOptions = ["1", "2", "3"]; + scope.repeatsEveryOptions = [1, 2, 3]; scope.selectedPeriod(scope.calendarData.frequency.id); //to display default in select boxes scope.formData = { repeating: scope.calendarData.repeating, frequency: scope.calendarData.frequency.id, - interval: scope.calendarData.interval + interval: Math.abs(scope.calendarData.interval) } + for(var i in scope.repeatsEveryOptions){ + if (scope.formData.interval == scope.repeatsEveryOptions[i]){ + scope.formData.interval = scope.repeatsEveryOptions[i]; + } + } + console.log(scope.formData); //update interval option for (var i in scope.repeatsEveryOptions) { if (scope.repeatsEveryOptions[i] == scope.calendarData.interval) { diff --git a/app/scripts/controllers/system/DataTableEntryController.js b/app/scripts/controllers/system/DataTableEntryController.js index a3f4a74b..437a2b05 100644 --- a/app/scripts/controllers/system/DataTableEntryController.js +++ b/app/scripts/controllers/system/DataTableEntryController.js @@ -41,6 +41,21 @@ scope.columnHeaders = data.columnHeaders; }); + //return input type + scope.fieldType = function (type) { + var fieldType = ""; + if (type) { + if (type == 'STRING' || type == 'INTEGER' || type == 'TEXT' || type == 'DECIMAL') { + fieldType = 'TEXT'; + } else if (type == 'CODELOOKUP' || type == 'CODEVALUE') { + fieldType = 'SELECT'; + } else if (type == 'DATE') { + fieldType = 'DATE'; + } + } + return fieldType; + }; + scope.editDatatableEntry = function () { scope.isViewMode = false; var colName = scope.columnHeaders[0].columnName; diff --git a/app/styles/app.css b/app/styles/app.css index 95b8c577..b518151f 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -915,7 +915,7 @@ a.no-decorate { padding:15px; margin-left: 70px; height:50px; - width:130px; + width:202px; overflow:hidden; background-color: #555555; z-index: -1; diff --git a/app/styles/bootstrap-ext.css b/app/styles/bootstrap-ext.css index d57f2ce7..0985cd58 100644 --- a/app/styles/bootstrap-ext.css +++ b/app/styles/bootstrap-ext.css @@ -234,3 +234,4 @@ api-validate label { .muted { color: #bbbbbb; } +select[multiple]{min-height: 30px;} \ No newline at end of file diff --git a/app/views/administration/roles.html b/app/views/administration/roles.html index 5e2318e3..05981f46 100644 --- a/app/views/administration/roles.html +++ b/app/views/administration/roles.html @@ -4,11 +4,12 @@
  • {{'label.anchor.viewroles' | translate}}
    • -
    +
    {{'label.button.addrole' | translate}}
    -
    +
    +
    diff --git a/app/views/centers/closecenter.html b/app/views/centers/closecenter.html index 8b1933d4..f48cb6b2 100644 --- a/app/views/centers/closecenter.html +++ b/app/views/centers/closecenter.html @@ -1,26 +1,29 @@ - +

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

    -
    +
    +
    +
    -
    +
    - - +

    -
    - {{ 'label.button.cancel' | translate }} -
    diff --git a/app/views/centers/viewcenter.html b/app/views/centers/viewcenter.html index 56ef7ddb..a08ecb28 100644 --- a/app/views/centers/viewcenter.html +++ b/app/views/centers/viewcenter.html @@ -55,7 +55,7 @@
  • {{ 'label.button.close' | translate }}
    • -
  • +
  • {{ 'label.button.attachmeeting' | translate }}
    • diff --git a/app/views/clients/addclientidentifierdocument.html b/app/views/clients/addclientidentifierdocument.html index 1dc1c3ff..fd9b59fd 100644 --- a/app/views/clients/addclientidentifierdocument.html +++ b/app/views/clients/addclientidentifierdocument.html @@ -17,6 +17,8 @@
    +
    +
    Required Field @@ -30,7 +32,7 @@ class="required">*
    - +
    diff --git a/app/views/clients/editclient.html b/app/views/clients/editclient.html index 50877557..0f83c34e 100644 --- a/app/views/clients/editclient.html +++ b/app/views/clients/editclient.html @@ -143,7 +143,6 @@
    diff --git a/app/views/groups/closegroup.html b/app/views/groups/closegroup.html index ddc6cd9b..c61cbe72 100644 --- a/app/views/groups/closegroup.html +++ b/app/views/groups/closegroup.html @@ -1,24 +1,27 @@ - +

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

    -
    +
    - + +
    -
    +
    +
    +

    - -
    +
    {{ 'label.button.cancel' | translate }}
    + +
    - - - - - -
    - +
    - +
    -
    +
    +
    @@ -296,32 +298,34 @@
    {{'label.heading.name' | translate}}
    - - - - - - - - - - - - - - -
    {{'label.heading.name' | translate}}{{'label.heading.type' | translate}}{{'label.heading.amount' | translate}}{{'label.heading.collectedon' | translate}}
    {{charge.name}},{{charge.currency.displaySymbol}}{{charge.chargeCalculationType.value}}{{charge.amount}}{{charge.chargeTimeType.value}}
    -
    - -    -    - -   + + + + + + + + + + + + + + +
    {{'label.heading.name' | translate}}{{'label.heading.type' | translate}}{{'label.heading.amount' | translate}}{{'label.heading.collectedon' | translate}}
    {{charge.name}},{{charge.currency.displaySymbol}}{{charge.chargeCalculationType.value}}{{charge.amount}}{{charge.chargeTimeType.value}}
    +
    +
    + +    +    + +   +
    diff --git a/app/views/loans/newloanaccount.html b/app/views/loans/newloanaccount.html index ca42a81b..efcd08ef 100644 --- a/app/views/loans/newloanaccount.html +++ b/app/views/loans/newloanaccount.html @@ -264,13 +264,15 @@
    {{'label.heading.name' | translate}}
    - - - +
    + + + +
    @@ -311,16 +313,18 @@
    {{'label.heading.name' | translate}}
    - -    -    - -   +
    + +    +    + +   +
    diff --git a/app/views/organization/createholiday.html b/app/views/organization/createholiday.html index 3ab3975e..b7ade083 100644 --- a/app/views/organization/createholiday.html +++ b/app/views/organization/createholiday.html @@ -21,29 +21,28 @@
    - +
    -
    -
    - +
    + -
    - -
    -
    -
    - - -
    - -
    +
    +
    -
    +
    + + +
    + +
    +
    +
    diff --git a/app/views/private/home_superuser.html b/app/views/private/home_superuser.html index f896c92a..b56e7807 100644 --- a/app/views/private/home_superuser.html +++ b/app/views/private/home_superuser.html @@ -12,8 +12,8 @@ {{'label.heading.recentactivities' | translate}}
    -
    -
    +
    +
    -
    -
    +
    +
    {{'label.heading.name' | translate}} - - - - - +
    + @@ -29,7 +29,7 @@
    + @@ -42,7 +42,7 @@
    +
    @@ -51,7 +51,7 @@
    +
    diff --git a/app/views/products/productmix/editproductmix.html b/app/views/products/productmix/editproductmix.html index cda8a545..a9c53ffe 100644 --- a/app/views/products/productmix/editproductmix.html +++ b/app/views/products/productmix/editproductmix.html @@ -29,8 +29,7 @@

    -
    -
    +
    {{ 'label.button.cancel' | translate }}
    diff --git a/app/views/products/productmix/productmix.html b/app/views/products/productmix/productmix.html index fdbf5d04..1ad7f75f 100644 --- a/app/views/products/productmix/productmix.html +++ b/app/views/products/productmix/productmix.html @@ -1,14 +1,15 @@
    -
    +
    {{'label.button.add' | translate}}
    -
    +
    +
    diff --git a/app/views/products/productmix/viewproductmix.html b/app/views/products/productmix/viewproductmix.html index f3d8e01d..3e787ae7 100644 --- a/app/views/products/productmix/viewproductmix.html +++ b/app/views/products/productmix/viewproductmix.html @@ -1,20 +1,13 @@
    -
    +
    {{ 'label.button.edit' | translate }} @@ -35,7 +28,7 @@
    -
    +
    @@ -44,7 +37,7 @@ - +
    {{allowed.name}}{{allowed.name}}
    @@ -56,7 +49,7 @@
    {{restricted.name}}{{restricted.name}}
    diff --git a/app/views/search/advsearch.html b/app/views/search/advsearch.html index 63cd0092..84691256 100644 --- a/app/views/search/advsearch.html +++ b/app/views/search/advsearch.html @@ -14,7 +14,7 @@  {{'loanStatusType.overpaid' | translate}}
    -  {{'loanStatusType.witharrears' | translate}}
    +  {{'loanStatusType.closed.obligations.met' | translate}}
     {{'loanStatusType.closed.written.off' | translate}}
    diff --git a/app/views/system/audit.html b/app/views/system/audit.html index 5c9ec43b..a631f485 100644 --- a/app/views/system/audit.html +++ b/app/views/system/audit.html @@ -3,95 +3,64 @@
  • {{'label.anchor.system' | translate}}
  • {{'label.anchor.audit' | translate}}
    • -
    +
    + placeholder="{{'label.input.searchbyuser' | translate}}" type="text" ng-model="user" + class="form-control" + typeahead="users.username as users.username for users in template.appUsers | filter:$viewValue | limitTo:8"/> + class="icon-chevron-down"> + class="icon-search icon-white"> -
    +
    -
    -
    -
    - -
    +
    +
    + + + + +
    -
    - -
    - -
    +
    + + + + + + {{'label.button.advancesearch' | translate}}
    -
    - - -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    - - -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    -
    -
    - -
    -
    - {{'label.button.advancesearch' | translate}}
    diff --git a/app/views/system/codes.html b/app/views/system/codes.html index 9a500e89..ab11fc10 100644 --- a/app/views/system/codes.html +++ b/app/views/system/codes.html @@ -3,12 +3,14 @@
  • {{'label.anchor.system' | translate}}
  • {{'label.anchor.managecodes' | translate}}
    • -
    +
    {{ 'label.button.addcode' | - translate }} + translate }} +
    -
    +
    +
    diff --git a/app/views/system/createdatatable.html b/app/views/system/createdatatable.html index 337dba47..29fe24d4 100644 --- a/app/views/system/createdatatable.html +++ b/app/views/system/createdatatable.html @@ -27,7 +27,7 @@
    +
    -
    +
    - -
    + - +
    + @@ -100,7 +100,7 @@
    {{'label.heading.name' | translate}} +
    - - - + - -
    + + - - - - - - - - -
    - - - - @@ -41,39 +45,40 @@
    - + - + +
    + +
    		+ - - + +
    - - - - + + +
    + +
    +
    @@ -81,19 +86,19 @@
    		+
    -
    +
    @@ -105,21 +110,21 @@ - + - - - diff --git a/app/views/system/editdatatable.html b/app/views/system/editdatatable.html index d5371b15..d8345600 100644 --- a/app/views/system/editdatatable.html +++ b/app/views/system/editdatatable.html @@ -24,7 +24,7 @@
       - + @@ -65,23 +65,23 @@
    -
    - -
    + - - + + - {{ 'label.button.add' | translate }} @@ -132,8 +137,8 @@
    {{reportParameter.allowedParameterName | translate}} - + +
    +
    - -
    + - +
    + - - - - - - - + + + + + + + @@ -91,15 +91,15 @@ placeholder="{{'label.input.columnname' | translate}}" ng-readonly="column.originalName"/> - - - - + - - - diff --git a/app/views/system/editreport.html b/app/views/system/editreport.html index b1943200..816a46ea 100644 --- a/app/views/system/editreport.html +++ b/app/views/system/editreport.html @@ -8,32 +8,36 @@
    -
    {{'label.heading.name' | translate}}{{'label.heading.newname' | translate}}{{'label.heading.type' | translate}}{{'label.heading.mandatory' | translate}}{{'label.heading.length' | translate}}{{'label.heading.code' | translate}}{{'label.heading.newcode' | translate}}{{'label.heading.actions' | translate}}{{'label.heading.newname' | translate}}{{'label.heading.type' | translate}}{{'label.heading.mandatory' | translate}}{{'label.heading.length' | translate}}{{'label.heading.code' | translate}}{{'label.heading.newcode' | translate}}{{'label.heading.actions' | translate}}
    + + + + +
    +
    - - - + - -
    + + - - - - - - - - -
    - - - - @@ -41,36 +45,43 @@
    - + - +
    + +
    		+ - - + + +
    + +
    - - + + + +
    + +
    		+ +
    +
    @@ -78,19 +89,19 @@
    		+
    -
    +
    @@ -102,13 +113,13 @@ - + - -
    - -
    + - +
    + @@ -128,7 +139,7 @@ {{ 'label.button.add' | translate }} -
    {{'label.heading.parameter' | translate}} {{'label.heading.parameternamepassedtopentaho' | translate}}
    +
    @@ -136,7 +147,7 @@ - @@ -147,7 +158,7 @@
    {{'label.heading.parameter' | translate}} {{'label.heading.parameternamepassedtopentaho' | translate}}
    {{reportParameter.parameterName | translate}} +
    - {{'label.button.cancel' | translate}} + {{'label.button.cancel' | translate}}
    diff --git a/app/views/system/viewdatatableentry.html b/app/views/system/viewdatatableentry.html index 6e052a63..30be02d7 100644 --- a/app/views/system/viewdatatableentry.html +++ b/app/views/system/viewdatatableentry.html @@ -35,34 +35,26 @@ {{ 'label.heading.datatablename' | translate }}-{{tableName}}
    - +
    - - - - +
    -
    -
    - -
    - -
    -
    +
    {{ 'label.button.cancel' | translate }}
    diff --git a/app/views/templates/createtemplate.html b/app/views/templates/createtemplate.html index 8c21c856..3f2f142e 100644 --- a/app/views/templates/createtemplate.html +++ b/app/views/templates/createtemplate.html @@ -10,59 +10,62 @@
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    -
    -
    - - -
    -
    +
    +
    + + + +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + +
    +
    +
    - +
    - - - - - -
    + + +
    + + + diff --git a/app/views/templates/edittemplate.html b/app/views/templates/edittemplate.html index eb7215e7..4e027e5a 100644 --- a/app/views/templates/edittemplate.html +++ b/app/views/templates/edittemplate.html @@ -9,29 +9,31 @@
    -
    +
    - -
    -
    -
    -
    -
    +
    +
    +
    +
    @@ -41,34 +43,34 @@ - {{mapper}} +
    {{mapper}} - - - - - -
    + + +
    + + + diff --git a/app/views/templates/templates.html b/app/views/templates/templates.html index dc70427e..9eb91291 100644 --- a/app/views/templates/templates.html +++ b/app/views/templates/templates.html @@ -6,10 +6,10 @@ {{ 'label.button.createtemplate' | translate }} - -
    +
    +