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

feat: Performance Module (backport #43) #424

Merged
merged 71 commits into from
Mar 31, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 30, 2023

This is an automatic backport of pull request #43 done by Mergify.
Cherry-pick of 90d90b7 has failed:

On branch mergify/bp/version-14-hotfix/pr-43
Your branch is ahead of 'origin/version-14-hotfix' by 5 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 90d90b7c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/hr/workspace/performance/performance.json

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 468453b has failed:

On branch mergify/bp/version-14-hotfix/pr-43
Your branch is ahead of 'origin/version-14-hotfix' by 32 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 468453b5.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   hrms/hr/doctype/appraisal_template/appraisal_template.json
	new file:   hrms/patches/v14_0/update_performance_module_changes.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/patches.txt

Cherry-pick of 404ee15 has failed:

On branch mergify/bp/version-14-hotfix/pr-43
Your branch is ahead of 'origin/version-14-hotfix' by 42 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 404ee15d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/hr/workspace/performance/performance.json

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of ea188af has failed:

On branch mergify/bp/version-14-hotfix/pr-43
Your branch is ahead of 'origin/version-14-hotfix' by 64 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit ea188afa.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hrms/hr/workspace/performance/performance.json

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit e36a50e)
(cherry picked from commit 38c1d90)
- Details tab: basic details about appraisal cycle and employee

- KRAs: table for KRA, weightage, goal completion status against the KRA and score

- Feedbacks tab: add edit delete feedbacks (360 degree)

(cherry picked from commit 291afb5)
- set goals, priority, update progress

- link goals to appraisal cycles

- goal tree: hierarchy of goals with status

- update progress for goals from the tree itself

(cherry picked from commit 495d086)
(cherry picked from commit 90d90b7)

# Conflicts:
#	hrms/hr/workspace/performance/performance.json
(cherry picked from commit 1b3840c)
(cherry picked from commit 5e4b70b)
(cherry picked from commit 3b39914)
(cherry picked from commit b55d6e2)
- add details about the reviewer in performance

- fix duplicate check query in appraisal

(cherry picked from commit af8f577)
- rename `kra_template` to `appraisal_template` in Appraisal for consistency

- whitelisted method for setting KRAs in appraisal

- fix duplicate validation in appraisal

- map default appraisal template while pulling employees in appraisal cycle

- custom button to create or enqueue appraisal creation from Appraisal Cycle

(cherry picked from commit 9eb56b3)
- set KRAs from template on server side

- change naming from hash to naming series

- validate duplicate appraisals before insert

- remove redundant field for feedback count

(cherry picked from commit fb05d3e)
(cherry picked from commit 5eb1a39)
- cleanup goal form

- get kras for employee

- improve treeview UX by setting more default values

(cherry picked from commit 92cab7c)
- added Employee Feedback Criteria master and Employee Feedback Rating child table

- allow setting rating criteria in appraisal template with weights

- fetch rating criteria in self appraisal and performance feedback

(cherry picked from commit e2c2ee8)
- retain start and end date fields for backward compatibility, make them read-only

- make appraisal cycle mandatory

- simplify creating cycle by keeping appraisee list non-mandatory and checking it only if create appraisal is clicked

(cherry picked from commit de4b7cc)
… on evaluation criteria

- validate cycle's evaluation method change

(cherry picked from commit 83dbe15)
- old appraisal doc has score out of 5 so conversion is required for backward compatibility

(cherry picked from commit 987a0c1)
(cherry picked from commit 2febad3)
- updating avg score in the correct appraisal becomes easier and predictable

- change feedback history view to only visit feedback, remove add and edit perms

(cherry picked from commit 0b373ac)
- hide field if Appraisal Cycle is not linked since this field is irrelevant to old appraisals

(cherry picked from commit 581d1b2)
(cherry picked from commit 2aba91a)
- add tree node function for goal tree

- rate goals manually not getting set on client side

- only calculate avg score for goals belonging to the cycle

- avg feedback score not refreshed in perf view

- ignore user perms for reviewer field

(cherry picked from commit 9e3b135)
- validate transactions against an active cycle

- validate unsubmitted appraisals

(cherry picked from commit 7efbb91)
(cherry picked from commit 3ad9aa3)
[skip ci]

(cherry picked from commit ea188af)

# Conflicts:
#	hrms/hr/workspace/performance/performance.json
@codecov-commenter
Copy link

Codecov Report

Merging #424 (c74fe40) into version-14-hotfix (aee5db5) will increase coverage by 0.90%.
The diff coverage is 80.36%.

Additional details and impacted files
@@                  Coverage Diff                  @@
##           version-14-hotfix     #424      +/-   ##
=====================================================
+ Coverage              71.81%   72.72%   +0.90%     
=====================================================
  Files                    181      189       +8     
  Lines                   9357     9745     +388     
=====================================================
+ Hits                    6720     7087     +367     
- Misses                  2637     2658      +21     
Impacted Files Coverage Δ
hrms/setup.py 21.00% <ø> (ø)
hrms/hr/doctype/goal/goal.py 68.29% <68.29%> (ø)
hrms/hr/doctype/appraisal/appraisal.py 81.14% <80.18%> (+81.14%) ⬆️
hrms/hr/doctype/appraisal_cycle/appraisal_cycle.py 84.29% <84.29%> (ø)
...r/doctype/appraisal_template/appraisal_template.py 93.33% <90.00%> (+93.33%) ⬆️
...formance_feedback/employee_performance_feedback.py 92.15% <92.15%> (ø)
hrms/hooks.py 100.00% <100.00%> (ø)
hrms/hr/doctype/appraisal_kra/appraisal_kra.py 100.00% <100.00%> (ø)
hrms/hr/doctype/appraisee/appraisee.py 100.00% <100.00%> (ø)
...ee_feedback_criteria/employee_feedback_criteria.py 100.00% <100.00%> (ø)
... and 2 more

... and 3 files with indirect coverage changes

@ruchamahabal ruchamahabal merged commit e9fa0ea into version-14-hotfix Mar 31, 2023
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-43 branch March 31, 2023 05:01
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.

2 participants