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

Merge pull request #836 from lingalamadhukar/MIFOSX-979

Browse Source 
#MIFOSX-919,#MIFOSX-973,#MIFOSX-979
This commit is contained in:
Vishwas Babu A J 2014-03-12 19:01:41 -07:00
commit 6da08857a3
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Gruntfile.js
View File

@ -94,8 +94,8 @@ module.exports = function(grunt) {
:['<%= mifosx.app %>/bower_components/angular-mocks/angular-mocks.js'],
'<%= mifosx.dist %>/<%=mifosx.target%>/bower_components/angular-webstorage/angular-webstorage.min.js'
:['<%= mifosx.app %>/bower_components/angular-webstorage/angular-webstorage.js'],
'<%= mifosx.dist %>/<%=mifosx.target%>/bower_components/ckeditor/ckeditor.min.js'
:['<%= mifosx.app %>/bower_components/ckeditor/ckeditor.js'],
//'<%= mifosx.dist %>/<%=mifosx.target%>/bower_components/ckeditor/ckeditor.min.js'
//:['<%= mifosx.app %>/bower_components/ckeditor/ckeditor.js'],
'<%= mifosx.dist %>/<%=mifosx.target%>/bower_components/datatables/media/js/jquery.dataTables.min.js'
:['<%= mifosx.app %>/bower_components/datatables/media/js/jquery.dataTables.js'],
//'<%= mifosx.dist %>/<%=mifosx.target%>/bower_components/require-css/css.min.js'
@ -176,7 +176,7 @@ module.exports = function(grunt) {
cwd: '<%= mifosx.app %>/bower_components',
dest: '<%= mifosx.dist %>/<%=mifosx.target%>/bower_components',
src: [
'**/*min.js', 'require-css/*.js', 'require-less/*.js',
'**/*min.js', 'ckeditor/**', 'require-css/*.js', 'require-less/*.js',
'!jasmine/**', '!requirejs/**/**', 'requirejs/require.js', '!underscore/**'
]
}

2
app/scripts/loader-build.js
View File

@ -24,7 +24,7 @@
'angularFileUpload': '../bower_components/angularjs-file-upload/angular-file-upload.min',
'angularFileUploadShim': '../bower_components/angularjs-file-upload/angular-file-upload-shim.min',
'ngSanitize': '../bower_components/angular-sanitize/angular-sanitize.min',
'ckEditor': '../bower_components/ckeditor/ckeditor.min',
'ckEditor': '../bower_components/ckeditor/ckeditor',
'ngIdle': '../bower_components/ng-idle/angular-idle.min',
'LocalStorageModule': '../scripts/modules/localstorage',
'ngCsv': "../scripts/modules/csv",

3
app/views/loans/editloanaccount.html
View File

@ -352,6 +352,7 @@
<td>{{'label.heading.principalbalance' | translate}}</td>
<td>{{'label.heading.interestdue' | translate}}</td>
<td>{{'label.heading.fees' | translate}}</td>
<td>{{'label.heading.penalty' | translate}}</td>
<td>{{'label.heading.due' | translate}}</td>
</tr>
<tr ng-repeat="period in repaymentscheduleinfo.periods">
@ -363,6 +364,7 @@
<td>{{period.principalLoanBalanceOutstanding}}</td>
<td>{{period.interestDue}}</td>
<td>{{period.feeChargesDue}}</td>
<td>{{period.penaltyChargesDue}}</td>
<td>{{period.totalDueForPeriod}}</td>
</tr>
</tbody>
@ -375,6 +377,7 @@
<td></td>
<td>{{repaymentscheduleinfo.totalInterestCharged}}</td>
<td>{{repaymentscheduleinfo.totalFeeChargesCharged}}</td>
<td>{{repaymentscheduleinfo.totalPenaltyChargesCharged}}</td>
<td>{{repaymentscheduleinfo.totalRepaymentExpected}}</td>
</tr>
</tfoot>

3
app/views/loans/newloanaccount.html
View File

@ -351,6 +351,7 @@
<td>{{'label.heading.principalbalance' | translate}}</td>
<td>{{'label.heading.interestdue' | translate}}</td>
<td>{{'label.heading.fees' | translate}}</td>
<td>{{'label.heading.penalty' | translate}}</td>
<td>{{'label.heading.due' | translate}}</td>
</tr>
<tr ng-repeat="period in repaymentscheduleinfo.periods">
@ -362,6 +363,7 @@
<td>{{period.principalLoanBalanceOutstanding}}</td>
<td>{{period.interestDue}}</td>
<td>{{period.feeChargesDue}}</td>
<td>{{period.penaltyChargesDue}}</td>
<td>{{period.totalDueForPeriod}}</td>
</tr>
<tfoot class="ui-widget-header">
@ -373,6 +375,7 @@
<td></td>
<td>{{repaymentscheduleinfo.totalInterestCharged}}</td>
<td>{{repaymentscheduleinfo.totalFeeChargesCharged}}</td>
<td>{{repaymentscheduleinfo.totalPenaltyChargesCharged}}</td>
<td>{{repaymentscheduleinfo.totalRepaymentExpected}}</td>
</tr>
</tfoot>

4
app/views/loans/viewloanaccountdetails.html
View File

@ -21,7 +21,7 @@
<div class="btn-group">
<span ng-repeat="button in buttons.singlebuttons">
<a ng-show="button.name" ng-click="clickEvent(button.name.replace('button.',''), loandetails.id)"
class="btn btn-primary" has-permission='{{taskPermissionName}}'><i class="{{button.icon}} icon-white"></i>{{'label.' + button.name |
class="btn btn-primary" has-permission='{{button.taskPermissionName}}'><i class="{{button.icon}} icon-white"></i>{{'label.' + button.name |
translate}}</a>
</span>
<span ng-show="buttons.options" class="btn-group">
@ -31,7 +31,7 @@
</a>
<ul style='margin-left:-95px;' class="dropdown dropdown-menu">
<li class="{{button.icon}}" ng-repeat="button in buttons.options">
<a ng-click="clickEvent(button.name.replace('button.',''), loandetails.id)" has-permission='{{taskPermissionName}}'>{{'label.'+
<a ng-click="clickEvent(button.name.replace('button.',''), loandetails.id)" has-permission='{{button.taskPermissionName}}'>{{'label.'+
button.name | translate}}</a>
</li>
</ul>

4
app/views/savings/view_saving_account_details.html
View File

@ -18,7 +18,7 @@
<div class="pull-right">
<div class="btn-group">
<span ng-repeat="button in buttons.singlebuttons">
<a ng-show="button.name" has-permission='{{taskPermissionName}}'
<a ng-show="button.name" has-permission='{{button.taskPermissionName}}'
ng-click="clickEvent(button.name.replace('button.',''), savingaccountdetails.id)"
class="btn btn-primary"><i class="{{button.icon}} icon-white"></i>{{'label.'+button.name |
translate}}</a>
@ -30,7 +30,7 @@
</a>
<ul class="dropdown dropdown-menu">
<li class="{{button.icon}}" ng-repeat="button in buttons.options">
<a ng-click="clickEvent(button.name.replace('button.',''), savingaccountdetails.id)" has-permission='{{taskPermissionName}}'>{{'label.'+button.name | translate}}</a>
<a ng-click="clickEvent(button.name.replace('button.',''), savingaccountdetails.id)" has-permission='{{button.taskPermissionName}}'>{{'label.'+button.name | translate}}</a>
</li>
</ul>
</span>