From d4cb07ba1ce5c6bb2f8bc7cd3c1703225c8c0f32 Mon Sep 17 00:00:00 2001
From: CODEwithZAKI <cumaraani1887@gmail.com>
Date: Tue, 15 Dec 2020 05:30:00 +0300
Subject: [PATCH 01/11] increased the size of column_name Course_Name

---
 README.md   | 4 ++++
 lrr (1).sql | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/README.md b/README.md
index ece6575..fac0a53 100644
--- a/README.md
+++ b/README.md
@@ -134,6 +134,10 @@ The original GitHub Repo is at https://github.com/EngMohamedNor/LabReportRepo
 
 (Please put your name and student number below.)
 
+CODEwithZAKI - Omar Mohamud Mohamed - 202025800041
+
+BloudYoussef - Khayat Youssef - 202025800042 
+
 TanakaMichelle - Tanaka Michelle Sandati - 201732120134
 
 WhyteAsamoah   - Yeboah Martha Asamoah   - 201732120135
diff --git a/lrr (1).sql b/lrr (1).sql
index 62280ae..9a88436 100644
--- a/lrr (1).sql	
+++ b/lrr (1).sql	
@@ -405,6 +405,8 @@ ALTER TABLE `lab_report_submissions`
 ALTER TABLE `students_data`
   MODIFY `ID` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=5;
 
+  ALTER TABLE 'courses_table'
+   MODIFY 'Course_Name' varchar(500);
 --
 -- AUTO_INCREMENT for table `users_table`
 --

From 2567a7fe21d28f638795c3df80258bbe048dc53f Mon Sep 17 00:00:00 2001
From: CODEwithZAKI <cumaraani1887@gmail.com>
Date: Tue, 15 Dec 2020 05:56:04 +0300
Subject: [PATCH 02/11] Fixed Bug 25

---
 lrr (1).sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lrr (1).sql b/lrr (1).sql
index 9a88436..10a6809 100644
--- a/lrr (1).sql	
+++ b/lrr (1).sql	
@@ -405,6 +405,9 @@ ALTER TABLE `lab_report_submissions`
 ALTER TABLE `students_data`
   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);
 --

From 2778a9ed3b4d5f08076fc9b51398f6de31ce49c2 Mon Sep 17 00:00:00 2001
From: CODEwithZAKI <cumaraani1887@gmail.com>
Date: Tue, 15 Dec 2020 06:20:24 +0300
Subject: [PATCH 03/11] Removed leading space

---
 lrr (1).sql | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lrr (1).sql b/lrr (1).sql
index 10a6809..d6892d0 100644
--- a/lrr (1).sql	
+++ b/lrr (1).sql	
@@ -405,11 +405,11 @@ ALTER TABLE `lab_report_submissions`
 ALTER TABLE `students_data`
   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);
+--
+-- updading size of Course_Name`
+--
+ALTER TABLE 'courses_table'
+MODIFY 'Course_Name' varchar(500);
 --
 -- AUTO_INCREMENT for table `users_table`
 --

From a29a9053bdcc1003422bf0aba835c748c7430bb9 Mon Sep 17 00:00:00 2001
From: enockkays <enockkhondowe94@yahoo.com>
Date: Tue, 15 Dec 2020 20:20:38 +0800
Subject: [PATCH 04/11] Enock Khondowe 202025800044 & Samantha Rusike
 202025800046: Mark Submission error Bug No.177.

---
 Submissions.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Submissions.php b/Submissions.php
index 411fe75..2116abf 100644
--- a/Submissions.php
+++ b/Submissions.php
@@ -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>
 
@@ -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\
  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({
@@ -494,8 +494,8 @@ include 'Footer.php';
                                                                                                                                                   title:'Mark Submission',
                                                                                                                                                   buttons: {
             'Submit Marking': function () {
-                $('#frm').submit();
-     
+                $('#submit-form').submit();
+                //$('input[type=submit].default').submit();
                 $(this).dialog('close');
             },
                                                                                                                                                   'X': function () {
@@ -528,7 +528,7 @@ Update Visibility<br><select name="status"> <option> Public </option><option>Pri
                                                                                                                                                                                                              title:'Update Report Visibility',
                                                                                                                                                                                                              buttons: {
             'Update': function () {
-                $('#frm').submit();
+                $('#submit-form').submit()
      
                 $(this).dialog('close');
             },

From aa6401c5cd42fd78b12867a39867c6edc446172b Mon Sep 17 00:00:00 2001
From: Mabasa-elexma <nyasha@163.com>
Date: Mon, 21 Dec 2020 20:10:58 +0800
Subject: [PATCH 05/11] Mabasa Nyasha Mutyambizi 202025800045-Fixed Bug 51:
 Unable to find course after entering the course code.

---
 Courses.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Courses.php b/Courses.php
index 5005494..58128f6 100644
--- a/Courses.php
+++ b/Courses.php
@@ -564,8 +564,9 @@ if( $_SESSION['user_type']=="Student")
             $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
         {
             echo "<h3> Find Courses under faculty $faculty</h3>";

From 08e19558070020606d824487b6cd8bfac0108361 Mon Sep 17 00:00:00 2001
From: Hui Lan <lanhui@zjnu.edu.cn>
Date: Tue, 22 Dec 2020 18:22:35 +0800
Subject: [PATCH 06/11] Submissions.php: fix bug# 177: Mark submission does not
 work (http://118.25.96.118/bugzilla/show_bug.cgi?id=177).

---
 Submissions.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Submissions.php b/Submissions.php
index 411fe75..2f6696e 100644
--- a/Submissions.php
+++ b/Submissions.php
@@ -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\
  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({
@@ -494,7 +494,7 @@ include 'Footer.php';
                                                                                                                                                   title:'Mark Submission',
                                                                                                                                                   buttons: {
             'Submit Marking': function () {
-                $('#frm').submit();
+                $('#submit-form').submit();
      
                 $(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\
 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({
@@ -528,7 +528,7 @@ Update Visibility<br><select name="status"> <option> Public </option><option>Pri
                                                                                                                                                                                                              title:'Update Report Visibility',
                                                                                                                                                                                                              buttons: {
             'Update': function () {
-                $('#frm').submit();
+                $('#submit-form').submit();
      
                 $(this).dialog('close');
             },

From 3e4ee8958d155dd841438d910b5014d2625227e1 Mon Sep 17 00:00:00 2001
From: CODEwithZAKI <cumaraani1887@gmail.com>
Date: Tue, 22 Dec 2020 14:52:51 +0300
Subject: [PATCH 07/11] Removed the single qoutes

---
 lrr (1).sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lrr (1).sql b/lrr (1).sql
index d6892d0..ff2e593 100644
--- a/lrr (1).sql	
+++ b/lrr (1).sql	
@@ -408,7 +408,7 @@ ALTER TABLE `students_data`
 --
 -- updading size of Course_Name`
 --
