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.

Sign up for GitHub

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

Jump to bottom

TASK-350 Save shifts from next month #283

Merged
merged 6 commits into from
Mar 18, 2021
Merged

TASK-350 Save shifts from next month #283

merged 6 commits into from
Mar 18, 2021

Conversation

pectom
Copy link
Contributor

@pectom pectom commented Mar 17, 2021

No description provided.

@cypress
Copy link

cypress bot commented Mar 17, 2021 •
edited
Loading


Test summary

232 • 0 • 0 • 0 • Flakiness 0

Run details
Project NurseScheduling
Status Passed
Commit 18cdbf3
Started Mar 18, 2021 5:16 PM
Ended Mar 18, 2021 5:19 PM
Duration 03:43 💡
OS Linux Ubuntu - 20.04
Browser Custom chrome 88

View run in Cypress Dashboard ➡️

This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Dashboard

@pectom pectom force-pushed the TASK-350-save-changes-on-next-month-days branch from bc79c01 to be11f72 Compare March 17, 2021 16:18
@pectom pectom force-pushed the TASK-350-save-changes-on-next-month-days branch from b34f619 to 4cfb7c2 Compare March 17, 2021 16:38
@pectom pectom requested a review from prenc March 17, 2021 17:09
@pectom
Copy link
Contributor Author

pectom commented Mar 17, 2021

@prenc oprócz zapisywania dni z następnego miesiąca, poprawiłem też kopiowanie pierwszego tygodnia. Teraz już powinno działać normalnie.

Okazało się, że moje zmiany nie zostały poprawnie domergowane. Przywróciłem to co zrobiłem ostatnio.
Bląd, nad którym pracował Mateusz by wtedy w ogóle nie wystąpił. Chyba miałem jakieś konflikty i je źle rozwiązałem. PR na 1300 linii to nie był dobry pomysł :)

Dalej może się pieprzyć jeśli będziemy manipulować pracownikami. ale tym się zajmę w innym tasku.

Pozdrawiam
TP

@pectom pectom changed the title Task 350 save changes on next month days TASK-350 Save shifts from next month Mar 17, 2021
prenc
prenc reviewed Mar 17, 2021
View reviewed changes
Copy link
Contributor

@prenc prenc left a comment

Choose a reason for hiding this comment

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

Wygląda git, ale nie działą mi w ogóle zaznaczanie i edytowanie wielu zmian, ocb?

prenc
prenc requested changes Mar 17, 2021
View reviewed changes
Copy link
Contributor

@prenc prenc left a comment

Choose a reason for hiding this comment

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

Kasują się zmiany niepracujące w dniach następnego miesiąca przy kopiowaniu.

@pectom
Copy link
Contributor Author

pectom commented Mar 17, 2021

Kasują się zmiany niepracujące w dniach następnego miesiąca przy kopiowaniu.
@prenc tak ma być przecież. Jak ktoś ma L4 to nie chcemy, żeby w następnym miesiącu też je miał

@pectom
Copy link
Contributor Author

pectom commented Mar 17, 2021

Wygląda git, ale nie działą mi w ogóle zaznaczanie i edytowanie wielu zmian, ocb?

Tutaj nic nie ruszałem z tym. Z tego co widzę, to na developie też się to psuje jakoś losowo.

@pectom pectom requested a review from prenc March 17, 2021 20:30
@prenc
Copy link
Contributor

prenc commented Mar 17, 2021

Kasują się zmiany niepracujące w dniach następnego miesiąca przy kopiowaniu.
@prenc tak ma być przecież. Jak ktoś ma L4 to nie chcemy, żeby w następnym miesiącu też je miał

Ale ważniejsze jest to, że ustawiam sobie marzec cały, wszystko hula, kopiujemy go na kwiecień i w widoku marca coś się usuwa, tak nie może być.

@pectom pectom force-pushed the TASK-350-save-changes-on-next-month-days branch from c34562e to 87c3f2f Compare March 18, 2021 15:32
prenc
prenc approved these changes Mar 18, 2021
View reviewed changes
Copy link
Contributor

@prenc prenc left a comment

Choose a reason for hiding this comment

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

Działa ode mnie ok, wystawie Janka na code review.

@prenc prenc requested a review from net-runner March 18, 2021 15:47
net-runner
net-runner approved these changes Mar 18, 2021
View reviewed changes
Copy link
Contributor

@net-runner net-runner left a comment

Choose a reason for hiding this comment

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

Dzięki, działa! :)

@pectom
Copy link
Contributor Author

pectom commented Mar 18, 2021

@prenc to można mergować

