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

Add childquestions backend integration and refactor datainput datastructure #138

Merged
merged 103 commits into from
Nov 8, 2024

Conversation

MaHaWo
Copy link
Collaborator

@MaHaWo MaHaWo commented Oct 29, 2024

What it does

  • integrates backend into ChildrenDataInput and ChildrenGallery frontend component
  • add delete_child_image endpoint to user backend.
  • makes more use of svelte-5 runes in components related to child and data input.
  • various smaller fixes mostly related to types
  • modifies the FileInput component to work better with the backend system
  • functionally unifies the question editing dialog for user and child questions -> EditQuestions.svelte , Question.svelte
  • integrate question edition into admin page.
  • add creation of new child with necessary data to the children datainput dialog. Submit and markup section handle the data that is related to the child and the data that belongs to questions separately as discussed.
  • make the answer response for children a dict[id, answer] instead of list[answer]. This is a little easier to maintain in the frontend. Arguably should be the same for user answers, but not done here to not conflate things too much.
  • delete frontend code that emulated backend
  • delete childstore and replace with one that just stores the current child's id or null if there is none. Still using stores instead of runes here, imho they are easier to use with less code for what I need them for. Might be necessary to migrate at some point though.
  • adjust python tests where necessary.
  • the diff view won´t be much help for ChildrenGallery.svelte and ChildrenRegistration.svelte as especially for the latter, most of the code changed.

Questions

  • do we need the 'order' parameter in the questions or can this role be fulfilled by the id?
  • child image handling is a little suboptimal imho:
    • Image deletion is a bit complicated: Other question elements can be deleted by providing an empty value as input. For image files, this is not as straight forward since it's stored separately. I don´t want to do anything implicit à la "if empty string then and child had a file previously, then delete". So I added an explicit delete button if there is an image already. This is displayed in addition to the upload dialog. To make all this work and activate and deactivate at the right time, 2 new boolean flags are needed.
    • this might all simplify a bit if it turns out during milestone integration that we should store the whole child object as $currentChild and not just it's id. I was hesitant to do this right now though, because it stores a lot of data in the frontend.

closes #113
closes #112

MaHaWo and others added 17 commits October 29, 2024 08:49
commit 1ed8ef3
Merge: 83b2e59 7679af8
Author: Harald Mack <[email protected]>
Date:   Tue Oct 29 15:53:23 2024 +0100

    Merge pull request #130 from ssciwr/fix-userquestions-in-admin

    Integrate admin interface into user landing page

commit 7679af8
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date:   Tue Oct 29 13:31:01 2024 +0000

    update openapi.json & openapi-ts client, run pnpm format

commit c28089c
Merge: 03f911a 5b737fc
Author: Harald Mack <[email protected]>
Date:   Tue Oct 29 14:30:15 2024 +0100

    Merge branch 'fix-userquestions-in-admin' of github.com:ssciwr/mondey into fix-userquestions-in-admin

commit 03f911a
Author: Harald Mack <[email protected]>
Date:   Tue Oct 29 14:30:11 2024 +0100

    add autocomplete to formdata

commit 5b737fc
Author: Harald Mack <[email protected]>
Date:   Tue Oct 29 14:29:50 2024 +0100

    Update mondey_backend/src/mondey_backend/models/questions.py

    Co-authored-by: Liam Keegan <[email protected]>

commit b7fe5e8
Author: Harald Mack <[email protected]>
Date:   Tue Oct 29 14:22:25 2024 +0100

    Update mondey_backend/src/mondey_backend/routers/admin.py

    Co-authored-by: Liam Keegan <[email protected]>

commit a5892fe
Author: Harald Mack <[email protected]>
Date:   Tue Oct 29 14:22:07 2024 +0100

    Update frontend/src/lib/components/Admin/EditUserQuestionModal.svelte

    use localization in question modal

    Co-authored-by: Liam Keegan <[email protected]>

commit 57dfce2
Author: Harald Mack <[email protected]>
Date:   Tue Oct 29 14:11:44 2024 +0100

    remove debug logout

commit 0a6b213
Author: Harald Mack <[email protected]>
Date:   Tue Oct 29 14:09:19 2024 +0100

    fix error in loop

commit fb7ba48
Author: Harald Mack <[email protected]>
Date:   Mon Oct 28 17:00:24 2024 +0100

    update lock file

commit e9e27d2
Author: Harald Mack <[email protected]>
Date:   Mon Oct 28 16:58:27 2024 +0100

    fix conflict

commit c0cb20a
Author: Harald Mack <[email protected]>
Date:   Mon Oct 28 16:53:55 2024 +0100

    generate code anew

commit 1230ead
Merge: 3418a85 83b2e59
Author: Harald Mack <[email protected]>
Date:   Mon Oct 28 16:53:15 2024 +0100

    Merge branch 'main' into fix-userquestions-in-admin

