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

refactor: shift management #22262

Merged
merged 20 commits into from
Aug 18, 2020
Merged

Conversation

Anurag810
Copy link
Contributor

@Anurag810 Anurag810 commented Jun 16, 2020

Shift Assignment:
Previously user needs to assign shift daily.
There should be an active shift for a period if there is an end date else it is an ongoing shift.

image

Shift Request:

New approval system and approver for Shift Request. on approval shift assignment is created automatically.

image

Employee:

New section Approvers With New Field Shift request Approver. Set Employee Wise Shift request Approver.

image

Department:

New child Table Shift request Approver to set Department wise shift Approver.

image

Docs
frappe/erpnext_documentation#123

Copy link
Contributor

@karthikeyan5 karthikeyan5 left a comment

Choose a reason for hiding this comment

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

Need to change this line to reflect the changes in Shift Assignment:

filters = {'date':('>=', from_date), 'shift_type': self.name, 'docstatus': '1'}

@Anurag810 Anurag810 force-pushed the shift_management branch 2 times, most recently from af53eeb to 5e4243c Compare July 28, 2020 08:08
@marination
Copy link
Collaborator

marination commented Aug 10, 2020

  1. Add a title like Ongoing Shift, make employee bold and also shift type and name bold too
    Screenshot 2020-08-10 at 5 15 46 PM

  2. Add popup feedback (assignment created) on submitting approved shift request

karthikeyan5
karthikeyan5 previously approved these changes Aug 11, 2020
Copy link
Contributor

@karthikeyan5 karthikeyan5 left a comment

Choose a reason for hiding this comment

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

Auto Attendance related changes LGTM.

@Anurag810
Copy link
Contributor Author

Auto Attendance related changes LGTM.

yeah tested it with Marica

@Anurag810
Copy link
Contributor Author

@marination
Copy link
Collaborator

Patch for Shift Assignment

@Anurag810 Anurag810 force-pushed the shift_management branch 2 times, most recently from a6d7133 to b0c3f40 Compare August 13, 2020 08:46
@Anurag810
Copy link
Contributor Author

@marination please check.

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.

3 participants