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 135 #106

Merged
merged 8 commits into from
Dec 12, 2020
Merged

Task 135 #106

merged 8 commits into from
Dec 12, 2020

Conversation

venglov
Copy link
Contributor

@venglov venglov commented Dec 8, 2020

image
image

Copy link
Collaborator

@Ehevi Ehevi left a comment

Choose a reason for hiding this comment

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

Jak dla mnie wygląda i działa dobrze 👍
Mam kilka uwag, ale opis tego zadania na tarze jest dość ogólny i nie wiem, czy to też wchodziło w jego zakres. Jeśli nie, to dalszą część tego, co napisałam można uznać za czepianie się.
figma
-> z Figmy chyba wynika, że przyciski 'Sprawdź plan' i 'Pokaż błędy' są połączone [ja rozumiem to tak, że naciśnięcie 'Sprawdź plan' go sprawdza i po sprawdzeniu otwiera okno z błędami, ale to może być zła interpretacja]
-> przycisk 'Pogląd' na Figmie ma etykietę 'Wyjdź'
-> w obecnej wersji jeżeli okno jest mniejsze, to przy scrollowaniu "tracimy" część zawartości, wyglądałoby lepiej gdyby tak nie było
scroll
-> dobrze byłoby sprawdzić zgodność względem ostatnich mergów do developa ;)

Copy link
Collaborator

@Ehevi Ehevi left a comment

Choose a reason for hiding this comment

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

scroll

@Qwebeck
Copy link
Member

Qwebeck commented Dec 9, 2020

scroll

Myślę, że lepiej tego nie robić: przyciski należą do elementów statycznych które zawsze są widoczne na stronie. Gdyby te przyciski zmieniały swoją pozycję to myślę, że to wyglądało by nieprzyjemnie.
Mi się wydaje, że jeździć mogą tylko elementy które nie są widoczne zawsze:
modale, drawery, snackbary, etc

@Qwebeck
Copy link
Member

Qwebeck commented Dec 9, 2020

-> z Figmy chyba wynika, że przyciski 'Sprawdź plan' i 'Pokaż błędy' są połączone [ja rozumiem to tak, że naciśnięcie 'Sprawdź plan' go sprawdza i po sprawdzeniu otwiera okno z błędami, ale to może być zła interpretacja]

Uważam że to ma dużo sensu. Klikając Sprawdź plan na pewno chcesz zobaczyć te błędy co się pojawią.
Więc mi się wydaje, że moglibyśmy to podpiąć.

Copy link
Member

@Qwebeck Qwebeck 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 super, ale mam kilka drobnych uwag które wypisałem

}))((props) => <Tab disableRipple {...props} />);

