-
Notifications
You must be signed in to change notification settings - Fork 99
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 #696 from mbayopanda/cashflow_rebased
Cashflow Report
- Loading branch information
Showing
38 changed files
with
1,627 additions
and
147 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
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,20 @@ | ||
| 'use strict'; | ||
|
|
||
| /** | ||
| * @name CashflowService | ||
| * @description | ||
| * The `CashflowService` component provide a mean to get cashflow data by requesting | ||
| * to the /finance/cashflow API | ||
| */ | ||
| angular.module('bhima.services') | ||
| .factory('CashflowService', CashflowService); | ||
|
|
||
| // dependencies injection | ||
| CashflowService.$inject = ['PrototypeApiService']; | ||
|
|
||
| // service definition | ||
| function CashflowService(PrototypeApiService) { | ||
| var service = new PrototypeApiService('/finance/cashflow/'); | ||
|
|
||
| return service; | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| angular.module('bhima.routes') | ||
| .config(['$stateProvider', function ($stateProvider) { | ||
| $stateProvider | ||
|
|
||
| /* cashflow page */ | ||
| .state('cashflow', { | ||
| url : '/finance/cashflow', | ||
| params: { dateFrom: null, dateTo: null, cashbox: null }, | ||
| controller : 'CashflowController as CashflowIndexCtrl', | ||
| templateUrl : 'partials/finance/cashflow/index.html' | ||
| }) | ||
|
|
||
| /* cashflow configuration */ | ||
| .state('cashflow.configure', { | ||
| controller : 'CashflowConfigController as CashflowConfigCtrl', | ||
| templateUrl : 'partials/finance/cashflow/config.html' | ||
| }) | ||
|
|
||
| /* cashflow report */ | ||
| .state('cashflow.report', { | ||
| controller : 'CashflowReportController as CashflowReportCtrl', | ||
| templateUrl : 'partials/finance/cashflow/report.html' | ||
| }); | ||
|
|
||
| }]); |
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,40 @@ | ||
| <!-- configuration panel --> | ||
| <div class="col-md-6 col-md-offset-3 panel panel-default"> | ||
| <div class="panel-body"> | ||
| <form name="ConfigForm" bh-submit="CashflowConfigCtrl.generate()" bh-form-defaults novalidate> | ||
|
|
||
| <!-- Date interval --> | ||
| <bh-date-interval | ||
| date-from="CashflowConfigCtrl.dateFrom" | ||
| date-to="CashflowConfigCtrl.dateTo"> | ||
| </bh-date-interval> | ||
|
|
||
| <!-- cashbox selection --> | ||
| <div class="form-group" | ||
| ng-class="{ 'has-error' : ConfigForm.$submitted && ConfigForm.cashbox.$invalid }"> | ||
| <label class="control-label"> | ||
| <span class="fa fa-briefcase"></span> {{ 'FORM.SELECT.CASHBOX' | translate }} | ||
| </label> | ||
| <select | ||
| class="form-control" | ||
| name="cashbox" | ||
| ng-model="CashflowConfigCtrl.cashbox" | ||
| ng-options="cash as cash.hrlabel for cash in CashflowConfigCtrl.cashboxes" | ||
| required> | ||
| <option value="" disabled>-- {{ 'FORM.SELECT.CASHBOX' | translate }} --</option> | ||
| </select> | ||
| <div class="help-block" ng-messages="ConfigForm.cashbox.$error" ng-show="ConfigForm.$submitted"> | ||
| <div ng-messages-include="partials/templates/messages.tmpl.html"></div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div data-submit-area class="text-right"> | ||
| <bh-loading-button loading-state="ConfigForm.$loading" | ||
| ng-disabled="ConfigForm.$invalid"> | ||
| {{ "FORM.BUTTONS.GENERATE" | translate }} | ||
| </bh-loading-button> | ||
| </div> | ||
|
|
||
| </form> | ||
| </div> | ||
| </div> |
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,43 @@ | ||
| 'use strict'; | ||
|
|
||
| angular.module('bhima.controllers') | ||
| .controller('CashflowConfigController', CashflowConfigController); | ||
|
|
||
| // dependencies injection | ||
| CashflowConfigController.$inject = [ '$state', 'CashboxService', 'NotifyService' ]; | ||
|
|
||
| /** | ||
| * Cashflow config controller | ||
| * | ||
| * @description | ||
| * This controller is responsible of cash flow report, that report include | ||
| * all incomes minus all depenses | ||
| */ | ||
| function CashflowConfigController($state, Cashbox, Notify) { | ||
| var vm = this; | ||
|
|
||
| // expose to the view | ||
| vm.generate = generate; | ||
|
|
||
| /** init */ | ||
| Cashbox.read(null, { detailed: 1, is_auxiliary: 0}) | ||
| .then(function (list) { | ||
| list.forEach(function (cashbox) { | ||
| cashbox.hrlabel = cashbox.label + ' ' + cashbox.symbol; | ||
| }); | ||
| vm.cashboxes = list; | ||
| }) | ||
| .catch(Notify.errorHandler); | ||
|
|
||
| /** generate cashflow report */ | ||
| function generate() { | ||
| if (!vm.cashbox || !vm.dateFrom || !vm.dateTo) { return ; } | ||
| var params = { | ||
| dateFrom : vm.dateFrom, | ||
| dateTo : vm.dateTo, | ||
| cashbox : vm.cashbox | ||
| }; | ||
| $state.go('cashflow.report', params); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.