diff --git a/Submissions.php b/Submissions.php index db60e9a..d848a3f 100644 --- a/Submissions.php +++ b/Submissions.php @@ -107,23 +107,17 @@ echo "<div><a href='Courses.php?course=$url'> $header </a></div>"; <?php if ($Report_Type == "Group") { - $result1 = 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`, `Marks`, lab_report_submissions.Status, - `Title`,course_groups_table.Group_Name,course_groups_table.Group_Leader,users_table.Full_Name, users_table.Student_id -FROM `lab_report_submissions` -Left JOIN users_table on users_table.Student_ID=lab_report_submissions.Student_id -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='Pending' order by Submission_Date desc"); + $result1 = 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, Marks, lab_report_submissions.Status, Title, course_groups_table.Group_Name, course_groups_table.Group_Leader, users_table.Full_Name, users_table.Student_id + FROM lab_report_submissions + LEFT JOIN users_table ON users_table.Student_ID=lab_report_submissions.Student_id + 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='Pending' ORDER BY Submission_Date DESC"); } else { - $result1 = mysqli_query($con, "SELECT `Submission_ID`, `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='Pending' order by Submission_Date desc"); + $result1 = mysqli_query($con, "SELECT Submission_ID, 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='Pending' ORDER BY Submission_Date DESC"); } if (mysqli_num_rows($result1) == 0) {