(cron job) add cron email component to main reports #3794

jeremielodi · 2019-07-10T11:07:52Z

hound · 2019-07-10T11:07:59Z

client/src/modules/reports/generate/stock_value/stock_value.config.js

 ];

-function StockValueConfigController($sce, Notify, SavedReports, AppCache, reportData, $state, Languages, moment) {
+function StockValueConfigController($sce, Notify, SavedReports,
+  AppCache, reportData, $state, Languages, moment, util) {


'util' is defined but never used no-unused-vars

kwilu · 2019-07-10T11:08:02Z

Hello @jeremielodi, it seems like you have referenced #3792 in your pull request description, but you have not referenced them in your commit message description(s). When you reference an issue in a commit message, it automatically closes the corresponding issue when the commit is merged.

Please run git commit --amend in your command line client to amend your commit message description with Fixes #3792..

An example of a correctly-formatted commit:

commit fabd5e450374c8dde65ec35f02140383940fe146
Author: kwilu
Date:   Sat Mar 18 13:42:40 2017 -0700

    pull requests: Check PR commits reference when issue is referenced.

    Fixes #51.

Thank you for your contributions to BHIMA!

kwilu · 2019-07-10T11:35:53Z

Hello @jeremielodi, it seems like you have referenced #3792 in your pull request description, but you have not referenced them in your commit message description(s). When you reference an issue in a commit message, it automatically closes the corresponding issue when the commit is merged.

Please run git commit --amend in your command line client to amend your commit message description with Fixes #3792..

An example of a correctly-formatted commit:

commit fabd5e450374c8dde65ec35f02140383940fe146
Author: kwilu
Date:   Sat Mar 18 13:42:40 2017 -0700

    pull requests: Check PR commits reference when issue is referenced.

    Fixes #51.

Thank you for your contributions to BHIMA!

mbayopanda · 2019-07-10T18:10:42Z

server/controllers/finance/reports/cashflow/index.js

@@ -25,7 +25,7 @@ const TEMPLATE_BY_SERVICE = './server/controllers/finance/reports/cashflow/repor
 // expose to the API
 exports.report = report;
 exports.byService = reportByService;
-
+exports.printingReport = printingReport;


Is it possible to use just reporting as for others reports which has emailing options, because it can be useful to have the same terminology everywhere where have used this concept of exposing report on the server side.

kwilu · 2019-07-11T06:38:01Z

Hello @jeremielodi, it seems like you have referenced #3792 in your pull request description, but you have not referenced them in your commit message description(s). When you reference an issue in a commit message, it automatically closes the corresponding issue when the commit is merged.

Please run git commit --amend in your command line client to amend your commit message description with Fixes #3792..

An example of a correctly-formatted commit:

commit fabd5e450374c8dde65ec35f02140383940fe146
Author: kwilu
Date:   Sat Mar 18 13:42:40 2017 -0700

    pull requests: Check PR commits reference when issue is referenced.

    Fixes #51.

Thank you for your contributions to BHIMA!

mbayopanda

I made some comment about duplication of functions

mbayopanda · 2019-07-12T20:37:36Z

server/controllers/finance/reports/cashflow/index.js

@@ -361,6 +361,8 @@ function report(req, res, next) {
     * @param {*} source
     * @param {*} sourceTotalByTextKeys
     */
+
+  // eslint-disable-next-line no-shadow


Since there is another definition of a function with this name and the code looks the same, is it possible to just reuse this function, instead of recreating it again.

mbayopanda · 2019-07-12T20:42:03Z

server/controllers/finance/reports/cashflow/index.js

@@ -376,7 +378,7 @@ function report(req, res, next) {
    });
    return sourceTotalByTextKeys;
  }
-
+  // eslint-disable-next-line no-shadow


Same remark as for aggregateTotalByTextKeys, try to reuse it by removing this definition of the function.

mbayopanda · 2019-07-12T20:42:30Z

server/controllers/finance/reports/cashflow/index.js

@@ -385,7 +387,7 @@ function report(req, res, next) {
    });
    return totals;
  }
-
+  // eslint-disable-next-line no-shadow


Same remark as for aggregateTotalByTextKeys, try to reuse it by removing this definition of the function.

kwilu · 2019-07-15T09:32:31Z

Hello @jeremielodi, it seems like you have referenced #3792 in your pull request description, but you have not referenced them in your commit message description(s). When you reference an issue in a commit message, it automatically closes the corresponding issue when the commit is merged.

Please run git commit --amend in your command line client to amend your commit message description with Fixes #3792..

An example of a correctly-formatted commit:

commit fabd5e450374c8dde65ec35f02140383940fe146
Author: kwilu
Date:   Sat Mar 18 13:42:40 2017 -0700

    pull requests: Check PR commits reference when issue is referenced.

    Fixes #51.

Thank you for your contributions to BHIMA!

kwilu · 2019-07-23T08:17:06Z

Hello @jeremielodi, it seems like you have referenced #3792 in your pull request description, but you have not referenced them in your commit message description(s). When you reference an issue in a commit message, it automatically closes the corresponding issue when the commit is merged.

Please run git commit --amend in your command line client to amend your commit message description with Fixes #3792..

An example of a correctly-formatted commit:

commit fabd5e450374c8dde65ec35f02140383940fe146
Author: kwilu
Date:   Sat Mar 18 13:42:40 2017 -0700

    pull requests: Check PR commits reference when issue is referenced.

    Fixes #51.

Thank you for your contributions to BHIMA!

kwilu · 2019-07-31T17:39:37Z

Heads up @jeremielodi, we just merged some commits that conflict with the changes your made in this pull request! You can review this repository's recent commits to see where the conflicts occur. Please rebase your feature branch against the upstream/master branch and resolve your pull request's merge conflicts accordingly.

jeremielodi · 2019-07-31T17:43:28Z

Okay Le mer. 31 juil. 2019 à 7:39 PM, IMA World Health Bot < notifications@github.com> a écrit :

…

Heads up @jeremielodi <https://github.com/jeremielodi>, we just merged some commits that conflict with the changes your made in this pull request! You can review this repository's recent commits <https://github.com/IMA-WorldHealth/bhima/commits/master> to see where the conflicts occur. Please rebase your feature branch against the upstream/master branch and resolve <https://zulip.readthedocs.io/en/latest/git/troubleshooting.html#recover-from-a-git-rebase-failure> your pull request's merge conflicts accordingly. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#3794>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AGFEEKLS2APRQ27S3AOZORTQCHE5XANCNFSM4H7OFWQQ> .

mbayopanda · 2019-07-31T17:45:40Z

@jeremielodi could you fix the conflict so that i will merge you work.

kwilu · 2019-08-01T10:49:25Z

Hello @jeremielodi, it seems like you have referenced #3792 in your pull request description, but you have not referenced them in your commit message description(s). When you reference an issue in a commit message, it automatically closes the corresponding issue when the commit is merged.

Please run git commit --amend in your command line client to amend your commit message description with Fixes #3792..

An example of a correctly-formatted commit:

commit fabd5e450374c8dde65ec35f02140383940fe146
Author: kwilu
Date:   Sat Mar 18 13:42:40 2017 -0700

    pull requests: Check PR commits reference when issue is referenced.

    Fixes #51.

Thank you for your contributions to BHIMA!

mbayopanda · 2019-08-02T11:08:01Z

bors r+

3794: (cron job) add cron email component to main reports r=mbayopanda a=jeremielodi closes #3792 Co-authored-by: jeremielodi <jeremielodi@gmail.com>

bors · 2019-08-02T11:31:31Z

Build succeeded

continuous-integration/travis-ci/push