-ALTER TABLE 'courses_table'
+ALTER TABLE courses_table
 MODIFY 'Course_Name' varchar(500);
 --
 -- AUTO_INCREMENT for table `users_table`

From f31c7decfd2f10b6f3338097ac266cd6eece7c09 Mon Sep 17 00:00:00 2001
From: CODEwithZAKI <cumaraani1887@gmail.com>
Date: Tue, 22 Dec 2020 16:23:44 +0300
Subject: [PATCH 08/11] Removed the Single Qoutes+1

---
 lrr (1).sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lrr (1).sql b/lrr (1).sql
index ff2e593..22759cb 100644
--- a/lrr (1).sql	
+++ b/lrr (1).sql	
@@ -409,7 +409,7 @@ ALTER TABLE `students_data`
 -- updading size of Course_Name`
 --
 ALTER TABLE courses_table
-MODIFY 'Course_Name' varchar(500);
+MODIFY Course_Name varchar(500);
 --
 -- AUTO_INCREMENT for table `users_table`
 --

From 4318437b16dfdaf7cf440c6c7a79ebf6065866a7 Mon Sep 17 00:00:00 2001
From: Hui Lan <lanhui@zjnu.edu.cn>
Date: Thu, 24 Dec 2020 18:27:14 +0800
Subject: [PATCH 09/11] Courses.php: be more specific on 'Code'.

---
 Courses.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Courses.php b/Courses.php
index 5005494..182edaa 100644
--- a/Courses.php
+++ b/Courses.php
@@ -560,7 +560,7 @@ if( $_SESSION['user_type']=="Student")
        
         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`,"
                                    . " `Lecturer_User_ID`, `TA_User_ID`, `Course_Code`, `URL`, `Verify_New_Members`  "
                                    . " , users_table.Full_Name  FROM `courses_table` INNER JOIN users_table"

From f96fbf5447b849b94da980038e81671f0dcaa25a Mon Sep 17 00:00:00 2001
From: Hui Lan <lanhui@zjnu.edu.cn>
Date: Thu, 24 Dec 2020 18:39:03 +0800
Subject: [PATCH 10/11] index.php: remove the unused field 'Your
 Passport/National ID' in Sign up section.

---
 index.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/index.php b/index.php
index 1f3fb3e..66f1481 100644
--- a/index.php
+++ b/index.php
@@ -79,17 +79,16 @@ if (isset($_SESSION["user_fullname"])) {
 
     <br>
     <h4 class="list-group-item active"> Sign up </h4>
-    <div class="list-group-item">
+    <div class="list-group-item" style="height:235px">
 
     <form method="post" action="Script.php" name="frm_signup_1">
     <input type="hidden" name="frm_signup_1" value="true"/>
     
     Student ID
     <input type="text" name="student_id" placeholder="Entre your Student ID" class="form-control" required="">
-
-    Your Passport / National ID
-    <input type="text" class="form-control"  name="passport" placeholder="(Optional)">
     <br>
+
+    <div class="btnsignup" style="padding-top:58px">
     <input type="submit" name="frm_signup_1" class="btn btn-primary" value="Next"> <br> Click Next to set up password
 
 

From d18feb971344bee38eb2e607fc8897e39e66164c Mon Sep 17 00:00:00 2001
From: enockkays <32764779+enockkays@users.noreply.github.com>
Date: Thu, 24 Dec 2020 19:39:17 +0800
Subject: [PATCH 11/11] Update Submissions.php

Removed a duplicated line that was done by mistake  on line 531
$('#submit-form').submit()
---
 Submissions.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Submissions.php b/Submissions.php
index 97a540c..79bf09f 100644
--- a/Submissions.php
+++ b/Submissions.php
@@ -528,11 +528,7 @@ Update Visibility<br><select name="status"> <option> Public </option><option>Pri
                                                                                                                                                                                                              title:'Update Report Visibility',
                                                                                                                                                                                                              buttons: {
             'Update': function () {
-
-                $('#submit-form').submit()
                 $('#submit-form').submit();
-
-     
                 $(this).dialog('close');
             },
                                                                                                                                                                                                              'X': function () {