Commit Graph

291 Commits

Author SHA1 Message Date
Christian Cueni e02a386359 Update courses url 2023-07-10 07:35:38 +02:00
Christian Cueni 2e12e30b4d Fix content 2023-06-11 20:21:23 +02:00
Christian Cueni 1a9f676381 Add "Gewinnen" assignment, fix titles, update expert info 2023-06-08 16:01:02 +02:00
Christian Cueni 391c88e588 Update FR translations 2023-06-08 15:07:30 +02:00
Christian Cueni cf0ffe66ac Update goals
Update basis

Update circle Haushalt

Update Reisen

Add Pensionierung

Update Gesundheit

Update Vorbereitung

Update WBTs

Update kmu

Add Vermittler reflection

Add VV assignment "Gesundheit"

Add assignment "Gesundheit"

Add link to Fachcheck
2023-06-08 15:07:30 +02:00
Christian Cueni cb40554fe0 Update texts, remove blocks 2023-06-01 14:39:46 +02:00
Elia Bieri 6d662626dc Merged in feature/VBV-386-lerneinheiten-titel-entfernbar-machen (pull request #111)
Add ability to hide learning unit titles

* Add ability to hide learning unit titles

# Conflicts:
#	server/vbv_lernwelt/course/creators/uk_course.py

* Fix rebase

* Undo faulty rebase


Approved-by: Christian Cueni
2023-05-31 09:39:27 +00:00
Daniel Egger 1fa420a11b VBV-355: Inhaltstyp Test 2023-05-26 16:49:50 +02:00
Daniel Egger 904d24f566 Add `LearningContentDocumentList` 2023-05-26 16:07:42 +02:00
Daniel Egger 6368188d2f Rename back to `get_frontend_url` 2023-05-26 09:45:36 +02:00
Daniel Egger f33433b77d Merge branch 'develop' into feature/VBV-297-trainer-landet-direkt-in-cockpit 2023-05-26 09:39:44 +02: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
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
Daniel Egger b7cca35e88 Merge migrations 2023-05-24 16:02:29 +02:00
Daniel Egger 8743441e81 Format code 2023-05-24 15:20:30 +02:00
Daniel Egger 9be0ce9d39 Frontend: "Vorbereitungsauftrag" 2023-05-24 15:19:49 +02:00
Elia Bieri 1d0b956b56 Update features of course goals rich text field 2023-05-23 17:30:04 +02:00
Elia Bieri 100e42bdd2 Reformat code 2023-05-23 16:43:24 +02:00
Elia Bieri 132c115e8b Rename attendance days to attendance courses 2023-05-23 15:34:59 +02:00
Daniel Egger decba980f5 Rework Media Library 2023-05-19 10:17:25 +02:00
Daniel Egger 9e3124160a Add some test data and clean up some things 2023-05-17 19:09:33 +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 c5110e1051 Make migration 2023-05-17 11:00:43 +02:00
Elia Bieri 652cd7d8fb Implement RichTextBlock 2023-05-17 10:59:21 +02:00
Elia Bieri 45a27332cd Initialize LearningContent description with RichText 2023-05-17 10:59:21 +02:00
Daniel Egger 31dae0a5cd VBV-306: Use GraphQL for assignment code 2023-05-15 19:07:06 +02:00
Daniel Egger a15af2bf86 VBV-350: Refactor LearningContent to individual wagtail pages 2023-05-12 11:51:02 +02:00
Daniel Egger c0dc4d6a2f Fix python tests 2023-04-14 10:02:33 +02:00
Daniel Egger a3e4a50ba0 Add unit test to test creation of slug while saving 2023-04-13 20:03:09 +02:00
Daniel Egger b0cc789549 Attach Assignment to LearningPath 2023-04-05 21:43:15 +02:00
Daniel Egger 539ddbeaf9 Refactor the models 2023-04-05 21:43:15 +02:00
Elia Bieri 4cf292bbf8 Rework model 2023-04-05 21:43:15 +02:00
Daniel Egger 2c3b77b0d8 VBV-234: Bugfix neue Seiten im Wagtail erstellen
Der `parent` einer Page ist erst in der `save` Funktion
vorhanden für eine neue Seite. Deshalb muss man das
Überschreiben der `slug` im `save` machen.
2023-04-05 21:43:00 +02:00
Daniel Egger 85a0ba1d25 Fix cypress tests 2023-04-05 18:49:06 +02:00
Daniel Egger 9ee97ffc55 Format code 2023-04-03 18:55:05 +02:00
Daniel Egger 1437bc9b53 VBV-304: Add `AssignmentDayBlock` 2023-04-03 18:09:22 +02:00
Daniel Egger 8d41d3d3a2 VBV-193 refactored course completion for course sessions 2023-03-31 18:27:47 +02:00
Christian Cueni 97879b570c Show only start and stop icon in circle 2023-03-27 11:34:09 +02:00
Daniel Egger 45533e0b2d Refactor `frontend_url` calculation to avoid DB access and improve
performance

Das initiale Laden des Lernpfads dauerte so lange, weil das berechnen
des Felds `frontend_url` sehr viele DB-Zugriffe auf die jeweiligen
"parents" einer Page machten.
Die gleiche Berechnung kann man aber auch direkt aus dem `slug`
ohne Zugriff auf die Parents machen.
Das wurde hier gemacht. Das ganze beruht darauf, dass die page-`slug`
in einem bestimmten Format ist. Um das weiter zu bearbeiten,
habe ich VBV-296 erstellt.
2023-03-17 11:12:42 +01:00
Daniel Egger 8d0386c945 Fix formatting 2023-03-14 17:20:14 +01:00
Daniel Egger f68e20515d VBV-293: Link zu Mediathek in Versicherungsvermittlerin Lehrgang wieder eingefügt 2023-03-14 15:03:01 +01:00
Christian Cueni d233b782bc Use RichField for circle detail data 2023-03-09 15:30:50 +01:00
Christian Cueni c8905847fa Fix small circle unit titles 2023-03-09 15:30:50 +01:00
Christian Cueni 6b995bc4ae Change circle order 2023-02-22 13:02:47 +01:00
Christian Cueni 062900ab41 Update WBTs 2023-02-21 11:24:23 +01:00
Christian Cueni 8f5eebed1f Format files 2023-02-13 09:37:47 +01:00
Christian Cueni 52a3e4da8c Update topic name 2023-02-06 15:20:03 +01:00
Christian Cueni f5c7ab77e1 Remove "vernetzen" circle 2023-02-06 09:00:13 +01:00
Christian Cueni f6ffb431c2 Fix circle names 2023-01-30 08:23:58 +01:00
Daniel Egger 4be2bb1975 VBV-251: Neusten Vermittlerlehrgang abbilden 2023-01-25 16:29:54 +01:00
Christian Cueni bf704cccc5 Add experts to all circles 2023-01-23 13:40:47 +01:00
Christian Cueni 6c0aaaa9cf Rename Vermittler courses 2023-01-23 08:39:41 +01:00
Christian Cueni 6bbd509faf Add feedback icon, add feedback to default path 2023-01-19 07:43:04 +01:00
Daniel Egger 1aaf0810bd VBV-243: Add new Versicherungsvermittler learning path 2023-01-18 18:25:54 +01:00
Daniel Egger 503f819d38 Refactor expert handling 2023-01-11 15:54:50 +01:00
Daniel Egger 99da03bc37 Remove WBTs from LFS and git (they are on AWS now) 2023-01-11 15:34:23 +01:00
Daniel Egger a4ecaf2430 Link WBTs to AWS S3 hosted version 2023-01-11 15:34:23 +01:00
Ramon Wenger c64bc463db Make formatter happy 2022-12-29 16:28:36 +01:00
Ramon Wenger 5e559b66b0 Update Feedback model, add Wagtail block 2022-12-29 16:26:31 +01:00
Christian Cueni c8eb505cd2 Add fake üK-Content 2022-12-19 09:39:46 +01:00
Christian Cueni 58bb1d5fef Use own icon for learning content 2022-12-15 09:40:46 +01:00
Daniel Egger 15b5223dc5 Fix cypress tests 2022-12-14 22:05:10 +01:00
Christian Cueni 4ac1c78a4f Update path name 2022-12-13 14:21:26 +01:00
Daniel Egger 00d2527b29 Refactor urls for courses, learning paths and competence profile 2022-12-02 11:18:56 +01:00
Daniel Egger cb9505b54c Add some more demo users 2022-12-02 10:27:27 +01:00
Christian Cueni dc59b41455 Update video content 2022-11-21 10:37:02 +00:00
Christian Cueni 2313587f6a Update text 2022-11-15 13:02:37 +01:00
Daniel Egger 2295ede996 Add python unit tests 2022-11-09 12:40:01 +01:00
Daniel Egger 93a0fdaadb Add ÜK1 course 2022-11-09 12:40:01 +01:00
Daniel Egger 17eaf80d2c Add CourseSession serializer and view 2022-11-09 12:40:00 +01:00
Daniel Egger b36b0e8d96 Fix test by assigning admin user 2022-11-09 12:40:00 +01:00
Daniel Egger c61ea10c7d Format code 2022-11-09 12:40:00 +01:00
Daniel Egger d8148158a1 Refactor serialization code 2022-11-09 12:40:00 +01:00
Christian Cueni 25749bf915 Fix video location 2022-11-08 16:05:14 +01:00
Christian Cueni 2015ab25de Update WBTs 2022-11-08 08:28:26 +01:00
Christian Cueni ff088257ce Add video in Einstieg 2022-11-07 13:24:19 +01:00
Christian Cueni c9a5fd573c Add learning module 2022-11-05 17:59:06 +01:00
Christian Cueni 44d8c1645e Add new types, update name 2022-11-03 07:15:36 +01:00
Christian Cueni bd520134f1 Add changes for demo
New user name
Hide unfinished HFs
Make unfinished HFs in path placeholders
2022-11-01 21:25:45 +01:00
Daniel Egger 579865d478 Fix python tests 2022-10-21 18:05:37 +02:00
Daniel Egger c8824763f6 Refactor types 2022-10-21 13:44:11 +02:00
Christian Cueni 7fbac1aaea Rename Profil to Navi 2022-10-18 15:56:25 +02:00
Daniel Egger bb1db2d845 Add Beispiel Transferauftrag 2022-10-14 18:10:07 +02:00
Daniel Egger 4d24d3b295 Add "Beenden" content 2022-10-14 14:43:23 +02:00
Daniel Egger 189cfcde3f Weitere Circle-Texte übernommen 2022-10-14 12:57:34 +02:00
Daniel Egger c9bf1d2753 Add wbt files to git lfs 2022-10-12 17:22:03 +02:00
Daniel Egger 34a21eeed3 Use <router-link> instead of <a> for internal links 2022-10-11 16:46:53 +02:00
Daniel Egger cf873e6f23 Add circles to competence api json 2022-10-11 16:46:53 +02:00
Daniel Egger 3c386f31ca Add linking to `evaluate_url` for learning unit 2022-10-07 17:22:28 +02:00
Daniel Egger df6f331811 Anpassung "Verankerung im Lernpfad" 2022-10-05 15:29:29 +02:00
Daniel Egger b7e4d83e76 Add wbts to lernfpad oktober demo 2022-10-05 12:15:26 +02:00
Daniel Egger 3bf9e75714 Add urls to media_libraries in Lernpfad 2022-10-05 11:32:40 +02:00
Daniel Egger 647631491d Add Performance Criteria for oktober demo 2022-10-04 17:37:30 +02:00
Daniel Egger dbf3db3d23 Add more circle data 2022-10-04 16:55:48 +02:00
Daniel Egger ad532dc50d Add placeholder learning content 2022-10-04 16:26:34 +02:00
Daniel Egger a33c161231 Add learning path data for oktober demo 2022-10-04 15:48:53 +02:00
Daniel Egger cbdbdba6b8 Add `frontend_url` field to wagtail pages 2022-10-04 14:42:34 +02:00
Daniel Egger 827e7a0fc0 Add code formatting with prettier and black 2022-09-30 17:43:06 +02:00
Daniel Egger 3bd604215a Fix cypress tests 2022-09-28 17:55:47 +02:00
Daniel Egger bdae082550 Fix self-evalution checkboxes 2022-09-28 16:19:01 +02:00
Daniel Egger b5804c2696 Fix test lerngang 2022-09-28 14:52:25 +02:00
Daniel Egger 9be2fa0d3a Serialize LearningPath with PerformanceCriteria 2022-09-28 13:09:34 +02:00
Daniel Egger 5284d6f1cf Serialize LearningPath with PerformanceCriteria 2022-09-27 17:53:22 +02:00
Daniel Egger 8cfde35704 Serializer for CompetenceProfile 2022-09-27 17:19:47 +02:00
Daniel Egger 46998668d8 Add course_category to LearningUnit 2022-09-27 16:41:54 +02:00
Daniel Egger 9c77526646 Add initial competence django app 2022-09-27 15:57:17 +02:00
Daniel Egger c0e7662c8f Merge branch 'develop' into feature/mediathek-frontend 2022-09-27 15:01:47 +02:00
Elia Bieri 129507bf6e Merged in feature/vbv-132-learning-content-badges-20220921 (pull request #9)
Implement learning content type badges
2022-09-27 08:37:46 +00:00
Daniel Egger a7f0d79c0f Add serializer for media_library models 2022-09-23 15:38:06 +02:00
Daniel Egger 79c0fb8b11 Refactor 2022-09-23 15:14:42 +02:00
Daniel Egger f9c3e82b66 Adapt LearningPath to new course model 2022-09-23 14:55:21 +02:00
Daniel Egger ee4f6fb565 Add course app with default course model 2022-09-23 14:55:21 +02:00
Daniel Egger a75a29f57c Squashed commit of feature/Mediathek from Renzo
commit ac0707296df479c0de5399b8adcccc24da749810
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date:   Thu Sep 15 11:39:01 2022 +0200

    Revert "Upgrade to Wagtail 4.0"

    This reverts commit e6f43f6b11e91a923badbaec33ab460a3cfac60e.

commit d5b28e362f604d17fed32fabe8295865b82350de
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date:   Thu Sep 15 11:38:14 2022 +0200

    Add factories for category content

commit e6ebabc1c6b01ccbc14413bbe40e71a348dfa565
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date:   Tue Sep 13 16:10:58 2022 +0200

    Simplify Mediathek models

commit b4dd179b891960babb8c26a70d3cecfcabb72264
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date:   Mon Sep 12 15:53:00 2022 +0200

    Add Document and Link to Mediathek

commit 707ab8d9abc622f3ef5935472ddc7e7c74a352e6
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date:   Mon Sep 12 14:16:49 2022 +0200

    Add Media Library Models, including factory and default data

commit e6f43f6b11e91a923badbaec33ab460a3cfac60e
Author: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date:   Mon Sep 12 11:09:46 2022 +0200

    Upgrade to Wagtail 4.0
2022-09-23 14:55:21 +02:00
Daniel Egger 5663fe1a74 Try to make cypress tests less flaky 2022-09-14 16:29:41 +02:00
Daniel Egger 20a3de4d80 VBV-144: enable `hyphens: auto` on body tag 2022-09-14 15:52:44 +02:00
Daniel Egger 3ff2b23cf7 VBV-142: move "/media" to "/static/media" 2022-09-09 11:56:49 +02:00
Daniel Egger 2e59d2464c Add parent prefix to slugs 2022-09-02 17:42:14 +02:00
Daniel Egger d5f4b37cfe VBV-102: refactor server urls 2022-09-02 14:33:38 +02:00
Daniel Egger 18acf10c9a Refactor to new url structure for learningPath and circle 2022-08-31 15:28:17 +02:00
Daniel Egger 26139304a3 Generate additional simple learningPath for development 2022-08-30 15:56:54 +02:00
Daniel Egger 0ad8706625 Fix unit tests 2022-08-26 10:47:01 +02:00
Daniel Egger c2e2d596b2 Add function to create simple learningpath for unit tests 2022-08-26 10:02:43 +02:00
Lorenz Padberg 78ec4569ad Merge branch 'feature/demodaten_anpassung' into develop 2022-08-25 11:30:18 +02:00
Christian Cueni ad4c8771a8 Fix Selbsteinschätzung in "testen" 2022-08-25 08:19:02 +02:00
Lorenz Padberg 7ba1857ee2 Add more content 2022-08-24 17:12:01 +02:00
Lorenz Padberg ec479235f7 Add exercise url as wbt 2022-08-24 17:04:36 +02:00
Daniel Egger 987eeb9def Style LearningUnit in Wagtail 2022-07-14 16:08:18 +02:00
Daniel Egger 8edea0b92f Add page cache for learningpath pages 2022-07-05 15:44:11 +02:00
Daniel Egger 96020bf83d performance optimization to get full learningpath content 2022-07-05 13:11:45 +02:00
Daniel Egger 2daf659d71 Small fixes 2022-07-05 07:40:26 +02:00
Lorenz Padberg ad9c495c9c Merge remote-tracking branch 'origin/develop' into develop 2022-07-04 12:23:16 +02:00
Lorenz Padberg 5f39cfb2e9 fixed learning path text wrapping 2022-07-04 12:22:38 +02:00
Daniel Egger 2557d478c9 Show finished learningSequences in LearningPathDiagram 2022-07-04 12:15:49 +02:00
Daniel Egger cc293400b4 More (copied) content for learningpath 2022-07-04 09:37:26 +02:00
Daniel Egger b5e2f5af50 Filter to "de-CH" 2022-06-30 15:25:02 +02:00
Daniel Egger d679eeb17d VBV-78: WBT in Circle eingebaut 2022-06-30 14:11:22 +02:00
Daniel Egger 2af7439b97 VBV-76: Refactor user and login handling 2022-06-30 14:11:21 +02:00
Daniel Egger 4b02991f0d Improve DB reset for caprover deployment 2022-06-30 14:11:21 +02:00
Daniel Egger ad380f741e Use wagtail-localize for translations 2022-06-30 14:11:21 +02:00
Daniel Egger 16a4c8ccb4 Make responsive 2022-06-23 19:06:52 +02:00
Daniel Egger 500ed0f111 Step through circle 2022-06-23 18:33:20 +02:00
Daniel Egger 3686924cfe Refactor completion api 2022-06-22 19:04:35 +02:00
Daniel Egger 12322638dc Add LearningUnitQuestion as custom model 2022-06-22 16:26:12 +02:00
Daniel Egger 7e5debb5ca update icon stuff 2022-06-22 11:21:28 +02:00
Daniel Egger 2c36ea9242 Add previous-/next- attributes to LearningContents 2022-06-21 18:23:35 +02:00
Daniel Egger b893dcbcc8 Add component for learning content 2022-06-21 15:58:05 +02:00
Daniel Egger 9d768c8205 Changes for deployment 2022-06-21 13:39:48 +02:00