Added a test and changed course' style

orronai · orronai · commit 431f3501f0bb · 2021-09-24T15:43:32.000+03:00
diff --git a/lms/lmsdb/models.py b/lms/lmsdb/models.py
@@ -1,11 +1,11 @@
-from collections import Counter, defaultdict
+from collections import Counter
 import enum
 import html
 import secrets
 import string
 from datetime import datetime
 from typing import (
-    Any, DefaultDict, Dict, Iterable, List, Optional,
+    Any, Dict, Iterable, List, Optional,
     TYPE_CHECKING, Tuple, Type, Union, cast,
 )
 
@@ -28,7 +28,7 @@
 
 
 database = database_config.get_db_instance()
-ExercisesDictById = DefaultDict[str, Dict[int, Dict[str, Any]]]
+ExercisesDictById = Dict[int, Dict[str, Any]]
 if TYPE_CHECKING:
     from lms.extractors.base import File
 
@@ -141,6 +141,16 @@ class Course(BaseModel):
     invite_code = CharField(default=generate_invite_code, unique=True)
     is_public = BooleanField(default=False)
 
+    @classmethod
+    def fetch(cls, user: 'User'):
+        return (
+            cls
+            .select()
+            .join(UserCourse)
+            .where(UserCourse.user == user.id)
+            .order_by(Course.name.desc())
+        )
+
     def __str__(self):
         return f'{self.name}: {self.date} - {self.due_date}'
 
@@ -152,6 +162,7 @@ class User(UserMixin, BaseModel):
     password = CharField()
     role = ForeignKeyField(Role, backref='users')
     api_key = CharField()
+    last_course_viewed = ForeignKeyField(Course, null=True)
 
     def is_password_valid(self, password):
         return check_password_hash(self.password, password)
@@ -177,6 +188,9 @@ def random_password(cls, stronger: bool = False) -> str:
     def get_notifications(self) -> Iterable['Notification']:
         return Notification.fetch(self)
 
+    def get_courses(self) -> Iterable['Course']:
+        return Course.fetch(self)
+
     def notes(self) -> Iterable['Note']:
         fields = (
             Note.id, Note.creator.fullname, CommentText.text,
@@ -344,16 +358,24 @@ def open_for_new_solutions(self) -> bool:
         return datetime.now() < self.due_date and not self.is_archived
 
     @classmethod
-    def get_objects(cls, user_id: int, fetch_archived: bool = False):
+    def get_objects(
+        cls, user_id: int, fetch_archived: bool = False,
+        select_all: bool = False,
+    ):
+        user = User.get(User.id == user_id)
         exercises = (
             cls
             .select()
             .join(Course)
             .join(UserCourse)
             .where(UserCourse.user == user_id)
             .switch()
-            .order_by(UserCourse.date, Exercise.order)
+            .order_by(UserCourse.date, Exercise.number, Exercise.order)
         )
+        if not select_all:
+            exercises = exercises.where(
+                UserCourse.course == user.last_course_viewed,
+            )
         if not fetch_archived:
             exercises = exercises.where(cls.is_archived == False)  # NOQA: E712
         return exercises
@@ -372,10 +394,7 @@ def as_dict(self) -> Dict[str, Any]:
 
     @staticmethod
     def as_dicts(exercises: Iterable['Exercise']) -> ExercisesDictById:
-        nested_dict = defaultdict(dict)
-        for exercise in exercises:
-            nested_dict[exercise.course.name][exercise.id] = exercise.as_dict()
-        return nested_dict
+        return {exercise.id: exercise.as_dict() for exercise in exercises}
 
     def __str__(self):
         return self.subject
@@ -484,9 +503,11 @@ def test_results(self) -> Iterable[dict]:
     @classmethod
     def of_user(
         cls, user_id: int, with_archived: bool = False,
-    ) -> Iterable[DefaultDict[str, Dict[str, Any]]]:
+        select_all: bool = False,
+    ) -> Iterable[Dict[str, Any]]:
         db_exercises = Exercise.get_objects(
             user_id=user_id, fetch_archived=with_archived,
+            select_all=select_all,
         )
         exercises = Exercise.as_dicts(db_exercises)
         solutions = (
@@ -496,15 +517,14 @@ def of_user(
             .order_by(cls.submission_timestamp.desc())
         )
         for solution in solutions:
-            course_name = solution.exercise.course.name
-            exercise = exercises[course_name][solution.exercise_id]
+            exercise = exercises[solution.exercise_id]
             if exercise.get('solution_id') is None:
                 exercise['solution_id'] = solution.id
                 exercise['is_checked'] = solution.is_checked
                 exercise['comments_num'] = len(solution.staff_comments)
                 if solution.is_checked and solution.checker:
                     exercise['checker'] = solution.checker.fullname
-        return exercises
+        return tuple(exercises.values())
 
     @property
     def comments(self):
diff --git a/lms/lmsweb/views.py b/lms/lmsweb/views.py
@@ -15,7 +15,7 @@
 from werkzeug.utils import redirect
 
 from lms.lmsdb.models import (
-    ALL_MODELS, Comment, Note, Role, RoleOptions, SharedSolution,
+    ALL_MODELS, Comment, Course, Note, Role, RoleOptions, SharedSolution,
     Solution, SolutionFile, User, UserCourse, database,
 )
 from lms.lmsweb import babel, limiter, routes, webapp
@@ -242,6 +242,20 @@ def status():
     )
 
 
