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

Merge pull request #522 from safiyu/newissue

Browse Source 
fixed issue #515 & #514
This commit is contained in:
Vishwas Babu A J 2013-12-06 02:02:34 -08:00
commit c6a48b3226
19 changed files with 282 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/global-translations/locale-en.json
View File

@ -908,6 +908,7 @@
"label.heading.onprincipalpayment":"On Principal Payment",
"label.heading.oninterestpayment":"On Interest Payment",
"label.heading.editloanaccounttransaction":"Edit Transaction",
"label.heading.viewcollateral":"View Collateral",
"#Anchors": "..",
"label.anchor.viewloanaccount": "View Loan Account",
@ -984,6 +985,7 @@
"label.button.writeoff": "Write-Off",
"label.button.close-rescheduled": "Close (as Rescheduled)",
"label.button.assignloanofficer":"Assign Loan Officer",
"label.button.details":"Details",
"#Misc Labels": "..",
"label.selectpurpose": "Select purpose",

2
app/views/accounting/view_acc_rule.html
View File

@ -18,7 +18,7 @@
<div class="modal-header silver">
<h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
</div>
<div class="modal-body modal-middle">
<div class="modal-body ">
<button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
</div>

2
app/views/accounting/view_close_accounting.html
View File

@ -13,7 +13,7 @@
<div class="modal-header silver">
<h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
</div>
<div class="modal-body modal-middle">
<div class="modal-body ">
<button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
</div>

2
app/views/accounting/viewglaccounting.html
View File

@ -20,7 +20,7 @@
<div class="modal-header silver">
<h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
</div>
<div class="modal-body modal-middle">
<div class="modal-body ">
<button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
</div>

2
app/views/administration/viewuser.html
View File

@ -34,7 +34,7 @@
<div class="modal-header silver">
<h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
</div>
<div class="modal-body modal-middle">
<div class="modal-body ">
<button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
</div>

4
app/views/centers/viewcenter.html
View File

@ -43,7 +43,7 @@
<div class="modal-header silver">
<h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
</div>
<div class="modal-body modal-middle">
<div class="modal-body ">
<button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
</div>
@ -52,7 +52,7 @@
<div class="modal-header silver">
<h3 class="bolder">{{'label.heading.unassignstaff' | translate}}</h3>
</div>
<div class="modal-body modal-middle">
<div class="modal-body ">
<button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button class="btn btn-primary" ng-click="unassign()">{{'label.button.confirm' | translate}}</button>
</div>

4
app/views/clients/viewclient.html
View File

@ -40,7 +40,7 @@
<div class="modal-header silver">
<h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
</div>
<div class="modal-body modal-middle">
<div class="modal-body ">
<button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
</div>
@ -49,7 +49,7 @@
<div class="modal-header silver">
<h3 class="bolder">{{'label.heading.unassignstaff' | translate}}</h3>
</div>
<div class="modal-body modal-middle">
<div class="modal-body ">
<button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button class="btn btn-primary" ng-click="unassign()">{{'label.button.confirm' | translate}}</button>
</div>

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