commit 3418a85
Author: Harald Mack <[email protected]>
Date:   Mon Oct 28 16:44:10 2024 +0100

    remove researchpage

commit 687a573
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date:   Mon Oct 28 15:34:59 2024 +0000

    update openapi.json & openapi-ts client, run pnpm format

commit f11d80d
Author: Harald Mack <[email protected]>
Date:   Mon Oct 28 16:28:55 2024 +0100

    remove comment

commit 52c8d61
Author: Harald Mack <[email protected]>
Date:   Mon Oct 28 16:28:16 2024 +0100

    remove comments

commit 1d44371
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date:   Mon Oct 28 15:02:16 2024 +0000

    update openapi.json & openapi-ts client, run pnpm format

commit 36ddf78
Author: Harald Mack <[email protected]>
Date:   Mon Oct 28 15:41:15 2024 +0100

    adjust language label

commit df5667c
Merge: 66b6e45 5fac037
Author: Harald Mack <[email protected]>
Date:   Mon Oct 28 15:27:35 2024 +0100

    Merge branch 'main' into fix-userquestions-in-admin

commit 66b6e45
Author: Harald Mack <[email protected]>
Date:   Mon Oct 28 15:14:12 2024 +0100

    remove langStore

commit 43f3f5c
Author: Harald Mack <[email protected]>
Date:   Mon Oct 28 15:11:18 2024 +0100

    remove langstore

commit 732a9c9
Author: Harald Mack <[email protected]>
Date:   Mon Oct 28 15:09:19 2024 +0100

    add translations from main

commit c125a48
Author: Harald Mack <[email protected]>
Date:   Mon Oct 28 15:08:43 2024 +0100

    remove languages

commit 2fb1c6a
Author: Harald Mack <[email protected]>
Date:   Mon Oct 28 15:04:02 2024 +0100

    add localechooser from main

commit 24ca1f5
Author: Harald Mack <[email protected]>
Date:   Mon Oct 28 15:02:39 2024 +0100

    add master i18n

commit 2c321ec
Author: Harald Mack <[email protected]>
Date:   Mon Oct 28 14:40:46 2024 +0100

    fix python tests

commit 8295bb2
Author: Harald Mack <[email protected]>
Date:   Mon Oct 28 14:34:08 2024 +0100

    fix userProfile

commit f3bb815
Author: Harald Mack <[email protected]>
Date:   Mon Oct 28 14:13:41 2024 +0100

    fix language indexing problem

commit 96e2215
Author: Harald Mack <[email protected]>
Date:   Mon Oct 28 13:46:51 2024 +0100

    fix bug in data reading, work on fixing languages

commit e32011c
Author: Harald Mack <[email protected]>
Date:   Mon Oct 28 07:35:03 2024 +0100

    make datainput simpler

commit b99aa08
Author: Harald Mack <[email protected]>
Date:   Sun Oct 27 22:02:47 2024 +0100

    update to svelte 5, use runes mode for datainput

commit 2a2f018
Author: Harald Mack <[email protected]>
Date:   Fri Oct 25 16:56:11 2024 +0200

    work on simplifying datastructure

commit b424001
Author: Harald Mack <[email protected]>
Date:   Fri Oct 25 16:19:20 2024 +0200

    add fields

commit 11965f0
Author: Harald Mack <[email protected]>
Date:   Fri Oct 25 16:02:58 2024 +0200

    work on integrating necessary datastructure everywhere

commit d16f637
Author: Harald Mack <[email protected]>
Date:   Fri Oct 25 11:43:36 2024 +0200

    fix json creation for userquestion

commit 3c8a66b
Author: Harald Mack <[email protected]>
Date:   Fri Oct 25 11:34:26 2024 +0200

    correct language indexing

commit 9499dae
Author: Harald Mack <[email protected]>
Date:   Thu Oct 24 21:11:16 2024 +0200

    start fising lang_id issue

commit 13abba3
Author: Harald Mack <[email protected]>
Date:   Thu Oct 24 20:30:20 2024 +0200

    fix error

commit 7a744dd
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date:   Thu Oct 24 13:57:52 2024 +0000

    update openapi.json & openapi-ts client, run pnpm format

commit bfb39eb
Author: Harald Mack <[email protected]>
Date:   Thu Oct 24 13:34:15 2024 +0200

    work on making editing of questions usable

commit 4025b92
Author: Harald Mack <[email protected]>
Date:   Thu Oct 24 11:18:53 2024 +0200

    add elements for logged out user, delete separate verify component

commit 6722542
Author: Harald Mack <[email protected]>
Date:   Thu Oct 24 11:11:32 2024 +0200

    include admin page into userlandingpage, add admin component instead of route,
@codecov-commenter
Copy link

codecov-commenter commented Oct 29, 2024

Codecov Report

