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

fix: handle null & empty shift ('') values in Monthly Attendance Sheet #1123

Merged
merged 2 commits into from
Nov 29, 2023

Conversation

ruchamahabal
Copy link
Member

Before:

null and empty shift ("") being treated as 2 different shifts in attendance sheet

shifts-null-empty

After:

image

@codecov-commenter
Copy link

Codecov Report

Merging #1123 (2c5337b) into develop (e802cf9) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Additional details and impacted files
@@           Coverage Diff            @@
##           develop    #1123   +/-   ##
========================================
  Coverage    73.06%   73.06%           
========================================
  Files          199      199           
  Lines        10714    10716    +2     
========================================
+ Hits          7828     7830    +2     
  Misses        2886     2886           
Files Coverage Δ
...nthly_attendance_sheet/monthly_attendance_sheet.py 95.91% <100.00%> (+0.03%) ⬆️

@ruchamahabal ruchamahabal merged commit 39eb9c4 into frappe:develop Nov 29, 2023
7 checks passed
mergify bot pushed a commit that referenced this pull request Nov 29, 2023
#1123)

* fix: handle null & empty shift ('') values in Monthly Attendance Sheet

* test: empty shift check

(cherry picked from commit 39eb9c4)
mergify bot pushed a commit that referenced this pull request Nov 29, 2023
#1123)

* fix: handle null & empty shift ('') values in Monthly Attendance Sheet

* test: empty shift check

(cherry picked from commit 39eb9c4)
ruchamahabal added a commit that referenced this pull request Nov 29, 2023
#1123) (#1125)

* fix: handle null & empty shift ('') values in Monthly Attendance Sheet

* test: empty shift check

(cherry picked from commit 39eb9c4)

Co-authored-by: Rucha Mahabal <[email protected]>
ruchamahabal added a commit that referenced this pull request Nov 29, 2023
#1123) (#1126)

* fix: handle null & empty shift ('') values in Monthly Attendance Sheet

* test: empty shift check

(cherry picked from commit 39eb9c4)

Co-authored-by: Rucha Mahabal <[email protected]>
frappe-pr-bot pushed a commit that referenced this pull request Nov 29, 2023
## [14.18.1](v14.18.0...v14.18.1) (2023-11-29)

### Bug Fixes

* Dashboard must accomodate Document Links ([#1103](#1103)) ([#1120](#1120)) ([72d316e](72d316e))
* Employee role perms for Employee Grievance and Grievance Type ([#1115](#1115)) ([#1118](#1118)) ([5857822](5857822))
* handle null & empty shift ('') values in Monthly Attendance Sheet ([#1123](#1123)) ([#1125](#1125)) ([2e5946a](2e5946a))
* move translations from erpnext ([#1114](#1114)) ([e3f6a25](e3f6a25))
* rendering of Leaves with Half Day in Calendar View ([#1116](#1116)) ([bf4e03c](bf4e03c))
frappe-pr-bot pushed a commit that referenced this pull request Nov 29, 2023
## [15.4.1](v15.4.0...v15.4.1) (2023-11-29)

### Bug Fixes

* Dashboard must accomodate Document Links ([#1103](#1103)) ([#1121](#1121)) ([42c9591](42c9591))
* Employee role perms for Employee Grievance and Grievance Type ([#1115](#1115)) ([#1119](#1119)) ([db7ce38](db7ce38))
* handle null & empty shift ('') values in Monthly Attendance Sheet ([#1123](#1123)) ([#1126](#1126)) ([69160de](69160de))
* rendering of Leaves with Half Day in Calendar View ([#1117](#1117)) ([da639b3](da639b3))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants