Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature(Payroll for HGR) #7159

Merged
merged 6 commits into from
Aug 17, 2023

Conversation

lomamech
Copy link
Collaborator

  • Separation between Job title and function
  • Updated employee management by adding support for job title management
  • Improved Payroll index module to support general reference hospitals model

closes #7158

@lomamech lomamech requested review from jmcameron and mbayopanda July 23, 2023 12:26
@lomamech lomamech force-pushed the featurePayrollHgrModel branch from 08ee1d4 to ac953e8 Compare July 23, 2023 12:42
@@ -524,6 +524,7 @@ CREATE TABLE `employee` (
`patient_uuid` BINARY(16) DEFAULT NULL,
`is_medical` TINYINT(1) DEFAULT 0,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we move the is_medical to the title_employee table? It seems like is_medical has to do with the employee's job title, not the employee themselves, right?

From this implementation, I assume all employees have titles? Can multiple employees have the same title?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a really good idea that would make things a lot easier. I can do it in another PR

@lomamech
Copy link
Collaborator Author

lomamech commented Jul 25, 2023

PAYROLL FOR HGR.pdf
PAYROLL POUR LE HGR AVEC INDICE.pdf

Here are sample SQL data files (source these after loading bhima_test by doing build:db):

@lomamech
Copy link
Collaborator Author

MODELE PAYROLL HGR.xlsx

Copy link
Collaborator

@jmcameron jmcameron left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did a brief look through the code and it seems okay.
I've tested this PR (with training and assistance from Chris) and it seems to work fine.

I suggest we go ahead and merge it. I have some improvements to do (eg, for some of the English translations) but I plan to do those later.

@jmcameron
Copy link
Collaborator

bors r+

@bors
Copy link
Contributor

bors bot commented Aug 17, 2023

Build succeeded!

The publicly hosted instance of bors-ng is deprecated and will go away soon.

If you want to self-host your own instance, instructions are here.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

@bors bors bot merged commit 667412d into Third-Culture-Software:master Aug 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Implementation of Payroll for General Hospitals of Reference
3 participants