artin/community-app
1
0
Fork 0
mirror of https://github.com/openMF/community-app.git synced 2026-02-06 18:16:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1922 from Anh3h/ISSUE_1905

Browse Source 
Fixed issue #1905
This commit is contained in:
Shaik Nazeer Hussain 2017-03-07 16:19:52 +05:30 committed by GitHub
commit 12ca19de16
2 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/scripts/controllers/collection/CollectionSheetController.js
View File

@ -23,13 +23,20 @@
});
scope.productiveCollectionSheet = function () {
for (var i = 0; i < scope.offices.length; i++) {
if (scope.offices[i].id === scope.officeId) {
scope.officeName = scope.offices[i].name;
if (scope.officeId && scope.loanOfficerId ) {
for (var i = 0; i < scope.offices.length; i++) {
if (scope.offices[i].id === scope.officeId) {
scope.officeName = scope.offices[i].name;
}
}
scope.meetingDate = dateFilter(scope.date.transactionDate, scope.df);
location.path('/productivesheet/' + scope.officeId + '/' + scope.officeName + '/' + scope.meetingDate + '/' + scope.loanOfficerId);
} else {
scope.collectionsheetform.office.$valid = true;
scope.collectionsheetform.office.$error.req = true;
scope.collectionsheetform.loanOfficer.$valid = true;
scope.collectionsheetform.loanOfficer.$error.req = true;
}
scope.meetingDate = dateFilter(scope.date.transactionDate, scope.df);
location.path('/productivesheet/' + scope.officeId + '/' + scope.officeName + '/' + scope.meetingDate + '/' + scope.loanOfficerId);
};
scope.officeSelected = function (officeId) {
@ -60,6 +67,7 @@
scope.loanOfficerSelected = function (loanOfficerId) {
if (loanOfficerId) {
$scope.loanOfficerId = loanOfficerId;
resourceFactory.centerResource.getAllCenters({officeId: scope.officeId, staffId: loanOfficerId, orderBy: 'name', sortOrder: 'ASC', limit: -1}, function (data) {
scope.centers = data;
});
@ -409,7 +417,7 @@
scope.formData.transactionDate = dateFilter(scope.date.transactionDate, scope.df);
}
scope.formData.actualDisbursementDate = this.formData.transactionDate;
_.each(scope.savingsgroups, function (group) {
_.each(group.clients, function (client) {
var clientAttendanceDetails = {

38
app/views/collection/collectionsheet.html
View File

@ -6,7 +6,7 @@
<api-validate></api-validate>
<h2><strong ng-show="noData" style="padding-top: 400px !important;">{{'label.norepaymentsanddisbursalareavailable' |
translate}}</strong></h2>
<h2><strong ng-show="val" class="display-save-message">{{'label.savecollectionsheetsuccessfully' |
translate}}</strong></h2>
<fieldset ng-hide="val || noData">
@ -14,7 +14,7 @@
<div class="form-group">
<label class="control-label col-sm-2">{{ 'label.input.branchoffice' | translate }}<span
class="required">*</span></label>
<div class="col-sm-3">
<select chosen="offices" id="officeId" ng-model="officeId" name="office" class="chzn-select-deselect form-control"
ng-options="office.id as office.name for office in offices" value="{{office.id}}"
@ -26,30 +26,34 @@
<form-validate valattributeform="collectionsheetform" valattribute="office"/>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">{{ 'label.input.meetingcalendar' | translate }}<span
class="required">*</span></label>
<div class="col-sm-3">
<input type="text" id="transactionDate" name="transactiondate" datepicker-pop="dd MMMM yyyy"
ng-model="date.transactionDate" is-open="opened" class="form-control"/>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">{{ 'label.input.staff' | translate }}</label>
<label class="control-label col-sm-2">{{ 'label.input.staff' | translate }}<span
class="required">*</span></label>
<div class="col-sm-3">
<select chosen="loanOfficers" id="loanOfficerId" ng-model="loanOfficerId"
ng-options="loanOfficer.id as loanOfficer.displayName for loanOfficer in loanOfficers | filter: 'true' "
name="loanOfficer" ng-options="loanOfficer.id as loanOfficer.displayName for loanOfficer in loanOfficers | filter: 'true' "
value="{{loanOfficer.id}}" ng-change="loanOfficerSelected(loanOfficerId)" class="form-control"
required>
<option value="">{{'label.selectloanofficer' | translate}}</option>
</select>
</div>
<div class="col-sm-3">
<form-validate valattributeform="collectionsheetform" valattribute="loanOfficer"/>
</div>
</div>
<div class="form-group">
<div class="col-sm-2">
<button class="btn btn-primary" ng-click="productiveCollectionSheet()">
@ -57,11 +61,11 @@
<i class="icon-circle-arrow-right"></i></button>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">{{ 'label.input.center' | translate }}</label>
<div class="col-sm-3">
<select chosen="centers" id="centerId" name="center" ng-model="centerId"
ng-options="center.id as center.name for center in centers" value="{{center.id}}"
@ -70,10 +74,10 @@
</select>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2">{{ 'label.input.group' | translate }}</label>
<div class="col-sm-3">
<select chosen="groups" id="groupId" ng-model="groupId" ng-options="group.id as group.name for group in groups"
value="{{group.id}}" ng-change="groupSelected(groupId)" class="form-control">
@ -81,7 +85,7 @@
</select>
</div>
</div>
<div class="form-group">
<div class="col-sm-2">
<button class="btn btn-primary" ng-click="previewCollectionSheet()">{{'label.button.collectionsheet' |
@ -169,7 +173,7 @@
</tr>
<tr ng-repeat="client in group.clients">
<td ng-repeat="loanproduct in collectionsheetdata.loanProducts">
<span ng-repeat="loan in client.loans" ng-show="loanproduct.id == loan.productId">
<div class="col-md-7 paddinglr0px">
<input id="total" type="text" class="input-sm form-control" number-format
@ -256,7 +260,7 @@
<div ng-hide="noData" ng-show="collectionsheetdata" class="col-sm-3 col-md-3 paddedtop10">
<strong><h4 style="background-color: #D6D6C2">{{'label.heading.totalduecollections' | translate}}</h4>
</strong>
<div class="templatekeys" style="background-color:#8585FF!important"
ng-repeat="loanDueTotalCollection in totalDueCollection">
{{loanDueTotalCollection.dueAmount | number}}&nbsp;&nbsp;