diff --git a/Admin.php b/Admin.php index 1cbfb8e..d02f8b0 100644 --- a/Admin.php +++ b/Admin.php @@ -221,6 +221,9 @@ if ($_SESSION['user_type'] != "Lecturer" && $_SESSION['user_type'] != "Admin") { + + + + + + + + diff --git a/Course.php b/Course.php index 7d054ff..e8329fa 100644 --- a/Course.php +++ b/Course.php @@ -6,6 +6,11 @@ include 'NoDirectPhpAcess.php'; + +
+ + + + +
+ + + @@ -701,3 +712,7 @@ where course_group_members_table.Course_Group_id=$id"); }) + + + + diff --git a/Courses.php b/Courses.php index 5ca2270..fcf3d81 100644 --- a/Courses.php +++ b/Courses.php @@ -4,31 +4,30 @@ include 'NoDirectPhpAcess.php'; +
+ + + - - - -
- - - - + + + - - - - if(mysqli_num_rows($result)==0) - {} else { while($row = mysqli_fetch_assoc($result)) { - $name=$row['Course_Name']; - $code=$row['Course_Code']; - $faculty=$row['Faculty']; - $lecturer=$row['Full_Name']; - $academic=$row['Academic_Year']; - $url=$row['URL']; - $id=$row['Course_ID']; - $course_id=$row['Course_ID']; - echo " + +
($code) - $name
Faculty:$faculty   Year: $academic   Lecturer: $lecturer
- "; - - echo "
"; - } - - // ------------------------------Editing Lab Assignment by Lecturer ------------------------------------ - - - if($_GET['act']=="edit"){ - $getid = mysqli_real_escape_string($con, $_GET["cid"]); - $result1 = mysqli_query($con, "SELECT * from lab_reports_table WHERE Lab_Report_ID = '$getid'"); - - while($row1 = mysqli_fetch_assoc($result1)) { - $Deadline = $row1['Deadline']; - $_SESSION['Date'] = trim( strstr($Deadline, ' ', true) ); - $_SESSION['Time'] = trim( strstr($Deadline, ' ') ); - $_SESSION['Instructions'] = $row1['Instructions']; - $_SESSION['Title'] = $row1['Title']; - $_SESSION['Marks'] = $row1['Marks']; - $_SESSION['Type'] = $row1['Type']; - } + "; - if(isset($_POST['frm_uploadlab'])){ - $deadlinedate = trim(mysqli_real_escape_string($con, $_POST["deadlinedate"])); // remove spaces - $deadlinetime = trim(mysqli_real_escape_string($con, $_POST["deadlinetime"])); // remove spaces - $instructions = mysqli_real_escape_string($con, $_POST["instructions"]); - $title = mysqli_real_escape_string($con, $_POST["title"]); - $marks = mysqli_real_escape_string($con, $_POST["marks"]); - $type = mysqli_real_escape_string($con, $_POST["type"]); - $Deadline = $deadlinedate." ".$deadlinetime; - $date = date("Y-m-d H:i"); - - $sql = "UPDATE `lab_reports_table` SET `Deadline` = ('" . $Deadline . "'), `Instructions` = ('" . $instructions . "'), `Title` = ('" . $title . "'), `Marks` = ('" . $marks . "'), `Type` = ('" . $type . "') WHERE `lab_reports_table`.`Lab_Report_ID` = '$getid'"; - if ($con->query($sql) === TRUE) { - $_SESSION["info_Updated"]="Assignment information updated successfully."; - - } else { - // echo "Error: " . $sql . "
" . $con->error; - echo "Serious error happened whiling updating assignment information."; + echo "
"; + } + + // ------------------------------Editing Lab Assignment by Lecturer ------------------------------------ + + + if($_GET['act']=="edit"){ + $getid = mysqli_real_escape_string($con, $_GET["cid"]); + $result1 = mysqli_query($con, "SELECT * from lab_reports_table WHERE Lab_Report_ID = '$getid'"); + + while($row1 = mysqli_fetch_assoc($result1)) { + $Deadline = $row1['Deadline']; + $_SESSION['Date'] = trim( strstr($Deadline, ' ', true) ); + $_SESSION['Time'] = trim( strstr($Deadline, ' ') ); + $_SESSION['Instructions'] = $row1['Instructions']; + $_SESSION['Title'] = $row1['Title']; + $_SESSION['Marks'] = $row1['Marks']; + $_SESSION['Type'] = $row1['Type']; } - } - - if( $_SESSION['user_type']=="Lecturer"){ - $Date = $_SESSION['Date']; - $Time = $_SESSION['Time']; - $Instructions = $_SESSION['Instructions']; - $Title = $_SESSION['Title']; - $Marks = $_SESSION['Marks']; - $Type = $_SESSION['Type']; - echo "

Editing assignment information

"; - ?> -
- - - + if(isset($_POST['frm_uploadlab'])){ + $deadlinedate = trim(mysqli_real_escape_string($con, $_POST["deadlinedate"])); // remove spaces + $deadlinetime = trim(mysqli_real_escape_string($con, $_POST["deadlinetime"])); // remove spaces + $instructions = mysqli_real_escape_string($con, $_POST["instructions"]); + $title = mysqli_real_escape_string($con, $_POST["title"]); + $marks = mysqli_real_escape_string($con, $_POST["marks"]); + $type = mysqli_real_escape_string($con, $_POST["type"]); + $Deadline = $deadlinedate." ".$deadlinetime; + $date = date("Y-m-d H:i"); + + $sql = "UPDATE `lab_reports_table` SET `Deadline` = ('" . $Deadline . "'), `Instructions` = ('" . $instructions . "'), `Title` = ('" . $title . "'), `Marks` = ('" . $marks . "'), `Type` = ('" . $type . "') WHERE `lab_reports_table`.`Lab_Report_ID` = '$getid'"; + if ($con->query($sql) === TRUE) { + $_SESSION["info_Updated"]="Assignment information updated successfully."; + + } else { + // echo "Error: " . $sql . "
" . $con->error; + echo "Serious error happened whiling updating assignment information."; + } + } + + if( $_SESSION['user_type']=="Lecturer"){ + $Date = $_SESSION['Date']; + $Time = $_SESSION['Time']; + $Instructions = $_SESSION['Instructions']; + $Title = $_SESSION['Title']; + $Marks = $_SESSION['Marks']; + $Type = $_SESSION['Type']; + + echo "

Editing assignment information

"; + ?> + + + + + + Deadline Date/Time +
+
">
+
">
+
+ + Title + "> + Instructions + + Marks + "> + Attachment 1 + + + Attachment 2 + + + Attachment 3 + + + + Attachment 4 + +
+ + Individual Group"; + } else { + echo "Submission Type Individual Group"; + } + ?> + + +
+
+




+ - Deadline Date/Time -
-
">
-
">
-
+

New an assignment

+ +
+ + + + + + Deadline (date and time) +
+
+
+
- Title - "> - Instructions - - Marks - "> - Attachment 1 - + Title + + Instruction + + Mark + + Attachment 1 + - Attachment 2 - + Attachment 2 + - Attachment 3 - + Attachment 3 + - Attachment 4 - -
+ Attachment 4 + +
+ Submission type: Individual - Individual Group"; - } else { - echo "Submission Type Individual Group"; - } - ?> - - -
-
-




- - -

New an assignment

- -
- - - - - - Deadline (date and time) -
-
-
-
- - Title - - Instruction - - Mark - - Attachment 1 - - - Attachment 2 - - - Attachment 3 - - - - Attachment 4 - -
- Submission type: Individual - - Group -
-
-




- "; - - echo "

Assignment list

"; - - error_reporting(0); - if(isset($_SESSION["info_Updated"])){ - echo '
'; - $_SESSION['info_Updated'] = null; - } - if (isset($_SESSION['info_courses'])) { - echo '
'; - $_SESSION['info_courses'] = null; - } - if (isset($_SESSION['info_courses'])) { - echo '
'; - $_SESSION['info_courses']=null; - } - - - - - $result = mysqli_query($con," SELECT `Lab_Report_ID`,Type,Marks, `Course_ID`, `Posted_Date`, `Deadline`, `Instructions`, `Title`, `Attachment_link_1`, `Attachment_link_2`, `Attachment_link_3`, " - . "`Attachment_link_4` FROM `lab_reports_table` WHERE Course_ID=$id ORDER by Lab_Report_ID DESC"); - - - if( $_SESSION['user_type']=="TA") - { - echo "Only Lecturer can post assignments.
"; - } - if(mysqli_num_rows($result)==0) - { - echo "No assignments posted so far."; + Group +
+
+



+ $att1"; + } + echo "
"; + + echo "

Assignment list

"; - if($att2!=""){ - $full_link= $full_link."  |  $att2"; + error_reporting(0); + if(isset($_SESSION["info_Updated"])){ + echo '
'; + $_SESSION['info_Updated'] = null; } - if($att3!=""){ - $full_link= $full_link."  |  $att3"; + if (isset($_SESSION['info_courses'])) { + echo '
'; + $_SESSION['info_courses'] = null; } - - if($att4!=""){ - $full_link= $full_link."   |   $att4"; + if (isset($_SESSION['info_courses'])) { + echo '
'; + $_SESSION['info_courses']=null; } + + + $result = mysqli_query($con," SELECT `Lab_Report_ID`,Type,Marks, `Course_ID`, `Posted_Date`, `Deadline`, `Instructions`, `Title`, `Attachment_link_1`, `Attachment_link_2`, `Attachment_link_3`, " + . "`Attachment_link_4` FROM `lab_reports_table` WHERE Course_ID=$id ORDER by Lab_Report_ID DESC"); + - - $resultx1 = mysqli_query($con,"Select Count(*) as cnt from lab_report_submissions where lab_report_submissions.Lab_Report_ID=$id"); - while($row = mysqli_fetch_assoc($resultx1)) {$count_subs=$row['cnt'];} - - $resultx2 = mysqli_query($con,"Select COUNT(*) as cnt from lab_report_submissions where lab_report_submissions.Lab_Report_ID=$id and Marks is not null"); - if(mysqli_num_rows($resultx2)==0){$count_marked=0;} else { while($row = mysqli_fetch_assoc($resultx2)) {$count_marked =$row['cnt'];}} - - - $header="Courses > ".$name."($code) > Assignments > ".$title; - - echo "
+ if( $_SESSION['user_type']=="TA") + { + echo "Only Lecturer can post assignments.
"; + } + if(mysqli_num_rows($result)==0) + { + echo "No assignments posted so far."; + + } else { while($row = mysqli_fetch_assoc($result)) { + $marks=$row['Marks']; + $title=$row['Title']; + $ins=$row['Instructions']; + $posted=$row['Posted_Date']; + $deadline=$row['Deadline']; + $att1=$row['Attachment_link_1']; + $att2=$row['Attachment_link_2']; + $att3=$row['Attachment_link_3']; + $att4=$row['Attachment_link_4']; + $id=$row['Lab_Report_ID']; + $cours_id=$row['Course_ID']; + $as_type=$row['Type']; + $full_link="$att1"; + + if($att2!=""){ + $full_link= $full_link."  |  $att2"; + } + if($att3!=""){ + $full_link= $full_link."  |  $att3"; + } + + if($att4!=""){ + $full_link= $full_link."   |   $att4"; + } + + + + + $resultx1 = mysqli_query($con,"Select Count(*) as cnt from lab_report_submissions where lab_report_submissions.Lab_Report_ID=$id"); + while($row = mysqli_fetch_assoc($resultx1)) {$count_subs=$row['cnt'];} + + $resultx2 = mysqli_query($con,"Select COUNT(*) as cnt from lab_report_submissions where lab_report_submissions.Lab_Report_ID=$id and Marks is not null"); + if(mysqli_num_rows($resultx2)==0){$count_marked=0;} else { while($row = mysqli_fetch_assoc($resultx2)) {$count_marked =$row['cnt'];}} + + + $header="Courses > ".$name."($code) > Assignments > ".$title; + + echo "
$title ($marks Marks, $as_type)
$ins
Posted: $posted   Deadline: $deadline" - . "
" - . "    $count_subs Submissions ( $count_marked Marked )       Edit   |   View    |   Extend Deadline
Attachments : $full_link " - . "  
- "; - - - - }} - echo "
"; - - $resultx1 = mysqli_query($con,"SELECT course_students_table.Student_ID,users_table.Full_Name FROM + . "
" + . "    $count_subs Submissions ( $count_marked Marked )       Edit   |   View    |   Extend Deadline
Attachments : $full_link " + . "  
+ "; + + + + }} + echo "
"; + + $resultx1 = mysqli_query($con,"SELECT course_students_table.Student_ID,users_table.Full_Name FROM `course_students_table` INNER JOIN users_table on users_table.Student_ID=course_students_table.Student_ID WHERE Course_ID=$course_id"); - - - echo ""; - - return; - - } - - ?> - - - -
- - My courses
"; - - $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 ORDER BY Academic_Year DESC, URL ASC"); - if($_SESSION['user_type']=="TA") - { - $result = mysqli_query($con,"SELECT course_ta.Course_ID, `Course_Name`, + + echo ""; + + return; + + } + + ?> + + + +
+ + My courses
"; + + $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 ORDER BY Academic_Year DESC, URL ASC"); + + if($_SESSION['user_type']=="TA") + { + $result = mysqli_query($con,"SELECT course_ta.Course_ID, `Course_Name`, `Academic_Year`, `Faculty`, `Lecturer_User_ID`, `TA_User_ID`, `Course_Code`, `URL`, `Verify_New_Members` FROM `courses_table` INNER JOIN course_ta ON course_ta.Course_ID=courses_table.Course_ID where course_ta.TA=$user_d"); - } - - if(mysqli_num_rows($result)==0) - {} else { while($row = mysqli_fetch_assoc($result)) { - $id=$row['Course_ID']; - $name=$row['Course_Name']; - $code=$row['Course_Code']; - $faculty=$row['Faculty']; - $lecturer=$row['Full_Name']; - $academic=$row['Academic_Year']; - $url=$row['URL']; - - $resultTA = mysqli_query($con,"SELECT `Course_ID`, `TA`,users_table.Full_Name as TA_NAME FROM `course_ta` + } + + if(mysqli_num_rows($result)==0) + {} else { while($row = mysqli_fetch_assoc($result)) { + $id=$row['Course_ID']; + $name=$row['Course_Name']; + $code=$row['Course_Code']; + $faculty=$row['Faculty']; + $lecturer=$row['Full_Name']; + $academic=$row['Academic_Year']; + $url=$row['URL']; + + $resultTA = mysqli_query($con,"SELECT `Course_ID`, `TA`,users_table.Full_Name as TA_NAME FROM `course_ta` INNER JOIN users_table on users_table.User_ID=course_ta.TA where course_ta.Course_ID=$id"); - - $ta=""; - while($rowTA = mysqli_fetch_assoc($resultTA)) { - $ta=$ta." - ".$rowTA['TA_NAME']; - } - - - - echo" + + $ta=""; + while($rowTA = mysqli_fetch_assoc($resultTA)) { + $ta=$ta." - ".$rowTA['TA_NAME']; + } + + + + echo"
($code) - $name
Faculty : $faculty        Year : $academic        Lecturer :$lecturer        TA:$ta
- "; + "; + + }}?> +
+
+
+ Course joining requests - }}?> -
-
-
- Course joining requests - - No course-joining request so far for your courses
"; - } else { while($row = mysqli_fetch_assoc($result)) { - $id=$row['ID']; - - $name=$row['Course_Name']; - $code=$row['Course_Code']; - $faculty=$row['Faculty']; - $std_name=$row['Full_Name']; - $academic=$row['Academic_Year']; - - echo "
+ if(mysqli_num_rows($result)==0) + { + + echo "
No course-joining request so far for your courses
"; + } else { while($row = mysqli_fetch_assoc($result)) { + $id=$row['ID']; + + $name=$row['Course_Name']; + $code=$row['Course_Code']; + $faculty=$row['Faculty']; + $std_name=$row['Full_Name']; + $academic=$row['Academic_Year']; + + echo "
$std_name is Requesting to join
[($code) - $name ]     
Accept    Decline
"; - - } - } - ?> + + } + } + ?> - Only Lecturer can post assignments"; - } - if( $_SESSION['user_type']=="Lecturer"){ ?> - - Create a new course - -
- - - Course name - - - Course code - - - URL (leave blank to use course code & year) - - - Academic year - - - Faculty
- - - - - - - Verify joining students? - Yes - No - -

-
+ Only Lecturer can post assignments"; + } + if( $_SESSION['user_type']=="Lecturer"){ ?> -
+ Create a new course + +
+ + + Course name + + + Course code + + + URL (leave blank to use course code & year) + + + Academic year + + + Faculty
+ + + + + + + Verify joining students? + Yes + No + +

+
+ +
+ + - - -
- - - +
+ + + -
+
-
+
+ + + +
+ + + diff --git a/Footer.php b/Footer.php new file mode 100644 index 0000000..292966d --- /dev/null +++ b/Footer.php @@ -0,0 +1,3 @@ +Copyright © 2018-" . date("Y") . " The Authors

"; +?> diff --git a/Header.php b/Header.php index 129e94b..33e42ad 100644 --- a/Header.php +++ b/Header.php @@ -109,8 +109,6 @@ if (mysqli_connect_errno()) { position:fixed; bottom:0; left:0; - background-color:#03417C; - color:#FFF; text-align:center; width:100%; } @@ -206,4 +204,5 @@ if (mysqli_connect_errno()) { } window.location.href = "\Script.php\?action=statuschange&uid=" + id + "&status=" + status; } + diff --git a/Submissions.php b/Submissions.php index f686579..3e3647e 100644 --- a/Submissions.php +++ b/Submissions.php @@ -31,15 +31,16 @@ while ($row = mysqli_fetch_assoc($resultx1)) { $Report_Title = $row['Title']; $url = $row['URL']; } - -echo "
- $header -
- "; - ?> -
+
+ + $header
"; +?> + + +
$title
by: $submitted_by -
Submitted : $posted
Attachments : $full_link +
Submitted : $posted
Attachments : $full_link
"; } } @@ -412,6 +413,11 @@ where course_group_members_table.Course_Group_id=$id"); } ?> + + + +
+ @@ -462,3 +468,6 @@ where course_group_members_table.Course_Group_id=$id"); }) + + + diff --git a/SubmitLab.php b/SubmitLab.php index 167087c..2869253 100644 --- a/SubmitLab.php +++ b/SubmitLab.php @@ -7,7 +7,9 @@ $page='Submit LAB+'; include 'Header.php'; ?> -
+
+ +
$att4"; } - echo "
- Courses > $url > Submlit Lab Report > $title -
-
- "; + echo ""; - echo ""; } } } @@ -87,7 +84,7 @@ include 'Header.php';
-
+

Submit assignment

@@ -128,3 +125,5 @@ include 'Header.php';
+ +
diff --git a/index.php b/index.php index da2bd49..16d97f6 100644 --- a/index.php +++ b/index.php @@ -71,9 +71,8 @@ if (isset($_SESSION["user_fullname"])) {
- diff --git a/recover_password.php b/recover_password.php index 2e6b465..a95ee9d 100644 --- a/recover_password.php +++ b/recover_password.php @@ -30,3 +30,5 @@ include 'Header.php'; ?>
+ + diff --git a/signup.php b/signup.php index 2df46e8..99c01b2 100644 --- a/signup.php +++ b/signup.php @@ -42,3 +42,5 @@ include 'Header.php';
+ +