@ -184,7 +184,7 @@
<div class="modal-header silver">
<h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
</div>
<div class="modal-body modal-middle">
<div class="modal-body ">
<button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
</div>
@ -379,15 +379,16 @@
<th>{{'label.heading.type' | translate}}</th>
<th>{{'label.heading.description' | translate}}</th>
<th>{{'label.heading.value' | translate}}</th>
<th></th>
</thead>
<tbody>
<tr ng-repeat="collateral in loandetails.collateral">
<td>
<a ng-show="loandetails.status.pendingApproval" href="#/loan/{{loandetails.id}}/viewcollateral/{{collateral.id}}">{{collateral.type.name}}</a>
<a ng-hide="loandetails.status.pendingApproval">{{collateral.type.name}}</a>
{{collateral.type.name}}
</td>
<td>{{collateral.description}}</td>
<td>{{collateral.value}}</td>
<td><a ng-show="loandetails.status.pendingApproval" style="text-decoration:none;" class="btn-primary" href="#/loan/{{loandetails.id}}/viewcollateral/{{collateral.id}}">{{'label.button.details' | translate}}</a></td>
</tr>
</tbody>
</table>
@ -496,9 +497,9 @@
<tab heading="{{loandatatable.registeredTableName}}" ng-repeat="loandatatable in loandatatables" select="dataTableChange(loandatatable)">
<div>
<span data-ng-show="choice">
<a ng-show="datatabledetails.isData" class="btn btn-danger pull-right" ng-click="deleteAll(loandatatable.registeredTableName, loandetails.id)"><i class="icon-trash icon-white"></i>{{'button.deleteall' | translate}}</a>
<a ng-show="datatabledetails.isData" class="btn btn-danger pull-right" ng-click="deleteAll(loandatatable.registeredTableName, loandetails.id)"><i class="icon-trash icon-white"></i>{{'label.button.deleteall' | translate}}</a>
<span ng-show="!datatabledetails.isData || datatabledetails.isMultirow" class="pull-right ">
<a href="#/makedatatableentry/{{loandatatable.registeredTableName}}/{{loandetails.id}}" class="btn btn-primary"><i class="icon-plus icon-white"></i>{{'button.add' | translate}}</a>
<a href="#/makedatatableentry/{{loandatatable.registeredTableName}}/{{loandetails.id}}" class="btn btn-primary"><i class="icon-plus icon-white"></i>{{'label.button.add' | translate}}</a>
</span></br>
</span>
<table ng-show="datatabledetails.isData" class="table">

2
app/views/loans/viewloancharge.html
View File

@ -9,7 +9,7 @@
<div class="modal-header silver">
<h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
</div>
<div class="modal-body modal-middle">
<div class="modal-body ">
<button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
</div>

24
app/views/loans/viewloancollateral.html
View File

@ -4,24 +4,24 @@
<li><a href="#/viewloanaccount/{{loanId}}">{{'label.anchor.viewloanaccount' | translate}}</a><span class="divider">/</span></li>
<li class="active">{{ 'label.anchor.viewcollateral' | translate}}({{collateral.type.name}})</li>
</ul>
</div>
<script type="text/ng-template" id="deletecollateral.html">
<div class="modal-header silver">
<h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
</div>
<div class="modal-body">
<button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
</div>
</script>
<div class="well">
<div class="pull-right">
<div class="btn-group">
<a href="#/loan/{{loanId}}/editcollateral/{{collateralId}}" class="btn btn-primary"><i class="icon-edit icon-white"></i> {{'label.button.edit' | translate}}</a>
<button type="button" ng-click="deleteCollateral()" class="btn btn-danger"><i class="icon-trash icon-white"></i>{{'label.button.delete' | translate}}</button>
</div>
</div>
</div>
<script type="text/ng-template" id="deletecollateral.html">
<div class="modal-header silver">
<h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
</div>
<div class="modal-body modal-middle">
<button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
</div>
</script>
<div class="row-fluid">
<h3>{{'label.input.viewcollateral' | translate}}</h3>
<h3>{{'label.heading.viewcollateral' | translate}}</h3>
<table width="100%">
<tr>
<td width="20%">{{'label.heading.name' | translate}}</td>

49
app/views/products/createloanproduct.html
View File

