TASK-362 Use excel spreadsheet to import and export shifts #291

kaplonpaulina · 2021-03-20T04:34:05Z

Nie mam pomysłu na nazwę jako, że wszystkie dobre są już zajęte xd
PS, defaultowe wartości sprawdźcie.
Jeśli chodzi o testy, to powinnam czekać na refaktor, jak chyba wszystkie inne PR?

Jak mnie nie będzie na stand-upie, to mnie obudźcie. Idę spać.

cypress · 2021-03-20T04:39:21Z

Test summary

229 • 0 • 0 • 0 • 1

Run details


Project	NurseScheduling
Status	Passed
Commit	`1bd4923`
Started	Mar 22, 2021 7:17 PM
Ended	Mar 22, 2021 7:20 PM
Duration	03:50 💡
OS	Linux Ubuntu - 20.04
Browser	Custom chrome 88

View run in Cypress Dashboard ➡️

Flakiness

	cypress/integration/e2e/app-error-handling/schedule-errors.spec.ts		1
1	Schedule errors > Should throw error after adding error user

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

src/logic/schedule-parser/shifts-proper-info.parser.ts

src/logic/schedule-exporter/schedule-export.logic.ts

src/logic/schedule-parser/shifts-proper-info.parser.ts

pectom

Jakieś zmiany do wprowadzenia obgadane z @Qwebeck

pectom

Mam kilka uwag :)

src/components/schedule-page/import-buttons/hooks/use-schedule-converter.ts

src/logic/schedule-exporter/schedule-export.logic.ts

src/logic/schedule-parser/shifts-proper-info.parser.ts

pectom · 2021-03-20T16:04:48Z

src/logic/schedule-parser/shifts-proper-info.parser.ts

+  }
+
+  private parseShiftCode(shiftRow: string[], name: string): string {
+    if (shiftRow[1]) {


Te wszystkie indeksy do stałej.
#człowiekstała
Proponuję umieścić je w enumie, tak żeby nazwa kolumny odpowiadała jej indeksowi :)

wymyśliłam , że tabloica będzie bezpieczniejsza, niż enum
zweryfikujcie

Oki, może być, ale moim zdaniem enum lepszy :)

pectom · 2021-03-20T16:07:21Z

src/logic/schedule-parser/shifts-proper-info.parser.ts

