Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

trim function #64

Open
wants to merge 64 commits into
base: ferguson
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
47b5f09
Update Script.php
31iauk May 20, 2020
099d0e0
Update Header.php
31iauk May 20, 2020
454d306
Update Script.php
31iauk May 20, 2020
45554cd
Update Script.php
31iauk May 25, 2020
1dcbb9b
Update Script.php
31iauk May 25, 2020
e504e83
Update Overview.html
31iauk Jun 15, 2020
74704c1
Merge branch 'master' into ZhengXiaoyu-201732120110-ContributorList
31iauk Jun 15, 2020
a29a905
Enock Khondowe 202025800044 & Samantha Rusike 202025800046: Mark Subm…
enockkays Dec 15, 2020
aa6401c
Mabasa Nyasha Mutyambizi 202025800045-Fixed Bug 51: Unable to find co…
MabasaDailyCode Dec 21, 2020
511ff80
Merge branch 'master' into lrr-enockkays/Samantha
enockkays Dec 23, 2020
d18feb9
Update Submissions.php
enockkays Dec 24, 2020
8c42ebe
Update signup.php
Samrusike Dec 25, 2020
3ca7a1e
Update index.php
enockkays Dec 25, 2020
a877d38
Add files via upload
Samrusike Dec 25, 2020
6ba6ebe
Update recover_password.php
enockkays Dec 25, 2020
a238909
Update Script.php
Samrusike Dec 25, 2020
3ab9c33
Update Script.php
enockkays Dec 25, 2020
088ab3d
Update Script.php
Samrusike Dec 25, 2020
1d2192e
Update Script.php
enockkays Dec 25, 2020
cd124ed
Update Header.php
enockkays Dec 25, 2020
5177327
Merge pull request #51 from lanlab-org/lrr-enockkays/Samantha
spm2020spring Dec 29, 2020
6e5eff1
Merge pull request #53 from lanlab-org/Mabasaa
spm2020spring Dec 29, 2020
0dd3abe
Update index.php
Samrusike Jan 5, 2021
56c2493
index.php: make the code look cleaner.
Jan 29, 2021
019a832
index.php: resolve merge conflict.
Jan 29, 2021
e947b97
Merge pull request #66 from lanlab-org/Hui-Reformat-Code
spm2020spring Jan 29, 2021
e49b047
Courses.php: trim course code before search for it.
Feb 17, 2021
b501fcd
Merge pull request #67 from lanlab-org/Ferguson-Trim-CourseCode-Befor…
spm2020spring Feb 17, 2021
c2cee17
Course.php: show missed courses properly. This is bug fix commit.
Apr 4, 2021
be61b89
Merge branch 'master' of https://github.com/lanlab-org/LRR into Hui-S…
Apr 4, 2021
63c6f84
Merge pull request #68 from lanlab-org/Hui-ShowMissedCourses
spm2020spring Apr 4, 2021
a0f82ec
index.php: resolve merge conflicts
Apr 9, 2021
6971b0d
index.php: position the log in the right place.
Apr 9, 2021
43b9da8
index.php: change P to lowercase p.
Apr 9, 2021
476aa87
index.php, signup.php and recover_password.php: change button widths.
Apr 9, 2021
95e3e92
Merge pull request #69 from lanlab-org/Hui-IncorporateChangesMadeByEnock
spm2020spring Apr 9, 2021
99063b1
signup.php: use proper lowercases.
Apr 9, 2021
1e55057
Merge pull request #70 from lanlab-org/Hui-IncorporateChangesMadeByEnock
spm2020spring Apr 9, 2021
197e557
recover_password.php: require that the two fields must not be empty.
Apr 9, 2021
d5c4079
Merge pull request #71 from lanlab-org/Hui-IncorporateChangesMadeByEnock
spm2020spring Apr 9, 2021
4e66a39
ENOCK JEANNICK OMAR bug41:need to be submitted by whom information. t…
Jeannick94 Apr 17, 2021
f7124f3
README.md: highlight important contributors.
Apr 17, 2021
6202c15
Merge pull request #73 from lanlab-org/Hui-improve-README.md
spm2020spring Apr 17, 2021
a0025dc
Incorporate changes made by Zheng Xiaoyu. This is mainly a bug fix f…
Apr 17, 2021
59eda32
Merge pull request #74 from lanlab-org/Hui-IncorporateChangesMadeByZh…
spm2020spring Apr 17, 2021
5f25c14
README.md: the feature request is done.
Apr 17, 2021
9497809
README.md: the feature request is done (revision).
Apr 17, 2021
d4c3c98
Merge pull request #75 from lanlab-org/Hui-UpdateReadMeInMaster
spm2020spring Apr 17, 2021
d8ea11f
Update Script.php
enockkays Apr 21, 2021
cdf5e84
Script.php: fix typo happend
Apr 29, 2021
70bfb83
Merge pull request #76 from lanlab-org/Hui-IncorporateChangesMadeByEn…
spm2020spring Apr 29, 2021
cb0e456
Update Submissions.php
Jeannick94 Apr 29, 2021
ca69011
Merge branch 'SIMPLICITY_submitted_by_who' of https://github.com/lanl…
Apr 29, 2021
aab5ce5
Mabasa, Samantha, and Nafis - Fixed Bug 201 Unable to download an att…
Jeannick94 May 5, 2021
11cb05b
Enock Omar Jeannick bug 42: please add a link under assignments so t…
Jeannick94 May 6, 2021
1a2d2b0
Merge with the latest Submissions.php.
May 13, 2021
e2c2c7c
Merge pull request #80 from lanlab-org/SIMPLICITY_link
spm2020spring May 13, 2021
a2d80ff
Merge branch 'Panda_download' of https://github.com/lanlab-org/LRR in…
May 21, 2021
8b40765
Download.php: remove the redundant space before the closing parenthes…
May 21, 2021
559b910
Merge branch 'master' of https://github.com/lanlab-org/LRR into BugFi…
May 21, 2021
709215d
Merge pull request #79 from lanlab-org/Panda_download
spm2020spring May 21, 2021
b34dcbf
update
Jun 17, 2022
b39dd93
Merge branch 'master' of https://github.com/lanlab-org/LRR into Hui-i…
Jun 17, 2022
37a4e92
Merge pull request #85 from lanlab-org/Hui-improve-README.md
spm2020spring Jun 18, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 10 additions & 14 deletions Course.php
Original file line number Diff line number Diff line change
Expand Up @@ -181,19 +181,14 @@