3853: Release v1.2.0 r=jniles a=jniles 🚀 Let's release bhima (currently at 1.1.1) Changelog: * chore: use release-it for releases (f4efd33) * chore: rename migration path (37fe3b4) * chore: dump dependencies before release (492ac19) * Merge #3846 (c2f27c8) * Merge #3849 (7a41977) * bug(Cash box translation) - Fix untranslation key for user deactivated (b0f4fbe) * Merge #3836 (f20d459) * refactor(Make Exchange Rates human readable) - Addition of the minimum value of the exchange rate to prevent the exchange rate equal to zero - Show exchange rates less than 0.1 as a fraction for example 1/1630 instead of 0.0006134 (c21e24a) * Merge #3829 (28fdd28) * test: run client unit tests on AppVeyor (a1c8968) * chore: refactor testing code (64b3c96) * test: remove server-unit from TravisCI (0357ec2) * test: add appveyor to bors (b790a45) * ci: add initial appveyor support (c235a97) * Merge #3840 (8d3010a) * fix: bump unit ids in the migration file (9bf73ee) * chore(package): update eslint-config-airbnb-base to version 14.0.0 (6fbde6a) * Merge #3834 (8774b09) * handle negative values in stock report (57380f1) * Merge #3833 (217d0d1) * add translation in employee report (aee91f6) * Merge #3832 (3578b7f) * fix(Calcul Sum Distributed) - Around the sum distributed for escape error when percent as decimal (30dbc83) * Merge #3799 (852b220) * clean code (95f1e93) * improvement(Employee Standing) - clean the representation of tabSQL - Capitalize creditoropeningbalance (01893e9) * Sanitaze code (7268cad) * improvement(Employee Standing) - Fix and Upgrate the translation key - Adding opening balance until a date from - Adding new function openingBlanceCreditor with parameters like creditorUuid and datefrom (3588ff8) * Sanitaze code (b914bca) * refactor(Employee Standing) - Refactor and Sanitaze code (e115407) * improvement(Improve Employees Standings report) - Add the possibility to visualize the employees standings by range of date, by the adding of component date by bh-date-interval - Add filter by range of date (f4c4774) * Merge #3827 (f1a7e6f) * Merge #3828 (19f0753) * fix(tests): no async forEach in merge patients (c4b257a) * feat(report) debtor summary report (a835fb3) * chore: update depends (b78ab2a) * Merge #3825 (1326302) * Merge #3794 (7ae875f) * (cron job) add cron email componet to main reports (438b1ac) * improvement(Invoicing Bug) - Restoring the old debtor balance request and modifying the hasCreditorBalance calculation by analyzing whether the balance is greater than 0.01 (b289a4e) * Merge #3815 (d115442) * improve(Monthly Balance) - Rename Monthly Balance instead Monthly Balance Analysis - Sanitaze code and refactor Report Design (0ae1f6a) * Merge #3820 (64497cc) * improvement(MonthlyBalance) - Sanitaze code and improve report and translate key (58cb1d0) * Sanitaze code (1167990) * Sanitaze code (9455a3d) * feature(Monthly Balance Analysis) - Add new report for Analysis Monthly Balance of accounts (06d9f60) * Merge #3801 (87edd98) * remove toggle required (7c0f583) * Improve and sanitaze code (b613b29) * fix (Invoicing Bug) - resolution of the problem when calling the Debtors.balance function with rounding to two ranks after the decimal point of the total credit and debit values (1edfd7b) * rename cashboxId to cashboxAccountId (f895692) * fix component require condition for validation (00869ad) * Enhance caution filter and fix cashflow by service report (a6bfc8b) * Merge #3821 (2973736) * fix stock adjustment deletion (ab9db1d) * Sanitaze html form (3494521) * improvement(Cash Flow Reports) - Adding Possibilty to view the detailed cashflow report (946e278) * Merge #3813 (21d19d3) * chore(package): update cz-conventional-changelog to version 3.0.0 (6c941a5) * Merge #3808 (34fe9fc) * Merge #3809 (f5d7fb2) * chore(package): update commitizen to version 4.0.0 (2dfc6cb) * chore(package): update gulp-if to version 3.0.0 (6af28e8) * Merge #3797 (cda7c86) * chore(package): update karma-chrome-launcher to version 3.0.0 (d3be817) * Merge #3795 (0d5adeb) * fix cron table on migration (8ad64ba) * Merge #3767 (84b5af0) * Merge remote-tracking branch 'upstream/master' into auto-email-reporting (ada6cd6) * Merge #3775 (ce8af95) * Merge #3785 (f50b9c6) * fix e2e tests for cron emailing (e39aa2a) * Merge #3777 (e30235b) * fix(Payslip) - Restaure the management of off days in payslip - fix the displaying of daily rate for Holidays periods and offdays - Exted the periode of definition of offdays (713c4bf) * Merge #3782 (14ae5ba) * fix: .snyk & package.json to reduce vulnerabilities (b3c8d1a) * Merge #3779 (47ba601) * Merge #3780 (ad5115c) * fix integration test (cd531cb) * chore(package): update lockfile yarn.lock (3ef4a2d) * chore(package): update del to version 5.0.0 (72c68d7) * fix label index length (45e6dc3) * improve(Employee Standing) - Adding option to include medical care provided to the employee - Update Report, display Employee Standing Status in Report closes #3778 (331d9c1) * fix column length (bf3259c) * fix: restaure old file (e2e1e4a) * feature(Bhima User) - Complete Bhima User Manual (18a0514) * fix entity parent (852144d) * update report id length (842b864) * fix: migration script typo (bf1157a) * fix translations and unit test for bhMoment (8109ab7) * fix migration file (e1edfba) * dev environment (bb2b5ba) * fix ui and integration tests for cron email report (d68d383) * instant email send for reports (2bbd820) * ohada_balance_sheet, ohada_income_expense, exploitation, balance emailing (ea4fac0) * Form reset after submission and cron job fixing (7ab8b44) * handle deletion and job stop (2101165) * balance report by email and use of async await (b9cec59) * sending email (af4b449) * cron job for email report (54fc906) * load report details (c8c9115) * simple crud for cron email report (46d7a34) * contact group management (f3c040f) * feature(Bhima User Manual) - References accounts User Manual - Fee Center User Manual - Payroll User Manual (0aacc6a) * Merge #3772 (78a657a) * fix: rubrics config tests (c31beee) * fix: flaky role management test (90a6fcb) * Merge #3768 (a18c9f5) * Merge #3770 (c65a8d5) * chore: bump dependencies (96207a2) * Merge #3724 (b244207) * fix purchase reference (5f0dc18) * Merge branch 'master' of https://github.com/IMA-WorldHealth/bhima into report-stock-entry (efc5e43) * chore(package): update lockfile yarn.lock (c0f80d7) * chore(package): update eslint to version 6.0.0 (e90a2e7) * fix stock sheet report (ef42f3b) * Capitalize report description and use of reportDetails correctly (0af0ec8) * stock entry report (9b7f65c) * Merge #3762 (d2bc25a) * Merge branch 'master' into fix-depot-path (75ca9e2) * Merge #3760 (c13c5a4) * fix depot path (18d2eee) * feat(component) bhperiod, use period translate_key as label (d061ecc) * Merge #3759 (b7cc0d3) * Merge #3736 (f95255b) * Merge #3751 (30ea36d) * add warning message for employees patients merge (3236947) * Merge branch 'master' of https://github.com/IMA-WorldHealth/bhima into merge-patient-records (ff4f7da) * chore(package): update lockfile yarn.lock (aef66b2) * chore(package): update mochawesome to version 4.0.0 (21fe8dd) * Merge #3752 (9880ae8) * Merge #3757 (fc69b92) * update action link column (200d0a7) * updates integration and e2e tests (ce256bc) * Split hospitalization indicators by projects (18d659b) * count services by project (995a746) * add project in service (8a9b6bd) * Merge #3755 (752723a) * Merge #3756 (480f324) * fix: typos in migration script setup (3c9ed3e) * Reset Numbers of vouchers in E2E test (f3345be) * Restore number of vouchers in Ui grid (d9319af) * Reset defaut number of vouchers (dde4bb0) * test(Voucher Registry) - Update number of vouchers (6b7683a) * improvement(Payroll Configuration) - Update the max length of abbreviation of rubrics - remove unused require - Before we had to prevent the edition of all the headings which were taxes, but it can be made that there are taxes which is not calculated expressed as a percentage, to allow the edition of this kind of tax, it would be enough to exclude the only tax which is expressed as a percentage neither and which is not nor éditable reason why we had excluded the IPR - closes #3754 (b70ef8d) * improvement(Payroll) - Sanitaze code remove unused require employees - Use the date to instead the current days for commitment of paiement in accounting (c62c98f) * Merge #3753 (80e2607) * fix(invoice): primary key collision invoicing_fees (df82dad) * fix selection list (b6681a6) * Merge #3743 (1a3d919) * reload page before each tests (a939788) * fix price list report (b4471b5) * integration tests and e2e tests of patients merge fetaure (93bd991) * merge patients tool (a6ca2de) * merge patients (5dc2a0b) * chore(package): update merge-stream to version 2.0.0 (e8005ec) * Merge #3732 (54212b3) * Merge #3733 #3734 (b2eec0b) * chore: combine date/username lines on receipt head (52fdbdb) * Merge #3735 (b68bd3f) * Merge #3737 (4886914) * Merge #3739 (f2b3983) * feat(unpaid invoice) add filter by service (e14ed21) * fix indicator report missing value (4bfac9a) * fix: parse <head> contents from XLS renderer (f15481a) * fix: dismiss fiscal loading indicator once loaded (6b5bd8f) * fix: account reference dropdown header links (f40a358) * fix: display correct currency in account footer (9642e6f) * Merge #3730 (c33886f) Co-authored-by: Jonathan Niles <jonathanwniles@gmail.com>