@ -11,7 +11,7 @@
<div class="control-group">
<table width="100%">
<tr class="control-group">
<td width="12%">
<td width="11%">
<label class="control-label"><h4>{{ 'label.heading.details' | translate }}</h4></label>
</td>
<td class="blockquoteresult">
@ -506,10 +506,11 @@
<tr class="span2"></tr>
<tr class="control-group">
<td width="11%"></td>
<td width="80%">
<td>
<label class="control-label"><h4>{{ 'label.heading.accounting' | translate }}</h4></label>
</td>
<td class="blockquoteresult">
<table>
<tr class="span2"></tr>
<tr>
<td width="30%"></td>
<td>
@ -522,18 +523,12 @@
</td>
</tr>
</table>
</td>
</tr>
<tr ng-show="formData.accountingRule==2" class="control-group">
<td>
<label class="control-label"><h4>{{ 'label.heading.accounting' | translate }}</h4></label>
</td>
<td class="blockquoteresult">
<div ng-show="formData.accountingRule==2">
<table width="50%">
<tr>
<td>
<hr class="marginbottom">
<hr/>
<h3>{{ 'label.heading.assets' | translate }}</h3>
</td>
</tr>
<tr class="control-group">
@ -567,13 +562,14 @@
<td>
</td>
</tr>
<tr>
<td>
<hr class="marginbottom">
</td>
</tr>
</table>
<table width="50%">
<tr>
<td>
<hr/>
<h3>{{ 'label.heading.income' | translate }}</h3>
</td>
</tr>
<tr class="control-group">
<td>
<label class="control-label">{{ 'label.input.incomefrominterest' | translate }}&nbsp;</label>
@ -606,13 +602,14 @@
<td>
</td>
</tr>
<tr>
<td>
<hr class="marginbottom">
</td>
</tr>
</table>
<table width="50%">
<tr>
<td>
<hr/>
<h3>{{ 'label.heading.expenses' | translate }}</h3>
</td>
</tr>
<tr class="control-group">
<td>
<label class="control-label">{{ 'label.input.loseswrittenoff' | translate }}&nbsp;</label>
@ -620,7 +617,12 @@
ng-options="expenseAccount.id as expenseAccount.name for expenseAccount in expenseAccountOptions"
value="{{expenseAccount.id}}">
</select>
</td>
</tr>
<tr>
<td>
<hr/>
<h3>{{ 'label.heading.liabilities' | translate }}</h3>
</td>
</tr>
<tr>
@ -773,6 +775,7 @@
</td>
</tr>
</table>
</div>
</td>
</tr>

2
app/views/products/productmix/viewproductmix.html
View File

@ -26,7 +26,7 @@
<div class="modal-header silver">
<h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
</div>
<div class="modal-body modal-middle">
<div class="modal-body ">
<button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
</div>

2
app/views/products/viewcharge.html
View File

@ -31,7 +31,7 @@
<div class="modal-header silver">
<h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
</div>
<div class="modal-body modal-middle">
<div class="modal-body ">
<button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
</div>

4
app/views/system/viewcheckerinbox.html
View File

@ -56,7 +56,7 @@
<div class="modal-header silver">
<h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
</div>
<div class="modal-body modal-middle">
<div class="modal-body ">
<button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
</div>
@ -65,7 +65,7 @@
<div class="modal-header silver">
<h3 class="bolder">{{'label.heading.approve' | translate}}</h3>
</div>
<div class="modal-body modal-middle">
<div class="modal-body ">
<button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button class="btn btn-primary" ng-click="approve()">{{'label.button.confirm' | translate}}</button>
</div>

4
app/views/system/viewcode.html
View File

@ -20,7 +20,7 @@
<div class="modal-header silver">
<h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
</div>
<div class="modal-body modal-middle">
<div class="modal-body ">
<button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
</div>
@ -29,7 +29,7 @@
<div class="modal-header silver">
<h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
</div>
<div class="modal-body modal-middle">
<div class="modal-body ">
<button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
</div>

2
app/views/system/viewdatatable.html
View File

@ -18,7 +18,7 @@
<div class="modal-header silver">
<h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
</div>
<div class="modal-body modal-middle">
<div class="modal-body ">
<button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
</div>

2
app/views/system/viewdatatableentry.html
View File

@ -9,7 +9,7 @@
<div class="modal-header silver">
<h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
</div>
<div class="modal-body modal-middle">
<div class="modal-body ">
<button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
</div>

2
app/views/system/viewreport.html
View File

@ -16,7 +16,7 @@
<div class="modal-header silver">
<h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
</div>
<div class="modal-body modal-middle">
<div class="modal-body ">
<button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
</div>

2
app/views/templates/viewtemplate.html
View File

@ -15,7 +15,7 @@
<div class="modal-header silver">
<h3 class="bolder">{{'label.heading.delete' | translate}}</h3>
</div>
<div class="modal-body modal-middle">
<div class="modal-body ">
<button class="btn btn-warning" ng-click="cancel()">{{'label.button.cancel' | translate}}</button>
<button class="btn btn-primary" ng-click="delete()">{{'label.button.confirm' | translate}}</button>
</div>