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

temp

Browse Source 
testing groups and centerss
This commit is contained in:
Safiyu 2013-10-18 17:45:17 +05:30
parent ad7a672098
commit 4f197bb4d0
12 changed files with 45 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -717,6 +717,7 @@
"table.heading.dueasof":"Due as of",
"table.heading.calculationtype":"Calculation type",
"label.select.saving.product":"--Select saving product--",
"label.centerclosed":"Center Closed",
"#Account Transfers":".........",
"label.heading.view.accounttransfer.details":"View Account Transfers Details",

4
app/scripts/controllers/centers/EditCenterController.js
View File

@ -3,7 +3,6 @@
EditCenterController: function(scope, resourceFactory,location, routeParams,dateFilter ) {
scope.managecode = routeParams.managecode;
scope.first = {};
scope.first.date = new Date();
resourceFactory.centerResource.get({centerId: routeParams.id,template: 'true'} , function(data) {
scope.edit = data;
scope.staffs = data.staffOptions;
@ -12,7 +11,10 @@
externalId:data.externalId,
staffId:data.staffId
};
var newDate = dateFilter(data.activationDate,'dd MMMM yyyy');
scope.first.date = new Date(newDate);
});
scope.updateGroup = function(){
var reqDate = dateFilter(scope.first.date,'dd MMMM yyyy');
this.formData.activationDate = reqDate;

2
app/scripts/controllers/centers/ViewCenterController.js
View File

@ -31,7 +31,7 @@
scope.unassignStaff = function(id){
var staffData = new Object();
staffData.staffId = id;
resourceFactory.centerResource.save({centerId: routeParams.id,command: 'unassignStaff'}, staffData, function(data) {
resourceFactory.groupResource.save({centerId: routeParams.id,anotherresource: 'unassignStaff'}, staffData, function(data) {
resourceFactory.centerResource.get({centerId: routeParams.id}, function(data){
route.reload();
});

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

@ -5,7 +5,6 @@
templateSource : 'template'}, function(data) {
scope.groupCenterData = data;
scope.first = {};
scope.first.date = new Date();
//to display default in select boxes
scope.formData = {
repeating :'true',

6
app/scripts/controllers/groups/EditGroupController.js
View File

@ -2,7 +2,6 @@
mifosX.controllers = _.extend(module, {
EditGroupController: function(scope, resourceFactory,location, routeParams,dateFilter ) {
scope.first = {};
scope.first.date = new Date();
scope.managecode = routeParams.managecode;
resourceFactory.groupResource.get({groupId: routeParams.id,associations:'clientMembers',template:'true'} , function(data) {
scope.editGroup = data;
@ -11,6 +10,11 @@
externalId:data.externalId,
staffId:data.staffId
};
if(data.activationDate){
var actDate = dateFilter(data.activationDate,'dd MMMM yyyy');
scope.first.date = new Date(actDate);
}
});
scope.updateGroup = function(){
var reqDate = dateFilter(scope.first.date,'dd MMMM yyyy');

9
app/scripts/controllers/loanAccount/NewLoanAccAppController.js
View File

@ -10,12 +10,7 @@
scope.collateralFormData = {}; //For collaterals
scope.inparams = {resourceType : 'template'};
scope.date = {};
scope.date.first = new Date();
scope.date.second = new Date();
scope.date.third = new Date();
scope.date.fourth = new Date();
scope.date.fifth = new Date();
if (scope.clientId) {
if (scope.clientId) {
scope.inparams.clientId = scope.clientId;
scope.formData.clientId = scope.clientId;
}
@ -125,8 +120,6 @@
var reqSecondDate = dateFilter(scope.date.second,'dd MMMM yyyy');
var reqThirdDate = dateFilter(scope.date.third,'dd MMMM yyyy');
var reqFourthDate = dateFilter(scope.date.fourth,'dd MMMM yyyy');
var reqFifthDate = dateFilter(scope.date.fifth,'dd MMMM yyyy');
if (scope.charges.length > 0) {
scope.formData.charges = [];
for (var i in scope.charges) {

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

@ -68,13 +68,14 @@
location.path('/guarantor/' + accountId);
}
};
resourceFactory.LoanAccountResource.getLoanAccountDetails({loanId: routeParams.id, associations: 'all'}, function(data) {
scope.loandetails = data;
scope.status = data.status.value;
scope.$broadcast('LoanAccountDataLoadingCompleteEvent');
if (data.status.value == "Submitted and pending approval") {
if(scope.status=="Submitted and pending approval" || scope.status=="Active" || scope.status=="Approved" ){
scope.choice = true;
}
if (data.status.value == "Submitted and pending approval") {
scope.buttons = { singlebuttons : [{
name:"button.addloancharge",
icon :"icon-plus-sign"

4
app/scripts/controllers/savings/ViewSavingDetailsController.js
View File

@ -70,6 +70,10 @@
resourceFactory.savingsResource.get({accountId: routeParams.id, associations: 'all'}, function(data) {
scope.savingaccountdetails = data;
scope.status = data.status.value;
if(scope.status=="Submitted and pending approval" || scope.status=="Active" || scope.status=="Approved" ){
scope.choice = true;
}
if(scope.savingaccountdetails.charges) {
scope.charges = scope.savingaccountdetails.charges;
scope.chargeTableShow = true;

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

@ -197,10 +197,12 @@
</tab>
</tab>
<tab heading="{{centerdatatable.registeredTableName}}" ng-repeat="centerdatatable in centerdatatables" select="dataTableChange(centerdatatable)">
<a ng-show="datatabledetails.isData" class="btn btn-danger pull-right" ng-click="deleteAll(centerdatatable.registeredTableName, center.id)"><i class="icon-trash icon-white"></i>{{'button.deleteall' | translate}}</a>
<span ng-show="!datatabledetails.isData || datatabledetails.isMultirow" class="pull-right ">
<a href="#/makedatatableentry/{{centerdatatable.registeredTableName}}/{{center.id}}" class="btn btn-primary"><i class="icon-plus icon-white"></i>{{'button.add' | translate}}</a>
</span></br>
<span data-ng-show="center.status.value=='Closed'">
<a ng-show="datatabledetails.isData" class="btn btn-danger pull-right" ng-click="deleteAll(centerdatatable.registeredTableName, center.id)"><i class="icon-trash icon-white"></i>{{'button.deleteall' | translate}}</a>
<span ng-show="!datatabledetails.isData || datatabledetails.isMultirow" class="pull-right ">
<a href="#/makedatatableentry/{{centerdatatable.registeredTableName}}/{{center.id}}" class="btn btn-primary"><i class="icon-plus icon-white"></i>{{'button.add' | translate}}</a>
</span></br>
</span>
<table ng-show="datatabledetails.isData" class="table">
<thead>
<th ng-repeat="column in datatabledetails.columnHeaders">{{column.columnName}}</th>

10
app/views/groups/viewgroup.html
View File

@ -254,10 +254,12 @@
</table>
</tab>
<tab heading="{{groupdatatable.registeredTableName}}" ng-repeat="groupdatatable in groupdatatables" select="dataTableChange(groupdatatable)">
<a ng-show="datatabledetails.isData" class="btn btn-danger pull-right" ng-click="deleteAll(groupdatatable.registeredTableName, group.id)"><i class="icon-trash icon-white"></i>{{'button.deleteall' | translate}}</a>
<span ng-show="!datatabledetails.isData || datatabledetails.isMultirow" class="pull-right ">
<a href="#/makedatatableentry/{{groupdatatable.registeredTableName}}/{{group.id}}" class="btn btn-primary"><i class="icon-plus icon-white"></i>{{'button.add' | translate}}</a>
</span></br>
<span data-ng-hide="group.status.value == 'Closed'">
<a ng-show="datatabledetails.isData" class="btn btn-danger pull-right" ng-click="deleteAll(groupdatatable.registeredTableName, group.id)"><i class="icon-trash icon-white"></i>{{'button.deleteall' | translate}}</a>
<span ng-show="!datatabledetails.isData || datatabledetails.isMultirow" class="pull-right ">
<a href="#/makedatatableentry/{{groupdatatable.registeredTableName}}/{{group.id}}" class="btn btn-primary"><i class="icon-plus icon-white"></i>{{'button.add' | translate}}</a>
</span></br>
</span>
<table ng-show="datatabledetails.isData" class="table">
<thead>
<th ng-repeat="column in datatabledetails.columnHeaders">{{column.columnName}}</th>

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

@ -301,7 +301,7 @@
</tab>
<tab heading="{{'tab.loandocuments' | translate}}" select="getLoanDocuments()">
<div class="pull-right">
<div class="pull-right" data-ng-show="choice">
<a href="#/addloandocument/{{loandetails.id}}" class="btn btn-primary"><i class="icon-plus icon-white"></i>{{'button.upload' | translate}}</a>
</div>
<br>
@ -337,10 +337,12 @@
</tab>
<tab heading="{{loandatatable.registeredTableName}}" ng-repeat="loandatatable in loandatatables" select="dataTableChange(loandatatable)">
<div>
<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>
<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>
</span></br>
<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>
<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>
</span></br>
</span>
<table ng-show="datatabledetails.isData" class="table">
<thead>
<th ng-repeat="column in datatabledetails.columnHeaders">{{column.columnName}}</th>

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

@ -149,10 +149,12 @@
</table>
</tab>
<tab heading="{{savingdatatable.registeredTableName}}" ng-repeat="savingdatatable in savingdatatables" select="dataTableChange(savingdatatable)">
<a ng-show="datatabledetails.isData" class="btn btn-danger pull-right" ng-click="deleteAll(savingdatatable.registeredTableName, savingaccountdetails.id)"><i class="icon-trash icon-white"></i>{{'button.deleteall' | translate}}</a>
<span ng-show="!datatabledetails.isData || datatabledetails.isMultirow" class="pull-right ">
<a href="#/makedatatableentry/{{savingdatatable.registeredTableName}}/{{savingaccountdetails.id}}" class="btn btn-primary"><i class="icon-plus icon-white"></i>{{'button.add' | translate}}</a>
</span></br>
<span data-ng-show="choice">
<a ng-show="datatabledetails.isData" class="btn btn-danger pull-right" ng-click="deleteAll(savingdatatable.registeredTableName, savingaccountdetails.id)"><i class="icon-trash icon-white"></i>{{'button.deleteall' | translate}}</a>
<span ng-show="!datatabledetails.isData || datatabledetails.isMultirow" class="pull-right ">
<a href="#/makedatatableentry/{{savingdatatable.registeredTableName}}/{{savingaccountdetails.id}}" class="btn btn-primary"><i class="icon-plus icon-white"></i>{{'button.add' | translate}}</a>
</span></br>
</span>
<table ng-show="datatabledetails.isData" class="table">
<thead>
<th ng-repeat="column in datatabledetails.columnHeaders">{{column.columnName}}</th>