Merge branch 'main' into pmd

UM-LPM · May 9, 2024 · 4bc77cd · 4bc77cd
2 parents 6940c73 + efca5a8
commit 4bc77cd
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 3 deletions.
diff --git a/_courses/IOB.md b/_courses/IOB.md
@@ -8,6 +8,7 @@ permalink: "IOB"
 author:
 - "Muhamed Turkanović"
 contact: "muhamed.turkanovic@um.si"
+notifyEmail: "cvetankapasinecka@gmail.com"
 title: "Identifikacija, overjanje in blockchain"
 image: "https://unsplash.com/photos/black-flat-screen-computer-monitor-bMvuh0YQQ68"
 type: "Potrjeno krajše izobraževanje za podelitev mikrodokazila UM"

diff --git a/_courses/RSASMCD.md b/_courses/RSASMCD.md
@@ -9,6 +9,7 @@ author:
 - "Tomaž Kosar"
 - "Dragana Ostojić"
 contact: "tomaz.kosar@um.si"
+notifyEmail: "cvetankapasinecka@gmail.com"
 title: "Razvoj spletnih aplikacij s skladom MERN: čelni del"
 image: "https://images.unsplash.com/photo-1633356122544-f134324a6cee"
 type: "Potrjeno krajše izobraževanje za podelitev mikrodokazila UM"

diff --git a/_courses/RSASMZD.md b/_courses/RSASMZD.md
@@ -9,6 +9,7 @@ author:
 - "Tomaž Kosar"
 - "Dragana Ostojić"
 contact: "tomaz.kosar@um.si"
+notifyEmail: "cvetankapasinecka@gmail.com"
 title: "Razvoj spletnih aplikacij s skladom MERN: zaledni del"
 image: "https://images.unsplash.com/photo-1511376777868-611b54f68947"
 type: "Potrjeno krajše izobraževanje za podelitev mikrodokazila UM"

diff --git a/_courses/SVVT.md b/_courses/SVVT.md
@@ -9,6 +9,7 @@ author:
 - "Marko Hölbl"
 - "Muhamed Turkanović"
 contact: "muhamed.turkanovic@um.si"
+notifyEmail: "cvetankapasinecka@gmail.com"
 title: "Spletna varnost in vdorno testiranje"
 image: "https://unsplash.com/photos/closeup-photo-of-eyeglasses-w7ZyuGYNpRQ"
 type: "Potrjeno krajše izobraževanje za podelitev mikrodokazila UM"

diff --git a/_courses/UPyN.md b/_courses/UPyN.md
@@ -9,6 +9,7 @@ author:
 - "Nina Murks"
 - "Matej Kramberger"
 contact: "nina.murks@um.si"
+notifyEmail: "cvetankapasinecka@gmail.com"
 title: "Uvod v Python za neprogramerje"
 image: "https://images.unsplash.com/photo-1517148815978-75f6acaaf32c"
 type: "Potrjeno krajše izobraževanje za podelitev mikrodokazila UM"

diff --git a/_layouts/course-data-filtered.html b/_layouts/course-data-filtered.html
@@ -15,7 +15,10 @@
       "image": "{{ course.image}}",
       "difficulty": "{{ course.difficulty | replace: "š", "s" | replace: "č", "c" | replace: "ž", "z" | replace: "Š", "S" | replace: "Č", "C" | replace: "Ž", "Z" }}",
       "type": "{{ course.type | replace: "š", "s" | replace: "č", "c" | replace: "ž", "z" | replace: "Š", "S" | replace: "Č", "C" | replace: "Ž", "Z" }}",
-      "cType": "{{ course.cType }}"
+      "cType": "{{ course.cType }}",
+      {% if course.notifyEmail and course.notifyEmail != "" %}"notifyEmail": "{{ course.notifyEmail }}"{% else %}"notifyEmail": ""{% endif %},
+      {% if course.executionStartDate and course.executionStartDate != "" %}"executionStartDate": "{{ course.executionStartDate }}"{% else %}"executionStartDate": ""{% endif %},
+      {% if course.executionData and course.executionData != "" %}"executionData": "{{ course.executionData | replace: "š", "s" | replace: "č", "c" | replace: "ž", "z" | replace: "Š", "S" | replace: "Č", "C" | replace: "Ž", "Z" | strip_newlines | replace: '"', '\"' }}"{% else %}"executionData": ""{% endif %}
     }{% unless forloop.last %},{% endunless %}
   {% endfor %}
 ]
diff --git a/_layouts/course-data.html b/_layouts/course-data.html
@@ -16,7 +16,10 @@
       "difficulty": "{{ course.difficulty }}",
       "type": "{{ course.type }}",
       "execution": "{{ course.execution }}",
-      "cType": "{{ course.cType }}"
+      "cType": "{{ course.cType }}",
+      {% if course.notifyEmail and course.notifyEmail != "" %}"notifyEmail": "{{ course.notifyEmail }}"{% else %}"notifyEmail": ""{% endif %},
+      {% if course.executionStartDate and course.executionStartDate != "" %}"executionStartDate": "{{ course.executionStartDate }}"{% else %}"executionStartDate": ""{% endif %},
+      {% if course.executionData and course.executionData != "" %}"executionData": "{{ course.executionData | strip_newlines | replace: '"', '\"' }}"{% else %}"executionData": ""{% endif %}
     }{% unless forloop.last %},{% endunless %}
   {% endfor %}
 ]
diff --git a/_layouts/course.html b/_layouts/course.html
@@ -6,7 +6,6 @@
         {% include svg-icons.html %}
         {% include feri-header.html %}
         {% include header.html %}
-
         <section class="course {% if site.two_columns_layout %}two-columns{% else %}one-column{% endif %}">
             <article role="article" class="course-content">
                 <header>
@@ -35,6 +34,16 @@ <h1 class="course-title">{{ page.title }}</h1>
                                 svoje zanimanje</a></button>
                         {% endif %}
                     </p>
+                    {% if page.executionStartDate and page.executionStartDate != "" %}
+                        {% assign executionDate = page.executionStartDate | date: "%Y-%m-%d" %}
+                        {% assign formattedExecutionDate = executionDate | date: "%d.%m.%Y" %}
+                        {% assign currentDate = 'now' | date: "%Y-%m-%d" %}
+                        {% if executionDate >= currentDate %}
+                            <p class="course-title">
+                                <b>Prva načrtovana izvedba: {{ formattedExecutionDate }}</b>
+                            </p>
+                        {% endif %}
+                    {% endif %}
                 </header>
                 <section>
                     <div class="box-info">
@@ -130,6 +139,22 @@ <h1 class="course-title">{{ page.title }}</h1>
                                 </div>
                             </div>
                         </div>
+
+                        {% if page.executionStartDate and page.executionStartDate != "" %}
+                        {% assign executionDate = page.executionStartDate | date: "%Y-%m-%d" %}
+                        {% assign currentDate = 'now' | date: "%Y-%m-%d" %}
+                        {% if executionDate >= currentDate and page.executionData and page.executionData != "" %}
+                            <div class="icon-description-container">
+                                <div class="inside-icon-description">
+                                    <i class="fas fa-paperclip"></i>
+                                    <div class="description-data">
+                                        <p class="desc"><strong>Datumi izvedbe</strong></p>
+                                        <p>{{ page.executionData | newline_to_br | replace: "  ", "&nbsp;&nbsp;&nbsp;&nbsp;" }}</p>
+                                    </div>
+                                </div>
+                            </div>
+                        {% endif %}
+                    {% endif %}
                     </div>   
                     <p style="text-align: center;"  class="course-button">
                         {% if page.cType == "1" %}