+@webapp.route('/change-course/<int:course_id>')
+@login_required
+def change_last_course_viewed(course_id: int):
+    course = Course.get_or_none(course_id)
+    if course is None:
+        return fail(404, f'No such course {course_id}.')
+    user = User.get(User.id == current_user.id)
+    if not UserCourse.is_user_registered(user.id, course.id):
+        return fail(403, "You're not allowed to access this page.")
+    user.last_course_viewed = course
+    user.save()
+    return redirect(url_for('exercises_page'))
+
+
 @webapp.route('/exercises')
 @login_required
 def exercises_page():
@@ -398,7 +412,9 @@ def user(user_id):
 
     return render_template(
         'user.html',
-        solutions=Solution.of_user(target_user.id, with_archived=True),
+        solutions=Solution.of_user(
+            target_user.id, with_archived=True, select_all=True,
+        ),
         user=target_user,
         is_manager=is_manager,
         notes_options=Note.get_note_options(),
diff --git a/lms/static/my.css b/lms/static/my.css
@@ -764,11 +764,18 @@ code .grader-add .fa {
   font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
 }
 
-#notification-icon {
+#courses-list {
+  overflow-y: scroll;
+  max-height: 10em;
+}
+
+#notification-icon,
+#courses-icon {
   cursor: pointer;
 }
 