<div id="menu2" class="container tab-pane"><br>

<?php
$group_id=$_SESSION['group_id'];
if($group_id == ""){$group_id = -1;} // Individual assignment does not require the student to have a group id. Therefore, the group is an empty string. To make the following SQL statement work properly, initialize the group id to -1.
$result = mysqli_query($con,"SELECT Lab_Report_ID,Marks, `Course_ID`, `Posted_Date`, `Deadline`, `Instructions`, lab_reports_table.Title, `Attachment_link_1`, `Attachment_link_2`, `Attachment_link_3`, `Attachment_link_4`
FROM `lab_reports_table`
where





Lab_Report_ID not in
(select Lab_Report_ID from lab_report_submissions where (Student_id=$student_id or Course_Group_id=$group_id) and Course_ID=$course_id )
and Course_ID=$course_id and deadline < '$c_date' "
WHERE
Lab_Report_ID not in (select Lab_Report_ID from lab_report_submissions where (Student_id=$student_id or Course_Group_id=$group_id)) and Course_ID=$course_id and Deadline < '$c_date'"
. ""
. ""
. ""
Expand Down Expand Up @@ -238,17 +233,18 @@
}
;

echo " <k href='#'> <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> <span style='font-size:8pt'> $ins</span>
<br> <span style='font-size:8pt'>Posted : $posted &nbsp; &nbsp; &nbsp; Deadline : $deadline &nbsp; &nbsp; &nbsp; ($marks Marks) &nbsp; &nbsp; <span class='btn-sm btn-warning' style='margin-left:50px;'><i class='fa fa-times-circle'></i> Missed !</span><br> Attachments : $full_link </span>
</div></k>";
echo "<div class='btn btn-default break-word' style='dislay:block; word-wrap: break-word; border: 1px solid #F0F0F0;border-left: 4px solid #03407B;'><span class='btn-sm btn-warning' style='margin-left:0px;'>MISSED</span> $title ($marks Marks) <br> <span style='font-size:8pt'> $ins</span>
<br> <span style='font-size:8pt'>Posted: $posted<br> Deadline: $deadline &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;<br> Attachments : $full_link </span>
</div>";

}}
echo "";
?>


</div>



<div id="menu3" class="container tab-pane"><br>
<?php

