Commit Graph

708 Commits

Author SHA1 Message Date
Daniel Egger f33433b77d Merge branch 'develop' into feature/VBV-297-trainer-landet-direkt-in-cockpit 2023-05-26 09:39:44 +02:00
Christian Cueni 3ae4dbdf8d Merged in feature/VBV-379-ui-cleanup (pull request #94)
Feature/VBV-379 ui cleanup

Approved-by: Daniel Egger
2023-05-26 06:57:54 +00:00
Christian Cueni b58405f568 Merged in feature/VBV-318-dashboard (pull request #90)
Remove fake content

Approved-by: Daniel Egger
2023-05-26 06:54:06 +00:00
Daniel Egger 4b06654954 Merged in feature/VBV-278-vorbereitungsauftrag (pull request #96)
Feature/VBV-278 vorbereitungsauftrag

Approved-by: Elia Bieri
2023-05-25 16:31:41 +00:00
Christian Cueni 0c06a169bc Use v-if 2023-05-25 14:39:20 +02:00
Elia Bieri ace5b5b21c Fix JS tests 2023-05-25 14:08:53 +02:00
Elia Bieri f5e367d467 Fix typecheck 2023-05-25 13:40:00 +02:00
Elia Bieri db35a037eb Jump to cockpit for trainers and superusers 2023-05-25 13:34:23 +02:00
Christian Cueni abefe878da Set duration default to 0, hide duration info if 0 2023-05-25 11:57:01 +02:00
Elia Bieri 1908665596 Merged in feature/VBV-377-umsetzung-das-lernst-du-in-diese (pull request #93)
Umsetzung: das lernst du in diesem Circle

Approved-by: Christian Cueni
2023-05-25 09:47:25 +00:00
Christian Cueni 6816ad8388 Add language parameter to SSO 2023-05-25 09:08:31 +02:00
Daniel Egger 3293e7bb45 Use title 2023-05-24 15:23:04 +02:00
Daniel Egger 0f0d1632a7 VBV-279: Inhaltstyp Reflexion 2023-05-24 15:20:47 +02:00
Daniel Egger 9b5516a1bf Show correct badge vor "Vorbereitungsauftrag" 2023-05-24 15:20:28 +02:00
Daniel Egger de320be3cb Provide LearningContent to badge logic 2023-05-24 15:19:52 +02:00
Daniel Egger 9be0ce9d39 Frontend: "Vorbereitungsauftrag" 2023-05-24 15:19:49 +02:00
Christian Cueni 3a6a143b7c Fix type, remove FAQ from footer 2023-05-24 14:51:02 +02:00
Christian Cueni a7986085ba Add fake "no events" text 2023-05-24 14:46:12 +02:00
Christian Cueni fac1f53f29 Fix footer, add it 2023-05-24 13:37:24 +02:00
Elia Bieri 322077ec82 Rework CircleOverview modal 2023-05-24 11:24:18 +02:00
Christian Cueni b2e9873666 Show plural of "Benachrichtigung" 2023-05-24 08:14:03 +02:00
Christian Cueni 5e01de2d72 Remove fake profile 2023-05-24 07:29:40 +02:00
Elia Bieri 09dcfcc418 Implement additional fields 2023-05-23 16:43:18 +02:00
Elia Bieri b7cdc0ddde Add attendance course start- and endtime 2023-05-23 15:35:19 +02:00
Elia Bieri 132c115e8b Rename attendance days to attendance courses 2023-05-23 15:34:59 +02:00
Christian Cueni 7e1bfffac1 Remove fake content 2023-05-22 12:57:25 +02:00
Daniel Egger bc368e7a2f Fix cypress tests 2023-05-19 14:50:41 +02:00
Daniel Egger 4fb534aa25 Create `create_course_uk_de_completion_data` with algo 2023-05-19 14:05:14 +02:00
Daniel Egger decba980f5 Rework Media Library 2023-05-19 10:17:25 +02:00
Daniel Egger e1b0add09b Hide Media Library navbar icon on mobile 2023-05-19 10:17:24 +02:00
Daniel Egger e8d6a9c784 Embed media library as course session specific page 2023-05-19 10:17:24 +02:00
Daniel Egger 38d753de42 Add "media library" navigation link 2023-05-19 10:17:24 +02:00
Daniel Egger 4d4b6c5405 Fiddle with height of notification icon 2023-05-19 10:17:24 +02:00
Daniel Egger a0593bbacd Remove debug stuff 2023-05-19 10:02:35 +02:00
Daniel Egger bcc42eaf83 Make `useCurrentCourseSession` reactive 2023-05-19 09:58:55 +02:00
Daniel Egger eaf12fbc87 Readd comments 2023-05-17 19:30:10 +02:00
Elia Bieri 1d97ec9dcf Make composable reactive 2023-05-17 19:30:10 +02:00
Daniel Egger 8793b30b56 Add comments for documentation 2023-05-17 19:30:10 +02:00
Daniel Egger 2f9fbed8f5 Access courseSession by `useCurrentCourseSession` 2023-05-17 19:30:10 +02:00
Daniel Egger 44131f1d8b Refactor loading of course sessions 2023-05-17 19:30:10 +02:00
Daniel Egger 518b8c2ad0 Merge branch 'develop' into feature/VBV-331-inhaltstyp-statischer-text 2023-05-17 19:11:37 +02:00
Daniel Egger 9e3124160a Add some test data and clean up some things 2023-05-17 19:09:33 +02:00
Elia Bieri 4d614b10cc Fix circle diagram text 2023-05-17 15:19:16 +02:00
Elia Bieri bec2348c79 Format code 2023-05-17 13:58:32 +02:00
Elia Bieri 849e49c433 Minor fixes 2023-05-17 13:42:16 +02:00
Elia Bieri e69004c1f2 Run GraphQL codegen concurrently with vite 2023-05-17 11:23:36 +02:00
Elia Bieri 652cd7d8fb Implement RichTextBlock 2023-05-17 10:59:21 +02:00
Daniel Egger 8d879ba981 Add graqhql introspection schema 2023-05-16 17:08:54 +02:00
Daniel Egger 31dae0a5cd VBV-306: Use GraphQL for assignment code 2023-05-15 19:07:06 +02:00
Daniel Egger e130d65f37 Merged in feature/VBV-339-assignment-cypress-test (pull request #79)
Feature/VBV-339 assignment cypress test UNFINISHED

* Create assignment submission test data for cypress test

* Add first assignment trainer test

* Add first cypress test which checks DB entry with all instrumentation
2023-05-12 14:33:14 +00:00
Daniel Egger b313bad031 Rename field `type` to `content_type` in REST response
In Wagtail Grapple/GraphQL the field is already called `content_type`
2023-05-12 13:38:35 +02:00
Daniel Egger a15af2bf86 VBV-350: Refactor LearningContent to individual wagtail pages 2023-05-12 11:51:02 +02:00
Elia Bieri 3858cdfc79 Merged in bugfix/auftrag_ui_test_rework (pull request #80)
Auftrag UI Test rework

* UI test rework

* Fix cypress tests
2023-05-11 12:48:33 +00:00
Christian Cueni 3ad18057af Update input fields font feature 2023-05-11 14:05:01 +02:00
Elia Bieri f3c599c344 Merged in feature/strengthen_lint_rules (pull request #77)
Strengthen lint rules

* Strengthen lint rules

* Fix linting errors

# Conflicts:
#	client/src/components/learningPath/LearningPathDiagram.vue
#	client/src/components/learningPath/LearningPathViewVertical.vue

* Add no-required-prop-with-default rule

# Conflicts:
#	client/src/components/learningPath/LearningPathDiagram.vue

* Fix typechecks

* Reformat eslintrc
2023-05-11 09:52:10 +00:00
Elia Bieri 2e974dc323 Merged in bugfix/VBV-308-bereinigung-altes-lernpfad-diagramm (pull request #74)
Cleanup old learn path diagrams

* Fix Safari mobile bug

* Initial cleanup


Approved-by: Daniel Egger
2023-05-11 07:50:20 +00:00
Daniel Egger 50e15f4aeb Add query url to assignment evaluation page 2023-05-09 18:23:37 +02:00
Daniel Egger eb3db902b9 Add query url and clickable navigation to SelfEvaluation 2023-05-09 18:17:31 +02:00
Daniel Egger 04b179aa52 Add query url and clickable navigation 2023-05-09 18:13:09 +02:00
Christian Cueni 6534cbf8df Update feedback questions and order 2023-05-09 14:38:40 +02:00
Daniel Egger 35e629f64c Add navigation cypress tests 2023-05-09 14:22:53 +02:00
Daniel Egger f9a5f7c9a5 Small changes 2023-05-09 14:10:10 +02:00
Daniel Egger d1907182a3 Fix cypress tests 2023-05-09 13:46:43 +02:00
Daniel Egger 726d5dc9bd Calculate step when there is no start badge 2023-05-09 11:04:01 +02:00
Daniel Egger 02d637f971 Add urls to `ItNavigationProgress` to make them clickable 2023-05-09 08:08:36 +02:00
Daniel Egger 7217424fdc Use query param to store page index 2023-05-09 07:56:38 +02:00
Daniel Egger dbde2eb662 Assignment Cockpit icons 2023-05-08 17:54:51 +02:00
Daniel Egger 57a4f447af Show assignment results for user 2023-05-08 17:13:24 +02:00
Daniel Egger 69e96391d9 Show "Bewertung abschliessen" when finished 2023-05-08 16:40:53 +02:00
Daniel Egger d8ae598be1 Show Assignment details in Cockpit overview 2023-05-08 16:19:30 +02:00
Daniel Egger e2347d8571 Rename `courseSessionStore` to `courseSessionsStore` 2023-05-08 16:03:26 +02:00
Daniel Egger 0401298f85 Reason text for evaluation is mandatory 2023-05-08 15:50:23 +02:00
Daniel Egger 720342f5b9 Render wagtial rich text fields as html 2023-05-08 14:55:54 +02:00
Daniel Egger d213f2d237 Change icons in cockpit 2023-05-08 14:44:24 +02:00
Daniel Egger cfa7309526 Fix after rebase 2023-05-08 14:29:26 +02:00
Daniel Egger 08b2e9e49a Show grade on overview page 2023-05-08 14:27:40 +02:00
Daniel Egger 32c3d6d1b4 Format code 2023-05-08 14:27:40 +02:00
Daniel Egger 447d1d8915 Fix navigation when assignment completion is submitted 2023-05-08 14:27:40 +02:00
Daniel Egger 313417dfd6 Fix typecheck errors 2023-05-08 14:27:40 +02:00
Daniel Egger e688cf2fc8 Improve display 2023-05-08 14:27:40 +02:00
Daniel Egger 5868468a48 Add grades to AssingmentEvaluation 2023-05-08 14:27:40 +02:00
Daniel Egger 2d6cee9f9f Add EvaluationSummary 2023-05-08 14:27:40 +02:00
Daniel Egger d9a6f2dd94 Add EvaluationIntro 2023-05-08 14:27:39 +02:00
Daniel Egger 26caf06391 Show evaluation full screen 2023-05-08 14:27:37 +02:00
Daniel Egger 9a5feb2ba6 Add evaluation task stepper 2023-05-08 14:24:38 +02:00
Daniel Egger fef864df25 VBV-321: squash current work
Load and display AssignmentCompletionStatus

Datenmodell um Bewertungskriterien erweitern

Refactor assignment pages

Show user results

Update some data fields

Show user assignment evaluation

Changes after rebase

Rename `grading` -> `evaluation`

Add evaluation data to AssignmentCompletion

Refactor usage of `assignmentStore`

Store points for evaluation

Only debounce text

Show user responses on evaluation page
2023-05-08 14:24:38 +02:00
Ramon Wenger a11c0d481f Merged in feature/VBV-310-VBV-324-document-improvements (pull request #66)
Feature/VBV-310 VBV 324 document improvements

Approved-by: Elia Bieri
2023-05-08 08:42:33 +00:00
Ramon Wenger 8a96af1818 Add documentation to the confirm dialog service 2023-05-04 16:43:39 +02:00
Christian Cueni fbefd8815d Merged in feature/VBV-300-update-font (pull request #69)
Replace font files, update styles

Approved-by: Daniel Egger
2023-05-03 16:52:55 +00:00
Elia Bieri e4b8d7c301 Merged in feature/VBV-291-kn-frontend-teilnehmer (pull request #56)
VBV-291 Auftrag Frontend

* Fixes in SubmissionView

* Change closing button tag

* Delete client cypress folder

* Add eslint cypress plugin

* Add Cypress tests

* Reformat de.json

* Fix type errors

* Fix cypress tests

* Add cypress commands

* Disable assignment task inputs after submission
2023-05-03 14:53:21 +00:00
Christian Cueni dd49d050ef Replace font files, update styles 2023-05-03 14:43:50 +02:00
Ramon Wenger eba448afec Remove unused code 2023-05-02 17:40:46 +02:00
Ramon Wenger 270acd5575 Remove console.log statements 2023-05-02 16:49:05 +02:00
Ramon Wenger 9ab9f25d86 Add comment to annotate inspiration 2023-05-02 16:47:11 +02:00
Ramon Wenger 0ac4f7b395 Move confirm dialog to its own service 2023-05-02 16:22:43 +02:00
Ramon Wenger ba2d4df639 Add body text 2023-05-02 15:32:27 +02:00
Ramon Wenger 17028b8905 Add 2 types of confirm modal
Still need to be refactored into one
2023-05-01 21:41:58 +02:00
Ramon Wenger af7f0c9223 Update layout for document list
Relates to VBV-324
2023-05-01 21:40:04 +02:00
Ramon Wenger 78037b3373 Rename component 2023-04-27 12:01:35 +02:00
Ramon Wenger 0bae4a8cb2 Add info block for teachers
Also refactor CirclePage

Resolves VBV-310
2023-04-27 11:55:45 +02:00