diff --git a/Admin.php b/Admin.php index 057783c..fd93d1e 100644 --- a/Admin.php +++ b/Admin.php @@ -77,14 +77,14 @@ if ($_SESSION['user_type'] != "Lecturer" && $_SESSION['user_type'] != "Admin") { ?>
- Full Name + Full name Email - Passport Number / ID (Used as Initial Password) + Passport number/ID (used as the initial password) -
User Type : +
User type: - Courses > $name ($code) > Lab Reports
Faculty: $faculty | Year: $academic | Lecturer: $lecturer - "; + Courses > ($code) $name > Assignments
Faculty: $faculty   Year: $academic   Lecturer: $lecturer + "; } else { $ta_name = ""; while ($row = mysqli_fetch_assoc($ta_result)) { @@ -138,7 +138,7 @@ if( $_SESSION['user_type'] == "Student") if(mysqli_num_rows($result1)==0) { - echo "No active assignments for this course so far."; + echo "No active assignments for this course now."; } else { while($row = mysqli_fetch_assoc($result1)) { @@ -406,13 +406,13 @@ where Lab_Report_ID=$lab_repo_id and (lab_report_submissions.Student_id='$studen } if($status=='Remarking') { - $remarking=" Remarking Request sent
Remarking Reason:$remarking_reason
"; + $remarking=" Remarking request sent
Reasons for remarking: $remarking_reason
"; } echo "
- $title ($marks Marks out of $Originalmarks)
Lecturer Feedback : $notes   $remarking
Submitted 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`, diff --git a/Courses.php b/Courses.php index 0a2de79..e3401b7 100644 --- a/Courses.php +++ b/Courses.php @@ -85,7 +85,7 @@ if( $_SESSION['user_type']=="Lecturer" || $_SESSION['user_type']=="TA")
($code) - $name -
Faculty: $faculty | Year: $academic | Lecturer: $lecturer +
Faculty:$faculty   Year: $academic   Lecturer: $lecturer
"; @@ -366,7 +366,7 @@ WHERE Course_ID=$course_id"); $result = mysqli_query($con,"SELECT `Course_ID`, `Course_Name`, `Academic_Year`, `Faculty`, " - . "`Lecturer_User_ID`, `TA_User_ID`, `Course_Code`, `URL`, `Verify_New_Members` , users_table.Full_Name FROM `courses_table` INNER JOIN users_table ON users_table.User_ID=courses_table.Lecturer_User_ID where courses_table.Lecturer_User_ID=$user_d"); + . "`Lecturer_User_ID`, `TA_User_ID`, `Course_Code`, `URL`, `Verify_New_Members` , users_table.Full_Name FROM `courses_table` INNER JOIN users_table ON users_table.User_ID=courses_table.Lecturer_User_ID where courses_table.Lecturer_User_ID=$user_d ORDER BY Academic_Year DESC, URL ASC"); if($_SESSION['user_type']=="TA") { @@ -412,7 +412,7 @@ where course_ta.Course_ID=$id");

- Course Joining Requests + Course joining requests @@ -426,7 +426,7 @@ WHERE Lecturer_User_ID=$lecturer_id and course_students_table.Status='Pending'" if(mysqli_num_rows($result)==0) { - echo "
No course-joining request so far for all your courses
"; + echo "
No course-joining request so far for your courses
"; } else { while($row = mysqli_fetch_assoc($result)) { $id=$row['ID']; @@ -453,7 +453,7 @@ WHERE Lecturer_User_ID=$lecturer_id and course_students_table.Status='Pending'" } if( $_SESSION['user_type']=="Lecturer"){ ?> - Create new Course Portal + Create a new course @@ -482,7 +482,7 @@ WHERE Lecturer_User_ID=$lecturer_id and course_students_table.Status='Pending'" No
-
+
@@ -537,7 +537,7 @@ if( $_SESSION['user_type']=="Student") // the user has not entered something under "Find course by Code" if($faculty=="") { - echo "

Search Results for Course Code $search

"; + echo "

Search results for course code: $search

"; $result = mysqli_query($con,"SELECT `Course_ID`, `Course_Name`, `Academic_Year`, `Faculty`," . " `Lecturer_User_ID`, `TA_User_ID`, `Course_Code`, `URL`, `Verify_New_Members` " . " , users_table.Full_Name FROM `courses_table` INNER JOIN users_table" @@ -546,7 +546,7 @@ if( $_SESSION['user_type']=="Student") // the user has entered something under "Find course by Code" else { - echo "

Find Courses under faculty $faculty

"; + echo "

Find courses under faculty: $faculty

"; $result = mysqli_query($con,"SELECT `Course_ID`, `Course_Name`, `Academic_Year`, `Faculty`, `Lecturer_User_ID`, `TA_User_ID`, `Course_Code`, `URL`, `Verify_New_Members` , users_table.Full_Name FROM `courses_table` INNER JOIN users_table @@ -556,7 +556,7 @@ if( $_SESSION['user_type']=="Student") if(mysqli_num_rows($result)==0) { - echo "No results found ...
"; + echo "No results.
"; } else { @@ -569,7 +569,6 @@ if( $_SESSION['user_type']=="Student") $url=$row['URL']; $id=$row['Course_ID']; $v=$row['Verify_New_Members']; - $msg2="Join Course"; if($v>0) { $msg=" Lecturer verification required"; @@ -577,25 +576,25 @@ if( $_SESSION['user_type']=="Student") } echo "
- [$code] $name
($url)
$msg2 -
Faculty: $faculty | Year: $academic | Lecturer: $lecturer
$msg
+ ($code) $name
($url)
Join +
Faculty: $faculty   Year: $academic   Lecturer: $lecturer
$msg
"; } } } // Otherwise, list the student's joined courses (already done), in reverse chronological order - echo "

My Courses

"; + echo "

My courses

"; $result = mysqli_query($con,"SELECT users_table.Full_Name, course_students_table.Status, courses_table.Course_ID, `Course_Name`, `Academic_Year`, `Faculty`, `Lecturer_User_ID`, `TA_User_ID`, `Course_Code`, `URL`, `Verify_New_Members` FROM `courses_table` INNER JOIN users_table ON users_table.User_ID=courses_table.Lecturer_User_ID INNER JOIN course_students_table on course_students_table.Course_ID=courses_table.Course_ID - where course_students_table.Student_ID=$student_id order by Academic_Year desc"); + where course_students_table.Student_ID=$student_id ORDER BY Academic_Year DESC, URL ASC"); if(mysqli_num_rows($result)==0) { - echo " You are not Enrolled in any Course"; + echo " You are not enrolled in any Course"; } else { while($row = mysqli_fetch_assoc($result)) { $name=$row['Course_Name']; @@ -610,15 +609,15 @@ INNER JOIN course_students_table on course_students_table.Course_ID=courses_tabl if($Status=="Joined") { echo "
- ($code) - $name
($url)     $Status      Open -
Faculty : $faculty Year : $academic Lecturer :$lecturer
+ ($code) - $name
($url)     $Status      +
Faculty: $faculty   Year: $academic   Lecturer: $lecturer "; } else { echo "
($code) - $name $Status -
Faculty : $faculty Year : $academic Lecturer :$lecturer
+
Faculty: $faculty   Year: $academic   Lecturer: $lecturer "; } } @@ -628,9 +627,9 @@ INNER JOIN course_students_table on course_students_table.Course_ID=courses_tabl
-
-
Find course by course code - +
+
Find new course by course code +
List courses by faculty