From a2f2c9c30f903137d2b46217c0f2e66bf61a26e0 Mon Sep 17 00:00:00 2001
From: Lan Hui <lanhui@zjnu.edu.cn>
Date: Sat, 26 Aug 2023 20:12:46 +0800
Subject: [PATCH] Submissions.php: better code format.

---
 Submissions.php | 52 +++++++++++++++++++------------------------------
 1 file changed, 20 insertions(+), 32 deletions(-)

diff --git a/Submissions.php b/Submissions.php
index cabc053..db60e9a 100644
--- a/Submissions.php
+++ b/Submissions.php
@@ -191,26 +191,22 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Pending' order by Sub
                     <?php
 
                     if ($Report_Type == "Group") {
-                        $result = mysqli_query($con, "SELECT `Submission_ID`,Visibility, `Submission_Date`, lab_report_submissions.Lab_Report_ID,
-    lab_report_submissions.Course_Group_id, `Attachment1`,
-     `Notes`, `Attachment2`, `Attachment3`, `Attachment4`, `Marks`, lab_report_submissions.Status, 
-     `Title`,course_groups_table.Group_Name
-FROM `lab_report_submissions`
-left JOIN course_groups_table on course_groups_table.Course_Group_id=lab_report_submissions.Course_Group_id
-where Lab_Report_ID=$id and lab_report_submissions.Status='Marked'");
+                        $result = mysqli_query($con, "SELECT Submission_ID, Visibility, Submission_Date, lab_report_submissions.Lab_Report_ID, lab_report_submissions.Course_Group_id, Attachment1, Notes, Attachment2, Attachment3, Attachment4, Marks, lab_report_submissions.Status, Title, course_groups_table.Group_Name
+                                                      FROM lab_report_submissions
+                                                      LEFT JOIN course_groups_table ON course_groups_table.Course_Group_id=lab_report_submissions.Course_Group_id
+                                                      WHERE Lab_Report_ID=$id and lab_report_submissions.Status='Marked'");
                     } else {
-                        $result = mysqli_query($con, "SELECT `Submission_ID`,Visibility, `Submission_Date`, lab_report_submissions.Lab_Report_ID,
-     lab_report_submissions.Student_id sub_std, lab_report_submissions.Course_Group_id, `Attachment1`,
-     `Notes`, `Attachment2`, `Attachment3`, `Attachment4`, `Marks`, lab_report_submissions.Status, 
-     `Title`,users_table.Full_Name,course_group_members_table.Student_ID
-FROM `lab_report_submissions`
-Left JOIN users_table  on users_table.Student_ID=lab_report_submissions.Student_id
-left JOIN course_group_members_table on course_group_members_table.Course_Group_id=lab_report_submissions.Course_Group_id
-where Lab_Report_ID=$id and lab_report_submissions.Status='Marked'  Order by lab_report_submissions.Student_id Desc");
+                        $result = mysqli_query($con, "SELECT Submission_ID, Visibility, Submission_Date, lab_report_submissions.Lab_Report_ID, lab_report_submissions.Student_id sub_std, lab_report_submissions.Course_Group_id, Attachment1, Notes, Attachment2, Attachment3, Attachment4, Marks, lab_report_submissions.Status, Title, users_table.Full_Name, course_group_members_table.Student_ID
+                                                      FROM lab_report_submissions
+                                                      LEFT JOIN users_table ON users_table.Student_ID=lab_report_submissions.Student_id
+                                                      LEFT JOIN course_group_members_table ON course_group_members_table.Course_Group_id=lab_report_submissions.Course_Group_id
+                                                      WHERE Lab_Report_ID=$id AND lab_report_submissions.Status='Marked' ORDER BY lab_report_submissions.Student_id Desc");
                     }
 
                     if (mysqli_num_rows($result) == 0) {
+
                         echo "No marked submissions.";
+
                     } else {
 
                         echo "<h3><a href='~\..\Script.php?exportgrade=true&lab=$id&lab_name=$Report_Title'><i class='fa fa-book'></i> Export grades</a></h3>";
@@ -278,24 +274,16 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Marked'  Order by lab
                     <?php
 
                     if ($Report_Type == "Group") {
-                        $resulty  = mysqli_query($con, "SELECT `Submission_ID`, `Submission_Date`, lab_report_submissions.Lab_Report_ID,
-      lab_report_submissions.Course_Group_id, `Attachment1`,
-     `Notes`, `Attachment2`, `Attachment3`, `Attachment4`, lab_report_submissions.Marks, lab_report_submissions.Status, 
-     `Title`,course_groups_table.Group_Name
-FROM `lab_report_submissions`
-
-left JOIN course_groups_table on course_groups_table.Course_Group_id=lab_report_submissions.Course_Group_id
-where Lab_Report_ID=$id and lab_report_submissions.Status='Remarking'");
+                        $resulty = mysqli_query($con, "SELECT Submission_ID, Submission_Date, lab_report_submissions.Lab_Report_ID, lab_report_submissions.Course_Group_id, Attachment1, Notes, Attachment2, Attachment3, Attachment4, lab_report_submissions.Marks, lab_report_submissions.Status, Title, course_groups_table.Group_Name
+                                                       FROM lab_report_submissions
+                                                       LEFT JOIN course_groups_table ON course_groups_table.Course_Group_id=lab_report_submissions.Course_Group_id
+                                                       WHERE Lab_Report_ID=$id AND lab_report_submissions.Status='Remarking'");
                     } else {
-                        $resulty  = mysqli_query($con, "SELECT `Submission_ID`, `Submission_Date`, lab_report_submissions.Lab_Report_ID, 
-    lab_report_submissions.Remarking_Reason,
-     lab_report_submissions.Student_id sub_std, lab_report_submissions.Course_Group_id, `Attachment1`,
-     `Notes`, `Attachment2`, `Attachment3`, `Attachment4`, lab_report_submissions.Marks, lab_report_submissions.Status, 
-     `Title`,users_table.Full_Name,course_group_members_table.Student_ID
-FROM `lab_report_submissions`
-Left JOIN users_table  on users_table.Student_ID=lab_report_submissions.Student_id
-left JOIN course_group_members_table on course_group_members_table.Course_Group_id=lab_report_submissions.Course_Group_id
-where Lab_Report_ID=$id and lab_report_submissions.Status='Remarking'");
+                        $resulty = mysqli_query($con, "SELECT Submission_ID, Submission_Date, lab_report_submissions.Lab_Report_ID,  lab_report_submissions.Remarking_Reason, lab_report_submissions.Student_id sub_std, lab_report_submissions.Course_Group_id, Attachment1, Notes, Attachment2, Attachment3, Attachment4, lab_report_submissions.Marks, lab_report_submissions.Status, Title, users_table.Full_Name, course_group_members_table.Student_ID
+                                                       FROM lab_report_submissions
+                                                       LEFT JOIN users_table ON users_table.Student_ID=lab_report_submissions.Student_id
+                                                       LEFT JOIN course_group_members_table ON course_group_members_table.Course_Group_id=lab_report_submissions.Course_Group_id
+                                                       WHERE Lab_Report_ID=$id AND lab_report_submissions.Status='Remarking'");
                     }
 
                     if (mysqli_num_rows($resulty) == 0) {