Incorporate changes made by Zheng Xiaoyu. This is mainly a bug fix for bug 57: http://118.25.96.118/bugzilla/show_bug.cgi?id=57

SIMPLICITY_link
Hui Lan 2021-04-17 15:31:41 +08:00
commit a0025dc7b5
3 changed files with 70 additions and 53 deletions

View File

@ -28,6 +28,7 @@ if (mysqli_connect_errno()) {
<script src="./css/bootsrap.min.js" type="text/javascript"></script> <script src="./css/bootsrap.min.js" type="text/javascript"></script>
<script src="./css/jquery.datetimepicker.min.js" type="text/javascript"></script> <script src="./css/jquery.datetimepicker.min.js" type="text/javascript"></script>
</header> </header>

View File

@ -9,6 +9,7 @@
*/ */
session_start(); session_start();
date_default_timezone_set('Asia/Shanghai'); date_default_timezone_set('Asia/Shanghai');
// Connect to MySQL database // Connect to MySQL database
@ -862,58 +863,66 @@ if (!empty($_GET["creategroup"])) {
if (!empty($_GET["groupinvite"])) { if (!empty($_GET["groupinvite"])) {
$student_id=$_GET["student_id"]; $student_id=$_GET["student_id"];
$url=$_GET["url"]; $url=$_GET["url"];
$courseid=$_GET["courseid"]; $courseid=$_GET["courseid"];
$groupid=$_GET["groupid"]; $groupid=$_GET["groupid"];
// if(($_SESSION['Group_Member4']=='0') or ($_SESSION['Group_Member3']=='0') or ($_SESSION['Group_Member2']=='0') or ($_SESSION['Group_Member']=='0')){ $result = mysqli_query($con,"SELECT * FROM course_group_members_table where Course_Group_id = '$groupid' and Student_ID = '$student_id'");
$sql="INSERT INTO `course_group_members_table`( `Course_Group_id`, `Student_ID`, `Status`) if(mysqli_num_rows($result)>0){
VALUES ($groupid,$student_id,'Invited')"; $_SESSION["info_ReMarking"]=$student_id . " has already been invited";
header("Location: Course.php?url=".$url);
}else{
$sql="INSERT INTO `course_group_members_table`( `Course_Group_id`, `Student_ID`, `Status`)
VALUES ($groupid,$student_id,'Invited')";
}
if ($con->query($sql) === TRUE) { if ($con->query($sql) === TRUE) {
$resultx1 = mysqli_query($con,"SELECT * FROM course_groups_table where Course_Group_id ='$groupid'"); $resultx1 = mysqli_query($con,"SELECT * FROM course_groups_table where Course_Group_id ='$groupid'");
while($row = mysqli_fetch_assoc($resultx1)) while($row = mysqli_fetch_assoc($resultx1))
{ {
$Group_Member=$row['Group_Member']; $Group_Member=$row['Group_Member'];
$Group_Member4=$row['Group_Member4']; $Group_Member4=$row['Group_Member4'];
$Group_Member2=$row['Group_Member2']; $Group_Member2=$row['Group_Member2'];
$Group_Member3=$row['Group_Member3']; $Group_Member3=$row['Group_Member3'];
$_SESSION['Group_Member4']=$Group_Member4; $_SESSION['Group_Member4']=$Group_Member4;
$_SESSION['Group_Member3']=$Group_Member3; $_SESSION['Group_Member3']=$Group_Member3;
$_SESSION['Group_Member2']=$Group_Member2; $_SESSION['Group_Member2']=$Group_Member2;
$_SESSION['Group_Member']=$Group_Member; $_SESSION['Group_Member']=$Group_Member;
if($Group_Member=='0'){ if($Group_Member=='0'){
mysqli_query($con,"UPDATE `course_groups_table` SET `Group_Member` = ('" . $student_id . "') WHERE `course_groups_table`.`Course_Group_id` = '$groupid'"); mysqli_query($con,"UPDATE `course_groups_table` SET `Group_Member` = ('" . $student_id . "') WHERE `course_groups_table`.`Course_Group_id` = '$groupid'");
$_SESSION["info_ReMarking"]=$student_id . " was invited to the group"; $_SESSION["info_ReMarking"]=$student_id . " was invited to the group";
header("Location: Course.php?url=".$url); header("Location: Course.php?url=".$url);
}elseif($Group_Member2=='0'){ }elseif($Group_Member2=='0'){
mysqli_query($con,"UPDATE `course_groups_table` SET `Group_Member2` = ('" . $student_id . "') WHERE `course_groups_table`.`Course_Group_id` = '$groupid'"); mysqli_query($con,"UPDATE `course_groups_table` SET `Group_Member2` = ('" . $student_id . "') WHERE `course_groups_table`.`Course_Group_id` = '$groupid'");
$_SESSION["info_ReMarking"]=$student_id . " was invited to the group"; $_SESSION["info_ReMarking"]=$student_id . " was invited to the group";
header("Location: Course.php?url=".$url); header("Location: Course.php?url=".$url);
}elseif($Group_Member3=='0'){ }elseif($Group_Member3=='0'){
mysqli_query($con,"UPDATE `course_groups_table` SET `Group_Member3` = ('" . $student_id . "') WHERE `course_groups_table`.`Course_Group_id` = '$groupid'"); mysqli_query($con,"UPDATE `course_groups_table` SET `Group_Member3` = ('" . $student_id . "') WHERE `course_groups_table`.`Course_Group_id` = '$groupid'");
$_SESSION["info_ReMarking"]=$student_id . " was invited to the group"; $_SESSION["info_ReMarking"]=$student_id . " was invited to the group";
header("Location: Course.php?url=".$url); header("Location: Course.php?url=".$url);
}elseif($Group_Member4=='0'){ }elseif($Group_Member4=='0'){
mysqli_query($con,"UPDATE `course_groups_table` SET `Group_Member4` = ('" . $student_id . "') WHERE `course_groups_table`.`Course_Group_id` = '$groupid'"); mysqli_query($con,"UPDATE `course_groups_table` SET `Group_Member4` = ('" . $student_id . "') WHERE `course_groups_table`.`Course_Group_id` = '$groupid'");
$_SESSION["info_ReMarking"]=$student_id . " was invited to the group"; $_SESSION["info_ReMarking"]=$student_id . " was invited to the group";
header("Location: Course.php?url=".$url); header("Location: Course.php?url=".$url);
} else { } else {
$_SESSION["info_ReMarking"]= " You cant add any more members"; $_SESSION["info_ReMarking"]= " You cant add any more members";
header("Location: Course.php?url=".$url); header("Location: Course.php?url=".$url);
}
} }
} $_SESSION["info_ReMarking"]=$student_id . " was invited to the group";
header("Location: Course.php?url=".$url);
} else {
echo "Error: " . $sql . "<br>" . $con->error;
} }
} }
#Accept deny Group Invite #Accept deny Group Invite
if (!empty($_GET["acceptinvite"])) { if (!empty($_GET["acceptinvite"])) {

View File

@ -48,7 +48,7 @@
</ul> </ul>
<h3>About us</h3> <h3>Contact</h3>
<ul> <ul>
<li><a href="contact.html">Contact us</a></li> <li><a href="contact.html">Contact us</a></li>
@ -67,13 +67,14 @@
<div class="tabsLeft"> <div class="tabsLeft">
<ul> <ul>
<ul> <ul>
<li class="menubox"><a href="index.html" class="menubox" >Home</a></li> <li class="menubox"><a href="index.html" class="menubox">Home</a></li>
<li ><a href="overview.html" class="active">Overview</a></li> <li><a href="overview.html" class="active">Overview</a></li>
<li ><a href="features.html" class="menubox">Features</a></li> <li><a href="features.html" class="menubox">Features</a></li>
<li><a href="screenshots.html" class="menubox">Screenshots</a></li> <li><a href="screenshots.html" class="menubox">Screenshots</a></li>
<li><a href="sourcecode.html" class="menubox">Source Code</a></li> <li><a href="sourcecode.html" class="menubox">Source Code</a></li>
<li><a href="issues.html" class="menubox">Issues</a></li> <li><a href="issues.html" class="menubox">Issues</a></li>
<li ><a href="contact.html" class="menubox">Contact us</a></li> <li><a href="contact.html" class="menubox">Contact us</a></li>
</ul> </ul>
</ul> </ul>
@ -85,24 +86,24 @@
<h2>Overview</h2> <h2>Overview</h2>
LRRS is an open-source lab report management software for college students. LRRS is an open source lab report management software for college students.
<br> <br>
The lab report repository system is developing for general purpose and used to replace old The lab report repository system was developed for general purposes and used to replace old
paperwork and email based systems . This system increases the efficiency of lab report paperwork and email-based systems . This system increases the efficiency of lab report
submission and result reporting for both lecturers and students. submission and result reporting for both lecturers and students.
<br><br> <br><br>
The Project was developed at ZJNU by Mohamed nor and El-mahdi houzi. The project was developed at ZJNU by Mohamed nor and El-mahdi houzi.
The project was tested by some undergraduates classes at ZJNU. The project was tested by some undergraduate students at the Zhejiang Normal University.
<br> The system is developed using client/server architecture and its compatible with both Linux and Microsoft Windows Operating Systems. The system was developed using PHP Scripting language and MySQL as database management system. <br> The system is developed using client/server architecture and its compatible with both Linux and Microsoft Windows Operating Systems. The system was developed using PHP Scripting language and MySQL as database management system.
<br> The LRRS project have seen incredible improvements since it's development earlier 2019. <br> The LRRS project has seen incredible improvements since it's development earlier 2019.
The software includes a lot of features that simplify assignment submission and grading. The software includes a lot of features that simplify assignment submission and grading.
@ -110,9 +111,15 @@
For helpful hints about how to get the most out of this project, see <a href="quickstart.html"> Quick Start</a>. For helpful hints about how to get the most out of this project, see <a href="quickstart.html"> Quick Start </a> Section.
</div> </div>
<div class="pagefooter"> <div class="pagefooter">
<div class="footerlinks"> <div class="footerlinks">