@prenc prenc merged commit e541824 into develop Mar 18, 2021
@prenc prenc deleted the TASK-350-save-changes-on-next-month-days branch March 18, 2021 17:50
Qwebeck pushed a commit that referenced this pull request Mar 20, 2021
@pectom @Qwebeck
TASK-350 Keep shifts scheduled in next month's days (#283)
c5e41e0 
* Add corrupted info to schedule state

* Stash branch changes

* Restore prev storage initialization

* Do not replace free shifts in first week
prenc pushed a commit that referenced this pull request Mar 22, 2021
@pectom @prenc
TASK-350 Keep shifts scheduled in next month's days (#283)
2684d66 
* Add corrupted info to schedule state

* Stash branch changes

* Restore prev storage initialization

* Do not replace free shifts in first week
prenc added a commit that referenced this pull request Mar 22, 2021
@prenc @pectom
@Ehevi @kaplonpaulina @Qwebeck @venglov @kopcion @net-runner @mbielech
fix(App): v1.0.1 (#300)
ec3976b 
* TASK-338 Enable database clear when error appears  (#249)

* Save file with proper name, save all db docs when error button clicked

* Modify database export and export all schedules in zip

* Set proper zip name

* Fix and extend filehelper test

* Move handle dummp to file helper, remove comments

* Fix file helper test

* Add custom types instead of inline dicts

* Save correct timestamp

* TASK-343 Handle rendering crushes at schedule level (#257)

* TASK-323 Add min char number indication in report issue modal (#262)

* Task 348 Enable undo on corrupted schedule page (#265)

* TASK-345 Improve descriptions of found schedule's issues (#263)

* TASK-371 Bug: wrong errors when 31-day month (#271)

* export workers (#267)

Co-authored-by: Tomasz Pęcak <[email protected]>
Co-authored-by: Paweł Renc <[email protected]>

* TASK-324 Reduce hour number based on previously scheduled shifts for L4 (#259)

* TASK-319 Export number of daytime employees information (#260)

* Task 291 Copy month to full schedule (including next month) (#272)

* Fixes bad key setting (#275)

* TASK-322 Bug: fix missing colors in Excel export for employees having no shifts (#258)

* TASK-333 && TASK-335 Asking about unsaved changes when exiting edit mode && disabling undo/redo/save buttons (#270)

* TASK-370 Fix restoring state on corrupted schedule page (#276)

* TASK-362 Parse workers info from excel (#269)

* TASK-375 Bug: app crashes when copying from month ending on sunday (#280)

* TASK-314 Another iteration over excel layout of exported schedule (#278)

* bugfixes

* implements function to decide font color

* added links

* small fixes

Co-authored-by: Tomasz Pęcak <[email protected]>

* TASK-389 Close issue drawer when exiting edit mode (#285)

* Bug fixed. Cypress passing.

* Added isEditMode watcher for auto drawer closing.

* TASK-376 Error modal doesn't appear on app error (#286)

* Handle error on higher tree level

* Add error message for testing purposes

* TASK-350 Keep shifts scheduled in next month's days  (#283)

* Add corrupted info to schedule state

* Stash branch changes

* Restore prev storage initialization

* Do not replace free shifts in first week

* TASK-387 Sort shifts in dropdown (#282)

* TASK-361 autocomplete component rendering fix (#284)

* TASK-304 Another iteration over drawer for managing workers (#279)

* TASK-388 Now edit state is properly false after leaving edit mode. BUGFIXED (#290)

* TASK-256 Add exporting employees' small calendar to pdf (#277)

* TASK-379 Add worker to single month (#289)

* TASK-339 & TASK-382 fix all console errors & increase folding performance (#288)

* TASK-391 fixed calculation of worker norm when added during the month with parttime contract. (#295)

* TASK-390 Stick footer to bottom of page, not viewport (#294)

* Change footer to be the end of the content, rather than sticked to the bottom of the screen. Remove electron block

* Footer always on the bottom of the page

* Repair jira like drawer after footer changes. Repair zarzadzanie tab

Co-authored-by: Tomasz Pęcak <[email protected]>
Co-authored-by: Ehevi <[email protected]>
Co-authored-by: Paulina <[email protected]>
Co-authored-by: Bohdan <[email protected]>
Co-authored-by: Vyacheslav Trushkov <[email protected]>
Co-authored-by: kopcion <[email protected]>
Co-authored-by: Jan Ślażyński <[email protected]>
Co-authored-by: Maciej Bielech <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@net-runner net-runner net-runner approved these changes

@prenc prenc prenc approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@pectom @prenc @net-runner