From d936e221922db76f82cbd67c3678308c0d8177ce Mon Sep 17 00:00:00 2001 From: Bruce Mbayo Date: Mon, 27 Jun 2016 09:54:33 -0700 Subject: [PATCH 01/11] Transfer type for simple voucher --- bower.json | 3 +- client/src/i18n/en.json | 15 ++++++- client/src/i18n/fr.json | 15 ++++++- client/src/js/app.js | 18 ++++---- client/src/partials/vouchers/simple.html | 52 +++++++++++++++++++++++- client/src/partials/vouchers/simple.js | 47 +++++++++++++++++++-- 6 files changed, 134 insertions(+), 16 deletions(-) diff --git a/bower.json b/bower.json index bd2d20a721..11b52a75cd 100644 --- a/bower.json +++ b/bower.json @@ -35,7 +35,8 @@ "ngstorage": "^0.3.10", "Chart.js": "^2.1.6", "angular-chart.js": "~1.0.0-alpha6", - "components-font-awesome": "^4.6.3" + "components-font-awesome": "^4.6.3", + "angular-ui-select": "^0.18.0" }, "devDependencies": { "angular-mocks": "^1.5.6" diff --git a/client/src/i18n/en.json b/client/src/i18n/en.json index 53e3ea9a73..0f18c2597c 100644 --- a/client/src/i18n/en.json +++ b/client/src/i18n/en.json @@ -476,6 +476,7 @@ "TO_ACCOUNT" : "To Account", "TRANSACTION" : "Transaction", "TRANSFER_ACCOUNT" : "Transfer Account", + "TRANSFER_TYPE" : "Transfer Type", "TYPE" : "Type", "UNCONFIGURED" : "Unconfigured", "UPDATE" : "UPDATE", @@ -556,6 +557,7 @@ "SELECT_SECTOR" : "Select a sector", "SELECT_SERVICE" : "Select a Service", "SELECT_SEX" : "Select a sex", + "SELECT_TRANSFER_TYPE" : "Select a transfer type", "SELECT_USER" : "Select User", "SELECT_VILLAGE" : "Select village", "SELECT_ZS" : "Select an health zone" @@ -1137,7 +1139,18 @@ }, "VOUCHERS": { "SIMPLE": { - "TITLE" : "Simple Vouchers" + "CASH_PAYMENT" : "Client Payment", + "CASH_RETURN" : "Cash Return (Payback)", + "CONVENTION_PAYMENT" : "Convention Payment", + "EXPENSE" : "Expenses", + "INCOME" : "Incomes", + "SALARY_PAYMENT" : "Salary Payment", + "GENERIC_EXPENSE" : "Other Expenses", + "GENERIC_INCOME" : "Other Incomes", + "PURCHASES" : "Purchases", + "SUPPORT_INCOME" : "Support Incomes", + "TITLE" : "Simple Voucher", + "TRANSFER" : "Money Transfer" }, "COMPLEX": { "ADD_ITEMS" : "Add item(s)", diff --git a/client/src/i18n/fr.json b/client/src/i18n/fr.json index 1773d3c31d..ae20ac2585 100644 --- a/client/src/i18n/fr.json +++ b/client/src/i18n/fr.json @@ -475,6 +475,7 @@ "TO_ACCOUNT" : "Au Compte", "TRANSACTION" : "Transaction", "TRANSFER_ACCOUNT" : "Compte transfert", + "TRANSFER_TYPE" : "Type de Transfert", "TYPE" : "Type", "UNCONFIGURED" : "Non configuree", "UNIT" : "Forme galenique", @@ -555,6 +556,7 @@ "SELECT_SECTOR" : "Sélectionner secteur", "SELECT_SERVICE" : "Sélectionner un Service", "SELECT_SEX" : "Sélectionner le sexe", + "SELECT_TRANSFER_TYPE" : "Sélectionner le type de transfert", "SELECT_USER" : "Selectionner Utilisateur", "SELECT_VILLAGE" : "Sélectionner village", "SELECT_ZS" : "Sélectionner zone de sante" @@ -1144,7 +1146,18 @@ }, "VOUCHERS": { "SIMPLE": { - "TITLE" : "Bordereau de transfert" + "CASH_PAYMENT" : "Paiement des clients", + "CASH_RETURN" : "Remboursement", + "CONVENTION_PAYMENT" : "Paiement des Conventions", + "EXPENSE" : "Dépenses", + "INCOME" : "Récettes", + "SALARY_PAYMENT" : "Paiement des Salaires", + "GENERIC_EXPENSE" : "Autres Depenses", + "GENERIC_INCOME" : "Autres Recettes", + "PURCHASES" : "Achats", + "SUPPORT_INCOME" : "Paiement Prise en charge", + "TITLE" : "Bordereau de transfert", + "TRANSFER" : "Transfert d'argent" }, "COMPLEX": { "ADD_ITEMS" : "Ajouter item(s)", diff --git a/client/src/js/app.js b/client/src/js/app.js index f41ffc25a9..2e60d4dd56 100644 --- a/client/src/js/app.js +++ b/client/src/js/app.js @@ -358,14 +358,14 @@ function bhimaConfig($stateProvider, $urlRouterProvider, $urlMatcherFactoryProvi data : { label : null } }) - + /* Fiscal Year */ .state('fiscal', { url : '/fiscal/:id', abstract : true, params : { id : { squash : true, value : null } - }, + }, controller: 'FiscalController as FiscalCtrl', templateUrl: 'partials/fiscal/fiscal.html' }) @@ -960,7 +960,7 @@ function bhimaConfig($stateProvider, $urlRouterProvider, $urlMatcherFactoryProvi url : '/error404', templateUrl : 'partials/error404/error404.html' }); - + $urlRouterProvider.otherwise('/error404');} function translateConfig($translateProvider) { @@ -989,7 +989,7 @@ function startupConfig($rootScope, $state, SessionService, amMoment, Notify, $lo // navigating by URL. This is pure an authentication issue. $rootScope.$on('$locationChangeStart', function (event, next) { var isLoggedIn = !!SessionService.user; - var isLoginState = next.indexOf('#/login') !== -1; + var isLoginState = next.indexOf('#/login') !== -1; if (next.indexOf('/error403') !== -1) { $state.go('/error403'); @@ -1019,12 +1019,12 @@ function startupConfig($rootScope, $state, SessionService, amMoment, Notify, $lo // trigger a $state.go() to the login state, it will not be stopped - the // $locationChangeStart event will only prevent the URL from changing ... not // the actual state transition! So, we need this to stop $stateChange events. - + // var paths recovered all the path that the user is allowed to enter - // Tests if the path has elements and other common paths are not called - // if the test is positive, the current path is verified in the path list + // Tests if the path has elements and other common paths are not called + // if the test is positive, the current path is verified in the path list // if the current path does not exist in the path list in this case the user will rédirrigé to error403 page - + $rootScope.$on('$stateChangeStart', function (event, next) { var isLoggedIn = !!SessionService.user; var isLoginState = next.name.indexOf('login') !== -1; @@ -1043,7 +1043,7 @@ function startupConfig($rootScope, $state, SessionService, amMoment, Notify, $lo }); if(!authorized){ - $location.path('/error403'); + $location.path('/error403'); } } }); diff --git a/client/src/partials/vouchers/simple.html b/client/src/partials/vouchers/simple.html index 56e4e454d8..5ecdcf47ce 100644 --- a/client/src/partials/vouchers/simple.html +++ b/client/src/partials/vouchers/simple.html @@ -1,3 +1,24 @@ + @@ -24,10 +45,39 @@ > +
+ + +
+
- + @@ -100,7 +79,7 @@ + +
+ +
+
+

{{ model.enterprise.name }} ({{ model.enterprise.abbr}})

+ {{translate 'FORM.LABELS.PHONE'}}: {{ model.enterprise.phone }}
+ {{translate 'FORM.LABELS.EMAIL'}}: {{ model.enterprise.email }}
+
+
+   +
+
+ {{ model.project.name}} ({{ model.project.abbr }}) +
+
+ + +
+
+ + +

{{uppercase (translate 'VOUCHERS.TITLE') }}

+ + + + + + + + + + + + + + {{#each model.data }} + {{#if @first}} + + + + + + + + {{/if}} + {{/each}} + +
{{translate 'FORM.LABELS.REFERENCE'}}{{translate 'FORM.LABELS.DATE'}}{{translate 'FORM.LABELS.DESCRIPTION'}}{{translate 'FORM.LABELS.AMOUNT'}}{{translate 'FORM.LABELS.BY'}}
{{ reference }}{{date date }}{{ description }}{{currency amount }}{{ user }}
+
+
+ +
+ +
+ + + + + + + + + + + + {{#each model.data}} + + + + + + + {{/each}} + +
{{translate 'FORM.LABELS.ACCOUNT'}}{{translate 'FORM.LABELS.DESCRIPTION'}}{{translate 'FORM.LABELS.DEBIT'}}{{translate 'FORM.LABELS.CREDIT'}}
{{ number }}{{ label }}{{currency debit }}{{currency credit }}
+
+
+ + {{translate 'FORM.LABELS.SIGNATURE'}} +
+ +
diff --git a/server/controllers/finance/vouchers.js b/server/controllers/finance/vouchers.js index 8db351bad0..6712986f1a 100644 --- a/server/controllers/finance/vouchers.js +++ b/server/controllers/finance/vouchers.js @@ -17,6 +17,7 @@ const _ = require('lodash'); const uuid = require('node-uuid'); const util = require('../../lib/util'); const db = require('../../lib/db'); +const rm = require('../../lib/ReportManager'); const NotFound = require('../../lib/errors/NotFound'); const BadRequest = require('../../lib/errors/BadRequest'); const journal = require('./journal/voucher'); @@ -30,6 +31,9 @@ exports.detail = detail; /** Create a new voucher record */ exports.create = create; +/** Get the voucher report */ +exports.report = report; + /** * GET /vouchers * @@ -172,3 +176,35 @@ function create(req, res, next) { .catch(next) .done(); } + +/** +* GET /vouchers/report/:uuid +* +* @method report +*/ +function report(req, res, next) { + let reportUrl = './server/controllers/finance/reports/voucher.receipt.handlebars'; + let reportOptions = { pageSize : 'A5', orientation: 'landscape' }; + let sql = + `SELECT BUID(v.uuid) as uuid, v.date, v.project_id, v.currency_id, v.amount, + v.description, BUID(vi.document_uuid) as document_uuid, + v.user_id, BUID(vi.uuid) AS voucher_item_uuid, + vi.account_id, vi.debit, vi.credit, + a.number, a.label, + CONCAT(u.first, ' - ', u.last) AS user, + CONCAT(p.abbr, v.reference) AS reference + FROM voucher v + JOIN voucher_item vi ON vi.voucher_uuid = v.uuid + JOIN project p ON p.id = v.project_id + JOIN user u ON u.id = v.user_id + JOIN account a ON a.id = vi.account_id + WHERE v.uuid = ?`; + + db.exec(sql, db.bid(req.params.uuid)) + .then(rows => rm.build(rows, req, reportUrl, reportOptions)) + .spread(function (document, headers) { + res.set(headers).send(document); + }) + .catch(next) + .done(); +} diff --git a/server/lib/ReportManager.js b/server/lib/ReportManager.js new file mode 100644 index 0000000000..177fadb13e --- /dev/null +++ b/server/lib/ReportManager.js @@ -0,0 +1,70 @@ +'use strict'; + +const q = require('q'); +const path = require('path'); +const BadRequest = require('./errors/BadRequest'); +const supportedRender = { + json : require('./renderers/json'), + html : require('./renderers/html'), + pdf : require('./renderers/pdf') +}; + +const defaultRender = 'pdf'; +const defaultOptions = { pageSize : 'A4', orientation: 'landscape' }; +const contentType = { + 'pdf' : '"Content-Type" : "application/pdf"', + 'html' : '"Content-Type" : "application/html"', + 'json' : '"Content-Type" : "application/json"' +}; + +// export the receipt object +exports.build = build; + +/** + * @function build + * @desc build a report for inventory list of metadata + * @param {array} data inventory list of metadata + * @param {object} request the request which contains the renderer type (pdf, json, html, ...) + * @param {string} templateUrl the handlebars template url for the report + * @param {object} options the report page options + * @return {object} document the document blob + * @return {object} headers the document headers + * NOTE: the returned data are get by a spread(document, headers) function + * and the result is sended with res.set(headers).send(document) + */ +function build(data, req, templateUrl, options) { + 'use strict'; + + /** Requirement for report */ + let request = { + query : req.query, + enterprise : req.session.enterprise, + project : req.session.project + }; + + /* + * the template url is like this : + * './server/controllers/stock/inventory/receipts/list.handlebars' + */ + let template = path.normalize(templateUrl); + let queryString = request.query; + let renderTarget = (queryString && queryString.renderer) ? queryString.renderer : defaultRender; + let renderer = supportedRender[renderTarget]; + let pageOptions = options || defaultOptions; + + // header configurations + let headerKey = queryString.renderer || 'pdf'; + let headers = contentType[headerKey]; + + if (!renderer) { + throw new BadRequest('Render target provided is invalid or not supported by this report '.concat(renderTarget)); + } + + let model = { + enterprise : request.enterprise, + project : request.project, + data : data + }; + + return q.all([renderer.render({ model }, template, pageOptions), headers]); +} From 5b8659399419fc59d8a5fb741610ace234d6315f Mon Sep 17 00:00:00 2001 From: Bruce Mbayo Date: Tue, 28 Jun 2016 12:35:34 -0700 Subject: [PATCH 03/11] Fix and enhancement according the review --- client/src/js/services/PrototypeApiService.js | 6 +- client/src/js/services/VoucherService.js | 21 ++++--- .../templates/modals/reports.modal.html | 62 ++++++++++--------- .../templates/modals/reports.modal.js | 2 +- client/src/partials/vouchers/simple.html | 4 +- client/src/partials/vouchers/simple.js | 15 +---- client/test/e2e/shared/FormUtils.js | 4 +- client/test/e2e/vouchers/simple.spec.js | 10 ++- server/controllers/finance/vouchers.js | 40 ++++++------ server/lib/ReportManager.js | 19 +++--- 10 files changed, 98 insertions(+), 85 deletions(-) diff --git a/client/src/js/services/PrototypeApiService.js b/client/src/js/services/PrototypeApiService.js index e0d626ca9b..61b78030c9 100644 --- a/client/src/js/services/PrototypeApiService.js +++ b/client/src/js/services/PrototypeApiService.js @@ -171,14 +171,14 @@ function PrototypeApiService($http, util) { * Sends an HTTP GET request to the url "/route/reports/:id" * to get a document as a report. * - * @param {Number} id - the identifier of the URL route. + * @param {String} param - A parameter for the URL route. * @param {String} filetype - the report file type (pdf, json, html) * @returns {Promise} - the promise */ - function report(id, filetype) { + function report(param, filetype) { // append the id to the base url - var target = this.url.concat('reports/', id); + var target = this.url.concat('reports/', param); // filetype setup var responseType = filetype === 'pdf' ? 'arraybuffer' : null; diff --git a/client/src/js/services/VoucherService.js b/client/src/js/services/VoucherService.js index e101746d31..f86b5038dc 100644 --- a/client/src/js/services/VoucherService.js +++ b/client/src/js/services/VoucherService.js @@ -18,10 +18,22 @@ function VoucherService(PrototypeApiService) { // inherit prototype API service methods angular.extend(service, PrototypeApiService); + // transfer type + service.transferType = [ + { id: 0, text: 'VOUCHERS.SIMPLE.GENERIC_INCOME', incomeExpense: 'income', prefix: 'REC. GEN' }, + { id: 1, text: 'VOUCHERS.SIMPLE.CASH_PAYMENT', incomeExpense: 'income', prefix: 'CASH' }, + { id: 2, text: 'VOUCHERS.SIMPLE.CONVENTION_PAYMENT', incomeExpense: 'income', prefix: 'CONV' }, + { id: 3, text: 'VOUCHERS.SIMPLE.SUPPORT_INCOME', incomeExpense: 'income', prefix: 'PEC' }, + { id: 4, text: 'VOUCHERS.SIMPLE.TRANSFER', incomeExpense: 'income', prefix: 'TRANSF' }, + { id: 5, text: 'VOUCHERS.SIMPLE.GENERIC_EXPENSE', incomeExpense: 'expense', prefix: 'DEP. GEN' }, + { id: 6, text: 'VOUCHERS.SIMPLE.SALARY_PAYMENT', incomeExpense: 'expense', prefix: 'SALAIRE' }, + { id: 7, text: 'VOUCHERS.SIMPLE.CASH_RETURN', incomeExpense: 'expense', prefix: 'PAYBACK' }, + { id: 8, text: 'VOUCHERS.SIMPLE.PURCHASES', incomeExpense: 'expense', prefix: 'ACHAT' } + ]; + service.url = '/vouchers/'; service.createSimple = createSimple; service.create = create; - service.report = report; /** * Wraps the prototype create method. @@ -30,13 +42,6 @@ function VoucherService(PrototypeApiService) { return PrototypeApiService.create.call(service, { voucher : voucher }); } - /** - * Wraps the prototype report method. - */ - function report(id, filetype) { - return PrototypeApiService.report.call(service, id, filetype); - } - /** * @method createSimple * diff --git a/client/src/partials/templates/modals/reports.modal.html b/client/src/partials/templates/modals/reports.modal.html index 2b262c2f9e..445fff9d3f 100644 --- a/client/src/partials/templates/modals/reports.modal.html +++ b/client/src/partials/templates/modals/reports.modal.html @@ -1,35 +1,39 @@ -
+
+
- -
- -
+ +
+ +
- -
-
-
+ +
+
+
+
-
-
+
-
- - +
+ + +
diff --git a/client/src/partials/templates/modals/reports.modal.js b/client/src/partials/templates/modals/reports.modal.js index abdf042767..37ba8461e7 100644 --- a/client/src/partials/templates/modals/reports.modal.js +++ b/client/src/partials/templates/modals/reports.modal.js @@ -8,7 +8,7 @@ ReportsModalController.$inject = [ /** * Reports Modal Controller - * This controller is responsible display document as report + * This controller is responsible display document as report */ function ReportsModalController(Receipts, Instance, $sce, $window, Data) { var vm = this; diff --git a/client/src/partials/vouchers/simple.html b/client/src/partials/vouchers/simple.html index 09df5e3b66..de89c7a72b 100644 --- a/client/src/partials/vouchers/simple.html +++ b/client/src/partials/vouchers/simple.html @@ -33,12 +33,12 @@ - + - +
diff --git a/client/src/partials/vouchers/simple.js b/client/src/partials/vouchers/simple.js index 78c4a50c42..ed9b529eb5 100644 --- a/client/src/partials/vouchers/simple.js +++ b/client/src/partials/vouchers/simple.js @@ -31,17 +31,7 @@ function SimpleJournalVoucherController(AppCache, Vouchers, Accounts, Session, u ]; // transfer type - vm.transferType = [ - { id: 0, text: 'VOUCHERS.SIMPLE.GENERIC_INCOME', incomeExpense: 'income', prefix: 'REC. GEN' }, - { id: 1, text: 'VOUCHERS.SIMPLE.CASH_PAYMENT', incomeExpense: 'income', prefix: 'CASH' }, - { id: 2, text: 'VOUCHERS.SIMPLE.CONVENTION_PAYMENT', incomeExpense: 'income', prefix: 'CONV' }, - { id: 3, text: 'VOUCHERS.SIMPLE.SUPPORT_INCOME', incomeExpense: 'income', prefix: 'PEC' }, - { id: 4, text: 'VOUCHERS.SIMPLE.TRANSFER', incomeExpense: 'income', prefix: 'TRANSF' }, - { id: 5, text: 'VOUCHERS.SIMPLE.GENERIC_EXPENSE', incomeExpense: 'expense', prefix: 'DEP. GEN' }, - { id: 6, text: 'VOUCHERS.SIMPLE.SALARY_PAYMENT', incomeExpense: 'expense', prefix: 'SALAIRE' }, - { id: 7, text: 'VOUCHERS.SIMPLE.CASH_RETURN', incomeExpense: 'expense', prefix: 'PAYBACK' }, - { id: 8, text: 'VOUCHERS.SIMPLE.PURCHASES', incomeExpense: 'expense', prefix: 'ACHAT' } - ]; + vm.transferType = Vouchers.transferType; // expose methods to the view vm.submit = submit; @@ -93,9 +83,6 @@ function SimpleJournalVoucherController(AppCache, Vouchers, Accounts, Session, u }) .then(function () { - // Notify for the success of the action - Notify.success('FORM.INFO.UPDATE_SUCCESS'); - // setup the voucher object to init state form.$setPristine(); vm.incomeExpense = undefined; diff --git a/client/test/e2e/shared/FormUtils.js b/client/test/e2e/shared/FormUtils.js index 438453742b..c52e7ee56e 100644 --- a/client/test/e2e/shared/FormUtils.js +++ b/client/test/e2e/shared/FormUtils.js @@ -23,7 +23,9 @@ const buttons = { // data tags used in form buttons. var modal = { submit: function submit() { return $('[uib-modal-window] [data-method="submit"]').click(); }, - cancel: function cancel() { return $('[uib-modal-window] [data-method="cancel"]').click(); } + cancel: function cancel() { return $('[uib-modal-window] [data-method="cancel"]').click(); }, + close: function close() { return $('[uib-modal-window] [data-method="close"]').click(); }, + print: function print() { return $('[uib-modal-window] [data-method="print"]').click(); } }; // convenience methods to see if the form contains feedback text. Returns locators. diff --git a/client/test/e2e/vouchers/simple.spec.js b/client/test/e2e/vouchers/simple.spec.js index d207d766f1..f6e34ca5d5 100644 --- a/client/test/e2e/vouchers/simple.spec.js +++ b/client/test/e2e/vouchers/simple.spec.js @@ -13,6 +13,7 @@ describe('Simple Vouchers', function () { const voucher = { date: yesterday, + type: 'transfer', toAccount: 'Test Debtor Accounts 1', fromAccount: 'Test Inventory Accounts', description: 'Awesome description', @@ -25,6 +26,8 @@ describe('Simple Vouchers', function () { components.dateEditor.set(voucher.date); FU.input('SimpleVoucherCtrl.voucher.description', voucher.description); + element(by.model('SimpleVoucherCtrl.selectedType')).click(); + element(by.css('[data-item="1"]')).click(); // select the appropriate accounts FU.typeahead('SimpleVoucherCtrl.voucher.fromAccount', voucher.fromAccount); @@ -35,6 +38,11 @@ describe('Simple Vouchers', function () { // submit the form FU.buttons.submit(); - components.notification.hasSuccess(); + + // is the modal is openned + FU.exists(by.css('[data-modal-box]'), true); + + // close the modal + FU.modal.close(); }); }); diff --git a/server/controllers/finance/vouchers.js b/server/controllers/finance/vouchers.js index 6712986f1a..efdfc2205b 100644 --- a/server/controllers/finance/vouchers.js +++ b/server/controllers/finance/vouchers.js @@ -72,16 +72,8 @@ function list(req, res, next) { * @method detail */ function detail(req, res, next) { - var query = - `SELECT BUID(v.uuid) as uuid, v.date, v.project_id, v.reference, v.currency_id, v.amount, - v.description, BUID(vi.document_uuid), v.user_id, BUID(vi.uuid) AS voucher_item_uuid, - vi.account_id, vi.debit, vi.credit - FROM voucher v JOIN voucher_item vi ON vi.voucher_uuid = v.uuid - WHERE v.uuid = ?;`; - - var id = db.bid(req.params.uuid); - db.exec(query, id) + getVouchers(req.params.uuid) .then(function (rows) { if (!rows.length) { throw new NotFound(`Could not find a voucher with id ${req.params.id}`); @@ -185,6 +177,23 @@ function create(req, res, next) { function report(req, res, next) { let reportUrl = './server/controllers/finance/reports/voucher.receipt.handlebars'; let reportOptions = { pageSize : 'A5', orientation: 'landscape' }; + + getVouchers(req.params.uuid) + .then(rows => rm.build(req, rows, reportUrl, reportOptions)) + .spread(function (document, headers) { + res.set(headers).send(document); + }) + .catch(next) + .done(); +} + +/** + * @function getVouchers + * @param {null|string} uuid The voucher uuid, returns list of voucher according the uuid + * @param {null|object} query The req.query object, retunrs list of voucher according the query, + * @return promise + */ +function getVouchers(uuid) { let sql = `SELECT BUID(v.uuid) as uuid, v.date, v.project_id, v.currency_id, v.amount, v.description, BUID(vi.document_uuid) as document_uuid, @@ -197,14 +206,9 @@ function report(req, res, next) { JOIN voucher_item vi ON vi.voucher_uuid = v.uuid JOIN project p ON p.id = v.project_id JOIN user u ON u.id = v.user_id - JOIN account a ON a.id = vi.account_id - WHERE v.uuid = ?`; + JOIN account a ON a.id = vi.account_id `; - db.exec(sql, db.bid(req.params.uuid)) - .then(rows => rm.build(rows, req, reportUrl, reportOptions)) - .spread(function (document, headers) { - res.set(headers).send(document); - }) - .catch(next) - .done(); + sql += uuid ? 'WHERE v.uuid = ?' : ''; + + return db.exec(sql, [db.bid(uuid)]); } diff --git a/server/lib/ReportManager.js b/server/lib/ReportManager.js index 177fadb13e..7b16844f3f 100644 --- a/server/lib/ReportManager.js +++ b/server/lib/ReportManager.js @@ -32,16 +32,23 @@ exports.build = build; * NOTE: the returned data are get by a spread(document, headers) function * and the result is sended with res.set(headers).send(document) */ -function build(data, req, templateUrl, options) { +function build(req, data, templateUrl, options) { 'use strict'; - /** Requirement for report */ + // Requirement for report let request = { query : req.query, enterprise : req.session.enterprise, project : req.session.project }; + // The model to send to the view template + let model = { + enterprise : request.enterprise, + project : request.project, + data : data + }; + /* * the template url is like this : * './server/controllers/stock/inventory/receipts/list.handlebars' @@ -60,11 +67,7 @@ function build(data, req, templateUrl, options) { throw new BadRequest('Render target provided is invalid or not supported by this report '.concat(renderTarget)); } - let model = { - enterprise : request.enterprise, - project : request.project, - data : data - }; + const report = renderer.render({ model }, template, pageOptions); - return q.all([renderer.render({ model }, template, pageOptions), headers]); + return q.all([report, headers]); } From c0046b563e0f2956f40a5e052d6bcb7c48397724 Mon Sep 17 00:00:00 2001 From: Bruce Mbayo Date: Tue, 28 Jun 2016 13:54:32 -0700 Subject: [PATCH 04/11] Fix i18n ortograpn --- client/src/i18n/fr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/i18n/fr.json b/client/src/i18n/fr.json index 8e77f44038..a7b50cdbe4 100644 --- a/client/src/i18n/fr.json +++ b/client/src/i18n/fr.json @@ -1187,7 +1187,7 @@ "REFERENCE" : "Reference", "ROWS" : "Ligne(s)", "SELECT_DOCUMENT_TYPE" : "Veuillez selectionner le type de document", - "TITLE" : "Ajour de transactions", + "TITLE" : "Ajout des transactions", "VALID_TOTALS" : "Les transactions sont valides (Transactions balancées)", "VOUCHER" : "Bordereau de Transfert" } From f647b0b77b70c07ff83d512c849bada2bd5246c0 Mon Sep 17 00:00:00 2001 From: Bruce Mbayo Date: Tue, 28 Jun 2016 14:12:52 -0700 Subject: [PATCH 05/11] Fix es6 standards for old version of node --- server/controllers/finance/vouchers.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/controllers/finance/vouchers.js b/server/controllers/finance/vouchers.js index 40f6f039fd..79e99e1c71 100644 --- a/server/controllers/finance/vouchers.js +++ b/server/controllers/finance/vouchers.js @@ -13,6 +13,8 @@ * @requires lib/errors/NotFound */ +'use strict'; + const _ = require('lodash'); const uuid = require('node-uuid'); const util = require('../../lib/util'); @@ -72,7 +74,8 @@ function list(req, res, next) { * @method detail */ function detail(req, res, next) { - + 'use strict'; + getVouchers(req.params.uuid) .then(function (rows) { if (!rows.length) { @@ -196,6 +199,8 @@ function report(req, res, next) { * @return promise */ function getVouchers(uuid) { + 'use strict'; + let sql = `SELECT BUID(v.uuid) as uuid, v.date, v.project_id, v.currency_id, v.amount, v.description, BUID(vi.document_uuid) as document_uuid, From 3711adbab0a71873a1fc7139b302ca73b688e9d3 Mon Sep 17 00:00:00 2001 From: Bruce Mbayo Date: Wed, 6 Jul 2016 10:39:17 -0700 Subject: [PATCH 06/11] Vouchers registry implementation --- client/src/i18n/en.json | 44 ++-- client/src/i18n/fr.json | 44 ++-- client/src/js/app.js | 5 + client/src/js/components/bhPDFPrint.js | 6 +- client/src/js/services/ModalService.js | 22 ++ client/src/js/services/PrototypeApiService.js | 19 +- client/src/partials/inventory/list/list.js | 15 +- .../partials/templates/modals/dateInterval.js | 69 ++++++ .../templates/modals/dateInterval.tmpl.html | 60 ++++++ .../templates/modals/reports.modal.html | 5 + .../templates/modals/reports.modal.js | 53 +++-- client/src/partials/vouchers/records.html | 21 ++ client/src/partials/vouchers/records.js | 196 ++++++++++++++++++ client/src/partials/vouchers/simple.js | 10 +- server/config/routes.js | 3 +- .../reports/voucher.receipt.handlebars | 2 +- .../finance/reports/voucher.report.handlebars | 62 ++++++ server/controllers/finance/vouchers.js | 98 +++++++-- server/lib/ReportManager.js | 8 +- server/lib/util.js | 33 ++- server/models/schema.sql | 1 + server/models/test/data.sql | 8 +- 22 files changed, 688 insertions(+), 96 deletions(-) create mode 100644 client/src/partials/templates/modals/dateInterval.js create mode 100644 client/src/partials/templates/modals/dateInterval.tmpl.html create mode 100644 client/src/partials/vouchers/records.html create mode 100644 client/src/partials/vouchers/records.js create mode 100644 server/controllers/finance/reports/voucher.report.handlebars diff --git a/client/src/i18n/en.json b/client/src/i18n/en.json index 246466f99e..0e281659f9 100644 --- a/client/src/i18n/en.json +++ b/client/src/i18n/en.json @@ -364,7 +364,9 @@ "CREATED" : "Created", "DATE" : "Date", "DATE_CREATED" : "Date Created", + "DATE_FROM" : "Start", "DATE_REGISTRATION" : "Registration Date", + "DATE_TO" : "End", "DEBIT" : "Debit", "DEBITOR_GROUP" : "Debtor Group", "DEBTOR_GROUP" : "Form debtor group record", @@ -440,6 +442,7 @@ "NO_DISTRIBUTABLE" : "Not distributable", "OPTIONAL_INFO" : "Optional Information", "ORIGIN_LOCATION" : "Origin Location", + "OTHER" : "Other", "PARENT_ACCOUNT" : "Parent Account", "PASSIVE" : "Passive", "PASSWORD" : "Password", @@ -494,8 +497,11 @@ "SUBSIDIES" : "Subsidies Applied", "TEL" : "TEL", "TELEPHONE" : "Telephone", + "THIS_MONTH" : "This Month", + "THIS_WEEK" : "This week", "TITLE" : "Title", "TITLE_ACCOUNT" : "Title Account", + "TODAY" : "Today", "TOTAL" : "Total", "TOTAL_BILLED" : "Total Billed", "TOTAL_PAID" : "Total Paid", @@ -505,6 +511,7 @@ "TRANSFER_TYPE" : "Transfer Type", "TYPE" : "Type", "UNCONFIGURED" : "Unconfigured", + "UNDEFINED" : "Undefined", "UPDATE" : "UPDATE", "UPDATE_GROUP_DEBTOR" : "Debtor group assignment updated", "UPDATE_PATIENT_GROUP" : "Patient group membership updated", @@ -562,6 +569,7 @@ "SELECT_COUNTRY" : "Select Country", "SELECT_CREDITOR" : "Select a creditor", "SELECT_CREDITOR_GROUP" : "Select a Creditor Group", + "SELECT_DATE_INTERVAL" : "Select a date interval", "SELECT_DEBITOR_GROUP" : "Select a Debtor Group", "SELECT_ENTERPRISE" : "Select an Enterprise", "SELECT_FUNCTION" : "Select function", @@ -1154,7 +1162,8 @@ "TRANSACTIONS_BY_ACCOUNT" : "Transactions by Account", "UPDATE_STOCK" : "Update stock", "USERS" : "Users", - "VALIDATE_PURCHASE" : "Validation" + "VALIDATE_PURCHASE" : "Validation", + "VOUCHER_RECORDS" : "Voucher records" }, "VILLAGE": { "CONFIG" : "Village Manager Configuration", @@ -1167,21 +1176,6 @@ "TITLE" : "Village Management" }, "VOUCHERS": { - "SIMPLE": { - "CASH_PAYMENT" : "Client Payment", - "CASH_RETURN" : "Cash Return (Payback)", - "CONVENTION_PAYMENT" : "Convention Payment", - "EXPENSE" : "Expenses", - "INCOME" : "Incomes", - "SALARY_PAYMENT" : "Salary Payment", - "GENERIC_EXPENSE" : "Other Expenses", - "GENERIC_INCOME" : "Other Incomes", - "PURCHASES" : "Purchases", - "SUPPORT_INCOME" : "Support Incomes", - "TITLE" : "Simple Voucher", - "TRANSFER" : "Money Transfer" - }, - "TITLE" : "Voucher", "COMPLEX": { "ADD_ITEMS" : "Add item(s)", "CASH_PAYMENT" : "Cash Payment", @@ -1203,6 +1197,24 @@ "TITLE" : "Advanced Journal Vouchers", "VALID_TOTALS" : "Transactions are valid (balanced transaction)", "VOUCHER" : "Voucher" + }, + "GLOBAL" : { + "REPORT" : "Voucher Report", + "TITLE" : "Voucher" + }, + "SIMPLE": { + "CASH_PAYMENT" : "Client Payment", + "CASH_RETURN" : "Cash Return (Payback)", + "CONVENTION_PAYMENT" : "Convention Payment", + "EXPENSE" : "Expenses", + "INCOME" : "Incomes", + "SALARY_PAYMENT" : "Salary Payment", + "GENERIC_EXPENSE" : "Other Expenses", + "GENERIC_INCOME" : "Other Incomes", + "PURCHASES" : "Purchases", + "SUPPORT_INCOME" : "Support Incomes", + "TITLE" : "Simple Voucher", + "TRANSFER" : "Money Transfer" } }, "GRAPHS" : { diff --git a/client/src/i18n/fr.json b/client/src/i18n/fr.json index b9ae9b8f42..1cd0a4bd80 100644 --- a/client/src/i18n/fr.json +++ b/client/src/i18n/fr.json @@ -350,7 +350,9 @@ "CURRENT_LOCATION" : "Localisation actuelle", "DATE" : "Date", "DATE_CREATED" : "Date de création", + "DATE_FROM" : "Debut", "DATE_REGISTRATION" : "Date d'enregistrement", + "DATE_TO" : "Fin", "DEBIT" : "Débit", "DEBITOR_GROUP" : "Groupe Débiteur", "DEBTOR_GROUP" : "Formulaire d'enregistrement de groupe débiteur", @@ -425,6 +427,7 @@ "NO_DISTRIBUTABLE" : "Non distribuable", "OPTIONAL_INFO" : "Informations optionnelles", "ORIGIN_LOCATION" : "Localisation d'origine", + "OTHER" : "Autre", "PASSIVE" : "Passive", "PASSWORD" : "Mot de passe", "PATIENT" : "patient", @@ -478,8 +481,11 @@ "SUBSIDIES" : "Les subventions appliqués", "TEL" : "Tél", "TELEPHONE" : "Téléphone", + "THIS_MONTH" : "Ce Mois", + "THIS_WEEK" : "Cette Semaine", "TITLE" : "Titre", "TITLE_ACCOUNT" : "Comptes Titre", + "TODAY" : "Aujourd'hui", "TOTAL" : "Total", "TOTAL_BILLED" : "Total Facture", "TOTAL_PAID" : "Total paye", @@ -489,6 +495,7 @@ "TRANSFER_TYPE" : "Type de Transfert", "TYPE" : "Type", "UNCONFIGURED" : "Non configuree", + "UNDEFINED" : "Non defini", "UNIT" : "Forme galenique", "UNIT_WEIGHT" : "Poids", "UNIT_VOLUME" : "Volume", @@ -546,6 +553,7 @@ "SELECT_COUNTRY" : "Sélectionner pays", "SELECT_CREDITOR" : "Sélectionner un Créditeur", "SELECT_CREDITOR_GROUP" : "Sélectionner Groupe de créditeurs", + "SELECT_DATE_INTERVAL" : "Sélectionner un intervalle de date", "SELECT_DEBITOR_GROUP" : "Sélectionner Groupe de Débiteurs", "SELECT_ENTERPRISE" : "Sélectionner entreprise", "SELECT_FUNCTION" : "Sélectionner une fonction", @@ -1146,7 +1154,8 @@ "TRANSACTIONS_BY_ACCOUNT" : "Transactions par Compte", "UPDATE_STOCK" : "Mettre à Jour les Stocks", "USERS" : "Utilisateurs", - "VALIDATE_PURCHASE" : "Validation" + "VALIDATE_PURCHASE" : "Validation", + "VOUCHER_RECORDS" : "Registre des Bordereaux" }, "VILLAGE": { "CONFIG" : "Configuration de Gestion des Villages", @@ -1159,21 +1168,6 @@ "TITLE" : "Gestion des Villages" }, "VOUCHERS": { - "SIMPLE": { - "CASH_PAYMENT" : "Paiement des clients", - "CASH_RETURN" : "Remboursement", - "CONVENTION_PAYMENT" : "Paiement des Conventions", - "EXPENSE" : "Dépenses", - "INCOME" : "Récettes", - "SALARY_PAYMENT" : "Paiement des Salaires", - "GENERIC_EXPENSE" : "Autres Depenses", - "GENERIC_INCOME" : "Autres Recettes", - "PURCHASES" : "Achats", - "SUPPORT_INCOME" : "Paiement Prise en charge", - "TITLE" : "Bordereau de transfert", - "TRANSFER" : "Transfert d'argent" - }, - "TITLE" : "Quittance", "COMPLEX": { "ADD_ITEMS" : "Ajouter item(s)", "CASH_PAYMENT" : "Paiement Caisse", @@ -1195,6 +1189,24 @@ "TITLE" : "Ajout des transactions", "VALID_TOTALS" : "Les transactions sont valides (Transactions balancées)", "VOUCHER" : "Bordereau de Transfert" + }, + "GLOBAL" : { + "REPORT" : "Rapport des Quittances", + "TITLE" : "Quittance" + }, + "SIMPLE": { + "CASH_PAYMENT" : "Paiement des clients", + "CASH_RETURN" : "Remboursement", + "CONVENTION_PAYMENT" : "Paiement des Conventions", + "EXPENSE" : "Dépenses", + "INCOME" : "Récettes", + "SALARY_PAYMENT" : "Paiement des Salaires", + "GENERIC_EXPENSE" : "Autres Depenses", + "GENERIC_INCOME" : "Autres Recettes", + "PURCHASES" : "Achats", + "SUPPORT_INCOME" : "Paiement Prise en charge", + "TITLE" : "Bordereau de transfert", + "TRANSFER" : "Transfert d'argent" } } } diff --git a/client/src/js/app.js b/client/src/js/app.js index 30b4ab305a..ab17c63bee 100644 --- a/client/src/js/app.js +++ b/client/src/js/app.js @@ -218,6 +218,11 @@ function bhimaConfig($stateProvider, $urlRouterProvider, $urlMatcherFactoryProvi controller: 'ComplexJournalVoucherController as ComplexVoucherCtrl', templateUrl: 'partials/vouchers/complex.html' }) + .state('vouchersRecords', { + url : '/vouchers/records', + controller: 'VouchersRecordsController as VouchersRecordsCtrl', + templateUrl: 'partials/vouchers/records.html' + }) /* 2.X Journal routes */ .state('journal', { diff --git a/client/src/js/components/bhPDFPrint.js b/client/src/js/components/bhPDFPrint.js index 0a3b234f1b..b2f0d071bb 100644 --- a/client/src/js/components/bhPDFPrint.js +++ b/client/src/js/components/bhPDFPrint.js @@ -13,7 +13,7 @@ angular.module('bhima.components') controller : bhPDFPrintController }); -bhPDFPrintController.$inject = ['$window', '$http', '$sce', '$timeout']; +bhPDFPrintController.$inject = ['$window', '$http', '$sce', '$timeout', 'uuid']; /** * @class bhPDFPrintController @@ -41,7 +41,7 @@ bhPDFPrintController.$inject = ['$window', '$http', '$sce', '$timeout']; * options="options"> * */ -function bhPDFPrintController($window, $http, $sce, $timeout) { +function bhPDFPrintController($window, $http, $sce, $timeout, uuid) { var cachedRequest; var component = this; @@ -57,7 +57,7 @@ function bhPDFPrintController($window, $http, $sce, $timeout) { var loadingIndicatorDelay = 1000; component.$loading = false; - component.embeddedContentId = 'pdfdirect'; + component.embeddedContentId = 'pdfdirect' + Date.now(); // expose the print method to the view component.print = print; diff --git a/client/src/js/services/ModalService.js b/client/src/js/services/ModalService.js index eab6d8dd14..8d55af8e1c 100644 --- a/client/src/js/services/ModalService.js +++ b/client/src/js/services/ModalService.js @@ -53,6 +53,9 @@ function ModalService(Modal) { // inventory list action : add or edit service.openInventoryListActions = openInventoryListActions; + // date interval modal + service.openDateInterval = openDateInterval; + /** * Opens a "confirm delete" modal with a button for "Confirm" or "Cancel". * The modal is a safe replacement for $window.confirm(), since you cannot @@ -279,4 +282,23 @@ function ModalService(Modal) { return instance.result; } + /** Find by Date interval modal */ + function openDateInterval(request) { + + var params = angular.extend(modalParameters, { + templateUrl : 'partials/templates/modals/dateInterval.tmpl.html', + controller : 'DateIntervalModalController', + controllerAs : '$ctrl', + size : 'xs', + backdrop : 'static', + animation : false, + resolve : { + data : function dataProvider() { return request; } + } + }); + + var instance = Modal.open(params); + return instance.result; + } + } diff --git a/client/src/js/services/PrototypeApiService.js b/client/src/js/services/PrototypeApiService.js index 61b78030c9..209a0129ff 100644 --- a/client/src/js/services/PrototypeApiService.js +++ b/client/src/js/services/PrototypeApiService.js @@ -179,16 +179,31 @@ function PrototypeApiService($http, util) { // append the id to the base url var target = this.url.concat('reports/', param); + return reportBuilder(this, param, filetype); + } + + /** + * Receipt + */ + function report(param, filetype) { + // append the id to the base url + var target = this.url.concat('receipts/', param); + return reportBuilder(this, param, filetype); + } + + /** report builder */ + function reportBuilder(container, param, filetype) { // filetype setup var responseType = filetype === 'pdf' ? 'arraybuffer' : null; var params = { renderer: filetype }; // send the GET request - return this.$http.get(target, { + return container.$http.get(target, { params: params, responseType: responseType }) - .then(util.unwrapHttpResponse); + .then(util.unwrapHttpResponse); } + } diff --git a/client/src/partials/inventory/list/list.js b/client/src/partials/inventory/list/list.js index 44e6315f3d..a180c00394 100644 --- a/client/src/partials/inventory/list/list.js +++ b/client/src/partials/inventory/list/list.js @@ -128,20 +128,7 @@ function InventoryListController ($translate, Inventory, Notify, uiGridConstants /** print inventory list */ function printList() { - var buttonState = JSON.parse(JSON.stringify(vm.bcButtons[2])); - vm.bcButtons[2].disabled = true; - vm.bcButtons[2].icon = 'fa fa-spinner fa-pulse'; - - Inventory.report('pdf') - .then(function (result) { - vm.report = result; - return Modal.openReports({ report: vm.report, renderer: 'pdf' }); - }) - .then(function () { - vm.bcButtons[2] = JSON.parse(JSON.stringify(buttonState)); - vm.bcButtons[2].action = printList; - }) - .catch(Notify.errorHandler); + Modal.openReports({ url: '/inventory/reports/metadata', renderer: 'pdf' }); } /** startup */ diff --git a/client/src/partials/templates/modals/dateInterval.js b/client/src/partials/templates/modals/dateInterval.js new file mode 100644 index 0000000000..452aca27a9 --- /dev/null +++ b/client/src/partials/templates/modals/dateInterval.js @@ -0,0 +1,69 @@ +angular.module('bhima.controllers') +.controller('DateIntervalModalController', DateIntervalModalController); + +DateIntervalModalController.$inject = ['$uibModalInstance']; + +/** + * Date Interval Modal + * This controller permit to select Interval of date + * it returns the result as dateFrom and dateTo + */ +function DateIntervalModalController (Instance) { + var vm = this; + + vm.options = [ + { label : 'FORM.LABELS.TODAY', fn : day }, + { label : 'FORM.LABELS.THIS_WEEK', fn : week }, + { label : 'FORM.LABELS.THIS_MONTH', fn : month }, + { label : 'FORM.LABELS.OTHER', fn : other }, + ]; + + // expose to the viewe + vm.search = search; + vm.submit = submit; + vm.close = close; + + // start up the modal + startup(); + + // submit + function submit() { + Instance.close({ dateFrom: vm.dateFrom, dateTo: vm.dateTo }); + } + + // close + function close() { + Instance.dismiss(); + } + + function search (selection) { + vm.selected = selection.label; + selection.fn(); + } + + function day () { + vm.dateFrom = new Date(); + vm.dateTo = new Date(); + } + + function week () { + vm.dateFrom = new Date(); + vm.dateTo = new Date(); + vm.dateFrom.setDate(vm.dateTo.getDate() - vm.dateTo.getDay()); + } + + function other () { + vm.dateFrom = new Date(null); // start at the beginning + vm.dateTo = new Date(); + } + + function month () { + vm.dateFrom = new Date(); + vm.dateTo = new Date(); + vm.dateFrom.setDate(1); + } + + function startup() { + search(vm.options[0]); + } +} diff --git a/client/src/partials/templates/modals/dateInterval.tmpl.html b/client/src/partials/templates/modals/dateInterval.tmpl.html new file mode 100644 index 0000000000..20b7e8d135 --- /dev/null +++ b/client/src/partials/templates/modals/dateInterval.tmpl.html @@ -0,0 +1,60 @@ +
+
+

+   + {{ 'FORM.SELECTS.SELECT_DATE_INTERVAL' | translate }} + {{ $ctrl.selected | translate }} +

+
+ +
+ +
+ +
+ +
+
+ +
+
+ + +
+ +
+ + +
+ +
+ +
+ +
+ + + +
+
diff --git a/client/src/partials/templates/modals/reports.modal.html b/client/src/partials/templates/modals/reports.modal.html index 445fff9d3f..ccb25fd73c 100644 --- a/client/src/partials/templates/modals/reports.modal.html +++ b/client/src/partials/templates/modals/reports.modal.html @@ -1,6 +1,11 @@
+ +

+ {{ 'FORM.INFOS.LOADING' | translate }} +

+