show courses that are not assigned to a teacher in teacher overview

spz-signup · Apr 14, 2024 · d96187b · d96187b
1 parent 37aefd5
commit d96187b
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 11 deletions.
diff --git a/src/spz/administration/admin_views.py b/src/spz/administration/admin_views.py
@@ -59,7 +59,18 @@ def administration_teacher_lang(id):
         .filter(models.Role.role == 'COURSE_TEACHER') \
         .distinct().all()
 
-    return dict(language=lang, teacher=teacher)
+    # courses with assigned teachers
+    assigned_courses = db.session.query(models.Role.course_id) \
+        .filter(models.Role.role == models.Role.COURSE_TEACHER) \
+        .subquery()
+
+    unassigned_courses = db.session.query(models.Course) \
+        .join(models.Language) \
+        .filter(models.Language.id == id) \
+        .filter(~models.Course.id.in_(assigned_courses))
+    #~Course.id.in_(assigned_courses)
+
+    return dict(language=lang, teacher=teacher, unassigned_courses=unassigned_courses)
 
 
 @templated('internal/administration/add_teacher.html')

diff --git a/src/spz/templates/baselayout.html b/src/spz/templates/baselayout.html
@@ -16,8 +16,10 @@
     {% endblock head %}
 
     {% block style %}
-        .auto-height-row {
-        height: 100px;
+        .inline-flex-container {
+        display: inline-flex;
+        align-items: center; // Vertical alignment
+        justify-content: center; // Horizontal alignment
         }
     {% endblock style %}
 </head>

diff --git a/src/spz/templates/internal/administration/teacher_overview_lang.html b/src/spz/templates/internal/administration/teacher_overview_lang.html
@@ -7,6 +7,7 @@
 
 
 {% block internal_body %}
+    <!---
     <div class="row">
         <div class="ui message">
             <div class="header">Infos</div>
@@ -20,6 +21,7 @@
             </dl>
         </div>
     </div>
+    --->
     <div>
         <a href="{{ url_for('add_teacher', id=language.id) }}">
             <button class="ui basic button">
@@ -34,8 +36,6 @@
             <tr>
                 <th>Lehrbeauftragte*r</th>
                 <th>Kurse</th>
-                <th>Option 1</th>
-                <th>Option 2</th>
             </tr>
             </thead>
             <tbody>
@@ -56,16 +56,33 @@
                             {% endif %}
                         {% endfor %}
                     </td>
-                    <td>
-                        0
-                    </td>
-                    <td>
-                        0
-                    </td>
                 </tr>
             {% endfor %}
             </tbody>
         </table>
     </div>
+    <div class="ui section divider"></div>
+    <div class="row">
+        <div class="row">
+            <table>
+                <thead>
+                <tr>
+                    <th><h3>Kurse ohne Dozent</h3></th>
+                </tr>
+                </thead>
+                <tbody>
+                <tr>
+                    <th>
+                        {% for unassigned in unassigned_courses %}
+                            <a href="{{ url_for('course', id=unassigned.id) }}">
+                                <div class="ui button"> {{ unassigned.full_name }} </div>
+                            </a>
+                        {% endfor %}
+                    </th>
+                </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
 
 {% endblock internal_body %}