Merge pull request #83 from wmo-raf/dev

Updates and Bug Fixes
wmo-raf · Mar 20, 2024 · fbe6ed6 · fbe6ed6
2 parents 5bf1975 + 472c1fa
commit fbe6ed6
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/nmhs_cms/templates/videos_include.html b/nmhs_cms/templates/videos_include.html
@@ -17,7 +17,7 @@ <h4>{{ item.snippet.title }}</h4>
                 </a>
                 <div class="card-video-stats">
                     <span>
-                        {% blocktranslate trimmed with updated_on=item.contentDetails.videoPublishedAt|slice:"0:10"|parse_date:"%Y-%m-%d"|date:"d M Y" %}
+                        {% blocktranslate trimmed with updated_on=item.contentDetails.videoPublishedAt|date:'d M Y' %}
                             Published on : {{ updated_on }}
                         {% endblocktranslate %}
                     </span>

diff --git a/pages/feedback/templates/feedback.html b/pages/feedback/templates/feedback.html
@@ -1,5 +1,5 @@
 {% extends 'base.html' %}
-{% load static wagtailcore_tags bulma_tags nmhs_cms_tags i18n %}
+{% load static wagtailimages_tags lazyimages_tags wagtailcore_tags bulma_tags nmhs_cms_tags i18n %}
 
 {% block body_class %}feedback_page{% endblock %}
 
@@ -18,8 +18,13 @@ <h1 class="title" style="font-weight:600; font-size:40px">{{ page.introduction_t
                     </p>
 
                     <figure class="image">
-                        {% if page.illustration %}
+                        {% if page.illustration.url %}
                             {% svg page.illustration.file.name %}
+                        {% else %}
+                            {% image page.illustration original as img %}
+                            <img class="progressive__img progressive--not-loaded"
+                                 data-progressive="{{ img.url }}"
+                                 src="{% lazy_image_url img %}" alt=""/>
                         {% endif %}
                     </figure>
                 </div>

diff --git a/pages/videos/models.py b/pages/videos/models.py
@@ -1,3 +1,4 @@
+from dateutil.parser import parse
 from django.db import models
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
@@ -82,9 +83,16 @@ def playlist_items(self, limit=None):
                 pass
 
             if info:
-                # sort by video position in playlist
-                info.sort(key=lambda info_item: info_item['snippet']['position'], reverse=True)
+                # parse the date published
+                for item in info:
+                    published_at = parse(item['contentDetails']['videoPublishedAt'])
+                    item['contentDetails']['videoPublishedAt'] = published_at
+
+                # sort the videos by date published
+                info = sorted(info, key=lambda x: x['contentDetails']['videoPublishedAt'], reverse=True)
+
             return info
+
         return None
 
     panels = [

diff --git a/pages/videos/templates/playlist_items.html b/pages/videos/templates/playlist_items.html
@@ -40,9 +40,8 @@ <h1 class="icon icon-form">
                                 </iframe>
                                 <h2>{{ video.snippet.title }}</h2>
                             </td>
-                            {#                            2019-09-27T08:57:37.000Z#}
                             <td class="title">
-                                <h2>{{ video.snippet.publishedAt|slice:"0:10"|parse_date:"%Y-%m-%d"|date:"d M Y" }}</h2>
+                                <h2>{{ video.snippet.publishedAt }}</h2>
                             </td>
                         </tr>
                     {% endfor %}

diff --git a/pages/weather/templates/weather/daily_weather_report_index.html b/pages/weather/templates/weather/daily_weather_report_index.html
@@ -3,9 +3,6 @@
 
 {% block body_class %}weather{% endblock %}
 
-{% block extra_css %}
-    <link rel="stylesheet" href="{% static 'weather/css/daily_weather_report.css' %}">
-{% endblock extra_css %}
 {% block content %}
     <main class="is-index">
         <section class="nmhs-work is-desktop">