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 "
+echo "
$header
"; @@ -121,8 +123,9 @@ echo "
$title
by: $submitted_by -
Submitted at $posted
Attachments : $full_link
+
Submitted : $posted
Attachments : $full_link
"; } @@ -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="(GROUP) 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="(GROUP) $gname" ; }