hound bot reviewed Jul 10, 2019

View reviewed changes

kwilu added the size: XL label Jul 10, 2019

jeremielodi force-pushed the cron_emails branch from 3b21bfb to 420ca32 Compare July 10, 2019 11:35

mbayopanda reviewed Jul 10, 2019

View reviewed changes

jeremielodi force-pushed the cron_emails branch from 420ca32 to 406b33a Compare July 11, 2019 06:37

mbayopanda reviewed Jul 12, 2019

View reviewed changes

jeremielodi force-pushed the cron_emails branch from 406b33a to bb33f0a Compare July 15, 2019 09:32

jeremielodi force-pushed the cron_emails branch from bb33f0a to 97be9e6 Compare July 23, 2019 08:17

kwilu added the has conflicts label Jul 31, 2019

(cron job) add cron email componet to main reports

438b1ac

jeremielodi force-pushed the cron_emails branch from 97be9e6 to 438b1ac Compare August 1, 2019 10:49

bors bot added a commit that referenced this pull request Aug 2, 2019

Merge #3794

7ae875f

3794: (cron job) add cron email component to main reports r=mbayopanda a=jeremielodi closes #3792 Co-authored-by: jeremielodi <jeremielodi@gmail.com>

bors bot merged commit 438b1ac into Third-Culture-Software:master Aug 2, 2019

