fix: collection of fixes

Author: TigerCodeHub

intranet/apps/eighth/migrations/0072_auto_20250429_1128.py

@@ -8,11 +8,11 @@ def generate_attendance_codes(apps, schema_editor):
     HistoricalEighthScheduledActivity = apps.get_model('eighth', 'HistoricalEighthScheduledActivity')
 
     for activity in EighthScheduledActivity.objects.all():
-        activity.attendance_code = intranet.apps.eighth.models.EighthScheduledActivity.random_code()
+        activity.attendance_code = intranet.apps.eighth.models.random_code()
         activity.save(update_fields=['attendance_code'])
 
     for historical_activity in HistoricalEighthScheduledActivity.objects.all():
-        historical_activity.attendance_code = intranet.apps.eighth.models.EighthScheduledActivity.random_code()
+        historical_activity.attendance_code = intranet.apps.eighth.models.random_code()
         historical_activity.save(update_fields=['attendance_code'])
 
 
@@ -44,4 +44,14 @@ class Migration(migrations.Migration):
             name='code_mode',
             field=models.IntegerField(choices=[(0, 'Auto'), (1, 'Open'), (2, 'Closed')], default=0),
         ),
+        migrations.AddField(
+            model_name='eighthsignup',
+            name='attendance_marked',
+            field=models.BooleanField(blank=True, default=False),
+        ),
+        migrations.AddField(
+            model_name='historicaleighthsignup',
+            name='attendance_marked',
+            field=models.BooleanField(blank=True, default=False),
+        ),
     ]

intranet/apps/eighth/models.py

@@ -1750,6 +1750,7 @@ class EighthSignup(AbstractBaseEighthModel):
 
     pass_accepted = models.BooleanField(default=False, blank=True)
     was_absent = models.BooleanField(default=False, blank=True)
+    attendance_marked = models.BooleanField(default=False, blank=True)
     absence_acknowledged = models.BooleanField(default=False, blank=True)
     absence_emailed = models.BooleanField(default=False, blank=True)
 
@@ -1839,6 +1840,7 @@ def accept_pass(self):
         """Accepts an eighth period pass for the EighthSignup object."""
         self.was_absent = False
         self.pass_accepted = True
+        self.attendance_marked = True
         self.save(update_fields=["was_absent", "pass_accepted"])
 
     def reject_pass(self):

intranet/apps/eighth/views/attendance.py

@@ -307,12 +307,11 @@ def take_attendance_view(request, scheduled_activity_id):
                 status=403,
             )
 
-        if "att_code_mode" in request.POST:
-            selected_mode = int(request.POST["att_code_mode"])
-            if scheduled_activity.code_mode != selected_mode:
-                scheduled_activity.set_code_mode(selected_mode)
-                redirect_url = reverse(url_name, args=[scheduled_activity.id])
-                return redirect(redirect_url)
+        att_code_mode = request.POST.get("att_code_mode")
+        if att_code_mode is not None and int(att_code_mode) != scheduled_activity.code_mode:
+            scheduled_activity.set_code_mode(int(att_code_mode))
+            redirect_url = reverse(url_name, args=[scheduled_activity.id])
+            return redirect(redirect_url)
 
         if not scheduled_activity.block.locked and request.user.is_eighth_admin:
             messages.success(request, "Note: Taking attendance on an unlocked block.")
@@ -363,6 +362,7 @@ def take_attendance_view(request, scheduled_activity_id):
 
         present_signups = EighthSignup.objects.filter(scheduled_activity=scheduled_activity, user__in=present_user_ids)
         present_signups.update(was_absent=False)
+        present_signups.update(attendance_marked=True)
 
         for s in present_signups:
             invalidate_obj(s)
@@ -430,7 +430,7 @@ def take_attendance_view(request, scheduled_activity_id):
             "show_checkboxes": (scheduled_activity.block.locked or request.user.is_eighth_admin),
             "show_icons": (scheduled_activity.block.locked and scheduled_activity.block.attendance_locked() and not request.user.is_eighth_admin),
             "bbcu_script": settings.BBCU_SCRIPT,
-            "qrurl": request.build_absolute_uri(reverse("qr_attendance", args=[scheduled_activity.id, scheduled_activity.attendance_code])),
+            "qr_url": request.build_absolute_uri(reverse("qr_attendance", args=[scheduled_activity.id, scheduled_activity.attendance_code])),
         }
 
         if request.user.is_eighth_admin:
