Commit Graph

477 Commits

Author SHA1 Message Date
Daniel Egger dec1b874a7 Add Performance Criteria for oktober demo 2022-10-05 11:16:52 +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 2fd189e063 Merge branch 'feature/media-library' into develop 2022-10-04 14:44:25 +02:00
Daniel Egger 17eb308f6e Add data for mediathek "Reisen" und "Fahrzeug" 2022-10-04 14:43:06 +02:00
Daniel Egger e95086850b Default data for mediathek 2022-10-04 14:42:34 +02:00
Daniel Egger fd6c15c282 Fix cypress tests 2022-10-04 14:42:34 +02:00
Daniel Egger a8e7b6f433 Add learn media page 2022-10-04 14:42:34 +02:00
Daniel Egger 63a5039134 Work on media library frontend 2022-10-04 14:42:34 +02:00
Daniel Egger cbdbdba6b8 Add `frontend_url` field to wagtail pages 2022-10-04 14:42:34 +02:00
Daniel Egger 5b3a751704 Load media items from backend to show in frontend 2022-10-04 14:42:34 +02:00
Daniel Egger 71b072ade2 Refactor media content data models 2022-10-04 14:42:34 +02:00
Lorenz Padberg 87ab5ae194 Fix Bug of multiple circles over each other. 2022-10-04 11:18:11 +02:00
Daniel Egger 5a4ff1cfda Rename "circle" folder to "learningPath" folder 2022-09-30 17:58:32 +02:00
Daniel Egger 9d1eff5a42 Rename "Media Center" to "Media Library" 2022-09-30 17:55:35 +02:00
Daniel Egger 827e7a0fc0 Add code formatting with prettier and black 2022-09-30 17:43:06 +02:00
Daniel Egger 38c8d2120a Merge branch 'feature/datenmodell' into develop 2022-09-30 15:22:47 +02:00
Daniel Egger 03e82fadb7 Fix lowercase mediacenter for build in cypress 2022-09-28 20:48:11 +02:00
Daniel Egger 6cf7d97771 Fix js tests 2022-09-28 18:10:38 +02:00
Daniel Egger 3bd604215a Fix cypress tests 2022-09-28 17:55:47 +02:00
Daniel Egger 659684f25b Fix some type errors 2022-09-28 16:51:10 +02:00
Daniel Egger bdae082550 Fix self-evalution checkboxes 2022-09-28 16:19:01 +02:00
Daniel Egger e230c0b8e5 Fix python tests 2022-09-28 15:34:07 +02:00
Daniel Egger 8ab17f9370 Readd completion code 2022-09-28 15:11:08 +02:00
Daniel Egger b5804c2696 Fix test lerngang 2022-09-28 14:52:25 +02:00
Daniel Egger d5e484a6c7 Add CompetencePage 2022-09-28 13:09:36 +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 5667921518 Take MediaCategoryDetail data from api 2022-09-23 17:47:19 +02:00
Daniel Egger 18c3e28ba1 Load MediaCenter data from api 2022-09-23 16:49:00 +02:00
Daniel Egger 8941f4ad24 Merge branch 'feature/mediathek-server' into feature/mediathek-frontend 2022-09-23 16:17:02 +02: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 5425c1b22c Add content collections with create_default script 2022-09-23 14:55:21 +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
Elia Bieri 722b9f7937 Merged in feature/vbv-148-human-readable-duration (pull request #8)
Implement human readable durations

* Implement duration formatting for humans

* Add UTs

* Rework rounding and formatting

* Rename function
2022-09-20 11:12:05 +00:00
Christian Cueni 442ee3e4da Add basic mediacenter store 2022-09-19 14:40:06 +02:00
Christian Cueni f7b0140eec Make grids mobile-ish 2022-09-19 14:40:06 +02:00
Christian Cueni 6d5823eb06 Add Dropdown to Mediathek 2022-09-19 14:40:06 +02:00
Christian Cueni c35b5cce70 Make DropdownSelect component 2022-09-19 14:40:06 +02:00
Christian Cueni 1a41fe4f10 WIP: Add "Alles zeigen" link 2022-09-19 14:40:06 +02:00