Update sorting, move button to switch open/closed job positions

main/models.py

@@ -489,13 +489,21 @@ class MainCareersPage(
 
         current_date = date.today()
 
-        if not show_closed:
+        if show_closed:
+            filter = filter & models.Q(closing_date__lt=current_date)
+        else:
             filter = filter & models.Q(closing_date__gte=current_date)
 
         if category is not None:
             filter = filter & models.Q(category=category)
 
-        return MainCareerPage.objects.child_of(self).filter(filter).live().all()
+        return (
+            MainCareerPage.objects.child_of(self)
+            .filter(filter)
+            .order_by("-created_date")
+            .live()
+            .all()
+        )
 
     class Meta:
         verbose_name = "Kariéry"

main/templates/main/main_careers_page.html

@@ -13,6 +13,12 @@
 
             <main role="main" class="mb-20">
                 <div class="container--wide">
+                    {% if not show_closed %}
+                        <a class="underline" href="?show_closed=true">Zobrazit uzavřené</a>
+                    {% else %}
+                        <a class="underline" href="?show_closed=false">Skrýt uzavřené</a>
+                    {% endif %}
+
                     <template v-if="isCurrentView('all')">
                         {% get_career_pages page show_closed as career_pages %}
 
@@ -42,12 +48,6 @@
                             {% endif %}
                         </template>
                     {% endfor %}
-
-                    {% if not show_closed %}
-                        <a class="underline" href="?show_closed=true">Zobrazit uzavřené</a>
-                    {% else %}
-                        <a class="underline" href="?show_closed=false">Skrýt uzavřené</a>
-                    {% endif %}
                 </div>
             </main>
         </ui-view-provider>

shared/models/main.py

@@ -1747,7 +1747,10 @@ class MainArticlePageMixin(
                 articles_with_same_tags = list(
                     all_articles_in_same_web.filter(
                         tags__in=self.get_tags,
-                    ).distinct().specific().all()
+                    )
+                    .distinct()
+                    .specific()
+                    .all()
                 )
 
                 picked_articles = []
@@ -1784,9 +1787,9 @@ class MainArticlePageMixin(
                         picked_articles
                     )
                     main_web_articles = list(
-                        MainArticlePage.objects.distinct().all().specific()[
-                            : needed_supplementary_articles_num - 1
-                        ]
+                        MainArticlePage.objects.distinct()
+                        .all()
+                        .specific()[: needed_supplementary_articles_num - 1]
                     )
 
                     picked_articles += main_web_articles