Attention: Patch coverage is 3.24826% with 417 lines in your changes missing coverage. Please review.

Project coverage is 27.89%. Comparing base (52e4c51) to head (926b612).

Files with missing lines Patch % Lines
...end/src/lib/components/ChildrenRegistration.svelte 0.00% 205 Missing and 1 partial ⚠️
frontend/src/lib/components/ChildrenGallery.svelte 0.00% 81 Missing and 1 partial ⚠️
frontend/src/lib/components/Admin/Questions.svelte 0.00% 57 Missing and 1 partial ⚠️
.../src/lib/components/Admin/EditQuestionModal.svelte 0.00% 33 Missing ⚠️
.../src/lib/components/DataDisplay/CardDisplay.svelte 0.00% 14 Missing and 1 partial ⚠️
frontend/src/lib/admin.svelte.ts 0.00% 7 Missing ⚠️
frontend/src/lib/components/AdminPage.svelte 0.00% 7 Missing ⚠️
...tend/src/lib/components/DataInput/DataInput.svelte 0.00% 3 Missing ⚠️
...end/src/lib/components/DataInput/Fileupload.svelte 0.00% 2 Missing ⚠️
frontend/src/lib/stores/childrenStore.ts 0.00% 1 Missing and 1 partial ⚠️
... and 2 more
Additional details and impacted files
@@             Coverage Diff             @@
##             main     #138       +/-   ##
===========================================
- Coverage   93.64%   27.89%   -65.76%     
===========================================
  Files          20       91       +71     
  Lines         850     3280     +2430     
  Branches        0       88       +88     
===========================================
+ Hits          796      915      +119     
- Misses         54     2299     +2245     
- Partials        0       66       +66     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@MaHaWo MaHaWo requested a review from lkeegan November 8, 2024 09:17
@MaHaWo
Copy link
Collaborator Author

MaHaWo commented Nov 8, 2024

found a bug that slipped through the net. need to fix that before review. sry

@MaHaWo
Copy link
Collaborator Author

MaHaWo commented Nov 8, 2024

ok, I think I'm done @lkeegan. feel free to start whenever you have time.

Copy link
Member

@lkeegan lkeegan left a comment

Choose a reason for hiding this comment

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

lgtm - some minor comments/suggestions.

re questions:

  1. we need order if we want the admins to be able to change the order of the questions, if they are fine with them coming in the order that they were added to the database then yes we can remove it (same goes for milestonegroup)
  2. image handling: do we need to be able to delete the image - or is just allowing the user to upload a different one sufficient?
  3. yes I would store the child object

docker-compose.yml Show resolved Hide resolved
docker-compose.yml Show resolved Hide resolved
frontend/src/lib/components/Admin/Questions.svelte Outdated Show resolved Hide resolved
frontend/src/lib/components/ChildrenGallery.svelte Outdated Show resolved Hide resolved
mondey_backend/src/mondey_backend/routers/users.py Outdated Show resolved Hide resolved
mondey_backend/src/mondey_backend/routers/users.py Outdated Show resolved Hide resolved
@MaHaWo
Copy link
Collaborator Author

MaHaWo commented Nov 8, 2024

thanks for the input. Regarding image deletion:

  • I think we should be able to delete it:
    • users might just change their mind.
    • user might upload an image but later find out they were not allowed to/ did so on accident or are not allowed anymore.
    • it might be more convenient to have no images when the number of observed children grows - kindergarden or the like.
      => therefore, option to delete image would be nice to have.

Copy link

sonarcloud bot commented Nov 8, 2024

@MaHaWo
Copy link
Collaborator Author

MaHaWo commented Nov 8, 2024

I added the default image for image-less children now, too.

