richie 2.34.1.dev21__py2.py3-none-any.whl → 2.34.1.dev23__py2.py3-none-any.whl

frontend/js/components/Icon/index.tsx

@@ -35,6 +35,7 @@ export enum IconTypeEnum {
   CHEVRON_RIGHT_OUTLINE = 'icon-chevron-right-outline',
   CHEVRON_UP_OUTLINE = 'icon-chevron-up-outline',
   CLOCK = 'icon-clock',
+  COURSES = 'icon-courses',
   CREDIT_CARD = 'icon-creditCard',
   CROSS = 'icon-cross',
   DURATION = 'icon-duration',
@@ -49,6 +50,7 @@ export enum IconTypeEnum {
   LOGOUT_SQUARE = 'icon-logout-square',
   MAGNIFYING_GLASS = 'icon-magnifying-glass',
   MENU = 'icon-menu',
+  MONEY = 'icon-money',
   MORE = 'icon-more',
   ORG = 'icon-org',
   PACE = 'icon-pace',

frontend/scss/colors/_theme.scss

@@ -491,6 +491,8 @@ $r-theme: (
   ),
   program-detail: (
     cover-empty-background: r-color('smoke'),
+    checkmark-list-decoration: url('../../richie/images/components/checkmark.svg'),
+    checkmark-list-decoration-color: r-color('indianred3'),
   ),
   registered-credit-card: (
     title-color: r-color('charcoal'),

frontend/scss/components/templates/courses/cms/_program_detail.scss

@@ -2,11 +2,13 @@
 //
 
 .program-detail {
+  $detail-selector: &;
   margin: 0 auto;
   padding: 0;
 
   &__block {
     @include detail-block;
+
     @if $body-padding-fix {
       @include content-padding-fix($target: '&:last-child');
     }
@@ -54,6 +56,75 @@
     padding-right: $grid-gutter-width;
   }
 
+  &__objectives {
+    ul {
+      padding-left: 0.3rem;
+      list-style-type: none;
+
+      li {
+        position: relative;
+        margin-top: 0.5rem;
+        font-size: 1rem;
+        padding-left: 1.5rem;
+
+        &::before {
+          content: '';
+          display: block;
+          position: absolute;
+          top: 0.2rem;
+          left: 0;
+          width: 0.8rem;
+          height: 0.8rem;
+          background-repeat: no-repeat;
+          background-color: r-theme-val(program-detail, checkmark-list-decoration-color);
+          -webkit-mask: r-theme-val(program-detail, checkmark-list-decoration);
+          mask: r-theme-val(program-detail, checkmark-list-decoration);
+          -webkit-mask-size: cover;
+          mask-size: cover;
+        }
+      }
+    }
+  }
+
+  &__content {
+    @include media-breakpoint-up(lg) {
+      padding-right: 3rem;
+    }
+  }
+
+  &__aside {
+    padding: 1rem 0;
+
+    @include media-breakpoint-up(lg) {
+      @include sv-flex(1, 0, $r-program-aside);
+      padding: 3rem 1rem;
+    }
+
+    #{$detail-selector}__row {
+      margin-bottom: 1.5rem;
+    }
+
+    #{$detail-selector}__title {
+      @include font-size($h3-font-size);
+      padding-bottom: 1rem;
+
+      @if r-theme-val(course-detail, aside-title-border) {
+        border-bottom: $onepixel solid r-theme-val(course-detail, aside-title-border);
+      }
+    }
+  }
+
+  &__main {
+    @include media-breakpoint-up(lg) {
+      @include sv-flex(1, 0, calc(100% - #{$r-program-subheader-aside}));
+      display: flex;
+      justify-content: flex-start;
+      align-content: flex-start;
+      align-items: flex-start;
+      flex-wrap: wrap;
+    }
+  }
+
   &__courses {
     @include make-col-ready();
     @include make-col(12);

frontend/scss/settings/_variables.scss

@@ -152,11 +152,13 @@ $r-footer-logo-width-lg: 11.875rem !default;
 // full width like common blocks. Usefull if you plan to remove course run from
 // template
 $r-course-aside: 35% !default;
+$r-program-aside: 25% !default;
 
 // Subheader aside column width in course detail. Unlike, $r-course-aside this
 // variable cannot be null. Otherwise to homegenize layout, it should have the
 // same value than $r-course-aside.
 $r-course-subheader-aside: 35% !default;
+$r-program-subheader-aside: 25% !default;
 
 // Course search page shared variables
 $r-search-filters-gutter: 0.2rem !default;
@@ -173,6 +175,8 @@ $r-section-grid-sizes: (
   '33x33x33': 1fr 1fr 1fr,
   '25x75': 25% 2fr,
   '75x25': 2fr 25%,
+  '35x65': 35% 2fr,
+  '65x35': 2fr 35%,
 );
 
 // Define gutter size to apply on Section grid

richie/apps/core/templates/richie/icons.html

@@ -192,6 +192,14 @@
     <symbol id="icon-archive" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
       <path d="M19.2 3H4.8C3.9 3 3 3.81 3 4.8v2.709c0 .648.387 1.206.9 1.521V19.2c0 .99.99 1.8 1.8 1.8h12.6c.81 0 1.8-.81 1.8-1.8V9.03c.513-.315.9-.873.9-1.521V4.8c0-.99-.9-1.8-1.8-1.8Zm-5.4 10.8h-3.6a.903.903 0 0 1-.9-.9c0-.495.405-.9.9-.9h3.6c.495 0 .9.405.9.9s-.405.9-.9.9Zm5.4-6.3H4.8V4.8h14.4v2.7Z" fill="currentColor" fill-rule="nonzero"/>
     </symbol>
+
+    <symbol id="icon-money" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="none" stroke-width="1.5" stroke="currentColor">
+      <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 18.75a60.07 60.07 0 0 1 15.797 2.101c.727.198 1.453-.342 1.453-1.096V18.75M3.75 4.5v.75A.75.75 0 0 1 3 6h-.75m0 0v-.375c0-.621.504-1.125 1.125-1.125H20.25M2.25 6v9m18-10.5v.75c0 .414.336.75.75.75h.75m-1.5-1.5h.375c.621 0 1.125.504 1.125 1.125v9.75c0 .621-.504 1.125-1.125 1.125h-.375m1.5-1.5H21a.75.75 0 0 0-.75.75v.75m0 0H3.75m0 0h-.375a1.125 1.125 0 0 1-1.125-1.125V15m1.5 1.5v-.75A.75.75 0 0 0 3 15h-.75M15 10.5a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm3 0h.008v.008H18V10.5Zm-12 0h.008v.008H6V10.5Z" />
+    </symbol>
+
+    <symbol id="icon-courses" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="none" stroke-width="1.5" stroke="currentColor">
+      <path stroke-linecap="round" stroke-linejoin="round" d="M19.5 14.25v-2.625a3.375 3.375 0 0 0-3.375-3.375h-1.5A1.125 1.125 0 0 1 13.5 7.125v-1.5a3.375 3.375 0 0 0-3.375-3.375H8.25m0 12.75h7.5m-7.5 3H12M10.5 2.25H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 0 0-9-9Z" />
+    </symbol>
     
   </defs>
 </svg>

richie/apps/courses/admin.py

@@ -361,6 +361,24 @@ class PersonAdmin(PageExtensionAdmin):
         return obj.extended_object.get_title()
 
 
+class ProgramAdmin(PageExtensionAdmin):
+    """Admin class for the Program model"""
+
+    list_display = ["title"]
+    frontend_editable_fields = (
+        "duration",
+        "effort",
+        "price",
+    )
+
+    # pylint: disable=no-self-use
+    def title(self, obj):
+        """
+        Display the course title as a read-only field from the related page
+        """
+        return obj.extended_object.get_title()
+
+
 class LicenceAdmin(TranslatableAdmin):
     """
     Admin class for the Licence model
@@ -378,3 +396,4 @@ admin.site.register(models.MainMenuEntry, MainMenuEntryAdmin)
 admin.site.register(models.Organization, OrganizationAdmin)
 admin.site.register(models.PageRole, PageRoleAdmin)
 admin.site.register(models.Person, PersonAdmin)
+admin.site.register(models.Program, ProgramAdmin)

richie/apps/courses/cms_toolbars.py

@@ -13,7 +13,7 @@ from cms.utils.page_permissions import user_can_add_subpage, user_can_change_pag
 from cms.utils.urlutils import admin_reverse
 
 from .defaults import PAGE_EXTENSION_TOOLBAR_ITEM_POSITION
-from .models import Category, Course, MainMenuEntry, Organization, Person
+from .models import Category, Course, MainMenuEntry, Organization, Person, Program
 
 
 class BaseExtensionToolbar(ExtensionToolbar):
@@ -181,3 +181,12 @@ class MainMenuEntryExtensionToolbar(BaseExtensionToolbar):
                     disabled=not self.toolbar.edit_mode_active,
                     position=PAGE_EXTENSION_TOOLBAR_ITEM_POSITION,
                 )
+
+
+@toolbar_pool.register
+class ProgramExtensionToolbar(BaseExtensionToolbar):
+    """
+    This extension class customizes the toolbar for the program page extension
+    """
+
+    model = Program

richie/apps/courses/factories.py

@@ -27,6 +27,8 @@ from ..core.factories import (
 from . import defaults, models
 from .defaults import ROLE_CHOICES
 
+# pylint: disable=too-many-lines
+
 VideoSample = namedtuple("VideoSample", ["label", "image", "url"])
 
 VIDEO_SAMPLE_LINKS = (
@@ -864,6 +866,87 @@ class ProgramFactory(PageExtensionDjangoModelFactory):
     # fields concerning the related page
     page_template = models.Program.PAGE["template"]
 
+    # pylint: disable=no-self-use
+    @factory.lazy_attribute
+    def duration(self):
+        """Generate a random duration for the course between 1 day and 10 months."""
+        return [
+            random.randint(1, 10),  # nosec
+            random.choice(list(defaults.TIME_UNITS.keys())[2:]),  # nosec
+        ]
+
+    # pylint: disable=no-self-use
+    @factory.lazy_attribute
+    def effort(self):
+        """Generate a random effort for the course between 1 minute and 500 hours."""
+        return [
+            random.randint(1, 500),  # nosec
+            random.choice(list(defaults.EFFORT_UNITS.keys())),  # nosec
+        ]
+
+    # pylint: disable=no-self-use
+    @factory.lazy_attribute
+    def price(self):
+        """Generate a random price for the program between 1 and 100 euros."""
+        return random.randint(1, 500)  # nosec
+
+    @factory.post_generation
+    # pylint: disable=unused-argument
+    def fill_teaser(self, create, extracted, **kwargs):
+        """
+        Add a video plugin for teaser with a random url
+        """
+
+        if create and extracted:
+            for language in self.extended_object.get_languages():
+                placeholder = self.extended_object.placeholders.get(
+                    slot="program_teaser"
+                )
+
+                video_sample = (
+                    extracted
+                    if isinstance(extracted, VideoSample)
+                    else random.choice(VIDEO_SAMPLE_LINKS)  # nosec
+                )
+
+                add_plugin(
+                    language=language,
+                    placeholder=placeholder,
+                    plugin_type="VideoPlayerPlugin",
+                    label=video_sample.label,
+                    embed_link=video_sample.url,
+                )
+
+    @factory.post_generation
+    # pylint: disable=unused-argument
+    def fill_categories(self, create, extracted, **kwargs):
+        """Add categories plugin to organization from a given list of category instances."""
+        if create and extracted:
+            associate_extensions(
+                self, extracted, "program_categories", "CategoryPlugin"
+            )
+
+    @factory.post_generation
+    # pylint: disable=unused-argument
+    def fill_team(self, create, extracted, **kwargs):
+        """
+        Add person plugin for course team from given person instance list
+        """
+        if create and extracted:
+            associate_extensions(self, extracted, "program_team", "PersonPlugin")
+
+    @factory.post_generation
+    # pylint: disable=unused-argument
+    def fill_organizations(self, create, extracted, **kwargs):
+        """
+        Add organizations plugin to course from a given list of organization instances.
+        """
+
+        if create and extracted:
+            associate_extensions(
+                self, extracted, "program_organizations", "OrganizationPlugin"
+            )
+
     @factory.post_generation
     # pylint: disable=unused-argument
     def fill_body(self, create, extracted, **kwargs):
@@ -879,6 +962,21 @@ class ProgramFactory(PageExtensionDjangoModelFactory):
                 plugin_type="TextPlugin",
             )
 
+    @factory.post_generation
+    # pylint: disable=unused-argument
+    def fill_objectives(self, create, extracted, **kwargs):
+        """
+        Add simple text plugin for objectives with a random number of paragraphs
+        """
+        if create and extracted:
+            create_text_plugin(
+                self.extended_object,
+                "program_objectives",
+                nb_paragraphs=random.randint(2, 4),  # nosec
+                languages=self.extended_object.get_languages(),
+                plugin_type="TextPlugin",
+            )
+
     @factory.post_generation
     # pylint: disable=unused-argument
     def fill_courses(self, create, extracted, **kwargs):

richie/apps/courses/migrations/0039_program_duration_program_effort_program_price.py

@@ -0,0 +1,60 @@
+# Generated by Django 4.2.20 on 2025-03-10 14:44
+
+import django.core.validators
+from django.db import migrations, models
+
+import richie.apps.core.fields.duration
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("courses", "0038_alter_mainmenuentry_menu_color"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="program",
+            name="duration",
+            field=richie.apps.core.fields.duration.CompositeDurationField(
+                blank=True,
+                default_unit="hour",
+                help_text="The program time range.",
+                max_length=80,
+                null=True,
+                time_units={
+                    "day": ("day", "days"),
+                    "hour": ("hour", "hours"),
+                    "minute": ("minute", "minutes"),
+                    "month": ("month", "months"),
+                    "week": ("week", "weeks"),
+                },
+            ),
+        ),
+        migrations.AddField(
+            model_name="program",
+            name="effort",
+            field=richie.apps.core.fields.duration.CompositeDurationField(
+                blank=True,
+                default_unit="hour",
+                help_text="Total amount of time to complete this program.",
+                max_length=80,
+                null=True,
+                time_units={"hour": ("hour", "hours"), "minute": ("minute", "minutes")},
+            ),
+        ),
+        migrations.AddField(
+            model_name="program",
+            name="price",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=2,
+                default=0,
+                help_text="The price of the program.",
+                max_digits=10,
+                null=True,
+                validators=[django.core.validators.MinValueValidator(0)],
+                verbose_name="price",
+            ),
+        ),
+    ]

richie/apps/courses/models/program.py

@@ -2,6 +2,7 @@
 Declare and configure the models for the program part
 """
 
+from django.core.validators import MinValueValidator
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 
@@ -9,8 +10,12 @@ from cms.api import Page
 from cms.extensions.extension_pool import extension_pool
 from cms.models.pluginmodel import CMSPlugin
 
+from ...core.fields.duration import CompositeDurationField
 from ...core.models import BasePageExtension
-from ..defaults import PROGRAMS_PAGE
+from .. import defaults
+from .category import Category, CategoryPluginModel
+from .organization import Organization, OrganizationPluginModel
+from .person import Person, PersonPluginModel
 
 
 class Program(BasePageExtension):
@@ -18,7 +23,36 @@ class Program(BasePageExtension):
     The program extension represents and records a program.
     """
 
-    PAGE = PROGRAMS_PAGE
+    PAGE = defaults.PROGRAMS_PAGE
+
+    duration = CompositeDurationField(
+        time_units=defaults.TIME_UNITS,
+        default_unit=defaults.DEFAULT_TIME_UNIT,
+        max_length=80,
+        blank=True,
+        null=True,
+        help_text=_("The program time range."),
+    )
+
+    effort = CompositeDurationField(
+        time_units=defaults.EFFORT_UNITS,
+        default_unit=defaults.DEFAULT_EFFORT_UNIT,
+        max_length=80,
+        blank=True,
+        null=True,
+        help_text=_("Total amount of time to complete this program."),
+    )
+
+    price = models.DecimalField(
+        _("price"),
+        max_digits=10,
+        decimal_places=2,
+        default=0,
+        blank=True,
+        null=True,
+        help_text=_("The price of the program."),
+        validators=[MinValueValidator(0)],
+    )
 
     class Meta:
         db_table = "richie_program"
@@ -32,6 +66,61 @@ class Program(BasePageExtension):
         name = self.extended_object.get_title()
         return f"{model:s}: {name:s}"
 
+    @property
+    def pt_effort(self):
+        """Return effort as a PT string for schema.org metadata."""
+        if not self.effort:
+            return ""
+
+        (effort, effort_unit) = self.effort
+        unit_letter = effort_unit[0].upper()
+        return f"PT{effort:d}{unit_letter:s}"
+
+    @property
+    def price_with_currency(self):
+        """Return price with currency for schema.org metadata."""
+        if not self.price:
+            return ""
+
+        return f"€{self.price}"
+
+    def get_categories(self, language=None):
+        """
+        Return the categories linked to the program via a category plugin in any of the
+        placeholders on the program detail page, ranked by their `path` to respect the
+        order in the categories tree.
+        """
+        return self.get_direct_related_page_extensions(
+            Category, CategoryPluginModel, language=language
+        )
+
+    def get_organizations(self, language=None):
+        """
+        Return the organizations linked to the course via an organization plugin in any
+        of the placeholders on the course detail page, ranked by their `path` to respect
+        the order in the organizations tree.
+        """
+        return self.get_direct_related_page_extensions(
+            Organization, OrganizationPluginModel, language=language
+        )
+
+    def get_persons(self, language=None):
+        """
+        Return the persons linked to the course via a person plugin in any of the
+        placeholders on the course detail page, ranked by their `path` to respect
+        the order in the persons tree.
+        """
+        return self.get_direct_related_page_extensions(
+            Person, PersonPluginModel, language=language
+        )
+
+    def save(self, *args, **kwargs):
+        """
+        Enforce validation each time an instance is saved
+        """
+        self.full_clean()
+        super().save(*args, **kwargs)
+
 
 class ProgramPluginModel(CMSPlugin):
     """

richie/apps/courses/settings/__init__.py

@@ -381,25 +381,58 @@ CMS_PLACEHOLDER_CONF = {
         "child_classes": {"SectionPlugin": ["CKEditorPlugin"]},
     },
     # Program page detail
+    "courses/cms/program_detail.html program_categories": {
+        "name": _("Categories"),
+        "plugins": ["CategoryPlugin"],
+    },
     "courses/cms/program_detail.html program_cover": {
         "name": _("Cover"),
         "plugins": ["SimplePicturePlugin"],
         "limits": {"SimplePicturePlugin": 1},
     },
+    "courses/cms/program_detail.html program_teaser": {
+        "name": _("Teaser"),
+        "plugins": ["VideoPlayerPlugin"],
+        "limits": {"VideoPlayerPlugin": 1},
+    },
     "courses/cms/program_detail.html program_excerpt": {
         "name": _("Excerpt"),
         "plugins": ["PlainTextPlugin"],
         "limits": {"PlainTextPlugin": 1},
     },
+    "courses/cms/program_detail.html program_organizations": {
+        "name": _("Organizations"),
+        "plugins": ["OrganizationPlugin"],
+    },
     "courses/cms/program_detail.html program_body": {
         "name": _("Body"),
         "plugins": ["CKEditorPlugin"],
         "limits": {"CKEditorPlugin": 1},
     },
+    "courses/cms/program_detail.html program_objectives": {
+        "name": _("What you will learn"),
+        "plugins": ["CKEditorPlugin"],
+    },
     "courses/cms/program_detail.html program_courses": {
         "name": _("Courses"),
         "plugins": ["CoursePlugin"],
     },
+    "courses/cms/program_detail.html program_team": {
+        "name": _("Instructors"),
+        "plugins": ["PersonPlugin"],
+    },
+    "courses/cms/program_detail.html program_information": {
+        "name": _("Complementary information"),
+        "plugins": ["SectionPlugin"],
+        "parent_classes": {
+            "CKEditorPlugin": ["SectionPlugin"],
+            "SimplePicturePlugin": ["SectionPlugin"],
+            "GlimpsePlugin": ["SectionPlugin"],
+        },
+        "child_classes": {
+            "SectionPlugin": ["CKEditorPlugin", "SimplePicturePlugin", "GlimpsePlugin"]
+        },
+    },
     "courses/cms/program_list.html maincontent": {
         "name": _("Main content"),
         "plugins": ["SectionPlugin"],