+  }
+
+  private parseShiftTo(shiftRow: string[], name: string): number {
+    if (shiftRow[3]) {


To musimy obgadać

co konkretnie?

W złym miejscu dałem ten komentarz. Chodzi o to, że dzień zaczyna się od 7 i żadna zmiana nie może jej przecinać np. nie może być zmiany 5-12, ale to już nie w tym PR.

prenc

Zarequestuj jak poprawisz uwagi od chłopaków

pectom

Świetna robota zią :)

* TASK-321 Introduce workers' teams (#293) * TASK-362 Use excel spreadsheet to import and export shifts (#291) * TASK-408 Add information about worker team to management table (#298) * TASK-408 Adds information about worker group to managament table and allows to change worker group * Fixes z-index * Adds groups sotring * TASK-411 Export with worker groups (#299) * Change error folding section display (#308) * Fix corrupted schedule test case (#310) * TASK-330 Track app version and store it presistently (#273) * TASK-327 Use worker shifts from state (#264) * TASK-394 New free shifts (#304) * TASK-410 Not working switch between actual and base versions & TASK-420 always same default group in worker drawer (#312) * TASK-423 sticky month header (#314) * TASK-416 Sort workers in groups && TASK-406 Display worker markers on schedule (#309) * TASK-409 Show import bug messages for all import buttons (#307) * TASK-423 Remove background of schedule's header (#315) * First push <3 * Done?. * Ready for review. * Ready for review. * Unreal changes. * Removed comments, reverted to develop styling. * Epic changes. * HEIGHT FIXED. Co-authored-by: Tomasz Pęcak <[email protected]> * TASK-422 Fixes export of worker calendar (#313) * TASK-425 disables edit buttons (#318) * TASK-386 Enhance comprehensibility of error messages (#302) * Add mapping to uid for employee info contractType and workerGroup keys (#311) * Add bunch of prerelease fixes (#321) * TASK-419 Style non-working shifts consistently (#316) * TASK-412 Bug: drawer button does not stick bottom (#325) * TASK-386 Enhance comprehensibility of error messages (follow-up) (#326) * Fix shift types that was not defined (#327) * Fix cell input (#328) * Fix onBlur when no value provided (#329) * Fix logs from shifts (#331) * Fix work norm calculation for not working shifts (#332) Co-authored-by: Bohdan <[email protected]> Co-authored-by: Paulina <[email protected]> Co-authored-by: Tomasz Pęcak <[email protected]> Co-authored-by: Maciej Bielech <[email protected]> Co-authored-by: Jan Ślażyński <[email protected]> Co-authored-by: Ehevi <[email protected]> Co-authored-by: Szymon Fugas <[email protected]>

## [1.0.2](v1.0.1...v1.0.2) (2021-03-26) ### Performance Improvements * **App:** Release v2.0.0 ([#323](#323)) ([cdc701d](cdc701d)), closes [#293](#293) [#291](#291) [#298](#298) [#299](#299) [#308](#308) [#310](#310) [#273](#273) [#264](#264) [#304](#304) [#312](#312) [#314](#314) [#309](#309) [#307](#307) [#315](#315) [#313](#313) [#318](#318) [#302](#302) [#311](#311) [#321](#321) [#316](#316) [#325](#325) [#326](#326) [#327](#327) [#328](#328) [#329](#329) [#331](#331) [#332](#332)

* TASK-321 Introduce workers' teams (#293) * TASK-362 Use excel spreadsheet to import and export shifts (#291) * TASK-408 Add information about worker team to management table (#298) * TASK-408 Adds information about worker group to managament table and allows to change worker group * Fixes z-index * Adds groups sotring * TASK-411 Export with worker groups (#299) * Change error folding section display (#308) * Fix corrupted schedule test case (#310) * TASK-330 Track app version and store it presistently (#273) * TASK-327 Use worker shifts from state (#264) * TASK-394 New free shifts (#304) * TASK-410 Not working switch between actual and base versions & TASK-420 always same default group in worker drawer (#312) * TASK-423 sticky month header (#314) * TASK-416 Sort workers in groups && TASK-406 Display worker markers on schedule (#309) * TASK-409 Show import bug messages for all import buttons (#307) * TASK-423 Remove background of schedule's header (#315) * First push <3 * Done?. * Ready for review. * Ready for review. * Unreal changes. * Removed comments, reverted to develop styling. * Epic changes. * HEIGHT FIXED. Co-authored-by: Tomasz Pęcak <[email protected]> * TASK-422 Fixes export of worker calendar (#313) * TASK-425 disables edit buttons (#318) * TASK-386 Enhance comprehensibility of error messages (#302) * Add mapping to uid for employee info contractType and workerGroup keys (#311) * Add bunch of prerelease fixes (#321) * TASK-419 Style non-working shifts consistently (#316) * TASK-412 Bug: drawer button does not stick bottom (#325) * TASK-386 Enhance comprehensibility of error messages (follow-up) (#326) * Fix shift types that was not defined (#327) * Fix cell input (#328) * Fix onBlur when no value provided (#329) * Fix logs from shifts (#331) * Fix work norm calculation for not working shifts (#332) Co-authored-by: Bohdan <[email protected]> Co-authored-by: Paulina <[email protected]> Co-authored-by: Tomasz Pęcak <[email protected]> Co-authored-by: Maciej Bielech <[email protected]> Co-authored-by: Jan Ślażyński <[email protected]> Co-authored-by: Ehevi <[email protected]> Co-authored-by: Szymon Fugas <[email protected]>

## [1.0.2](v1.0.1...v1.0.2) (2021-03-26) ### Performance Improvements * **App:** Release v2.0.0 ([#323](#323)) ([cdc701d](cdc701d)), closes [#293](#293) [#291](#291) [#298](#298) [#299](#299) [#308](#308) [#310](#310) [#273](#273) [#264](#264) [#304](#304) [#312](#312) [#314](#314) [#309](#309) [#307](#307) [#315](#315) [#313](#313) [#318](#318) [#302](#302) [#311](#311) [#321](#321) [#316](#316) [#325](#325) [#326](#326) [#327](#327) [#328](#328) [#329](#329) [#331](#331) [#332](#332) * **App:** Release v2.0.0 ([#333](#333)) ([230ae80](230ae80)), closes [#293](#293) [#291](#291) [#298](#298) [#299](#299) [#308](#308) [#310](#310) [#273](#273) [#264](#264) [#304](#304) [#312](#312) [#314](#314) [#309](#309) [#307](#307) [#315](#315) [#313](#313) [#318](#318) [#302](#302) [#311](#311) [#321](#321) [#316](#316) [#325](#325) [#326](#326) [#327](#327) [#328](#328) [#329](#329) [#331](#331) [#332](#332)

kaplonpaulina force-pushed the task-362-parsing-shifts branch from 9194fa3 to d3d24fd Compare March 20, 2021 04:43

kaplonpaulina requested a review from prenc March 20, 2021 04:45

kaplonpaulina changed the title ~~in/export shifts~~ TASK-362 in/export shifts Mar 20, 2021

kaplonpaulina commented Mar 20, 2021

View reviewed changes

src/logic/schedule-parser/shifts-proper-info.parser.ts Outdated Show resolved Hide resolved

kaplonpaulina commented Mar 20, 2021

View reviewed changes

src/logic/schedule-parser/shifts-proper-info.parser.ts Outdated Show resolved Hide resolved

Qwebeck reviewed Mar 20, 2021

View reviewed changes

src/logic/schedule-exporter/schedule-export.logic.ts Outdated Show resolved Hide resolved

src/logic/schedule-parser/shifts-proper-info.parser.ts Outdated Show resolved Hide resolved

src/logic/schedule-parser/shifts-proper-info.parser.ts Outdated Show resolved Hide resolved

pectom requested changes Mar 20, 2021

View reviewed changes

prenc changed the title ~~TASK-362 in/export shifts~~ TASK-362 Use excel spreadsheet to import and export shifts Mar 21, 2021

prenc reviewed Mar 21, 2021

View reviewed changes

kaplonpaulina added 2 commits March 22, 2021 04:43

in/export shifts

6475e77

first iteration

1bd4923

kaplonpaulina force-pushed the task-362-parsing-shifts branch from d3d24fd to 1bd4923 Compare March 22, 2021 06:42

pectom approved these changes Mar 22, 2021

View reviewed changes

pectom merged commit 8fa31cc into develop Mar 22, 2021

pectom deleted the task-362-parsing-shifts branch March 22, 2021 19:22

prenc pushed a commit that referenced this pull request Mar 26, 2021

TASK-362 Use excel spreadsheet to import and export shifts (#291)

8cb0423

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

TASK-362 Use excel spreadsheet to import and export shifts #291

TASK-362 Use excel spreadsheet to import and export shifts #291

kaplonpaulina commented Mar 20, 2021 •

edited

Loading

cypress bot commented Mar 20, 2021 •

edited

Loading

pectom left a comment

pectom left a comment

pectom Mar 20, 2021

kaplonpaulina Mar 22, 2021

pectom Mar 22, 2021

pectom Mar 20, 2021

kaplonpaulina Mar 22, 2021

pectom Mar 22, 2021

prenc left a comment

pectom left a comment

TASK-362 Use excel spreadsheet to import and export shifts #291

TASK-362 Use excel spreadsheet to import and export shifts #291

Conversation

kaplonpaulina commented Mar 20, 2021 • edited Loading

cypress bot commented Mar 20, 2021 • edited Loading

Test summary

Run details

Flakiness

pectom left a comment

Choose a reason for hiding this comment

pectom left a comment

Choose a reason for hiding this comment

pectom Mar 20, 2021

Choose a reason for hiding this comment

kaplonpaulina Mar 22, 2021

Choose a reason for hiding this comment

pectom Mar 22, 2021

Choose a reason for hiding this comment

pectom Mar 20, 2021

Choose a reason for hiding this comment

kaplonpaulina Mar 22, 2021

Choose a reason for hiding this comment

pectom Mar 22, 2021

Choose a reason for hiding this comment

prenc left a comment

Choose a reason for hiding this comment

pectom left a comment

Choose a reason for hiding this comment

kaplonpaulina commented Mar 20, 2021 •

edited

Loading

cypress bot commented Mar 20, 2021 •

edited

Loading