@@ -540,7 +540,9 @@ def accept_all_passes_view(request, scheduled_activity_id):
     if not can_accept:
         return render(request, "error/403.html", {"reason": "You do not have permission to take accept these passes."}, status=403)
 
-    EighthSignup.objects.filter(after_deadline=True, scheduled_activity=scheduled_activity).update(pass_accepted=True, was_absent=False)
+    EighthSignup.objects.filter(after_deadline=True, scheduled_activity=scheduled_activity).update(
+        pass_accepted=True, was_absent=False, attendance_taken=True
+    )
     invalidate_obj(scheduled_activity)
 
     if "admin" in request.path:
@@ -774,71 +776,92 @@ def email_students_view(request, scheduled_activity_id):
 
 @login_required
 @deny_restricted
-def student_attendance_view(request, attc=None, attf=None, attimef=None, atteachf=None):
+def student_attendance_view(request):
     blocks = EighthBlock.objects.get_blocks_today()
+    mark_block = None
+    mark_result = None
     if request.method == "POST":
         now = timezone.localtime()
-        dayblks = Day.objects.select_related("day_type").get(date=now).day_type.blocks
-        for blk in blocks:
-            blklet = blk.block_letter
-            code = request.POST.get(blklet)
+        try:
+            day_blocks = Day.objects.select_related("day_type").get(date=now).day_type.blocks
+        except Day.DoesNotExist:
+            messages.error(request, "Error. Attendance is only available on school days.")
+            return redirect("index")
+        for block in blocks:
+            block_letter = block.block_letter
+            code = request.POST.get(block_letter)
             if code is None:
                 continue
-            act = request.user.eighthscheduledactivity_set.get(block=blk)
+            act = request.user.eighthscheduledactivity_set.get(block=block)
             if act.get_code_mode_display() == "Auto":
                 try:
-                    dayblk = dayblks.get(name="8" + blklet)
+                    day_block = day_blocks.get(name="8" + block_letter)
                 except Exception:
-                    attimef = blk
+                    mark_result = "invalid_time"
+                    mark_block = block
                     break
-                start_time = shift_time(tm(hour=dayblk.start.hour, minute=dayblk.start.minute), -20)
-                end_time = shift_time(tm(hour=dayblk.end.hour, minute=dayblk.end.minute), 20)
+                start_time = shift_time(tm(hour=day_block.start.hour, minute=day_block.start.minute), -20)
+                end_time = shift_time(tm(hour=day_block.end.hour, minute=day_block.end.minute), 20)
                 if not start_time <= now.time() <= end_time:
-                    attimef = blk
+                    mark_result = "invalid_time"
+                    mark_block = block
                     break
             elif act.get_code_mode_display() == "Closed":
-                atteachf = blk
+                mark_result = "code_closed"
+                mark_block = block
                 break
             code = code.upper()
             if code == act.attendance_code:
                 try:
                     present = EighthSignup.objects.get(scheduled_activity=act, user__in=[request.user.id])
                     present.was_absent = False
+                    present.attendance_marked = True
                     invalidate_obj(present)
                     act.attendance_taken = True
                     act.save()
                     invalidate_obj(act)
-                    attc = blk
+                    mark_result = "code_correct"
+                    mark_block = block
                 except Exception:
-                    attf = blk
+                    mark_result = "code_fail"
+                    mark_block = block
                 break
             else:
-                attf = blk
+                mark_result = "code_fail"
+                mark_block = block
                 break
-    return student_frontend(request, attc, attf, attimef, atteachf)
+    return student_frontend(request, mark_block, mark_result)
 
 
 @login_required
 @deny_restricted
-def student_frontend(request, attc=None, attf=None, attimef=None, atteachf=None):
+def student_frontend(request, mark_block: EighthBlock = None, mark_result: str = None):
     blocks = EighthBlock.objects.get_blocks_today()
     if blocks:
         sch_acts = []
         att_marked = []
-        for b in blocks:
+        for block in blocks:
             try:
-                act = request.user.eighthscheduledactivity_set.get(block=b)
+                act = request.user.eighthscheduledactivity_set.get(block=block)
                 if act.activity.name != "z - Hybrid Sticky":
-                    sch_acts.append([b, act, ", ".join([r.name for r in act.get_true_rooms()]), ", ".join([s.name for s in act.get_true_sponsors()])])
+                    sch_acts.append(
+                        [block, act, ", ".join([r.name for r in act.get_true_rooms()]), ", ".join([s.name for s in act.get_true_sponsors()])]
+                    )
                 signup = EighthSignup.objects.get(user=request.user, scheduled_activity=act)
