forked from openMF/community-app
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request openMF#789 from dhirenpratap/developtask2
openMF#3238 Large JLG Loan changes
- Loading branch information
Showing
24 changed files
with
2,444 additions
and
34 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
726 changes: 726 additions & 0 deletions
726
app/scripts/controllers/task/activity/camActivityController.js
Large diffs are not rendered by default.
Oops, something went wrong.
219 changes: 219 additions & 0 deletions
219
app/scripts/controllers/task/activity/cashflowActivityController.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,219 @@ | ||
| (function (module) { | ||
| mifosX.controllers = _.extend(module, { | ||
| cashflowActivityController: function (scope, resourceFactory, API_VERSION, location, http, routeParams, API_VERSION, $upload, $rootScope) { | ||
|
|
||
| scope.showSummary = true; | ||
| scope.showAddClientoccupationdetailsForm = false; | ||
| scope.showEditClientoccupationdetailsForm = false; | ||
| scope.showAddClientassetdetailsForm = false; | ||
| scope.showEditClientassetdetailsForm = false; | ||
| scope.showAddClienthouseholddetailsForm = false; | ||
| scope.showEditClienthouseholddetailsForm = false; | ||
|
|
||
| function hideAll(){ | ||
| scope.showSummary = false; | ||
| scope.showAddClientoccupationdetailsForm = false; | ||
| scope.showEditClientoccupationdetailsForm = false; | ||
| scope.showAddClientassetdetailsForm = false; | ||
| scope.showEditClientassetdetailsForm = false; | ||
| scope.showAddClienthouseholddetailsForm = false; | ||
| scope.showEditClienthouseholddetailsForm = false; | ||
| }; | ||
|
|
||
| function initTask(){ | ||
| scope.clientId = scope.taskconfig['clientId']; | ||
| scope.showSummary = true; | ||
| refreshAndShowSummaryView(); | ||
| }; | ||
|
|
||
| initTask(); | ||
|
|
||
| function incomeAndexpense(){ | ||
| resourceFactory.incomeExpenseAndHouseHoldExpense.getAll({clientId: scope.clientId},function(data){ | ||
| scope.incomeAndExpenses = data; | ||
| scope.totalIncomeOcc = scope.calculateOccupationTotal(); | ||
| scope.totalIncomeAsset = scope.calculateTotalAsset(); | ||
| scope.totalHouseholdExpense = scope.calculateTotalExpense(); | ||
| scope.showSummaryView(); | ||
| }); | ||
| }; | ||
|
|
||
| scope.calculateOccupationTotal = function(){ | ||
| var total = 0; | ||
| angular.forEach(scope.incomeAndExpenses, function(data){ | ||
| if(!_.isUndefined(data.incomeExpenseData.cashFlowCategoryData.categoryEnum) && data.incomeExpenseData.cashFlowCategoryData.categoryEnum.id == 1){ | ||
| if(!_.isUndefined(data.totalIncome) && !_.isNull(data.totalIncome)){ | ||
| total = total + data.totalIncome; | ||
| } | ||
| } | ||
| }); | ||
| return total; | ||
| }; | ||
|
|
||
| scope.calculateTotalAsset = function(){ | ||
| var total = 0; | ||
| angular.forEach(scope.incomeAndExpenses, function(data){ | ||
| if(!_.isUndefined(data.incomeExpenseData.cashFlowCategoryData.categoryEnum) && data.incomeExpenseData.cashFlowCategoryData.categoryEnum.id == 2){ | ||
| if(!_.isUndefined(data.totalIncome) && !_.isNull(data.totalIncome)){ | ||
| total = total + data.totalIncome; | ||
| } | ||
| } | ||
| }); | ||
| return total; | ||
| }; | ||
|
|
||
| scope.calculateTotalExpense = function(){ | ||
| var total = 0; | ||
| angular.forEach(scope.incomeAndExpenses, function(data){ | ||
| if(!_.isUndefined(data.incomeExpenseData.cashFlowCategoryData.typeEnum) && data.incomeExpenseData.cashFlowCategoryData.typeEnum.id == 2){ | ||
| if(!_.isUndefined(data.totalExpense) && !_.isNull(data.totalExpense)){ | ||
| total = total + data.totalExpense; | ||
| } | ||
| } | ||
| }); | ||
| return total; | ||
| }; | ||
|
|
||
| scope.showSummaryView = function(){ | ||
| hideAll(); | ||
| scope.showSummary = true; | ||
| }; | ||
|
|
||
| function refreshAndShowSummaryView(){ | ||
| incomeAndexpense(); | ||
| }; | ||
|
|
||
| //edit | ||
|
|
||
| scope.editClientoccupationdetails = function (incomeExpenseId) { | ||
| hideAll(); | ||
| scope.showEditClientoccupationdetailsForm = true; | ||
| initEditClientoccupationdetails(incomeExpenseId); | ||
| }; | ||
|
|
||
| scope.editClientassetdetails = function (incomeExpenseId) { | ||
| hideAll(); | ||
| scope.showEditClientassetdetailsForm = true; | ||
| initEditClientoccupationdetails(incomeExpenseId); | ||
| }; | ||
|
|
||
| scope.editClienthouseholddetails = function (incomeExpenseId) { | ||
| hideAll(); | ||
| scope.showEditClienthouseholddetailsForm = true; | ||
| initEditClientoccupationdetails(incomeExpenseId); | ||
| }; | ||
|
|
||
| function initEditClientoccupationdetails(incomeExpenseId) { | ||
| scope.incomeAndExpenseId = incomeExpenseId; | ||
| scope.formData = {}; | ||
| scope.formData.isMonthWiseIncome = false; | ||
| scope.isQuantifierNeeded = false; | ||
|
|
||
| resourceFactory.cashFlowCategoryResource.getAll({isFetchIncomeExpenseDatas: true}, function (data) { | ||
| scope.occupations = data; | ||
| }); | ||
|
|
||
| resourceFactory.incomeExpenseAndHouseHoldExpense.get({ | ||
| clientId: scope.clientId, | ||
| incomeAndExpenseId: scope.incomeAndExpenseId | ||
| }, function (data) { | ||
| angular.forEach(scope.occupations, function (occ) { | ||
| if (occ.id == data.incomeExpenseData.cashflowCategoryId) { | ||
| scope.occupationOption = occ; | ||
| } | ||
| }); | ||
| scope.formData.incomeExpenseId = data.incomeExpenseData.id; | ||
| scope.formData.quintity = data.quintity; | ||
| scope.formData.totalIncome = data.totalIncome; | ||
| scope.formData.totalExpense = data.totalExpense; | ||
| scope.formData.isPrimaryIncome = data.isPrimaryIncome; | ||
| scope.isQuantifierNeeded = data.incomeExpenseData.isQuantifierNeeded | ||
| scope.quantifierLabel = data.incomeExpenseData.quantifierLabel; | ||
| }); | ||
| }; | ||
|
|
||
| // create activity | ||
| scope.addClientoccupationdetails = function () { | ||
| hideAll(); | ||
| scope.showAddClientoccupationdetailsForm = true; | ||
| initAddClientoccupationdetails(); | ||
| }; | ||
|
|
||
| scope.addClientassetdetails = function () { | ||
| hideAll(); | ||
| scope.showAddClientassetdetailsForm = true; | ||
| initAddClientoccupationdetails(); | ||
| }; | ||
|
|
||
| scope.addClienthouseholddetails = function () { | ||
| hideAll(); | ||
| scope.showAddClienthouseholddetailsForm = true; | ||
| initAddClientoccupationdetails(); | ||
| }; | ||
|
|
||
| function initAddClientoccupationdetails(){ | ||
| scope.formData = {}; | ||
| scope.subOccupations = []; | ||
| scope.formData.clientMonthWiseIncomeExpense = []; | ||
| scope.formData.isMonthWiseIncome = false; | ||
| scope.isQuantifierNeeded = false; | ||
| scope.quantifierLabel = undefined; | ||
|
|
||
| resourceFactory.cashFlowCategoryResource.getAll({isFetchIncomeExpenseDatas: true}, function(data){ | ||
| scope.occupations = data; | ||
| }); | ||
| }; | ||
|
|
||
| scope.slectedOccupation = function(occupationId, subOccupationId){ | ||
| _.each(scope.occupations, function (occupation) { | ||
| if(occupation.id == occupationId){ | ||
| _.each(occupation.incomeExpenseDatas, function(iterate){ | ||
| if(iterate.cashflowCategoryId == occupationId && iterate.isQuantifierNeeded == true && iterate.id == subOccupationId){ | ||
| scope.quantifierLabel = iterate.quantifierLabel; | ||
| scope.isQuantifierNeeded = iterate.isQuantifierNeeded; | ||
| } else { | ||
| scope.isQuantifierNeeded = false; | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| }); | ||
| }; | ||
|
|
||
| scope.subOccupationNotAvailable = function(occupationId){ | ||
| _.each(scope.occupationOption, function(occupation){ | ||
| if(occupation == occupationId && _.isUndefined(occupation.incomeExpenseDatas)){ | ||
| scope.isQuantifierNeeded = false; | ||
| return scope.isQuantifierNeeded; | ||
| } | ||
| }) | ||
| }; | ||
|
|
||
| scope.addClientoccupationdetailsSubmit = function () { | ||
| scope.formData.locale = "en"; | ||
| resourceFactory.incomeExpenseAndHouseHoldExpense.save({clientId: scope.clientId},scope.formData, function (data) { | ||
| refreshAndShowSummaryView(); | ||
| }); | ||
| }; | ||
|
|
||
| scope.addClientassetdetailsSubmit = function () { | ||
| scope.addClientoccupationdetailsSubmit(); | ||
| }; | ||
|
|
||
| scope.addClienthouseholddetailsSubmit = function () { | ||
| scope.addClientoccupationdetailsSubmit(); | ||
| }; | ||
|
|
||
| scope.editClientoccupationdetailsSubmit = function () { | ||
| scope.formData.locale = "en"; | ||
| resourceFactory.incomeExpenseAndHouseHoldExpense.update({clientId: scope.clientId, incomeAndExpenseId: scope.incomeAndExpenseId}, | ||
| scope.formData, function (data) { | ||
| refreshAndShowSummaryView(); | ||
| }); | ||
| }; | ||
| } | ||
| }); | ||
| mifosX.ng.application.controller('cashflowActivityController', ['$scope', 'ResourceFactory', 'API_VERSION', '$location', '$http', '$routeParams', 'API_VERSION', '$upload', '$rootScope', mifosX.controllers.cashflowActivityController]).run(function ($log) { | ||
| $log.info("cashflowActivityController initialized"); | ||
| }); | ||
| }(mifosX.controllers || {})); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
23 changes: 23 additions & 0 deletions
23
app/scripts/controllers/task/activity/criteriacheckActivityController.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| (function (module) { | ||
| mifosX.controllers = _.extend(module, { | ||
| criteriacheckActivityController: function (scope, resourceFactory, API_VERSION, location, http, routeParams, API_VERSION, $upload, $rootScope, dateFilter) { | ||
|
|
||
| function initTask(){ | ||
|
|
||
| }; | ||
|
|
||
| initTask(); | ||
|
|
||
| scope.submit = function () { | ||
| scope.activityDone(); | ||
| }; | ||
|
|
||
| scope.runCriteriaCheck = function(){ | ||
| scope.taskCriteriaCheck(); | ||
| }; | ||
| } | ||
| }); | ||
| mifosX.ng.application.controller('criteriacheckActivityController', ['$scope', 'ResourceFactory', 'API_VERSION', '$location', '$http', '$routeParams', 'API_VERSION', '$upload', '$rootScope' ,'dateFilter', mifosX.controllers.criteriacheckActivityController]).run(function ($log) { | ||
| $log.info("criteriacheckActivityController initialized"); | ||
| }); | ||
| }(mifosX.controllers || {})); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.