From 29de4e84014c1e3fa636f72e95da589dc05d35b0 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 29 Oct 2015 18:24:06 +0530 Subject: [PATCH] MIFOSX-2303 Community App changes --- app/global-translations/locale-en.json | 1 + .../ViewAllProvisoningEntriesController.js | 13 +++-- .../ViewProvisioningEntryController.js | 52 ++++++++++++++++--- .../services/ResourceFactoryProvider.js | 9 +++- .../provisioning/ProvisioningEntries.html | 26 +++++++--- .../provisioning/ViewProvisioningEntry.html | 33 +++++++++++- .../ViewProvisioningJournalEntries.html | 3 +- 7 files changed, 114 insertions(+), 23 deletions(-) diff --git a/app/global-translations/locale-en.json b/app/global-translations/locale-en.json index 96e30740..5ad23c55 100755 --- a/app/global-translations/locale-en.json +++ b/app/global-translations/locale-en.json @@ -1391,6 +1391,7 @@ "label.selectsavingsofficer": "Select Savings Officer", "label.selectliabilitiaccount": "Select liability account", "label.selectexpenseaccount": "Select expense account", + "label.selectprovisioningcategory": "Select Category", "#tool tip for loan products":"..", "label.tooltip.fundsource":"an Asset account(typically Bank or cash) that is debited during repayments/payments an credited using disbursals.", "label.tooltip.loanportfolio":"an Asset account that is debited during disbursement and credited during principal repayment/writeoff.", diff --git a/app/scripts/controllers/accounting/provisioning/ViewAllProvisoningEntriesController.js b/app/scripts/controllers/accounting/provisioning/ViewAllProvisoningEntriesController.js index 241a1693..a849757d 100644 --- a/app/scripts/controllers/accounting/provisioning/ViewAllProvisoningEntriesController.js +++ b/app/scripts/controllers/accounting/provisioning/ViewAllProvisoningEntriesController.js @@ -1,9 +1,6 @@ (function (module) { mifosX.controllers = _.extend(module, { ViewAllProvisoningEntriesController: function (scope, routeParams, paginatorService, resourceFactory, location, $modal) { - resourceFactory.provisioningentries.getAll(function (data) { - scope.entries = data; - }); scope.routeTo = function (id) { location.path('/viewprovisioningentry/' + id); @@ -19,6 +16,10 @@ }); }; + scope.searchTransaction = function () { + scope.entries = paginatorService.paginate(fetchFunction, 10); + }; + var fetchFunction = function (offset, limit, callback) { var params = {}; params.offset = offset; @@ -26,8 +27,12 @@ params.locale = scope.optlang.code; params.dateFormat = scope.df; scope.saveSC(); - resourceFactory.provisioningentries.getAll(params, callback); + resourceFactory.provisioningentries.getAll(params, callback) ; }; + + paginatorService.currentOffset = 0 ; + scope.entries = paginatorService.paginate(fetchFunction, 10); + } diff --git a/app/scripts/controllers/accounting/provisioning/ViewProvisioningEntryController.js b/app/scripts/controllers/accounting/provisioning/ViewProvisioningEntryController.js index b089fc8b..10e9de95 100644 --- a/app/scripts/controllers/accounting/provisioning/ViewProvisioningEntryController.js +++ b/app/scripts/controllers/accounting/provisioning/ViewProvisioningEntryController.js @@ -1,24 +1,60 @@ (function (module) { mifosX.controllers = _.extend(module, { - ViewProvisioningEntryController: function (scope, routeParams, resourceFactory, location, $modal) { + ViewProvisioningEntryController: function (scope, routeParams, paginatorService, resourceFactory, location, $modal) { scope.charge = []; scope.choice = 0; var i = 0 ; var temp = 0 ; scope.totalReservedAmount; + scope.formData = {}; + scope.transactions = []; + + resourceFactory.officeResource.getAllOffices(function (data) { + scope.offices = data; + }); + resourceFactory.loanProductResource.getAllLoanProducts(function (data) { + scope.loanproducts = data; + }) ; + resourceFactory.provisioningcategory.getAll(function (data) { + scope.provisioningcategories = data; + }) ; + + resourceFactory.provisioningentries.get({entryId: routeParams.entryId}, function (data) { scope.data = data ; scope.createdby = data.createdUser ; scope.createdDate = data.createdDate ; - scope.entries = data.provisioningEntries ; + scope.totalReservedAmount = data.reservedAmount ; scope.isjournalEntriesCreated = !data.journalEntry ; - var length = data.provisioningEntries.length; - for(i = 0 ; i < length; i++) { - temp = temp + data.provisioningEntries[i].amountreserved ; - } - scope.totalReservedAmount = temp.toFixed(2) ; }); + scope.searchTransaction = function () { + scope.transactions = paginatorService.paginate(fetchFunction, 10); + }; + + var fetchFunction = function (offset, limit, callback) { + var params = {}; + params.entryId = routeParams.entryId ; + params.offset = offset; + params.limit = limit; + if (scope.formData.officeId) { + params.officeId = scope.formData.officeId; + } + + if (scope.formData.loanproductId) { + params.productId = scope.formData.loanproductId; + } + + if (scope.formData.categoryId) { + params.categoryId = scope.formData.categoryId; + } + scope.saveSC(); + resourceFactory.provisioningentriesSearch.get(params, callback); + }; + + paginatorService.currentOffset = 0 ; + scope.transactions = paginatorService.paginate(fetchFunction, 10); + scope.submit = function () { resourceFactory.provisioningentries.createJournals({entryId: routeParams.entryId}, this.formData, function (data) { location.path('/viewprovisioningentries/'); @@ -26,7 +62,7 @@ }; } }); - mifosX.ng.application.controller('ViewProvisioningEntryController', ['$scope', '$routeParams', 'ResourceFactory', '$location', '$modal', mifosX.controllers.ViewProvisioningEntryController]).run(function ($log) { + mifosX.ng.application.controller('ViewProvisioningEntryController', ['$scope', '$routeParams', 'PaginatorService', 'ResourceFactory', '$location', '$modal', mifosX.controllers.ViewProvisioningEntryController]).run(function ($log) { $log.info("ViewProvisioningEntryController initialized"); }); }(mifosX.controllers || {})); diff --git a/app/scripts/services/ResourceFactoryProvider.js b/app/scripts/services/ResourceFactoryProvider.js index cdbe46c8..9f2bcc46 100755 --- a/app/scripts/services/ResourceFactoryProvider.js +++ b/app/scripts/services/ResourceFactoryProvider.js @@ -524,7 +524,7 @@ }), provisioningentries: defineResource(apiVer + "/provisioningentries/:entryId",{entryId:'@entryId'},{ get: {method: 'GET',params:{}}, - getAll: {method: 'GET',params:{}, isArray : true}, + getAll: {method: 'GET',params:{}}, template: {method: 'GET',params:{}}, post:{method:'POST',params:{}}, put: {method: 'PUT', params: {}}, @@ -534,6 +534,13 @@ }), provisioningjournals: defineResource(apiVer + "/journalentries/provisioning", {}, { get: {method: 'GET', params: {}} + }), + provisioningentriesSearch: defineResource(apiVer + "/provisioningentries/entries", {}, { + get: {method: 'GET', params: {}} + }), + + provisioningcategory: defineResource(apiVer + "/provisioningcategory", {}, { + getAll: {method: 'GET', params: {}, isArray : true} }) }; diff --git a/app/views/accounting/provisioning/ProvisioningEntries.html b/app/views/accounting/provisioning/ProvisioningEntries.html index 11d14116..5665eca8 100644 --- a/app/views/accounting/provisioning/ProvisioningEntries.html +++ b/app/views/accounting/provisioning/ProvisioningEntries.html @@ -3,7 +3,9 @@
  • {{'label.anchor.accounting' | translate}}
  • {{'label.anchor.viewprovisioningeentries' | translate}}
    • - {{'label.button.createprovisioning.entry' | translate}} + {{'label.button.createprovisioning.entry' + | translate}} @@ -16,22 +18,32 @@ - + - + - +
    {{entryObject.createdUser}}{{entryObject.createdDate}}{{entryObject.createdDate}}   - + - + - +
    + \ No newline at end of file diff --git a/app/views/accounting/provisioning/ViewProvisioningEntry.html b/app/views/accounting/provisioning/ViewProvisioningEntry.html index 78682b85..dddd9036 100644 --- a/app/views/accounting/provisioning/ViewProvisioningEntry.html +++ b/app/views/accounting/provisioning/ViewProvisioningEntry.html @@ -13,7 +13,31 @@
    - +
    +
    + +
    +
    + +
    + +
    + +
    + +
    + +
    +
    + +
    @@ -23,7 +47,7 @@ - + @@ -33,6 +57,11 @@
    {{'label.heading.officeName' | translate}} {{'label.heading.productname' | translate}}{{'label.input.liabilityaccount' | translate}} {{'label.input.expenseaccount' | translate}}
    {{provisioningentry.officeName}} {{provisioningentry.productName}} {{provisioningentry.currencyCode}}{{provisioningentry.expenseAccountName}}
    + +
    diff --git a/app/views/accounting/provisioning/ViewProvisioningJournalEntries.html b/app/views/accounting/provisioning/ViewProvisioningJournalEntries.html index b0b87f3f..e7bc3708 100644 --- a/app/views/accounting/provisioning/ViewProvisioningJournalEntries.html +++ b/app/views/accounting/provisioning/ViewProvisioningJournalEntries.html @@ -31,7 +31,8 @@ {{transaction.glAccountType.value}} - + {{transaction.createdByUserName}}