-                if not signup.was_absent:
-                    att_marked.append(b)
+                if signup.attendance_marked:
+                    att_marked.append(block)
             except EighthScheduledActivity.DoesNotExist:
-                sch_acts.append([b, None])
+                sch_acts.append([block, None])
+        results = {
+            "code_correct": '<p style="color: green;">Attendance marked successfully.</p>',
+            "code_closed": '<p style="color: red;">Error. Ask your teacher to open the attendance code.</p>',
+            "code_fail": '<p style="color: red;">Invalid Code.</p>',
+            "invalid_time": f'<p style="color: red;">Invalid time. Please fill this out during {block.block_letter} block.</p>',
+        }
         response = render(
             request,
             "eighth/student_submit_attendance.html",
-            context={"sch_acts": sch_acts, "att_marked": att_marked, "attc": attc, "attf": attf, "attimef": attimef, "atteachf": atteachf},
+            context={"sch_acts": sch_acts, "att_marked": att_marked, "mark_block": mark_block, "attendance_result": results.get(mark_result)},
         )
     else:
         messages.error(request, "There are no eighth period blocks scheduled today.")
@@ -852,25 +875,22 @@ def qr_attendance_view(request, act_id, code):
     act = get_object_or_404(EighthScheduledActivity, id=act_id)
     error = False
     block = act.block
-    attc = None
-    attf = None
-    attimef = None
-    atteachf = None
+    mark_result = None
     if act.get_code_mode_display() == "Auto":
         now = timezone.localtime()
-        dayblks = Day.objects.select_related("day_type").get(date=now).day_type.blocks
+        day_blocks = Day.objects.select_related("day_type").get(date=now).day_type.blocks
         try:
-            dayblk = dayblks.get(name="8" + block.block_letter)
-            start_time = shift_time(tm(hour=dayblk.start.hour, minute=dayblk.start.minute), -20)
-            end_time = shift_time(tm(hour=dayblk.end.hour, minute=dayblk.end.minute), 20)
+            day_block = day_blocks.get(name="8" + block.block_letter)
+            start_time = shift_time(tm(hour=day_block.start.hour, minute=day_block.start.minute), -20)
+            end_time = shift_time(tm(hour=day_block.end.hour, minute=day_block.end.minute), 20)
             if not start_time <= now.time() <= end_time:
-                attimef = block
+                mark_result = "invalid_time"
                 error = True
         except Exception:
-            attimef = block
+            mark_result = "invalid_time"
             error = True
     elif act.get_code_mode_display() == "Closed":
-        atteachf = block
+        mark_result = "code_closed"
         error = True
     if not error:
         code = code.upper()
@@ -882,14 +902,14 @@ def qr_attendance_view(request, act_id, code):
                 act.attendance_taken = True
                 act.save()
                 invalidate_obj(act)
-                attc = block
+                mark_result = "code_correct"
                 messages.success(request, "Attendance marked.")
             except Exception:
-                attf = block
+                mark_result = "code_fail"
                 messages.error(request, "Failed to mark attendance.")
         else:
-            attf = block
+            mark_result = "code_fail"
             messages.error(request, "Failed to mark attendance.")
     else:
         messages.error(request, "Failed to mark attendance.")
-    return student_frontend(request, attc, attf, attimef, atteachf)
+    return student_frontend(request, block, mark_result)

intranet/apps/eighth/views/signup.py

@@ -254,7 +254,7 @@ def eighth_signup_view(request, block_id=None):
             "activities_list": safe_json(block_info["activities"]),
             "active_block": block,
             "active_block_current_signup": active_block_current_signup,
-            "attopen": attendance_open,
+            "attendance_open": attendance_open,
         }
 
         #######
@@ -508,7 +508,9 @@ def eighth_location(request):
                     attendance_open = True
         except Exception:
             attendance_open = False
-        response = render(request, "eighth/location.html", context={"sch_acts": sch_acts, "real_user": request.user, "attopen": attendance_open})
+        response = render(
+            request, "eighth/location.html", context={"sch_acts": sch_acts, "real_user": request.user, "attendance_open": attendance_open}
+        )
     else:
         messages.error(request, "There are no eighth period blocks scheduled today.")
         response = redirect("index")

intranet/templates/eighth/location.html

@@ -43,7 +43,7 @@ <h5><strong>Sponsor(s):</strong> {{ s.3 }}</h5>
         </div>
         <br><br>
     {% endfor %}
-    {% if real_user.is_student and attopen%}
+    {% if real_user.is_student and attendance_open%}
         <a class="button" href="{% url 'student_attendance' %}">Enter Attendance Code for Today's Blocks</a>
     {% endif %}
     <br>

