Merge pull request #1649 from satish-conflux/SMS-CAMP-PAGINATION

Added pagination in list SMS campaigns
This commit is contained in:
Shaik Nazeer Hussain 2016-11-18 14:54:44 +05:30 committed by GitHub
commit 1be5dd902d
4 changed files with 27 additions and 6 deletions

View File

@ -10,6 +10,11 @@
scope.first.date = new Date();
scope.translate = translate;
scope.criterias = [];
scope.smsCampaignsPerPage = 15;
scope.smsCampaigns = [];
scope.formParams = {};
scope.formParams.offset = 0;
scope.formParams.limit = scope.smsCampaignsPerPage;
scope.routeTo = function (id) {
location.path('/viewsmscampaign/' + id);
@ -20,15 +25,30 @@
scope.saveSC();
}
scope.getResultsPage = function (pageNumber) {
scope.formParams.offset = ((pageNumber - 1) * scope.smsCampaignsPerPage);
scope.formParams.limit = scope.smsCampaignsPerPage;
resourceFactory.smsCampaignResource.getAll(scope.formParams, function (data) {
scope.smsCampaigns = data.pageItems;
scope.totalSMSCampaigns = data.totalFilteredRecords;
});
}
scope.initPage = function () {
resourceFactory.smsCampaignResource.getAll(scope.formParams, function (data) {
scope.smsCampaigns = data.pageItems;
scope.totalSMSCampaigns = data.totalFilteredRecords;
});
}
scope.initPage();
scope.filterText = scope.searchCriteria.criterias;
scope.onFilter = function () {
scope.searchCriteria.criterias = scope.filterText;
scope.saveSC();
};
resourceFactory.smsCampaignResource.getAll(function (data) {
scope.smsCampaigns = data;
});
}
});
mifosX.ng.application.controller('SmsCampaignsController', ['$scope', 'ResourceFactory', '$location', 'dateFilter', '$translate', mifosX.controllers.SmsCampaignsController]).run(function ($log) {

View File

@ -4,7 +4,7 @@
scope.tabsList = [{id: 'pending', name: 'Pending SMS', status: 100}, {id: 'waiting', name: 'Waiting for Delivery Report', status: 150}, {id: 'sent', name: 'Sent SMS', status: 200}, {id: 'delivered', name: 'Delivered SMS', status: 300}, {id: 'failed', name: 'Failed SMS', status: 400}];
scope.smsList = [];
scope.formData = {};
scope.smsPerPage = 14;
scope.smsPerPage = 15;
resourceFactory.smsCampaignResource.get({campaignId: routeParams.campaignId}, function (data) {
scope.campaignData = data;
});

View File

@ -623,7 +623,7 @@
}),
smsCampaignResource: defineResource(apiVer + "/smscampaigns/:campaignId/:additionalParam", {campaignId: '@campaignId', additionalParam: '@additionalParam'}, {
getAll: {method: 'GET', params: {}, isArray: true},
getAll: {method: 'GET', params: {}},
get: {method: 'GET', params: {}},
save: {method: 'POST', params: {}},
update: {method: 'PUT', params: {}},

View File

@ -19,7 +19,7 @@
</tr>
</thead>
<tbody>
<tr class="pointer-main" ng-repeat="smsCampaign in smsCampaigns |orderBy:'criteriaName' | filter:filterText">
<tr class="pointer-main" dir-paginate="smsCampaign in smsCampaigns | itemsPerPage: smsCampaignsPerPage" total-items="totalSMSCampaigns">
<td class="pointer" data-ng-click="routeTo(smsCampaign.id)">{{smsCampaign.campaignName}}</td>
<td class="pointer" data-ng-click="routeTo(smsCampaign.id)">{{smsCampaign.campaignMessage}}</td>
<td class="pointer" data-ng-click="routeTo(smsCampaign.id)">{{smsCampaign.campaignType.value}}</td>
@ -29,4 +29,5 @@
</tr>
</tbody>
</table>
<dir-pagination-controls boundary-links="true" template-url="bower_components/angular-utils-pagination/dirPagination.tpl.html" on-page-change="getResultsPage(newPageNumber)"></dir-pagination-controls>
</div>