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

Merge pull request #195 from mifoscontributer/testing

Browse Source 
Fixing group issues
This commit is contained in:
Nayan Ambali 2013-10-19 04:47:47 -07:00
commit 2254664445
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/scripts/controllers/groups/CreateGroupController.js
View File

@ -6,7 +6,6 @@
scope.data = {};
scope.choice = 0;
scope.first = {};
scope.first.date = new Date();
resourceFactory.groupTemplateResource.get(function(data) {
scope.offices = data.officeOptions;
scope.staffs = data.staffOptions;

4
app/scripts/controllers/loanAccount/ViewLoanDetailsController.js
View File

@ -248,10 +248,6 @@
};
scope.unassignLoanOfficer = function () {
};
}
});
mifosX.ng.application.controller('ViewLoanDetailsController', ['$scope', '$routeParams', 'ResourceFactory', '$location', '$route', mifosX.controllers.ViewLoanDetailsController]).run(function($log) {

6
app/views/accounting/view_transactions.html
View File

@ -1,4 +1,10 @@
<form ng-controller="ViewTransactionController">
<div>
<ul class="breadcrumb">
<li><a href="#/accounting">{{'link.accounting' | translate}}</a> <span class="divider">/</span></li>
<li class="active">{{'label.view.transaction' | translate}}</li>
</ul>
</div>
<div class="row alert-block span" >
<h3>{{ 'label.journalentry.transaction.number' | translate }}&nbsp;<b>{{transactionNumber}}</b></h3>
<div class="pull-right">

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

@ -64,7 +64,7 @@
<tr>
<td>{{ 'label.memberof' | translate }}</td>
<td>
<span ng-repeat="group in client.groups" > {{group.name}} |&nbsp;</span>
<span ng-repeat="group in client.groups" > <a href="#/viewgroup/{{group.id}}">{{group.name}}</a> |&nbsp;</span>
</td>
</tr>
</table>

12
app/views/groups/editgroup.html
View File

@ -22,11 +22,13 @@
<input type="text" id="externalid" ng-model="formData.externalId">
</div>
</div>
<div class="control-group">
<label class="control-label">{{'label.form.activationdate' | translate}}</label>
<div class="controls">
<input type="text" datepicker-pop="dd MMMM yyyy" ng-model="first.date" is-open="opened" min="minDate" max="'2020-06-22'" date-disabled="disabled(date, mode)" required late-Validate />
</div>
<div ng-hide="editGroup.status.value == 'Pending'">
<div class="control-group">
<label class="control-label">{{'label.form.activationdate' | translate}}</label>
<div class="controls">
<input type="text" datepicker-pop="dd MMMM yyyy" ng-model="first.date" is-open="opened" min="minDate" max="'2020-06-22'" date-disabled="disabled(date, mode)" required late-Validate />
</div>
</div>
</div>
<div class="offset">
<a href="#/viewgroup/{{editGroup.id}}" class="btn">{{'label.cancel' | translate}}</a>