-.notification {
+.notification,
+.course {
   flex-direction: column;
   text-align: start;
 }
diff --git a/lms/templates/exercises.html b/lms/templates/exercises.html
@@ -9,47 +9,44 @@ <h1 id="exercises-head">{{ _('תרגילים') }}</h1>
       </div>
     </div>
     <div id="exercises">
-      {% for course, values in exercises.items() %}
-        <h3>{{ course }}</h3>
-        {%- for exercise in values.values() %}
-        <div class="exercise">
-          <div class="right-side {{ direction }}-language">
-            <div class="exercise-number">{{ exercise['exercise_number'] }}</div>
-            <div class="exercise-name"><div class="ex-title">{{ exercise['exercise_name'] | e }}</div></div>
+      {%- for exercise in exercises %}
+      <div class="exercise">
+        <div class="right-side {{ direction }}-language">
+          <div class="exercise-number">{{ exercise['exercise_number'] }}</div>
+          <div class="exercise-name"><div class="ex-title">{{ exercise['exercise_name'] | e }}</div></div>
+        </div>
+        <div class="left-side">
+          <div class="comments-count">
+            <span class="badge bg-secondary">{{ exercise['comments_num'] }}</span>
+            <span class="visually-hidden">{{ _("הערות על התרגיל") }}</span>
           </div>
-          <div class="left-side">
-            <div class="comments-count">
-              <span class="badge bg-secondary">{{ exercise['comments_num'] }}</span>
-              <span class="visually-hidden">{{ _("הערות על התרגיל") }}</span>
-            </div>
-            {%- if exercise['notebook'] %}
-            <div class="which-notebook">
-              <i class="fa fa-book" aria-hidden="true"></i>
-              {{ exercise['notebook'] }}
-            </div>
-            {%- endif %}
-            {%- if exercise.get('is_checked') is none %}
-              {% set details = {'page': 'send', 'icon': 'upload', 'text': _('שלח'), 'css': 'send', 'page_id': exercise['course_id']} %}
-            {% elif not exercise.get('is_checked') %}
-              {% set details = {'page': 'view', 'icon': 'eye', 'text': _('הצצה'), 'css': 'view', 'page_id': exercise['solution_id']} %}
-            {% else %}
-              {% set details = {'page': 'view', 'icon': 'check-circle-o', 'text': _('לבדיקה'), 'css': 'checked', 'page_id': exercise['solution_id']} %}
-            {% endif -%}
-            {%- if not exercise.get('is_archived') or exercise.get('is_checked') is not none %}
-            <a class="our-button go-{{ details['css'] }}" href="{{ details['page'] }}/{{ details['page_id'] }}">
-              {{ details['text'] | e }}
-              <i class="fa fa-{{ details['icon'] }}" aria-hidden="true"></i>
-            </a>
-            {% endif -%}
-            {% if is_manager %}
-            <a class="our-button our-button-narrow go-grader" href="check/{{ exercise['exercise_id'] }}">
-              <i class="fa fa-graduation-cap" aria-hidden="true"></i>
-            </a>
-            {% endif %}
+          {%- if exercise['notebook'] %}
+          <div class="which-notebook">
+            <i class="fa fa-book" aria-hidden="true"></i>
+            {{ exercise['notebook'] }}
           </div>
+          {%- endif %}
+          {%- if exercise.get('is_checked') is none %}
+            {% set details = {'page': 'send', 'icon': 'upload', 'text': _('שלח'), 'css': 'send', 'page_id': exercise['course_id']} %}
+          {% elif not exercise.get('is_checked') %}
+            {% set details = {'page': 'view', 'icon': 'eye', 'text': _('הצצה'), 'css': 'view', 'page_id': exercise['solution_id']} %}
+          {% else %}
+            {% set details = {'page': 'view', 'icon': 'check-circle-o', 'text': _('לבדיקה'), 'css': 'checked', 'page_id': exercise['solution_id']} %}
+          {% endif -%}
+          {%- if not exercise.get('is_archived') or exercise.get('is_checked') is not none %}
+          <a class="our-button go-{{ details['css'] }}" href="{{ details['page'] }}/{{ details['page_id'] }}">
+            {{ details['text'] | e }}
+            <i class="fa fa-{{ details['icon'] }}" aria-hidden="true"></i>
+          </a>
+          {% endif -%}
+          {% if is_manager %}
+          <a class="our-button our-button-narrow go-grader" href="check/{{ exercise['exercise_id'] }}">
+            <i class="fa fa-graduation-cap" aria-hidden="true"></i>
+          </a>
+          {% endif %}
         </div>
-        {% endfor -%}
-      {% endfor %}
+      </div>
+      {% endfor -%}
       {%- if not fetch_archived %}
       <div class="exercise centered">
         <div id="show-all-exercises-action" class="right-side">
diff --git a/lms/templates/navbar.html b/lms/templates/navbar.html
@@ -37,6 +37,32 @@
             </div>
           </div>
         </li>
+        <li class="nav-item dropdown">
+          <a id="courses-icon" href="#" class="nav-link" aria-expanded="false" aria-haspopup="true" aria-label="Courses" role="button" data-toggle="dropdown">
+            <i class="fa fa-graduation-cap" aria-hidden="true"></i>
+            {% if not current_user.last_course_viewed %}
+              {{ _('רשימת הקורסים') }}
+            {% else %}
+              {{ current_user.last_course_viewed.name | e }}
+            {% endif %}
+          </a>
+          <div id="courses-list" aria-labelledby="navbarDropdown" class="dropdown-menu 
+          {%- if direction == 'rtl' %}
+          dropdown-menu-right
+          {%- else %}
+          dropdown-menu-left
+          {%- endif %}
+          ">
+            {% for course in current_user.get_courses() %}
+            <div class="course dropdown-item {{ direction }}">
+              <i class="fa fa-book" aria-hidden="true"></i>
+              <a href="{{ url_for('change_last_course_viewed', course_id=course.id) }}" class="course-text {{ direction }}">
+                {{ course.name | e }}
+              </a>
+            </div>
+            {% endfor -%}
+          </div>
+        </li>
         {%- if not exercises or fetch_archived %}
         <li class="nav-item">
           <a href="/exercises" class="nav-link">
diff --git a/lms/templates/user.html b/lms/templates/user.html
@@ -26,20 +26,18 @@ <h2>{{ _('תרגילים שהוגשו:') }}</h2>
             </tr>
           </thead>
           <tbody>
-            {%- for exercise in solutions.values() %}
-              {% for solution in exercise.values() %}
-                <tr>
-                  <th scope="row">{{ solution.exercise_number | e }}</th>
-                  <td>{{ solution.course_name | e }}</td>
-                  <td>{{ solution.exercise_name | e }}</td>
-                  <td>
-                    {{ _('נבדק') if solution.is_checked else _('הוגש') if solution.solution_id else _('לא הוגש') }}
-                  </td>
-                  <td><a href="/view/{{ solution.solution_id }}">{{ solution.solution_id }}</a></td>
-                  <td>{{ solution.get('checker', '') | e }}</a></td>
-                </tr>
-              {% endfor %}
-            {% endfor -%}
+            {% for solution in solutions %}
+              <tr>
+                <th scope="row">{{ solution.exercise_number | e }}</th>
+                <td>{{ solution.course_name | e }}</td>
+                <td>{{ solution.exercise_name | e }}</td>
+                <td>
+                  {{ _('נבדק') if solution.is_checked else _('הוגש') if solution.solution_id else _('לא הוגש') }}
+                </td>
+                <td><a href="/view/{{ solution.solution_id }}">{{ solution.solution_id }}</a></td>
+                <td>{{ solution.get('checker', '') | e }}</a></td>
+              </tr>
+            {% endfor %}
           </tbody>
         </table>
       </div>
diff --git a/tests/test_exercises.py b/tests/test_exercises.py

Original file line number	Diff line number	Diff line change
`@@ -764,11 +764,18 @@ code .grader-add .fa {`
`764`	`764`	`font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;`
`765`	`765`	`}`
`766`	`766`
`767`		`-#notification-icon {`
	`767`	`+#courses-list {`
	`768`	`+ overflow-y: scroll;`
	`769`	`+ max-height: 10em;`
	`770`	`+}`
	`771`	`+`
	`772`	`+#notification-icon,`
	`773`	`+#courses-icon {`
`768`	`774`	`cursor: pointer;`
`769`	`775`	`}`
`770`	`776`
`771`		`-.notification {`
	`777`	`+.notification,`
	`778`	`+.course {`
`772`	`779`	`flex-direction: column;`
`773`	`780`	`text-align: start;`
`774`	`781`	`}`