Skip to content

Commit

Permalink
Fix/353 vlastni prohlidky pridat prohlidku (#423)
Browse files Browse the repository at this point in the history
* Develop (#408)

* SelfExamination Skin done.

Adding new Self Examination Skin.
Adding new content pauldrons.
Adding new texts.

* Changing Flutter version of backend-tests.yaml etc.

* Ordering selfExaminations.

* BE Integration test fixed.

Adding test for self examination skin.
Fixing lint.
Fixing FE self examination category.

* Fixing lint.

* Fixing github test

* Changing layout of settings, adding setting account.

User form edited,
ExpanseTile for user data and notifications added.
Donate buton working.
TODO:
 1) Create notification screen
 2) Create notification shedule tasks
 3) Create notification switch in notification settings.

* Fix merge

* Delete ._Runner.xcodeproj

* Adding new screen donate page

TODO: Change placeholder image.
Edited notification switch for turning on/off donate notification.
Donate notification is turned for device not for user.

* Fixing Tests.

* Fixing lints. Adding functionality for opening settings.

* Donate Ilustration image is added to donate page.

Creating donate utils to handle function for showing donatepage.

* fix analyzer.

* Fixing PR.

* Fixing analyzer.

* Renaming file.

* fix/badge_brzy_vyprsi_rozbita_obrazovka (#364)
oprava zobrazovani 2 textu pred vyprsenim badge, oprava zobrazovani stavu vyprseni a ziskani u badge.
(https://github.com/Loono-cz/loono-tasks/issues/6)

* Adding new form for custom examinations.

Adding new form for custom examinations.
Adding new screens.
Adding new widget for customTextInput.
TODO: FE with BE.
TODO: controll inputs.

* Adding error to custom_text_field.

* Addint error messaage into others text input fields

* Adding Translate.

* Adding prepossition Dativ translations.

Adding preposition Dativ translations.
Adding input validation.
Removing TOKS and VENERAL_SISEASES

* Adding function for transform year to month

* Editing examination detail for once examinaiton.

* Edditing examination detail for periodical Custom Examination.

* Fix: Logging with google account.

* fixing stuff for creating custom examinations.

* Přidaní překladů nových prohlídek - nomativ, genitiv, dativ

* Some fixes.

TODO: Control task and figma.

* Fixing bugs.

* Fixing date validation.

* fixing but with date interval instead of month was year.

* Fixing nonperiodic exam has order button not add to calendar.

* Fixing buttons not showing.

* Changing card layouts

TODO: Sorting.

* Fixing lint

* Fixing lint

* feat: examination action menu

* Fixing tests.

* Fixing test.

* feat: examination edit flow wip

* FIX: Show month right now.

FIX: creating exams ?
FIX: Show month right now.

TODO: Razeni vlastnich prohlidek...

* Fixing desc. of award in custom exam detail.

* lint and format fix.

* analyze test fix.

* Fixing lateinit examinaitonActionTypeUnion.

* Fixing creating examination.

* Fix: Disposable Exam now showing add to calendar button.

* Adding modal for disposable examination Delete Exam.

TODO: Connect with BE api.

* Adding streambuilder of calendar.

* Adding flow for editing frequency of exam and last visit date.

TODO: Je to spravne ?

* feat: examination edit flow UI wip

* Fixing when to show last examination picker.

* Fixing some task in comment on Github.

* Fix note is enabled when nevim is checked

Poznámka k návšteve - pri zaškrtnutí checkboxu "Zatím nevím" by malo byť pole pre poznámku disabled. V pripade, že som najprv vyplnila dátum a následne zaškrtla "Zatím nevím" pole pre poznámku ostalo aktívne.

* Fixing Functional stuff.

* fixing selectbox visual

Select boxy - upravit ikonu - namiesto šipky by mal byť chevron + ikona select boxu, ktorý bol rozkliknutý ako posledný má inú farbu/je zvýraznená - mala by mať default farbu ako ostatné neaktívne select boxy.

* Adding Divider.

* Fixing visual task from Github.

* Fixing functional stuff.

 Na kartách povinných prohlídek je uvedený nesprávny typ vyšetření - malo by tam byť "Preventivní prohlídka".

* Adding placeholder into sheet overlay exam.

Fixing bugs from comment section.

* Adding text for exams count.

* Geting new loono api

* Edit term of regularly examination.

* Edit date of exam is added to default and custom exams.

* TODO Unset comment after BE delete exam working.

* merge

* Fix intervals in default examinatoins.

* Done

* Removing old code.

* Detail done.

* fix merge.

* Examination sorting on main screen is done.

* Padding of text in specialist listview builder.

* Refactor function in examinations service.

* add interval check condition

* Fix for choosing date by interval.

* fix: no internet connection flushBar fix by [email protected] (#374)

* fix: no internet connection flushBar fix by [email protected]

* feat: Connectivity result condition opt

* Fixing lint

* fix analyze.

* fix merge.

* Fixing analyze

Co-authored-by: Petr Noga <[email protected]>

* Fixing new date in future.

* Fixing showing bad date in detail and examination card.

* Fix/nelze potvrdit absolovane samovysetreni#361 (#376)

* fix/nelze_potvrdit_absolovane_samovysetreni (#361)
tlacitko "Vysetril jsem se" je kliknutelne

* Fixing format.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Fix/feedback_button_zakryva_jmeno_na_homescreen (#359) (#377)

posunuti jmena a bodu dolu, aby se nekrylo s tlacitkem

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

* Fixing bugs.

zmizelo někam "mám/nemám lékaře" v defaultních prohlídkách - při rozkliku nesplněných prohlídek, když se chci objednat, správně by se mě aplikace měla zeptat, zda mám či nemám lékaře - pokud nemám, měla by mě odkázat na Najít lékaře s vyhledáním konkrétní specializace

při úpravě naplánovaného termínu ( i když je pozdější než ten původně plánovaný) mi píše aplikace "ještě není čas se objednat"

nedá se přidat ani upravit poznámka
nelze upravovat termín první prohlídky

na main screen porhlídky mají napsané, že jsou Preventivní, v detailu ale pak Vyšetření, což je trochu matoucí - neměly by to být i v detailu Preventivní prohlídky?

* Examination type duplicity remove (#380)

* Fix.

- nefunguje přidání druhé vlastní prohlídky u Zubaře - píše, že se "něco nepovedlo".
- v rozkliku detailu prohlídky se nezobrazuje uvedená poznámka:Při přidání poznámky k vlastní prohlídce se objeví chybová hláška, že není připojení k internetu (viz klip)/
- pokud zadam datum na formulari a pak zaskrtnu nevim, datum se nesmaze, ani nelze manuane smazat
- v typu vyšetření je zvláštní čára dole viz screenshot

* Merge fix.

* removing second break; merge fix.

* fix: unused variable

* Done bug fixing. (#385)

* Refactor loono strings.

* Fix: Vlastní prohlídky - Přidat prohlídku - FE#353

* Feat/souhlas gdpr and newsletters#379 (#383)

* feat/souhlas_GDPR_and_Newsletters (#379)
přidání kroku (checkbox pro souhlas s GDPR a pro posílání newsletterů) do registračního formuláře
(https://github.com/Loono-cz/loono-tasks/issues/94)

* #379 newsletter option is saving in account

* Fixing format and analyze tests.

* Fix formater

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Fix/357 main screen (#384)

* feat/souhlas_GDPR_and_Newsletters (#379)
přidání kroku (checkbox pro souhlas s GDPR a pro posílání newsletterů) do registračního formuláře
(https://github.com/Loono-cz/loono-tasks/issues/94)

* #379 newsletter option is saving in account

* listener to true = now writen logic for disable add button works

* sort update for null values

* git tests fix

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Format.

* Fix/353 vlastni prohlidky pridat prohlidku (#389)

* Develop (#386)

* SelfExamination Skin done.

Adding new Self Examination Skin.
Adding new content pauldrons.
Adding new texts.

* Changing Flutter version of backend-tests.yaml etc.

* Ordering selfExaminations.

* BE Integration test fixed.

Adding test for self examination skin.
Fixing lint.
Fixing FE self examination category.

* Fixing lint.

* Fixing github test

* Changing layout of settings, adding setting account.

User form edited,
ExpanseTile for user data and notifications added.
Donate buton working.
TODO:
 1) Create notification screen
 2) Create notification shedule tasks
 3) Create notification switch in notification settings.

* Fix merge

* Delete ._Runner.xcodeproj

* Adding new screen donate page

TODO: Change placeholder image.
Edited notification switch for turning on/off donate notification.
Donate notification is turned for device not for user.

* Fixing Tests.

* Fixing lints. Adding functionality for opening settings.

* Donate Ilustration image is added to donate page.

Creating donate utils to handle function for showing donatepage.

* fix analyzer.

* Fixing PR.

* Fixing analyzer.

* Renaming file.

* fix/badge_brzy_vyprsi_rozbita_obrazovka (#364)
oprava zobrazovani 2 textu pred vyprsenim badge, oprava zobrazovani stavu vyprseni a ziskani u badge.
(https://github.com/Loono-cz/loono-tasks/issues/6)

* Adding new form for custom examinations.

Adding new form for custom examinations.
Adding new screens.
Adding new widget for customTextInput.
TODO: FE with BE.
TODO: controll inputs.

* Adding error to custom_text_field.

* Addint error messaage into others text input fields

* Adding Translate.

* Adding prepossition Dativ translations.

Adding preposition Dativ translations.
Adding input validation.
Removing TOKS and VENERAL_SISEASES

* Adding function for transform year to month

* Editing examination detail for once examinaiton.

* Edditing examination detail for periodical Custom Examination.

* Fix: Logging with google account.

* fixing stuff for creating custom examinations.

* Přidaní překladů nových prohlídek - nomativ, genitiv, dativ

* Some fixes.

TODO: Control task and figma.

* Fixing bugs.

* Fixing date validation.

* fixing but with date interval instead of month was year.

* Fixing nonperiodic exam has order button not add to calendar.

* Fixing buttons not showing.

* Changing card layouts

TODO: Sorting.

* Fixing lint

* Fixing lint

* feat: examination action menu

* Fixing tests.

* Fixing test.

* feat: examination edit flow wip

* FIX: Show month right now.

FIX: creating exams ?
FIX: Show month right now.

TODO: Razeni vlastnich prohlidek...

* Fixing desc. of award in custom exam detail.

* lint and format fix.

* analyze test fix.

* Fixing lateinit examinaitonActionTypeUnion.

* Fixing creating examination.

* Fix: Disposable Exam now showing add to calendar button.

* Adding modal for disposable examination Delete Exam.

TODO: Connect with BE api.

* Adding streambuilder of calendar.

* Adding flow for editing frequency of exam and last visit date.

TODO: Je to spravne ?

* feat: examination edit flow UI wip

* Fixing when to show last examination picker.

* Fixing some task in comment on Github.

* Fix note is enabled when nevim is checked

Poznámka k návšteve - pri zaškrtnutí checkboxu "Zatím nevím" by malo byť pole pre poznámku disabled. V pripade, že som najprv vyplnila dátum a následne zaškrtla "Zatím nevím" pole pre poznámku ostalo aktívne.

* Fixing Functional stuff.

* fixing selectbox visual

Select boxy - upravit ikonu - namiesto šipky by mal byť chevron + ikona select boxu, ktorý bol rozkliknutý ako posledný má inú farbu/je zvýraznená - mala by mať default farbu ako ostatné neaktívne select boxy.

* Adding Divider.

* Fixing visual task from Github.

* Fixing functional stuff.

 Na kartách povinných prohlídek je uvedený nesprávny typ vyšetření - malo by tam byť "Preventivní prohlídka".

* Adding placeholder into sheet overlay exam.

Fixing bugs from comment section.

* Adding text for exams count.

* Geting new loono api

* Edit term of regularly examination.

* Edit date of exam is added to default and custom exams.

* TODO Unset comment after BE delete exam working.

* merge

* Fix intervals in default examinatoins.

* Done

* Removing old code.

* Detail done.

* fix merge.

* Examination sorting on main screen is done.

* Padding of text in specialist listview builder.

* Refactor function in examinations service.

* add interval check condition

* Fix for choosing date by interval.

* fix: no internet connection flushBar fix by [email protected] (#374)

* fix: no internet connection flushBar fix by [email protected]

* feat: Connectivity result condition opt

* Fixing lint

* fix analyze.

* fix merge.

* Fixing analyze

Co-authored-by: Petr Noga <[email protected]>

* Fixing new date in future.

* Fixing showing bad date in detail and examination card.

* Fix/nelze potvrdit absolovane samovysetreni#361 (#376)

* fix/nelze_potvrdit_absolovane_samovysetreni (#361)
tlacitko "Vysetril jsem se" je kliknutelne

* Fixing format.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Fix/feedback_button_zakryva_jmeno_na_homescreen (#359) (#377)

posunuti jmena a bodu dolu, aby se nekrylo s tlacitkem

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

* Fixing bugs.

zmizelo někam "mám/nemám lékaře" v defaultních prohlídkách - při rozkliku nesplněných prohlídek, když se chci objednat, správně by se mě aplikace měla zeptat, zda mám či nemám lékaře - pokud nemám, měla by mě odkázat na Najít lékaře s vyhledáním konkrétní specializace

při úpravě naplánovaného termínu ( i když je pozdější než ten původně plánovaný) mi píše aplikace "ještě není čas se objednat"

nedá se přidat ani upravit poznámka
nelze upravovat termín první prohlídky

na main screen porhlídky mají napsané, že jsou Preventivní, v detailu ale pak Vyšetření, což je trochu matoucí - neměly by to být i v detailu Preventivní prohlídky?

* Examination type duplicity remove (#380)

* Fix.

- nefunguje přidání druhé vlastní prohlídky u Zubaře - píše, že se "něco nepovedlo".
- v rozkliku detailu prohlídky se nezobrazuje uvedená poznámka:Při přidání poznámky k vlastní prohlídce se objeví chybová hláška, že není připojení k internetu (viz klip)/
- pokud zadam datum na formulari a pak zaskrtnu nevim, datum se nesmaze, ani nelze manuane smazat
- v typu vyšetření je zvláštní čára dole viz screenshot

* Merge fix.

* removing second break; merge fix.

* fix: unused variable

* Done bug fixing. (#385)

* Refactor loono strings.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Jakub Smolik <[email protected]>
Co-authored-by: Jakub Smolík <[email protected]>
Co-authored-by: Denis Ulč <[email protected]>
Co-authored-by: smolikjacgi <[email protected]>
Co-authored-by: StepanDrozdek <[email protected]>
Co-authored-by: Jan Bláha <[email protected]>

* Fix: Vlastní prohlídky - Přidat prohlídku - FE#353

* Format.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Jakub Smolik <[email protected]>
Co-authored-by: Jakub Smolík <[email protected]>
Co-authored-by: Denis Ulč <[email protected]>
Co-authored-by: smolikjacgi <[email protected]>
Co-authored-by: StepanDrozdek <[email protected]>
Co-authored-by: Jan Bláha <[email protected]>

* Fix for title of custom badges.

* Feat/356 update (#392)

* feat: post examination note update wip

* fix: date/time picker validation w/[email protected]

* fix: time validation fix

* feat: edit examination note final

* feat: edit exam note icon

* fix: format

* fix: datepicker validation fix

* Fix/#355 vlastni prohlidky upravit prohlidku (#393)

* Fix

Fix:
divna hlaska neni mozne zadat prohlidku
 v detailu prohlídky se ukládá jiné datum, než požadované (zadávám 8.12.2022 a aplikace si ukládá 7.12.2022) - prohlídka se následně ani neuloží (viz druhý klip)
nelze upravit termín první prohlídky, přijde hláška, že se "neco nepovedlo" a prohlídka se neuloží

* Fix Done.

* Feat/pridani loga cgi #372 (#390)

* feat/pridani_loga_cgi (#372)
přidáno logo na welcomescreen (first time use splashscreen ve figmě)
TODO: přidání na splashscreen

* feat/pridani_loga_cgi (#372)
přidáno logo na welcomescreen (first time use splashscreen ve figmě)
přidání loga na splashscreen
oprava testů

* fix: logos to assets

* fix: analyze, format

Co-authored-by: Jakub Smolík <[email protected]>

* Fixing update examinations.

* Edit for PR. (#395)

* Edit for PR.

* fix: problems

* fix merge.

Co-authored-by: Jakub Smolík <[email protected]>

* Update examination_detail.dart (#396)

* Update examination_detail.dart

* fix: format

Co-authored-by: Jakub Smolík <[email protected]>

* fix: delete examination; fix: flushbar memory leak (#397)

* fix: last doxtor visit datepicker title and validation (#400)

* Fix/souhlas gdpr and newsletters#379 (#401)

* feat/souhlas_GDPR_and_Newsletters (#379)
přidání kroku (checkbox pro souhlas s GDPR a pro posílání newsletterů) do registračního formuláře
(https://github.com/Loono-cz/loono-tasks/issues/94)

* feat/souhlas_GDPR_and_Newsletters (#379)
oprava překlepu v textaci
(https://github.com/Loono-cz/loono-tasks/issues/94)

* Oprava zobrazování success ikony (https://github.com/Loono-cz/loono-tasks/issues/23) (#387)

Co-authored-by: Jakub Smolík <[email protected]>

* Update notification_service.dart (#402)

* fix/pri_vyhledani_lekare_uvedena_spatna_specializace (#365) (#388)

* fix/pri_vyhledani_lekare_uvedena_spatna_specializace (#365)
opraveno po kliknutí na "Nemám lékaře" při objednávání se na prohlídku se otevře mapa s lékaři se specializací na prohlídku.
(https://github.com/Loono-cz/loono-tasks/issues/79)

* fix: typo

* fox: format

* fix: format

Co-authored-by: Jakub Smolík <[email protected]>

* Fix/#355 vlastni prohlidky upravit prohlidku (#399)

* Fix

Fix:
divna hlaska neni mozne zadat prohlidku
 v detailu prohlídky se ukládá jiné datum, než požadované (zadávám 8.12.2022 a aplikace si ukládá 7.12.2022) - prohlídka se následně ani neuloží (viz druhý klip)
nelze upravit termín první prohlídky, přijde hláška, že se "neco nepovedlo" a prohlídka se neuloží

* Fix Done.

* Keyboard handling.

Handling keyboard on examiantion detail, create new exam, custom_exam_form

* Adding controller into examiantion_detail.dart

* Edit Exam term. Fix faq and badges not showing.

* Adding categorizedExam into edit examination modal.

* removing print.

* fix bug.

nefunguje zmena intervalu u vlastnich prohlidek

* Fixing edit frequency of exam.

* Fix note.

* Fixing PR comments.

* fix: no connecttion flushbar fix (#403)

* Fixing routing, onboarding route. (#406)

* Fixing routing, onboarding route.

* Fix analyze.

* fix: donate notification state was not remembered after log out/delete acc (#405)

* Fix/najit lékare search by address does not search#368 (#375)

* fix/najit_lékare_search_by_address_does_not_search_when_cislo_popisne_filled_in (#368)
oprava vyhledávání pomocí čísla popisného
(https://github.com/Loono-cz/loono-tasks/issues/15)

* fix: analyze

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

* Fixing 354 time is in past missing validation. (#407)

* Fixing 354 time must be in past.

* TODO Unwrap

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Jakub Smolik <[email protected]>
Co-authored-by: Jakub Smolík <[email protected]>
Co-authored-by: Denis Ulč <[email protected]>
Co-authored-by: smolikjacgi <[email protected]>
Co-authored-by: StepanDrozdek <[email protected]>
Co-authored-by: Jan Bláha <[email protected]>
Co-authored-by: Marek Škořepa <[email protected]>

* Develop (#416)

* SelfExamination Skin done.

Adding new Self Examination Skin.
Adding new content pauldrons.
Adding new texts.

* Changing Flutter version of backend-tests.yaml etc.

* Ordering selfExaminations.

* BE Integration test fixed.

Adding test for self examination skin.
Fixing lint.
Fixing FE self examination category.

* Fixing lint.

* Fixing github test

* Changing layout of settings, adding setting account.

User form edited,
ExpanseTile for user data and notifications added.
Donate buton working.
TODO:
 1) Create notification screen
 2) Create notification shedule tasks
 3) Create notification switch in notification settings.

* Fix merge

* Delete ._Runner.xcodeproj

* Adding new screen donate page

TODO: Change placeholder image.
Edited notification switch for turning on/off donate notification.
Donate notification is turned for device not for user.

* Fixing Tests.

* Fixing lints. Adding functionality for opening settings.

* Donate Ilustration image is added to donate page.

Creating donate utils to handle function for showing donatepage.

* fix analyzer.

* Fixing PR.

* Fixing analyzer.

* Renaming file.

* fix/badge_brzy_vyprsi_rozbita_obrazovka (#364)
oprava zobrazovani 2 textu pred vyprsenim badge, oprava zobrazovani stavu vyprseni a ziskani u badge.
(https://github.com/Loono-cz/loono-tasks/issues/6)

* Adding new form for custom examinations.

Adding new form for custom examinations.
Adding new screens.
Adding new widget for customTextInput.
TODO: FE with BE.
TODO: controll inputs.

* Adding error to custom_text_field.

* Addint error messaage into others text input fields

* Adding Translate.

* Adding prepossition Dativ translations.

Adding preposition Dativ translations.
Adding input validation.
Removing TOKS and VENERAL_SISEASES

* Adding function for transform year to month

* Editing examination detail for once examinaiton.

* Edditing examination detail for periodical Custom Examination.

* Fix: Logging with google account.

* fixing stuff for creating custom examinations.

* Přidaní překladů nových prohlídek - nomativ, genitiv, dativ

* Some fixes.

TODO: Control task and figma.

* Fixing bugs.

* Fixing date validation.

* fixing but with date interval instead of month was year.

* Fixing nonperiodic exam has order button not add to calendar.

* Fixing buttons not showing.

* Changing card layouts

TODO: Sorting.

* Fixing lint

* Fixing lint

* feat: examination action menu

* Fixing tests.

* Fixing test.

* feat: examination edit flow wip

* FIX: Show month right now.

FIX: creating exams ?
FIX: Show month right now.

TODO: Razeni vlastnich prohlidek...

* Fixing desc. of award in custom exam detail.

* lint and format fix.

* analyze test fix.

* Fixing lateinit examinaitonActionTypeUnion.

* Fixing creating examination.

* Fix: Disposable Exam now showing add to calendar button.

* Adding modal for disposable examination Delete Exam.

TODO: Connect with BE api.

* Adding streambuilder of calendar.

* Adding flow for editing frequency of exam and last visit date.

TODO: Je to spravne ?

* feat: examination edit flow UI wip

* Fixing when to show last examination picker.

* Fixing some task in comment on Github.

* Fix note is enabled when nevim is checked

Poznámka k návšteve - pri zaškrtnutí checkboxu "Zatím nevím" by malo byť pole pre poznámku disabled. V pripade, že som najprv vyplnila dátum a následne zaškrtla "Zatím nevím" pole pre poznámku ostalo aktívne.

* Fixing Functional stuff.

* fixing selectbox visual

Select boxy - upravit ikonu - namiesto šipky by mal byť chevron + ikona select boxu, ktorý bol rozkliknutý ako posledný má inú farbu/je zvýraznená - mala by mať default farbu ako ostatné neaktívne select boxy.

* Adding Divider.

* Fixing visual task from Github.

* Fixing functional stuff.

 Na kartách povinných prohlídek je uvedený nesprávny typ vyšetření - malo by tam byť "Preventivní prohlídka".

* Adding placeholder into sheet overlay exam.

Fixing bugs from comment section.

* Adding text for exams count.

* Geting new loono api

* Edit term of regularly examination.

* Edit date of exam is added to default and custom exams.

* TODO Unset comment after BE delete exam working.

* merge

* Fix intervals in default examinatoins.

* Done

* Removing old code.

* Detail done.

* fix merge.

* Examination sorting on main screen is done.

* Padding of text in specialist listview builder.

* Refactor function in examinations service.

* add interval check condition

* Fix for choosing date by interval.

* fix: no internet connection flushBar fix by [email protected] (#374)

* fix: no internet connection flushBar fix by [email protected]

* feat: Connectivity result condition opt

* Fixing lint

* fix analyze.

* fix merge.

* Fixing analyze

Co-authored-by: Petr Noga <[email protected]>

* Fixing new date in future.

* Fixing showing bad date in detail and examination card.

* Fix/nelze potvrdit absolovane samovysetreni#361 (#376)

* fix/nelze_potvrdit_absolovane_samovysetreni (#361)
tlacitko "Vysetril jsem se" je kliknutelne

* Fixing format.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Fix/feedback_button_zakryva_jmeno_na_homescreen (#359) (#377)

posunuti jmena a bodu dolu, aby se nekrylo s tlacitkem

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

* Fixing bugs.

zmizelo někam "mám/nemám lékaře" v defaultních prohlídkách - při rozkliku nesplněných prohlídek, když se chci objednat, správně by se mě aplikace měla zeptat, zda mám či nemám lékaře - pokud nemám, měla by mě odkázat na Najít lékaře s vyhledáním konkrétní specializace

při úpravě naplánovaného termínu ( i když je pozdější než ten původně plánovaný) mi píše aplikace "ještě není čas se objednat"

nedá se přidat ani upravit poznámka
nelze upravovat termín první prohlídky

na main screen porhlídky mají napsané, že jsou Preventivní, v detailu ale pak Vyšetření, což je trochu matoucí - neměly by to být i v detailu Preventivní prohlídky?

* Examination type duplicity remove (#380)

* Fix.

- nefunguje přidání druhé vlastní prohlídky u Zubaře - píše, že se "něco nepovedlo".
- v rozkliku detailu prohlídky se nezobrazuje uvedená poznámka:Při přidání poznámky k vlastní prohlídce se objeví chybová hláška, že není připojení k internetu (viz klip)/
- pokud zadam datum na formulari a pak zaskrtnu nevim, datum se nesmaze, ani nelze manuane smazat
- v typu vyšetření je zvláštní čára dole viz screenshot

* Merge fix.

* removing second break; merge fix.

* fix: unused variable

* Done bug fixing. (#385)

* Refactor loono strings.

* Fix: Vlastní prohlídky - Přidat prohlídku - FE#353

* Feat/souhlas gdpr and newsletters#379 (#383)

* feat/souhlas_GDPR_and_Newsletters (#379)
přidání kroku (checkbox pro souhlas s GDPR a pro posílání newsletterů) do registračního formuláře
(https://github.com/Loono-cz/loono-tasks/issues/94)

* #379 newsletter option is saving in account

* Fixing format and analyze tests.

* Fix formater

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Fix/357 main screen (#384)

* feat/souhlas_GDPR_and_Newsletters (#379)
přidání kroku (checkbox pro souhlas s GDPR a pro posílání newsletterů) do registračního formuláře
(https://github.com/Loono-cz/loono-tasks/issues/94)

* #379 newsletter option is saving in account

* listener to true = now writen logic for disable add button works

* sort update for null values

* git tests fix

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Format.

* Fix/353 vlastni prohlidky pridat prohlidku (#389)

* Develop (#386)

* SelfExamination Skin done.

Adding new Self Examination Skin.
Adding new content pauldrons.
Adding new texts.

* Changing Flutter version of backend-tests.yaml etc.

* Ordering selfExaminations.

* BE Integration test fixed.

Adding test for self examination skin.
Fixing lint.
Fixing FE self examination category.

* Fixing lint.

* Fixing github test

* Changing layout of settings, adding setting account.

User form edited,
ExpanseTile for user data and notifications added.
Donate buton working.
TODO:
 1) Create notification screen
 2) Create notification shedule tasks
 3) Create notification switch in notification settings.

* Fix merge

* Delete ._Runner.xcodeproj

* Adding new screen donate page

TODO: Change placeholder image.
Edited notification switch for turning on/off donate notification.
Donate notification is turned for device not for user.

* Fixing Tests.

* Fixing lints. Adding functionality for opening settings.

* Donate Ilustration image is added to donate page.

Creating donate utils to handle function for showing donatepage.

* fix analyzer.

* Fixing PR.

* Fixing analyzer.

* Renaming file.

* fix/badge_brzy_vyprsi_rozbita_obrazovka (#364)
oprava zobrazovani 2 textu pred vyprsenim badge, oprava zobrazovani stavu vyprseni a ziskani u badge.
(https://github.com/Loono-cz/loono-tasks/issues/6)

* Adding new form for custom examinations.

Adding new form for custom examinations.
Adding new screens.
Adding new widget for customTextInput.
TODO: FE with BE.
TODO: controll inputs.

* Adding error to custom_text_field.

* Addint error messaage into others text input fields

* Adding Translate.

* Adding prepossition Dativ translations.

Adding preposition Dativ translations.
Adding input validation.
Removing TOKS and VENERAL_SISEASES

* Adding function for transform year to month

* Editing examination detail for once examinaiton.

* Edditing examination detail for periodical Custom Examination.

* Fix: Logging with google account.

* fixing stuff for creating custom examinations.

* Přidaní překladů nových prohlídek - nomativ, genitiv, dativ

* Some fixes.

TODO: Control task and figma.

* Fixing bugs.

* Fixing date validation.

* fixing but with date interval instead of month was year.

* Fixing nonperiodic exam has order button not add to calendar.

* Fixing buttons not showing.

* Changing card layouts

TODO: Sorting.

* Fixing lint

* Fixing lint

* feat: examination action menu

* Fixing tests.

* Fixing test.

* feat: examination edit flow wip

* FIX: Show month right now.

FIX: creating exams ?
FIX: Show month right now.

TODO: Razeni vlastnich prohlidek...

* Fixing desc. of award in custom exam detail.

* lint and format fix.

* analyze test fix.

* Fixing lateinit examinaitonActionTypeUnion.

* Fixing creating examination.

* Fix: Disposable Exam now showing add to calendar button.

* Adding modal for disposable examination Delete Exam.

TODO: Connect with BE api.

* Adding streambuilder of calendar.

* Adding flow for editing frequency of exam and last visit date.

TODO: Je to spravne ?

* feat: examination edit flow UI wip

* Fixing when to show last examination picker.

* Fixing some task in comment on Github.

* Fix note is enabled when nevim is checked

Poznámka k návšteve - pri zaškrtnutí checkboxu "Zatím nevím" by malo byť pole pre poznámku disabled. V pripade, že som najprv vyplnila dátum a následne zaškrtla "Zatím nevím" pole pre poznámku ostalo aktívne.

* Fixing Functional stuff.

* fixing selectbox visual

Select boxy - upravit ikonu - namiesto šipky by mal byť chevron + ikona select boxu, ktorý bol rozkliknutý ako posledný má inú farbu/je zvýraznená - mala by mať default farbu ako ostatné neaktívne select boxy.

* Adding Divider.

* Fixing visual task from Github.

* Fixing functional stuff.

 Na kartách povinných prohlídek je uvedený nesprávny typ vyšetření - malo by tam byť "Preventivní prohlídka".

* Adding placeholder into sheet overlay exam.

Fixing bugs from comment section.

* Adding text for exams count.

* Geting new loono api

* Edit term of regularly examination.

* Edit date of exam is added to default and custom exams.

* TODO Unset comment after BE delete exam working.

* merge

* Fix intervals in default examinatoins.

* Done

* Removing old code.

* Detail done.

* fix merge.

* Examination sorting on main screen is done.

* Padding of text in specialist listview builder.

* Refactor function in examinations service.

* add interval check condition

* Fix for choosing date by interval.

* fix: no internet connection flushBar fix by [email protected] (#374)

* fix: no internet connection flushBar fix by [email protected]

* feat: Connectivity result condition opt

* Fixing lint

* fix analyze.

* fix merge.

* Fixing analyze

Co-authored-by: Petr Noga <[email protected]>

* Fixing new date in future.

* Fixing showing bad date in detail and examination card.

* Fix/nelze potvrdit absolovane samovysetreni#361 (#376)

* fix/nelze_potvrdit_absolovane_samovysetreni (#361)
tlacitko "Vysetril jsem se" je kliknutelne

* Fixing format.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Fix/feedback_button_zakryva_jmeno_na_homescreen (#359) (#377)

posunuti jmena a bodu dolu, aby se nekrylo s tlacitkem

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

* Fixing bugs.

zmizelo někam "mám/nemám lékaře" v defaultních prohlídkách - při rozkliku nesplněných prohlídek, když se chci objednat, správně by se mě aplikace měla zeptat, zda mám či nemám lékaře - pokud nemám, měla by mě odkázat na Najít lékaře s vyhledáním konkrétní specializace

při úpravě naplánovaného termínu ( i když je pozdější než ten původně plánovaný) mi píše aplikace "ještě není čas se objednat"

nedá se přidat ani upravit poznámka
nelze upravovat termín první prohlídky

na main screen porhlídky mají napsané, že jsou Preventivní, v detailu ale pak Vyšetření, což je trochu matoucí - neměly by to být i v detailu Preventivní prohlídky?

* Examination type duplicity remove (#380)

* Fix.

- nefunguje přidání druhé vlastní prohlídky u Zubaře - píše, že se "něco nepovedlo".
- v rozkliku detailu prohlídky se nezobrazuje uvedená poznámka:Při přidání poznámky k vlastní prohlídce se objeví chybová hláška, že není připojení k internetu (viz klip)/
- pokud zadam datum na formulari a pak zaskrtnu nevim, datum se nesmaze, ani nelze manuane smazat
- v typu vyšetření je zvláštní čára dole viz screenshot

* Merge fix.

* removing second break; merge fix.

* fix: unused variable

* Done bug fixing. (#385)

* Refactor loono strings.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Jakub Smolik <[email protected]>
Co-authored-by: Jakub Smolík <[email protected]>
Co-authored-by: Denis Ulč <[email protected]>
Co-authored-by: smolikjacgi <[email protected]>
Co-authored-by: StepanDrozdek <[email protected]>
Co-authored-by: Jan Bláha <[email protected]>

* Fix: Vlastní prohlídky - Přidat prohlídku - FE#353

* Format.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Jakub Smolik <[email protected]>
Co-authored-by: Jakub Smolík <[email protected]>
Co-authored-by: Denis Ulč <[email protected]>
Co-authored-by: smolikjacgi <[email protected]>
Co-authored-by: StepanDrozdek <[email protected]>
Co-authored-by: Jan Bláha <[email protected]>

* Fix for title of custom badges.

* Feat/356 update (#392)

* feat: post examination note update wip

* fix: date/time picker validation w/[email protected]

* fix: time validation fix

* feat: edit examination note final

* feat: edit exam note icon

* fix: format

* fix: datepicker validation fix

* Fix/#355 vlastni prohlidky upravit prohlidku (#393)

* Fix

Fix:
divna hlaska neni mozne zadat prohlidku
 v detailu prohlídky se ukládá jiné datum, než požadované (zadávám 8.12.2022 a aplikace si ukládá 7.12.2022) - prohlídka se následně ani neuloží (viz druhý klip)
nelze upravit termín první prohlídky, přijde hláška, že se "neco nepovedlo" a prohlídka se neuloží

* Fix Done.

* Feat/pridani loga cgi #372 (#390)

* feat/pridani_loga_cgi (#372)
přidáno logo na welcomescreen (first time use splashscreen ve figmě)
TODO: přidání na splashscreen

* feat/pridani_loga_cgi (#372)
přidáno logo na welcomescreen (first time use splashscreen ve figmě)
přidání loga na splashscreen
oprava testů

* fix: logos to assets

* fix: analyze, format

Co-authored-by: Jakub Smolík <[email protected]>

* Fixing update examinations.

* Edit for PR. (#395)

* Edit for PR.

* fix: problems

* fix merge.

Co-authored-by: Jakub Smolík <[email protected]>

* Update examination_detail.dart (#396)

* Update examination_detail.dart

* fix: format

Co-authored-by: Jakub Smolík <[email protected]>

* fix: delete examination; fix: flushbar memory leak (#397)

* fix: last doxtor visit datepicker title and validation (#400)

* Fix/souhlas gdpr and newsletters#379 (#401)

* feat/souhlas_GDPR_and_Newsletters (#379)
přidání kroku (checkbox pro souhlas s GDPR a pro posílání newsletterů) do registračního formuláře
(https://github.com/Loono-cz/loono-tasks/issues/94)

* feat/souhlas_GDPR_and_Newsletters (#379)
oprava překlepu v textaci
(https://github.com/Loono-cz/loono-tasks/issues/94)

* Oprava zobrazování success ikony (https://github.com/Loono-cz/loono-tasks/issues/23) (#387)

Co-authored-by: Jakub Smolík <[email protected]>

* Update notification_service.dart (#402)

* fix/pri_vyhledani_lekare_uvedena_spatna_specializace (#365) (#388)

* fix/pri_vyhledani_lekare_uvedena_spatna_specializace (#365)
opraveno po kliknutí na "Nemám lékaře" při objednávání se na prohlídku se otevře mapa s lékaři se specializací na prohlídku.
(https://github.com/Loono-cz/loono-tasks/issues/79)

* fix: typo

* fox: format

* fix: format

Co-authored-by: Jakub Smolík <[email protected]>

* Fix/#355 vlastni prohlidky upravit prohlidku (#399)

* Fix

Fix:
divna hlaska neni mozne zadat prohlidku
 v detailu prohlídky se ukládá jiné datum, než požadované (zadávám 8.12.2022 a aplikace si ukládá 7.12.2022) - prohlídka se následně ani neuloží (viz druhý klip)
nelze upravit termín první prohlídky, přijde hláška, že se "neco nepovedlo" a prohlídka se neuloží

* Fix Done.

* Keyboard handling.

Handling keyboard on examiantion detail, create new exam, custom_exam_form

* Adding controller into examiantion_detail.dart

* Edit Exam term. Fix faq and badges not showing.

* Adding categorizedExam into edit examination modal.

* removing print.

* fix bug.

nefunguje zmena intervalu u vlastnich prohlidek

* Fixing edit frequency of exam.

* Fix note.

* Fixing PR comments.

* fix: no connecttion flushbar fix (#403)

* Fixing routing, onboarding route. (#406)

* Fixing routing, onboarding route.

* Fix analyze.

* fix: donate notification state was not remembered after log out/delete acc (#405)

* Fix/najit lékare search by address does not search#368 (#375)

* fix/najit_lékare_search_by_address_does_not_search_when_cislo_popisne_filled_in (#368)
oprava vyhledávání pomocí čísla popisného
(https://github.com/Loono-cz/loono-tasks/issues/15)

* fix: analyze

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

* Fixing 354 time is in past missing validation. (#407)

* Fixing 354 time must be in past.

* TODO Unwrap

* dead cat fix (#414)

* Fix/hide donation ios (#413)

* Develop (#408)

* SelfExamination Skin done.

Adding new Self Examination Skin.
Adding new content pauldrons.
Adding new texts.

* Changing Flutter version of backend-tests.yaml etc.

* Ordering selfExaminations.

* BE Integration test fixed.

Adding test for self examination skin.
Fixing lint.
Fixing FE self examination category.

* Fixing lint.

* Fixing github test

* Changing layout of settings, adding setting account.

User form edited,
ExpanseTile for user data and notifications added.
Donate buton working.
TODO:
 1) Create notification screen
 2) Create notification shedule tasks
 3) Create notification switch in notification settings.

* Fix merge

* Delete ._Runner.xcodeproj

* Adding new screen donate page

TODO: Change placeholder image.
Edited notification switch for turning on/off donate notification.
Donate notification is turned for device not for user.

* Fixing Tests.

* Fixing lints. Adding functionality for opening settings.

* Donate Ilustration image is added to donate page.

Creating donate utils to handle function for showing donatepage.

* fix analyzer.

* Fixing PR.

* Fixing analyzer.

* Renaming file.

* fix/badge_brzy_vyprsi_rozbita_obrazovka (#364)
oprava zobrazovani 2 textu pred vyprsenim badge, oprava zobrazovani stavu vyprseni a ziskani u badge.
(https://github.com/Loono-cz/loono-tasks/issues/6)

* Adding new form for custom examinations.

Adding new form for custom examinations.
Adding new screens.
Adding new widget for customTextInput.
TODO: FE with BE.
TODO: controll inputs.

* Adding error to custom_text_field.

* Addint error messaage into others text input fields

* Adding Translate.

* Adding prepossition Dativ translations.

Adding preposition Dativ translations.
Adding input validation.
Removing TOKS and VENERAL_SISEASES

* Adding function for transform year to month

* Editing examination detail for once examinaiton.

* Edditing examination detail for periodical Custom Examination.

* Fix: Logging with google account.

* fixing stuff for creating custom examinations.

* Přidaní překladů nových prohlídek - nomativ, genitiv, dativ

* Some fixes.

TODO: Control task and figma.

* Fixing bugs.

* Fixing date validation.

* fixing but with date interval instead of month was year.

* Fixing nonperiodic exam has order button not add to calendar.

* Fixing buttons not showing.

* Changing card layouts

TODO: Sorting.

* Fixing lint

* Fixing lint

* feat: examination action menu

* Fixing tests.

* Fixing test.

* feat: examination edit flow wip

* FIX: Show month right now.

FIX: creating exams ?
FIX: Show month right now.

TODO: Razeni vlastnich prohlidek...

* Fixing desc. of award in custom exam detail.

* lint and format fix.

* analyze test fix.

* Fixing lateinit examinaitonActionTypeUnion.

* Fixing creating examination.

* Fix: Disposable Exam now showing add to calendar button.

* Adding modal for disposable examination Delete Exam.

TODO: Connect with BE api.

* Adding streambuilder of calendar.

* Adding flow for editing frequency of exam and last visit date.

TODO: Je to spravne ?

* feat: examination edit flow UI wip

* Fixing when to show last examination picker.

* Fixing some task in comment on Github.

* Fix note is enabled when nevim is checked

Poznámka k návšteve - pri zaškrtnutí checkboxu "Zatím nevím" by malo byť pole pre poznámku disabled. V pripade, že som najprv vyplnila dátum a následne zaškrtla "Zatím nevím" pole pre poznámku ostalo aktívne.

* Fixing Functional stuff.

* fixing selectbox visual

Select boxy - upravit ikonu - namiesto šipky by mal byť chevron + ikona select boxu, ktorý bol rozkliknutý ako posledný má inú farbu/je zvýraznená - mala by mať default farbu ako ostatné neaktívne select boxy.

* Adding Divider.

* Fixing visual task from Github.

* Fixing functional stuff.

 Na kartách povinných prohlídek je uvedený nesprávny typ vyšetření - malo by tam byť "Preventivní prohlídka".

* Adding placeholder into sheet overlay exam.

Fixing bugs from comment section.

* Adding text for exams count.

* Geting new loono api

* Edit term of regularly examination.

* Edit date of exam is added to default and custom exams.

* TODO Unset comment after BE delete exam working.

* merge

* Fix intervals in default examinatoins.

* Done

* Removing old code.

* Detail done.

* fix merge.

* Examination sorting on main screen is done.

* Padding of text in specialist listview builder.

* Refactor function in examinations service.

* add interval check condition

* Fix for choosing date by interval.

* fix: no internet connection flushBar fix by [email protected] (#374)

* fix: no internet connection flushBar fix by [email protected]

* feat: Connectivity result condition opt

* Fixing lint

* fix analyze.

* fix merge.

* Fixing analyze

Co-authored-by: Petr Noga <[email protected]>

* Fixing new date in future.

* Fixing showing bad date in detail and examination card.

* Fix/nelze potvrdit absolovane samovysetreni#361 (#376)

* fix/nelze_potvrdit_absolovane_samovysetreni (#361)
tlacitko "Vysetril jsem se" je kliknutelne

* Fixing format.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Fix/feedback_button_zakryva_jmeno_na_homescreen (#359) (#377)

posunuti jmena a bodu dolu, aby se nekrylo s tlacitkem

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

* Fixing bugs.

zmizelo někam "mám/nemám lékaře" v defaultních prohlídkách - při rozkliku nesplněných prohlídek, když se chci objednat, správně by se mě aplikace měla zeptat, zda mám či nemám lékaře - pokud nemám, měla by mě odkázat na Najít lékaře s vyhledáním konkrétní specializace

při úpravě naplánovaného termínu ( i když je pozdější než ten původně plánovaný) mi píše aplikace "ještě není čas se objednat"

nedá se přidat ani upravit poznámka
nelze upravovat termín první prohlídky

na main screen porhlídky mají napsané, že jsou Preventivní, v detailu ale pak Vyšetření, což je trochu matoucí - neměly by to být i v detailu Preventivní prohlídky?

* Examination type duplicity remove (#380)

* Fix.

- nefunguje přidání druhé vlastní prohlídky u Zubaře - píše, že se "něco nepovedlo".
- v rozkliku detailu prohlídky se nezobrazuje uvedená poznámka:Při přidání poznámky k vlastní prohlídce se objeví chybová hláška, že není připojení k internetu (viz klip)/
- pokud zadam datum na formulari a pak zaskrtnu nevim, datum se nesmaze, ani nelze manuane smazat
- v typu vyšetření je zvláštní čára dole viz screenshot

* Merge fix.

* removing second break; merge fix.

* fix: unused variable

* Done bug fixing. (#385)

* Refactor loono strings.

* Fix: Vlastní prohlídky - Přidat prohlídku - FE#353

* Feat/souhlas gdpr and newsletters#379 (#383)

* feat/souhlas_GDPR_and_Newsletters (#379)
přidání kroku (checkbox pro souhlas s GDPR a pro posílání newsletterů) do registračního formuláře
(https://github.com/Loono-cz/loono-tasks/issues/94)

* #379 newsletter option is saving in account

* Fixing format and analyze tests.

* Fix formater

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Fix/357 main screen (#384)

* feat/souhlas_GDPR_and_Newsletters (#379)
přidání kroku (checkbox pro souhlas s GDPR a pro posílání newsletterů) do registračního formuláře
(https://github.com/Loono-cz/loono-tasks/issues/94)

* #379 newsletter option is saving in account

* listener to true = now writen logic for disable add button works

* sort update for null values

* git tests fix

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Format.

* Fix/353 vlastni prohlidky pridat prohlidku (#389)

* Develop (#386)

* SelfExamination Skin done.

Adding new Self Examination Skin.
Adding new content pauldrons.
Adding new texts.

* Changing Flutter version of backend-tests.yaml etc.

* Ordering selfExaminations.

* BE Integration test fixed.

Adding test for self examination skin.
Fixing lint.
Fixing FE self examination category.

* Fixing lint.

* Fixing github test

* Changing layout of settings, adding setting account.

User form edited,
ExpanseTile for user data and notifications added.
Donate buton working.
TODO:
 1) Create notification screen
 2) Create notification shedule tasks
 3) Create notification switch in notification settings.

* Fix merge

* Delete ._Runner.xcodeproj

* Adding new screen donate page

TODO: Change placeholder image.
Edited notification switch for turning on/off donate notification.
Donate notification is turned for device not for user.

* Fixing Tests.

* Fixing lints. Adding functionality for opening settings.

* Donate Ilustration image is added to donate page.

Creating donate utils to handle function for showing donatepage.

* fix analyzer.

* Fixing PR.

* Fixing analyzer.

* Renaming file.

* fix/badge_brzy_vyprsi_rozbita_obrazovka (#364)
oprava zobrazovani 2 textu pred vyprsenim badge, oprava zobrazovani stavu vyprseni a ziskani u badge.
(https://github.com/Loono-cz/loono-tasks/issues/6)

* Adding new form for custom examinations.

Adding new form for custom examinations.
Adding new screens.
Adding new widget for customTextInput.
TODO: FE with BE.
TODO: controll inputs.

* Adding error to custom_text_field.

* Addint error messaage into others text input fields

* Adding Translate.

* Adding prepossition Dativ translations.

Adding preposition Dativ translations.
Adding input validation.
Removing TOKS and VENERAL_SISEASES

* Adding function for transform year to month

* Editing examination detail for once examinaiton.

* Edditing examination detail for periodical Custom Examination.

* Fix: Logging with google account.

* fixing stuff for creating custom examinations.

* Přidaní překladů nových prohlídek - nomativ, genitiv, dativ

* Some fixes.

TODO: Control task and figma.

* Fixing bugs.

* Fixing date validation.

* fixing but with date interval instead of month was year.

* Fixing nonperiodic exam has order button not add to calendar.

* Fixing buttons not showing.

* Changing card layouts

TODO: Sorting.

* Fixing lint

* Fixing lint

* feat: examination action menu

* Fixing tests.

* Fixing test.

* feat: examination edit flow wip

* FIX: Show month right now.

FIX: creating exams ?
FIX: Show month right now.

TODO: Razeni vlastnich prohlidek...

* Fixing desc. of award in custom exam detail.

* lint and format fix.

* analyze test fix.

* Fixing lateinit examinaitonActionTypeUnion.

* Fixing creating examination.

* Fix: Disposable Exam now showing add to calendar button.

* Adding modal for disposable examination Delete Exam.

TODO: Connect with BE api.

* Adding streambuilder of calendar.

* Adding flow for editing frequency of exam and last visit date.

TODO: Je to spravne ?

* feat: examination edit flow UI wip

* Fixing when to show last examination picker.

* Fixing some task in comment on Github.

* Fix note is enabled when nevim is checked

Poznámka k návšteve - pri zaškrtnutí checkboxu "Zatím nevím" by malo byť pole pre poznámku disabled. V pripade, že som najprv vyplnila dátum a následne zaškrtla "Zatím nevím" pole pre poznámku ostalo aktívne.

* Fixing Functional stuff.

* fixing selectbox visual

Select boxy - upravit ikonu - namiesto šipky by mal byť chevron + ikona select boxu, ktorý bol rozkliknutý ako posledný má inú farbu/je zvýraznená - mala by mať default farbu ako ostatné neaktívne select boxy.

* Adding Divider.

* Fixing visual task from Github.

* Fixing functional stuff.

 Na kartách povinných prohlídek je uvedený nesprávny typ vyšetření - malo by tam byť "Preventivní prohlídka".

* Adding placeholder into sheet overlay exam.

Fixing bugs from comment section.

* Adding text for exams count.

* Geting new loono api

* Edit term of regularly examination.

* Edit date of exam is added to default and custom exams.

* TODO Unset comment after BE delete exam working.

* merge

* Fix intervals in default examinatoins.

* Done

* Removing old code.

* Detail done.

* fix merge.

* Examination sorting on main screen is done.

* Padding of text in specialist listview builder.

* Refactor function in examinations service.

* add interval check condition

* Fix for choosing date by interval.

* fix: no internet connection flushBar fix by [email protected] (#374)

* fix: no internet connection flushBar fix by [email protected]

* feat: Connectivity result condition opt

* Fixing lint

* fix analyze.

* fix merge.

* Fixing analyze

Co-authored-by: Petr Noga <[email protected]>

* Fixing new date in future.

* Fixing showing bad date in detail and examination card.

* Fix/nelze potvrdit absolovane samovysetreni#361 (#376)

* fix/nelze_potvrdit_absolovane_samovysetreni (#361)
tlacitko "Vysetril jsem se" je kliknutelne

* Fixing format.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Petr Noga <[email protected]>

* Fix/feedback_button_zakryva_jmeno_na_homescreen (#359) (#377)

posunuti jmena a bodu dolu, aby se nekrylo s tlacitkem

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

* Fixing bugs.

zmizelo někam "mám/nemám lékaře" v defaultních prohlídkách - při rozkliku nesplněných prohlídek, když se chci objednat, správně by se mě aplikace měla zeptat, zda mám či nemám lékaře - pokud nemám, měla by mě odkázat na Najít lékaře s vyhledáním konkrétní specializace

při úpravě naplánovaného termínu ( i když je pozdější než ten původně plánovaný) mi píše aplikace "ještě není čas se objednat"

nedá se přidat ani upravit poznámka
nelze upravovat termín první prohlídky

na main screen porhlídky mají napsané, že jsou Preventivní, v detailu ale pak Vyšetření, což je trochu matoucí - neměly by to být i v detailu Preventivní prohlídky?

* Examination type duplicity remove (#380)

* Fix.

- nefunguje přidání druhé vlastní prohlídky u Zubaře - píše, že se "něco nepovedlo".
- v rozkliku detailu prohlídky se nezobrazuje uvedená poznámka:Při přidání poznámky k vlastní prohlídce se objeví chybová hláška, že není připojení k internetu (viz klip)/
- pokud zadam datum na formulari a pak zaskrtnu nevim, datum se nesmaze, ani nelze manuane smazat
- v typu vyšetření je zvláštní čára dole viz screenshot

* Merge fix.

* removing second break; merge fix.

* fix: unused variable

* Done bug fixing. (#385)

* Refactor loono strings.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Jakub Smolik <[email protected]>
Co-authored-by: Jakub Smolík <[email protected]>
Co-authored-by: Denis Ulč <[email protected]>
Co-authored-by: smolikjacgi <[email protected]>
Co-authored-by: StepanDrozdek <[email protected]>
Co-authored-by: Jan Bláha <[email protected]>

* Fix: Vlastní prohlídky - Přidat prohlídku - FE#353

* Format.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Jakub Smolik <[email protected]>
Co-authored-by: Jakub Smolík <[email protected]>
Co-authored-by: Denis Ulč <[email protected]>
Co-authored-by: smolikjacgi <[email protected]>
Co-authored-by: StepanDrozdek <[email protected]>
Co-authored-by: Jan Bláha <[email protected]>

* Fix for title of custom badges.

* Feat/356 update (#392)

* feat: post examination note update wip

* fix: date/time picker validation w/[email protected]

* fix: time validation fix

* feat: edit examination note final

* feat: edit exam note icon

* fix: format

* fix: datepicker validation fix

* Fix/#355 vlastni prohlidky upravit prohlidku (#393)

* Fix

Fix:
divna hlaska neni mozne zadat prohlidku
 v detailu prohlídky se ukládá jiné datum, než požadované (zadávám 8.12.2022 a aplikace si ukládá 7.12.2022) - prohlídka se následně ani neuloží (viz druhý klip)
nelze upravit termín první prohlídky, přijde hláška, že se "neco nepovedlo" a prohlídka se neuloží

* Fix Done.

* Feat/pridani loga cgi #372 (#390)

* feat/pridani_loga_cgi (#372)
přidáno logo na welcomescreen (first time use splashscreen ve figmě)
TODO: přidání na splashscreen

* feat/pridani_loga_cgi (#372)
přidáno logo na welcomescreen (first time use splashscreen ve figmě)
přidání loga na splashscreen
oprava testů

* fix: logos to assets

* fix: analyze, format

Co-authored-by: Jakub Smolík <[email protected]>

* Fixing update examinations.

* Edit for PR. (#395)

* Edit for PR.

* fix: problems

* fix merge.

Co-authored-by: Jakub Smolík <[email protected]>

* Update examination_detail.dart (#396)

* Update examination_detail.dart

* fix: format

Co-authored-by: Jakub Smolík <[email protected]>

* fix: delete examination; fix: flushbar memory leak (#397)

* fix: last doxtor visit datepicker title and validation (#400)

* Fix/souhlas gdpr and newsletters#379 (#401)

* feat/souhlas_GDPR_and_Newsletters (#379)
přidání kroku (checkbox pro souhlas s GDPR a pro posílání newsletterů) do registračního formuláře
(https://github.com/Loono-cz/loono-tasks/issues/94)

* feat/souhlas_GDPR_and_Newsletters (#379)
oprava překlepu v textaci
(https://github.com/Loono-cz/loono-tasks/issues/94)

* Oprava zobrazování success ikony (https://github.com/Loono-cz/loono-tasks/issues/23) (#387)

Co-authored-by: Jakub Smolík <[email protected]>

* Update notification_service.dart (#402)

* fix/pri_vyhledani_lekare_uvedena_spatna_specializace (#365) (#388)

* fix/pri_vyhledani_lekare_uvedena_spatna_specializace (#365)
opraveno po kliknutí na "Nemám lékaře" při objednávání se na prohlídku se otevře mapa s lékaři se specializací na prohlídku.
(https://github.com/Loono-cz/loono-tasks/issues/79)

* fix: typo

* fox: format

* fix: format

Co-authored-by: Jakub Smolík <[email protected]>

* Fix/#355 vlastni prohlidky upravit prohlidku (#399)

* Fix

Fix:
divna hlaska neni mozne zadat prohlidku
 v detailu prohlídky se ukládá jiné datum, než požadované (zadávám 8.12.2022 a aplikace si ukládá 7.12.2022) - prohlídka se následně ani neuloží (viz druhý klip)
nelze upravit termín první prohlídky, přijde hláška, že se "neco nepovedlo" a prohlídka se neuloží

* Fix Done.

* Keyboard handling.

Handling keyboard on examiantion detail, create new exam, custom_exam_form

* Adding controller into examiantion_detail.dart

* Edit Exam term. Fix faq and badges not showing.

* Adding categorizedExam into edit examination modal.

* removing print.

* fix bug.

nefunguje zmena intervalu u vlastnich prohlidek

* Fixing edit frequency of exam.

* Fix note.

* Fixing PR comments.

* fix: no connecttion flushbar fix (#403)

* Fixing routing, onboarding route. (#406)

* Fixing routing, onboarding route.

* Fix analyze.

* fix: donate notification state was not remembered after log out/delete acc (#405)

* Fix/najit lékare search by address does not search#368 (#375)

* fix/najit_lékare_search_by_address_does_not_search_when_cislo_popisne_filled_in (#368)
oprava vyhledávání pomocí čísla popisného
(https://github.com/Loono-cz/loono-tasks/issues/15)

* fix: analyze

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

* Fixing 354 time is in past missing validation. (#407)

* Fixing 354 time must be in past.

* TODO Unwrap

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Jakub Smolik <[email protected]>
Co-authored-by: Jakub Smolík <[email protected]>
Co-authored-by: Denis Ulč <[email protected]>
Co-authored-by: smolikjacgi <[email protected]>
Co-authored-by: StepanDrozdek <[email protected]>
Co-authored-by: Jan Bláha <[email protected]>
Co-authored-by: Marek Škořepa <[email protected]>

* Hiding donation feature for ios.

Co-authored-by: Brambora0 <[email protected]>
Co-authored-by: Jakub Smolik <[email protected]>
Co-authored-by: Jakub Smolík <[email protected]>
Co-authored-by: Denis Ulč <[email protected]>
Co-authored-by: smolikjacgi <[email protected]>
Co-authored-by: StepanDrozdek <[email protected]>
Co-authored-by: Jan Bláha <[email protected]>
Co-authored-by: Marek Škořepa <[email protected]>

* Feat/firebase configuration be server (#415)

* Develop (#408)

* SelfExamination Skin done.

Adding new Self Examination Skin.
Adding new content pauldrons.
Adding new texts.

* Changing Flutter version of backend-tests.yaml etc.

* Ordering selfExaminations.

* BE Integration test fixed.

Adding test for self examination skin.
Fixing lint.
Fixing FE self examination category.

* Fixing lint.

* Fixing github test

* Changing layout of settings, adding setting account.

User form edited,
ExpanseTile for user data and notifications added.
Donate buton working.
TODO:
 1) Create notification screen
 2) Create notification shedule tasks
 3) Create notification switch in notification settings.

* Fix merge

* Delete ._Runner.xcodeproj

* Adding new screen donate page

TODO: Change placeholder image.
Edited notification switch for turning on/off donate notification.
Donate notification is turned for device not for user.

* Fixing Tests.

* Fixing lints. Adding functionality for opening settings.

* Donate Ilustration image is added to donate page.

Creating donate utils to handle function for showing donatepage.

* fix analyzer.

* Fixing PR.

* Fixing analyzer.

* Renaming file.

* fix/badge_brzy_vyprsi_rozbita_obrazovka (#364)
oprava zobrazovani 2 textu pred vyprsenim badge, oprava zobrazovani stavu vyprseni a ziskani u badge.
(https://github.com/Loono-cz/loono-tasks/issues/6)

* Adding new form for custom examinations.

Adding new form for custom examinations.
Adding new screens.
Adding new widget for customTextInput.
TODO: FE with BE.
TODO: controll inputs.

* Adding error to custom_text_field.

* Addint error messaage into others text input fields

* Adding Translate.

* Adding prepossition Dativ translations.

Adding preposition Dativ translations.
Adding input validation.
Removing TOKS and VENERAL_SISEASES

* Adding function for transform year to month

* Editing examination detail for once examinaiton.

* Edditing examination detail for periodical Custom Examination.

* Fix: Logging with google account.

* fixing stuff for creating custom examinations.

* Přidaní překladů nových prohlídek - nomativ, genitiv, dativ

* Some fixes.

TODO: Control task and figma.

* Fixing bugs.

* Fixing date validation.

* fixing but with date interval instead of month was year.

* Fixing nonperiodic exam has order button not add to calendar.

* Fixing buttons not showing.

* Changing card layouts

TODO: Sorting.

* Fixing lint

* Fixing lint

* feat: examination action menu

* Fixing tests.

* Fixing test.

* feat: examination edit flow wip

* FIX: Show month right now.

FIX: creating exams ?
FIX: Show month right now.

TODO: Razeni vlastnich prohlidek...

* Fixing desc. of award in custom exam detail.

* lint and format fix.

* analyze test fix.

* Fixing lateinit examinaitonActionTypeUnion.

* Fixing creating examination.

* Fix: Disposable Exam now showing add to calendar button.

* Adding modal for disposable examination Delete Exam.

TODO: Connect with BE api.

* Adding streambuilder of calendar.

* Adding flow for editing frequency of exam and last visit date.

TODO: Je to spravne ?

* feat: examination edit flow UI wip

* Fixing when to show last examination picker.

* Fixing some task in comment on Github.

* Fix note is enabled when nevim is checked

Poznámka k návšteve - pri zaškrtnutí checkboxu "Zatím nevím" by malo byť pole pre poznámku disabled. V pripade, že som najprv vyplnila dátum a následne zaškrtla "Zatím nevím" pole pre poznámku ostalo aktívne.

* Fixing Functional stuff.

* fixing selectbox visual

Select boxy - upravit ikonu - namiesto šipky by mal byť chevron + ikona select boxu, ktorý bol rozkliknutý ako posledný má inú farbu/je zvýraznená - mala by mať default farbu ako ostatné neaktívne select boxy.

* Adding Divider.

* Fixing visual task from Github.

* Fixing functional stuff.

 Na kartách povinných prohlídek je uvedený nesprávny typ vyšetření - malo by tam byť "Preventivní prohlídka".

* Adding placeholder into sheet overlay exam.

Fixing bugs from comment section.

* Adding text for exams count.

* Geting new loono api

* Edit term of regularly examination.

* Edit date of exam is…
  • Loading branch information
9 people authored Oct 12, 2022
1 parent 73ba8b7 commit 16c2aca
Show file tree
Hide file tree
Showing 11 changed files with 195 additions and 46 deletions.
4 changes: 4 additions & 0 deletions assets/icons/custom_exam_full.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ PODS:
- Firebase/Crashlytics (9.4.0):
- Firebase/CoreOnly
- FirebaseCrashlytics (~> 9.4.0)
- Firebase/RemoteConfig (9.4.0):
- Firebase/CoreOnly
- FirebaseRemoteConfig (~> 9.4.0)
- Firebase/Storage (9.4.0):
- Firebase/CoreOnly
- FirebaseStorage (~> 9.4.0)
Expand All @@ -41,10 +44,16 @@ PODS:
- Firebase/Crashlytics (= 9.4.0)
- firebase_core
- Flutter
- firebase_remote_config (2.0.20):
- Firebase/RemoteConfig (= 9.4.0)
- firebase_core
- Flutter
- firebase_storage (10.3.7):
- Firebase/Storage (= 9.4.0)
- firebase_core
- Flutter
- FirebaseABTesting (9.6.0):
- FirebaseCore (~> 9.0)
- FirebaseAnalytics/WithoutAdIdSupport (9.4.0):
- FirebaseCore (~> 9.0)
- FirebaseInstallations (~> 9.0)
Expand Down Expand Up @@ -87,6 +96,12 @@ PODS:
- GoogleUtilities/Environment (~> 7.7)
- GoogleUtilities/UserDefaults (~> 7.7)
- PromisesObjC (~> 2.1)
- FirebaseRemoteConfig (9.4.0):
- FirebaseABTesting (~> 9.0)
- FirebaseCore (~> 9.0)
- FirebaseInstallations (~> 9.0)
- GoogleUtilities/Environment (~> 7.7)
- "GoogleUtilities/NSData+zlib (~> 7.7)"
- FirebaseStorage (9.4.0):
- FirebaseAppCheckInterop (~> 9.0)
- FirebaseAuthInterop (~> 9.0)
Expand Down Expand Up @@ -249,6 +264,7 @@ DEPENDENCIES:
- firebase_auth (from `.symlinks/plugins/firebase_auth/ios`)
- firebase_core (from `.symlinks/plugins/firebase_core/ios`)
- firebase_crashlytics (from `.symlinks/plugins/firebase_crashlytics/ios`)
- firebase_remote_config (from `.symlinks/plugins/firebase_remote_config/ios`)
- firebase_storage (from `.symlinks/plugins/firebase_storage/ios`)
- Flutter (from `Flutter`)
- flutter_config (from `.symlinks/plugins/flutter_config/ios`)
Expand Down Expand Up @@ -280,6 +296,7 @@ SPEC REPOS:
trunk:
- AppAuth
- Firebase
- FirebaseABTesting
- FirebaseAnalytics
- FirebaseAppCheckInterop
- FirebaseAuth
Expand All @@ -290,6 +307,7 @@ SPEC REPOS:
- FirebaseCoreInternal
- FirebaseCrashlytics
- FirebaseInstallations
- FirebaseRemoteConfig
- FirebaseStorage
- FirebaseStorageInternal
- FMDB
Expand Down Expand Up @@ -323,6 +341,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/firebase_core/ios"
firebase_crashlytics:
:path: ".symlinks/plugins/firebase_crashlytics/ios"
firebase_remote_config:
:path: ".symlinks/plugins/firebase_remote_config/ios"
firebase_storage:
:path: ".symlinks/plugins/firebase_storage/ios"
Flutter:
Expand Down Expand Up @@ -384,7 +404,9 @@ SPEC CHECKSUMS:
firebase_auth: 74cfbf7be1e3e7fdaac9e7f117cefd89155251a9
firebase_core: 8e500850dd138c269d197c8dfca3ae886fa3b6f2
firebase_crashlytics: 4414603468b8f1514eb246de097f9101c36448db
firebase_remote_config: 276c74fd16cba1db4a0ef73dbde716bec6dda0d2
firebase_storage: 846832b7f2d22238678dc9abc513f2151f102462
FirebaseABTesting: 61826730ce9eee8781ba99a2b3420e9bce148dc9
FirebaseAnalytics: a1a24e72b7ba7f47045a4633f1abb545c07bd29c
FirebaseAppCheckInterop: d5ecda0c09f8069406643d6e0fa12c09d1b736e3
FirebaseAuth: ae5d4402e1516497357d909162b091b3ca2a2e9c
Expand All @@ -395,6 +417,7 @@ SPEC CHECKSUMS:
FirebaseCoreInternal: bca76517fe1ed381e989f5e7d8abb0da8d85bed3
FirebaseCrashlytics: 121ea1d37f4906c94c4c9307297af5121b98b789
FirebaseInstallations: 0a115432c4e223c5ab20b0dbbe4cbefa793a0e8e
FirebaseRemoteConfig: 6d9982bc64548a6e3c1b497b9fa53938ad135f2d
FirebaseStorage: 160ba975dd3452d9c59a3bf5ea9bf70ff96bd3c2
FirebaseStorageInternal: 81d8a597324ccd06c41a43c5700bc1185a2fc328
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
Expand Down
20 changes: 14 additions & 6 deletions lib/l10n/intl_cs.arb
Original file line number Diff line number Diff line change
Expand Up @@ -1400,6 +1400,12 @@
"@custom_exam_choose_provider": {},
"custom_exam_choosen_provider": "Vybraný specialista: ",
"@custom_exam_choosen_provider": {},
"custom_exam_full_dialog_title": "V seznamu již není volné místo",
"@custom_exam_full_dialog_title": {},
"custom_exam_full_dialog_desc": "Do seznamu si můžeš přidat maximálně deset prohlídek. Smazáním dříve přidaných prohlídek získáš dodatečný prostor.",
"@custom_exam_full_dialog_desc": {},
"i_agree": "Rozumím",
"@i_agree": {},
"add_examination": "Přidat prohlídku",
"@add_examination": {},
"specialist": "Specialista",
Expand All @@ -1418,23 +1424,23 @@
"@wich_date_you_have_reservation_female": {},
"wich_date_you_have_reservation_male": "Na jaké datum jsi objednaný?",
"@wich_date_you_have_reservation_male": {},
"for_now_idk": "Zatím nevim",
"for_now_idk": "Zatím nevím",
"@for_now_idk": {},
"idk": "Nevim",
"idk": "Nevím",
"@idk": {},
"last_examination": "Poslední vysetreni",
"last_examination": "Poslední vyšetření",
"@last_examination": {},
"your_last_examination_female": "Kdy naposledy jsi byla na vyšetření?",
"@yout_last_examination_female": {},
"your_last_examination_male": "Kdy naposledy jsi byl na vyšetření?",
"@yout_last_examination_male": {},
"examination_term": "Termin vysetreni",
"examination_term": "Termín vyšetření",
"@examination_term": {},
"once_to": "Jednou za ",
"@once_to": {},
"note_visiting": "Poznámka k návštevě",
"@note_visiting": {},
"note_visiting_description": "Prostor pro tvoje poznámky k návštevě",
"note_visiting_description": "Prostor pro tvoje poznámky k návštěvě",
"@note_visiting_description": {},
"examinatoin_was_added": "Prohlídka byla přidána",
"@examinatoin_was_added": {},
Expand Down Expand Up @@ -1510,5 +1516,7 @@
}
},
"examination_detail_cusotm_rewards_get_badge_1": "Za dokončenou prohlídku získáš",
"@examination_detail_cusotm_rewards_get_badge_1": {}
"@examination_detail_cusotm_rewards_get_badge_1": {},
"choose_interval": "Vyber interval",
"@choose_interval": {}
}
14 changes: 10 additions & 4 deletions lib/services/examinations_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,17 @@ class ExaminationsProvider extends ChangeNotifier {
void updateExaminationsRecord(
ExaminationRecord record,
) {
final indexToUpdate = examinations?.examinations.indexWhere(
(examination) => record.uuid != null && examination.uuid != null
? examination.uuid == record.uuid
: examination.examinationType == record.type,
final exams = examinations?.examinations;

final examination = exams?.firstWhere(
(item) => item.uuid == record.uuid,
orElse: () => exams.firstWhere(
(item) => record.type == item.examinationType && item.uuid == null,
),
);

final indexToUpdate = examinations?.examinations.indexWhere((item) => item == examination);

if (indexToUpdate != null && indexToUpdate >= 0) {
final updatedItem = examinations?.examinations.elementAt(indexToUpdate).rebuild(
(item) => item
Expand Down
10 changes: 4 additions & 6 deletions lib/ui/screens/custom_exam_form/custom_exam_form_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ class _CustomExamFormScreenState extends State<CustomExamFormScreen> {
),
),
const SizedBox(
height: 16.0,
height: 24.0,
),
Container(child: buildFrequentionForm(context)),
const SizedBox(
Expand Down Expand Up @@ -342,7 +342,7 @@ class _CustomExamFormScreenState extends State<CustomExamFormScreen> {
child: CustomInputTextField(
error: _showError && _customInterval.isEmpty,
label: '',
hintText: context.l10n.exam_frequency,
hintText: context.l10n.choose_interval,
value: _customInterval,
onClickInputField: () => AutoRouter.of(context).navigate(
ChooseFrequencyOfExamRoute(
Expand Down Expand Up @@ -374,8 +374,8 @@ class _CustomExamFormScreenState extends State<CustomExamFormScreen> {
: '',
prefixIcon: SvgPicture.asset(
'assets/icons/calendar.svg',
width: 5,
height: 5,
width: 10,
height: 10,
fit: BoxFit.scaleDown,
color: _lastExamChck ? Colors.black38 : Colors.black87,
),
Expand Down Expand Up @@ -423,8 +423,6 @@ class _CustomExamFormScreenState extends State<CustomExamFormScreen> {
: '',
prefixIcon: SvgPicture.asset(
'assets/icons/calendar.svg',
width: 5,
height: 5,
fit: BoxFit.scaleDown,
color: _nextExamChck ? Colors.black38 : Colors.black87,
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,14 @@ class _ExaminationDetailState extends State<ExaminationDetail> {
_examination.examinationActionType ?? ExaminationActionType.CONTROL;

DateTime? get _nextVisitDate => _examination.plannedDate;
//Pravidelna prohlidka
bool get _isPeriodicalExam =>
_examination.periodicExam == true || _examination.periodicExam == null; //Pravidelna prohlidka

_examination.periodicExam == true || _examination.periodicExam == null;
//Pravidelna vlastni prohlidka
bool get _isCustomPeriodicalExam =>
_isPeriodicalExam &&
_examination.examinationCategoryType ==
ExaminationCategoryType.CUSTOM; //Pravidelna vlastni prohlidka
_isPeriodicalExam && _examination.examinationCategoryType == ExaminationCategoryType.CUSTOM;

bool isNoteTextChanged = false;

Widget get _doctorAsset => SvgPicture.asset(
(_examinationCategoryType == ExaminationCategoryType.MANDATORY ||
Expand All @@ -85,7 +86,6 @@ class _ExaminationDetailState extends State<ExaminationDetail> {
width: 180,
);

String? _note;
final TextEditingController _editingController = TextEditingController();
late FocusNode _focusNote;

Expand Down Expand Up @@ -122,16 +122,15 @@ class _ExaminationDetailState extends State<ExaminationDetail> {
}

Future<void> noteChanged() async {
_focusNote.unfocus();
// TODO: post only required changes! >> note | rewrite exProvider's methods
final response = await registry.get<ExaminationRepository>().postExamination(
_examinationType,
newDate: _examination.plannedDate,
uuid: _examination.uuid,
firstExam: false,
status: ExaminationStatus.NEW,
firstExam: _examination.firstExam,
status: _examination.state,
categoryType: _examinationCategoryType ?? ExaminationCategoryType.MANDATORY,
note: _note,
note: _editingController.text,
actionType: _examinationActionType,
periodicExam: _examination.periodicExam,
customInterval: _examination.customInterval,
Expand All @@ -141,7 +140,6 @@ class _ExaminationDetailState extends State<ExaminationDetail> {
success: (res) {
Provider.of<ExaminationsProvider>(context, listen: false)
.updateExaminationsRecord(res.data);

showFlushBarSuccess(
context,
context.l10n.examination_was_edited,
Expand All @@ -162,11 +160,11 @@ class _ExaminationDetailState extends State<ExaminationDetail> {
@override
void initState() {
super.initState();
_note = _examination.note;
_focusNote = FocusNode();
_focusNote.addListener(() async {
if (!_focusNote.hasFocus) {
if (!_focusNote.hasFocus && isNoteTextChanged) {
await noteChanged();
isNoteTextChanged = false;
}
});
SchedulerBinding.instance.addPostFrameCallback((_) {
Expand All @@ -179,6 +177,8 @@ class _ExaminationDetailState extends State<ExaminationDetail> {
@override
void dispose() {
_focusNote.dispose();
_editingController.dispose();
isNoteTextChanged = false;
super.dispose();
}

Expand All @@ -204,7 +204,6 @@ class _ExaminationDetailState extends State<ExaminationDetail> {
}

final preposition = czechPreposition(context, examinationType: _examinationType);
_editingController.text = _examination.note ?? '';

/// not ideal in build method but need context
Future<void> onPostNewCheckupSubmit({required DateTime date, String? note}) async {
Expand Down Expand Up @@ -273,6 +272,7 @@ class _ExaminationDetailState extends State<ExaminationDetail> {
);
}

_editingController.text = _examination.note ?? '';
return GestureDetector(
behavior: HitTestBehavior.translucent,
onTap: () => hideKeyboard(context),
Expand Down Expand Up @@ -413,7 +413,7 @@ class _ExaminationDetailState extends State<ExaminationDetail> {
noteController: _editingController,
enable: _examination.plannedDate?.toLocal().isBefore(DateTime.now()) == false,
onNoteChange: (value) {
_note = value;
isNoteTextChanged = true;
},
focusNode: _focusNote,
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,15 @@ class ExaminationDetailScreen extends StatelessWidget {

@override
Widget build(BuildContext context) {
final examination = Provider.of<ExaminationsProvider>(context, listen: true)
.examinations!
.examinations
.firstWhere(
(item) => item.uuid != null
? item.uuid == _exam.uuid
: _exam.examinationType == item.examinationType,
);
final exams =
Provider.of<ExaminationsProvider>(context, listen: true).examinations!.examinations;

final examination = exams.firstWhere(
(item) => item.uuid == _exam.uuid,
orElse: () => exams.firstWhere(
(item) => _exam.examinationType == item.examinationType && item.uuid == null,
),
);

return Scaffold(
appBar: AppBar(
Expand Down
12 changes: 7 additions & 5 deletions lib/ui/screens/prevention/prevention_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,18 @@ import 'package:loono/router/app_router.gr.dart';
import 'package:loono/services/examinations_service.dart';
import 'package:loono/ui/widgets/avatar_arrow_bubble.dart';
import 'package:loono/ui/widgets/badges/badge_composer.dart';
import 'package:loono/ui/widgets/prevention/custom_exam_full_dialog.dart';
import 'package:loono/ui/widgets/prevention/examinations_sheet_overlay.dart';
import 'package:loono/ui/widgets/prevention/prevention_header.dart';
import 'package:loono/utils/registry.dart';
import 'package:loono_api/loono_api.dart';
import 'package:provider/provider.dart';

class PreventionScreen extends StatelessWidget {
PreventionScreen({Key? key}) : super(key: key);

AppRouter get appRouter => registry.get<AppRouter>();

final ValueNotifier<double?> extentFromTop = ValueNotifier<double?>(null);

void convertExtent(double? extent) {
Expand All @@ -32,11 +36,9 @@ class PreventionScreen extends StatelessWidget {
0;
return Scaffold(
floatingActionButton: FloatingActionButton(
onPressed: count >= 10
? null
: () {
AutoRouter.of(context).push(const CustomExamFormRoute());
},
onPressed: () => count >= 10
? showCustomExamFullDialog(context: context, router: appRouter)
: AutoRouter.of(context).push(const CustomExamFormRoute()),
backgroundColor: count >= 10 ? LoonoColors.grey : LoonoColors.primaryEnabled,
child: const Icon(
Icons.add,
Expand Down
3 changes: 2 additions & 1 deletion lib/ui/widgets/custom_exam_form/custom_input_text_field.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_svg/svg.dart';
import 'package:loono/helpers/ui_helpers.dart';
import 'package:loono/l10n/ext.dart';

// ignore: must_be_immutable
Expand Down Expand Up @@ -57,7 +58,7 @@ class _CustomInputTextFieldState extends State<CustomInputTextField> {
return TextFormField(
style: TextStyle(
color: widget.value == '' || widget.enabled == false ? Colors.black38 : Colors.black,
fontSize: 14,
fontSize: LoonoSizes.isScreenSmall(context) ? 12.0 : 14,
),
controller: textController,
readOnly: true,
Expand Down
Loading

0 comments on commit 16c2aca

Please sign in to comment.