diff --git a/Course.php b/Course.php index ab8fb0d..4125a86 100644 --- a/Course.php +++ b/Course.php @@ -402,7 +402,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,7 +412,7 @@ 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
Submission files :"; + $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`, @@ -462,7 +462,7 @@ where Lab_Report_ID=$lab_repo_id and (lab_report_submissions.Student_id='$studen
-

Class Groups

+

My groups

DELETE GROUP"; + $extra4 = ""; echo "
$name ($status) $extra $extra2 $extra3" . (($status == "Created")? "$extra4": "") @@ -524,8 +524,8 @@ 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)"; } @@ -555,18 +555,16 @@ include 'Footer.php'; try { $('
    \n\ - Group Name \n\ + Group name \n\
    ').dialog({ modal: true, - title:'Create Group', + title:'Create a group', buttons: { - 'Create Group': function () { + 'Create': function () { $('#frm').submit(); - $(this).dialog('close'); }, 'Cancel': function () { - $(this).dialog('close'); } @@ -583,7 +581,7 @@ include 'Footer.php'; try { $('
    \n\ - Enter Student_ID to Invite \n\ + Enter Student ID to invite \n\
    ').dialog({ modal: true, title:'Invite Students to Group', @@ -652,15 +650,13 @@ include 'Footer.php'; \n\ ').dialog({ modal: true, - title:'Remove '+student_id+'?', + title:'Kick out '+student_id+'?', buttons: { - 'Confirm': function () { + 'Yes': function () { $('#frm').submit(); - $(this).dialog('close'); }, - 'Cancel': function () { - + 'No': function () { $(this).dialog('close'); } @@ -681,13 +677,11 @@ include 'Footer.php'; modal: true, title:'Delete this group?', buttons: { - 'Confirm': function () { + 'Yes': function () { $('#frm').submit(); - $(this).dialog('close'); }, - 'Cancel': function () { - + 'No': function () { $(this).dialog('close'); } diff --git a/Script.php b/Script.php index 05545be..e011f4d 100644 --- a/Script.php +++ b/Script.php @@ -833,7 +833,7 @@ if (!empty($_GET["removemember"])) { $sql = "Delete from `course_group_members_table` where student_id=$student_id and Course_Group_id=$group_id"; if ($con->query($sql) === TRUE) { - $_SESSION["info_general"] = " Member " . $student_id . " removed from the group"; + $_SESSION["info_general"] = " Member " . $student_id . " is gone."; header("Location: Course.php?url=" . $url); } else { echo "Error: " . $sql . "
    " . $con->error;