From b41cf01f58544a6c71c16bab1854142a3ffc8e03 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Fri, 28 Aug 2020 18:30:42 +0530
Subject: Show max marks for all attempts in answerpaper

- Latest attempt marks were shown in the answerpaper, which made
  it difficult to analyze the paper. This PR fixes the issue
  and the best marks of all the attempt are provided.
---
 yaksh/models.py                      | 11 +++++++++++
 yaksh/templates/yaksh/user_data.html | 24 +++++++++++-------------
 yaksh/views.py                       |  1 -
 3 files changed, 22 insertions(+), 14 deletions(-)

(limited to 'yaksh')

diff --git a/yaksh/models.py b/yaksh/models.py
index 1094bb0..0456b52 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -2305,6 +2305,17 @@ class AnswerPaper(models.Model):
                     'answer': answer,
                     'error_list': [e for e in json.loads(answer.error)]
                 }]
+
+        for question, answers in q_a.items():
+            answers = q_a[question]
+            q_a[question].append({
+                'marks': max([
+                    answer['answer'].marks
+                        for answer in answers
+                            if question == answer['answer'].question
+                ])
+            })
+
         return q_a
 
     def get_latest_answer(self, question_id):
diff --git a/yaksh/templates/yaksh/user_data.html b/yaksh/templates/yaksh/user_data.html
index 6252fb3..a79071d 100644
--- a/yaksh/templates/yaksh/user_data.html
+++ b/yaksh/templates/yaksh/user_data.html
@@ -74,19 +74,17 @@
                 </tr>
                 </thead>
                 <tbody>
-                {% for question, answers in paper.get_question_answers.items %}
-                  {% with answers|last as answer %}
-                      <tr>
+                  {% for question, answers in paper.get_question_answers.items %}
+                    <tr>
+                      <td>{{question.summary}}</td>
+                      <td>{{question.type}}</td>
                       <td>
-                        <a href="#question_{{question.id}}">
-                          {{ question.summary }}
-                        </a>
+                        {% for answer in answers %}
+                          {{answer.marks}}
+                        {% endfor %}
                       </td>
-                      <td>{{ question.type }}</td>
-                      <td>{{ answer.answer.marks }}</td>
-                      </tr>
-                  {% endwith %}
-                {% endfor %}
+                    </tr>
+                  {% endfor %}
                 </tbody>
             </table>
             {% for question, answers in paper.get_question_answers.items %}
@@ -313,12 +311,12 @@
                 <div class="col-md-2">
                   <label class="col-form-label" for="q{{ question.id }}">Marks:</label>
                   {% with answers|last as answer %}
-                  <input id="q{{ question.id }}" type="text" name="q{{ question.id }}_marks" size="4" class="form-control" value="{{ answer.answer.marks }}" readonly=""><br><br>
+                    <input id="q{{ question.id }}" type="text" name="q{{ question.id }}_marks" size="4" class="form-control" value="{{ answer.marks }}" readonly=""><br><br>
                   {% endwith %}
                 </div>
               </div>
               <hr/>
