vittascience · maxencelav · Nov 5, 2022 · Nov 5, 2022 · Nov 5, 2022 · Nov 5, 2022
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,12 @@
 /vendor
 /node_modules
-.env 
+.env
 composer.lock
 /plugins
 classroom/assets/plugins
-/EmailTemplates
+/EmailTemplates
+.idea/
+
+classroom/cookie.php
+
+classroom/legalnotice.css
diff --git a/README.md b/README.md
@@ -230,8 +230,8 @@ This $body variable will be injected inside your html emails before sending each
 
 The current repository only contains front elements of the LMS. The back end is mainly located in the dependencies (in the vendor folder) :
 
-- [vuser](https://github.com/vittascience/vuser) : current version (1.2.7)
-- [vclassroom](https://github.com/vittascience/vclassroom) : current version (1.3.2)
+- [vuser](https://github.com/vittascience/vuser) : current version (1.2.8)
+- [vclassroom](https://github.com/vittascience/vclassroom) : current version (1.3.5)
 - [vutils](https://github.com/vittascience/vutils) : current version (1.2.8b)
-- vinterfaces (not public yet) : current version (1.2.9)
-- vlearn (not public yet) : current version (1.2.13)
+- vinterfaces (not public yet) : current version (1.3.3)
+- vlearn (not public yet) : current version (1.3.2)
diff --git a/classroom/Views/_newExercicesPanel.html b/classroom/Views/_newExercicesPanel.html
diff --git a/classroom/Views/groupAdminProfilePanel.html b/classroom/Views/groupAdminProfilePanel.html
@@ -1,7 +1,7 @@
 <div id="classroom-dashboard-profil-panel-groupadmin" class="dashboard-block profile-panel" style="display:none;">
 
     <div class="d-flex flex-column text-center">
-        <img src="assets/media/profile_picture.svg" alt="Photo de profil" class="user-picture">
+        <img src="assets/media/profile_picture.svg?version=VERSIONNUM" alt="Photo de profil" class="user-picture">
         <span id="user-name-groupadmin" class="mt-4" data-i18n="classroom.profil.identity">PLACEHOLDER</span>
     </div>
 
@@ -15,4 +15,4 @@
             <i class="fas fa-power-off"></i>
         </button>
     </div>
-</div>
+</div>
diff --git a/classroom/Views/header.html b/classroom/Views/header.html
@@ -1,8 +1,8 @@
-    <link rel="stylesheet" href="assets/css/modal.css">
+    <link rel="stylesheet" href="assets/css/modal.css?version=VERSIONNUM">
     <!-- PLUGIN CSS-->
 
     <!-- END PLUGIN CSS -->
-    <script src="assets/js/scripts/classroom-lang.js"></script>
+    <script src="assets/js/scripts/classroom-lang.js?version=VERSIONNUM"></script>
 </head>
 
-<body>
+<body>
diff --git a/classroom/Views/home_footer.html b/classroom/Views/home_footer.html
@@ -4,7 +4,7 @@
 <script src="assets/js/lib/jquery-3.5.1/jquery-3.5.1.min.js"></script>
 <script src="assets/js/lib/wysibb/jquery.wysibb.js"></script>
 <script src="assets/js/lib/jquery_ui-1.12.0/jquery-ui.min.js"></script>
-<link rel="stylesheet" stype="text/css" href="assets/js/lib/wysibb/theme/default/wbbtheme.css">
+<link rel="stylesheet" stype="text/css" href="assets/js/lib/wysibb/theme/default/wbbtheme.css?version=VERSIONNUM">
 <script>
     $(document).ready(function () {
         let wbbOpt = {
@@ -13,66 +13,64 @@
         $("#activity-form-content").wysibb(wbbOpt);
     })
 </script>
-<script src="assets/js/lib/popper-1.16.0/popper.min.js">
-</script>
-<script src="assets/js/lib/bootstrap-4.4.1/bootstrap.min.js">
-</script>
-<script src="assets/js/lib/i18next.js"></script>
-<script src="assets/js/lib/jquery-i18next.min.js"></script>
-<script src="assets/js/lib/i18nextXHRBackend.min.js"></script>
-<script
-    src="assets/js/lib/i18nextBrowserLanguageDetector.min.js">
-</script>
-
+<script src="assets/js/lib/popper-1.16.0/popper.min.js"></script>
+<script src="assets/js/lib/bootstrap-4.4.1/bootstrap.min.js"></script>
+<script src="assets/js/lib/i18next.js?version=VERSIONNUM"></script>
+<script src="assets/js/lib/jquery-i18next.min.js?version=VERSIONNUM"></script>
+<script src="assets/js/lib/i18nextXHRBackend.min.js?version=VERSIONNUM"></script>
+<script  src="assets/js/lib/i18nextBrowserLanguageDetector.min.js?version=VERSIONNUM"></script>
 <!-- drag and drop bundle -->
-<link rel="stylesheet" stype="text/css" href="assets/css/dragula.css">
-<script src="assets/js/lib/dragula.js" ></script>
+<link rel="stylesheet" stype="text/css" href="assets/css/dragula.css?version=VERSIONNUM">
+<script src="assets/js/lib/dragula.js?version=VERSIONNUM" ></script>
 <!-- build:js-classroom -->
-<script src="assets/js/utils/url.js"></script>
-<script src="assets/js/utils/parsingJson.js"></script>
-<script src="assets/js/utils/text.js"></script>
-<script src="assets/js/lib/rotate.js"></script>
-<script src="assets/js/utils/bbcodeToHtml.js"></script>
-<script src="assets/js/utils/activityContentManager.js"></script>
-<script src="assets/js/utils/registrationTemplate.js"></script>
-<script src="assets/js/scripts/disconnect.js"></script>
-<script src="assets/js/scripts/dashboardActivities.js"></script>
-<script src="assets/js/scripts/teacherActivities.js"></script>
-<script src="assets/js/scripts/manageClassroom.js"></script>
-<script src="assets/js/scripts/displayPanel.js"></script>
-<script src="assets/js/main/modal.js"></script>
-<script src="assets/js/constants/modals.js"></script>
-<script src="assets/js/scripts/buttons.js"></script>
-<script src="assets/js/scripts/ActivityTracker.js"></script>
-<script src="assets/js/scripts/activityManager.js"></script>
-<script src="assets/js/scripts/classroomDisplay.js"></script>
-<script src="assets/js/main/FoldersManager.js"></script>
+<script src="assets/js/utils/url.js?version=VERSIONNUM"></script>
+<script src="assets/js/utils/parsingJson.js?version=VERSIONNUM"></script>
+<script src="assets/js/utils/text.js?version=VERSIONNUM"></script>
+<script src="assets/js/lib/rotate.js?version=VERSIONNUM"></script>
+<script src="assets/js/utils/bbcodeToHtml.js?version=VERSIONNUM"></script>
+<script src="assets/js/utils/activityContentManager.js?version=VERSIONNUM"></script>
+<script src="assets/js/utils/registrationTemplate.js?version=VERSIONNUM"></script>
+<script src="assets/js/scripts/disconnect.js?version=VERSIONNUM"></script>
+<script src="assets/js/scripts/dashboardActivities.js?version=VERSIONNUM"></script>
+<script src="assets/js/scripts/teacherActivities.js?version=VERSIONNUM"></script>
+<script src="assets/js/scripts/manageClassroom.js?version=VERSIONNUM"></script>
+<script src="assets/js/scripts/displayPanel.js?version=VERSIONNUM"></script>
+<script src="assets/js/main/modal.js?version=VERSIONNUM"></script>
+<script src="assets/js/constants/modals.js?version=VERSIONNUM"></script>
+<script src="assets/js/scripts/buttons.js?version=VERSIONNUM"></script>
+<script src="assets/js/scripts/ActivityTracker.js?version=VERSIONNUM"></script>
+<script src="assets/js/scripts/activityManager.js?version=VERSIONNUM"></script>
+<script src="assets/js/scripts/classroomDisplay.js?version=VERSIONNUM"></script>
 <!-- end build -->
-<script src="assets/js/main/Loader.js"></script>
-<script src="assets/js/main/UIManager.js"></script>
-<script src="assets/js/main/User.js"></script>
-<script src="assets/js/main/ClassroomManager.js"></script>
+<script src="assets/js/main/Loader.js?version=VERSIONNUM"></script>
+<script src="assets/js/main/UIManager.js?version=VERSIONNUM"></script>
+<script src="assets/js/main/User.js?version=VERSIONNUM"></script>
+<script src="assets/js/main/ClassroomManager.js?version=VERSIONNUM"></script>
 <!-- manager & groupadmin -->
-<script src="assets/js/main/ManagerManager.js"></script>
-<script src="assets/js/main/GroupAdminManager.js"></script>
-<script src="assets/js/main/MainManagerAndGroup.js"></script>
+<script src="assets/js/main/ManagerManager.js?version=VERSIONNUM"></script>
+<script src="assets/js/main/GroupAdminManager.js?version=VERSIONNUM"></script>
+<script src="assets/js/main/MainManagerAndGroup.js?version=VERSIONNUM"></script>
 <!-- end manager & groupadmin -->
-<script src="assets/js/main/Main.js"></script>
-<script src="assets/js/main/Loader.js"></script>
-
+<script src="assets/js/main/Main.js?version=VERSIONNUM"></script>
+<script src="assets/js/main/Loader.js?version=VERSIONNUM"></script>
+<!-- courses -->
+<script src="assets/js/main/CoursesManager.js?version=VERSIONNUM"></script>
+<!-- Custom Activities -->
 <script src="assets/js/main/CustomActivityManager.js"></script>
+<!-- Folder management -->
+<script src="assets/js/main/FoldersManager.js?version=VERSIONNUM"></script>
 
 <script>
     UIManager.init().then((resolve) => {
         UserManager.init().then((resolve) => {
                 Main.init().then((resolve) => {
                     const EVENTS_SCRIPTS = [{
                             id: "modals",
-                            src: "assets/js/scripts/loadModals.js"
+                            src: "assets/js/scripts/loadModals.js?version=VERSIONNUM"
                         },
                         {
                             id: "i18n",
-                            src: "assets/js/scripts/checkMail.js"
+                            src: "assets/js/scripts/checkMail.js?version=VERSIONNUM"
                         }
                     ];
                     Loader.loadScripts(EVENTS_SCRIPTS).then(
@@ -92,6 +90,8 @@
                                             administration[0] = resolve;
                                             createRegistrationTemplate();
                                             goBackToThePreviousView(administration);
+                                            // Courses
+                                            coursesManager.actualizeCourse();
                                             onEnd();
                                         })
                                     })
@@ -126,7 +126,10 @@
                             console.log("Loader failed to load: " + reason);
                             failedToLoad();
                         }
-                    );
+                    ).then((resolve)=> {
+                        // hide spinner when load
+                        $("#spinner-loading").hide();
+                    });
                 })
             },
             (reason) => {
@@ -138,9 +141,9 @@
 
     // Update Rémi, allow to return in the manager or groupadmin mode after a refresh
     function goBackToThePreviousView(administration = []) {
-        if ($_GET('panel') && 
-        (ClassroomSettings.mixPanels.includes($_GET('panel')) || 
-        ClassroomSettings.teacherPanels.includes($_GET('panel')) || 
+        if ($_GET('panel') &&
+        (ClassroomSettings.mixPanels.includes($_GET('panel')) ||
+        ClassroomSettings.teacherPanels.includes($_GET('panel')) ||
         ClassroomSettings.managerPanels.includes($_GET('panel')) ||
         ClassroomSettings.groupAdminPanels.includes($_GET('panel')))) {
             if (administration[0] === true && $_GET('panel').includes("manager") && $_GET('nav').includes("manager")) {
@@ -171,10 +174,10 @@
         }
     }
 </script>
-<script src="assets/js/utils/translate.js"></script>
+<script src="assets/js/utils/translate.js?version=VERSIONNUM"></script>
 <!-- PLUGIN SCRIPTS-->
 
 <!-- END PLUGIN SCRIPTS -->
 </body>
 
-</html>
+</html>
diff --git a/classroom/Views/home_topbar.html b/classroom/Views/home_topbar.html
@@ -1,4 +1,7 @@
 <div id="classroom-dashboard-content">
+    <div id="spinner-loading">
+        <div></div>
+    </div>
     <div id="classroom-dashboard-top-bar">
         <!-- Breadcrumb -->
         <div id="breadcrumb" class="row ml-2 mr-auto"></div>

diff --git a/classroom/Views/login_by_link.html b/classroom/Views/login_by_link.html
@@ -5,7 +5,7 @@
         <div id="classroom-create-account" class="container-border-left container-border-left-enable">
             <div class="c-primary-form">
                 <p>Première viste ? Veuillez choisir un identifiant.</p>
-                <img src="./assets/media/green_user.png" class="icon-label">
+                <img src="./assets/media/green_user.png?version=VERSIONNUM" class="icon-label">
                 <label for="username">Pseudonyme</label></br>
                 <input type="text" placeholder="Vitta" name="username" id="new-user-pseudo-form" required>
             </div>
@@ -19,11 +19,11 @@
 
                 <p>De retour dans cette classe ?</p>
 
-                <img src="./assets/media/green_user.png" class="icon-label">
+                <img src="./assets/media/green_user.png?version=VERSIONNUM" class="icon-label">
                 <label for="username">Pseudonyme</label></br>
                 <input type="text" placeholder="Vitta" id="user-pseudo-form" name="secret_code" required></br>
 
-                <img src="./assets/media/green_lock.png" class="icon-label">
+                <img src="./assets/media/green_lock.png?version=VERSIONNUM" class="icon-label">
                 <label for="username">Mot de passe</label></br>
                 <input type="password" placeholder="••••••••••" name="secret_code" id="user-password-form"
                     required></br>
@@ -37,4 +37,4 @@
         <button onclick="returnToConnectionPanel('#classroom-login-container-bis')" class="btn close-login-classroom"><i
                 class="fas fa-times"></i></button>
     </div>
-</div>
+</div>
diff --git a/classroom/Views/login_selection.html b/classroom/Views/login_selection.html
@@ -4,7 +4,7 @@
         <div id="classroom-login-code" class="container-border-left">
             <h3 class="font-weight-bold c-text-secondary" data-i18n="classroom.login.student"></h3>
             <div class="c-secondary-form">
-                <img src="./assets/media/orange_lock.png" class="icon-label">
+                <img src="./assets/media/orange_lock.png?version=VERSIONNUM" class="icon-label">
                 <label for="secret_code"> Rentrez ici votre code classe</label><br>
                 <input type="text" placeholder="123ABC" name="secret_code" id="class-code" required>
             </div>
@@ -19,10 +19,10 @@ <h3 class="font-weight-bold c-text-primary" data-i18n="classroom.login.teacher">
             </span>
         </div>
         <div id="classroom-login-gar" class="container-border-right">
-            <img src="./assets/media/logoGAR.png" alt="Logo GAR">
+            <img src="./assets/media/logoGAR.png?version=VERSIONNUM" alt="Logo GAR">
             <span class="gar-presentation-text">Profitez du mode classe en toute simplicité à l'aide du GAR.<br>
                 <a href="http://google.com">Cliquez ici</a> pour en savoir plus.</span>
         </div>
 
     </div>
-</div>
+</div>
diff --git a/classroom/Views/managerProfilePanel.html b/classroom/Views/managerProfilePanel.html
@@ -1,7 +1,7 @@
 <div id="classroom-dashboard-profil-panel-manager" class="dashboard-block profile-panel" style="display:none;">
 
     <div class="d-flex flex-column text-center">
-        <img src="assets/media/profile_picture.svg" alt="Photo de profil" class="user-picture">
+        <img src="assets/media/profile_picture.svg?version=VERSIONNUM" alt="Photo de profil" class="user-picture">
         <span id="user-name-manager" class="mt-4" data-i18n="classroom.profil.identity">PLACEHOLDER</span>
     </div>
 
@@ -15,4 +15,4 @@
             <i class="fas fa-power-off"></i>
         </button>
     </div>
-</div>
+</div>
diff --git a/classroom/Views/newExercicesPanel.html b/classroom/Views/newExercicesPanel.html
@@ -1,5 +1,5 @@
 <!-- content part -->
-<div id="classroom-dashboard-classes-new-activity" style="display:none;" class="dashboard-block classes-panel">
+<div id="classroom-dashboard-classes-new-activity" style="display:none;" class="classroom-dashboard-new-activity dashboard-block classes-panel">
     <nav class="row form-activity-container" style="margin: 0 auto;">
         <div class="col text-center">
             <span class="form-activity form-activity-secondary"><i class="fas fa-check"></i></span>
@@ -28,7 +28,7 @@
         </div>
     </nav>
 
-    <div class="container mb-2 part-content-index c-primary-form">
+    <div id="tool-container" class="tool-container mb-2 part-content-index c-primary-form">
 
         <!-- Free activity part -->
         <div id="activity-free" style="display:none;">
@@ -37,7 +37,7 @@
                 <textarea id="free-content" style="height:340px"></textarea>
             </div>
 
-            <div class="c-checkbox">
+            <div class="c-checkbox ml-3">
                 <input type="checkbox" name="free-autocorrect" id="free-autocorrect">
                 <label for="free-autocorrect" data-i18n="newActivities.autocorrect">Autocorrection</label>
             </div>
@@ -180,8 +180,8 @@
 
 
         <!-- Custom & probably Lti -->
-        <div id="activity-custom" style="display:none;">
-            <div id="lti-loader-container"></div>
+        <div id="activity-custom" style="display:none;" class="activity-custom">
+            <div id="lti-loader-container" class="lti-loader-container"></div>
         </div>
 
         <div class="container">
@@ -260,7 +260,6 @@ <h3 class="activity-title" id="preview-title" style="display: none;"></h3>
 
 
                 <div id="preview-content" style="display: none;">
-                    <label for="preview-activity-content" id="label-activity-content" class="vitta-modal-title mt-2" data-i18n="newActivities.contentTitle">Contenu de l'activité</label>
                     <p id="preview-activity-content"></p>   
                 </div>
 
@@ -419,4 +418,14 @@ <h3 class="c-text-primary text-uppercase font-weight-bold" data-i18n="classroom.
             <span data-i18n="classroom.activities.form.4">Attribution</span>
         </div>
     </nav>
-</div>
+</div>
+
+<!-- content part -->
+<div id="classroom-dashboard-collections-new-activity" style="display:none;" class="classroom-dashboard-new-activity dashboard-block classes-panel">
+    <div id="tool-container" class="tool-container mb-2 part-content-index c-primary-form">
+        <!-- Custom & probably Lti -->
+        <div id="activity-custom-collections" class="activity-custom" style="display:none;">
+            <div id="lti-loader-container-collections" class="lti-loader-container"></div>
+        </div>
+    </div>
+</div>
diff --git a/classroom/Views/sidebar_groupadmin.html b/classroom/Views/sidebar_groupadmin.html
@@ -4,25 +4,25 @@
 
     <div class="classroom-navbar-button" id="dashboard-groupadmin-users-side"
         onclick="navigatePanel('groupadmin-dashboard-users', 'dashboard-groupadmin-users-side')">
-        <img src="assets/media/my_classes.svg" alt="Icône classe">
+        <img src="assets/media/my_classes.svg?version=VERSIONNUM" alt="Icône classe">
         <span data-i18n="manager.users.users">Utilisateurs</span>
     </div>
 
     <div class="classroom-navbar-button" id="dashboard-groupadmin-apps"
         onclick="navigatePanel('groupadmin-apps-main', 'dashboard-groupadmin-apps')">
-        <img src="assets/media/my_apps.svg" alt="Icône classe">
+        <img src="assets/media/my_apps.svg?version=VERSIONNUM" alt="Icône classe">
         <span data-i18n="manager.apps.apps">Applications</span>
     </div>
 
     <div class="classroom-navbar-button" id="dashboard-groupadmin-help-side"
         onclick="navigatePanel('groupadmin-dashboard-help', 'dashboard-groupadmin-help-side')">
-        <img src="assets/media/call_for_help.svg" alt="Icône Appel à l'aide">
+        <img src="assets/media/call_for_help.svg?version=VERSIONNUM" alt="Icône Appel à l'aide">
         <span data-i18n="manager.profil.help">Appel à l'aide</span>
     </div>
 
     <div id="dashboard-profil-groupadmin" class="classroom-navbar-button"
         onclick="navigatePanel('classroom-dashboard-profil-panel-groupadmin', 'dashboard-profil-groupadmin')">
-        <img class="user-picture" src="assets/media/profile_picture.svg" alt="Photo de profil">
+        <img class="user-picture" src="assets/media/profile_picture.svg?version=VERSIONNUM" alt="Photo de profil">
         <span data-i18n="classroom.ids.classroom-dashboard-profil-panel-teacher"></span>
     </div>
-</div>
+</div>