Expand Down
4 changes: 2 additions & 2 deletions Courses.php
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ function extend_deadline(id) {
$student_id= $_SESSION['user_student_id'];
if(!empty($_GET["search"]) || !empty($_GET["faculty"]))
{
$search=$_GET["search"];
$search = trim($_GET["search"]);
$faculty=$_GET["faculty"];


Expand All @@ -564,7 +564,7 @@ function extend_deadline(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 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
{
Expand Down
2 changes: 1 addition & 1 deletion Download.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
if ( (isset($_SESSION["user_student_id"]) && strpos($file, $_SESSION["user_student_id"])) || $_SESSION['user_type'] == "Lecturer" || $_SESSION['user_type'] == "TA") {
// 发送文件头部
header("Content-type: $type");
header("Content-Disposition: attachment;filename=$filename");
header('Content-Disposition: attachment;filename="'.urldecode($filename).'"');
header("Content-Transfer-Encoding: binary");
header('Pragma: no-cache');
header('Expires: 0');
Expand Down
3 changes: 2 additions & 1 deletion Header.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,14 @@
<script src="./css/bootsrap.min.js" type="text/javascript"></script>
<script src="./css/jquery.datetimepicker.min.js" type="text/javascript"></script>


</header>


<body>

<nav class="navbar navbar-expand-lg navbar-dark bg-dark" style="padding-left:150px;padding-right:150px;margin:auto;">
<a class="navbar-brand" href="~\..\index.php"> <img src="logo.png" style="width:30px;heigh:30px;"> LRRS</a>
<a class="navbar-brand" href="~\..\index.php"> <img src="logo.png" style="width:30px;heigh:30px;"> LRR </a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarColor02" aria-controls="navbarColor02" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
Expand Down
49 changes: 26 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ http://118.25.96.118/bugzilla/describecomponents.cgi?product=Lab%20Report%20Repo

- *How assignements should be stored?* Creating sub-directories on all student submissions course-code/semester/section-number. (/student-number/course-code/semester/section-number/assignement-title/submission.txt)

- *Feature request*. Editing the assignment title after uploading a new assignment (instructor).
- [SOLVED] Editing the assignment title after uploading a new assignment (instructor).

- [SOLVED] A new user could not login immediately after sign up.

Expand Down Expand Up @@ -131,48 +131,51 @@ The original GitHub Repo is at https://github.com/EngMohamedNor/LabReportRepo

# Contributor List

*Important contributors are highlighted.*

(Please put your name and student number below.)
GitHub Account - Full Name

CODEwithZAKI - Omar Mohamud Mohamed - 202025800041
CODEwithZAKI - Omar Mohamud Mohamed

BloudYoussef - Khayat Youssef - 202025800042
BloudYoussef - Khayat Youssef

TanakaMichelle - Tanaka Michelle Sandati - 201732120134
TanakaMichelle - Tanaka Michelle Sandati

WhyteAsamoah - Yeboah Martha Asamoah - 201732120135
WhyteAsamoah - Yeboah Martha Asamoah

xiaoyusoil - ZhengXiaoyu - 201732120110
xiaoyusoil - ZhengXiaoyu

Benny123-cell

Benny123-cell - ZhangBin - 201732120127
421281726 - LiJiaxing

421281726 - LiJiaxing - 201732120118
zhenghongyu-david

zhenghongyu-david - ZhengHongyu - 201732120128
wkytz - YeHantao

wkytz - YeHantao - 201732120125
zego000 - GaoZeng

zego000 - GaoZeng - 201732120117
Richard1427 - XieJiacong

Richard1427 - XieJiacong - 201732120123
yutengYing - YingYuteng

yutengYing - YingYuteng - 201732120126
Samrusike - Samantha Rusike

Samrusike - Samantha Rusike - 201632120140
*enockkays* <enockkhondowe94@yahoo.com>

Teecloudy - Ashly Tafadzwa Dhani - 201632120150
*Teecloudy* - Ashly Tafadzwa Dhani

GuedaliaBonheurSPM - Guedalia Youma - 201925800221
GuedaliaBonheurSPM - Guedalia Youma

ACorneille - Alimasi Corneille - 201925800168
ACorneille - Alimasi Corneille

Tabithakipanga - Kipanga Dorcas - 201925800170
Tabithakipanga - Kipanga Dorcas

Mary-AK - Mary Akussah Doe - 201925800173
Mary-AK

pkkumson - Kumson Princewill Kum - 201925800166
pkkumson - Kumson Princewill Kum

Twizere - Twizere Pacifique - 201925800174
Twizere - Twizere Pacifique

Nicole-Rutagengwa

Nicole-Rutagengwa - Nicole Rutagengwa - 201925800169
Loading