@MaHaWo MaHaWo merged commit 33d4f17 into main Nov 8, 2024
6 checks passed
@MaHaWo MaHaWo deleted the add-childquestions_backend-integration branch November 8, 2024 16:24
MaHaWo added a commit that referenced this pull request Nov 11, 2024
commit 43bf1b3
Author: Liam Keegan <[email protected]>
Date:   Mon Nov 11 08:17:47 2024 +0100

    Add admin option to delete milestone images (#150)

    * Add admin option to delete milestone images

    - add delete button below existing milestone images in admin interface
    - add delete /milestone-images endpoint
    - restate /admin route for convenience during development, can be removed again later
    - resolves #98

    * update openapi.json & openapi-ts client

    ---------

    Co-authored-by: Harald Mack <[email protected]>
    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

commit 33d4f17
Author: Harald Mack <[email protected]>
Date:   Fri Nov 8 17:23:58 2024 +0100

    Add childquestions backend integration and refactor datainput datastructure (#138)

    * add childanswers and base answer model

    * add child question models

    * add question admin endpoints

    * make current tests work again

    * adjust imports, add test skeleton

    * add dummy questions to test fixtures

    * start working on backend tests

    * work more on backend tests and model inheritance

    * fix errors in test data

    * try to get sqlmodel inheritnace to work

    * get rid of inheritance in question models for now

    * finish user question tests

    * finish python test draft
MaHaWo added a commit that referenced this pull request Nov 14, 2024
commit 1e481ac
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 16:17:06 2024 +0100

    fix tests

commit 6079925
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date:   Wed Nov 13 15:06:43 2024 +0000

    update openapi.json & openapi-ts client

commit d207bab
Merge: 4b4a7e7 1496a3a
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 16:05:52 2024 +0100

    Merge branch 'main' into integrate-milestones-userland-with-backend

commit 4b4a7e7
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 15:42:41 2024 +0100

    adjust tests

commit 77ea2eb
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 15:24:26 2024 +0100

    fix backend error

commit 036f4ce
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date:   Wed Nov 13 13:14:35 2024 +0000

    update openapi.json & openapi-ts client

commit 2f64c56
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Wed Nov 13 13:13:52 2024 +0000

    [pre-commit.ci] auto fixes from pre-commit.com hooks

    for more information, see https://pre-commit.ci

commit ef560b7
Merge: 8fad755 43bf1b3
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 14:13:26 2024 +0100

    Merge branch 'main' into integrate-milestones-userland-with-backend

commit 8fad755
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 14:06:02 2024 +0100

    fix child data loading bug, adjust breadcrumb navigation

commit b6e1452
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 13:47:15 2024 +0100

    work on styling, change navigation to something hopefully more intuitive, make more use of localization

commit 3012086
Author: Harald Mack <[email protected]>
Date:   Tue Nov 12 19:00:06 2024 +0100

    adjust styling

commit eb136b3
Author: Harald Mack <[email protected]>
Date:   Tue Nov 12 14:38:56 2024 +0100

    simplify progress computation, include milestone completion feedback

commit efae46f
Author: Harald Mack <[email protected]>
Date:   Tue Nov 12 13:28:56 2024 +0100

    modify progress reporting to be only a userland feature

commit 1dd97f7
Author: Harald Mack <[email protected]>
Date:   Tue Nov 12 11:46:21 2024 +0100

    add completion status to the milestone models

commit 06b6a2a
Author: Harald Mack <[email protected]>
Date:   Tue Nov 12 11:41:54 2024 +0100

    fix card styling, error message

commit 4e58cf8
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 16:56:51 2024 +0100

    integrate milestone

commit 166c18f
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 15:44:20 2024 +0100

    get milestone loading right

commit 7db9480
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 11:10:51 2024 +0100

    adjust milestonegroup to backend data

commit e7709d5
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 09:53:32 2024 +0100

    make use of states

commit 84c3f17
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 09:03:59 2024 +0100

    Squashed commit of the following:

    commit 43bf1b3
    Author: Liam Keegan <[email protected]>
    Date:   Mon Nov 11 08:17:47 2024 +0100

        Add admin option to delete milestone images (#150)

        * Add admin option to delete milestone images

        - add delete button below existing milestone images in admin interface
        - add delete /milestone-images endpoint
        - restate /admin route for convenience during development, can be removed again later
        - resolves #98

        * update openapi.json & openapi-ts client

        ---------

        Co-authored-by: Harald Mack <[email protected]>
        Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

    commit 33d4f17
    Author: Harald Mack <[email protected]>
    Date:   Fri Nov 8 17:23:58 2024 +0100

        Add childquestions backend integration and refactor datainput datastructure (#138)

        * add childanswers and base answer model

        * add child question models

        * add question admin endpoints

        * make current tests work again

        * adjust imports, add test skeleton

        * add dummy questions to test fixtures

        * start working on backend tests

        * work more on backend tests and model inheritance

        * fix errors in test data

        * try to get sqlmodel inheritnace to work

        * get rid of inheritance in question models for now

        * finish user question tests

        * finish python test draft

commit d900c19
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 08:56:33 2024 +0100

    work on localization, add setup-await pattern to milestoneoverview

commit be2393d
Author: Harald Mack <[email protected]>
Date:   Fri Nov 8 15:30:24 2024 +0100

    make data a member of currentChild for now, start integrating backend calls

commit 2254332
Author: Harald Mack <[email protected]>
Date:   Fri Nov 8 14:51:20 2024 +0100

    merge add-childquestion_backend-integration until
    32304c9
Majapur1 pushed a commit that referenced this pull request Nov 14, 2024
…ucture (#138)

* add childanswers and base answer model

* add child question models

* add question admin endpoints

* make current tests work again

* adjust imports, add test skeleton

* add dummy questions to test fixtures

* start working on backend tests

* work more on backend tests and model inheritance

* fix errors in test data

* try to get sqlmodel inheritnace to work

* get rid of inheritance in question models for now

* finish user question tests

* finish python test draft
MaHaWo added a commit that referenced this pull request Nov 14, 2024
* merge add-childquestion_backend-integration until
32304c9

* make data a member of currentChild for now, start integrating backend calls

* work on localization, add setup-await pattern to milestoneoverview

* Squashed commit of the following:

commit 43bf1b3
Author: Liam Keegan <[email protected]>
Date:   Mon Nov 11 08:17:47 2024 +0100

    Add admin option to delete milestone images (#150)

    * Add admin option to delete milestone images

    - add delete button below existing milestone images in admin interface
    - add delete /milestone-images endpoint
    - restate /admin route for convenience during development, can be removed again later
    - resolves #98

    * update openapi.json & openapi-ts client

    ---------

    Co-authored-by: Harald Mack <[email protected]>
    Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

commit 33d4f17
Author: Harald Mack <[email protected]>
Date:   Fri Nov 8 17:23:58 2024 +0100

    Add childquestions backend integration and refactor datainput datastructure (#138)

    * add childanswers and base answer model

    * add child question models

    * add question admin endpoints

    * make current tests work again

    * adjust imports, add test skeleton

    * add dummy questions to test fixtures

    * start working on backend tests

    * work more on backend tests and model inheritance

    * fix errors in test data

    * try to get sqlmodel inheritnace to work

    * get rid of inheritance in question models for now

    * finish user question tests

    * finish python test draft

* make use of states

* adjust milestonegroup to backend data

* get milestone loading right

* integrate milestone

* fix card styling, error message

* add completion status to the milestone models

* modify progress reporting to be only a userland feature

* simplify progress computation, include milestone completion feedback

* adjust styling

* work on styling, change navigation to something hopefully more intuitive, make more use of localization

* fix child data loading bug, adjust breadcrumb navigation

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* update openapi.json & openapi-ts client

* fix backend error

* adjust tests

* update openapi.json & openapi-ts client

* fix tests

* correct merge error

* use tailwind for making labels visible/invisible

* work on layout

* update openapi.json & openapi-ts client

* remove searchByMilestone

* fix styling issue

* put progress computation into frontend

* update openapi.json & openapi-ts client

* remove debug output

* simplify progress computation

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
MaHaWo added a commit that referenced this pull request Nov 14, 2024
commit 7c01dce
Merge: 7ac5c7b 4e2a2ec
Author: Harald Mack <[email protected]>
Date:   Thu Nov 14 13:39:39 2024 +0100

    Merge branch 'integrate-milestones-userland-with-backend' of github.com:ssciwr/mondey into integrate-milestones-userland-with-backend

commit 7ac5c7b
Author: Harald Mack <[email protected]>
Date:   Thu Nov 14 13:39:35 2024 +0100

    remove debug output

commit 4e2a2ec
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date:   Thu Nov 14 12:39:35 2024 +0000

    update openapi.json & openapi-ts client

commit c9e4d97
Author: Harald Mack <[email protected]>
Date:   Thu Nov 14 13:38:11 2024 +0100

    put progress computation into frontend

commit 44100b0
Author: Harald Mack <[email protected]>
Date:   Thu Nov 14 12:59:41 2024 +0100

    fix styling issue

commit e233c63
Author: Harald Mack <[email protected]>
Date:   Thu Nov 14 12:47:22 2024 +0100

    remove searchByMilestone

commit 670bf04
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date:   Thu Nov 14 09:39:33 2024 +0000

    update openapi.json & openapi-ts client

commit 02841be
Author: Harald Mack <[email protected]>
Date:   Thu Nov 14 10:38:46 2024 +0100

    work on layout

commit 109ec0e
Author: Harald Mack <[email protected]>
Date:   Thu Nov 14 10:04:29 2024 +0100

    use tailwind for making labels visible/invisible

commit 42d239c
Author: Harald Mack <[email protected]>
Date:   Thu Nov 14 10:03:21 2024 +0100

    correct merge error

commit 1e481ac
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 16:17:06 2024 +0100

    fix tests

commit 6079925
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date:   Wed Nov 13 15:06:43 2024 +0000

    update openapi.json & openapi-ts client

commit d207bab
Merge: 4b4a7e7 1496a3a
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 16:05:52 2024 +0100

    Merge branch 'main' into integrate-milestones-userland-with-backend

commit 4b4a7e7
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 15:42:41 2024 +0100

    adjust tests

commit 77ea2eb
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 15:24:26 2024 +0100

    fix backend error

commit 036f4ce
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date:   Wed Nov 13 13:14:35 2024 +0000

    update openapi.json & openapi-ts client

commit 2f64c56
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Wed Nov 13 13:13:52 2024 +0000

    [pre-commit.ci] auto fixes from pre-commit.com hooks

    for more information, see https://pre-commit.ci

commit ef560b7
Merge: 8fad755 43bf1b3
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 14:13:26 2024 +0100

    Merge branch 'main' into integrate-milestones-userland-with-backend

commit 8fad755
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 14:06:02 2024 +0100

    fix child data loading bug, adjust breadcrumb navigation

commit b6e1452
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 13:47:15 2024 +0100

    work on styling, change navigation to something hopefully more intuitive, make more use of localization

commit 3012086
Author: Harald Mack <[email protected]>
Date:   Tue Nov 12 19:00:06 2024 +0100

    adjust styling

commit eb136b3
Author: Harald Mack <[email protected]>
Date:   Tue Nov 12 14:38:56 2024 +0100

    simplify progress computation, include milestone completion feedback

commit efae46f
Author: Harald Mack <[email protected]>
Date:   Tue Nov 12 13:28:56 2024 +0100

    modify progress reporting to be only a userland feature

commit 1dd97f7
Author: Harald Mack <[email protected]>
Date:   Tue Nov 12 11:46:21 2024 +0100

    add completion status to the milestone models

commit 06b6a2a
Author: Harald Mack <[email protected]>
Date:   Tue Nov 12 11:41:54 2024 +0100

    fix card styling, error message

commit 4e58cf8
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 16:56:51 2024 +0100

    integrate milestone

commit 166c18f
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 15:44:20 2024 +0100

    get milestone loading right

commit 7db9480
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 11:10:51 2024 +0100

    adjust milestonegroup to backend data

commit e7709d5
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 09:53:32 2024 +0100

    make use of states

commit 84c3f17
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 09:03:59 2024 +0100

    Squashed commit of the following:

    commit 43bf1b3
    Author: Liam Keegan <[email protected]>
    Date:   Mon Nov 11 08:17:47 2024 +0100

        Add admin option to delete milestone images (#150)

        * Add admin option to delete milestone images

        - add delete button below existing milestone images in admin interface
        - add delete /milestone-images endpoint
        - restate /admin route for convenience during development, can be removed again later
        - resolves #98

        * update openapi.json & openapi-ts client

        ---------

        Co-authored-by: Harald Mack <[email protected]>
        Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

    commit 33d4f17
    Author: Harald Mack <[email protected]>
    Date:   Fri Nov 8 17:23:58 2024 +0100

        Add childquestions backend integration and refactor datainput datastructure (#138)

        * add childanswers and base answer model

        * add child question models

        * add question admin endpoints

        * make current tests work again

        * adjust imports, add test skeleton

        * add dummy questions to test fixtures

        * start working on backend tests

        * work more on backend tests and model inheritance

        * fix errors in test data

        * try to get sqlmodel inheritnace to work

        * get rid of inheritance in question models for now

        * finish user question tests

        * finish python test draft

commit d900c19
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 08:56:33 2024 +0100

    work on localization, add setup-await pattern to milestoneoverview

commit be2393d
Author: Harald Mack <[email protected]>
Date:   Fri Nov 8 15:30:24 2024 +0100

    make data a member of currentChild for now, start integrating backend calls

commit 2254332
Author: Harald Mack <[email protected]>
Date:   Fri Nov 8 14:51:20 2024 +0100

    merge add-childquestion_backend-integration until
    32304c9
MaHaWo added a commit that referenced this pull request Nov 15, 2024
* use runes mode for login, add missing localization

* make better use of stores

* work on refresh-login logic

* Squashed commit of the following:

commit 1e481ac
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 16:17:06 2024 +0100

    fix tests

commit 6079925
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date:   Wed Nov 13 15:06:43 2024 +0000

    update openapi.json & openapi-ts client

commit d207bab
Merge: 4b4a7e7 1496a3a
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 16:05:52 2024 +0100

    Merge branch 'main' into integrate-milestones-userland-with-backend

commit 4b4a7e7
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 15:42:41 2024 +0100

    adjust tests

commit 77ea2eb
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 15:24:26 2024 +0100

    fix backend error

commit 036f4ce
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date:   Wed Nov 13 13:14:35 2024 +0000

    update openapi.json & openapi-ts client

commit 2f64c56
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Wed Nov 13 13:13:52 2024 +0000

    [pre-commit.ci] auto fixes from pre-commit.com hooks

    for more information, see https://pre-commit.ci

commit ef560b7
Merge: 8fad755 43bf1b3
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 14:13:26 2024 +0100

    Merge branch 'main' into integrate-milestones-userland-with-backend

commit 8fad755
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 14:06:02 2024 +0100

    fix child data loading bug, adjust breadcrumb navigation

commit b6e1452
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 13:47:15 2024 +0100

    work on styling, change navigation to something hopefully more intuitive, make more use of localization

commit 3012086
Author: Harald Mack <[email protected]>
Date:   Tue Nov 12 19:00:06 2024 +0100

    adjust styling

commit eb136b3
Author: Harald Mack <[email protected]>
Date:   Tue Nov 12 14:38:56 2024 +0100

    simplify progress computation, include milestone completion feedback

commit efae46f
Author: Harald Mack <[email protected]>
Date:   Tue Nov 12 13:28:56 2024 +0100

    modify progress reporting to be only a userland feature

commit 1dd97f7
Author: Harald Mack <[email protected]>
Date:   Tue Nov 12 11:46:21 2024 +0100

    add completion status to the milestone models

commit 06b6a2a
Author: Harald Mack <[email protected]>
Date:   Tue Nov 12 11:41:54 2024 +0100

    fix card styling, error message

commit 4e58cf8
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 16:56:51 2024 +0100

    integrate milestone

commit 166c18f
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 15:44:20 2024 +0100

    get milestone loading right

commit 7db9480
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 11:10:51 2024 +0100

    adjust milestonegroup to backend data

commit e7709d5
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 09:53:32 2024 +0100

    make use of states

commit 84c3f17
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 09:03:59 2024 +0100

    Squashed commit of the following:

    commit 43bf1b3
    Author: Liam Keegan <[email protected]>
    Date:   Mon Nov 11 08:17:47 2024 +0100

        Add admin option to delete milestone images (#150)

        * Add admin option to delete milestone images

        - add delete button below existing milestone images in admin interface
        - add delete /milestone-images endpoint
        - restate /admin route for convenience during development, can be removed again later
        - resolves #98

        * update openapi.json & openapi-ts client

        ---------

        Co-authored-by: Harald Mack <[email protected]>
        Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

    commit 33d4f17
    Author: Harald Mack <[email protected]>
    Date:   Fri Nov 8 17:23:58 2024 +0100

        Add childquestions backend integration and refactor datainput datastructure (#138)

        * add childanswers and base answer model

        * add child question models

        * add question admin endpoints

        * make current tests work again

        * adjust imports, add test skeleton

        * add dummy questions to test fixtures

        * start working on backend tests

        * work more on backend tests and model inheritance

        * fix errors in test data

        * try to get sqlmodel inheritnace to work

        * get rid of inheritance in question models for now

        * finish user question tests

        * finish python test draft

commit d900c19
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 08:56:33 2024 +0100

    work on localization, add setup-await pattern to milestoneoverview

commit be2393d
Author: Harald Mack <[email protected]>
Date:   Fri Nov 8 15:30:24 2024 +0100

    make data a member of currentChild for now, start integrating backend calls

commit 2254332
Author: Harald Mack <[email protected]>
Date:   Fri Nov 8 14:51:20 2024 +0100

    merge add-childquestion_backend-integration until
    32304c9

* remove old userStore, remove separate adminstore, remove old basicStore, adjustments for convenience

* Squashed commit of the following:

commit 7c01dce
Merge: 7ac5c7b 4e2a2ec
Author: Harald Mack <[email protected]>
Date:   Thu Nov 14 13:39:39 2024 +0100

    Merge branch 'integrate-milestones-userland-with-backend' of github.com:ssciwr/mondey into integrate-milestones-userland-with-backend

commit 7ac5c7b
Author: Harald Mack <[email protected]>
Date:   Thu Nov 14 13:39:35 2024 +0100

    remove debug output

commit 4e2a2ec
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date:   Thu Nov 14 12:39:35 2024 +0000

    update openapi.json & openapi-ts client

commit c9e4d97
Author: Harald Mack <[email protected]>
Date:   Thu Nov 14 13:38:11 2024 +0100

    put progress computation into frontend

commit 44100b0
Author: Harald Mack <[email protected]>
Date:   Thu Nov 14 12:59:41 2024 +0100

    fix styling issue

commit e233c63
Author: Harald Mack <[email protected]>
Date:   Thu Nov 14 12:47:22 2024 +0100

    remove searchByMilestone

commit 670bf04
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date:   Thu Nov 14 09:39:33 2024 +0000

    update openapi.json & openapi-ts client

commit 02841be
Author: Harald Mack <[email protected]>
Date:   Thu Nov 14 10:38:46 2024 +0100

    work on layout

commit 109ec0e
Author: Harald Mack <[email protected]>
Date:   Thu Nov 14 10:04:29 2024 +0100

    use tailwind for making labels visible/invisible

commit 42d239c
Author: Harald Mack <[email protected]>
Date:   Thu Nov 14 10:03:21 2024 +0100

    correct merge error

commit 1e481ac
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 16:17:06 2024 +0100

    fix tests

commit 6079925
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date:   Wed Nov 13 15:06:43 2024 +0000

    update openapi.json & openapi-ts client

commit d207bab
Merge: 4b4a7e7 1496a3a
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 16:05:52 2024 +0100

    Merge branch 'main' into integrate-milestones-userland-with-backend

commit 4b4a7e7
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 15:42:41 2024 +0100

    adjust tests

commit 77ea2eb
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 15:24:26 2024 +0100

    fix backend error

commit 036f4ce
Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Date:   Wed Nov 13 13:14:35 2024 +0000

    update openapi.json & openapi-ts client

commit 2f64c56
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date:   Wed Nov 13 13:13:52 2024 +0000

    [pre-commit.ci] auto fixes from pre-commit.com hooks

    for more information, see https://pre-commit.ci

commit ef560b7
Merge: 8fad755 43bf1b3
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 14:13:26 2024 +0100

    Merge branch 'main' into integrate-milestones-userland-with-backend

commit 8fad755
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 14:06:02 2024 +0100

    fix child data loading bug, adjust breadcrumb navigation

commit b6e1452
Author: Harald Mack <[email protected]>
Date:   Wed Nov 13 13:47:15 2024 +0100

    work on styling, change navigation to something hopefully more intuitive, make more use of localization

commit 3012086
Author: Harald Mack <[email protected]>
Date:   Tue Nov 12 19:00:06 2024 +0100

    adjust styling

commit eb136b3
Author: Harald Mack <[email protected]>
Date:   Tue Nov 12 14:38:56 2024 +0100

    simplify progress computation, include milestone completion feedback

commit efae46f
Author: Harald Mack <[email protected]>
Date:   Tue Nov 12 13:28:56 2024 +0100

    modify progress reporting to be only a userland feature

commit 1dd97f7
Author: Harald Mack <[email protected]>
Date:   Tue Nov 12 11:46:21 2024 +0100

    add completion status to the milestone models

commit 06b6a2a
Author: Harald Mack <[email protected]>
Date:   Tue Nov 12 11:41:54 2024 +0100

    fix card styling, error message

commit 4e58cf8
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 16:56:51 2024 +0100

    integrate milestone

commit 166c18f
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 15:44:20 2024 +0100

    get milestone loading right

commit 7db9480
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 11:10:51 2024 +0100

    adjust milestonegroup to backend data

commit e7709d5
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 09:53:32 2024 +0100

    make use of states

commit 84c3f17
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 09:03:59 2024 +0100

    Squashed commit of the following:

    commit 43bf1b3
    Author: Liam Keegan <[email protected]>
    Date:   Mon Nov 11 08:17:47 2024 +0100

        Add admin option to delete milestone images (#150)

        * Add admin option to delete milestone images

        - add delete button below existing milestone images in admin interface
        - add delete /milestone-images endpoint
        - restate /admin route for convenience during development, can be removed again later
        - resolves #98

        * update openapi.json & openapi-ts client

        ---------

        Co-authored-by: Harald Mack <[email protected]>
        Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

    commit 33d4f17
    Author: Harald Mack <[email protected]>
    Date:   Fri Nov 8 17:23:58 2024 +0100

        Add childquestions backend integration and refactor datainput datastructure (#138)

        * add childanswers and base answer model

        * add child question models

        * add question admin endpoints

        * make current tests work again

        * adjust imports, add test skeleton

        * add dummy questions to test fixtures

        * start working on backend tests

        * work more on backend tests and model inheritance

        * fix errors in test data

        * try to get sqlmodel inheritnace to work

        * get rid of inheritance in question models for now

        * finish user question tests

        * finish python test draft

commit d900c19
Author: Harald Mack <[email protected]>
Date:   Mon Nov 11 08:56:33 2024 +0100

    work on localization, add setup-await pattern to milestoneoverview

commit be2393d
Author: Harald Mack <[email protected]>
Date:   Fri Nov 8 15:30:24 2024 +0100

    make data a member of currentChild for now, start integrating backend calls

commit 2254332
Author: Harald Mack <[email protected]>
Date:   Fri Nov 8 14:51:20 2024 +0100

    merge add-childquestion_backend-integration until
    32304c9

* merge main

* work on removing svelte 5 deprecations and leftover debug output

* reduce usage of deprecated functionality

* undo some breaking changes

* remove svelte:component in carddisplay

* remove flowbite gallery

* use runes in gallerydisplay

* try to fix some code smells/typing issues

* use more svelte 5 features, correct minor mistakes and type issues

* activate more biome linter rules

* relax any and console rule

* work on gallerydisplay code issues

* work on code quality of carddisplay

* add type to util file

* allow forEach, console. log

* work on code quality

* work on fixing code quality issues uncovered by biome

* add nonempty block

* add better output

* adjust styling, codegen

* remove old tests that will be replaced with cypress tests in the future

* remove old backend stuff

* update openapi.json & openapi-ts client

* reorganize testable functionality  - most likely temporary

* fix comparison

* add functionality to frontpage button

* adjust styling of frontpagecard

* use more localization

* add corrections from review

* add missing locale checks

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
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.

Add ChildQuestionAnswer and UserQuestionAnswer add ChildQuestions
3 participants