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

TASK-410 Not working switch between actual and base versions & TASK-420 always same default group in worker drawer #312

Merged
merged 3 commits into from
Mar 24, 2021

Conversation

Qwebeck
Copy link
Member

@Qwebeck Qwebeck commented Mar 23, 2021

Jak odtworzyć błąd z selection matrix
Na developie:

  1. Wczytać grafik https://drive.google.com/file/d/1Hw6_8m_p-EGSyea8JrDUitxk9hBrda0f/view?usp=sharing
  2. Zmienić zespół dowolnego pracownika

@Qwebeck Qwebeck changed the title TASK-410 Not working switch between actual and base versions TASK-420 Not working switch between actual and base versions & TASK-420 always same default group in worker drawer Mar 23, 2021
@Qwebeck Qwebeck requested a review from pectom March 23, 2021 23:30
@cypress
Copy link

cypress bot commented Mar 23, 2021



Test summary

228 0 0 0Flakiness 0


Run details

Project NurseScheduling
Status Passed
Commit 2d099af
Started Mar 24, 2021 9:01 AM
Ended Mar 24, 2021 9:06 AM
Duration 04:41 💡
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

@Qwebeck Qwebeck requested a review from prenc March 23, 2021 23:45
@pectom
Copy link
Contributor

pectom commented Mar 24, 2021

Jak odtworzyć błąd z selection matrix
Na developie:

  1. Wczytać grafik https://drive.google.com/file/d/1Hw6_8m_p-EGSyea8JrDUitxk9hBrda0f/view?usp=sharing
  2. Zmienić zespół dowolnego pracownika

Zrobiłem tak, ale błąd się nie pojawił


export type SelectionMatrix = boolean[][];

export function areDimesionsEqual(matrix1: unknown[][], matrix2: unknown[][]): boolean {
Copy link
Contributor

Choose a reason for hiding this comment

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

@Qwebeck Mógłbyś opisać jaki był problem?

Copy link
Member Author

Choose a reason for hiding this comment

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

Tak, sorki, że nie opisałem wcześniej.

Problem był taki, że w momencie kiedy zmienialiśmy stan grafiku z aktualnego na bazowy, to nie komponent się renderował od nowa, ale macierz się nie odświeżała, i miała mniejszy rozmiar.
Komponent sekcji jest renderowany w taki sposób

 <RowComponent
            selection={[...selectionMatrix[rowInd]]}

I pojawiała się sytuacja w której próbowaliśmy zrobić spread na undeinfed i mieliśmy bug.

Ale nie jestem pewny czy to jest na rozwiązuje problem, czy to rozwiązanie które wprowadziłem sedno problemu, czy tylko eliminuje jeden z jego przejawów.

Copy link
Contributor

Choose a reason for hiding this comment

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

Oki, to zobaczymy czy będzie to nawracać. Na razie działa lepiej, więc mergujemy.

@Qwebeck
Copy link
Member Author

Qwebeck commented Mar 24, 2021

Jak odtworzyć błąd z selection matrix
Na developie:

  1. Wczytać grafik https://drive.google.com/file/d/1Hw6_8m_p-EGSyea8JrDUitxk9hBrda0f/view?usp=sharing
  2. Zmienić zespół dowolnego pracownika

Zrobiłem tak, ale błąd się nie pojawił

Umknął mi jeden punkt:
3. Przełączyć na wersję bazową

@Qwebeck Qwebeck changed the title TASK-420 Not working switch between actual and base versions & TASK-420 always same default group in worker drawer TASK-410 Not working switch between actual and base versions & TASK-420 always same default group in worker drawer Mar 24, 2021
Copy link
Contributor

@pectom pectom left a comment

Choose a reason for hiding this comment

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

Powtórzyłem przypadek testowy i wywala na developie, a tu jest w porządku.
Super robota :D

@pectom pectom merged commit 9c08749 into develop Mar 24, 2021
@pectom pectom deleted the TASK-410-not-working-base-version branch March 24, 2021 10:06
prenc pushed a commit that referenced this pull request Mar 26, 2021
…20 always same default group in worker drawer (#312)
prenc added a commit that referenced this pull request Mar 26, 2021
* 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]>
github-actions bot pushed a commit that referenced this pull request Mar 26, 2021
## [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)
github-actions bot pushed a commit that referenced this pull request Mar 26, 2021
## [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)
prenc added a commit that referenced this pull request Mar 26, 2021
* 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]>
github-actions bot pushed a commit that referenced this pull request Mar 26, 2021
## [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)
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