diff --git a/app/global-translations/locale-en.json b/app/global-translations/locale-en.json index 205b4c8d..35ad8a42 100644 --- a/app/global-translations/locale-en.json +++ b/app/global-translations/locale-en.json @@ -65,7 +65,7 @@ "label.editoffice":"Edit Office", "label.createemployee":"Create Employee", "label.managefunds":"Manage Funds", - "label.currencyconfig":"Currecny configuration", + "label.currencyconfig":"Currency configuration", "label.editcurrencyconfig":"Edit Currecny Configuration", "label.charges":"Charges", "label.transactionId":"Transaction Id", @@ -160,7 +160,8 @@ "label.schedulerstatus":"Scheduler Status", "label.jobname":"Job Name:", "label.selectall":"Select all", - "label.cornexpression":"Corn Expression:", + "label.cronexpression":"Cron Expression:", + "label.follow":"Follow:", "label.isactivejob":"Is Active Job:", "label.manageschedulerjobs":"Scheduler Jobs", "label.editschedulerjob":"Edit Scheduler Job", @@ -168,6 +169,8 @@ "table.heading.runstarttime":"Run Start Time", "table.heading.status":"Status", "table.heading.runtype":"Run Type", + "label.filterbyversion":"Filter by Version/Runtype", + "label.schedularjobhistory":"Scheduler Job History", "#view employee":"....", "label.employee.isLoanOfficer":"is Loan Officer?:", @@ -472,6 +475,7 @@ "table.heading.penalty":"Penalty", "label.productname":"Name", "label.createloanproduct":"Create loan prouct", + "label.overpaymentliability":"Over Payment Liability", "label.editloanproduct":"Edit loan prouct", "label.includeinborrowerloancounter":"Include in borrower loan cycle counter", "label.advancedaccountingrules":"Advanced accounting rules", @@ -543,7 +547,7 @@ "label.userreportui":"Use report(UI)", "label.heading.reportdetails":"Report Details", "label.heading.sql":"Sql", - "label.sql":"Sql", + "label.sql":"Sql:", "label.select.allowedParameter":"--Select parameter--", "label.heading.reportparameters":"Report Parameters", "startDateSelect":"Start Date", @@ -772,6 +776,7 @@ "label.addnote":"Add Note", "label.reset":"Reset", "label.addrole":"Add Role", + "table.heading.userreport":"User Report", "label.client":"Client", "label.clients":"Clients", "label.role":"Role", @@ -846,6 +851,7 @@ "label.amount":"Amount", "label.chargepaymentby":"Charge Payment By", "label.editcharge":"Edit Charge", + "label.createcharge":"Create Charge", "label.list.chargetype":"Charge Type:", "label.confirm":"Confirm", "label.unassignstaff":"Unassign Staff", diff --git a/app/scripts/controllers/organization/CurrencyConfigController.js b/app/scripts/controllers/organization/CurrencyConfigController.js index ca4b2326..16b89ab3 100644 --- a/app/scripts/controllers/organization/CurrencyConfigController.js +++ b/app/scripts/controllers/organization/CurrencyConfigController.js @@ -36,14 +36,15 @@ }; scope.submit = function () { - - var currencies = []; + var currencies = []; + var curr = {}; for(var i=0; i < scope.selectedCurrOptions.length; i++){ currencies.push(scope.selectedCurrOptions[i].code); } - resourceFactory.currencyConfigResource.update(currencies , function(data){ - console.log('test'); - }); + curr["currencies"] = currencies; + resourceFactory.currencyConfigResource.upd(curr , function(data){ + route.reload(); + }); }; diff --git a/app/scripts/controllers/organization/EditOfficeController.js b/app/scripts/controllers/organization/EditOfficeController.js index c078f1fd..465cb5c2 100644 --- a/app/scripts/controllers/organization/EditOfficeController.js +++ b/app/scripts/controllers/organization/EditOfficeController.js @@ -3,9 +3,11 @@ EditOfficeController: function(scope, routeParams, resourceFactory, location,dateFilter) { scope.formData = {}; scope.first = {}; - scope.first.date = new Date(); resourceFactory.officeResource.get({officeId: routeParams.id, template: 'true'} , function(data) { - scope.formData = + if(data.openingDate){ + var editDate = dateFilter(data.openingDate,'dd MMMM yyyy'); + scope.first.date = new Date(editDate); } + scope.formData = { name : data.name, externalId : data.externalId diff --git a/app/scripts/controllers/organization/HolController.js b/app/scripts/controllers/organization/HolController.js index 66184035..4f2c55a5 100644 --- a/app/scripts/controllers/organization/HolController.js +++ b/app/scripts/controllers/organization/HolController.js @@ -4,7 +4,7 @@ scope.holidays = []; scope.offices = []; scope.formData={officeId:1}; - resourceFactory.holResource.getAllHols({officeId:1},function(data){ + resourceFactory.holResource.getAllHols({officeId:scope.formData.officeId},function(data){ scope.holidays = data; }); resourceFactory.officeResource.getAllOffices(function(data){ diff --git a/app/scripts/controllers/organization/ManageFundsController.js b/app/scripts/controllers/organization/ManageFundsController.js index 87508acb..82257812 100644 --- a/app/scripts/controllers/organization/ManageFundsController.js +++ b/app/scripts/controllers/organization/ManageFundsController.js @@ -6,11 +6,7 @@ scope.funds = data; }); - scope.deleteFund = function (id){ - resourceFactory.fundsResource.delete({'fundId':id}); - }; - - scope.addFund = function (){ + scope.addFund = function (){ if(scope.newfund != undefined ) { resourceFactory.fundsResource.save({'name':scope.newfund} , function(data){ diff --git a/app/scripts/controllers/product/CreateLoanProductController.js b/app/scripts/controllers/product/CreateLoanProductController.js index 224ea458..8ea44a7d 100644 --- a/app/scripts/controllers/product/CreateLoanProductController.js +++ b/app/scripts/controllers/product/CreateLoanProductController.js @@ -9,13 +9,12 @@ scope.penaltySpecificIncomeaccounts = []; scope.configureFundOption = {}; scope.date = {}; - scope.date.first = new Date(); - scope.date.second = new Date(); resourceFactory.loanProductResource.get({resourceType:'template'}, function(data) { scope.product = data; scope.assetAccountOptions = scope.product.accountingMappingOptions.assetAccountOptions; scope.incomeAccountOptions = scope.product.accountingMappingOptions.incomeAccountOptions; scope.expenseAccountOptions = scope.product.accountingMappingOptions.expenseAccountOptions; + scope.liabilityOptions = data.accountingMappingOptions.liabilityAccountOptions; scope.formData = { currencyCode : scope.product.currencyOptions[0].code, @@ -36,6 +35,7 @@ incomeFromPenaltyAccountId : scope.incomeAccountOptions[2].id, writeOffAccountId : scope.expenseAccountOptions[0].id, accountingRule : '1', + overpaymentLiabilityAccountId : scope.liabilityOptions[0].id } }); diff --git a/app/scripts/controllers/product/EditLoanProductController.js b/app/scripts/controllers/product/EditLoanProductController.js index e4dd39cd..f8515e52 100644 --- a/app/scripts/controllers/product/EditLoanProductController.js +++ b/app/scripts/controllers/product/EditLoanProductController.js @@ -9,14 +9,14 @@ scope.penaltySpecificIncomeaccounts = []; scope.configureFundOption = {}; scope.date = {}; - scope.date.first = new Date(); - scope.date.second = new Date(); resourceFactory.loanProductResource.get({loanProductId : routeParams.id, template:'true'}, function(data) { scope.product = data; scope.assetAccountOptions = scope.product.accountingMappingOptions.assetAccountOptions; scope.incomeAccountOptions = scope.product.accountingMappingOptions.incomeAccountOptions; scope.expenseAccountOptions = scope.product.accountingMappingOptions.expenseAccountOptions; scope.charges = scope.product.charges || []; + if(data.startDate){scope.date.first = new Date(data.startDate);} + if(data.closeDate){scope.date.second = new Date(data.closeDate);} scope.formData = { name : scope.product.name, description : scope.product.description, @@ -46,7 +46,7 @@ graceOnPrincipalPayment : scope.product.graceOnPrincipalPayment, graceOnInterestPayment : scope.product.graceOnInterestPayment, graceOnInterestCharged : scope.product.graceOnInterestCharged, - accountingRule : scope.product.accountingRule.id, + accountingRule : scope.product.accountingRule.id } if(scope.formData.accountingRule == 1){ diff --git a/app/scripts/controllers/system/AuditController.js b/app/scripts/controllers/system/AuditController.js index 908428b7..84a2a85c 100644 --- a/app/scripts/controllers/system/AuditController.js +++ b/app/scripts/controllers/system/AuditController.js @@ -4,10 +4,6 @@ scope.formData = []; scope.isCollapsed = true; scope.date = {}; - scope.date.first = new Date(); - scope.date.second = new Date(); - scope.date.third = new Date(); - scope.date.fourth = new Date(); resourceFactory.auditResource.get({templateResource: 'searchtemplate'} , function(data) { scope.template = data; }); diff --git a/app/scripts/controllers/system/CreateReportController.js b/app/scripts/controllers/system/CreateReportController.js index 4eb03033..685a0a73 100644 --- a/app/scripts/controllers/system/CreateReportController.js +++ b/app/scripts/controllers/system/CreateReportController.js @@ -49,7 +49,7 @@ } this.formData.reportParameters = scope.temp; resourceFactory.reportsResource.save(this.formData,function(data){ - location.path('/viewreport/' + data.resourceId); + location.path('/system/viewreport/' + data.resourceId); }); }; } diff --git a/app/scripts/controllers/system/EditReportController.js b/app/scripts/controllers/system/EditReportController.js index a4634f2a..92f023f1 100644 --- a/app/scripts/controllers/system/EditReportController.js +++ b/app/scripts/controllers/system/EditReportController.js @@ -12,7 +12,7 @@ scope.submit = function() { this.formData.reportParameters = scope.temp; resourceFactory.reportsResource.update({id: routeParams.id}, this.formData,function(data){ - location.path('/viewreport/' + data.resourceId); + location.path('/system/viewreport/' + data.resourceId); }); }; } diff --git a/app/scripts/loader.js b/app/scripts/loader.js index dd2101d9..dd706f3e 100644 --- a/app/scripts/loader.js +++ b/app/scripts/loader.js @@ -26,7 +26,7 @@ 'angularFileUpload': '../bower_components/angularjs-file-upload/angular-file-upload', 'ngSanitize': '../bower_components/angular-sanitize/angular-sanitize', 'angularFileUpload': '../bower_components/angularjs-file-upload/angular-file-upload', - 'ckEditor': '../bower_components/ckeditor/ckeditor', + 'ckEditor': '../bower_components/ckeditor/ckeditor' }, shim: { 'angular': { exports: 'angular' }, @@ -45,7 +45,7 @@ 'angularFileUpload':{deps: ['angular','jquery'],exports:'angularFileUpload'}, 'modified.datepicker':{deps: ['angular']}, 'ngSanitize':{deps:['angular'],exports:'ngSanitize'}, - 'ckEditor':{deps: ['angular','jquery'],exports:'ckEditor'}, + 'ckEditor':{deps:['jquery']}, 'mifosX': { deps: [ 'angular', diff --git a/app/scripts/services/ResourceFactoryProvider.js b/app/scripts/services/ResourceFactoryProvider.js index ab6990aa..667bd8a5 100644 --- a/app/scripts/services/ResourceFactoryProvider.js +++ b/app/scripts/services/ResourceFactoryProvider.js @@ -131,7 +131,8 @@ }), currencyConfigResource: defineResource(apiVer + "/currencies", {}, { get: {method: 'GET', params: {}}, - update: { method: 'PUT'} + update: { method: 'PUT'}, + upd: { method: 'PUT', params:{}, isArray:true} }), userListResource: defineResource(apiVer + "/users/:userId", {userId:'@userId'}, { getAllUsers: {method: 'GET', params: {}, isArray: true}, diff --git a/app/views/administration/global.html b/app/views/administration/global.html index 67ecd1d7..7eb96059 100644 --- a/app/views/administration/global.html +++ b/app/views/administration/global.html @@ -4,6 +4,11 @@
+
+

+ Loading Data  +

+
diff --git a/app/views/administration/makerchecker.html b/app/views/administration/makerchecker.html index 16822222..fa1c8d38 100644 --- a/app/views/administration/makerchecker.html +++ b/app/views/administration/makerchecker.html @@ -1,4 +1,4 @@ - +
\ No newline at end of file diff --git a/app/views/organization/viewemployee.html b/app/views/organization/viewemployee.html index 05fe1933..3b570d1e 100644 --- a/app/views/organization/viewemployee.html +++ b/app/views/organization/viewemployee.html @@ -8,7 +8,7 @@
Edit - Delete +
diff --git a/app/views/products/createloanproduct.html b/app/views/products/createloanproduct.html index b1982086..569c6bde 100644 --- a/app/views/products/createloanproduct.html +++ b/app/views/products/createloanproduct.html @@ -43,16 +43,16 @@ -
- + - +
- + @@ -265,10 +265,6 @@ - - -
@@ -411,11 +407,16 @@ - - +
+ + + + + + diff --git a/app/views/products/editloanproduct.html b/app/views/products/editloanproduct.html index 9f893e22..0ebf058d 100644 --- a/app/views/products/editloanproduct.html +++ b/app/views/products/editloanproduct.html @@ -290,7 +290,6 @@ - @@ -303,7 +302,6 @@ - @@ -529,7 +527,7 @@
- + Cancel
diff --git a/app/views/products/productmix/productmix.html b/app/views/products/productmix/productmix.html index 9a3988bc..bc731bf1 100644 --- a/app/views/products/productmix/productmix.html +++ b/app/views/products/productmix/productmix.html @@ -7,21 +7,16 @@
-
{{'table.heading.collectedon' | translate}} {{'table.heading.date' | translate}} {{'table.heading.actions' | translate}}
{{charge.chargeTimeType.value}}
- - - + + + - - - + + +
{{'label.list.productname' | translate}}
{{'label.list.productname' | translate}}
{{productmix.productName}}
{{productmix.productName}}
- -
\ No newline at end of file + diff --git a/app/views/products/viewloanproduct.html b/app/views/products/viewloanproduct.html index 1c628537..52b2bcde 100644 --- a/app/views/products/viewloanproduct.html +++ b/app/views/products/viewloanproduct.html @@ -6,17 +6,13 @@
  • {{loanproduct.name}}
    • -
    -
    -
    -
    - Edit - Delete -
    -
    -
    - {{loanproduct.name}} +
    +
    + Edit +
    +
    + {{loanproduct.name}}
    diff --git a/app/views/products/viewsavingproduct.html b/app/views/products/viewsavingproduct.html index acab40a1..8861e3dd 100644 --- a/app/views/products/viewsavingproduct.html +++ b/app/views/products/viewsavingproduct.html @@ -7,13 +7,12 @@
  • {{savingproduct.name}}
    • -
    -
    -
    - Edit -
    -
    +
    +
    + Edit +
    +
    {{savingproduct.name}} diff --git a/app/views/system/audit.html b/app/views/system/audit.html index c0e299e8..9320c099 100644 --- a/app/views/system/audit.html +++ b/app/views/system/audit.html @@ -1,4 +1,8 @@
    +
    {{'label.searchoptions' | translate}} @@ -14,21 +18,21 @@
    - +
    - +
    @@ -75,12 +79,12 @@
    - +
    - +
    diff --git a/app/views/system/editdatatable.html b/app/views/system/editdatatable.html index 5f6ffb61..ddb40d5f 100644 --- a/app/views/system/editdatatable.html +++ b/app/views/system/editdatatable.html @@ -11,13 +11,13 @@
    {{ 'label.edit.datatable' | translate }}
    - +
    - +
    @@ -47,7 +41,7 @@
    - - + +
    \ No newline at end of file diff --git a/app/views/system/viewaudit.html b/app/views/system/viewaudit.html index 3b37ec70..353038fa 100644 --- a/app/views/system/viewaudit.html +++ b/app/views/system/viewaudit.html @@ -1,6 +1,8 @@

    {{'label.viewauditentry' | translate}}

    diff --git a/app/views/system/viewcode.html b/app/views/system/viewcode.html index 04bed1a2..27415028 100644 --- a/app/views/system/viewcode.html +++ b/app/views/system/viewcode.html @@ -20,7 +20,7 @@ - + diff --git a/app/views/system/viewdatatable.html b/app/views/system/viewdatatable.html index 0e0cbfb6..4b437348 100644 --- a/app/views/system/viewdatatable.html +++ b/app/views/system/viewdatatable.html @@ -7,16 +7,13 @@
  • {{datatable.registeredTableName}}
    • -
    + - -
    {{datatable.registeredTableName}} {{'label.associatedwith' | translate}}  {{datatable.applicationTableName}}
    {{ 'label.name1' | translate }}{{ 'label.form.name' | translate }} {{ 'label.position' | translate }}
    diff --git a/app/views/system/viewreport.html b/app/views/system/viewreport.html index 1ffff211..f2c43c11 100644 --- a/app/views/system/viewreport.html +++ b/app/views/system/viewreport.html @@ -5,14 +5,13 @@
  • {{'label.managereports' | translate}} /
  • {{report.reportName}}
    • -
    -
    - Edit - Delete -
    -
    - +
    +
    + Edit + Delete +
    +

    {{report.reportName}}

    @@ -36,7 +35,7 @@ -
    {{ 'label.usereport' | translate }} {{report.useReport}}
    +
    \ No newline at end of file diff --git a/app/views/system/viewschedulerjob.html b/app/views/system/viewschedulerjob.html index 813cccf1..5cd68fb2 100644 --- a/app/views/system/viewschedulerjob.html +++ b/app/views/system/viewschedulerjob.html @@ -21,7 +21,7 @@ {{job.displayName}} - {{ 'label.cornexpression' | translate }} + {{ 'label.cronexpression' | translate }} {{job.cronExpression}} @@ -29,7 +29,8 @@ {{job.active}} - Follow "http://www.cronmaker.com" to generate cron expression + {{ 'label.follow' | translate }} + click here to generate cron expression diff --git a/app/views/system/viewschedulerjobhistory.html b/app/views/system/viewschedulerjobhistory.html index 84640029..1040a9fe 100644 --- a/app/views/system/viewschedulerjobhistory.html +++ b/app/views/system/viewschedulerjobhistory.html @@ -1,5 +1,10 @@
    - + + diff --git a/bower.json b/bower.json index d2a61b50..2a6cb279 100644 --- a/bower.json +++ b/bower.json @@ -23,7 +23,8 @@ "d3": "3.3.3", "nvd3": "1.1.10-beta", "angularjs-file-upload":"0.1.4", - "angular-sanitize":"v1.0.8" + "angular-sanitize":"v1.0.8", + "ckeditor":"" }, "devDependencies": { "jasmine": "1.3.1"