kasoka
/
LRR
forked from mrlan/LRR
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

index.php: resolve merge conflict.

SIMPLICITY_link
Hui Lan 2021-01-29 17:34:48 +08:00
parent 56c249390e 6e5eff11de
commit 019a832c0b
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Courses.php
View File

@ -560,12 +560,13 @@ if( $_SESSION['user_type']=="Student")
if($faculty=="") if($faculty=="")
{ {
echo "<h4> Search Results for Code : $search</h4><hr>"; echo "<h4> Search Results for Course Code $search</h4><hr>";
$result = mysqli_query($con,"SELECT `Course_ID`, `Course_Name`, `Academic_Year`, `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` " . " `Lecturer_User_ID`, `TA_User_ID`, `Course_Code`, `URL`, `Verify_New_Members` "
. " , users_table.Full_Name FROM `courses_table` INNER JOIN users_table" . " , users_table.Full_Name FROM `courses_table` INNER JOIN users_table"
. " ON users_table.User_ID=courses_table.Lecturer_User_ID where Course_Code='$search' and courses_table.Course_ID not in (select course_id from course_students_table where Student_ID=$student_id)"); . " ON users_table.User_ID=courses_table.Lecturer_User_ID where Course_Code like '%{$search}%' and courses_table.Course_ID not in (select course_id from course_students_table where Student_ID=$student_id)");
} }
else else
{ {
echo "<h3> Find Courses under faculty $faculty</h3>"; echo "<h3> Find Courses under faculty $faculty</h3>";

4
README.md
View File

@ -134,6 +134,10 @@ The original GitHub Repo is at https://github.com/EngMohamedNor/LabReportRepo
(Please put your name and student number below.) (Please put your name and student number below.)
CODEwithZAKI - Omar Mohamud Mohamed - 202025800041
BloudYoussef - Khayat Youssef - 202025800042
TanakaMichelle - Tanaka Michelle Sandati - 201732120134 TanakaMichelle - Tanaka Michelle Sandati - 201732120134
WhyteAsamoah - Yeboah Martha Asamoah - 201732120135 WhyteAsamoah - Yeboah Martha Asamoah - 201732120135

15
Submissions.php
View File

@ -470,11 +470,11 @@ include 'Footer.php';
?> ?>
<script src="./css/jquery-1.11.1.min.js"></script> <script src="http://118.25.96.118/nor/css/jquery-1.11.1.min.js"></script>
<script src="./css/jquery-ui.min.js"></script> <script src="http://118.25.96.118/nor/css/jquery-ui.min.js"></script>
<link rel="stylesheet" href="./css/jquery-ui.css" /> <link rel="stylesheet" href="http://118.25.96.118/nor/css/jquery-ui.css" />
<script> <script>
@ -486,7 +486,7 @@ include 'Footer.php';
{ {
$('<form id="frm" method="get" action="Script.php">'+title+'('+marks+' marks) <input type="hidden" name="savemarks" value="true">\n\ $('<form id="submit-form" method="get" action="Script.php">'+title+'('+marks+' marks) <input type="hidden" name="savemarks" value="true">\n\
<input type="hidden" name="total" value="'+marks+'" > <input type="hidden" name="id" value="'+id+'" ><br> Marks <input type="text" name="marks">\n\ <input type="hidden" name="total" value="'+marks+'" > <input type="hidden" name="id" value="'+id+'" ><br> Marks <input type="text" name="marks">\n\
Comments <textarea name="feedback"></textarea> \n\ Comments <textarea name="feedback"></textarea> \n\
<input type="hidden" name="labid" value="<?php echo $course_id; ?>"> <input type="hidden" name="header" value="<?php echo $header; ?>"> </form>').dialog({ <input type="hidden" name="labid" value="<?php echo $course_id; ?>"> <input type="hidden" name="header" value="<?php echo $header; ?>"> </form>').dialog({
@ -494,7 +494,7 @@ include 'Footer.php';
title:'Mark Submission', title:'Mark Submission',
buttons: { buttons: {
'Submit Marking': function () { 'Submit Marking': function () {
$('#frm').submit(); $('#submit-form').submit();
$(this).dialog('close'); $(this).dialog('close');
}, },
@ -520,7 +520,7 @@ function updatev(id)
{ {
$('<form id="frm" method="get" action="Script.php"> <input type="hidden" name="updatevisibility" value="true">\n\ $('<form id="submit-form" method="get" action="Script.php"> <input type="hidden" name="updatevisibility" value="true">\n\
<input type="hidden" name="id" value="'+id+'" > <br>\n\ <input type="hidden" name="id" value="'+id+'" > <br>\n\
Update Visibility<br><select name="status"> <option> Public </option><option>Private</option> </select> \n\ Update Visibility<br><select name="status"> <option> Public </option><option>Private</option> </select> \n\
<input type="hidden" name="labid" value="<?php echo $id; ?>"> <input type="hidden" name="total" value="<?php echo $total; ?>" > <input type="hidden" name="header" value="<?php echo $header; ?>"> </form>').dialog({ <input type="hidden" name="labid" value="<?php echo $id; ?>"> <input type="hidden" name="total" value="<?php echo $total; ?>" > <input type="hidden" name="header" value="<?php echo $header; ?>"> </form>').dialog({
@ -528,8 +528,7 @@ Update Visibility<br><select name="status"> <option> Public </option><option>Pri
title:'Update Report Visibility', title:'Update Report Visibility',
buttons: { buttons: {
'Update': function () { 'Update': function () {
$('#frm').submit(); $('#submit-form').submit();
$(this).dialog('close'); $(this).dialog('close');
}, },
'X': function () { 'X': function () {

5
lrr (1).sql
View File

@ -405,6 +405,11 @@ ALTER TABLE `lab_report_submissions`
ALTER TABLE `students_data` ALTER TABLE `students_data`
MODIFY `ID` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=5; MODIFY `ID` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=5;
--
-- updading size of Course_Name`
--
ALTER TABLE courses_table
MODIFY Course_Name varchar(500);
-- --
-- AUTO_INCREMENT for table `users_table` -- AUTO_INCREMENT for table `users_table`
-- --