From 01e19e1065ff4ab7c2a008b284cb286bf3be2146 Mon Sep 17 00:00:00 2001
From: Aline <aline.keller@gmail.com>
Date: Wed, 11 Sep 2024 19:00:03 +0200
Subject: [PATCH] Update reference week

Add new schedule types with new icons
---
 .../content-types/coursebook/coursebook.scss  | 53 +++++++++++++------
 .../content-types/coursebook/coursebook.twig  | 30 +++++++----
 .../icons/icon-course-based-project.svg       |  3 ++
 assets/images/icons/icon-course-exercise.svg  |  4 +-
 .../icons/icon-course-individual-project.svg  |  3 ++
 assets/images/icons/icon-course-lab.svg       |  3 ++
 assets/images/icons/icon-course-project.svg   |  3 --
 assets/images/icons/icon-course-tp.svg        |  3 ++
 8 files changed, 71 insertions(+), 31 deletions(-)
 create mode 100644 assets/images/icons/icon-course-based-project.svg
 create mode 100644 assets/images/icons/icon-course-individual-project.svg
 create mode 100644 assets/images/icons/icon-course-lab.svg
 delete mode 100644 assets/images/icons/icon-course-project.svg
 create mode 100644 assets/images/icons/icon-course-tp.svg

diff --git a/assets/components/content-types/coursebook/coursebook.scss b/assets/components/content-types/coursebook/coursebook.scss
index a800e5253..579a0e01a 100644
--- a/assets/components/content-types/coursebook/coursebook.scss
+++ b/assets/components/content-types/coursebook/coursebook.scss
@@ -158,23 +158,35 @@
       padding-left: 0;
     }
 