export default function RouteButtonsComponent({ tabs }: { tabs: Tabs[] }): JSX.Element {
export default function RouteButtonsComponent(props: TabsProps): JSX.Element {
Copy link
Member

Choose a reason for hiding this comment

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

Ja bym zmienił nazwę interfejsu na RouteButtonOptions/Props, ponieważ tak naprawdę ten argument jest przyjmowany przez ten komponent

Copy link
Member

Choose a reason for hiding this comment

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

Lepiej na Options, bo tak to jest zapisane w konwencji.
https://github.com/Project-Summer-AI-Lab-Glider/nurse-scheduling-problem-frontend/wiki/Struktura-projektu-i-konwencja-kodu#komponenty

Twoje podejście też nie jest źle, ale wolałbym nie używać różnych styli w aplikacji, ponieważ to wprowadza później zamieszanie + kod wygląda mniej czytelnie: w różnych miejscach różne nazwy dla tego samego.

BTW, to dodajemy przed Options nazwę komponentu żeby to potem można było rozszerzyć nowym interfejsem w wygodny sposób. Np.:

interface ShiftCellOptions extends BaseCellOptions {
...
}

<TabList classes={{ indicator: classes.indicatorStyle }} onChange={handleChange}>
<TabList
classes={{ indicator: classes.indicatorStyle }}
onChange={!props.editMode ? handleChange : void 0}
Copy link
Member

Choose a reason for hiding this comment

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

Moim zdaniem o wiele sensowniejszą nazwą byłoby disabled, a nie editMode, ponieważ:

  1. Nie konieczenie musimy mieć editMode, żeby chcieć zablokować tab
  2. Nie koniecznie mając editMode chcemy zablokować taby
  3. To pole nie odpowiada za rzeczy związane z edycją, a tylko za te, co są związane z wlączeniem/wylączeniem przycisków.

import ScheduleViewOnlyMode from "./schedule-page/schedule-view-only-mode.component";
import { ScheduleEditMode } from "./schedule-page/schedule-edit-mode.component";

interface PropsType {
Copy link
Member

Choose a reason for hiding this comment

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

Pisałem o tym wyżej

function ViewOnly(): JSX.Element {
return (
<>
<ScheduleViewOnlyMode editModeHandler={props.editModeHandler} />
Copy link
Member

Choose a reason for hiding this comment

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

Ja bym zrobił to tak:

<ScheduleViewOnlyMode openEdit={() => props.editModeHandler(true)} />

To moim zdaniem jest lepsze ponieważ komponent viewOnly nie potrzebuje mieć możliwości otwierać lub zamykać tryb edycji.
Ponadto, uważam, że ten komponent nie powinien wiedzieć o tym, że żeby przejść do trybu edycji, on musi przekazać true do funkcji ediModeHandler.

onClick={updateScheduleErrors}
>
Sprawdź Plan
</Button>

<div className={"filler"} />
Copy link
Member

Choose a reason for hiding this comment

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

Można też nie używać klamr jeżeli przekazujemy strign

Copy link
Collaborator

Choose a reason for hiding this comment

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

+1
trzymajmy się jednej konwencji, w tym pliku użyłeś jednocześnie className={""} i className=""

@Ehevi
Copy link
Collaborator

Ehevi commented Dec 10, 2020

Myślę, że lepiej tego nie robić: przyciski należą do elementów statycznych które zawsze są widoczne na stronie. Gdyby te przyciski zmieniały swoją pozycję to myślę, że to wyglądało by nieprzyjemnie.
Mi się wydaje, że jeździć mogą tylko elementy które nie są widoczne zawsze:
modale, drawery, snackbary, etc

Źle wyraziłam, o co mi chodzi. Chciałam zasugerować, żeby właśnie te elementy zawsze były widoczne na stronie bez względu na scrollowanie, np. position fixed albo sticky. Wtedy nie uciekałyby przy przewijaniu i użytkownik cały czas miałby do nich dostęp. Anyway, jestem świeżynką w temacie, więc statystycznie większość moich pomysłów nie będzie bardzo dobra XD
I warto mieć nadzieję, że użytkownik końcowy raczej nie będzie na siłę utrudniał sobie życia i będzie preferował pracę na pełnym oknie, bez konieczności scrollowania ;)

@Qwebeck
Copy link
Member

Qwebeck commented Dec 10, 2020

Źle wyraziłam, o co mi chodzi. Chciałam zasugerować, żeby właśnie te elementy zawsze były widoczne na stronie bez względu na scrollowanie, np. position fixed albo sticky. Wtedy nie uciekałyby przy przewijaniu i użytkownik cały czas miałby do nich dostęp.

Myślę, że to czy muszą być statyczne czy nie, do przegadania z Agą.

Anyway, jestem świeżynką w temacie, więc statystycznie większość moich pomysłów nie będzie bardzo dobra XD

Ten akurat nie jest zły, a tylko źle zrozumiany ;)

I warto mieć nadzieję, że użytkownik końcowy raczej nie będzie na siłę utrudniał sobie życia i będzie preferował pracę na pełnym oknie, bez konieczności scrollowania ;)

Niestety będzie musiał skrolować, bo harmonogram jest duży i nie mieści się na jednej stronie.
Chyba że zrobimy tak, że skrolowalny będzie tylko kontener, który zawiera sekcje zmian).
Myślę, że to jest sensowne:

  • zafiksowany nałówek u góry
  • zafiksowana liczba dzieci u dołu
  • skrolowalne zmiany.

Ale wtedy potrzeba będzie też zastanowić się nad tym, jak to współgra z tym, że chcieliśmy robić zwijalne sekcje ( mi się wydaje, że jeżeli będzie scroll, to w tym miejscu raczje się nie przydadzą )

@kaplonpaulina
Copy link
Collaborator

kaplonpaulina commented Dec 12, 2020

Ogólnie dobra robota, ale mam kilka uwag:

Suwak na dole strony powinien być niewidoczny kiedy jest nieaktywny:
image
image

Jak klikę Plik i wczytam plik i nie odkliknę to się robią śmieszne rzeczy jak scroluję góra-dół:
image

Suwak do tej pory działał tak:
Jak trzeba to się pojawiał jako element okna a nie strony, więc był zawsze widoczny kiedy mamy pomniejszone okno.
image

Teraz kiedy pomniejsze okno suwak jest na samym dole strony i żeby go użyć muszę zjechać na sam dół, uważam, że przedtem było lepiej i wygodniej:

image

Można zostawić wymuszony scroll po prawej bo jest zawsze tam gdzie być powinien(jest zawsze dostępny) i nie rzuca się w oczy tak jak ten zaraz pod harmonogramem.

Jeśli chodzi o problem pzresuwania i "kończenia się" toolbaru, zgadam się i według mnie trzeba zrobić fixed toolbar, znaczy, że nie ważne jak zesklorujemy toolbar nie będzie się zmieniał względem okna aplikacji.

Dodatkowo dodałabym też ograniczenia do samego elektrona odnośnie wielkościokana aplikacji -> w sesnie dodać minimalne wymiary okna, na które pozwalamy

@Qwebeck
Copy link
Member

Qwebeck commented Dec 12, 2020

Jak klikę Plik i wczytam plik i nie odkliknę to się robią śmieszne rzeczy jak scroluję góra-dół:

Super uwaga!
Zrobiłem na to zadanie na Tarze

Teraz kiedy pomniejsze okno suwak jest na samym dole strony i żeby go użyć muszę zjechać na sam dół, uważam, że przedtem było lepiej i wygodniej:

Dodałem suwak taki jak ty powiedziałaś. Teraz jest elementem strony

image

Dodatkowo dodałabym też ograniczenia do samego elektrona odnośnie wielkościokana aplikacji -> w sesnie dodać minimalne wymiary okna, na które pozwalamy

Ustawiłem 1500x500

image

Copy link
Member

@Qwebeck Qwebeck left a comment

Choose a reason for hiding this comment

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

Kończę te dyskusje :D

Super praca, super review: dużo cennych uwag który potrzeba będzie omówić

@Qwebeck Qwebeck merged commit 97aac84 into develop Dec 12, 2020
@Qwebeck Qwebeck deleted the TASK-135 branch December 12, 2020 14:14
prenc added a commit that referenced this pull request Mar 2, 2021
* NS-80 Replace fat arrow functions with class functions. Refactor some typos/code.

* Refactor safe stuff

* Replaced employee with worker in variable namings

* Add eslint, pre-commit hooks and refactor to stick to linter rules (#43)

* Configure eslint, husky and lint-stage and disable eslint errors

* Enable prefer-const, no-var rules and fix errors for them

* Enable fix no-unused-vars and no-fallthrough warnings

* Enable fix @typescript-eslint/class-name-casing, @typescript-eslint/no-empty-interface, @typescript-eslint

* Enable fix @typescript-eslint/camelcase

* Enable and fix errors from @typescript-eslint/no-inferrable-types eslint rule

* Enable global @typescript-eslint/no-explicit-any eslint rule and disable it locally

* Change usages of Object type to Record<string, any>

* Add missing return types to all project function

* Add missing return types to all project functions

* Enable react-hooks/exhaustive-deps lint rule and fix its warnings

* Refactor worker_info to employee_info to be consistent with server

* NS-93 Add .idea/ folder to gitignore (#44)

* Fixed bug where work time 1/N wasn't possible

* Fixed bug where work time 1/N wasn't possible

* Added no console rule

Co-authored-by: Bohdan Forostianyi <[email protected]>

* NS-86 Use exceljs instead of XLSX for loading the Excel file (#49)

* Add exceljs to dependencies and import it in useScheduleConverter hook

* Get data from sheet, exceljs style

* Removed rules for lint disable

Co-authored-by: Bohdan Forostianyi <[email protected]>

* Rename file and its content to stick to the convention (#50)

* Add props interface to files with components

* Refactor models structure

* Ns 79 helpers (#48)

* Applied conventions to helper files

* Moved hooks lower in hierarchy

* Moved verbose date to month-info.model

Co-authored-by: Bohdan Forostianyi <[email protected]>

* Remove @types/files-save dep and unnecessary comment

Co-authored-by: Bohdan <[email protected]>
Co-authored-by: Bohdan Forostianyi <[email protected]>

* Added missing schedule (#54)

authored-by: Bohdan Forostianyi <[email protected]>

* NS-92 (#45)

* NS-92 Setup Sentry

* Added missing dependecies

Co-authored-by: Bohdan Forostianyi <[email protected]>

* Remove xlsx from project dependencies (#55)

* Add cypress NS-48 (#46)

* NS-48 Add cypress. Add exemplar test.

* Remove cypress default examples

* NS-48 Fix port issue. Remove cypress examples

* Add .env to git

* Remove cypress.env.json file

* Add extend eslint to env. Fix cypress config. Rename tests folder and file

* move styles to designaed folder (#53)

* NS 49 Handle public holidays (#56)

* Add public holidays logic and store info about it in VerboseDates

* Refactor public holiday logic (use custom type for day and month)

* Add coloring for holidays

* NS-77 (#59)

Adds pipiline with test runner

* NS-85 frontend refactor (#57)

* Adds frontend refactor

* Removes README from docs

Co-authored-by: Bohdan Forostianyi <[email protected]>

* Test public holiday logic for holidays in 2020

* Expand on test cases, add cypress videos to gitignore

* Refactor tests

* TASK-6 Add test: load schedule from file (#61)

* TASK-3 add electron (#64)

* Task 5 - Undo/Redo functonality  (#63)

* Handle global state undo/redo with shortcuts

* TASK-4 optimizes schedule rendering

Co-authored-by: Bohdan <[email protected]>

* Update README.md

* Update README.md

* TASK-7 data row parser (#69)

* NS-98 (#68)

* Adds more typed zip function

Co-authored-by: Bohdan Forostianyi <[email protected]>

* Task 1 - import exception handle (#67)

* TASK-64 basic repository (#71)

* Restore proper schedule example file (#73)

* TASK-9 Introduce React Router (#70)

* Introduce react router

* Fix test

Co-authored-by: Tomasz Pecak <[email protected]>

* Add linter for test and resolve errors (#77)

* TASK-61 getWorkersCount added to ShiftHelper (#75)

* TASK-61 getWorkersCount added to ShiftHelper

* Task 84 month switch component (#74)

* TASK-101 addaed mainWindow.removeMenu() and menu is removed (#81)

merged TASK-101 (menu removed) into develo

* TASK-30 Header (#76)

* TASK-30 adds header

* Move logic for calculating work hours info to shift helper (#82)

* TASK-27 dropdown (#80)

* Set electron run and build script to npm start and build (#83)

* TASK-94 Management page sketch (#79)

* Create simple management page

* Task-66 (#78)

* 'TASK-106'

* Task-105 route buttons (#84)

* TASK-105 adds routing to application

* TASK-117 Test changing shifts (#89)

* TASK-88 cypress environment variables fixed (#94)

* Adds button component (#91)

* Fixes bug which caused a problem (#98)

* Task 116 work hour calculation (#92)

* TASK-118 Load example schedule data when dev mode is on (#99)

* Task-29 Implementacja toolbaru w podglądzie i edycji harmonogramu (#97)

* TASK-83 Export work hours info (#100)

* Adds work hour export

* TASK-26 timetable component (#86)

* TASK-112 (#93)

* workerCount are now using different data for nurses and babysitters. Removed error from route-buttons.component. Fixed missed columns in getWorkersCount in shifts.helper.ts

* Defines interface for props, replaces raw values with variables in scss (#101)

Co-authored-by: Bohdan Forostianyi <[email protected]>

* TASK-121 buttons dropdown (#103)

* TASK-123 Add showing schedule errors test (#105)

* TASK-11 Test: Eksportowanie i następnie importowanie harmonogramu (#108)

* TASK-137 edycja informacji o ośrodku (#110)

* Task 113 Refinement of Worker management page (#107)

* Task 143 add overtime header time table (#114)

* Task 135 (#106)

* Task 34 range selection (#113)

* Adds local variables to electron (#116)

* Task 109: error list items styling (#115)

* TASK-151 Add styles to drawer component (#119)

* TASK-142 Worker info drawer (#109)

* Task 79 (#122)

* added 4 tests

* fixed tslint

* refactoring

Co-authored-by: Paweł Renc <[email protected]>

* TASK-162 Fix work hours info calculation (#121)

* TASK-80 (#124)

* TASK-23 add error triangles + fix table style unwanted change (#123)

* TASK-141 Adds pouchdb (#125)

* TASK-150 shifts tab (#126)

* TASK-85 (#117)

* Task 57 Cypress refactor + undo redo test (#127)

* TASK-170 (#131)

* TASK-47 basic set-up of task (#134)

* TASK-158 Workers Calendar (#132)

* Task 163 (#120)

* Task 65 (#138)

* TASK-159 Add workers range selection test (#137)

* Task 178 Application state history setup (#140)

* Add styling of edit/add worker component inside drawer (#128)

* Create LICENSE (#141)

* Task 178 next month switch (#143)

* Task 161 test drawera edycji pracownika (#136)

* TASK-169 displaying-connection-errors (#142)

* Task 177 (#148)

* Task 187 translacja ilosci godzin z wersji ulamka do godzinowej i na odwrot (#147)

* TASK-181-Schedule-Style (#146)

* Remove fixed position property from month-switch (#151)

* Task 183 shift edit drawer (#156)

* TASK-199 Force header to stay on top of the page while scrolling (#157)

* Setup env to solver api (#158)

* TASK-196-actions-of-error-drawer-buttons (#155)

* add modal (#154)

* Task 111 collapsible error sections (#159)

* Task 178 continue (#150)

* TASK-193-drawer-prcownikow (#161)

* TASK-156 sanckbar with alerts (#160)

* TASK-217 Self-host gitrunners on AGH servers (#169)

* TASK-206 Add netlify pro open source project footer and code of conduct (#167)

* Refine month switch (#170)

* Task 210 wrong month import (#171)

* TASK-184 Rework half of the app (#144)

* TASK-184 Adds task setup

* Add monthDataModel, create class to store ScheduleKey

* Save month data model in dn

* Fix a lot of bugs :)

* Resolve bug with wrong schedule key

* Find and fix bug in caclulateWorkHoursInfo

* Code refactoring

* Add new property isAutoGenerated to ScheduleComponentState and ScheduleDM, create reducer to handle its change

* Extend month shifts when copying to bigger month

* Resolve bug with wrong date order

* Resolve bug with undefined month info

* Allow to copy only from not auto genearated months

* Set default value for month extension

* Add param to specify month and year to loading schedule function

* Fix local schedule state

* Fix local schedule test

* Put DNDProvider on top of render tree

* Optimize and update work hours test

* Change contains to assertion

* Rename scheduleKey key to dbKey

* Rename scheduleModel from UseScheduleConverterOutput to monthModel

* Preprocess schedule before load in dev mode

* Handle foundation info update in schedule update

* Remove code duplication from nextMonthKey and prevMonthKey

Co-authored-by: Tomasz Pecak <[email protected]>

* Task 33 chmurki (#168)

* Task 208 user acceptance tests (#163)

* TASK-203-dropdown-styling-update (#174)

* TASK-209 drawer z bledami jak w jirze i dodatki (#172)

* Adds retry setting, adds more assertions to code (#183)

* Task 236 license header linter (#179)

* TASK-192 Primary schedule revision (#177)

* TASK 185 add "poprawki" 1/2 (#173)

* TASK-157 worker delete modal (#178)

* Task 223 disable month switching in edit mode (#180)

* Fixes extend method (#187)

* Task 237 drawer kolejne rzeczy (#186)

* Task 235 disable previous month editing cherry pick (#190)

* TASK-218-kalendarz-pracownika (#192)

* Fix using span-errors everywhere (#193)

* Task 154  parsowanie (#162)

* Task 247 dropdown bug (#194)

* Adds return to today button (#196)

* TASK-268 Add button "back to now" (#197)

* Task 17 modal do eksportu (#184)

* TASK-269 Fix Excel parsing when formatted richly (#198)

* resolve bug

* UPDATE TESTS

* update style

* LOWERCASE

* TASK-180 Add proper error badges (#153)

* Adds basic error selection

* Adds badges to namestable

* Fixes bug  with hidden dropdown, makes input to fill full cell

* Fixes bug where cells in row could not be edited

* Adds error triangles to timetable header

* Refactors shift cell and base cell

* Split base cell on shift cell and base cell

* Fixes linting errors

* Fixes bug with wrong month switching, fixes some warnings

* Start using popper properly

* Adds normal positioning for triagnles

* Adds error tooltips

* Fixes test

Co-authored-by: Bohdan Forostianyi <[email protected]>
Co-authored-by: Paweł Renc <[email protected]>

* BUG WITH ERROR MODAL (#200)

* Set 10-minute timeout on CI and bump runners number (#201)

* TASK-264 Hardcode pandemic shifts (#199)

* Adds new shifts

* Fixes tests

* Adds backend compatible shifts

* Fixes tests

* bug+colors (#203)

* bug+colors

* bug+colors

Co-authored-by: Paweł Renc <[email protected]>
Co-authored-by: Paulina <[email protected]>

* Perform test checks on google-chrome (#202)

* Bump container number

* Run tests on electron and chrome

* Set workflow to test only google-chrome

* Add group name

* Show loader when reloading errors (#204)

* TASK-204-worker-list-actualization (#195)

* Fixes bug by generating shifts for worker (#206)

* TASK-193-Wykończenie drawera do zarządzania pracownikami (#205)

* TASK-202 Add modal for issue reporting (UI & logic) (#175)

* Add basic modal and set header to always be visible

* Add basic screenshot feature

* Poor man's styling

* TASK-202-report-issues-panel

* TASK-202 some styling

* TASK-202 modal styling

* TASK-202 classnames cleanup

* TASK-202 separate settings icon

* TASK-202 centered screenshot image

* getting rid of warnings

* a little update

* wrong button variant fixed

* drawer margin top

* Add sending message with reported issue

* made bottom drawer buttons visible

* getting rid of warnings

* cleanup

* addressed reported issues

* typo fixed

* env email key

Co-authored-by: Ehevi <[email protected]>
Co-authored-by: Bohdan <[email protected]>
Co-authored-by: Maciej Bielech <[email protected]>
Co-authored-by: Ehevi <[email protected]>

* TASK-179 Add weekly badges (#208)

Co-authored-by: Paweł Renc <[email protected]>

* TASK-290 Fix next month days saving (#209)

Co-authored-by: Paweł Renc <[email protected]>

* TASK-227 Fix month copying (#211)

* Fix month copying function

* Refactor copying prev and next month

* Change dev mode schedule to current month

* Resolve bug with copying to january and its weekend highlight

* TASK-296 Show month label in edit mode (#212)

* Show month label in edit mode, fix disable button opacity

* Disable edit mode button

* Create app config context to store app mode

* Remove link parent component to shrink onClick space

* TASK-299 Add OP and OK shifts to shift info model (#213)

* TASK-299 Add OP and OK shifts to shift info model

* TASK-299 Add missing expected hours to ShiftHelper tests

Co-authored-by: Paweł Renc <[email protected]>

* TASK-298 Fix drawer logic for managing workers (#210)

* Fixes worker agreement

* Contract type and worker type are automatically shown when user is edited

* fixes work time calculation for civil contract

* Adds validation to worker drawer

* Adds opacity

* Fixes edit mode and table with workers

* Adds validation to worker drawer

Co-authored-by: Paweł Renc <[email protected]>

* TASK-293 Move nurse count error badges to table header (#215)

* Add nurse count errors to table header, fix indexing for errors shown at foundation info

* TASK-293 remove error badges from foundation info comp altogether

* TASK-253 Anonymize schedule before sending on server (#216)

* TASK-253 Schedule anonymization

* TASK-253 Schedule anonymization

* TASK-253 eslint disables resolved

* TASK-280 Display time intervals in discovered issues' descriptions (#207)

* TASK-280 przedziały czasowe AON

* aon, wnd, wnn error from to message

* TASK-280 don't display night error hours if 22-6

* warning 'workerName' is assigned a value but never used

Co-authored-by: Paweł Renc <[email protected]>

* TASK-300 Add calendar image to no schedule uploaded screen (#214)

* TASK-300 Add calendar image to no-schedule-uploaded screen

* Replace calendar image with nurse image

* Comment out the failing test

* Add timeout to tests

* Increase timeout on nurse shifts table loading to 10s

Co-authored-by: Paweł Renc <[email protected]>

* Revert "TASK-300 Add calendar image to no schedule uploaded screen (#214)" (#224)

This reverts commit e733675.

* TASK-200 Fix major issues in shifts' drawer (#223)

* add "poprawki"

* add "poprawki"

* add "poprawki"

* test update

* dropdown

* diable pointer when disabled

* revert package-lock

* add suggestions

* change buttons style

* update zIndex

* add variants

* add color selector

* add changes - am lazy today

* bug fix

* bug fix + diable buttons

* TASK-281 Fix dates of discovered issues (#219)

* Add nurse count errors to table header, fix indexing for errors shown at foundation info

* TASK-293 remove error badges from foundation info comp altogether

* TASK-281 tinker with error days indexing and presentation

* Sort errors based on date

* Increase timeout on getting worker shift

* Increase timeouts even further beyond

* Fix outdated message asserts in schedule errors test

* Fix message asserts

* Increase timeout on schedule error folding section get

* Update messages in schedule-errors test

* Update schedule-errors.spec.ts

* Update commands.ts

* Update schedule-errors.spec.ts

* Update schedule-errors.spec.ts

Co-authored-by: Paweł Renc <[email protected]>

* TASK-306 Make workers' info has length of full weeks  (#221)

* Adds worker info on new month

* Update schedule-data.model.ts

Co-authored-by: Paweł Renc <[email protected]>

* Updates packag-lock (#226)

Co-authored-by: Paweł Renc <[email protected]>

* TASK-289 Correct dropdown positioning (#217)

* Autocomplete near cell

* zindex update

Co-authored-by: Paweł Renc <[email protected]>
Co-authored-by: kaplonpaulina <[email protected]>

* TASK-302 Add notification about issues absence (#218)

Co-authored-by: Paweł Renc <[email protected]>

* Task-286 Save workers persistently (#222)

* Fixes worker agreement

* Contract type and worker type are automatically shown when user is edited

* fixes work time calculation for civil contract

* Adds validation to worker drawer

* Adds opacity

* Fixes edit mode and table with workers

* Adds validation for invalid civil time

* TASK-296 Show month label in edit mode (#212)

* Show month label in edit mode, fix disable button opacity

* Disable edit mode button

* Create app config context to store app mode

* Remove link parent component to shrink onClick space

* Put worker logic in action creator

* Refactor schedule action creator

* Save NZ if in current month

Co-authored-by: Bohdan Forostianyi <[email protected]>
Co-authored-by: Paweł Renc <[email protected]>

* TASK-309 Show "go to now" button only in schedule view mode (#231)

Co-authored-by: Paweł Renc <[email protected]>

* TASK-311 Improve shifts' long names (#230)

* TASK-312 Omit header line of imported file when parsing  (#232)

* TASK-198 Make exported sheet printable (#229)

* xlxs update

* xlxs update

* xlxs update

* xlxs update

* xlxs update

* TASK-308 Evaluate working time issues on frontend (#233)

* Adds worker info on new month

* Moves errors from backend to frontend

Co-authored-by: Paweł Renc <[email protected]>

* TASK-313 Add colors in worker's calendar (#234)

* xlxs update

* xlxs update

* xlxs update

* xlxs update

* xlxs update

* workers-calendar style update

Co-authored-by: Paweł Renc <[email protected]>

* TASK-316 Fix long name for RPN  (#236)

* TASK-315 Fix request when reporting issue (#237)

Co-authored-by: Paweł Renc <[email protected]>

* TASK-310 Fix problem with copying month with newly added workers (#235)

* Disable copying from next month

* Save actual revision when saving primary
Create new dict with only based shifts workers
Add worker to current and next month

* Remove unnecessary state spread from reducers with UPDATE_WORKER_INFO

Co-authored-by: Paweł Renc <[email protected]>

* TASK-300 Add no schedule image as link (don't merge) (#228)

* Revert "TASK-308 Evaluate working time issues on frontend (#233)" (#240)

This reverts commit 63cbca9.

* Revert "TASK-300 Add no schedule image as link (don't merge) (#228)" (#241)

This reverts commit 6ee577d.

* Adds link to help page (#243)

* Moves overtime and undertime error calculation on frontend (#246)

* TASK-292 Integrate redux in sentry (#245)

* Adds worker update (#247)

* TASK-320 Set default number of children to 20 (#250)

* TASK-259 Resolve PouchDB update error (#244)

* Show errors in console, fix update bug

* Mute eslint warning

* Resolve db update conflict, disable error printing when doc is not found

* TASK-340 Remove unused logic for copying from next month (#248)

Co-authored-by: Bohdan <[email protected]>

* TASK-250 Add semantic release library (#242)

* Add semantic versioning library

* Remove package-lock update

* Sync package-lock

* Updates package-lock

* Updates package-lock.json

Co-authored-by: Bohdan Forostianyi <[email protected]>

Co-authored-by: Maciej Bielech <[email protected]>
Co-authored-by: Sig00rd <[email protected]>
Co-authored-by: Bohdan <[email protected]>
Co-authored-by: Bohdan Forostianyi <[email protected]>
Co-authored-by: Tomasz Pęcak <[email protected]>
Co-authored-by: Szymon Fugas <[email protected]>
Co-authored-by: Paulina <[email protected]>
Co-authored-by: Maciej Bielech <[email protected]>
Co-authored-by: KarolinaFilipiuk <[email protected]>
Co-authored-by: Dmytro <[email protected]>
Co-authored-by: Vyacheslav Trushkov <[email protected]>
Co-authored-by: Ehevi <[email protected]>
Co-authored-by: Dushess0 <[email protected]>
Co-authored-by: Ehevi <[email protected]>
prenc added a commit that referenced this pull request Mar 2, 2021
* NS-80 Replace fat arrow functions with class functions. Refactor some typos/code.

* Refactor safe stuff

* Replaced employee with worker in variable namings

* Add eslint, pre-commit hooks and refactor to stick to linter rules (#43)

* Configure eslint, husky and lint-stage and disable eslint errors

* Enable prefer-const, no-var rules and fix errors for them

* Enable fix no-unused-vars and no-fallthrough warnings

* Enable fix @typescript-eslint/class-name-casing, @typescript-eslint/no-empty-interface, @typescript-eslint

* Enable fix @typescript-eslint/camelcase

* Enable and fix errors from @typescript-eslint/no-inferrable-types eslint rule

* Enable global @typescript-eslint/no-explicit-any eslint rule and disable it locally

* Change usages of Object type to Record<string, any>

* Add missing return types to all project function

* Add missing return types to all project functions

* Enable react-hooks/exhaustive-deps lint rule and fix its warnings

* Refactor worker_info to employee_info to be consistent with server

* NS-93 Add .idea/ folder to gitignore (#44)

* Fixed bug where work time 1/N wasn't possible

* Fixed bug where work time 1/N wasn't possible

* Added no console rule

Co-authored-by: Bohdan Forostianyi <[email protected]>

* NS-86 Use exceljs instead of XLSX for loading the Excel file (#49)

* Add exceljs to dependencies and import it in useScheduleConverter hook

* Get data from sheet, exceljs style

* Removed rules for lint disable

Co-authored-by: Bohdan Forostianyi <[email protected]>

* Rename file and its content to stick to the convention (#50)

* Add props interface to files with components

* Refactor models structure

* Ns 79 helpers (#48)

* Applied conventions to helper files

* Moved hooks lower in hierarchy

* Moved verbose date to month-info.model

Co-authored-by: Bohdan Forostianyi <[email protected]>

* Remove @types/files-save dep and unnecessary comment

Co-authored-by: Bohdan <[email protected]>
Co-authored-by: Bohdan Forostianyi <[email protected]>

* Added missing schedule (#54)

authored-by: Bohdan Forostianyi <[email protected]>

* NS-92 (#45)

* NS-92 Setup Sentry

* Added missing dependecies

Co-authored-by: Bohdan Forostianyi <[email protected]>

* Remove xlsx from project dependencies (#55)

* Add cypress NS-48 (#46)

* NS-48 Add cypress. Add exemplar test.

* Remove cypress default examples

* NS-48 Fix port issue. Remove cypress examples

* Add .env to git

* Remove cypress.env.json file

* Add extend eslint to env. Fix cypress config. Rename tests folder and file

* move styles to designaed folder (#53)

* NS 49 Handle public holidays (#56)

* Add public holidays logic and store info about it in VerboseDates

* Refactor public holiday logic (use custom type for day and month)

* Add coloring for holidays

* NS-77 (#59)

Adds pipiline with test runner

* NS-85 frontend refactor (#57)

* Adds frontend refactor

* Removes README from docs

Co-authored-by: Bohdan Forostianyi <[email protected]>

* Test public holiday logic for holidays in 2020

* Expand on test cases, add cypress videos to gitignore

* Refactor tests

* TASK-6 Add test: load schedule from file (#61)

* TASK-3 add electron (#64)

* Task 5 - Undo/Redo functonality  (#63)

* Handle global state undo/redo with shortcuts

* TASK-4 optimizes schedule rendering

Co-authored-by: Bohdan <[email protected]>

* Update README.md

* Update README.md

* TASK-7 data row parser (#69)

* NS-98 (#68)

* Adds more typed zip function

Co-authored-by: Bohdan Forostianyi <[email protected]>

* Task 1 - import exception handle (#67)

* TASK-64 basic repository (#71)

* Restore proper schedule example file (#73)

* TASK-9 Introduce React Router (#70)

* Introduce react router

* Fix test

Co-authored-by: Tomasz Pecak <[email protected]>

* Add linter for test and resolve errors (#77)

* TASK-61 getWorkersCount added to ShiftHelper (#75)

* TASK-61 getWorkersCount added to ShiftHelper

* Task 84 month switch component (#74)

* TASK-101 addaed mainWindow.removeMenu() and menu is removed (#81)

merged TASK-101 (menu removed) into develo

* TASK-30 Header (#76)

* TASK-30 adds header

* Move logic for calculating work hours info to shift helper (#82)

* TASK-27 dropdown (#80)

* Set electron run and build script to npm start and build (#83)

* TASK-94 Management page sketch (#79)

* Create simple management page

* Task-66 (#78)

* 'TASK-106'

* Task-105 route buttons (#84)

* TASK-105 adds routing to application

* TASK-117 Test changing shifts (#89)

* TASK-88 cypress environment variables fixed (#94)

* Adds button component (#91)

* Fixes bug which caused a problem (#98)

* Task 116 work hour calculation (#92)

* TASK-118 Load example schedule data when dev mode is on (#99)

* Task-29 Implementacja toolbaru w podglądzie i edycji harmonogramu (#97)

* TASK-83 Export work hours info (#100)

* Adds work hour export

* TASK-26 timetable component (#86)

* TASK-112 (#93)

* workerCount are now using different data for nurses and babysitters. Removed error from route-buttons.component. Fixed missed columns in getWorkersCount in shifts.helper.ts

* Defines interface for props, replaces raw values with variables in scss (#101)

Co-authored-by: Bohdan Forostianyi <[email protected]>

* TASK-121 buttons dropdown (#103)

* TASK-123 Add showing schedule errors test (#105)

* TASK-11 Test: Eksportowanie i następnie importowanie harmonogramu (#108)

* TASK-137 edycja informacji o ośrodku (#110)

* Task 113 Refinement of Worker management page (#107)

* Task 143 add overtime header time table (#114)

* Task 135 (#106)

* Task 34 range selection (#113)

* Adds local variables to electron (#116)

* Task 109: error list items styling (#115)

* TASK-151 Add styles to drawer component (#119)

* TASK-142 Worker info drawer (#109)

* Task 79 (#122)

* added 4 tests

* fixed tslint

* refactoring

Co-authored-by: Paweł Renc <[email protected]>

* TASK-162 Fix work hours info calculation (#121)

* TASK-80 (#124)

* TASK-23 add error triangles + fix table style unwanted change (#123)

* TASK-141 Adds pouchdb (#125)

* TASK-150 shifts tab (#126)

* TASK-85 (#117)

* Task 57 Cypress refactor + undo redo test (#127)

* TASK-170 (#131)

* TASK-47 basic set-up of task (#134)

* TASK-158 Workers Calendar (#132)

* Task 163 (#120)

* Task 65 (#138)

* TASK-159 Add workers range selection test (#137)

* Task 178 Application state history setup (#140)

* Add styling of edit/add worker component inside drawer (#128)

* Create LICENSE (#141)

* Task 178 next month switch (#143)

* Task 161 test drawera edycji pracownika (#136)

* TASK-169 displaying-connection-errors (#142)

* Task 177 (#148)

* Task 187 translacja ilosci godzin z wersji ulamka do godzinowej i na odwrot (#147)

* TASK-181-Schedule-Style (#146)

* Remove fixed position property from month-switch (#151)

* Task 183 shift edit drawer (#156)

* TASK-199 Force header to stay on top of the page while scrolling (#157)

* Setup env to solver api (#158)

* TASK-196-actions-of-error-drawer-buttons (#155)

* add modal (#154)

* Task 111 collapsible error sections (#159)

* Task 178 continue (#150)

* TASK-193-drawer-prcownikow (#161)

* TASK-156 sanckbar with alerts (#160)

* TASK-217 Self-host gitrunners on AGH servers (#169)

* TASK-206 Add netlify pro open source project footer and code of conduct (#167)

* Refine month switch (#170)

* Task 210 wrong month import (#171)

* TASK-184 Rework half of the app (#144)

* TASK-184 Adds task setup

* Add monthDataModel, create class to store ScheduleKey

* Save month data model in dn

* Fix a lot of bugs :)

* Resolve bug with wrong schedule key

* Find and fix bug in caclulateWorkHoursInfo

* Code refactoring

* Add new property isAutoGenerated to ScheduleComponentState and ScheduleDM, create reducer to handle its change

* Extend month shifts when copying to bigger month

* Resolve bug with wrong date order

* Resolve bug with undefined month info

* Allow to copy only from not auto genearated months

* Set default value for month extension

* Add param to specify month and year to loading schedule function

* Fix local schedule state

* Fix local schedule test

* Put DNDProvider on top of render tree

* Optimize and update work hours test

* Change contains to assertion

* Rename scheduleKey key to dbKey

* Rename scheduleModel from UseScheduleConverterOutput to monthModel

* Preprocess schedule before load in dev mode

* Handle foundation info update in schedule update

* Remove code duplication from nextMonthKey and prevMonthKey

Co-authored-by: Tomasz Pecak <[email protected]>

* Task 33 chmurki (#168)

* Task 208 user acceptance tests (#163)

* TASK-203-dropdown-styling-update (#174)

* TASK-209 drawer z bledami jak w jirze i dodatki (#172)

* Adds retry setting, adds more assertions to code (#183)

* Task 236 license header linter (#179)

* TASK-192 Primary schedule revision (#177)

* TASK 185 add "poprawki" 1/2 (#173)

* TASK-157 worker delete modal (#178)

* Task 223 disable month switching in edit mode (#180)

* Fixes extend method (#187)

* Task 237 drawer kolejne rzeczy (#186)

* Task 235 disable previous month editing cherry pick (#190)

* TASK-218-kalendarz-pracownika (#192)

* Fix using span-errors everywhere (#193)

* Task 154  parsowanie (#162)

* Task 247 dropdown bug (#194)

* Adds return to today button (#196)

* TASK-268 Add button "back to now" (#197)

* Task 17 modal do eksportu (#184)

* TASK-269 Fix Excel parsing when formatted richly (#198)

* resolve bug

* UPDATE TESTS

* update style

* LOWERCASE

* TASK-180 Add proper error badges (#153)

* Adds basic error selection

* Adds badges to namestable

* Fixes bug  with hidden dropdown, makes input to fill full cell

* Fixes bug where cells in row could not be edited

* Adds error triangles to timetable header

* Refactors shift cell and base cell

* Split base cell on shift cell and base cell

* Fixes linting errors

* Fixes bug with wrong month switching, fixes some warnings

* Start using popper properly

* Adds normal positioning for triagnles

* Adds error tooltips

* Fixes test

Co-authored-by: Bohdan Forostianyi <[email protected]>
Co-authored-by: Paweł Renc <[email protected]>

* BUG WITH ERROR MODAL (#200)

* Set 10-minute timeout on CI and bump runners number (#201)

* TASK-264 Hardcode pandemic shifts (#199)

* Adds new shifts

* Fixes tests

* Adds backend compatible shifts

* Fixes tests

* bug+colors (#203)

* bug+colors

* bug+colors

Co-authored-by: Paweł Renc <[email protected]>
Co-authored-by: Paulina <[email protected]>

* Perform test checks on google-chrome (#202)

* Bump container number

* Run tests on electron and chrome

* Set workflow to test only google-chrome

* Add group name

* Show loader when reloading errors (#204)

* TASK-204-worker-list-actualization (#195)

* Fixes bug by generating shifts for worker (#206)

* TASK-193-Wykończenie drawera do zarządzania pracownikami (#205)

* TASK-202 Add modal for issue reporting (UI & logic) (#175)

* Add basic modal and set header to always be visible

* Add basic screenshot feature

* Poor man's styling

* TASK-202-report-issues-panel

* TASK-202 some styling

* TASK-202 modal styling

* TASK-202 classnames cleanup

* TASK-202 separate settings icon

* TASK-202 centered screenshot image

* getting rid of warnings

* a little update

* wrong button variant fixed

* drawer margin top

* Add sending message with reported issue

* made bottom drawer buttons visible

* getting rid of warnings

* cleanup

* addressed reported issues

* typo fixed

* env email key

Co-authored-by: Ehevi <[email protected]>
Co-authored-by: Bohdan <[email protected]>
Co-authored-by: Maciej Bielech <[email protected]>
Co-authored-by: Ehevi <[email protected]>

* TASK-179 Add weekly badges (#208)

Co-authored-by: Paweł Renc <[email protected]>

* TASK-290 Fix next month days saving (#209)

Co-authored-by: Paweł Renc <[email protected]>

* TASK-227 Fix month copying (#211)

* Fix month copying function

* Refactor copying prev and next month

* Change dev mode schedule to current month

* Resolve bug with copying to january and its weekend highlight

* TASK-296 Show month label in edit mode (#212)

* Show month label in edit mode, fix disable button opacity

* Disable edit mode button

* Create app config context to store app mode

* Remove link parent component to shrink onClick space

* TASK-299 Add OP and OK shifts to shift info model (#213)

* TASK-299 Add OP and OK shifts to shift info model

* TASK-299 Add missing expected hours to ShiftHelper tests

Co-authored-by: Paweł Renc <[email protected]>

* TASK-298 Fix drawer logic for managing workers (#210)

* Fixes worker agreement

* Contract type and worker type are automatically shown when user is edited

* fixes work time calculation for civil contract

* Adds validation to worker drawer

* Adds opacity

* Fixes edit mode and table with workers

* Adds validation to worker drawer

Co-authored-by: Paweł Renc <[email protected]>

* TASK-293 Move nurse count error badges to table header (#215)

* Add nurse count errors to table header, fix indexing for errors shown at foundation info

* TASK-293 remove error badges from foundation info comp altogether

* TASK-253 Anonymize schedule before sending on server (#216)

* TASK-253 Schedule anonymization

* TASK-253 Schedule anonymization

* TASK-253 eslint disables resolved

* TASK-280 Display time intervals in discovered issues' descriptions (#207)

* TASK-280 przedziały czasowe AON

* aon, wnd, wnn error from to message

* TASK-280 don't display night error hours if 22-6

* warning 'workerName' is assigned a value but never used

Co-authored-by: Paweł Renc <[email protected]>

* TASK-300 Add calendar image to no schedule uploaded screen (#214)

* TASK-300 Add calendar image to no-schedule-uploaded screen

* Replace calendar image with nurse image

* Comment out the failing test

* Add timeout to tests

* Increase timeout on nurse shifts table loading to 10s

Co-authored-by: Paweł Renc <[email protected]>

* Revert "TASK-300 Add calendar image to no schedule uploaded screen (#214)" (#224)

This reverts commit e733675.

* TASK-200 Fix major issues in shifts' drawer (#223)

* add "poprawki"

* add "poprawki"

* add "poprawki"

* test update

* dropdown

* diable pointer when disabled

* revert package-lock

* add suggestions

* change buttons style

* update zIndex

* add variants

* add color selector

* add changes - am lazy today

* bug fix

* bug fix + diable buttons

* TASK-281 Fix dates of discovered issues (#219)

* Add nurse count errors to table header, fix indexing for errors shown at foundation info

* TASK-293 remove error badges from foundation info comp altogether

* TASK-281 tinker with error days indexing and presentation

* Sort errors based on date

* Increase timeout on getting worker shift

* Increase timeouts even further beyond

* Fix outdated message asserts in schedule errors test

* Fix message asserts

* Increase timeout on schedule error folding section get

* Update messages in schedule-errors test

* Update schedule-errors.spec.ts

* Update commands.ts

* Update schedule-errors.spec.ts

* Update schedule-errors.spec.ts

Co-authored-by: Paweł Renc <[email protected]>

* TASK-306 Make workers' info has length of full weeks  (#221)

* Adds worker info on new month

* Update schedule-data.model.ts

Co-authored-by: Paweł Renc <[email protected]>

* Updates packag-lock (#226)

Co-authored-by: Paweł Renc <[email protected]>

* TASK-289 Correct dropdown positioning (#217)

* Autocomplete near cell

* zindex update

Co-authored-by: Paweł Renc <[email protected]>
Co-authored-by: kaplonpaulina <[email protected]>

* TASK-302 Add notification about issues absence (#218)

Co-authored-by: Paweł Renc <[email protected]>

* Task-286 Save workers persistently (#222)

* Fixes worker agreement

* Contract type and worker type are automatically shown when user is edited

* fixes work time calculation for civil contract

* Adds validation to worker drawer

* Adds opacity

* Fixes edit mode and table with workers

* Adds validation for invalid civil time

* TASK-296 Show month label in edit mode (#212)

* Show month label in edit mode, fix disable button opacity

* Disable edit mode button

* Create app config context to store app mode

* Remove link parent component to shrink onClick space

* Put worker logic in action creator

* Refactor schedule action creator

* Save NZ if in current month

Co-authored-by: Bohdan Forostianyi <[email protected]>
Co-authored-by: Paweł Renc <[email protected]>

* TASK-309 Show "go to now" button only in schedule view mode (#231)

Co-authored-by: Paweł Renc <[email protected]>

* TASK-311 Improve shifts' long names (#230)

* TASK-312 Omit header line of imported file when parsing  (#232)

* TASK-198 Make exported sheet printable (#229)

* xlxs update

* xlxs update

* xlxs update

* xlxs update

* xlxs update

* TASK-308 Evaluate working time issues on frontend (#233)

* Adds worker info on new month

* Moves errors from backend to frontend

Co-authored-by: Paweł Renc <[email protected]>

* TASK-313 Add colors in worker's calendar (#234)

* xlxs update

* xlxs update

* xlxs update

* xlxs update

* xlxs update

* workers-calendar style update

Co-authored-by: Paweł Renc <[email protected]>

* TASK-316 Fix long name for RPN  (#236)

* TASK-315 Fix request when reporting issue (#237)

Co-authored-by: Paweł Renc <[email protected]>

* TASK-310 Fix problem with copying month with newly added workers (#235)

* Disable copying from next month

* Save actual revision when saving primary
Create new dict with only based shifts workers
Add worker to current and next month

* Remove unnecessary state spread from reducers with UPDATE_WORKER_INFO

Co-authored-by: Paweł Renc <[email protected]>

* TASK-300 Add no schedule image as link (don't merge) (#228)

* Revert "TASK-308 Evaluate working time issues on frontend (#233)" (#240)

This reverts commit 63cbca9.

* Revert "TASK-300 Add no schedule image as link (don't merge) (#228)" (#241)

This reverts commit 6ee577d.

* Adds link to help page (#243)

* Moves overtime and undertime error calculation on frontend (#246)

* TASK-292 Integrate redux in sentry (#245)

* Adds worker update (#247)

* TASK-320 Set default number of children to 20 (#250)

* TASK-259 Resolve PouchDB update error (#244)

* Show errors in console, fix update bug

* Mute eslint warning

* Resolve db update conflict, disable error printing when doc is not found

* TASK-340 Remove unused logic for copying from next month (#248)

Co-authored-by: Bohdan <[email protected]>

* TASK-250 Add semantic release library (#242)

* Add semantic versioning library

* Remove package-lock update

* Sync package-lock

* Updates package-lock

* Updates package-lock.json

Co-authored-by: Bohdan Forostianyi <[email protected]>

* perf(App) Release v1.0.0 (#252)

Co-authored-by: Maciej Bielech <[email protected]>
Co-authored-by: Sig00rd <[email protected]>
Co-authored-by: Bohdan <[email protected]>
Co-authored-by: Bohdan Forostianyi <[email protected]>
Co-authored-by: Tomasz Pęcak <[email protected]>
Co-authored-by: Szymon Fugas <[email protected]>
Co-authored-by: Paulina <[email protected]>
Co-authored-by: Maciej Bielech <[email protected]>
Co-authored-by: KarolinaFilipiuk <[email protected]>
Co-authored-by: Dmytro <[email protected]>
Co-authored-by: Vyacheslav Trushkov <[email protected]>
Co-authored-by: Ehevi <[email protected]>
Co-authored-by: Dushess0 <[email protected]>
Co-authored-by: Ehevi <[email protected]>
prenc added a commit that referenced this pull request Mar 2, 2021
* NS-80 Replace fat arrow functions with class functions. Refactor some typos/code.

* Refactor safe stuff

* Replaced employee with worker in variable namings

* Add eslint, pre-commit hooks and refactor to stick to linter rules (#43)

* Configure eslint, husky and lint-stage and disable eslint errors

* Enable prefer-const, no-var rules and fix errors for them

* Enable fix no-unused-vars and no-fallthrough warnings

* Enable fix @typescript-eslint/class-name-casing, @typescript-eslint/no-empty-interface, @typescript-eslint

* Enable fix @typescript-eslint/camelcase

* Enable and fix errors from @typescript-eslint/no-inferrable-types eslint rule

* Enable global @typescript-eslint/no-explicit-any eslint rule and disable it locally

* Change usages of Object type to Record<string, any>

* Add missing return types to all project function

* Add missing return types to all project functions

* Enable react-hooks/exhaustive-deps lint rule and fix its warnings

* Refactor worker_info to employee_info to be consistent with server

* NS-93 Add .idea/ folder to gitignore (#44)

* Fixed bug where work time 1/N wasn't possible

* Fixed bug where work time 1/N wasn't possible

* Added no console rule

Co-authored-by: Bohdan Forostianyi <[email protected]>

* NS-86 Use exceljs instead of XLSX for loading the Excel file (#49)

* Add exceljs to dependencies and import it in useScheduleConverter hook

* Get data from sheet, exceljs style

* Removed rules for lint disable

Co-authored-by: Bohdan Forostianyi <[email protected]>

* Rename file and its content to stick to the convention (#50)

* Add props interface to files with components

* Refactor models structure

* Ns 79 helpers (#48)

* Applied conventions to helper files

* Moved hooks lower in hierarchy

* Moved verbose date to month-info.model

Co-authored-by: Bohdan Forostianyi <[email protected]>

* Remove @types/files-save dep and unnecessary comment

Co-authored-by: Bohdan <[email protected]>
Co-authored-by: Bohdan Forostianyi <[email protected]>

* Added missing schedule (#54)

authored-by: Bohdan Forostianyi <[email protected]>

* NS-92 (#45)

* NS-92 Setup Sentry

* Added missing dependecies

Co-authored-by: Bohdan Forostianyi <[email protected]>

* Remove xlsx from project dependencies (#55)

* Add cypress NS-48 (#46)

* NS-48 Add cypress. Add exemplar test.

* Remove cypress default examples

* NS-48 Fix port issue. Remove cypress examples

* Add .env to git

* Remove cypress.env.json file

* Add extend eslint to env. Fix cypress config. Rename tests folder and file

* move styles to designaed folder (#53)

* NS 49 Handle public holidays (#56)

* Add public holidays logic and store info about it in VerboseDates

* Refactor public holiday logic (use custom type for day and month)

* Add coloring for holidays

* NS-77 (#59)

Adds pipiline with test runner

* NS-85 frontend refactor (#57)

* Adds frontend refactor

* Removes README from docs

Co-authored-by: Bohdan Forostianyi <[email protected]>

* Test public holiday logic for holidays in 2020

* Expand on test cases, add cypress videos to gitignore

* Refactor tests

* TASK-6 Add test: load schedule from file (#61)

* TASK-3 add electron (#64)

* Task 5 - Undo/Redo functonality  (#63)

* Handle global state undo/redo with shortcuts

* TASK-4 optimizes schedule rendering

Co-authored-by: Bohdan <[email protected]>

* Update README.md

* Update README.md

* TASK-7 data row parser (#69)

* NS-98 (#68)

* Adds more typed zip function

Co-authored-by: Bohdan Forostianyi <[email protected]>

* Task 1 - import exception handle (#67)

* TASK-64 basic repository (#71)

* Restore proper schedule example file (#73)

* TASK-9 Introduce React Router (#70)

* Introduce react router

* Fix test

Co-authored-by: Tomasz Pecak <[email protected]>

* Add linter for test and resolve errors (#77)

* TASK-61 getWorkersCount added to ShiftHelper (#75)

* TASK-61 getWorkersCount added to ShiftHelper

* Task 84 month switch component (#74)

* TASK-101 addaed mainWindow.removeMenu() and menu is removed (#81)

merged TASK-101 (menu removed) into develo

* TASK-30 Header (#76)

* TASK-30 adds header

* Move logic for calculating work hours info to shift helper (#82)

* TASK-27 dropdown (#80)

* Set electron run and build script to npm start and build (#83)

* TASK-94 Management page sketch (#79)

* Create simple management page

* Task-66 (#78)

* 'TASK-106'

* Task-105 route buttons (#84)

* TASK-105 adds routing to application

* TASK-117 Test changing shifts (#89)

* TASK-88 cypress environment variables fixed (#94)

* Adds button component (#91)

* Fixes bug which caused a problem (#98)

* Task 116 work hour calculation (#92)

* TASK-118 Load example schedule data when dev mode is on (#99)

* Task-29 Implementacja toolbaru w podglądzie i edycji harmonogramu (#97)

* TASK-83 Export work hours info (#100)

* Adds work hour export

* TASK-26 timetable component (#86)

* TASK-112 (#93)

* workerCount are now using different data for nurses and babysitters. Removed error from route-buttons.component. Fixed missed columns in getWorkersCount in shifts.helper.ts

* Defines interface for props, replaces raw values with variables in scss (#101)

Co-authored-by: Bohdan Forostianyi <[email protected]>

* TASK-121 buttons dropdown (#103)

* TASK-123 Add showing schedule errors test (#105)

* TASK-11 Test: Eksportowanie i następnie importowanie harmonogramu (#108)

* TASK-137 edycja informacji o ośrodku (#110)

* Task 113 Refinement of Worker management page (#107)

* Task 143 add overtime header time table (#114)

* Task 135 (#106)

* Task 34 range selection (#113)

* Adds local variables to electron (#116)

* Task 109: error list items styling (#115)

* TASK-151 Add styles to drawer component (#119)

* TASK-142 Worker info drawer (#109)

* Task 79 (#122)

* added 4 tests

* fixed tslint

* refactoring

Co-authored-by: Paweł Renc <[email protected]>

* TASK-162 Fix work hours info calculation (#121)

* TASK-80 (#124)

* TASK-23 add error triangles + fix table style unwanted change (#123)

* TASK-141 Adds pouchdb (#125)

* TASK-150 shifts tab (#126)

* TASK-85 (#117)

* Task 57 Cypress refactor + undo redo test (#127)

* TASK-170 (#131)

* TASK-47 basic set-up of task (#134)

* TASK-158 Workers Calendar (#132)

* Task 163 (#120)

* Task 65 (#138)

* TASK-159 Add workers range selection test (#137)

* Task 178 Application state history setup (#140)

* Add styling of edit/add worker component inside drawer (#128)

* Create LICENSE (#141)

* Task 178 next month switch (#143)

* Task 161 test drawera edycji pracownika (#136)

* TASK-169 displaying-connection-errors (#142)

* Task 177 (#148)

* Task 187 translacja ilosci godzin z wersji ulamka do godzinowej i na odwrot (#147)

* TASK-181-Schedule-Style (#146)

* Remove fixed position property from month-switch (#151)

* Task 183 shift edit drawer (#156)

* TASK-199 Force header to stay on top of the page while scrolling (#157)

* Setup env to solver api (#158)

* TASK-196-actions-of-error-drawer-buttons (#155)

* add modal (#154)

* Task 111 collapsible error sections (#159)

* Task 178 continue (#150)

* TASK-193-drawer-prcownikow (#161)

* TASK-156 sanckbar with alerts (#160)

* TASK-217 Self-host gitrunners on AGH servers (#169)

* TASK-206 Add netlify pro open source project footer and code of conduct (#167)

* Refine month switch (#170)

* Task 210 wrong month import (#171)

* TASK-184 Rework half of the app (#144)

* TASK-184 Adds task setup

* Add monthDataModel, create class to store ScheduleKey

* Save month data model in dn

* Fix a lot of bugs :)

* Resolve bug with wrong schedule key

* Find and fix bug in caclulateWorkHoursInfo

* Code refactoring

* Add new property isAutoGenerated to ScheduleComponentState and ScheduleDM, create reducer to handle its change

* Extend month shifts when copying to bigger month

* Resolve bug with wrong date order

* Resolve bug with undefined month info

* Allow to copy only from not auto genearated months

* Set default value for month extension

* Add param to specify month and year to loading schedule function

* Fix local schedule state

* Fix local schedule test

* Put DNDProvider on top of render tree

* Optimize and update work hours test

* Change contains to assertion

* Rename scheduleKey key to dbKey

* Rename scheduleModel from UseScheduleConverterOutput to monthModel

* Preprocess schedule before load in dev mode

* Handle foundation info update in schedule update

* Remove code duplication from nextMonthKey and prevMonthKey

Co-authored-by: Tomasz Pecak <[email protected]>

* Task 33 chmurki (#168)

* Task 208 user acceptance tests (#163)

* TASK-203-dropdown-styling-update (#174)

* TASK-209 drawer z bledami jak w jirze i dodatki (#172)

* Adds retry setting, adds more assertions to code (#183)

* Task 236 license header linter (#179)

* TASK-192 Primary schedule revision (#177)

* TASK 185 add "poprawki" 1/2 (#173)

* TASK-157 worker delete modal (#178)

* Task 223 disable month switching in edit mode (#180)

* Fixes extend method (#187)

* Task 237 drawer kolejne rzeczy (#186)

* Task 235 disable previous month editing cherry pick (#190)

* TASK-218-kalendarz-pracownika (#192)

* Fix using span-errors everywhere (#193)

* Task 154  parsowanie (#162)

* Task 247 dropdown bug (#194)

* Adds return to today button (#196)

* TASK-268 Add button "back to now" (#197)

* Task 17 modal do eksportu (#184)

* TASK-269 Fix Excel parsing when formatted richly (#198)

* resolve bug

* UPDATE TESTS

* update style

* LOWERCASE

* TASK-180 Add proper error badges (#153)

* Adds basic error selection

* Adds badges to namestable

* Fixes bug  with hidden dropdown, makes input to fill full cell

* Fixes bug where cells in row could not be edited

* Adds error triangles to timetable header

* Refactors shift cell and base cell

* Split base cell on shift cell and base cell

* Fixes linting errors

* Fixes bug with wrong month switching, fixes some warnings

* Start using popper properly

* Adds normal positioning for triagnles

* Adds error tooltips

* Fixes test

Co-authored-by: Bohdan Forostianyi <[email protected]>
Co-authored-by: Paweł Renc <[email protected]>

* BUG WITH ERROR MODAL (#200)

* Set 10-minute timeout on CI and bump runners number (#201)

* TASK-264 Hardcode pandemic shifts (#199)

* Adds new shifts

* Fixes tests

* Adds backend compatible shifts

* Fixes tests

* bug+colors (#203)

* bug+colors

* bug+colors

Co-authored-by: Paweł Renc <[email protected]>
Co-authored-by: Paulina <[email protected]>

* Perform test checks on google-chrome (#202)

* Bump container number

* Run tests on electron and chrome

* Set workflow to test only google-chrome

* Add group name

* Show loader when reloading errors (#204)

* TASK-204-worker-list-actualization (#195)

* Fixes bug by generating shifts for worker (#206)

* TASK-193-Wykończenie drawera do zarządzania pracownikami (#205)

* TASK-202 Add modal for issue reporting (UI & logic) (#175)

* Add basic modal and set header to always be visible

* Add basic screenshot feature

* Poor man's styling

* TASK-202-report-issues-panel

* TASK-202 some styling

* TASK-202 modal styling

* TASK-202 classnames cleanup

* TASK-202 separate settings icon

* TASK-202 centered screenshot image

* getting rid of warnings

* a little update

* wrong button variant fixed

* drawer margin top

* Add sending message with reported issue

* made bottom drawer buttons visible

* getting rid of warnings

* cleanup

* addressed reported issues

* typo fixed

* env email key

Co-authored-by: Ehevi <[email protected]>
Co-authored-by: Bohdan <[email protected]>
Co-authored-by: Maciej Bielech <[email protected]>
Co-authored-by: Ehevi <[email protected]>

* TASK-179 Add weekly badges (#208)

Co-authored-by: Paweł Renc <[email protected]>

* TASK-290 Fix next month days saving (#209)

Co-authored-by: Paweł Renc <[email protected]>

* TASK-227 Fix month copying (#211)

* Fix month copying function

* Refactor copying prev and next month

* Change dev mode schedule to current month

* Resolve bug with copying to january and its weekend highlight

* TASK-296 Show month label in edit mode (#212)

* Show month label in edit mode, fix disable button opacity

* Disable edit mode button

* Create app config context to store app mode

* Remove link parent component to shrink onClick space

* TASK-299 Add OP and OK shifts to shift info model (#213)

* TASK-299 Add OP and OK shifts to shift info model

* TASK-299 Add missing expected hours to ShiftHelper tests

Co-authored-by: Paweł Renc <[email protected]>

* TASK-298 Fix drawer logic for managing workers (#210)

* Fixes worker agreement

* Contract type and worker type are automatically shown when user is edited

* fixes work time calculation for civil contract

* Adds validation to worker drawer

* Adds opacity

* Fixes edit mode and table with workers

* Adds validation to worker drawer

Co-authored-by: Paweł Renc <[email protected]>

* TASK-293 Move nurse count error badges to table header (#215)

* Add nurse count errors to table header, fix indexing for errors shown at foundation info

* TASK-293 remove error badges from foundation info comp altogether

* TASK-253 Anonymize schedule before sending on server (#216)

* TASK-253 Schedule anonymization

* TASK-253 Schedule anonymization

* TASK-253 eslint disables resolved

* TASK-280 Display time intervals in discovered issues' descriptions (#207)

* TASK-280 przedziały czasowe AON

* aon, wnd, wnn error from to message

* TASK-280 don't display night error hours if 22-6

* warning 'workerName' is assigned a value but never used

Co-authored-by: Paweł Renc <[email protected]>

* TASK-300 Add calendar image to no schedule uploaded screen (#214)

* TASK-300 Add calendar image to no-schedule-uploaded screen

* Replace calendar image with nurse image

* Comment out the failing test

* Add timeout to tests

* Increase timeout on nurse shifts table loading to 10s

Co-authored-by: Paweł Renc <[email protected]>

* Revert "TASK-300 Add calendar image to no schedule uploaded screen (#214)" (#224)

This reverts commit e733675.

* TASK-200 Fix major issues in shifts' drawer (#223)

* add "poprawki"

* add "poprawki"

* add "poprawki"

* test update

* dropdown

* diable pointer when disabled

* revert package-lock

* add suggestions

* change buttons style

* update zIndex

* add variants

* add color selector

* add changes - am lazy today

* bug fix

* bug fix + diable buttons

* TASK-281 Fix dates of discovered issues (#219)

* Add nurse count errors to table header, fix indexing for errors shown at foundation info

* TASK-293 remove error badges from foundation info comp altogether

* TASK-281 tinker with error days indexing and presentation

* Sort errors based on date

* Increase timeout on getting worker shift

* Increase timeouts even further beyond

* Fix outdated message asserts in schedule errors test

* Fix message asserts

* Increase timeout on schedule error folding section get

* Update messages in schedule-errors test

* Update schedule-errors.spec.ts

* Update commands.ts

* Update schedule-errors.spec.ts

* Update schedule-errors.spec.ts

Co-authored-by: Paweł Renc <[email protected]>

* TASK-306 Make workers' info has length of full weeks  (#221)

* Adds worker info on new month

* Update schedule-data.model.ts

Co-authored-by: Paweł Renc <[email protected]>

* Updates packag-lock (#226)

Co-authored-by: Paweł Renc <[email protected]>

* TASK-289 Correct dropdown positioning (#217)

* Autocomplete near cell

* zindex update

Co-authored-by: Paweł Renc <[email protected]>
Co-authored-by: kaplonpaulina <[email protected]>

* TASK-302 Add notification about issues absence (#218)

Co-authored-by: Paweł Renc <[email protected]>

* Task-286 Save workers persistently (#222)

* Fixes worker agreement

* Contract type and worker type are automatically shown when user is edited

* fixes work time calculation for civil contract

* Adds validation to worker drawer

* Adds opacity

* Fixes edit mode and table with workers

* Adds validation for invalid civil time

* TASK-296 Show month label in edit mode (#212)

* Show month label in edit mode, fix disable button opacity

* Disable edit mode button

* Create app config context to store app mode

* Remove link parent component to shrink onClick space

* Put worker logic in action creator

* Refactor schedule action creator

* Save NZ if in current month

Co-authored-by: Bohdan Forostianyi <[email protected]>
Co-authored-by: Paweł Renc <[email protected]>

* TASK-309 Show "go to now" button only in schedule view mode (#231)

Co-authored-by: Paweł Renc <[email protected]>

* TASK-311 Improve shifts' long names (#230)

* TASK-312 Omit header line of imported file when parsing  (#232)

* TASK-198 Make exported sheet printable (#229)

* xlxs update

* xlxs update

* xlxs update

* xlxs update

* xlxs update

* TASK-308 Evaluate working time issues on frontend (#233)

* Adds worker info on new month

* Moves errors from backend to frontend

Co-authored-by: Paweł Renc <[email protected]>

* TASK-313 Add colors in worker's calendar (#234)

* xlxs update

* xlxs update

* xlxs update

* xlxs update

* xlxs update

* workers-calendar style update

Co-authored-by: Paweł Renc <[email protected]>

* TASK-316 Fix long name for RPN  (#236)

* TASK-315 Fix request when reporting issue (#237)

Co-authored-by: Paweł Renc <[email protected]>

* TASK-310 Fix problem with copying month with newly added workers (#235)

* Disable copying from next month

* Save actual revision when saving primary
Create new dict with only based shifts workers
Add worker to current and next month

* Remove unnecessary state spread from reducers with UPDATE_WORKER_INFO

Co-authored-by: Paweł Renc <[email protected]>

* TASK-300 Add no schedule image as link (don't merge) (#228)

* Revert "TASK-308 Evaluate working time issues on frontend (#233)" (#240)

This reverts commit 63cbca9.

* Revert "TASK-300 Add no schedule image as link (don't merge) (#228)" (#241)

This reverts commit 6ee577d.

* Adds link to help page (#243)

* Moves overtime and undertime error calculation on frontend (#246)

* TASK-292 Integrate redux in sentry (#245)

* Adds worker update (#247)

* TASK-320 Set default number of children to 20 (#250)

* TASK-259 Resolve PouchDB update error (#244)

* Show errors in console, fix update bug

* Mute eslint warning

* Resolve db update conflict, disable error printing when doc is not found

* TASK-340 Remove unused logic for copying from next month (#248)

Co-authored-by: Bohdan <[email protected]>

* TASK-250 Add semantic release library (#242)

* Add semantic versioning library

* Remove package-lock update

* Sync package-lock

* Updates package-lock

* Updates package-lock.json

Co-authored-by: Bohdan Forostianyi <[email protected]>

* perf(App) Release v1.0.0 (#252)

Co-authored-by: Maciej Bielech <[email protected]>
Co-authored-by: Sig00rd <[email protected]>
Co-authored-by: Bohdan <[email protected]>
Co-authored-by: Bohdan Forostianyi <[email protected]>
Co-authored-by: Tomasz Pęcak <[email protected]>
Co-authored-by: Szymon Fugas <[email protected]>
Co-authored-by: Paulina <[email protected]>
Co-authored-by: Maciej Bielech <[email protected]>
Co-authored-by: KarolinaFilipiuk <[email protected]>
Co-authored-by: Dmytro <[email protected]>
Co-authored-by: Vyacheslav Trushkov <[email protected]>
Co-authored-by: Ehevi <[email protected]>
Co-authored-by: Dushess0 <[email protected]>
Co-authored-by: Ehevi <[email protected]>
@prenc prenc mentioned this pull request Mar 22, 2021
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.

5 participants