-              {% endfor %} {# for question, answers ... #}
+            {% endfor %} {# for question, answers ... #}
               <div class="form-group">
                 <h3>Teacher comments: </h3>
                 <textarea id="comments_{{paper.question_paper.id}}" class="form-control"
diff --git a/yaksh/views.py b/yaksh/views.py
index 8413889..b955608 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -1757,7 +1757,6 @@ def user_data(request, user_id, questionpaper_id=None, course_id=None):
         raise Http404('You are not allowed to view this page!')
     user = User.objects.get(id=user_id)
     data = AnswerPaper.objects.get_user_data(user, questionpaper_id, course_id)
-
     context = {'data': data, 'course_id': course_id}
     return my_render_to_response(request, 'yaksh/user_data.html', context)
 
-- 
cgit 


From a80fef3789d970d3db17d72f761fe156fe735259 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Tue, 1 Sep 2020 11:54:01 +0530
Subject: Fix tests, Fix PEP8

---
 yaksh/models.py      | 4 ++--
 yaksh/test_models.py | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'yaksh')

diff --git a/yaksh/models.py b/yaksh/models.py
index 0456b52..eeae4af 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -2311,8 +2311,8 @@ class AnswerPaper(models.Model):
             q_a[question].append({
                 'marks': max([
                     answer['answer'].marks
-                        for answer in answers
-                            if question == answer['answer'].question
+                    for answer in answers
+                    if question == answer['answer'].question
                 ])
             })
 
diff --git a/yaksh/test_models.py b/yaksh/test_models.py
index a77c8bf..a48876c 100644
--- a/yaksh/test_models.py
+++ b/yaksh/test_models.py
@@ -1654,12 +1654,14 @@ class AnswerPaperTestCases(unittest.TestCase):
             answers_saved = Answer.objects.filter(question=question)
             error_list = [json.loads(ans.error) for ans in answers_saved]
             if answers_saved:
-                self.assertEqual(len(answered[question]), len(answers_saved))
+                self.assertGreater(len(answered[question]), len(answers_saved))
                 ans = []
                 err = []
                 for val in answered[question]:
-                    ans.append(val.get('answer'))
-                    err.append(val.get('error_list'))
+                    if val.get('answer') is not None:
+                        ans.append(val.get('answer'))
+                    if val.get('error_list') is not None:
+                        err.append(val.get('error_list'))
                 self.assertEqual(set(ans), set(answers_saved))
                 self.assertEqual(error_list, err)
 
-- 
cgit 


From 4f09013487e17e40b8fd14a3e4c574702c302fbb Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Thu, 3 Sep 2020 17:31:21 +0530
Subject: Fetch only distinct answered questions

---
 yaksh/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'yaksh')

diff --git a/yaksh/models.py b/yaksh/models.py
index 6542daa..1fee87b 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -2316,7 +2316,7 @@ class AnswerPaper(models.Model):
         return self.questions.filter(active=True)
 
     def get_questions_answered(self):
-        return self.questions_answered.all()
+        return self.questions_answered.all().distinct()
 
     def get_questions_unanswered(self):
         return self.questions_unanswered.all()
-- 
cgit 


From 89d7fb87fdacef4a15f36188938ab7044350f44e Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Fri, 11 Sep 2020 10:44:08 +0530
Subject: Multiple changes - Increase max_limit for files names in
 AssignmentUploads - Add email display to Added Teacher/TA screen

---
 yaksh/models.py                            | 2 +-
 yaksh/templates/yaksh/course_teachers.html | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'yaksh')

diff --git a/yaksh/models.py b/yaksh/models.py
index 84cad1e..d051e68 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -2531,7 +2531,7 @@ class AssignmentUploadManager(models.Manager):
 class AssignmentUpload(models.Model):
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     assignmentQuestion = models.ForeignKey(Question, on_delete=models.CASCADE)
-    assignmentFile = models.FileField(upload_to=get_assignment_dir)
+    assignmentFile = models.FileField(upload_to=get_assignment_dir, max_length=255)
     question_paper = models.ForeignKey(QuestionPaper, blank=True, null=True,
                                        on_delete=models.CASCADE)
     course = models.ForeignKey(Course, null=True, blank=True,
diff --git a/yaksh/templates/yaksh/course_teachers.html b/yaksh/templates/yaksh/course_teachers.html
index 1b1af87..ebbbb57 100644
--- a/yaksh/templates/yaksh/course_teachers.html
+++ b/yaksh/templates/yaksh/course_teachers.html
@@ -9,11 +9,13 @@
             <tr>
                 <th>Select</th>
                 <th>Name</th>
+                <th>Email</th>
             </tr>
             {% for teacher in teachers %}
                 <tr>
                     <td><input type="checkbox" name="remove" value="{{ teacher.id }}"></td>
                     <td>{{ teacher.get_full_name }}</td>
+                    <td>{{ teacher.email }}</td>
                 </tr>
             {% endfor %}
         <table>
-- 
cgit 


From ad5b7849169576b00afcb69bfddf9162b0e0f4b9 Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Sun, 13 Sep 2020 15:07:54 +0530
Subject: Fix rendering of the quiz list

---
 yaksh/templates/yaksh/micromanaged.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'yaksh')

