MIFOSX-2303 Community App changes

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.",

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);
+
         }
 
 

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 || {}));

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}
                     })
 
                 };

app/views/accounting/provisioning/ProvisioningEntries.html

@@ -3,7 +3,9 @@
         <li><a href="#/accounting">{{'label.anchor.accounting' | translate}}</a></li>
         <li class="active">{{'label.anchor.viewprovisioningeentries' | translate}}</li>
     </ul>
-    <a href="#/createprovisioningentries" class="btn btn-primary pull-right" has-permission='VIEW_ALL_PROVISIONING_ENTRIES'><i class="icon-plus icon-white"></i>{{'label.button.createprovisioning.entry' | translate}}</a>
+    <a href="#/createprovisioningentries" class="btn btn-primary pull-right"
+       has-permission='VIEW_ALL_PROVISIONING_ENTRIES'><i class="icon-plus icon-white"></i>{{'label.button.createprovisioning.entry'
+        | translate}}</a>
     <table class="table">
         <thead>
         <tr class="graybg">
@@ -16,22 +18,32 @@
         </tr>
         </thead>
         <tbody>
-        <tr class="pointer-main" ng-repeat="entryObject in entries |orderBy:'createdDate' | filter:filterText">
+        <tr class="pointer-main" ng-repeat="entryObject in entries.currentPageItems | filter:filterText">
             <td>{{entryObject.createdUser}}</td>
-            <td >{{entryObject.createdDate}}</td>
+            <td>{{entryObject.createdDate}}</td>
 
-            <td><input type="checkbox" name="name1" ng-model="entryObject.journalEntry" disabled />&nbsp;</td>
+            <td><input type="checkbox" name="name1" ng-model="entryObject.journalEntry" disabled/>&nbsp;</td>
             <td>
-                <input id="viewreport" data-ng-click="routeTo(entryObject.id)" type="submit"  name="viewreport" value="{{'label.button.view' | translate}}" />
+                <input id="viewreport" data-ng-click="routeTo(entryObject.id)" type="submit" name="viewreport"
+                       value="{{'label.button.view' | translate}}"/>
             </td>
             <td>
-                <input id="recreate" data-ng-click="recreate(entryObject.id)" type="submit" name="recreate" value="{{'label.button.recreate' | translate}}"  ng-disabled="entryObject.journalEntry"/>
+                <input id="recreate" data-ng-click="recreate(entryObject.id)" type="submit" name="recreate"
+                       value="{{'label.button.recreate' | translate}}" ng-disabled="entryObject.journalEntry"/>
             </td>
             <td>
-                <input id="viewjournals" data-ng-click="viewJournals(entryObject.id)" type="submit" name="viewjournals"  value="{{'label.button.view' | translate}}" ng-disabled="!entryObject.journalEntry"/>
+                <input id="viewjournals" data-ng-click="viewJournals(entryObject.id)" type="submit" name="viewjournals"
+                       value="{{'label.button.view' | translate}}" ng-disabled="!entryObject.journalEntry"/>
             </td>
 
         </tr>
         </tbody>
     </table>
+    <ul class="pager">
+        <li class="previous"><a id="prev" ng-click="entries.previous()" href=""
+                                ng-disabled="!entries.hasPrevious()">&larr; {{'label.button.previous' |
+            translate}}</a></li>
+        <li class="next"><a id="next" ng-click="entries.next()" href="" ng-disabled="!entries.hasNext()">{{'label.button.next'
+            | translate}} </a></li>
+    </ul>
 </div>

app/views/accounting/provisioning/ViewProvisioningEntry.html

@@ -13,7 +13,31 @@
 
             </h3>
             <hr>
-            <table class="table" class="width100" ng-show="entries.length>0">
+            <div class="form-group">
+                <div class="col-sm-3">
+                    <select id="offices" chosen="offices" class="form-control" ng-model="formData.officeId" ng-options="office.id as office.name for office in offices" value="{{office.id}}">
+                        <option class="displaynone" value="">{{'label.selectoffice' | translate}}</option>
+                    </select>
+                </div>
+                <div class="col-sm-3">
+                    <select id="loanproducts" chosen="loanproducts" class="form-control" ng-model="formData.loanproductId" ng-options="loanproduct.id as loanproduct.name for loanproduct in loanproducts" value="{{loanproduct.id}}">
+                        <option class="displaynone" value="">{{'label.selectloanproduct' | translate}}</option>
+                    </select>
+                </div>
+
+                <div class="col-sm-3">
+                    <select id="provisioningcategories" chosen="provisioningcategories" class="form-control" ng-model="formData.categoryId" ng-options="category.id as category.categoryName for category in provisioningcategories" value="{{category.id}}">
+                        <option class="displaynone" value="">{{'label.selectprovisioningcategory' | translate}}</option>
+                    </select>
+                </div>
+
+                <div class="col-sm-1 center">
+                    <a ng-click="searchTransaction()" class="btn btn-primary btn-lg" has-permission='READ_JOURNALENTRY'><i
+                            class="icon-search icon-white"></i></a></span>
+                </div>
+            </div>
+
+            <table class="table" class="width100">
                 <tr class="graybg">
                     <th>{{'label.heading.officeName' | translate}}</th>
                     <th>{{'label.heading.productname' | translate}}</th>
@@ -23,7 +47,7 @@
                     <th>{{'label.input.liabilityaccount' | translate}}</th>
                     <th>{{'label.input.expenseaccount' | translate}}</th>
                 </tr>
-                <tr ng-repeat="provisioningentry in entries">
+                <tr ng-repeat="provisioningentry in transactions.currentPageItems">
                     <td>{{provisioningentry.officeName}}</td>
                     <td>{{provisioningentry.productName}}</td>
                     <td>{{provisioningentry.currencyCode}}</td>
@@ -33,6 +57,11 @@
                     <td>{{provisioningentry.expenseAccountName}}</td>
                 </tr>
             </table>
+            <ul class="pager">
+                <li class="previous"><a id="prev" ng-click="transactions.previous()" href="" ng-disabled="!transactions.hasPrevious()">&larr; {{'label.button.previous' | translate}}</a></li>
+                <li class="next"><a id="next" ng-click="transactions.next()" href="" ng-disabled="!transactions.hasNext()">{{'label.button.next' | translate}} </a></li>
+            </ul>
+
             <div class="col-md-offset-3">
                 <button ng-show="isjournalEntriesCreated" id="save" type="submit" class="btn btn-primary" has-permission='CREATE_JOURNAL_ENTRY'>{{'label.button.addjournalentry' | translate}}</button>
             </div>

app/views/accounting/provisioning/ViewProvisioningJournalEntries.html

@@ -31,7 +31,8 @@
                 <td class="pointer" data-ng-click="routeTo(transaction.transactionId)">
                     {{transaction.glAccountType.value}}
                 </td>
-                <td class="pointer" data-ng-click="routeTo(transaction.transactionId)">
+                <td class="pointer" data-ng-click="routeTo(transaction.transactionId
+                )">
                     {{transaction.createdByUserName}}
                 </td>
                 <td class="pointer" data-ng-click="routeTo(transaction.transactionId)">