From 11cb05b31a33283949fa8d87a29cd71b529b7166 Mon Sep 17 00:00:00 2001
From: Jeannick94 <jeannickumba94@gmail.com>
Date: Thu, 6 May 2021 11:59:00 +0800
Subject: [PATCH]  Enock Omar Jeannick bug 42: please add a link under
 assignments so that we can go bact to the list of assignments.

---
 Submissions.php | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/Submissions.php b/Submissions.php
index 79bf09f..73b1dae 100644
--- a/Submissions.php
+++ b/Submissions.php
@@ -29,16 +29,18 @@ if(!empty($_GET["total"]))
 }
        
   
-$resultx1 = mysqli_query($con,"SELECT `Lab_Report_ID`,Title, `Course_ID`, `Posted_Date`, `Deadline`, `Marks`, `Type` FROM `lab_reports_table` WHERE Lab_Report_ID=$id");
+$resultx1 = mysqli_query($con,"SELECT `Lab_Report_ID`,Title, lab_reports_table.Course_ID, `Posted_Date`, `Deadline`, `Marks`, `Type` , courses_table.URL FROM `lab_reports_table` INNER JOIN courses_table ON courses_table.Course_ID=lab_reports_table.Course_ID WHERE Lab_Report_ID=$id");
 while($row = mysqli_fetch_assoc($resultx1)) {
     $Report_Type = $row['Type'];
     $c_id = $row['Course_ID'];
     $Report_Title = $row['Title'];
+    $url = $row['URL'];
 }  
-  
+
+
  
   
-echo "<div class='alert' style='margin-left:20px;border-bottom:2px solid #1D91EF;'> <a href='#'>
+echo "<div class='alert' style='margin-left:20px;border-bottom:2px solid #1D91EF;'> <a href='Courses.php?course=$url'>
  $header 
 </a></div>
  ";
@@ -121,8 +123,9 @@ echo "<div class='alert' style='margin-left:20px;border-bottom:2px solid #1D91EF
             $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
+     `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");
         }
@@ -159,18 +162,19 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Pending' order by Sub
                 $att4=$row['Attachment4'];
                 $labid=$row['Lab_Report_ID'];
                                      
-                $submitted_std=$row['Student_id'];
+                $submitter_student_number=$row['Student_id'];
                 $submitted_group=$row['Course_Group_id'];
                 $Submission_ID=$row['Submission_ID'];
-                $names=$row['Full_Name'];
-                $groupname=$row['Group_Name']; 
+                $student_name=$row['Full_Name'];
+                $groupname=$row['Group_Name'];
+                $groupleader=$row['Group_Leader'];  
                 $student_id=$row['sub_std'];
                                 
                 if($submitted_group==0)
                 {
-                    $submitted_by= $names."(".$student_id.")";
+                    $submitted_by= $student_name."(".$student_id.")";
                 } else {
-                    $submitted_by="<i>(GROUP)</i> $groupname" ;
+                    $submitted_by="$student_name ($submitter_student_number) for group $groupname ";
                 }
 
                     $base_att1 = basename($att1);
@@ -194,7 +198,7 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Pending' order by Sub
                                        
                 echo "   <k href='#'>   <div class='btn btn-default break-word' style='dislay:block; word-wrap: break-word; border: 1px solid #F0F0F0;border-left: 4px solid #03407B;'>
   $title  <br> by: <b> $submitted_by </b>
-   <br> <span style='font-size:8pt'>Submitted at $posted   <button class='btn-sm btn-info' style='margin-left:50px;' onclick='mark($Submission_ID,\"$title\",$total)'>  Mark Submission</button><br> Attachments : $full_link </span>  
+   <br> <span style='font-size:8pt'>Submitted : $posted   <button class='btn-sm btn-info' style='margin-left:50px;' onclick='mark($Submission_ID,\"$title\",$total)'>  Mark Submission</button><br> Attachments : $full_link </span>  
 </div></k>";
                 
             }
@@ -254,17 +258,17 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Marked'  Order by lab
                 $att4=$row['Attachment4'];
                 $labid=$row['Lab_Report_ID'];
                                      
-                $submitted_std=$row['Student_id'];
+                $submitter_student_number=$row['Student_id'];
                 $submitted_group=$row['Course_Group_id'];
                 $Submission_ID=$row['Submission_ID'];
-                $names=$row['Full_Name'];
+                $student_name=$row['Full_Name'];
                 $student_id=$row['sub_std'];
                 $Visibility=$row['Visibility'];
                 $notes=$row['Notes'];
                                 
                 if($submitted_group==0)
                 {
-                    $submitted_by= $names."(".$student_id.")";
+                    $submitted_by= $student_name."(".$student_id.")";
                 } else {
                     $submitted_by="<i>(GROUP)</i> Group X " ;
                 }
@@ -350,16 +354,16 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Remarking'");
                                      
                 $remarking_reason=$row['Remarking_Reason'];
 
-                $submitted_std=$row['Student_id'];
+                $submitter_student_number=$row['Student_id'];
                 $submitted_group=$row['Course_Group_id'];
                 $Submission_ID=$row['Submission_ID'];
-                $names=$row['Full_Name'];
+                $student_name=$row['Full_Name'];
                 $student_id=$row['sub_std'];
                 $gname=$row['Group_Name '];
                                 
                 if($submitted_group==0)
                 {
-                    $submitted_by= $names."(".$student_id.")";
+                    $submitted_by= $student_name."(".$student_id.")";
                 } else {
                     $submitted_by="<i>(GROUP)</i> $gname" ;
                 }