-    td.taken {
+    tr td.taken {
+      background: $red-dark;
+      background-repeat: no-repeat;
+      background-position: 0.25rem 0.25rem;
       color: #fff;
 
       a {
         color: #fff;
+        font-weight: bold;
       }
 
-      &.cours {
-        background: $red;
+      &.exercice {
+        background-image: url(../images/icons/icon-course-exercise.svg);
       }
 
-      &.exercice {
-        background: $red-dark url(../images/icons/icon-course-exercise.svg) no-repeat 4px 4px;
+      &.tp {
+        background-image: url(../images/icons/icon-course-tp.svg);
+      }
+
+      &.labo {
+        background-image: url(../images/icons/icon-course-lab.svg);
       }
 
-      &.projet {
-        background: #8e0000 url(../images/icons/icon-course-project.svg) no-repeat 4px 4px;
+      &.course-based-project {
+        background-image: url(../images/icons/icon-course-based-project.svg);
+      }
+
+      &.individual-project {
+        background-image: url(../images/icons/icon-course-individual-project.svg);
       }
     }
   }
@@ -186,24 +198,35 @@
     margin-bottom: .5rem;
 
     .caption-icon {
+      background: $red-dark;
+      background-repeat: no-repeat;
+      background-position: .5rem .5rem;
       display: inline-block;
-      width: 2rem;
-      height: 2rem;
+      width: 1.75rem;
+      height: 1.75rem;
       margin-right: .25rem;
       vertical-align: middle;
     }
   }
 
-  .caption-cours .caption-icon {
-    background: $red;
+  .caption-exercice .caption-icon {
+    background-image: url(../images/icons/icon-course-exercise.svg);
   }
 
-  .caption-exercice .caption-icon {
-    background: $red-dark url(../images/icons/icon-course-exercise.svg) no-repeat .5rem .5rem;
+  .caption-tp .caption-icon {
+    background-image: url(../images/icons/icon-course-tp.svg);
+  }
+
+  .caption-labo .caption-icon {
+    background-image: url(../images/icons/icon-course-lab.svg);
+  }
+
+  .caption-course-based-project .caption-icon {
+    background-image: url(../images/icons/icon-course-based-project.svg);
   }
 
-  .caption-projet .caption-icon {
-    background: #8e0000 url(../images/icons/icon-course-project.svg) no-repeat .5rem .5rem;
+  .caption-course-individual-project .caption-icon {
+    background-image: url(../images/icons/icon-course-individual-project.svg);
   }
 }
 
diff --git a/assets/components/content-types/coursebook/coursebook.twig b/assets/components/content-types/coursebook/coursebook.twig
index 5a1c5d085..fe79f0c40 100644
--- a/assets/components/content-types/coursebook/coursebook.twig
+++ b/assets/components/content-types/coursebook/coursebook.twig
@@ -29,14 +29,12 @@
         <td class="time">10-11</td>
         <td rowspan="2" class="taken exercice">&nbsp;</td>
         <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
+        <td rowspan="2" class="taken course-based-project"><a href="#">CM5</a></td>
+        <td rowspan="2" class="taken individual-project">&nbsp;</td>
       </tr>
       <tr>
         <td class="time">11-12</td>
         <td>&nbsp;</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
       </tr>
       <tr>
         <td class="time">12-13</td>
@@ -48,7 +46,7 @@
       </tr>
       <tr>
         <td class="time">13-14</td>
-        <td rowspan="6" class="taken projet">&nbsp;</td>
+        <td rowspan="6" class="taken tp">&nbsp;</td>
         <td>&nbsp;</td>
         <td>&nbsp;</td>
         <td>&nbsp;</td>
@@ -57,7 +55,7 @@
       <tr>
         <td class="time">14-15</td>
         <td>&nbsp;</td>
-        <td>&nbsp;</td>
+        <td rowspan="3" class="taken labo"><a href="#">CM5</a></td>
         <td>&nbsp;</td>
         <td>&nbsp;</td>
       </tr>
@@ -66,14 +64,12 @@
         <td>&nbsp;</td>
         <td>&nbsp;</td>
         <td>&nbsp;</td>
-        <td>&nbsp;</td>
       </tr>
       <tr>
         <td class="time">16-17</td>
         <td>&nbsp;</td>
         <td>&nbsp;</td>
         <td>&nbsp;</td>
-        <td>&nbsp;</td>
       </tr>
       <tr>
         <td class="time">17-18</td>
@@ -124,11 +120,23 @@
     </p>
     <p class="caption caption-exercice">
       <span class="caption-icon"></span>
-      Exercice, TP
+      Exercices
+    </p>
+    <p class="caption caption-labo">
+      <span class="caption-icon"></span>
+      Labo
+    </p>
+    <p class="caption caption-tp">
+      <span class="caption-icon"></span>
+      Travaux pratiques
+    </p>
+    <p class="caption caption-course-based-project">
+      <span class="caption-icon"></span>
+      Course based project
     </p>
-    <p class="caption caption-projet">
+    <p class="caption caption-course-individual-project">
       <span class="caption-icon"></span>
-      Projet, autre
+      Individual project
     </p>
   </div>
 
diff --git a/assets/images/icons/icon-course-based-project.svg b/assets/images/icons/icon-course-based-project.svg
new file mode 100644
index 000000000..a4acb7c97
--- /dev/null
+++ b/assets/images/icons/icon-course-based-project.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
+  <rect x="0" width="12" height="4" fill="rgba(255,255,255,0.9)"/><rect x="0" y="8" width="12" height="4" fill="rgba(255,255,255,0.9)"/>
+</svg>
diff --git a/assets/images/icons/icon-course-exercise.svg b/assets/images/icons/icon-course-exercise.svg
index b8cf25c5b..5564a3eed 100644
--- a/assets/images/icons/icon-course-exercise.svg
+++ b/assets/images/icons/icon-course-exercise.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <path id="Tracé_7" data-name="Tracé 7" d="M0,0H16L0,16Z" fill="#fff"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
+  <path d="M0,0H12L0,12Z" fill="rgba(255,255,255,0.9)"/>
 </svg>
diff --git a/assets/images/icons/icon-course-individual-project.svg b/assets/images/icons/icon-course-individual-project.svg
new file mode 100644
index 000000000..c68904ac1
--- /dev/null
+++ b/assets/images/icons/icon-course-individual-project.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
+  <rect width="4" height="12" fill="rgba(255,255,255,0.9)"/><rect x="8" width="4" height="12" fill="rgba(255,255,255,0.9)"/>
+</svg>
diff --git a/assets/images/icons/icon-course-lab.svg b/assets/images/icons/icon-course-lab.svg
new file mode 100644
index 000000000..77ee99185
--- /dev/null
+++ b/assets/images/icons/icon-course-lab.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
+  <circle cx="6" cy="6" r="6"  fill="rgba(255,255,255,0.9)"/>
+</svg>
diff --git a/assets/images/icons/icon-course-project.svg b/assets/images/icons/icon-course-project.svg
deleted file mode 100644
index 940270132..000000000
--- a/assets/images/icons/icon-course-project.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
-  <rect id="Rectangle_47" data-name="Rectangle 47" width="16" height="16" fill="#fff"/>
-</svg>
diff --git a/assets/images/icons/icon-course-tp.svg b/assets/images/icons/icon-course-tp.svg
new file mode 100644
index 000000000..4d904cee8
--- /dev/null
+++ b/assets/images/icons/icon-course-tp.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
+  <rect width="12" height="12" fill="rgba(255,255,255,0.9)"/>
+</svg>