[Training] displays duration in hours

claroline · May 3, 2023 · f421b2b · f421b2b
1 parent 3cd196a
commit f421b2b
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 7 deletions.
diff --git a/src/plugin/cursus/Entity/Course.php b/src/plugin/cursus/Entity/Course.php
@@ -72,7 +72,7 @@ class Course extends AbstractTraining
     /**
      * @ORM\Column(name="session_duration", nullable=false, type="float", options={"default" = 1})
      */
-    private float $defaultSessionDuration = 1;
+    private float $defaultSessionDuration = 1; // in hours
 
     /**
      * @ORM\ManyToMany(

diff --git a/src/plugin/cursus/Installation/ClarolineCursusInstaller.php b/src/plugin/cursus/Installation/ClarolineCursusInstaller.php
@@ -5,6 +5,7 @@
 use Claroline\CursusBundle\Installation\Updater\Updater130001;
 use Claroline\CursusBundle\Installation\Updater\Updater130013;
 use Claroline\CursusBundle\Installation\Updater\Updater130100;
+use Claroline\CursusBundle\Installation\Updater\Updater130800;
 use Claroline\InstallationBundle\Additional\AdditionalInstaller;
 
 class ClarolineCursusInstaller extends AdditionalInstaller
@@ -15,6 +16,7 @@ public static function getUpdaters(): array
             '13.0.1' => Updater130001::class,
             '13.0.13' => Updater130013::class,
             '13.1.0' => Updater130100::class,
+            '13.8.0' => Updater130800::class,
         ];
     }
 

diff --git a/src/plugin/cursus/Installation/Updater/Updater130800.php b/src/plugin/cursus/Installation/Updater/Updater130800.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Claroline\CursusBundle\Installation\Updater;
+
+use Claroline\InstallationBundle\Updater\Updater;
+use Doctrine\DBAL\Connection;
+
+class Updater130800 extends Updater
+{
+    private Connection $connection;
+
+    public function __construct(
+        Connection $connection
+    ) {
+        $this->connection = $connection;
+    }
+
+    public function preUpdate(): void
+    {
+        $this->connection->executeQuery('UPDATE claro_cursusbundle_course SET session_duration = (session_duration * 24) WHERE session_duration IS NOT NULL');
+    }
+}
diff --git a/src/plugin/cursus/Resources/config/services/updater.yml b/src/plugin/cursus/Resources/config/services/updater.yml
@@ -1,17 +1,21 @@
 services:
+    _defaults:
+        tags: [ 'claroline.platform.updater' ]
+
     Claroline\CursusBundle\Installation\Updater\Updater130001:
         arguments:
             - '@Claroline\AppBundle\Persistence\ObjectManager'
             - '@logger'
-        tags: ['claroline.platform.updater']
 
     Claroline\CursusBundle\Installation\Updater\Updater130013:
         arguments:
             - '@Claroline\AppBundle\Persistence\ObjectManager'
             - '@Claroline\CoreBundle\Manager\PlanningManager'
-        tags: [ 'claroline.platform.updater' ]
 
     Claroline\CursusBundle\Installation\Updater\Updater130100:
         arguments:
             - '@Claroline\AppBundle\Persistence\ObjectManager'
-        tags: [ 'claroline.platform.updater' ]
+
+    Claroline\CursusBundle\Installation\Updater\Updater130800:
+        arguments:
+            - '@doctrine.dbal.default_connection'
diff --git a/src/plugin/cursus/Resources/modules/course/components/about.jsx b/src/plugin/cursus/Resources/modules/course/components/about.jsx
@@ -3,7 +3,7 @@ import {PropTypes as T} from 'prop-types'
 import get from 'lodash/get'
 import isEmpty from 'lodash/isEmpty'
 
-import {trans, displayDuration, displayDate, now} from '#/main/app/intl'
+import {trans, displayDate, now} from '#/main/app/intl'
 import {param} from '#/main/app/config'
 import {currency} from '#/main/app/intl/currency'
 import {hasPermission} from '#/main/app/security'
@@ -113,7 +113,7 @@ const CourseAbout = (props) => {
               {trans('duration')}
               <span className="value">
                 {getInfo(props.course, props.activeSession, 'meta.duration') ?
-                  displayDuration(getInfo(props.course, props.activeSession, 'meta.duration') * 3600 * 24, true) :
+                  getInfo(props.course, props.activeSession, 'meta.duration') + ' ' + trans('hours') :
                   trans('empty_value')
                 }
               </span>

diff --git a/src/plugin/cursus/Resources/modules/course/components/parameters.jsx b/src/plugin/cursus/Resources/modules/course/components/parameters.jsx
@@ -65,7 +65,7 @@ const CourseParameters = (props) =>
             required: true,
             options: {
               min: 0,
-              unit: trans('days')
+              unit: trans('hours')
             }
           }, {
             name: 'tags',