From 7d28f987d247bd036ae81d8d615c95228a76cda0 Mon Sep 17 00:00:00 2001 From: Lan Hui Date: Sat, 5 Aug 2023 16:11:27 +0800 Subject: [PATCH] Make pages look even better. --- Course.php | 28 ++++++++++++++-------------- Courses.php | 35 +++++++++++++++++++---------------- Script.php | 6 +++--- Submissions.php | 14 +++++++------- 4 files changed, 43 insertions(+), 40 deletions(-) diff --git a/Course.php b/Course.php index 26df151..f148f4c 100644 --- a/Course.php +++ b/Course.php @@ -275,7 +275,7 @@ Lab_Report_ID not in (select Lab_Report_ID from lab_report_submissions where (St $id = $row['Lab_Report_ID']; if( $c_date < $deadline) { - $submittedx=" Re-submit "; + $submittedx="Re-submit"; } $full_link = "$att1"; @@ -292,9 +292,9 @@ Lab_Report_ID not in (select Lab_Report_ID from lab_report_submissions where (St } echo "
- $title ($marks Marks)
$ins -
Posted:$posted   Deadline:$deadline       $submittedx  Submitted -
Submitted files: "; + $title ($marks Marks) Submitted
$ins +
Posted:$posted   Deadline:$deadline       $submittedx   +
Submitted files: "; $Sub_result = 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`, @@ -403,7 +403,7 @@ where Lab_Report_ID=$lab_repo_id and (lab_report_submissions.Student_id='$studen if($status=='Marked') { $rm_data="\Script.php?remarking=yes&id=$Submission_ID&url=$url&status=Remarking"; - $remarking=""; + $remarking=""; } if($status=='Remarking') { @@ -412,8 +412,8 @@ where Lab_Report_ID=$lab_repo_id and (lab_report_submissions.Student_id='$studen } - echo "
- $title ($marks marks out of $Originalmarks)
Lecturer feedback: $notes   $remarking
Submitted files :"; + echo "
+ $title ($marks marks out of $Originalmarks)
Lecturer feedback: $notes   $remarking
Submitted files :"; $Sub_result = 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`, @@ -453,7 +453,7 @@ where Lab_Report_ID=$lab_repo_id and (lab_report_submissions.Student_id='$studen } }} - echo "
"; + echo "
"; ?>
@@ -461,7 +461,8 @@ where Lab_Report_ID=$lab_repo_id and (lab_report_submissions.Student_id='$studen - + +








My groups

@@ -501,8 +502,7 @@ course_groups_table.Course_Group_id=course_group_members_table.Course_Group_id W } # Add "delete group" button and allow only group creator to delete it - $extra4 = ""; + $extra4 = ""; echo "
$name ($status) $extra $extra2 $extra3" . (($status == "Created")? "$extra4": "") @@ -525,10 +525,10 @@ where course_group_members_table.Course_Group_id=$id"); #Show group members + remove button next to each member except the creator of the group if($flag){ - echo "
  • $name - $Student_ID ($status) ".(($status != "Created")?"":"")."
    • "; + echo "
  • $name - $Student_ID ($status) ".(($status != "Created")?"":"")."
    • "; }else{ - echo "
  • $name-$Student_ID ($status)"; + echo "
  • $name - $Student_ID ($status)"; } } diff --git a/Courses.php b/Courses.php index 7c14c18..9178f22 100644 --- a/Courses.php +++ b/Courses.php @@ -496,7 +496,7 @@ if( $_SESSION['user_type']=="Student")
    -
    Course Portal > Students
    +
    -
    -
    Find new course by course code - -
    -List courses by faculty +
    +
    +
    + Find new course by course code + +
    -"; $result = mysqli_query($con,"SELECT DISTINCT(Faculty) as Faculty FROM `courses_table`"); if(mysqli_num_rows($result)==0){ - } else { - echo""; + echo" "; while($row = mysqli_fetch_assoc($result)) { $fname=$row['Faculty']; - echo " "; + echo " "; }} - echo "
    + echo " +
    -
    -

    - +

    + +
    +
    +
    - -
    • "; diff --git a/Script.php b/Script.php index e011f4d..af52ea7 100644 --- a/Script.php +++ b/Script.php @@ -585,7 +585,7 @@ if (!empty($_POST["frm_submitlab"])) { $con->query($sql = "UPDATE `lab_report_submissions` SET `Course_Group_id` = '0' WHERE `lab_report_submissions`.`Lab_Report_ID` = '$lab_id'"); } - $_SESSION["info_courses"] = "Thanks. Your lab report assignment is submitted successfully."; + $_SESSION["info_courses"] = "Thanks. You have successfully submitted your assignment."; header("Location: Course.php?url=" . $url); } else { echo "Error:
    " . $con->error; @@ -648,7 +648,7 @@ if (!empty($_GET["savemarks"])) { if ($con->query($sql) === TRUE) { - $_SESSION["info_Marking"] = "Lab Report Submission Marked"; + $_SESSION["info_Marking"] = "Assignment marked"; header("Location: Submissions.php?id=" . $labid . "&header=" . $header . "&total=" . $total); } else { echo "Error: " . $sql . "
    " . $con->error; @@ -692,7 +692,7 @@ if (!empty($_GET["remarking"])) { if ($con->query($sql) === TRUE) { - $_SESSION["info_general"] = "Remarking Request Sent"; + $_SESSION["info_general"] = "Remarking request sent"; header("Location: Course.php?url=" . $url); } else { echo "Error: " . $sql . "
    " . $con->error; diff --git a/Submissions.php b/Submissions.php index 63ddfbf..211c9da 100644 --- a/Submissions.php +++ b/Submissions.php @@ -137,7 +137,7 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Pending' order by Sub } if (mysqli_num_rows($result1) == 0) { - echo "No Un-Marked Submissions for this Lab Report."; + echo "No unmarked submissions."; } else { while ($row = mysqli_fetch_assoc($result1)) { $title = $row['Title']; @@ -159,7 +159,7 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Pending' order by Sub $student_id = $row['sub_std']; if ($submitted_group == 0) { - $submitted_by = $student_name . "(" . $student_id . ")"; + $submitted_by = $student_name . " (" . $student_id . ")"; } else { $submitted_by = "$student_name ($submitter_student_number) for group $groupname "; } @@ -220,7 +220,7 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Marked' Order by lab echo "No Marked submissions for this lab"; } else { - echo "

    Export Grade Sheet

    "; + echo "

    Export grades

    "; while ($row = mysqli_fetch_assoc($result)) { $title = $row['Title']; @@ -304,7 +304,7 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Remarking'"); } if (mysqli_num_rows($resulty) == 0) { - echo "No Remarking Request for this lab"; + echo "No remarking requests."; } else { while ($row = mysqli_fetch_assoc($resulty)) { $title = $row['Title']; @@ -350,7 +350,7 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Remarking'"); $title
    by : $submitted_by        [ Marked $Marks ]
    Remarking Reason : $remarking_reason
    Submitted : $posted " . "" - . "       Ignore Request " + . "      Ignore request" . "
    Attachments : $full_link
    "; } @@ -362,7 +362,7 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Remarking'");