intranet/templates/eighth/signup.html

@@ -352,7 +352,7 @@ <h3 class="activity-detail-header">
                 <%}%>
                 <br>
                 {% endverbatim %}
-                {% if real_user.is_student and attopen and not real_user.is_eighth_admin%}
+                {% if real_user.is_student and attendance_open and not real_user.is_eighth_admin%}
                     <a class="button" href="{% url 'student_attendance' %}">Enter Attendance Code for Today's Blocks</a>
                 {% endif %}
                 <div class="error-feedback">

intranet/templates/eighth/student_submit_attendance.html

@@ -39,7 +39,7 @@ <h5><strong>Sponsor(s):</strong> {{ s.3 }}</h5>
             <p>{{ s.1.activity.description }}</p>
             {% if s.0 in att_marked%}
             <p style="color: green;">Attendance marked.</p>
-            {% endif %}
+            {% else %}
             <form method="post" action="">
                 {% csrf_token %}
                 <p><strong>Attendance Code: </strong></p>
@@ -52,14 +52,9 @@ <h5><strong>Sponsor(s):</strong> {{ s.3 }}</h5>
                 />
                 <button type="submit">Submit</button>
             </form>
-            {% if s.0 == attc %}
-            <p style="color: green;">Attendance marked successfully.</p>
-            {% elif s.0 == attimef %}
-            <p style="color: red;">Invalid time. Please fill this out during {{ s.0.block_letter }} block.</p>
-            {% elif s.0 == attf %}
-            <p style="color: red;">Invalid Code.</p>
-            {% elif s.0 == atteachf %}
-            <p style="color: red;">Error. Ask your teacher to open the attendance code.</p>
+            {% endif %}
+            {% if s.0 == mark_block %}
+            {{ attendance_result|safe }}
             {% endif %}
             {% else %}
             <p>You are not signed up for any activity.</p>

intranet/templates/eighth/take_attendance.html

@@ -466,12 +466,12 @@ <h3>Passes</h3>
                                 &nbsp;&nbsp;<button type="submit">Save</button>
 
                                 <div class="activity-card">
-                                    <button type="button" onclick="showQRModal('{{ qrurl }}')">
+                                    <button type="button" id="show-qr-button">
                                         Show QR Code
                                     </button>
                                 </div>
 
-                                <div id="qrModal" style="display:none; position:fixed; top:0; left:0; width:100vw; height:100vh;
+                                <div id="qr-modal" style="display:none; position:fixed; top:0; left:0; width:100vw; height:100vh;
                                     background:rgba(0,0,0,0.6); align-items:center; justify-content:center; z-index:1000;">
 
                                     <div style="background:#fff; padding:20px; border-radius:8px; text-align:center; position:relative;">
@@ -481,20 +481,33 @@ <h3>Passes</h3>
                                             {{ scheduled_activity.attendance_code }}
                                         </div>
 
-                                        <div id="qrImageContainer" style="max-width:55000px; max-height:550px;"></div>
+                                        <div id="qr-image-container" style="max-width:55000px; max-height:550px;"></div>
                                         </div>
 
                                         <br>
-                                        <button type="button" onclick="closeQRModal()">Close</button>
+                                        <button type="button" id="close-qr-button">Close</button>
                                     </div>
                                 </div>
 
                                 <script>
+                                    document.addEventListener("DOMContentLoaded", function () {
+                                    const show_qr = document.getElementById("show-qr-button");
+                                    const close_qr = document.getElementById("close-qr-button");
+                                    show_qr.addEventListener("click", function (event) {
+                                        event.preventDefault();
+                                        showQRModal('{{ qr_url }}');
+                                        });
+                                    close_qr.addEventListener("click", function (event) {
+                                        event.preventDefault();
+                                        closeQRModal();
+                                        });
+                                    });
+
                                     function showQRModal(qrUrl) {
                                       event.preventDefault();
 
-                                      const modal = document.getElementById('qrModal');
-                                      const qrContainer = document.getElementById('qrImageContainer');
+                                      const modal = document.getElementById('qr-modal');
+                                      const qrContainer = document.getElementById('qr-image-container');
 
                                       qrContainer.innerHTML = '';
 
@@ -509,7 +522,7 @@ <h3>Passes</h3>
                                     }
 
                                     function closeQRModal() {
-                                      document.getElementById('qrModal').style.display = 'none';
+                                      document.getElementById('qr-modal').style.display = 'none';
                                     }
                                   </script>
                                 </td>