improved data export function, fixed typos in admin view, fixed database error on list_subjects_by_term

Author: Aaronnz303

muesli/web/templates/admin.pt

@@ -16,19 +16,19 @@
 </div>
 <div class="row">
   <a class="col-md btn border border-light btn-dark btn-block m-1 d-flex" tal:attributes="href request.route_path('lecture_export_yaml_details')"><span class="align-self-center mx-auto">Aktuelle Vorlesungen und Tutorien als YAML exportieren</span></a>
-  <a class="col-md btn border border-light btn-dark btn-block m-1 d-flex" tal:attributes="href request.route_path('lecture_export_yaml_details', _query={'show_all': 1})"><span class="align-self-center mx-auto">Alle Vorlesungen und Tutorien als YAMLexportieren</span></a>
+  <a class="col-md btn border border-light btn-dark btn-block m-1 d-flex" tal:attributes="href request.route_path('lecture_export_yaml_details', _query={'show_all': 1})"><span class="align-self-center mx-auto">Alle Vorlesungen und Tutorien als YAML exportieren</span></a>
 </div>
 <div class="row">
-  <a class="col-md btn border border-light btn-dark btn-block m-1 d-flex" tal:attributes="href request.route_path('lecture_export_yaml_emails')"><span class="align-self-center mx-auto">Aktuelle Vorlesungsen Emails der Teilnehmenden als YAML exportieren</span></a>
+  <a class="col-md btn border border-light btn-dark btn-block m-1 d-flex" tal:attributes="href request.route_path('lecture_export_yaml_emails')"><span class="align-self-center mx-auto">Aktuelle Vorlesungen mit Emails der Teilnehmenden als YAML exportieren</span></a>
   <a class="col-md btn border border-light btn-dark btn-block m-1 d-flex" tal:attributes="href request.route_path('lecture_export_yaml_emails', _query={'show_all': 1})"><span class="align-self-center mx-auto">Alle exportieren</span></a>
 </div>
 <div class="row">
   <a class="col-md btn border border-light btn-dark btn-block m-1 d-flex" tal:attributes="href request.route_path('lecture_export_excel')"><span class="align-self-center mx-auto">Aktuelle Vorlesungen und Tutorien als Excel Exportieren</span></a>
   <a class="col-md btn border border-light btn-dark btn-block m-1 d-flex" tal:attributes="href request.route_path('lecture_add')"><span class="align-self-center mx-auto">Neue Vorlesung</span></a>
 </div>
 <div class="row">
-  <a class="col-md btn border border-light btn-dark btn-block m-1 d-flex" tal:attributes="href request.route_path('email_users')"><span class="align-self-center mx-auto">Studenten mit Problems mailen</span></a>
-  <a class="col-md btn border border-light btn-dark btn-block m-1 d-flex" tal:attributes="href request.route_path('email_all_users')"><span class="align-self-center mx-auto">Alles Studenten mailen</span></a>
+  <a class="col-md btn border border-light btn-dark btn-block m-1 d-flex" tal:attributes="href request.route_path('email_users')"><span class="align-self-center mx-auto">Studenten mit Problemen mailen</span></a>
+  <a class="col-md btn border border-light btn-dark btn-block m-1 d-flex" tal:attributes="href request.route_path('email_all_users')"><span class="align-self-center mx-auto">Allen Studenten mailen</span></a>
 </div>
 <div class="row">
   <a class="col-md btn border border-light btn-dark btn-block m-1 d-flex" tal:attributes="href request.route_path('user_delete_unconfirmed')"><span class="align-self-center mx-auto">Karteileichen sichten und löschen</span></a>

muesli/web/viewsLecture.py

@@ -698,7 +698,7 @@ def viewPoints(request):
 def exportYaml(request):
     lectures = request.db.query(models.Lecture)
     if not "show_all" in request.GET:
-        lectures = lectures.filter(models.Lecture.is_visible==True)
+        lectures = lectures.filter(models.Lecture.term==utils.getSemesterLimit())
     out = []
     for lecture in lectures.all():
         lecture_dict = {}
@@ -717,7 +717,7 @@ def exportYaml(request):
 def exportYaml_details(request):
     lectures = request.db.query(models.Lecture)
     if not "show_all" in request.GET:
-        lectures = lectures.filter(models.Lecture.is_visible == True)
+        lectures = lectures.filter(models.Lecture.term==utils.getSemesterLimit())
     out = []
     for lecture in lectures.all():
         lecture_dict = {}
@@ -743,7 +743,7 @@ def exportYaml_details(request):
 def exportYaml_emails(request):
     lectures = request.db.query(models.Lecture)
     if not "show_all" in request.GET:
-        lectures = lectures.filter(models.Lecture.is_visible == True)
+        lectures = lectures.filter(models.Lecture.term==utils.getSemesterLimit())
     out = [{
             'name': lecture.name,
             'lecturer': lecture.lecturer,
@@ -786,7 +786,7 @@ def createResponse(self):
 class DoExport(ExcelExport):
     def __call__(self):
         lectures = self.request.db.query(models.Lecture)
-        lectures = lectures.filter(models.Lecture.is_visible)
+        lectures = lectures.filter(models.Lecture.term==utils.getSemesterLimit())
         w = self.w
 
         # sheet Tutorials

muesli/web/viewsUser.py

@@ -169,12 +169,12 @@ def listSubjectsByTerm(request):
             .group_by(models.Lecture.term).order_by(models.Lecture.term.desc())]
     subjects_by_term = []
     table = request.db.query(models.Lecture.term, models.User.subject, func.count(models.User.id))\
-            .join(models.LectureStudent)\
-            .join(models.User)\
-            .filter(models.Lecture.term >= settings['starting_term'])\
-            .filter(not_(models.Lecture.name.contains(settings['exclude_lecture_name'])))\
-            .group_by(models.User.subject, models.Lecture.term)\
-            .order_by(models.Lecture.term, models.User.subject)
+    .join(models.LectureStudent, models.Lecture.id == models.LectureStudent.lecture_id)\
+    .join(models.User, models.User.id == models.LectureStudent.student_id)\
+    .filter(models.Lecture.term >= settings['starting_term'])\
+    .filter(not_(models.Lecture.name.like(f"%{settings['exclude_lecture_name']}%")))\
+    .group_by(models.User.subject, models.Lecture.term)\
+    .order_by(models.Lecture.term, models.User.subject)
     for (term, subject, count) in table:
         subject = re.sub(r'\(.*\)', '', str(subject))
         subject = re.sub(r'\s$', '', str(subject))