From ebb78affd2e785ed48f8cc09ed250af24248ca98 Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Wed, 11 May 2022 15:11:10 +0200 Subject: [PATCH] Reformat all reports to put title block on the top right --- client/src/i18n/en/asset.json | 1 + client/src/i18n/en/report.json | 7 +- client/src/i18n/fr/asset.json | 1 + client/src/i18n/fr/report.json | 10 +- .../analysis_auxiliary_cashboxes.config.js} | 8 +- .../analysis_auxiliary_cashboxes.html} | 0 client/src/modules/reports/reports.routes.js | 2 +- server/config/routes.js | 8 +- .../controllers/admin/metadataReport/index.js | 2 +- .../metadataReport/metadataReport.handlebars | 121 +++---- .../metadataReport/metadatacard.handlebars | 136 ++++---- .../reports/needed_inventory_scans.handlebars | 32 +- .../assets/reports/needed_inventory_scans.js | 2 +- .../reports/shipment-barcode.handlebars | 4 +- .../reports/shipment-overview.handlebars | 23 +- .../shipment/reports/shipment-overview.js | 2 +- .../shipment/reports/shipments.handlebars | 11 +- .../cost_center_allocation_registry.js | 22 +- server/controllers/finance/currencies.js | 6 +- .../indicator/dashboard/report.handlebars | 11 +- .../finance/indicator/dashboard/report.js | 2 +- .../reports/account_reference/index.js | 2 +- .../account_reference/report.handlebars | 33 +- .../account_statement/report.handlebars | 6 +- .../finance/reports/accounts/chart.handlebars | 9 +- .../analysis_auxiliary_cashboxes/index.js | 2 +- .../report.handlebars | 159 +++++----- .../finance/reports/balance/index.js | 2 +- .../finance/reports/balance/report.handlebars | 33 +- .../finance/reports/break_even/index.js | 3 +- .../reports/break_even/report.handlebars | 73 ++--- .../break_even/report_project.handlebars | 93 +++--- .../reports/break_even_cost_center/index.js | 2 +- .../break_even_cost_center/report.handlebars | 90 +++--- .../report_project.handlebars | 90 +++--- .../controllers/finance/reports/cash/index.js | 1 + .../finance/reports/cash/receipt.handlebars | 48 ++- .../reports/cash/receipt.pos.handlebars | 1 + .../finance/reports/cash/report.handlebars | 21 +- .../finance/reports/cashReport/index.js | 3 + .../cashReport/report_combined.handlebars | 20 +- .../cashReport/report_separated.handlebars | 17 +- .../finance/reports/cashflow/index.js | 7 +- .../reports/cashflow/report.handlebars | 16 +- .../cashflow/reportByService.handlebars | 15 +- .../finance/reports/client_debts/index.js | 2 + .../reports/client_debts/report.handlebars | 11 +- .../finance/reports/client_support/index.js | 2 +- .../reports/client_support/report.handlebars | 13 +- .../configurable_analysis_report/index.js | 2 +- .../report.handlebars | 251 ++++++++------- .../reports/cost_center/report.handlebars | 20 +- .../accounts_report.handlebars | 35 +- .../cost_center_step_down/accounts_report.js | 18 +- .../income_and_expense.handlebars | 42 +-- .../income_and_expense.js | 6 +- .../reports/cost_center_step_down/index.js | 2 +- .../cost_center_step_down/report.handlebars | 38 +-- .../finance/reports/creditors/aged.handlebars | 16 +- .../finance/reports/creditors/index.js | 5 +- .../finance/reports/debtors/aged.handlebars | 20 +- .../debtors/annual_clients_report.handlebars | 16 +- .../finance/reports/debtors/index.js | 1 + .../reports/debtors/openDebtors.handlebars | 18 +- .../finance/reports/debtors/openDebtors.js | 1 + .../reports/debtors/summaryReport.handlebars | 36 +-- .../finance/reports/debtors/summaryReport.js | 8 +- .../financial.all_employees.handlebars | 8 +- .../reports/financial.all_employees.js | 2 +- .../reports/financial.employee.handlebars | 17 +- .../finance/reports/financial.employee.js | 2 +- .../reports/financial.patient.handlebars | 11 +- .../finance/reports/financial.patient.js | 2 +- .../finance/reports/general_ledger/index.js | 2 +- .../reports/general_ledger/report.handlebars | 10 +- .../finance/reports/income_expense/index.js | 2 +- .../reports/income_expense/report.handlebars | 16 +- .../reports/income_expense_by_month/index.js | 2 +- .../income_expense_by_month/report.handlebars | 20 +- .../reports/income_expense_by_year/index.js | 2 +- .../income_expense_by_year/report.handlebars | 9 +- .../invoiced_received_stock/report.handlebars | 298 +++++++++--------- .../reports/invoices/creditNote.handlebars | 27 +- .../finance/reports/invoices/index.js | 2 + .../reports/invoices/receipt.handlebars | 45 ++- .../reports/invoices/report.handlebars | 9 +- .../finance/reports/journal/report.handlebars | 2 +- .../finance/reports/monthly_balance/index.js | 6 +- .../reports/monthly_balance/report.handlebars | 16 +- .../ohada_balance_sheet/report.handlebars | 11 +- .../reports/ohada_profit_loss/index.js | 2 +- .../ohada_profit_loss/report.handlebars | 14 +- .../reports/operating/report.handlebars | 21 +- .../finance/reports/priceList/index.js | 2 +- .../reports/priceList/registry.handlebars | 4 +- .../reports/priceList/report.handlebars | 4 +- .../reports/purchases/report.handlebars | 7 +- .../finance/reports/realized_profit/index.js | 1 + .../reports/realized_profit/report.handlebars | 10 +- .../reports/recovery_capacity/index.js | 3 +- .../recovery_capacity/report.handlebars | 14 +- .../finance/reports/reportAccounts/index.js | 14 +- .../reports/reportAccounts/report.handlebars | 23 +- .../reports/reportAccountsMultiple/index.js | 8 +- .../reportAccountsMultiple/report.handlebars | 12 +- .../systemUsage/system.usage.handlebars | 18 +- .../reports/unpaid_invoice_payments/index.js | 2 +- .../unpaid_invoice_payments/report.handlebars | 28 +- .../finance/reports/vouchers/index.js | 3 +- .../reports/vouchers/receipt.handlebars | 33 +- .../reports/vouchers/report.handlebars | 7 +- .../inventory/reports/changes.handlebars | 9 +- .../controllers/inventory/reports/changes.js | 3 +- .../inventory/reports/items.handlebars | 17 +- .../inventory/reports/prices.handlebars | 4 +- .../controllers/inventory/reports/prices.js | 1 + .../reports/purchases.receipt.handlebars | 32 +- .../inventory/reports/purchases.receipt.js | 2 + .../medical/reports/patient.fiche.handlebars | 3 +- .../reports/patient.receipt.handlebars | 2 +- .../medical/reports/patient.receipt.js | 3 + .../medical/reports/registrations.handlebars | 4 +- .../medical/reports/visits.handlebars | 35 +- server/controllers/medical/reports/visits.js | 3 + .../medical/reports/visits.report.handlebars | 14 +- .../payroll/reports/multipayroll.handlebars | 24 +- .../payroll/reports/multipayroll.js | 2 + .../reports/payrollReportGenerator.handlebars | 4 +- .../payrollReportSocialCharge.handlebars | 25 +- .../reports/payslipGenerator.handlebars | 30 +- .../reports/payslipGeneratorIndex.handlebars | 19 +- .../payroll/reports/registrations.handlebars | 6 +- .../payroll/staffingIndices/report.handlebars | 7 +- server/controllers/stock/asset_scan.js | 2 +- .../reports/assets_registry.report.handlebars | 14 +- server/controllers/stock/reports/common.js | 2 +- .../monthly_consumption.report.handlebars | 18 +- .../reports/purchase_order_analysis/index.js | 2 +- .../purchase_order_analysis/report.handlebars | 18 +- .../stock/reports/purchase_prices/index.js | 2 +- .../reports/purchase_prices/report.handlebars | 7 +- .../stock/reports/report.handlebars | 23 +- .../stock/reports/rumer.report.handlebars | 17 +- .../reports/rumer_condensed.report.handlebars | 15 +- .../stock_assign.receipt.handlebars | 3 +- .../stock_assign.registry.handlebars | 2 +- .../stock/reports/stock/consumption_graph.js | 2 +- .../reports/stock/entry_depot_receipt.js | 2 +- .../reports/stock/entry_donation_receipt.js | 2 +- .../stock/entry_integration_receipt.js | 2 +- .../reports/stock/entry_purchase_receipt.js | 2 +- .../exit_aggregate_consumption_receipt.js | 2 +- .../stock/reports/stock/exit_depot_receipt.js | 2 +- .../stock/reports/stock/exit_loss_receipt.js | 2 +- .../stock/reports/stock/exit_report.js | 2 +- .../stock/reports/stock/expiration_report.js | 1 + .../stock/reports/stock/lost_stock_report.js | 30 +- .../stock/lot_barcode/lot_barcode.handlebars | 2 +- .../reports/stock/monthly_consumption.js | 2 +- .../stock/reports/stock/movement_report.js | 2 +- .../controllers/stock/reports/stock/rumer.js | 2 +- .../stock_changes/stock_changes.handlebars | 16 +- .../stock/stock_changes/stock_changes.js | 2 +- .../stock/reports/stock/stock_sheet.js | 1 + .../controllers/stock/reports/stock/value.js | 6 +- ...k_aggregate_consumption.receipt.handlebars | 5 +- ...k_aggregated_consumption_report.handlebars | 24 +- .../reports/stock_assign.receipt.handlebars | 3 +- ...vg_med_costs_per_patient.report.handlebars | 19 +- .../stock_consumption_graph.handlebars | 15 +- .../reports/stock_entry.report.handlebars | 17 +- .../stock_entry_depot.receipt.handlebars | 3 +- .../stock_entry_donation.receipt.handlebars | 5 +- ...stock_entry_integration.receipt.handlebars | 5 +- .../stock_entry_purchase.receipt.handlebars | 3 +- .../reports/stock_exit.report.handlebars | 18 +- .../stock_exit_depot.receipt.handlebars | 3 +- .../stock_exit_loss.receipt.handlebars | 5 +- .../stock_exit_patient.receipt.handlebars | 5 +- .../stock_exit_service.receipt.handlebars | 7 +- .../stock_expiration_report.handlebars | 18 +- .../stock_inline_movements.report.handlebars | 11 +- .../stock_inventories.report.handlebars | 13 +- .../stock_lost_stock.report.handlebars | 26 +- .../reports/stock_lots.report.handlebars | 12 +- .../reports/stock_movement_report.handlebars | 9 +- .../reports/stock_movements.report.handlebars | 11 +- .../reports/stock_sheet.report.handlebars | 13 +- .../reports/stock_value.report.handlebars | 19 +- .../requisition.receipt.handlebars | 35 +- server/lib/ReportManager.js | 7 +- .../partials/enterpriseDetails.handlebars | 16 +- .../template/partials/exchangeRate.handlebars | 2 +- .../lib/template/partials/header.handlebars | 9 +- .../partials/stockReceiptHeader.handlebars | 4 +- server/lib/template/partials/title.handlebars | 51 +++ server/models/migrations/next/migrate.sql | 8 + 197 files changed, 1445 insertions(+), 1883 deletions(-) rename client/src/modules/reports/generate/{analysis_auxiliary_cashbox/analysis_auxiliary_cashbox.config.js => analysis_auxiliary_cashboxes/analysis_auxiliary_cashboxes.config.js} (90%) rename client/src/modules/reports/generate/{analysis_auxiliary_cashbox/analysis_auxiliary_cashbox.html => analysis_auxiliary_cashboxes/analysis_auxiliary_cashboxes.html} (100%) create mode 100644 server/lib/template/partials/title.handlebars diff --git a/client/src/i18n/en/asset.json b/client/src/i18n/en/asset.json index 2e2f0be426..9747031995 100644 --- a/client/src/i18n/en/asset.json +++ b/client/src/i18n/en/asset.json @@ -18,6 +18,7 @@ "NO_ASSIGNMENT_HISTORY" : "No assignment history", "ONLY_ASSETS" : "Only Assets", "REQUIRED_INVENTORY_SCAN" : "Required Inventory Scan", + "REQUIRED_INVENTORY_SCANS" : "Required Inventory Scans", "REQUIRED_INVENTORY_SCAN_CREATED" : "Required inventory scan successfully created", "REQUIRED_INVENTORY_SCAN_DETAILS" : "Required Inventory Scan Details", "REQUIRED_INVENTORY_SCAN_EDITED" : "Required inventory scan successfully edited", diff --git a/client/src/i18n/en/report.json b/client/src/i18n/en/report.json index ef45b9bbe0..77f783b401 100644 --- a/client/src/i18n/en/report.json +++ b/client/src/i18n/en/report.json @@ -34,12 +34,15 @@ "STATUS": { "CORRECT": "Correct", "TRANSFERT_GREATER": "The amount transferred is greater", - "TRANSFERT_LOWWER": "The amount transferred is lower", + "TRANSFERT_LOWER": "The amount transferred is lower", "TRANSFERT_PENDING": "Transfer pending" }, "TARGET": "Target", "TRANSFER_PRINCIPAL": "Transfer Account to Principal Cashbox" }, + "ASSET_SCANS": { + "TITLE" : "Asset Scans Report" + }, "AVG_MED_COST_PER_PATIENT" : { "TITLE" : "Average Medication Costs Per Patient", "DESCRIPTION" : "This report shows the average medication costs per patient over a specified time period.", @@ -123,6 +126,7 @@ }, "GENERATED": "Generated Report", "INCOME": "Income", + "LEGEND": "Legend", "PROFIT_AND_LOSS": "Profit and Loss Statement", "PROFIT_AND_LOSS_BY_MONTH": "Profit and Loss Statement By Month", "PROFIT_AND_LOSS_BY_YEAR": "Profit and Loss Statement By Fiscal Year", @@ -246,6 +250,7 @@ "NULL" : "Null", "SIXTY_TO_NINETY_DAYS": "60 to 90 Days", "THIRTY_TO_SIXTY_DAYS": "30 to 60 Days", + "THROUGH": "Through", "TOTALS": "Totals", "VIEW_ACCOUNT_STATEMENT": "View in Account Statement", "VIEW_CREDIT_NOTE": "View Credit Note", diff --git a/client/src/i18n/fr/asset.json b/client/src/i18n/fr/asset.json index 78a04a92be..b69cafeee0 100644 --- a/client/src/i18n/fr/asset.json +++ b/client/src/i18n/fr/asset.json @@ -18,6 +18,7 @@ "NO_ASSIGNMENT_HISTORY" : "Aucun historique des assignations", "ONLY_ASSETS" : "Seulement les actifs", "REQUIRED_INVENTORY_SCAN" : "Scan d'inventaire obligatoire", + "REQUIRED_INVENTORY_SCANS" : "Scans d'inventaire obligatoires", "REQUIRED_INVENTORY_SCAN_CREATED" : "Scan d'inventaire obligatoire créé avec succès", "REQUIRED_INVENTORY_SCAN_DETAILS" : "Détails de scan d'inventaire obligatoire", "REQUIRED_INVENTORY_SCAN_EDITED" : "Scan d'inventaire obligatoire édité avec succès", diff --git a/client/src/i18n/fr/report.json b/client/src/i18n/fr/report.json index 89d95b7fa8..6d0c492ee1 100644 --- a/client/src/i18n/fr/report.json +++ b/client/src/i18n/fr/report.json @@ -34,12 +34,15 @@ "STATUS": { "CORRECT": "Correcte", "TRANSFERT_GREATER": "Le montant transferé est supérieur", - "TRANSFERT_LOWWER": "Le montant transferé est inférieure", + "TRANSFERT_LOWER": "Le montant transferé est inférieure", "TRANSFERT_PENDING": "Transfère en attente" }, "TARGET": "Cible", "TRANSFER_PRINCIPAL": "Compte de transfert vers caisse Principale" }, + "ASSET_SCANS": { + "TITLE" : "Rapport de scans d'actifs" + }, "AVG_MED_COST_PER_PATIENT" : { "TITLE" : "Coût moyen des médicaments par patient", "DESCRIPTION" : "Ce rapport indique le coût moyen des médicaments par patient sur une période donnée.", @@ -115,6 +118,7 @@ }, "GENERATED" : "Rapport généré", "INCOME": "Produit", + "LEGEND": "Legende", "PROFIT_AND_LOSS" : "Rapport des Produits et des Charges", "PROFIT_AND_LOSS_BY_MONTH": "Rapport des Produit et des Charges par Mois", "PROFIT_AND_LOSS_BY_YEAR": "Rapport des Produit et des Charges par Années", @@ -213,8 +217,8 @@ "STOCK_VALUE": { "TITLE" : "Rapport de valeur de stock", "DESCRIPTION" : "Ce rapport affiche la valeur actuelle du stock pour chaque inventaire dans un dépôt.", - "EXCLUDE_INVENTORIES_ZERO_VALUE": "Exclure les inventaires dont la valeur en stock est nulle" - + "EXCLUDE_INVENTORIES_ZERO_VALUE": "Exclure les inventaires dont la valeur en stock est nulle", + "THROUGH": "Jusqu'a" }, "STOCK_EXPIRATION_REPORT" : { "TITLE": "Rapport d'expiration de stock", diff --git a/client/src/modules/reports/generate/analysis_auxiliary_cashbox/analysis_auxiliary_cashbox.config.js b/client/src/modules/reports/generate/analysis_auxiliary_cashboxes/analysis_auxiliary_cashboxes.config.js similarity index 90% rename from client/src/modules/reports/generate/analysis_auxiliary_cashbox/analysis_auxiliary_cashbox.config.js rename to client/src/modules/reports/generate/analysis_auxiliary_cashboxes/analysis_auxiliary_cashboxes.config.js index 05a926a613..95315b8734 100644 --- a/client/src/modules/reports/generate/analysis_auxiliary_cashbox/analysis_auxiliary_cashbox.config.js +++ b/client/src/modules/reports/generate/analysis_auxiliary_cashboxes/analysis_auxiliary_cashboxes.config.js @@ -1,15 +1,17 @@ angular.module('bhima.controllers') - .controller('analysis_auxiliary_cashboxController', analysisAuxiliaryCashboxController); + .controller('analysis_auxiliary_cashboxesController', analysisAuxiliaryCashboxesController); -analysisAuxiliaryCashboxController.$inject = [ +analysisAuxiliaryCashboxesController.$inject = [ '$sce', 'NotifyService', 'BaseReportService', 'AppCache', 'reportData', '$state', ]; -function analysisAuxiliaryCashboxController($sce, Notify, SavedReports, AppCache, +function analysisAuxiliaryCashboxesController($sce, Notify, SavedReports, AppCache, reportData, $state) { const vm = this; + const cache = new AppCache('analysis_auxiliary_cashboxes'); + const reportUrl = 'reports/finance/analysis_auxiliary_cashboxes'; vm.previewGenerated = false; diff --git a/client/src/modules/reports/generate/analysis_auxiliary_cashbox/analysis_auxiliary_cashbox.html b/client/src/modules/reports/generate/analysis_auxiliary_cashboxes/analysis_auxiliary_cashboxes.html similarity index 100% rename from client/src/modules/reports/generate/analysis_auxiliary_cashbox/analysis_auxiliary_cashbox.html rename to client/src/modules/reports/generate/analysis_auxiliary_cashboxes/analysis_auxiliary_cashboxes.html diff --git a/client/src/modules/reports/reports.routes.js b/client/src/modules/reports/reports.routes.js index 6b0e2fe576..72bd84b5ae 100644 --- a/client/src/modules/reports/reports.routes.js +++ b/client/src/modules/reports/reports.routes.js @@ -9,7 +9,7 @@ angular.module('bhima.routes') 'aged_creditors', 'aged_debtors', 'aggregated_stock_consumption', - 'analysis_auxiliary_cashbox', + 'analysis_auxiliary_cashboxes', 'annual_clients_report', 'avg_med_costs_per_patient', 'balance_report', diff --git a/server/config/routes.js b/server/config/routes.js index 06669fc050..5367f02a66 100644 --- a/server/config/routes.js +++ b/server/config/routes.js @@ -85,7 +85,7 @@ const cashboxes = require('../controllers/finance/cashboxes'); const exchange = require('../controllers/finance/exchange'); const cash = require('../controllers/finance/cash'); const priceList = require('../controllers/finance/priceLists'); -const priceListPreport = require('../controllers/finance/reports/priceList'); +const priceListReport = require('../controllers/finance/reports/priceList'); const invoicingFees = require('../controllers/finance/invoicingFees'); const unpaidInvoicePayments = require('../controllers/finance/reports/unpaid_invoice_payments'); const accounts = require('../controllers/finance/accounts'); @@ -154,7 +154,7 @@ const reqInvScans = require('../controllers/stock/required_inventory_scans'); // todo: the indicator folder must not be inside the finance folder const dashboard = require('../controllers/finance/indicator/dashboard'); -const indicatorRerpor = require('../controllers/finance/indicator/dashboard/report'); +const indicatorsReport = require('../controllers/finance/indicator/dashboard/report'); // Data Kit const dataCollectorManagement = require('../controllers/admin/dataCollectorManagement'); @@ -614,7 +614,7 @@ exports.configure = function configure(app) { // price lists app.get('/prices', priceList.list); app.get('/prices/:uuid', priceList.details); - app.get('/prices/download/list', priceListPreport.downloadRegistry); + app.get('/prices/download/list', priceListReport.downloadRegistry); app.get('/prices/download/filled_template', priceList.downloadFilledTemplate); app.get('/prices/report/:uuid', financeReports.priceList); app.post('/prices', priceList.create); @@ -1076,7 +1076,7 @@ exports.configure = function configure(app) { // API dashboard app.get('/indicators/dashboards', dashboard.getIndicators); - app.get('/reports/indicators_report', indicatorRerpor.report); + app.get('/reports/indicators_report', indicatorsReport.report); // API cron app.get('/crons', cron.list); diff --git a/server/controllers/admin/metadataReport/index.js b/server/controllers/admin/metadataReport/index.js index c62d14a2da..8a155107b1 100644 --- a/server/controllers/admin/metadataReport/index.js +++ b/server/controllers/admin/metadataReport/index.js @@ -89,6 +89,7 @@ function metadataCard(req, res, next) { }); data.surveyFormElements = surveyFormElements; + return report.render(data); }) .then(result => { @@ -227,7 +228,6 @@ function reportMetadata(req, res, next) { }) .then(dataCollector => { data.dataCollector = dataCollector; - return report.render(data); }) .then(result => { diff --git a/server/controllers/admin/metadataReport/metadataReport.handlebars b/server/controllers/admin/metadataReport/metadataReport.handlebars index 30914a8c52..0f87a6ff74 100644 --- a/server/controllers/admin/metadataReport/metadataReport.handlebars +++ b/server/controllers/admin/metadataReport/metadataReport.handlebars @@ -1,71 +1,72 @@ - - - {{> head title="TREE.DATA_KIT_REPORT"}} - -
+{{> head }} + + +
+ {{> header}} - -
-
+ +
+
- -

{{translate 'TREE.DATA_KIT_REPORT'}}

-

{{ dataCollector.label }}

- {{#if patient.display_name }} -
-

{{translate 'FORM.LABELS.NAME'}} : {{ patient.reference }} | {{ patient.display_name }}

-

{{translate 'FORM.LABELS.SEX'}} : {{ patient.sex }}

-

{{translate 'FORM.LABELS.DOB'}} : {{date patient.dob }}

-
- {{/if}} +

+ {{ dataCollector.label }} +

- - - - - {{#each rows.columns}} - - {{/each}} - - + {{#if patient.display_name }} +
+

{{translate 'FORM.LABELS.NAME'}} : {{ patient.reference }} | {{ patient.display_name }}

+

{{translate 'FORM.LABELS.SEX'}} : {{ patient.sex }}

+

{{translate 'FORM.LABELS.DOB'}} : {{date patient.dob }}

+
+ {{/if}} - - {{#each rows.surveyData}} - - {{#each rowValue}} - - {{/each}} - - {{/each}} - -
{{translate displayName}}
- {{ value }} -
-
-
-
- - - - - - - {{#each filterQuery}} - - - + +
{{ translate 'FORM.INFO.RESULT_FOUND'}} {{ resultFound }}
{{ translate key }}{{ value }}
+ + + {{#each rows.columns}} + + {{/each}} - {{/each}} - {{#each filterClient}} + + + + {{#each rows.surveyData}} + + {{#each rowValue}} + + {{/each}} + + {{/each}} + +
{{translate displayName}}
+ {{ value }} +
+
+
+ + - - + + - {{/each}} - -
{{ _label }}{{ displayValue }} {{ translate 'FORM.INFO.RESULT_FOUND'}} {{ resultFound }}
+ {{#each filterQuery}} + + {{ translate key }} + {{ value }} + + {{/each}} + {{#each filterClient}} + + {{ _label }} + {{ displayValue }} + + {{/each}} + + +
- + diff --git a/server/controllers/admin/metadataReport/metadatacard.handlebars b/server/controllers/admin/metadataReport/metadatacard.handlebars index ac5d8b330f..367c888a91 100644 --- a/server/controllers/admin/metadataReport/metadatacard.handlebars +++ b/server/controllers/admin/metadataReport/metadatacard.handlebars @@ -1,79 +1,83 @@ -{{> head title="TREE.DISPLAY_METADATA"}} +{{> head }} + - {{> header}} +
+ + {{> header}} + + +
+
- -
-
+

+ {{ survey.label }} +

- -

- {{ survey.label }} -

- {{#if patient.display_name }} -
-

{{translate 'FORM.LABELS.NAME'}} : {{ patient.reference }} | {{ patient.display_name }}

-

{{translate 'FORM.LABELS.SEX'}} : {{ patient.sex }}

-

{{translate 'FORM.LABELS.DOB'}} : {{date patient.dob }}

-
- {{/if}} + {{#if patient.display_name }} +
+

{{translate 'FORM.LABELS.NAME'}} : {{ patient.reference }} | {{ patient.display_name }}

+

{{translate 'FORM.LABELS.SEX'}} : {{ patient.sex }}

+

{{translate 'FORM.LABELS.DOB'}} : {{date patient.dob }}

+
+ {{/if}} - - {{#each surveyFormElements}} - {{#equal typeForm 'note'}} - - + + + + + + +
-

+ + {{#each surveyFormElements}} + {{#equal typeForm 'note'}} + + + + {{/equal}} + {{#inequal typeForm 'note'}} + + - - {{/equal}} - {{#inequal typeForm 'note'}} - - - - - - + + + + - - {{/inequal}} - {{/each}} + + + {{/inequal}} + {{/each}} - - - - - - - -
+

+ + {{ label }} + +

+
{{ label }} - -
- - {{ label }} - -
- {{#equal typeForm 'date'}} - {{date value "DD/MM/YYYY"}} - {{/equal}} - {{#inequal typeForm 'date'}} - {{#equal typeForm 'image'}} - {{#fileExist ../absolutePath value}} - - - - {{/fileExist}} +
+ {{#equal typeForm 'date'}} + {{date value "DD/MM/YYYY"}} {{/equal}} - {{#inequal typeForm 'image'}} - {{value}} + {{#inequal typeForm 'date'}} + {{#equal typeForm 'image'}} + {{#fileExist ../absolutePath value}} + + + + {{/fileExist}} + {{/equal}} + {{#inequal typeForm 'image'}} + {{value}} + {{/inequal}} {{/inequal}} - {{/inequal}} -
- - {{translate 'TABLE.COLUMNS.REGISTERED_BY'}} - -
{{ survey.userName }}
+

+ + {{translate 'TABLE.COLUMNS.REGISTERED_BY'}} + +
{{ survey.userName }}
+
\ No newline at end of file diff --git a/server/controllers/asset_management/assets/reports/needed_inventory_scans.handlebars b/server/controllers/asset_management/assets/reports/needed_inventory_scans.handlebars index 3608617ed8..5147d4ca4d 100644 --- a/server/controllers/asset_management/assets/reports/needed_inventory_scans.handlebars +++ b/server/controllers/asset_management/assets/reports/needed_inventory_scans.handlebars @@ -1,4 +1,4 @@ -{{> head title="ASSETS.NEEDED_INVENTORY_SCANS" }} +{{> head }}
- {{> enterpriseDetails }} + + {{#> header }} +

+ {{date params.dateFrom }} - {{date params.dateTo }} +

+ {{/header}}
-

{{translate 'PATIENT_RECORDS.REPORT.VISITS'}}

-

- {{date params.dateFrom }} - {{date params.dateTo }} -

- diff --git a/server/controllers/payroll/reports/multipayroll.handlebars b/server/controllers/payroll/reports/multipayroll.handlebars index 6bea7d7978..439744a4be 100644 --- a/server/controllers/payroll/reports/multipayroll.handlebars +++ b/server/controllers/payroll/reports/multipayroll.handlebars @@ -1,25 +1,17 @@ -{{> head title="TREE.MULTI_PAYROLL"}} +{{> head }} + - {{> header}} + {{#> header}} +

+ {{translate 'VOUCHERS.SIMPLE.SALARY_PAYMENT'}} : {{ payrollTitle }} +

+ {{/header}}
- -

- {{translate 'VOUCHERS.SIMPLE.SALARY_PAYMENT'}} : {{ payrollTitle }} -

- - {{#each filters}} -

- - - {{translate this.displayName}} : {{this.value}} - -

- {{/each}} + {{> filterbar filters=filters }}
diff --git a/server/controllers/payroll/reports/multipayroll.js b/server/controllers/payroll/reports/multipayroll.js index 041f1317f6..ea625fc666 100644 --- a/server/controllers/payroll/reports/multipayroll.js +++ b/server/controllers/payroll/reports/multipayroll.js @@ -34,6 +34,8 @@ function build(req, res, next) { // delete options.payroll_configuration_id; delete options.currency_id; + _.extend(options, { filename : 'EMPLOYEE.TITLE' }); + let report; // set up the report with report manager diff --git a/server/controllers/payroll/reports/payrollReportGenerator.handlebars b/server/controllers/payroll/reports/payrollReportGenerator.handlebars index 778dd20912..92896afa83 100644 --- a/server/controllers/payroll/reports/payrollReportGenerator.handlebars +++ b/server/controllers/payroll/reports/payrollReportGenerator.handlebars @@ -1,9 +1,7 @@ -{{> head title="FORM.LABELS.PAYSLIP"}} +{{> head }} {{> header }} -
-

{{ payrollPeriod.label }} diff --git a/server/controllers/payroll/reports/payrollReportSocialCharge.handlebars b/server/controllers/payroll/reports/payrollReportSocialCharge.handlebars index e88088edba..63a3191080 100644 --- a/server/controllers/payroll/reports/payrollReportSocialCharge.handlebars +++ b/server/controllers/payroll/reports/payrollReportSocialCharge.handlebars @@ -1,24 +1,13 @@ -{{> head title="FORM.LABELS.PAYSLIP"}} +{{> head }} - -
-
-

{{enterprise.name}}

-
- {{enterprise.location}} -
-
{{enterprise.email}}
-
{{enterprise.phone}}
-
-
-
-
+ {{> header }} + +

{{ payrollPeriod.label }}
{{translate 'FORM.LABELS.SOCIAL_CHARGES' }}


-
@@ -44,7 +33,7 @@
{{#each rubricsChargeEnterprise}} @@ -60,10 +49,10 @@ {{#each rubEnterprises}} {{/each}} - +
{{service_name}} - {{#if result}} + {{#if result}} {{currency (multiply result ../../payrollPeriod.exchangeRate) ../../payrollPeriod.currency}} {{/if}} {{currency (multiply total ../payrollPeriod.exchangeRate) ../payrollPeriod.currency}} {{currency (multiply TotalChargeEnterprise payrollPeriod.exchangeRate) payrollPeriod.currency}} {{currency (multiply TotalChargeEnterprise payrollPeriod.exchangeRate) payrollPeriod.currency}}
-
+
\ No newline at end of file diff --git a/server/controllers/payroll/reports/payslipGenerator.handlebars b/server/controllers/payroll/reports/payslipGenerator.handlebars index 756eac1dd5..b0233f1fa6 100644 --- a/server/controllers/payroll/reports/payslipGenerator.handlebars +++ b/server/controllers/payroll/reports/payslipGenerator.handlebars @@ -1,5 +1,7 @@ -{{> head title="FORM.LABELS.PAYSLIP"}} +{{> head }} + + {{#each dataEmployees}} @@ -23,7 +25,7 @@
{{translate "FORM.LABELS.NB_CHILD"}} : {{nb_enfant}}
- +

{{translate 'TABLE.COLUMNS.PAYSLIP'}} : {{ ../payrollPeriod.label }}

@@ -36,7 +38,7 @@ {{translate "TABLE.COLUMNS.RUBRICS"}} {{translate 'TABLE.COLUMNS.RATE'}} ( % ) - {{translate 'TABLE.COLUMNS.DAYS'}} + {{translate 'TABLE.COLUMNS.DAYS'}} {{translate 'TABLE.COLUMNS.DAILY_RATE'}} {{translate "TABLE.COLUMNS.RESULT"}} @@ -53,7 +55,7 @@ {{ label }} {{ holiday_percentage }} - {{ holiday_nbdays }} + {{ holiday_nbdays }} {{currency (multiply dailyRate ../../payrollPeriod.exchangeRate) ../../payrollPeriod.currency }} {{currency (multiply value ../../payrollPeriod.exchangeRate) ../../payrollPeriod.currency }} @@ -73,8 +75,8 @@ {{currency (multiply basic_salary ../payrollPeriod.exchangeRate) ../payrollPeriod.currency }} - - + +
@@ -118,7 +120,7 @@ ({{ ratePercentage }} %) {{/if}} - @@ -138,19 +140,19 @@
{{translate 'TABLE.COLUMNS.PROFITS'}}
+ {{currency (multiply result ../../payrollPeriod.exchangeRate) ../../payrollPeriod.currency }}
{{translate 'TABLE.COLUMNS.TAXABLE_GROSS_SALARY'}} = ({{translate 'TABLE.COLUMNS.BASIC_SALARY'}}) + ({{translate 'TABLE.COLUMNS.NET_TAXABLE'}}) - = {{currency (multiply basic_salary ../payrollPeriod.exchangeRate) ../payrollPeriod.currency }} + - {{currency (multiply somRubTaxable ../payrollPeriod.exchangeRate) ../payrollPeriod.currency }} => + = {{currency (multiply basic_salary ../payrollPeriod.exchangeRate) ../payrollPeriod.currency }} + + {{currency (multiply somRubTaxable ../payrollPeriod.exchangeRate) ../payrollPeriod.currency }} => [ {{currency (multiply base_taxable ../payrollPeriod.exchangeRate) ../payrollPeriod.currency }} ] - {{translate 'TABLE.COLUMNS.GROSS_SALARY'}} = ({{translate 'TABLE.COLUMNS.TAXABLE_GROSS_SALARY'}}) + ({{translate 'TABLE.COLUMNS.NET_NON_TAXABLE'}}) = - {{currency (multiply base_taxable ../payrollPeriod.exchangeRate) ../payrollPeriod.currency }} + {{currency (multiply somRubNonTaxable ../payrollPeriod.exchangeRate) ../payrollPeriod.currency }} + {{translate 'TABLE.COLUMNS.GROSS_SALARY'}} = ({{translate 'TABLE.COLUMNS.TAXABLE_GROSS_SALARY'}}) + ({{translate 'TABLE.COLUMNS.NET_NON_TAXABLE'}}) = + {{currency (multiply base_taxable ../payrollPeriod.exchangeRate) ../payrollPeriod.currency }} + {{currency (multiply somRubNonTaxable ../payrollPeriod.exchangeRate) ../payrollPeriod.currency }} => [ {{currency (multiply gross_salary ../payrollPeriod.exchangeRate) ../payrollPeriod.currency }} ]
- +
@@ -209,7 +211,7 @@ ({{translate 'TABLE.COLUMNS.GROSS_SALARY'}}) - ({{translate "TABLE.COLUMNS.CONTRIBUTION_DEDUCTIONS"}}) @@ -226,7 +228,7 @@ diff --git a/server/controllers/payroll/reports/payslipGeneratorIndex.handlebars b/server/controllers/payroll/reports/payslipGeneratorIndex.handlebars index fccea5d320..356af13b37 100644 --- a/server/controllers/payroll/reports/payslipGeneratorIndex.handlebars +++ b/server/controllers/payroll/reports/payslipGeneratorIndex.handlebars @@ -1,5 +1,6 @@ -{{> head title="FORM.LABELS.PAYSLIP"}} +{{> head }} + {{#each dataEmployees}} @@ -22,12 +23,12 @@
{{translate "FORM.LABELS.NB_CHILD"}} : {{nb_enfant}}
- +

{{translate 'TABLE.COLUMNS.PAYSLIP'}} : {{ ../payrollPeriod.label }}

-
{{translate "TABLE.COLUMNS.DEDUCTIONS"}}
- {{currency (multiply gross_salary ../payrollPeriod.exchangeRate) ../payrollPeriod.currency }} - + {{currency (multiply gross_salary ../payrollPeriod.exchangeRate) ../payrollPeriod.currency }} - {{currency (multiply somChargeEmployee ../payrollPeriod.exchangeRate) ../payrollPeriod.currency }}
- {{numberToText (multiply net_salary ../payrollPeriod.exchangeRate) ../lang '.' }} + {{numberToText (multiply net_salary ../payrollPeriod.exchangeRate) ../lang '.' }}
+
@@ -45,14 +46,14 @@ {{/if}} - + {{#if is_extra_day.value}} {{/if}} - + {{#if is_extra_day.value}} @@ -80,7 +81,7 @@ - {{/if}} + {{/if}} {{/each}} {{#if is_total_code.value}} @@ -134,7 +135,7 @@ - + {{#each rubricNonTaxable}} @@ -217,7 +218,7 @@ diff --git a/server/controllers/payroll/reports/registrations.handlebars b/server/controllers/payroll/reports/registrations.handlebars index 85f533a52f..9aec77d62a 100644 --- a/server/controllers/payroll/reports/registrations.handlebars +++ b/server/controllers/payroll/reports/registrations.handlebars @@ -1,10 +1,8 @@ -{{> head title="EMPLOYEE.TITLE" }} +{{> head }} {{> header }} -

{{translate "EMPLOYEE.TITLE"}}

- {{> filterbar filters=filters }}
@@ -27,7 +25,7 @@
- + diff --git a/server/controllers/payroll/staffingIndices/report.handlebars b/server/controllers/payroll/staffingIndices/report.handlebars index e2a43ce999..5d83accbb5 100644 --- a/server/controllers/payroll/staffingIndices/report.handlebars +++ b/server/controllers/payroll/staffingIndices/report.handlebars @@ -1,4 +1,4 @@ -{{> head title="TREE.STAFFING_INDICES_MANAGEMENT"}} +{{> head }}
{{> header }} @@ -7,11 +7,6 @@
- -

- {{translate 'TREE.STAFFING_INDICES_MANAGEMENT'}} -

- {{> filterbar filters=filters }} diff --git a/server/controllers/stock/asset_scan.js b/server/controllers/stock/asset_scan.js index 48613ad1bb..2be2de71bd 100644 --- a/server/controllers/stock/asset_scan.js +++ b/server/controllers/stock/asset_scan.js @@ -207,7 +207,7 @@ async function report(req, res, next) { const filters = shared.formatFilters(req.query); _.extend(query, { - filename : 'TREE.ASSETS_SCANS_REGISTRY', + filename : 'REPORT.ASSET_SCANS.TITLE', csvKey : 'rows', orientation : 'landscape', }); diff --git a/server/controllers/stock/reports/assets_registry.report.handlebars b/server/controllers/stock/reports/assets_registry.report.handlebars index f00dae8f11..5c78758753 100644 --- a/server/controllers/stock/reports/assets_registry.report.handlebars +++ b/server/controllers/stock/reports/assets_registry.report.handlebars @@ -1,18 +1,8 @@ -{{> head title="TREE.ASSETS_REGISTRY" }} +{{> head }} - {{> header}} - - - -

- {{translate 'TREE.ASSETS_REGISTRY'}} -

- -

- {{date}} -

+ {{> header }} {{> filterbar filters=filters }} diff --git a/server/controllers/stock/reports/common.js b/server/controllers/stock/reports/common.js index 88a20cfa4a..09965dbf23 100644 --- a/server/controllers/stock/reports/common.js +++ b/server/controllers/stock/reports/common.js @@ -6,7 +6,7 @@ const path = require('path'); const mkPath = name => path.join(BASE_PATH, name).concat('.handlebars'); // receipts -const STOCK_EXIT_PATIENT_TEMPLATE = mkPath('stock_exit_patient.receipt.handlebars'); +const STOCK_EXIT_PATIENT_TEMPLATE = mkPath('stock_exit_patient.receipt'); const POS_STOCK_EXIT_PATIENT_TEMPLATE = mkPath('stock_exit_patient.receipt.pos'); const STOCK_EXIT_SERVICE_TEMPLATE = mkPath('stock_exit_service.receipt'); diff --git a/server/controllers/stock/reports/monthly_consumption.report.handlebars b/server/controllers/stock/reports/monthly_consumption.report.handlebars index 648bcbcf06..d76561ff7d 100644 --- a/server/controllers/stock/reports/monthly_consumption.report.handlebars +++ b/server/controllers/stock/reports/monthly_consumption.report.handlebars @@ -1,19 +1,19 @@ -{{> head title="REPORT.MONTHLY_CONSUMPTION.TITLE" }} +{{> head }} - {{> header}} + {{#> header}} +

+ {{ fiscalYear }} : {{ translate params.periodFromKey }} - {{ translate params.periodToKey }} +
+ {{depot}} +

+ {{/header}}
- -

{{translate 'REPORT.MONTHLY_CONSUMPTION.TITLE'}}

-

- {{ fiscalYear }} : {{ translate params.periodFromKey }} - {{ translate params.periodToKey }} -
- {{depot}} -

+
{{ is_day_worked.value }}
{{ is_extra_day.label }} {{ is_extra_day.value }}
{{ is_total_days.label }} {{ label }} {{ value }}
{{translate 'TABLE.COLUMNS.NON_TAXABLE'}}
@@ -200,7 +201,7 @@ ({{translate 'TABLE.COLUMNS.GROSS_SALARY'}}) - ({{translate "TABLE.COLUMNS.CONTRIBUTION_DEDUCTIONS"}}) - {{currency (multiply gross_salary ../payrollPeriod.exchangeRate) ../payrollPeriod.currency }} - + {{currency (multiply gross_salary ../payrollPeriod.exchangeRate) ../payrollPeriod.currency }} - {{currency (multiply somChargeEmployee ../payrollPeriod.exchangeRate) ../payrollPeriod.currency }}
- {{numberToText (multiply net_salary ../payrollPeriod.exchangeRate) ../lang '.' }} + {{numberToText (multiply net_salary ../payrollPeriod.exchangeRate) ../lang '.' }}
{{this.display_name}} {{this.sex}} {{this.age}} ({{date this.dob}}){{this.code_grade}}{{this.code_grade}} {{this.fonction_txt}} {{date this.date_embauche}}
diff --git a/server/controllers/stock/reports/purchase_order_analysis/index.js b/server/controllers/stock/reports/purchase_order_analysis/index.js index 2c048c0e6b..48190d5235 100644 --- a/server/controllers/stock/reports/purchase_order_analysis/index.js +++ b/server/controllers/stock/reports/purchase_order_analysis/index.js @@ -9,7 +9,7 @@ exports.report = report; // default report parameters const DEFAULT_PARAMS = { csvKey : 'inventoriesOrdered', - filename : 'REPORTS.PURCHASE_ORDER_ANALYSIS.TITLE', + filename : 'REPORT.PURCHASE_ORDER_ANALYSIS.TITLE', orientation : 'portrait', }; diff --git a/server/controllers/stock/reports/purchase_order_analysis/report.handlebars b/server/controllers/stock/reports/purchase_order_analysis/report.handlebars index 46ec0ede9b..ecb2c9e151 100644 --- a/server/controllers/stock/reports/purchase_order_analysis/report.handlebars +++ b/server/controllers/stock/reports/purchase_order_analysis/report.handlebars @@ -1,16 +1,11 @@ - {{> head title="REPORT.PURCHASE_ORDER_ANALYSIS.TITLE" }} + {{> head }} - {{> header}} + {{#> header }} - -
-
- -

{{translate 'REPORT.PURCHASE_ORDER_ANALYSIS.TITLE'}}

-
+
@@ -38,8 +33,13 @@ {{translate purchase.status}}
+ -
+ {{/header}} + + +
+
{{#if this.hideDetails }} diff --git a/server/controllers/stock/reports/purchase_prices/index.js b/server/controllers/stock/reports/purchase_prices/index.js index 2527901844..8569fa2211 100644 --- a/server/controllers/stock/reports/purchase_prices/index.js +++ b/server/controllers/stock/reports/purchase_prices/index.js @@ -13,7 +13,7 @@ exports.report = report; // default report parameters const DEFAULT_PARAMS = { csvKey : 'entries', - filename : 'REPORTS.PURCHASE_PRICES.TITLE', + filename : 'REPORT.PURCHASE_PRICES.TITLE', orientation : 'landscape', }; diff --git a/server/controllers/stock/reports/purchase_prices/report.handlebars b/server/controllers/stock/reports/purchase_prices/report.handlebars index f1a93a36c1..b872f72f22 100644 --- a/server/controllers/stock/reports/purchase_prices/report.handlebars +++ b/server/controllers/stock/reports/purchase_prices/report.handlebars @@ -1,6 +1,6 @@ - {{> head title="REPORT.PURCHASE_PRICES.TITLE" }} + {{> head }} {{> header}} @@ -8,11 +8,6 @@
- -

- {{translate 'REPORT.PURCHASE_PRICES.TITLE'}} -

-

{{ inventory.code }} - {{ inventory.text }}
diff --git a/server/controllers/stock/reports/report.handlebars b/server/controllers/stock/reports/report.handlebars index 2770d3edc4..0c564f64e5 100644 --- a/server/controllers/stock/reports/report.handlebars +++ b/server/controllers/stock/reports/report.handlebars @@ -1,25 +1,18 @@ -{{> head title="TREE.ASSET_MANAGEMENT.TITLE" }} +{{> head }} - {{> header}} + {{#> header}} +

+ {{#if project.id}}{{project.name}}
{{/if}} + {{date aggregates.minDate }} - {{date aggregates.maxDate}} +

+ {{/header}}
- -

- {{translate 'TREE.ASSETS_SCANS_REGISTRY'}} -

- -

- {{#if project.id}}{{project.name}}
{{/if}} - {{date aggregates.minDate }} - {{date aggregates.maxDate}} -

- -
- {{> filterbar filters=filters }} @@ -57,7 +50,7 @@
- + {{else}} {{> emptyTable columns=13}} diff --git a/server/controllers/stock/reports/rumer.report.handlebars b/server/controllers/stock/reports/rumer.report.handlebars index 4984b5042b..f6a1404389 100644 --- a/server/controllers/stock/reports/rumer.report.handlebars +++ b/server/controllers/stock/reports/rumer.report.handlebars @@ -1,4 +1,4 @@ -{{> head title="REPORT.MONTHLY_CONSUMPTION.TITLE" }} +{{> head }} - {{> header}} + {{#> header}} +

{{translate 'REPORT.MONTHLY_CONSUMPTION.TITLE'}}

+

{{params.depot_text}}

+

{{translate params.translate_key}} - {{params.year}}

+ {{/header}}
- -

- {{translate 'REPORT.RUMER.TITLE'}} - {{translate 'REPORT.RUMER.DESCRIPTION'}} -

-

{{params.depot_text}}

-

{{translate params.translate_key}} - {{params.year}}

+

+ {{translate 'REPORT.RUMER.DESCRIPTION'}} +

{{ translate condition }} {{ notes }} {{ scanned_by_name }}{{ date updated_at }}{{ date updated_at }}
diff --git a/server/controllers/stock/reports/rumer_condensed.report.handlebars b/server/controllers/stock/reports/rumer_condensed.report.handlebars index 274587f8db..382858355f 100644 --- a/server/controllers/stock/reports/rumer_condensed.report.handlebars +++ b/server/controllers/stock/reports/rumer_condensed.report.handlebars @@ -1,19 +1,20 @@ -{{> head title="REPORT.MONTHLY_CONSUMPTION.TITLE" }} +{{> head }} - {{> header}} + {{#> header}} +

{{translate 'REPORT.MONTHLY_CONSUMPTION.TITLE'}}

+

{{params.depot_text}}

+

{{translate params.translate_key}} - {{params.year}}

+ {{/header}}
- +

- {{translate 'REPORT.RUMER.TITLE'}} - {{translate 'REPORT.RUMER.DESCRIPTION'}} + {{translate 'REPORT.RUMER.DESCRIPTION'}}

-

{{params.depot_text}}

-

{{translate params.translate_key}} - {{params.year}}

-
diff --git a/server/controllers/stock/reports/stock/assignment/stock_assign.receipt.handlebars b/server/controllers/stock/reports/stock/assignment/stock_assign.receipt.handlebars index 8bd1e916a5..a723960373 100644 --- a/server/controllers/stock/reports/stock/assignment/stock_assign.receipt.handlebars +++ b/server/controllers/stock/reports/stock/assignment/stock_assign.receipt.handlebars @@ -1,4 +1,4 @@ -{{> head title="ASSIGN.STOCK_ASSIGN" }} +{{> head }}
@@ -6,7 +6,6 @@
{{> stockReceiptHeader - title="ASSIGN.STOCK_ASSIGN" entity=details.assigned_to_name reference=details.document_reference barcode=details.barcode diff --git a/server/controllers/stock/reports/stock/assignment/stock_assign.registry.handlebars b/server/controllers/stock/reports/stock/assignment/stock_assign.registry.handlebars index 84acdabd38..b3f946dac4 100644 --- a/server/controllers/stock/reports/stock/assignment/stock_assign.registry.handlebars +++ b/server/controllers/stock/reports/stock/assignment/stock_assign.registry.handlebars @@ -1,4 +1,4 @@ -{{> head title="ASSIGN.STOCK_ASSIGN" }} +{{> head }} diff --git a/server/controllers/stock/reports/stock/consumption_graph.js b/server/controllers/stock/reports/stock/consumption_graph.js index 6aa7eeb4dd..75d392fbe1 100644 --- a/server/controllers/stock/reports/stock/consumption_graph.js +++ b/server/controllers/stock/reports/stock/consumption_graph.js @@ -67,9 +67,9 @@ async function stockConsumptionGraphReport(req, res, next) { const reportResult = await report.render({ chartHeight, + depotName : depot.text, dateFrom : options.dateFrom, dateTo : options.dateTo, - depot, chartjs : chartjs.renderChart(chartRenderOptions), destinationType : `STOCK_FLUX.${options.destinationType || 'ALL_DESTINATION'}`, }); diff --git a/server/controllers/stock/reports/stock/entry_depot_receipt.js b/server/controllers/stock/reports/stock/entry_depot_receipt.js index 0ccacf0f6b..37f17e317b 100644 --- a/server/controllers/stock/reports/stock/entry_depot_receipt.js +++ b/server/controllers/stock/reports/stock/entry_depot_receipt.js @@ -20,7 +20,7 @@ shipmentStatus[SHIPMENT_COMPLETE] = 'SHIPMENT.STATUS.COMPLETE'; * GET /receipts/stock/entry_depot/:document_uuid */ function stockEntryDepotReceipt(documentUuid, session, options) { - const optionReport = _.extend(options, { filename : 'STOCK.RECEIPTS.ENTRY_DEPOT' }); + const optionReport = _.extend(options, { filename : 'STOCK.RECEIPT.ENTRY_DEPOT' }); // set up the report with report manager const report = new ReportManager(STOCK_ENTRY_DEPOT_TEMPLATE, session, optionReport); diff --git a/server/controllers/stock/reports/stock/entry_donation_receipt.js b/server/controllers/stock/reports/stock/entry_donation_receipt.js index 2d4988fec4..2d3447d898 100644 --- a/server/controllers/stock/reports/stock/entry_donation_receipt.js +++ b/server/controllers/stock/reports/stock/entry_donation_receipt.js @@ -12,7 +12,7 @@ const { */ async function stockEntryDonationReceipt(documentUuid, session, options) { const data = {}; - const optionReport = _.extend(options, { filename : 'STOCK.RECEIPTS.ENTRY_DONATION' }); + const optionReport = _.extend(options, { filename : 'STOCK.RECEIPT.ENTRY_DONATION' }); const autoStockAccountingEnabled = session.stock_settings.enable_auto_stock_accounting; // set up the report with report manager diff --git a/server/controllers/stock/reports/stock/entry_integration_receipt.js b/server/controllers/stock/reports/stock/entry_integration_receipt.js index 303dfca3e0..3ffeba0c8e 100644 --- a/server/controllers/stock/reports/stock/entry_integration_receipt.js +++ b/server/controllers/stock/reports/stock/entry_integration_receipt.js @@ -14,7 +14,7 @@ const { */ async function stockEntryIntegrationReceipt(documentUuid, session, options) { const data = {}; - const optionReport = _.extend(options, { filename : 'STOCK.RECEIPTS.ENTRY_INTEGRATION' }); + const optionReport = _.extend(options, { filename : 'STOCK.RECEIPT.ENTRY_INTEGRATION' }); const autoStockAccountingEnabled = session.stock_settings.enable_auto_stock_accounting; // set up the report with report manager diff --git a/server/controllers/stock/reports/stock/entry_purchase_receipt.js b/server/controllers/stock/reports/stock/entry_purchase_receipt.js index 30e5aa554d..2c6ee2b4cc 100644 --- a/server/controllers/stock/reports/stock/entry_purchase_receipt.js +++ b/server/controllers/stock/reports/stock/entry_purchase_receipt.js @@ -14,7 +14,7 @@ const Exchange = require('../../../finance/exchange'); */ async function stockEntryPurchaseReceipt(documentUuid, session, options) { const data = {}; - const optionReport = _.extend(options, { filename : 'STOCK.RECEIPTS.ENTRY_PURCHASE' }); + const optionReport = _.extend(options, { filename : 'STOCK.RECEIPT.ENTRY_PURCHASE' }); const autoStockAccountingEnabled = session.stock_settings.enable_auto_stock_accounting; // set up the report with report manager diff --git a/server/controllers/stock/reports/stock/exit_aggregate_consumption_receipt.js b/server/controllers/stock/reports/stock/exit_aggregate_consumption_receipt.js index 6bc10fa0e6..bd28e22998 100644 --- a/server/controllers/stock/reports/stock/exit_aggregate_consumption_receipt.js +++ b/server/controllers/stock/reports/stock/exit_aggregate_consumption_receipt.js @@ -12,7 +12,7 @@ const { */ async function stockExitAggregateConsumptionReceipt(documentUuid, session, options) { const data = {}; - const optionReport = _.extend(options, { filename : 'STOCK.RECEIPTS.AGGREGATE_CONSUMPTION' }); + const optionReport = _.extend(options, { filename : 'STOCK.RECEIPT.AGGREGATE_CONSUMPTION' }); const autoStockAccountingEnabled = session.stock_settings.enable_auto_stock_accounting; // set up the report with report manager diff --git a/server/controllers/stock/reports/stock/exit_depot_receipt.js b/server/controllers/stock/reports/stock/exit_depot_receipt.js index df704dbafa..1fd65de385 100644 --- a/server/controllers/stock/reports/stock/exit_depot_receipt.js +++ b/server/controllers/stock/reports/stock/exit_depot_receipt.js @@ -13,7 +13,7 @@ const { * GET /receipts/stock/exit_depot/:document_uuid */ function stockExitDepotReceipt(documentUuid, session, options) { - const optionReport = _.extend(options, { filename : 'STOCK.RECEIPTS.EXIT_DEPOT' }); + const optionReport = _.extend(options, { filename : 'STOCK.RECEIPT.EXIT_DEPOT' }); let template = STOCK_EXIT_DEPOT_TEMPLATE; if (Boolean(Number(optionReport.posReceipt))) { diff --git a/server/controllers/stock/reports/stock/exit_loss_receipt.js b/server/controllers/stock/reports/stock/exit_loss_receipt.js index 93ec3a0442..0d247d726f 100644 --- a/server/controllers/stock/reports/stock/exit_loss_receipt.js +++ b/server/controllers/stock/reports/stock/exit_loss_receipt.js @@ -15,7 +15,7 @@ const { */ async function stockExitLossReceipt(documentUuid, session, options) { const data = {}; - const optionReport = _.extend(options, { filename : 'STOCK.REPORTS.EXIT_LOSS' }); + const optionReport = _.extend(options, { filename : 'STOCK.RECEIPT.EXIT_LOSS' }); const autoStockAccountingEnabled = session.stock_settings.enable_auto_stock_accounting; let template = STOCK_EXIT_LOSS_TEMPLATE; diff --git a/server/controllers/stock/reports/stock/exit_report.js b/server/controllers/stock/reports/stock/exit_report.js index eb5c6ed827..b7921c34c4 100644 --- a/server/controllers/stock/reports/stock/exit_report.js +++ b/server/controllers/stock/reports/stock/exit_report.js @@ -37,8 +37,8 @@ async function stockExitReport(req, res, next) { ]); params.exchangeRate = exchange.rate || 1; - params.depotName = depot.text; + const collection = await collect(params); const bundle = await groupCollection(collection); diff --git a/server/controllers/stock/reports/stock/expiration_report.js b/server/controllers/stock/reports/stock/expiration_report.js index dc2b009c14..9d682859b1 100644 --- a/server/controllers/stock/reports/stock/expiration_report.js +++ b/server/controllers/stock/reports/stock/expiration_report.js @@ -111,6 +111,7 @@ async function stockExpirationReport(req, res, next) { currencyId, exchangeRate, depot, + depotName : depot.text, totals, today, }); diff --git a/server/controllers/stock/reports/stock/lost_stock_report.js b/server/controllers/stock/reports/stock/lost_stock_report.js index 594694f178..15cfe5d58a 100644 --- a/server/controllers/stock/reports/stock/lost_stock_report.js +++ b/server/controllers/stock/reports/stock/lost_stock_report.js @@ -1,5 +1,5 @@ const { - _, ReportManager, Stock, STOCK_LOST_STOCK_REPORT_TEMPLATE, + _, db, ReportManager, Stock, STOCK_LOST_STOCK_REPORT_TEMPLATE, } = require('../common'); const Exchange = require('../../../finance/exchange'); @@ -18,13 +18,14 @@ async function lostStockReport(req, res, next) { const { depotRole } = req.query; const { enterprise } = req.session; const currencyId = Number(params.currencyId); + const depot = await fetchDepotDetails(params.depot_uuid); const enterpriseId = enterprise.id; const exchangeRate = await Exchange.getExchangeRate(enterpriseId, currencyId, new Date()); const rate = exchangeRate.rate || 1; // set up the report with report manager - const optionReport = _.extend(params, { filename : 'TREE.LOST_STOCK_REPORT' }); + const optionReport = _.extend(params, { filename : 'REPORT.LOST_STOCK_REPORT.TITLE' }); const report = new ReportManager(STOCK_LOST_STOCK_REPORT_TEMPLATE, req.session, optionReport); return Stock.listLostStock(params) @@ -35,14 +36,14 @@ async function lostStockReport(req, res, next) { data.exchangeRate = rate; data.dateTo = params.dateTo; data.dateFrom = params.dateFrom; - data.isDestDepot = null; - data.isSrcDepot = null; - if (key && depotRole === 'destination') { - data.isDestDepot = true; - data.depotName = key.destDepot; - } else if (key && depotRole === 'source') { - data.isSrcDepot = true; - data.depotName = key.srcDepot; + data.destDepot = null; + data.srcDepot = null; + if (depotRole === 'destination') { + data.destDepot = depot.name; + } else if (depotRole === 'source') { + data.srcDepot = depot.name; + } else { + data.depotName = depot.name; } let sumLosses = 0; let totalMissing = 0; @@ -63,4 +64,13 @@ async function lostStockReport(req, res, next) { .catch(next); } +/** + * fetchDepotDetails + * @param {number} depotUuid depot uuid + */ +function fetchDepotDetails(depotUuid) { + const query = 'SELECT text AS name FROM depot WHERE uuid = ?'; + return db.one(query, [db.bid(depotUuid)]); +} + module.exports = lostStockReport; diff --git a/server/controllers/stock/reports/stock/lot_barcode/lot_barcode.handlebars b/server/controllers/stock/reports/stock/lot_barcode/lot_barcode.handlebars index e3ce0c45a6..3ebf0a62eb 100644 --- a/server/controllers/stock/reports/stock/lot_barcode/lot_barcode.handlebars +++ b/server/controllers/stock/reports/stock/lot_barcode/lot_barcode.handlebars @@ -1,4 +1,4 @@ -{{> head title="LOTS.BARCODE_FOR_LOT" }} +{{> head }}
diff --git a/server/controllers/stock/reports/stock/monthly_consumption.js b/server/controllers/stock/reports/stock/monthly_consumption.js index 3e038cedb9..151fa358d5 100644 --- a/server/controllers/stock/reports/stock/monthly_consumption.js +++ b/server/controllers/stock/reports/stock/monthly_consumption.js @@ -9,7 +9,7 @@ exports.report = report; // default report parameters const DEFAULT_PARAMS = { csvKey : 'monthlyConsumption', - filename : 'TREE.MONTHLY_CONSUMPTION', + filename : 'REPORT.MONTHLY_CONSUMPTION.TITLE', orientation : 'portrait', }; diff --git a/server/controllers/stock/reports/stock/movement_report.js b/server/controllers/stock/reports/stock/movement_report.js index f259aeffa3..16412d2ab0 100644 --- a/server/controllers/stock/reports/stock/movement_report.js +++ b/server/controllers/stock/reports/stock/movement_report.js @@ -113,7 +113,7 @@ async function document(req, res, next) { }; const reportResult = await report.render({ - depotText : depot.text, + depotName : depot.text, dateFrom : params.dateFrom, dateTo : params.dateTo, chartjs : chartjs.renderChart(chartRenderOptions), diff --git a/server/controllers/stock/reports/stock/rumer.js b/server/controllers/stock/reports/stock/rumer.js index 95d973a182..e86d98cfc2 100644 --- a/server/controllers/stock/reports/stock/rumer.js +++ b/server/controllers/stock/reports/stock/rumer.js @@ -13,7 +13,7 @@ exports.report = report; // default report parameters const DEFAULT_PARAMS = { csvKey : 'rumer', - filename : 'TREE.RUMER', + filename : 'REPORT.RUMER.TITLE', orientation : 'landscape', }; diff --git a/server/controllers/stock/reports/stock/stock_changes/stock_changes.handlebars b/server/controllers/stock/reports/stock/stock_changes/stock_changes.handlebars index c4156dd76f..0a686e0ff7 100644 --- a/server/controllers/stock/reports/stock/stock_changes/stock_changes.handlebars +++ b/server/controllers/stock/reports/stock/stock_changes/stock_changes.handlebars @@ -1,19 +1,15 @@ -{{> head title="REPORT.STOCK_CHANGES.TITLE" }} +{{> head }} - {{> header}} + {{#> header}} +

{{depot.text}}

+

{{date period.start_date}} - {{date period.end_date}}

+ {{/header}} +
-

- {{translate 'REPORT.STOCK_CHANGES.TITLE'}} -

- -

{{depot.text}}

- -

{{date period.start_date}} - {{date period.end_date}}

-
diff --git a/server/controllers/stock/reports/stock/stock_changes/stock_changes.js b/server/controllers/stock/reports/stock/stock_changes/stock_changes.js index 68d842119f..991f2ab327 100644 --- a/server/controllers/stock/reports/stock/stock_changes/stock_changes.js +++ b/server/controllers/stock/reports/stock/stock_changes/stock_changes.js @@ -6,7 +6,7 @@ const Periods = require('../../../../finance/period'); const DEFAULT_PARAMS = { csvKey : 'rows', - filename : 'REPORTS.STOCK_CHANGES.TITLE', + filename : 'REPORT.STOCK_CHANGES.TITLE', }; const STOCK_CHANGES_REPORT_TEMPLATE = './server/controllers/stock/reports/stock/stock_changes/stock_changes.handlebars'; diff --git a/server/controllers/stock/reports/stock/stock_sheet.js b/server/controllers/stock/reports/stock/stock_sheet.js index 5f295b9517..7879453644 100644 --- a/server/controllers/stock/reports/stock/stock_sheet.js +++ b/server/controllers/stock/reports/stock/stock_sheet.js @@ -94,6 +94,7 @@ async function stockSheetReport(req, res, next) { data.header = header; data.dateFrom = options.dateFrom; data.dateTo = options.dateTo; + data.depotName = depot?.text || null; data.wacDetails = { value : (rows.totals.entry - rows.totals.exit) * wacDetails.wac, diff --git a/server/controllers/stock/reports/stock/value.js b/server/controllers/stock/reports/stock/value.js index f1e01ab394..591e91bcf6 100644 --- a/server/controllers/stock/reports/stock/value.js +++ b/server/controllers/stock/reports/stock/value.js @@ -24,7 +24,7 @@ async function reporting(_options, session) { const enterpriseId = session.enterprise.id; const optionReport = _.extend(_options, { - filename : 'TREE.STOCK_VALUE', + filename : 'REPORT.STOCK_VALUE.TITLE', }); const report = new ReportManager(STOCK_VALUE_REPORT_TEMPLATE, session, optionReport); @@ -91,7 +91,9 @@ async function reporting(_options, session) { data.exchangeRate = exchangeRate.rate || 1; data.currency_id = options.currency_id; - return report.render({ ...data, depot, totals }); + data.depotName = depot.text; + + return report.render({ ...data, totals }); } module.exports.document = stockValue; diff --git a/server/controllers/stock/reports/stock_aggregate_consumption.receipt.handlebars b/server/controllers/stock/reports/stock_aggregate_consumption.receipt.handlebars index 8662086201..2d8fa73ec0 100644 --- a/server/controllers/stock/reports/stock_aggregate_consumption.receipt.handlebars +++ b/server/controllers/stock/reports/stock_aggregate_consumption.receipt.handlebars @@ -1,4 +1,4 @@ -{{> head title="STOCK.RECEIPT.AGGREGATE_CONSUMPTION" }} +{{> head }}
@@ -6,7 +6,6 @@
{{> stockReceiptHeader - title="STOCK.RECEIPT.AGGREGATE_CONSUMPTION" entity=details.depot_name reference=details.document_reference barcode=details.barcode @@ -22,7 +21,7 @@ {{translate 'STOCK.DEPOT'}}: {{details.depot_name}}
{{translate 'FORM.LABELS.DOCUMENT'}}: {{details.document_reference}}
{{#if details.autoStockAccountingEnabled}} - {{translate 'FORM.LABELS.VOUCHER'}}: + {{translate 'FORM.LABELS.VOUCHER'}}: {{#if details.voucher_reference}} {{details.voucher_reference}} {{else}} diff --git a/server/controllers/stock/reports/stock_aggregated_consumption_report.handlebars b/server/controllers/stock/reports/stock_aggregated_consumption_report.handlebars index bcf929589e..fa6a04bec7 100644 --- a/server/controllers/stock/reports/stock_aggregated_consumption_report.handlebars +++ b/server/controllers/stock/reports/stock_aggregated_consumption_report.handlebars @@ -1,34 +1,14 @@ -{{> head title="REPORT.AGGREGATED_STOCK_CONSUMPTION.TITLE" }} +{{> head }}
{{> header}} +
- -

- {{translate 'REPORT.AGGREGATED_STOCK_CONSUMPTION.TITLE'}} -

- - {{#if inventoryGroupName}} -

- {{inventoryGroupName}} -

- {{/if}} - -

- {{#if depot.text}}{{depot.text}}{{/if}} -

- -

- {{date dateFrom}} - {{date dateTo}} -

- -
-
diff --git a/server/controllers/stock/reports/stock_assign.receipt.handlebars b/server/controllers/stock/reports/stock_assign.receipt.handlebars index a9639fdb6f..e10a66b296 100644 --- a/server/controllers/stock/reports/stock_assign.receipt.handlebars +++ b/server/controllers/stock/reports/stock_assign.receipt.handlebars @@ -1,4 +1,4 @@ -{{> head title="ASSIGN.STOCK_ASSIGN" }} +{{> head }}
@@ -6,7 +6,6 @@
{{> stockReceiptHeader - title="ASSIGN.STOCK_ASSIGN" entity=details.assigned_to_name reference=details.document_reference barcode=details.barcode diff --git a/server/controllers/stock/reports/stock_avg_med_costs_per_patient.report.handlebars b/server/controllers/stock/reports/stock_avg_med_costs_per_patient.report.handlebars index 54eb6400b1..092790dad5 100644 --- a/server/controllers/stock/reports/stock_avg_med_costs_per_patient.report.handlebars +++ b/server/controllers/stock/reports/stock_avg_med_costs_per_patient.report.handlebars @@ -1,4 +1,4 @@ -{{> head title="REPORT.AVG_MED_COST_PER_PATIENT.TITLE" }} +{{> head }} {{> header}} @@ -6,23 +6,6 @@
- -

- {{translate 'REPORT.AVG_MED_COST_PER_PATIENT.TITLE'}} -

- {{#if depotOrService}} -

- {{#if depotName}} - {{ depotName }}{{#if depotAndService}}, {{/if}} - {{/if}} - {{#if serviceName}} - {{translate 'STOCK.SERVICE'}}: {{ serviceName }} - {{/if}} -

- {{/if}} -

- {{date dateFrom}} - {{date dateTo}} -

{{> exchangeRate rate=exchangeRate currencyId=currencyId}} diff --git a/server/controllers/stock/reports/stock_consumption_graph.handlebars b/server/controllers/stock/reports/stock_consumption_graph.handlebars index ccb59597e3..5e7c309c79 100644 --- a/server/controllers/stock/reports/stock_consumption_graph.handlebars +++ b/server/controllers/stock/reports/stock_consumption_graph.handlebars @@ -1,4 +1,4 @@ -{{> head title="REPORT.STOCK_CONSUMPTION_GRAPH_REPORT.TITLE" }} +{{> head }} @@ -6,19 +6,12 @@
- {{> header}} + {{#> header}} +

{{translate destinationType}}

+ {{/header}}
-
-

{{translate 'REPORT.STOCK_CONSUMPTION_GRAPH_REPORT.TITLE'}}

- {{#if depot.text}} -

{{depot.text}}

- {{/if}} -

{{translate destinationType}}

-

{{date dateFrom}} - {{date dateTo}}

-
-
diff --git a/server/controllers/stock/reports/stock_entry.report.handlebars b/server/controllers/stock/reports/stock_entry.report.handlebars index 919a4fff11..c456632952 100644 --- a/server/controllers/stock/reports/stock_entry.report.handlebars +++ b/server/controllers/stock/reports/stock_entry.report.handlebars @@ -1,25 +1,12 @@ -{{> head title="REPORT.STOCK.ENTRY_REPORT" }} +{{> head }} - {{> header}} + {{> header }}
- -

- {{translate 'REPORT.STOCK.ENTRY_REPORT'}} -

- -

- {{ depotName }} -

- -

- {{date dateFrom}} - {{date dateTo}} -

- {{> exchangeRate rate=exchangeRate currencyId=currencyId}} diff --git a/server/controllers/stock/reports/stock_entry_depot.receipt.handlebars b/server/controllers/stock/reports/stock_entry_depot.receipt.handlebars index 55339d0c0f..4316c876d0 100644 --- a/server/controllers/stock/reports/stock_entry_depot.receipt.handlebars +++ b/server/controllers/stock/reports/stock_entry_depot.receipt.handlebars @@ -1,4 +1,4 @@ -{{> head title="STOCK.RECEIPT.ENTRY_DEPOT" }} +{{> head }}
@@ -6,7 +6,6 @@
{{> stockReceiptHeader - title="STOCK.RECEIPT.ENTRY_DEPOT" entity=entry.details.depot_name reference=entry.details.document_reference barcode=entry.details.barcode diff --git a/server/controllers/stock/reports/stock_entry_donation.receipt.handlebars b/server/controllers/stock/reports/stock_entry_donation.receipt.handlebars index a281b64221..920732b74e 100644 --- a/server/controllers/stock/reports/stock_entry_donation.receipt.handlebars +++ b/server/controllers/stock/reports/stock_entry_donation.receipt.handlebars @@ -1,4 +1,4 @@ -{{> head title="STOCK.RECEIPT.ENTRY_DONATION" }} +{{> head }}
@@ -6,7 +6,6 @@
{{> stockReceiptHeader - title="STOCK.RECEIPT.ENTRY_DONATION" entity=details.depot_name reference=details.document_reference barcode=details.barcode @@ -23,7 +22,7 @@ {{translate 'STOCK.DEPOT'}}: {{details.depot_name}}
{{translate 'FORM.LABELS.DOCUMENT'}}: {{details.document_reference}}
{{#if details.autoStockAccountingEnabled}} - {{translate 'FORM.LABELS.VOUCHER'}}: + {{translate 'FORM.LABELS.VOUCHER'}}: {{#if details.voucher_reference}} {{details.voucher_reference}} {{else}} diff --git a/server/controllers/stock/reports/stock_entry_integration.receipt.handlebars b/server/controllers/stock/reports/stock_entry_integration.receipt.handlebars index 47bc1fbd30..d7ee293264 100644 --- a/server/controllers/stock/reports/stock_entry_integration.receipt.handlebars +++ b/server/controllers/stock/reports/stock_entry_integration.receipt.handlebars @@ -1,4 +1,4 @@ -{{> head title="STOCK.RECEIPT.ENTRY_INTEGRATION" }} +{{> head }}
@@ -6,7 +6,6 @@
{{> stockReceiptHeader - title="STOCK.RECEIPT.ENTRY_INTEGRATION" entity=details.depot_name reference=details.document_reference barcode=details.barcode @@ -25,7 +24,7 @@ {{translate 'STOCK.DEPOT'}}: {{details.depot_name}}
{{translate 'FORM.LABELS.DOCUMENT'}}: {{details.document_reference}}
{{#if details.autoStockAccountingEnabled}} - {{translate 'FORM.LABELS.VOUCHER'}}: + {{translate 'FORM.LABELS.VOUCHER'}}: {{#if details.voucher_reference}} {{details.voucher_reference}} {{else}} diff --git a/server/controllers/stock/reports/stock_entry_purchase.receipt.handlebars b/server/controllers/stock/reports/stock_entry_purchase.receipt.handlebars index 133f827044..395db378e3 100644 --- a/server/controllers/stock/reports/stock_entry_purchase.receipt.handlebars +++ b/server/controllers/stock/reports/stock_entry_purchase.receipt.handlebars @@ -1,4 +1,4 @@ -{{> head title="STOCK.RECEIPT.ENTRY_PURCHASE" }} +{{> head }}
@@ -6,7 +6,6 @@
{{> stockReceiptHeader - title="STOCK.RECEIPT.ENTRY_PURCHASE" entity=details.depot_name reference=details.document_reference barcode=details.barcode diff --git a/server/controllers/stock/reports/stock_exit.report.handlebars b/server/controllers/stock/reports/stock_exit.report.handlebars index 9daac4a237..813e0be043 100644 --- a/server/controllers/stock/reports/stock_exit.report.handlebars +++ b/server/controllers/stock/reports/stock_exit.report.handlebars @@ -1,25 +1,12 @@ -{{> head title="REPORT.STOCK.EXIT_REPORT" }} +{{> head }} - {{> header}} + {{> header }}
- -

- {{translate 'REPORT.STOCK.EXIT_REPORT'}} -

- -

- {{ depotName }} -

- -

- {{date dateFrom}} - {{date dateTo}} -

- {{> exchangeRate rate=exchangeRate currencyId=currencyId}} @@ -303,4 +290,5 @@

*{{translate 'STOCK.STOCK_UNIT_COST_ROUNDED'}}

+ diff --git a/server/controllers/stock/reports/stock_exit_depot.receipt.handlebars b/server/controllers/stock/reports/stock_exit_depot.receipt.handlebars index 1671b49588..bbed2462c0 100644 --- a/server/controllers/stock/reports/stock_exit_depot.receipt.handlebars +++ b/server/controllers/stock/reports/stock_exit_depot.receipt.handlebars @@ -1,4 +1,4 @@ -{{> head title="STOCK.RECEIPT.EXIT_DEPOT" }} +{{> head }}
@@ -6,7 +6,6 @@
{{> stockReceiptHeader - title="STOCK.RECEIPT.EXIT_DEPOT" entity=exit.details.depot_name reference=exit.details.document_reference barcode=exit.details.barcode diff --git a/server/controllers/stock/reports/stock_exit_loss.receipt.handlebars b/server/controllers/stock/reports/stock_exit_loss.receipt.handlebars index 2316e19f8c..2d8fa73ec0 100644 --- a/server/controllers/stock/reports/stock_exit_loss.receipt.handlebars +++ b/server/controllers/stock/reports/stock_exit_loss.receipt.handlebars @@ -1,4 +1,4 @@ -{{> head title="STOCK.RECEIPT.EXIT_LOSS" }} +{{> head }}
@@ -6,7 +6,6 @@
{{> stockReceiptHeader - title="STOCK.RECEIPT.EXIT_LOSS" entity=details.depot_name reference=details.document_reference barcode=details.barcode @@ -22,7 +21,7 @@ {{translate 'STOCK.DEPOT'}}: {{details.depot_name}}
{{translate 'FORM.LABELS.DOCUMENT'}}: {{details.document_reference}}
{{#if details.autoStockAccountingEnabled}} - {{translate 'FORM.LABELS.VOUCHER'}}: + {{translate 'FORM.LABELS.VOUCHER'}}: {{#if details.voucher_reference}} {{details.voucher_reference}} {{else}} diff --git a/server/controllers/stock/reports/stock_exit_patient.receipt.handlebars b/server/controllers/stock/reports/stock_exit_patient.receipt.handlebars index 75bece8dad..d04171ce42 100644 --- a/server/controllers/stock/reports/stock_exit_patient.receipt.handlebars +++ b/server/controllers/stock/reports/stock_exit_patient.receipt.handlebars @@ -1,4 +1,4 @@ -{{> head title="STOCK.RECEIPT.EXIT_PATIENT" }} +{{> head }}
@@ -6,7 +6,6 @@
{{> stockReceiptHeader - title="STOCK.RECEIPT.EXIT_PATIENT" entity=details.full_display_name reference=details.document_reference barcode=details.barcode @@ -29,7 +28,7 @@ {{translate 'FORM.LABELS.DOCUMENT'}}: {{details.document_reference}}
{{#if details.autoStockAccountingEnabled}} - {{translate 'FORM.LABELS.VOUCHER'}}: + {{translate 'FORM.LABELS.VOUCHER'}}: {{#if details.voucher_reference}} {{details.voucher_reference}} {{else}} diff --git a/server/controllers/stock/reports/stock_exit_service.receipt.handlebars b/server/controllers/stock/reports/stock_exit_service.receipt.handlebars index 08d4d5e5d4..92b1996b3d 100644 --- a/server/controllers/stock/reports/stock_exit_service.receipt.handlebars +++ b/server/controllers/stock/reports/stock_exit_service.receipt.handlebars @@ -1,11 +1,10 @@ -{{> head title="STOCK.RECEIPT.EXIT_SERVICE" }} +{{> head }}
- {{> stockReceiptHeader - title="STOCK.RECEIPT.EXIT_SERVICE" + {{> stockReceiptHeader entity=details.service_display_name reference=details.document_reference barcode=details.barcode @@ -24,7 +23,7 @@ {{translate 'FORM.LABELS.REQUISITION_REFERENCE'}}: {{details.document_requisition}}
{{/if}} {{#if details.autoStockAccountingEnabled}} - {{translate 'FORM.LABELS.VOUCHER'}}: + {{translate 'FORM.LABELS.VOUCHER'}}: {{#if details.voucher_reference}} {{details.voucher_reference}} {{else}} diff --git a/server/controllers/stock/reports/stock_expiration_report.handlebars b/server/controllers/stock/reports/stock_expiration_report.handlebars index 54348dacc7..3f6b6d5726 100644 --- a/server/controllers/stock/reports/stock_expiration_report.handlebars +++ b/server/controllers/stock/reports/stock_expiration_report.handlebars @@ -1,5 +1,4 @@ -{{> head title="REPORT.STOCK_EXPIRATION_REPORT.TITLE" }} - +{{> head }} @@ -20,19 +19,6 @@ } - -

- {{translate 'REPORT.STOCK_EXPIRATION_REPORT.TITLE'}} -

- - {{#if depot.text}} -

{{depot.text}}

- {{/if}} - -

- {{date today}} -

- {{> exchangeRate rate=exchangeRate currencyId=currencyId}}
@@ -56,7 +42,7 @@
{{#each result as |depot|}} -

{{depot.depot_name}}

+

{{depot.depot_name}}

diff --git a/server/controllers/stock/reports/stock_inline_movements.report.handlebars b/server/controllers/stock/reports/stock_inline_movements.report.handlebars index 2d73a5fdd8..fdf55764cc 100644 --- a/server/controllers/stock/reports/stock_inline_movements.report.handlebars +++ b/server/controllers/stock/reports/stock_inline_movements.report.handlebars @@ -1,4 +1,4 @@ -{{> head title="TREE.STOCK_MOVEMENTS" }} +{{> head }} @@ -8,15 +8,6 @@
- -

- {{translate 'TREE.STOCK_INLINE_MOVEMENTS'}} -

- -

- {{date}} -

- {{> filterbar filters=filters }} diff --git a/server/controllers/stock/reports/stock_inventories.report.handlebars b/server/controllers/stock/reports/stock_inventories.report.handlebars index 3518c2ed32..59d9b4a766 100644 --- a/server/controllers/stock/reports/stock_inventories.report.handlebars +++ b/server/controllers/stock/reports/stock_inventories.report.handlebars @@ -1,19 +1,8 @@ -{{> head title="TREE.STOCK_INVENTORY" }} +{{> head }} {{> header}} - - - -

- {{translate 'TREE.STOCK_INVENTORY'}} -

- -

- {{date dateTo}} -

- {{> filterbar filters=filters }} diff --git a/server/controllers/stock/reports/stock_lost_stock.report.handlebars b/server/controllers/stock/reports/stock_lost_stock.report.handlebars index e455546195..917212234d 100644 --- a/server/controllers/stock/reports/stock_lost_stock.report.handlebars +++ b/server/controllers/stock/reports/stock_lost_stock.report.handlebars @@ -1,22 +1,26 @@ -{{> head title="REPORT.LOST_STOCK_REPORT.TITLE" }} +{{> head }}
- {{> header}} + {{#> header }} + + {{/header}} +
-

- {{translate 'REPORT.LOST_STOCK_REPORT.TITLE'}}
- {{date dateFrom}} - {{date dateTo}} -

- -

- {{#if isDestDepot}}{{translate 'REPORT.LOST_STOCK_REPORT.DESTINATION_DEPOT'}}: {{depotName}}{{/if}} - {{#if isSrcDepot}}{{translate 'REPORT.LOST_STOCK_REPORT.SOURCE_DEPOT'}}: {{depotName}}{{/if}} -

+ {{#if destDepot}} +

+ {{translate 'REPORT.LOST_STOCK_REPORT.DESTINATION_DEPOT'}}: {{destDepot}} +

+ {{/if}} + {{#if srcDepot}} +

+ {{translate 'REPORT.LOST_STOCK_REPORT.SOURCE_DEPOT'}}: {{srcDepot}} +

+ {{/if}} {{> exchangeRate rate=exchangeRate currencyId=currencyId}} diff --git a/server/controllers/stock/reports/stock_lots.report.handlebars b/server/controllers/stock/reports/stock_lots.report.handlebars index 0ebb4e3293..c4a4c262f1 100644 --- a/server/controllers/stock/reports/stock_lots.report.handlebars +++ b/server/controllers/stock/reports/stock_lots.report.handlebars @@ -1,19 +1,9 @@ -{{> head title="TREE.STOCK_LOTS" }} +{{> head }} {{> header}} - - -

- {{translate 'TREE.STOCK_LOTS'}} -

- -

- {{date}} -

- {{> filterbar filters=filters }} diff --git a/server/controllers/stock/reports/stock_movement_report.handlebars b/server/controllers/stock/reports/stock_movement_report.handlebars index 0c5dd43a11..5345562b77 100644 --- a/server/controllers/stock/reports/stock_movement_report.handlebars +++ b/server/controllers/stock/reports/stock_movement_report.handlebars @@ -1,4 +1,4 @@ -{{> head TITLE="REPORT.STOCK_MOVEMENT_REPORT.TITLE" }} +{{> head }} @@ -10,12 +10,7 @@
-
-

{{translate 'REPORT.STOCK_MOVEMENT_REPORT.TITLE'}}

-

{{ depotText }}

-

{{date dateFrom}} - {{date dateTo}}

-
- +
diff --git a/server/controllers/stock/reports/stock_movements.report.handlebars b/server/controllers/stock/reports/stock_movements.report.handlebars index 857220a45f..4ab50ba071 100644 --- a/server/controllers/stock/reports/stock_movements.report.handlebars +++ b/server/controllers/stock/reports/stock_movements.report.handlebars @@ -1,4 +1,4 @@ -{{> head title="TREE.STOCK_MOVEMENTS" }} +{{> head }} @@ -8,15 +8,6 @@
- -

- {{translate 'TREE.STOCK_MOVEMENTS'}} -

- -

- {{date}} -

- {{> filterbar filters=filters }} diff --git a/server/controllers/stock/reports/stock_sheet.report.handlebars b/server/controllers/stock/reports/stock_sheet.report.handlebars index 5901685f7b..cf0596a423 100644 --- a/server/controllers/stock/reports/stock_sheet.report.handlebars +++ b/server/controllers/stock/reports/stock_sheet.report.handlebars @@ -1,4 +1,4 @@ -{{> head title="REPORT.STOCK.INVENTORY_REPORT" }} +{{> head }} @@ -8,21 +8,10 @@
- -

- {{translate 'REPORT.STOCK.INVENTORY_REPORT'}} -

-

- {{#if depot.text}}{{depot.text}}
{{/if}} {{#if inventory.code}}{{inventory.code}} - {{inventory.text}}{{/if}}

-

- {{#if dateFrom}}{{date dateFrom}} - {{/if}} - {{#if dateTo}}{{date dateTo}}{{/if}} -

- {{> exchangeRate rate=exchangeRate currencyId=currencyId}} diff --git a/server/controllers/stock/reports/stock_value.report.handlebars b/server/controllers/stock/reports/stock_value.report.handlebars index 17da7ad58c..edab229f80 100644 --- a/server/controllers/stock/reports/stock_value.report.handlebars +++ b/server/controllers/stock/reports/stock_value.report.handlebars @@ -1,26 +1,15 @@ -{{> head title="TREE.STOCK_VALUE" }} +{{> head }}
- {{> header}} + + {{> header }} +
- -

- {{translate 'REPORT.STOCK_VALUE.TITLE'}} -

- -

- {{#if depot.text}}{{depot.text}}{{/if}} -

- -

- {{date dateTo}} -

- {{#unless isEnterpriseCurrency}} {{> exchangeRate rate=exchangeRate currencyId=currency_id}} {{/unless}} diff --git a/server/controllers/stock/requisition/requisition.receipt.handlebars b/server/controllers/stock/requisition/requisition.receipt.handlebars index 123cf8654b..cc34b38aa1 100644 --- a/server/controllers/stock/requisition/requisition.receipt.handlebars +++ b/server/controllers/stock/requisition/requisition.receipt.handlebars @@ -1,31 +1,18 @@ -{{> head title="REQUISITION.STOCK_REQUISITION" }} +{{> head }} -
+
-
- -
- {{> enterpriseDetails }} - -
- -

- {{translate 'REQUISITION.STOCK_REQUISITION'}}
- {{details.reference}}
-

- -
- {{translate "REPORT.PRODUCED_ON"}} - {{translate "REPORT.BY"}} {{metadata.user.display_name}} - -
- {{#if metadata.enterprise.settings.enable_barcodes}} - {{> barcode value=barcode}}
- {{/if}} -
-
+ {{#> header}} +

{{details.reference}}

+ {{#if metadata.enterprise.settings.enable_barcodes}} +
+ {{> barcode value=barcode}}
+ {{/if}} + {{/header}} + +
diff --git a/server/lib/ReportManager.js b/server/lib/ReportManager.js index 0546cbd01a..8d985a5367 100644 --- a/server/lib/ReportManager.js +++ b/server/lib/ReportManager.js @@ -71,7 +71,7 @@ function getFileName(options, extension) { const fileDate = (new Date()).toLocaleDateString(); const formattedName = `${translatedName} ${fileDate}`; const fileName = `${formattedName}${extension}`; - return encodeURIComponent(fileName); + return [translatedName, encodeURIComponent(fileName)]; } // Class Declaration @@ -175,13 +175,14 @@ class ReportManager { data.rows = (renameKeys) ? util.renameKeys(rowsToRename, displayNames) : rowsToRename; + let defaultTitle; let fileName; if (this.options.filename) { - fileName = getFileName(this.options, this.renderer.extension); + [defaultTitle, fileName] = getFileName(this.options, this.renderer.extension); } // set the report title to the filename if no title is given - data.title = data.title || fileName; + data.title = data.title || defaultTitle; // render the report using the stored renderer const report = await renderer.render(data, this.template, this.options); diff --git a/server/lib/template/partials/enterpriseDetails.handlebars b/server/lib/template/partials/enterpriseDetails.handlebars index b8c8fe1550..5f6b93ff1c 100644 --- a/server/lib/template/partials/enterpriseDetails.handlebars +++ b/server/lib/template/partials/enterpriseDetails.handlebars @@ -1,3 +1,5 @@ + + {{#if metadata.enterprise.logo}}
@@ -5,21 +7,21 @@ {{/if}}
+ {{#if metadata.enterprise.logo}} + class="col-xs-4" + {{else}} + class="col-xs-5" + {{/if}}>

{{metadata.enterprise.name}}

{{metadata.project.name}} ({{metadata.project.abbr}})
{{#if metadata.enterprise.phone}}{{translate 'FORM.LABELS.PHONE'}}: {{metadata.enterprise.phone}}
{{/if}} {{#if metadata.enterprise.email}}{{translate 'FORM.LABELS.EMAIL'}}: {{metadata.enterprise.email}}
{{/if}} - {{translate 'FORM.LABELS.ADDRESS'}}: + {{translate 'FORM.LABELS.ADDRESS'}}: {{#if metadata.enterprise.address}} {{metadata.enterprise.address}} {{else}} {{metadata.enterprise.location}} {{/if}} +
diff --git a/server/lib/template/partials/exchangeRate.handlebars b/server/lib/template/partials/exchangeRate.handlebars index 9e39d3d1a2..d1a5f259c5 100644 --- a/server/lib/template/partials/exchangeRate.handlebars +++ b/server/lib/template/partials/exchangeRate.handlebars @@ -4,7 +4,7 @@ {{#gt rate 1}} {{translate 'FORM.LABELS.EXCHANGE_RATE'}}: {{currency rate currencyId 4}} {{translate 'FORM.INFO.PER'}} {{currency 1 metadata.enterprise.currency_id 0}} - {{else}} + {{else}} XYZ {{translate 'FORM.LABELS.EXCHANGE_RATE'}}: {{currency (divide 1 rate) metadata.enterprise.currency_id 4}} {{translate 'FORM.INFO.PER'}} {{currency 1 currencyId 0}} {{/gt}} diff --git a/server/lib/template/partials/header.handlebars b/server/lib/template/partials/header.handlebars index 3b6ce2f3ed..a10998faee 100644 --- a/server/lib/template/partials/header.handlebars +++ b/server/lib/template/partials/header.handlebars @@ -1,10 +1,5 @@ -
+
{{> enterpriseDetails }} -
-
- {{translate "REPORT.PRODUCED_ON"}} - {{translate "REPORT.BY"}} {{metadata.user.display_name}} -
-
+ {{> title }}
diff --git a/server/lib/template/partials/stockReceiptHeader.handlebars b/server/lib/template/partials/stockReceiptHeader.handlebars index d5e68f76aa..f0d9a65231 100644 --- a/server/lib/template/partials/stockReceiptHeader.handlebars +++ b/server/lib/template/partials/stockReceiptHeader.handlebars @@ -11,8 +11,8 @@
{{> enterpriseDetails }} -
-

{{translate this.title}}

+
+

{{translate this.title}}

{{this.entity}}

{{#if this.reference}}{{this.reference}} -{{/if}} diff --git a/server/lib/template/partials/title.handlebars b/server/lib/template/partials/title.handlebars new file mode 100644 index 0000000000..61bb202816 --- /dev/null +++ b/server/lib/template/partials/title.handlebars @@ -0,0 +1,51 @@ + + +
+ +

+ {{translate title}} {{#if provisionary}}({{translate 'REPORT.PROVISIONARY'}}){{/if}} +

+ + {{#if inventoryGroupName}} +

+ {{inventoryGroupName}} +

+ {{/if}} + + {{#if depotName}} +

+ {{translate depotName}} +

+ {{/if}} + + {{#if serviceName}} +

+ {{translate 'STOCK.SERVICE'}}: {{ serviceName }} +

+ {{/if}} + + + + {{#if @partial-block}} + {{> @partial-block}} + {{/if}} + + {{#if dateTo}} + {{#if dateFrom}} +

+ {{date dateFrom}} - {{date dateTo}} +

+ {{else}} +

+ {{translate 'REPORT.THROUGH'}}: {{date dateTo}} +

+ {{/if}} + {{/if}} + + +
+ {{translate "REPORT.PRODUCED_ON"}} + {{translate "REPORT.BY"}} {{metadata.user.display_name}} +
+ +
diff --git a/server/models/migrations/next/migrate.sql b/server/models/migrations/next/migrate.sql index 161be4f6bd..013b8b22c5 100644 --- a/server/models/migrations/next/migrate.sql +++ b/server/models/migrations/next/migrate.sql @@ -1 +1,9 @@ -- migration file for the next BHIMA release + + +/* + * @author: jmcameron + * @description: Reformat reports + * @date: 2022-05-23 + */ +UPDATE `report` set report_key='analysis_auxiliary_cashboxes' WHERE title_key='REPORT.ANALYSIS_AUX_CASHBOX.TITLE';