Livio Bieri
daaecb57a0
fix: use trainer url
2023-09-28 17:45:00 +02:00
Livio Bieri
4672698895
wip: appointment filtering poc
2023-09-28 17:45:00 +02:00
Christian Cueni
7c6d448268
Change feedback order
2023-09-28 15:27:06 +02:00
Livio Bieri
dbe74f754b
chore: more tests for mobile navigation
2023-09-28 09:38:48 +02:00
Livio Bieri
5247b6061b
chore: navigation tests (desktop)
2023-09-28 09:38:48 +02:00
Daniel Egger
966533e13b
Add feedback trainer cypress test
2023-09-26 18:48:25 +02:00
Daniel Egger
89e068fb09
Add cypress test for student
2023-09-26 14:34:22 +02:00
Daniel Egger
497f3a8f68
Make text responses mandatory
2023-09-26 13:50:35 +02:00
Daniel Egger
7a037e05ec
Remove automatic feedback creation in prepare scripts
2023-09-26 13:43:44 +02:00
Daniel Egger
3ae215296b
Remove console.logs
2023-09-26 13:43:44 +02:00
Daniel Egger
0444658ce3
Fix unit tests
2023-09-26 13:43:44 +02:00
Daniel Egger
733063399f
VBV-525: Feedback can only be sent once per person
2023-09-26 13:43:44 +02:00
Daniel Egger
70655935b0
VBV-525: Refactor feedback submission
2023-09-26 13:43:44 +02:00
Daniel Egger
ce15054340
VBV-525: Fix feedback rendering
2023-09-26 13:43:44 +02:00
Christian Cueni
5edf573471
Update translation files, remove locize sync
2023-09-26 12:48:26 +02:00
Christian Cueni
4b6cdef08e
Add title and border
2023-09-25 14:34:56 +02:00
Livio Bieri
18a6eecb49
Merged in feature/VBV-515-preview (pull request #205 )
...
WIP Feature/VBV-515 preview
Approved-by: Daniel Egger
2023-09-21 08:06:30 +00:00
Reto Aebersold
6232901060
Make Circle drop-down full width on mobile
2023-09-21 09:53:27 +02:00
Reto Aebersold
475b0851d6
Add warning if no Circle can / has been selected
2023-09-21 09:38:50 +02:00
Reto Aebersold
d673f2fdc9
User status only for selected circle
2023-09-20 19:01:39 +02:00
Livio Bieri
9020692ea9
fix: linting
2023-09-20 18:46:31 +02:00
Livio Bieri
46faea8c1c
cleanup: navigation (duplicated code, logic)
2023-09-20 18:21:25 +02:00
Livio Bieri
fac25e6089
fix: snafu from merge :(
2023-09-20 18:21:01 +02:00
Livio Bieri
f6d7f6e89e
Merge remote-tracking branch 'origin/develop' into feature/VBV-515-preview
...
# Conflicts:
# client/src/components/dueDates/DueDateSingle.vue
# client/src/components/header/MainNavigationBar.vue
# client/src/components/header/MobileMenu.vue
# client/src/pages/cockpit/cockpitPage/CockpitDates.vue
2023-09-20 17:33:01 +02:00
Livio Bieri
1e27f80949
refactor: main navigation, reduce duplication
2023-09-20 17:16:35 +02:00
Livio Bieri
93f05e4722
fix: mobile menu
2023-09-20 17:16:07 +02:00
Livio Bieri
fa22f5a18e
workaround: disable due date links for experts
2023-09-20 16:39:12 +02:00
Livio Bieri
5e8554acda
feat: added preview bar
2023-09-20 16:38:45 +02:00
Reto Aebersold
4ba12cbec8
Singe circle selection
2023-09-20 15:32:21 +02:00
Daniel Egger
abddf3079a
Fix mobile navigation and minor mobile problems
2023-09-18 19:04:49 +02:00
Livio Bieri
326e42c99f
wip: course preview poc
2023-09-16 22:27:19 +02:00
Daniel Egger
db40368244
VBV-514: Termine nur für ausgewählte Circles anzeigen im Cockpit
2023-09-15 14:50:52 +02:00
Daniel Egger
dbd6b31895
Add cypress tests
2023-09-15 12:21:42 +02:00
Daniel Egger
e6fbf0d276
Fix link in to KompetenzNavi in main navigation bar
2023-09-15 10:59:44 +02:00
Daniel Egger
9eec62c31b
Fix problems with slugs in moved ActionCompetences
2023-09-15 09:47:17 +02:00
Daniel Egger
b4638e372f
Open Assignment evaluation on last step when not in progress
2023-09-14 17:31:00 +02:00
Daniel Egger
00a36b52c8
Übersetzungen
2023-09-14 17:01:42 +02:00
Daniel Egger
83fcb84303
Add "Kompetenznachweis"-text to AssignmentIntroductionView
2023-09-14 15:57:35 +02:00
Daniel Egger
c7e443a4e3
Style changes in circle page
2023-09-14 15:24:12 +02:00
Daniel Egger
45da2ab7d7
Übersetzungen
2023-09-14 15:07:26 +02:00
Daniel Egger
e7bbf961d5
Cockpit Mobile Anpassungen
2023-09-14 14:28:06 +02:00
Daniel Egger
2c26a336ac
Mobile Anpassungen Kompetenzprofil
2023-09-14 13:40:20 +02:00
Daniel Egger
dfa03baa25
Handle closing of self evaluation in KompetenzNavi
2023-09-14 13:19:43 +02:00
Daniel Egger
5dfdd470ae
Add PerformanceCriteria page
2023-09-13 18:45:07 +02:00
Daniel Egger
e5d6dd60f6
Add ActionCompetences page
2023-09-13 15:42:32 +02:00
Daniel Egger
dbab03228b
Show result in EdoniqTestBlock
2023-09-08 16:56:24 +02:00
Daniel Egger
2e4ba6ad53
VBV-515: Kompetenznachweis mit 0 Punkten
2023-09-08 16:48:06 +02:00
Daniel Egger
e43e351e9d
Refactor design of learning contents in circle page
2023-09-08 16:47:38 +02:00
Daniel Egger
853c8746ea
VBV-329: Add link to competence certificate in circle view
2023-09-08 16:47:38 +02:00
Daniel Egger
9b654975c0
Mark translation keys
2023-09-08 16:47:37 +02:00
Daniel Egger
fde7e2edef
Add performanceCriteriaStatusCount to index page
2023-09-08 16:47:37 +02:00
Daniel Egger
24511df01e
Add competence detail page
2023-09-08 16:47:37 +02:00
Daniel Egger
93bec05abc
Add competence detail page
2023-09-08 16:47:37 +02:00
Daniel Egger
aabaced836
Fix creation scripts
2023-09-08 16:47:37 +02:00
Daniel Egger
cce82b72ad
Format code
2023-09-08 16:47:37 +02:00
Daniel Egger
08edf98e2a
More work on frontend
2023-09-08 16:47:37 +02:00
Daniel Egger
1196aba79d
Show result in EdoniqTestBlock
2023-09-08 16:47:33 +02:00
Daniel Egger
2569411959
Fix upsert on initial loading of assignment in circle
2023-09-08 16:46:54 +02:00
Daniel Egger
9f81def537
Show evaluation points in KompetenzNavi
2023-09-08 16:46:54 +02:00
Daniel Egger
21174d17db
Attach completion data to `Assignment` in GraphQL schema
2023-09-08 16:46:54 +02:00
Daniel Egger
4bc1ca636c
Add result data for edoniq test
2023-09-08 16:46:54 +02:00
Daniel Egger
428ac294e0
Add `--create-assignment-evaulation` cli parameter
2023-09-08 16:46:54 +02:00
Daniel Egger
2430c02584
Add initial KompetenzNavi Frontend
2023-09-08 16:46:53 +02:00
Daniel Egger
c59c44f1dd
Move old competence frontend code to "competence-old"
2023-09-08 16:46:53 +02:00
Daniel Egger
a95974c54f
Extend graphql scheme for KompetenzNavi
2023-09-08 16:46:53 +02:00
Daniel Egger
0537d96dbb
Add models for KompetenzNavi and GraphQL-Types
2023-09-08 16:46:53 +02:00
Daniel Egger
abf83b9fb8
VBV-512: Anwesenheit erneut bearbeiten
2023-09-08 15:32:10 +02:00
Daniel Egger
4909b38428
Translations assignment frontend
2023-09-08 15:11:59 +02:00
Daniel Egger
bc011e47be
VBV-489: Open external links in new tab in assignment
2023-09-08 11:36:57 +02:00
Daniel Egger
06a3706d29
VBV-489: Übersetzungen
2023-09-08 09:53:43 +02:00
Daniel Egger
515ef3707a
Bugfix: load only assignment completion data with given learning_content_id. Will fix bug with Reflexion
2023-09-06 17:31:27 +02:00
Daniel Egger
6175ca75ed
Add circle title to dropdown text
2023-09-06 16:58:49 +02:00
Daniel Egger
abe923b2e4
Fix bug so that you can select different attendance courses
2023-09-06 16:47:38 +02:00
Daniel Egger
da56f2a346
Refactor Notification model
2023-08-30 18:47:36 +02:00
Daniel Egger
f155ceb26b
Fix importer in default prepare_server
2023-08-24 08:06:32 +02:00
Daniel Egger
9f8686e592
Improve django admin
2023-08-23 19:06:32 +02:00
Daniel Egger
acdda923da
Make `start` in DueDate mandatory
2023-08-23 15:38:26 +02:00
Daniel Egger
969c55f15d
Sort dueDates by start date
2023-08-23 15:38:26 +02:00
Daniel Egger
2fa17e1204
Refactor dueDate frontent
2023-08-23 15:38:26 +02:00
Daniel Egger
279b6c1dd5
Refactor some fields in `DueDate`
2023-08-23 15:38:26 +02:00
Christian Cueni
a8819296e2
Make importer more resilient
2023-08-23 14:20:27 +02:00
Christian Cueni
9e68abd5f9
Add CourseSessionEdoniqTest to importer
...
Add tests for CourseSessionEdoniqTest
2023-08-23 07:33:29 +02:00
Christian Cueni
c140f225ea
Add Edoniq testblock
...
WIP: Add sso code
Update content name
WIP: Add redirect endpoint
mend
Fix after rebase
WIP: Update model
WIP: Add extended time test url
Update trufflehog config, use sso
Update test
2023-08-23 07:33:29 +02:00
Christian Cueni
81351aa9fa
Exclude email, fix dates, don't check "Geburtsdatum" field
2023-08-17 14:41:47 +02:00
Christian Cueni
ee33d999d1
Fix sort date (move dates with no end date to the back
2023-08-17 11:42:59 +02:00
Christian Cueni
45a70f6b75
Merged in feature/update-importer (pull request #188 )
...
Feature/update importer
2023-08-17 09:18:22 +00:00
Christian Cueni
57cd5fe871
Match existing Teilnehmer with multiple parameters
2023-08-17 08:11:15 +02:00
Christian Cueni
2f8b548ea7
Merged in fix/dates (pull request #187 )
...
Fix/dates
2023-08-16 14:18:13 +00:00
Christian Cueni
c622db7e22
Remove unusable link, don't open in blank
2023-08-16 15:31:14 +02:00
Christian Cueni
0bbd1a830d
Add missing translations
2023-08-16 14:49:07 +02:00
Christian Cueni
6195c9d32a
Use page id for feedbacks, filter by course session id
2023-08-14 19:57:31 +02:00
Christian Cueni
a411cc82d1
Fix missing "contact trainer"-functionality
2023-08-14 18:04:35 +02:00
Christian Cueni
f1f479a6f4
Add due date for casework
2023-08-14 17:20:33 +02:00
Elia Bieri
adc9e763f2
Merged in bugfix/VBV-344-auftrag-frontend-trainer-mobile (pull request #171 )
...
VBV-344- Improve assignment grading layout on mobile
* Improve assignment grading layout on mobile
Approved-by: Christian Cueni
2023-08-10 07:24:35 +00:00
Elia Bieri
667ef96b14
Merged in bugfix/VBV-470-abgabe-aufträge-homogenisierung (pull request #166 )
...
Bugfix/VBV-470 Homogenisierung Abgabe Aufträge
* Make feedback non-checkable without submission
* Submit preparation_assignment on close
# Conflicts:
# client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
* Also submit reflection on close
* Fix CourseSessionCompletionData reloading
* User can self toggle LearningContentFeedback completion
* Show submission view for all assignments
* Fix cockpit for condition acceptance
* Close assignments after submission
Approved-by: Dario Aebersold
Approved-by: Daniel Egger
2023-08-03 06:32:47 +00:00
Christian Cueni
6083ab8c92
Add demo courses again
2023-08-03 08:06:55 +02:00
Christian Cueni
b746e235d3
Update login page
2023-08-03 07:37:56 +02:00
Christian Cueni
28b2265465
Add prepwork IT/FR, add link to allowed features
2023-08-02 18:34:15 +02:00
Elia Bieri
3a2d12c0b9
Merged in feature/VBV-474-auftragstyp-condition-acceptance (pull request #173 )
...
Add CONDITION_ACCEPTANCE assignment type
* Add CONDITION_ACCEPTANCE assignment type
* Add translations
* Create default CONDITION_ACCEPTANCE assignment
* Move CONDITION_ACCEPTANCE assignment in learning sequence
* Add additional translations
* Add condition acceptance to ÜK basis circle
# Conflicts:
# server/vbv_lernwelt/course/management/commands/create_default_courses.py
* Move condition acceptance to kickoff circle
2023-08-02 08:13:35 +00:00
Christian Cueni
4486cb10cf
Add uk texts on dashboard
2023-07-24 13:17:28 +02:00
Christian Cueni
031b16c19c
Add uk Text on login page
2023-07-24 13:17:28 +02:00
Daniel Egger
815d81a471
Simplify media library models
2023-07-21 13:56:09 +02:00
Daniel Egger
4d9aa07b2d
Merged in feature/VBV-460-user-profile-circle-read-only (pull request #162 )
...
Bugfix VBV-460: show read-only circle view in cockpit
Approved-by: Elia Bieri
2023-07-21 06:41:57 +00:00
Daniel Egger
0798efc7f2
Merged in feature/VBV-453-graphql-learningpath-server (pull request #161 )
...
Feature/VBV-453 graphql learningpath server
Approved-by: Elia Bieri
2023-07-21 06:40:25 +00:00
Elia Bieri
b970597a81
Merged in feature/VBV-451-anwesenheitskontrolle-frontend (pull request #150 )
...
VBV-451 Anwesenheitskontrolle frontend & neues Cockpit
* Regenerate graphql types after rebase
* Fix grading progress
* Fix cypress tests
* Fix circle selection and add CourseSessionAssignment for Fahrzeug Vorbereitungsauftrag
* Use `LearningContentAssignment` explictly
* Improve type safety without `as`
* Disable feedback details button when no feedback
* Extend submission overview titles after review
* Improve attendance check state handling
* Minor translation/wording fixes
Approved-by: Daniel Egger
2023-07-20 16:22:28 +00:00
Daniel Egger
b2eb88b972
Bugfix VBV-460: show read-only circle view in cockpit
2023-07-18 13:30:21 +02:00
Daniel Egger
eb50fb0b59
Update generated types
2023-07-18 09:45:59 +02:00
Christian Cueni
6e9d87797e
Fix css
2023-07-18 07:46:18 +02:00
Daniel Egger
e208fdabbc
Change after making UUIDs
2023-07-14 17:13:21 +02:00
Daniel Egger
f25602c84c
Change types to use UUID ids
2023-07-14 14:55:45 +02:00
Daniel Egger
76e53a205c
Improve error handling a bit...
2023-07-14 13:15:28 +02:00
Daniel Egger
c97ec9b399
Adapt AssignmentCompletion model to include page_id
2023-07-12 19:06:51 +02:00
Elia Bieri
4b0a881055
Merged in feature/VBV-326-auftrag-benachrichtigungen-rebased (pull request #157 )
...
Feature/VBV-326 auftrag benachrichtigungen rebased
* Implement notifications for assignments
# Conflicts:
# server/vbv_lernwelt/assignment/services.py
* Add cypress test for student assignment submission
* Update django-notifications-hq
* Rework
Approved-by: Daniel Egger
2023-07-12 14:32:49 +00:00
Daniel Egger
dfefdb52ca
Fix typecheck errors
2023-07-12 11:47:16 +02:00
Daniel Egger
c1f29a02a0
Fix problems after rebase
2023-07-12 10:21:23 +02:00
Daniel Egger
9e5e2e10b7
Fix bug with performance criteria
2023-07-12 10:21:23 +02:00
Daniel Egger
0dbca05892
Fix course_session_id
2023-07-12 10:21:23 +02:00
Daniel Egger
3d4654efbc
Mark LearningContentAssignment completion in backend
2023-07-12 10:21:23 +02:00
Daniel Egger
36152a4364
Do not auto mark completion if the user should not be able to do it
2023-07-12 10:21:23 +02:00
Daniel Egger
1b7a3a401e
VBV-459: Add flag for user course completion self toggle
2023-07-12 10:21:23 +02:00
Daniel Egger
3bd489d2ae
Refactor `CourseCompletion` model
2023-07-12 10:21:23 +02:00
Daniel Egger
ab8dbd09ef
Working with enums in graphql...
2023-07-12 10:21:23 +02:00
Daniel Egger
eb0b03f413
Create mutation with test case
2023-07-12 10:21:23 +02:00
Daniel Egger
a75bb14e4c
Add simple graphql types for CourseSessionAttendanceCourse
2023-07-12 10:21:22 +02:00
Daniel Egger
282e62ef6f
"start" not "end" should be mandatory
2023-07-12 09:59:29 +02:00
Daniel Egger
c4d10badf6
Standardize name `duedates` to `due_dates`
2023-07-12 09:15:21 +02:00
Daniel Egger
ba7533614d
Format [Uhr] for single dates
2023-07-11 18:13:11 +02:00
Daniel Egger
5890e908f2
Add CourseSessionAssignment to serializer
2023-07-11 17:42:30 +02:00
Lorenz Padberg
bf3582d338
Fix linting
2023-07-11 11:23:36 +02:00
Lorenz Padberg
9911117df5
Resolve comments from Pullrequest
2023-07-11 11:19:00 +02:00
Lorenz Padberg
b06fc4bcbf
Add translations
2023-07-11 11:02:39 +02:00
Lorenz Padberg
57143a0209
Fix Types
2023-07-10 13:47:23 +02:00
Lorenz Padberg
24d816f950
Remove import defineprops
2023-07-10 13:47:23 +02:00
Lorenz Padberg
e0dbdde7cd
Fix Linting errors
2023-07-10 13:47:23 +02:00
Lorenz Padberg
858541134e
Add due date formatting to Attendance course
2023-07-10 13:47:23 +02:00
Lorenz Padberg
a7d17f7b69
Add date embedding to assigment submission date
2023-07-10 13:47:23 +02:00
Lorenz Padberg
b2a7c2e282
Add DateEmbedding component
2023-07-10 13:47:12 +02:00
Lorenz Padberg
77aacfc01c
Refactor Styleing
2023-07-10 13:46:56 +02:00
Lorenz Padberg
1671abe512
Refactor Duedates List to new design
2023-07-10 13:46:56 +02:00
Daniel Egger
a5acc66981
VBV-450: Custom CourseSessionAttendanceCourse model
2023-07-10 13:46:56 +02:00
Lorenz Padberg
e631cc4d13
Add Weekday to long list
2023-07-10 13:46:56 +02:00
Lorenz Padberg
ffefa520e1
Fix typechecker
2023-07-10 13:46:56 +02:00
Lorenz Padberg
e7917a6cdb
Fix linting errors
2023-07-10 13:46:56 +02:00
Lorenz Padberg
9bb3c93cfb
Use Due Dates from all course Sessions for Dashboard
2023-07-10 13:46:56 +02:00
Lorenz Padberg
89ff4af3c8
Refactoring
2023-07-10 13:46:56 +02:00
Lorenz Padberg
7ccc771ca7
Add DueDatesLongList to dashboard
2023-07-10 13:46:56 +02:00
Lorenz Padberg
639683c06d
Add DueDatesFrontendComponents
2023-07-10 13:46:56 +02:00
Lorenz Padberg
b92ac8b08a
Add duedates to frontend
2023-07-10 13:46:55 +02:00
Daniel Egger
a692c819ee
Add generated types so that they can be referenced in code
2023-07-07 18:43:57 +02:00
Daniel Egger
2fdae7c120
Use different naming convention for GraphQL types
2023-07-07 18:43:57 +02:00