diff --git a/yaksh/templates/yaksh/micromanaged.html b/yaksh/templates/yaksh/micromanaged.html
index 336feec..5d7e58c 100644
--- a/yaksh/templates/yaksh/micromanaged.html
+++ b/yaksh/templates/yaksh/micromanaged.html
@@ -17,6 +17,6 @@
              </div>
     {% endif %}
     {% endfor %}
-{% endif %}
 </div>
+{% endif %}
 
-- 
cgit 


From a939ffec44e538efa2b7021c3c5114babd718b31 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Mon, 14 Sep 2020 16:15:42 +0530
Subject: Release related changes

---
 yaksh/migrations/0024_release_0_24_0.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 yaksh/migrations/0024_release_0_24_0.py

(limited to 'yaksh')

diff --git a/yaksh/migrations/0024_release_0_24_0.py b/yaksh/migrations/0024_release_0_24_0.py
new file mode 100644
index 0000000..60ffc23
--- /dev/null
+++ b/yaksh/migrations/0024_release_0_24_0.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.0.7 on 2020-09-14 10:45
+
+from django.db import migrations, models
+import yaksh.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('yaksh', '0023_release_0_23_0'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='assignmentupload',
+            name='assignmentFile',
+            field=models.FileField(max_length=255, upload_to=yaksh.models.get_assignment_dir),
+        ),
+    ]
-- 
cgit 


From fee2f97d867e11216ee928f37c228e94a951bb9c Mon Sep 17 00:00:00 2001
From: adityacp
Date: Tue, 15 Sep 2020 15:19:58 +0530
Subject: Show missing marks in grade user

---
 yaksh/templates/yaksh/grade_user.html | 4 ++--
 yaksh/views.py                        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'yaksh')

diff --git a/yaksh/templates/yaksh/grade_user.html b/yaksh/templates/yaksh/grade_user.html
index a9ab53e..341fd7c 100644
--- a/yaksh/templates/yaksh/grade_user.html
+++ b/yaksh/templates/yaksh/grade_user.html
@@ -327,7 +327,7 @@ function searchNames() {
                             </a>
                           </td>
                           <td>{{ question.type }}</td>
-                          <td>{{ answer.answer.marks }}</td>
+                          <td>{{ answer.marks }}</td>
                           <td>
                             <a href="{% url 'yaksh:regrade_by_question' course_id quiz.questionpaper_set.get.id paper.id question.id %}" class="btn btn-outline-success">
                               <i class="fa fa-repeat"></i>&nbsp;Regrade
@@ -567,7 +567,7 @@ function searchNames() {
                       <div class="col-md-2">
                         <label class="col-form-label" for="q{{ question.id }}">Marks:</label>
                         {% with answers|last as answer %}
-                        <input id="q{{ question.id }}" type="text" name="q{{ question.id }}_marks" size="4" class="form-control" value="{{ answer.answer.marks }}"><br><br>
+                        <input id="q{{ question.id }}" type="text" name="q{{ question.id }}_marks" size="4" class="form-control" value="{{ answer.marks }}"><br><br>
                         {% endwith %}
                       </div>
                     </div>
diff --git a/yaksh/views.py b/yaksh/views.py
index 0ed8f9f..a8f0d23 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -1964,7 +1964,7 @@ def grade_user(request, quiz_id=None, user_id=None, attempt_number=None,
         for paper in papers:
             for question, answers in paper.get_question_answers().items():
                 marks = float(request.POST.get('q%d_marks' % question.id, 0))
-                answer = answers[-1]['answer']
+                answer = answers[0]['answer']
                 answer.set_marks(marks)
                 answer.save()
             paper.update_marks()
-- 
cgit