From 6af2d7791286d2f6934a24ea2c5b5283d92934d5 Mon Sep 17 00:00:00 2001 From: Lan Hui <lanhui@zjnu.edu.cn> Date: Tue, 8 Aug 2023 15:02:26 +0800 Subject: [PATCH] Add non-sticky footer. --- Admin.php | 8 + Course.php | 15 + Courses.php | 782 ++++++++++++++++++++++--------------------- Footer.php | 3 + Header.php | 3 +- Submissions.php | 25 +- SubmitLab.php | 15 +- index.php | 3 +- recover_password.php | 2 + signup.php | 2 + 10 files changed, 450 insertions(+), 408 deletions(-) create mode 100644 Footer.php 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") { </div> </div> + + <?php include 'Footer.php';?> + </div> <script> @@ -250,3 +253,8 @@ if ($_SESSION['user_type'] != "Lecturer" && $_SESSION['user_type'] != "Admin") { }) </script> + + +</body> +</html> + 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'; <?php $page='Courses+'; include 'Header.php'; +?> + +<div class="container"> + +<?php $student_id = $_SESSION["user_student_id"]; $group_id = $_SESSION["user_group_id"]; $c_date = date("Y-m-d H:i"); @@ -545,6 +550,12 @@ where course_group_members_table.Course_Group_id=$id"); } ?> +<?php include 'Footer.php';?> + +</div> + + + <script src="./css/jquery-1.11.1.min.js"></script> <script src="./css/jquery-ui.min.js"></script> <link rel="stylesheet" href="./css/jquery-ui.css" /> @@ -701,3 +712,7 @@ where course_group_members_table.Course_Group_id=$id"); }) </script> + + +</body> +</html> 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'; <?php - - $page='Courses'; include 'Header.php'; +?> +<div class="container"> + +<?php $user_d = $_SESSION['user_id']; - if( $_SESSION['user_type']=="Lecturer" || $_SESSION['user_type']=="TA") { ?> + <!-- FOR LECTURER--> - <!-- FOR LECTURER--> - - - <div class="row" style="width:80%;margin:auto; text-align:left;"> - <script src="./css/jquery-1.11.1.min.js"></script> - <script src="./css/jquery-ui.min.js"></script> - <link rel="stylesheet" href="./css/jquery-ui.css" /> - <script> - function extendDeadline(id) { - const dropstudents = $("#dropstudents").html(); - try { - $(`<form id="frm" method="get" action="Script.php"> + <div class="row"> + <script src="./css/jquery-1.11.1.min.js"></script> + <script src="./css/jquery-ui.min.js"></script> + <link rel="stylesheet" href="./css/jquery-ui.css" /> + <script> + function extendDeadline(id) { + const dropstudents = $("#dropstudents").html(); + try { + $(`<form id="frm" method="get" action="Script.php"> <input type="hidden" name="extenddeadline" value="true" > <input type="hidden" name="id" value="${id}" > New date and time<br> @@ -53,435 +52,435 @@ if( $_SESSION['user_type']=="Lecturer" || $_SESSION['user_type']=="TA") } } }); - } catch(e) { - alert(e); + } catch(e) { + alert(e); + } } - } - </script> - - - <?php - if(!empty($_GET["course"])) - { - $course_url = mysqli_real_escape_string($con, $_GET["course"]); - $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 URL='$course_url' "); + </script> - 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 " + + <?php + if(!empty($_GET["course"])) + { + $course_url = mysqli_real_escape_string($con, $_GET["course"]); + $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 URL='$course_url' "); + + 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 " <div class='alert> <a href='~\..\Courses.php?course=$url'> <div class='panel'> ($code) - $name <br> <span style='font-size:8pt'>Faculty:$faculty Year: $academic Lecturer: $lecturer </span> </div></a> <hr></div></div> <div class='row' style='width:80%;margin:auto; text-align:left;'> - "; - - echo "<div class='col-md-5'>"; - } - - // ------------------------------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 . "<br>" . $con->error; - echo "Serious error happened whiling updating assignment information."; + echo "<div class='col-md-5'>"; + } + + // ------------------------------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 " <h3><a href='Courses.php?course=".$url."'>Editing assignment information</a></h3>"; - ?> - <form method='post' enctype='multipart/form-data' action=''> - <input type='hidden' name='frm_uploadlab' value='true' required=''/> - <input type='hidden' name='course_id' value='<?php echo "$id" ?>' required=''/> - <input type='hidden' name='url' value='<?php echo ".$course_url." ?>' required=''/> + 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 . "<br>" . $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 " <h3><a href='Courses.php?course=".$url."'>Editing assignment information</a></h3>"; + ?> + <form method='post' enctype='multipart/form-data' action=''> + <input type='hidden' name='frm_uploadlab' value='true' required=''/> + <input type='hidden' name='course_id' value='<?php echo "$id" ?>' required=''/> + <input type='hidden' name='url' value='<?php echo ".$course_url." ?>' required=''/> + + Deadline Date/Time + <div class='row'> + <div class='col-md-7'><input type='date' id='date' name='deadlinedate' placeholder='' class='form-control' required='' value="<?php echo isset($_GET['act']) && $_GET['act']=="edit" ? $Date : ""; ?>"> </div> + <div class='col-md-5'> <input type='text' id='time' class='form-control' name='deadlinetime' value="<?php echo isset($_GET['act']) && $_GET['act']=="edit" ? $Time : ""; ?>"> </div> + </div> + + Title + <input type='text' name='title' placeholder='Title' class='form-control' required='' value="<?php echo isset($_GET['act']) && $_GET['act']=="edit" ? $Title : ""; ?>"> + Instructions + <textarea name='instructions' placeholder='Assignment Instructions' class='form-control' required='' ><?php echo isset($_GET['act']) && $_GET['act']=='edit' ? $Instructions : ''; ?></textarea> + Marks + <input type='text' name='marks' placeholder='Marks' class='form-control' required='' value="<?php echo isset($_GET['act']) && $_GET['act']=="edit" ? $Marks : ""; ?>"> + Attachment 1 + <input type='file' name='attachment1' placeholder='Attachment 1' class='form-control'> + + Attachment 2 + <input type='file' name='attachment2' placeholder='Attachment 1' class='form-control'> + + Attachment 3 + <input type='file' name='attachment3' placeholder='Attachment 1' class='form-control' > + + + Attachment 4 + <input type='file' name='attachment4' placeholder='Attachment 4' class='form-control' > + <br> + + <?php + if ($Type == "Individual") { + echo "Submission Type <input type='radio' name='type' value='Individual' checked /> Individual <input type='radio' name='type' value='Group' /> Group"; + } else { + echo "Submission Type <input type='radio' name='type' value='Individual' /> Individual <input type='radio' name='type' value='Group' checked> Group"; + } + ?> + + + <hr> + <input type='submit' class='btn btn-primary' value='Post Lab Assignment'><br> + </form><br><br><br><br> + <?php + }}else{ + + // ------------------------------Posting New Lab Assignment------------------------------------ + + // Mysql to split 1 string into 2 similar to the tsrstr in php + // SELECT SUBSTRING_INDEX(Deadline, ' ', 1) as Date, SUBSTRING_INDEX(Deadline, ' ', -1) as Time from lab_reports_table + + if( $_SESSION['user_type']=="Lecturer"){ + + ?> - Deadline Date/Time - <div class='row'> - <div class='col-md-7'><input type='date' id='date' name='deadlinedate' placeholder='' class='form-control' required='' value="<?php echo isset($_GET['act']) && $_GET['act']=="edit" ? $Date : ""; ?>"> </div> - <div class='col-md-5'> <input type='text' id='time' class='form-control' name='deadlinetime' value="<?php echo isset($_GET['act']) && $_GET['act']=="edit" ? $Time : ""; ?>"> </div> - </div> + <h3>New an assignment</h3> + + <form method='post' enctype='multipart/form-data' action='Script.php'> + <?php + $_SESSION['url']=$url; + ?> + <input type='hidden' name='frm_uploadlab' value='true' required=''/> + <input type='hidden' name='course_id' value='<?php echo "$id" ?>' required=''/> + <input type='hidden' name='url' value='<?php echo ".$course_url." ?>' required=''/> + + Deadline (date and time) + <div class='row'> + <div class='col-md-7'><input type='date' id='date' name='deadlinedate' placeholder='' class='form-control' required='' value=""> </div> + <div class='col-md-5'> <input type='time' class='form-control' name='deadlinetime' value=""> </div> + </div> - Title - <input type='text' name='title' placeholder='Title' class='form-control' required='' value="<?php echo isset($_GET['act']) && $_GET['act']=="edit" ? $Title : ""; ?>"> - Instructions - <textarea name='instructions' placeholder='Assignment Instructions' class='form-control' required='' ><?php echo isset($_GET['act']) && $_GET['act']=='edit' ? $Instructions : ''; ?></textarea> - Marks - <input type='text' name='marks' placeholder='Marks' class='form-control' required='' value="<?php echo isset($_GET['act']) && $_GET['act']=="edit" ? $Marks : ""; ?>"> - Attachment 1 - <input type='file' name='attachment1' placeholder='Attachment 1' class='form-control'> + Title + <input type='text' name='title' placeholder='Title' class='form-control' required='' value=""> + Instruction + <textarea name='instructions' placeholder='Assignment Instructions' class='form-control' required='' value=""></textarea> + Mark + <input type='text' name='marks' placeholder='Marks' class='form-control' required='' value=""> + Attachment 1 + <input type='file' name='attachment1' placeholder='Attachment 1' class='form-control'> - Attachment 2 - <input type='file' name='attachment2' placeholder='Attachment 1' class='form-control'> + Attachment 2 + <input type='file' name='attachment2' placeholder='Attachment 1' class='form-control'> - Attachment 3 - <input type='file' name='attachment3' placeholder='Attachment 1' class='form-control' > + Attachment 3 + <input type='file' name='attachment3' placeholder='Attachment 1' class='form-control' > - Attachment 4 - <input type='file' name='attachment4' placeholder='Attachment 4' class='form-control' > - <br> + Attachment 4 + <input type='file' name='attachment4' placeholder='Attachment 4' class='form-control' > + <br> + Submission type: <input type='radio' name='type' value='Individual' required=''> Individual - <?php - if ($Type == "Individual") { - echo "Submission Type <input type='radio' name='type' value='Individual' checked /> Individual <input type='radio' name='type' value='Group' /> Group"; - } else { - echo "Submission Type <input type='radio' name='type' value='Individual' /> Individual <input type='radio' name='type' value='Group' checked> Group"; - } - ?> - - - <hr> - <input type='submit' class='btn btn-primary' value='Post Lab Assignment'><br> - </form><br><br><br><br> - <?php - }}else{ - - // ------------------------------Posting New Lab Assignment------------------------------------ - - // Mysql to split 1 string into 2 similar to the tsrstr in php - // SELECT SUBSTRING_INDEX(Deadline, ' ', 1) as Date, SUBSTRING_INDEX(Deadline, ' ', -1) as Time from lab_reports_table - - if( $_SESSION['user_type']=="Lecturer"){ - - ?> - - <h3>New an assignment</h3> - - <form method='post' enctype='multipart/form-data' action='Script.php'> - <?php - $_SESSION['url']=$url; - ?> - <input type='hidden' name='frm_uploadlab' value='true' required=''/> - <input type='hidden' name='course_id' value='<?php echo "$id" ?>' required=''/> - <input type='hidden' name='url' value='<?php echo ".$course_url." ?>' required=''/> - - Deadline (date and time) - <div class='row'> - <div class='col-md-7'><input type='date' id='date' name='deadlinedate' placeholder='' class='form-control' required='' value=""> </div> - <div class='col-md-5'> <input type='time' class='form-control' name='deadlinetime' value=""> </div> - </div> - - Title - <input type='text' name='title' placeholder='Title' class='form-control' required='' value=""> - Instruction - <textarea name='instructions' placeholder='Assignment Instructions' class='form-control' required='' value=""></textarea> - Mark - <input type='text' name='marks' placeholder='Marks' class='form-control' required='' value=""> - Attachment 1 - <input type='file' name='attachment1' placeholder='Attachment 1' class='form-control'> - - Attachment 2 - <input type='file' name='attachment2' placeholder='Attachment 1' class='form-control'> - - Attachment 3 - <input type='file' name='attachment3' placeholder='Attachment 1' class='form-control' > - - - Attachment 4 - <input type='file' name='attachment4' placeholder='Attachment 4' class='form-control' > - <br> - Submission type: <input type='radio' name='type' value='Individual' required=''> Individual - - <input type='radio' name='type' value='Group' required=''> Group - <hr> - <input type='submit' class='btn btn-primary' value='Post'><br> - </form><br><br><br><br> - <?php - } - } - - } - echo "</div>"; - - echo "<div class='col-md-7'><h3>Assignment list</h3>"; - - error_reporting(0); - if(isset($_SESSION["info_Updated"])){ - echo '<hr><div class="alert alert-info" role="alert">' . $_SESSION['info_Updated'] . '</div>'; - $_SESSION['info_Updated'] = null; - } - if (isset($_SESSION['info_courses'])) { - echo '<hr><div class="alert alert-info" role="alert">' . $_SESSION['info_courses'] . '</div>'; - $_SESSION['info_courses'] = null; - } - if (isset($_SESSION['info_courses'])) { - echo '<hr><div class="alert alert-info" role="alert">' . $_SESSION['info_courses'] . '</div>'; - $_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 "<b style='color:gray'>Only Lecturer can post assignments.</b><br>"; - } - if(mysqli_num_rows($result)==0) - { - echo "No assignments posted so far."; + <input type='radio' name='type' value='Group' required=''> Group + <hr> + <input type='submit' class='btn btn-primary' value='Post'><br> + </form><br><br><br><br> + <?php + } + } - } 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="<a href='~\..\Lab_Report_Assignments\\$att1'>$att1</a>"; + } + echo "</div>"; + + echo "<div class='col-md-7'><h3>Assignment list</h3>"; - if($att2!=""){ - $full_link= $full_link."  |  <a href='~\..\Lab_Report_Assignments\\$att2'>$att2</a>"; + error_reporting(0); + if(isset($_SESSION["info_Updated"])){ + echo '<hr><div class="alert alert-info" role="alert">' . $_SESSION['info_Updated'] . '</div>'; + $_SESSION['info_Updated'] = null; } - if($att3!=""){ - $full_link= $full_link."  |  <a href='~\..\Lab_Report_Assignments\\$att3'>$att3</a>"; + if (isset($_SESSION['info_courses'])) { + echo '<hr><div class="alert alert-info" role="alert">' . $_SESSION['info_courses'] . '</div>'; + $_SESSION['info_courses'] = null; } - - if($att4!=""){ - $full_link= $full_link." |   <a href='~\..\Lab_Report_Assignments\\$att4'>$att4</a>"; + if (isset($_SESSION['info_courses'])) { + echo '<hr><div class="alert alert-info" role="alert">' . $_SESSION['info_courses'] . '</div>'; + $_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 " <div class='break-word btn btn-default' style='word-wrap: break-word;border-color:grey;'> + if( $_SESSION['user_type']=="TA") + { + echo "<b style='color:gray'>Only Lecturer can post assignments.</b><br>"; + } + 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="<a href='~\..\Lab_Report_Assignments\\$att1'>$att1</a>"; + + if($att2!=""){ + $full_link= $full_link."  |  <a href='~\..\Lab_Report_Assignments\\$att2'>$att2</a>"; + } + if($att3!=""){ + $full_link= $full_link."  |  <a href='~\..\Lab_Report_Assignments\\$att3'>$att3</a>"; + } + + if($att4!=""){ + $full_link= $full_link." |   <a href='~\..\Lab_Report_Assignments\\$att4'>$att4</a>"; + } + + + + + $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 " <div class='break-word btn btn-default' style='word-wrap: break-word;border-color:grey;'> $title ($marks Marks, $as_type) <br> $ins <br> <span style='font-size:8pt'>Posted: $posted Deadline: $deadline" - . "<br>" - . "<span class='btn-default'> $count_subs Submissions ( $count_marked Marked ) <a href='Courses.php?course=".$url."&act=edit&cid=".$id."'>Edit</a> | <a href='~\..\Submissions.php?id=$id&header=$header&total=$marks' onclick=''> View </a> | <a href='#' onclick='extendDeadline($id)'> Extend Deadline </a> </span> <hr> Attachments : $full_link </span>" - . " </div> - "; - - - - }} - echo "</div>"; - - $resultx1 = mysqli_query($con,"SELECT course_students_table.Student_ID,users_table.Full_Name FROM + . "<br>" + . "<span class='btn-default'> $count_subs Submissions ( $count_marked Marked ) <a href='Courses.php?course=".$url."&act=edit&cid=".$id."'>Edit</a> | <a href='~\..\Submissions.php?id=$id&header=$header&total=$marks' onclick=''> View </a> | <a href='#' onclick='extendDeadline($id)'> Extend Deadline </a> </span> <hr> Attachments : $full_link </span>" + . " </div> + "; + + + + }} + echo "</div>"; + + $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 "<span id='dropstudents' style='display:none;'> <select name='stdid'>"; - while($row = mysqli_fetch_assoc($resultx1)) - { - $stdid=$row['Student_ID']; - $stdname=$row['Full_Name']; - - echo "<option value='$stdid'> $stdname($stdid) </option> "; - } - echo "</select><br>Reason <input type='text' name='reason'>" - . "<input type='hidden' name='url' value='$course_url'>" - . " </span>"; - - return; - - } - - ?> - - - - <div class="col-md-8"> - - <?php - $user_name=$_SESSION['user_fullname']; - - echo "<div><b>My courses</b></div>"; - - $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 "<span id='dropstudents' style='display:none;'> <select name='stdid'>"; + while($row = mysqli_fetch_assoc($resultx1)) + { + $stdid=$row['Student_ID']; + $stdname=$row['Full_Name']; + + echo "<option value='$stdid'> $stdname($stdid) </option> "; + } + echo "</select><br>Reason <input type='text' name='reason'>" + . "<input type='hidden' name='url' value='$course_url'>" + . " </span>"; + + return; + + } + + ?> + + + + <div class="col-md-8"> + + <?php + $user_name=$_SESSION['user_fullname']; + + echo "<div><b>My courses</b></div>"; + + $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" <a href='~\..\Courses.php?course=$url'> <div class='btn btn-default'> ($code) - $name <br> <span style='font-size:8pt'>Faculty : $faculty Year : $academic Lecturer :$lecturer TA:$ta </span> </div></a> - "; + "; + + }}?> + </div> + <div class="col-md-4"> + <br> + <b> Course joining requests </b> - }}?> - </div> - <div class="col-md-4"> - <br> - <b> Course joining requests </b> - - <?php - $lecturer_id= $_SESSION['user_id']; - $result = mysqli_query($con,"SELECT course_students_table.ID,users_table.Full_Name, courses_table.Course_ID, `Course_Name`, `Academic_Year`, `Faculty`, `Lecturer_User_ID`, `TA_User_ID`, `Course_Code`, `URL`, `Verify_New_Members` FROM `courses_table` + <?php + $lecturer_id= $_SESSION['user_id']; + $result = mysqli_query($con,"SELECT course_students_table.ID,users_table.Full_Name, 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 course_students_table on course_students_table.Course_ID=courses_table.Course_ID INNER JOIN users_table on users_table.Student_ID=course_students_table.Student_ID WHERE Lecturer_User_ID=$lecturer_id and course_students_table.Status='Pending'"); - - if(mysqli_num_rows($result)==0) - { - echo "<br> <i class='fa fa-info-circle'></i>No course-joining request so far for your courses<hr>"; - } 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 "<div class='btn btn-default'> + if(mysqli_num_rows($result)==0) + { + + echo "<br> <i class='fa fa-info-circle'></i>No course-joining request so far for your courses<hr>"; + } 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 "<div class='btn btn-default'> $std_name is Requesting to join <br> [($code) - $name ] <br><a href='~\..\Script.php?AcceptStudent=y&id=$id&rs=yes' class='btn btn-sm btn-success' onclick=return confirm(\"are you sure to join this course?\")' > Accept </a> <a href='~\..\Script.php?AcceptStudent=y&id=$id&rs=no' class='btn btn-sm btn-danger' onclick=return confirm(\"are you sure to join this course?\")' > Decline </a> </div>"; - - } - } - ?> + + } + } + ?> - <?php - if( $_SESSION['user_type']=="TA") - { - echo "<center>Only Lecturer can post assignments</center>"; - } - if( $_SESSION['user_type']=="Lecturer"){ ?> - - <b>Create a new course</b> - - <form method="post" action="Script.php"> - <input type="hidden" name="frm_createCourse" value="true" required=""/> - <input type="hidden" name="l" value="l" required=""/> - Course name - <input type="text" name="name" placeholder="Course Name" class="form-control" required=""> - - Course code - <input type="text" name="code" placeholder="Course Code" class="form-control" required=""> - - URL (leave blank to use course code & year) - <input type="text" name="url" placeholder="Choose Custom URL " class="form-control"> - - Academic year - <input type="text" name="academic" placeholder="Academic Year" class="form-control" required=""> - - Faculty <br> - <input type="text" name="faculty" placeholder="Faculty" class="form-control" required=""> - - - <input type="hidden" name="lecturer" value="<?php echo $_SESSION['user_id']; ?>"> - - - Verify joining students? - <input type="radio" name="verify" value="1"> Yes - <input type="radio" name="verify" value="0" checked=""> No - - <br><br> - <input type="submit" class="btn btn-primary" value="Create"><br> + <?php + if( $_SESSION['user_type']=="TA") + { + echo "<center>Only Lecturer can post assignments</center>"; + } + if( $_SESSION['user_type']=="Lecturer"){ ?> - </form> + <b>Create a new course</b> + + <form method="post" action="Script.php"> + <input type="hidden" name="frm_createCourse" value="true" required=""/> + <input type="hidden" name="l" value="l" required=""/> + Course name + <input type="text" name="name" placeholder="Course Name" class="form-control" required=""> + + Course code + <input type="text" name="code" placeholder="Course Code" class="form-control" required=""> + + URL (leave blank to use course code & year) + <input type="text" name="url" placeholder="Choose Custom URL " class="form-control"> + + Academic year + <input type="text" name="academic" placeholder="Academic Year" class="form-control" required=""> + + Faculty <br> + <input type="text" name="faculty" placeholder="Faculty" class="form-control" required=""> + + + <input type="hidden" name="lecturer" value="<?php echo $_SESSION['user_id']; ?>"> + + + Verify joining students? + <input type="radio" name="verify" value="1"> Yes + <input type="radio" name="verify" value="0" checked=""> No + + <br><br> + <input type="submit" class="btn btn-primary" value="Create"><br> + + </form> + + <?php } ?> - <?php } ?> - - </div> - - - <!-- END LECTURER --> + </div> + + + <!-- END LECTURER --> <?php } @@ -492,7 +491,7 @@ if( $_SESSION['user_type']=="Student") ?> <!--STUDENT CODE--> - <div class="row" style="width:80%;margin:auto; text-align:left;"> + <div class="row"> <div class="col-md-6"> <?php @@ -509,7 +508,7 @@ if( $_SESSION['user_type']=="Student") </div> - <div class="row" style="width:80%;margin:auto; text-align:left;"> + <div class="row"> <div class="col-md-6"> <?php @@ -652,3 +651,10 @@ INNER JOIN course_students_table on course_students_table.Course_ID=courses_tabl } ?> + + <?php include 'Footer.php';?> + + </div> + +</body> +</html> diff --git a/Footer.php b/Footer.php new file mode 100644 index 0000000..292966d --- /dev/null +++ b/Footer.php @@ -0,0 +1,3 @@ +<?php +echo "<p id='myfooter' class='text-center'>Copyright © 2018-" . date("Y") . " The Authors</p>"; +?> 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; } + </script> 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 "<div class='alert' style='margin-left:20px;border-bottom:2px solid #1D91EF;'> <a href='Courses.php?course=$url'> - $header -</a></div> - "; - ?> -<div class="row" style="width:80%;margin:auto; text-align:left;"> +<div class="container"> + +<?php +echo "<div><a href='Courses.php?course=$url'> $header </a></div>"; +?> + + +<div class="row"> <!-- Lecturer CODE--> <?php @@ -184,7 +185,7 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Pending' order by Sub echo "<div class='btn btn-default break-word' style='dislay:block; word-wrap: break-word; border: 1px solid #F0F0F0;border-left: 4px solid #03407B;'> $title <br> by: <b> <span class = 'text-selectable'>$submitted_by </span> </b> - <br> <span style='font-size:8pt'>Submitted : $posted <button class='btn btn-sm btn-info' style='margin-left:50px;' onclick='mark($Submission_ID,\"$title\",$total)'> Mark</button><br> Attachments : $full_link </span> + <br> <span style='font-size:8pt'>Submitted : $posted <button class='btn btn-sm btn-primary' style='margin-left:50px;' onclick='mark($Submission_ID,\"$title\",$total)'> Mark</button><br> Attachments : $full_link </span> </div>"; } } @@ -412,6 +413,11 @@ where course_group_members_table.Course_Group_id=$id"); } ?> +<?php include 'Footer.php';?> + + +</div> + <script src="./css/jquery-1.11.1.min.js"></script> <script src="./css/jquery-ui.min.js"></script> <link rel="stylesheet" href="./css/jquery-ui.css" /> @@ -462,3 +468,6 @@ where course_group_members_table.Course_Group_id=$id"); }) </script> + +</body> +</html> 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'; ?> -<div class='row' style='width:80%;margin:auto;'> +<div class="container"> + +<div class='row'> <?php @@ -69,13 +71,8 @@ include 'Header.php'; $full_link = $full_link."| <a href='~\..\Lab_Report_Assignments\\$att4'>$att4</a>"; } - echo " <div class='alert' style='margin-left:20px;border-bottom:2px solid #1D91EF;'> <a href='~\..\Courses.php?course=$url'> - Courses > $url > Submlit Lab Report > $title - <br> -</a></div> - "; + echo "<div><a href='~\..\Courses.php?course=$url'> Courses > $url > Submit > $title </a></div>"; - echo ""; } } } @@ -87,7 +84,7 @@ include 'Header.php'; </div> -<div style="width:80%;margin:auto;"> +<div> <h3>Submit assignment</h3> <hr> @@ -128,3 +125,5 @@ include 'Header.php'; </div> </div> + +</div> 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"])) { </div> <div id="footer"> - LRR was originally developed as a <a href="http://lanlab.org/course/2018f/se/homepage.html" style="color:white;">software engineering course project</a> by Mohamed Nor and Elmahdi Houzi. Please submit your suggestions or bug reports to Mr Lan. <a href="./homepage" style="color:white;">More information ...</a> + LRR was originally developed in 2018 as a <a href="http://lanlab.org/course/2018f/se/homepage.html">software engineering course project</a> by Mohamed Nor and Elmahdi Houzi. Please submit your suggestions or bug reports to Mr Lan. <a href="./homepage">More information ...</a> </div> </body> - </html> 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'; ?> </div> + +<?php include 'Footer.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'; </div> </div> </div> + +<?php include 'Footer.php';?>