jniles mentioned this pull request Aug 20, 2019

Release v1.2.0 #3853

Merged

jeremielodi deleted the cron_emails branch October 1, 2021 09:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(cron job) add cron email component to main reports #3794

(cron job) add cron email component to main reports #3794

jeremielodi commented Jul 10, 2019

hound bot Jul 10, 2019

kwilu commented Jul 10, 2019

kwilu commented Jul 10, 2019

mbayopanda Jul 10, 2019

kwilu commented Jul 11, 2019

mbayopanda left a comment

mbayopanda Jul 12, 2019

mbayopanda Jul 12, 2019

mbayopanda Jul 12, 2019

kwilu commented Jul 15, 2019

kwilu commented Jul 23, 2019

kwilu commented Jul 31, 2019

jeremielodi commented Jul 31, 2019 via email

mbayopanda commented Jul 31, 2019

kwilu commented Aug 1, 2019

mbayopanda commented Aug 2, 2019

bors bot commented Aug 2, 2019

(cron job) add cron email component to main reports #3794

(cron job) add cron email component to main reports #3794

Conversation

jeremielodi commented Jul 10, 2019

hound bot Jul 10, 2019

Choose a reason for hiding this comment

kwilu commented Jul 10, 2019

kwilu commented Jul 10, 2019

mbayopanda Jul 10, 2019

Choose a reason for hiding this comment

kwilu commented Jul 11, 2019

mbayopanda left a comment

Choose a reason for hiding this comment

mbayopanda Jul 12, 2019

Choose a reason for hiding this comment

mbayopanda Jul 12, 2019

Choose a reason for hiding this comment

mbayopanda Jul 12, 2019

Choose a reason for hiding this comment

kwilu commented Jul 15, 2019

kwilu commented Jul 23, 2019

kwilu commented Jul 31, 2019

jeremielodi commented Jul 31, 2019 via email

mbayopanda commented Jul 31, 2019

kwilu commented Aug 1, 2019

mbayopanda commented Aug 2, 2019

bors bot commented Aug 2, 2019

Build succeeded