Bug 34

Update UI
Merge branch 'Bug37-Dmytro' of http://121.4.94.30:3000/mrlan/LRR into Bug37-Dmytro
2022-06-16 13:24:24 +02:00 · 2022-06-16 12:28:24 +02:00 · 2022-06-16 12:28:12 +02:00 · 2021-12-01 09:22:55 +08:00 · 2021-12-01 00:03:37 +01:00 · 2021-11-22 10:46:49 +08:00
27 changed files with 1776 additions and 2144 deletions
--- a/.htaccess
+++ b/.htaccess
@ -1 +0,0 @@
-allow from all
--- a/Admin.php
+++ b/Admin.php
@ -7,15 +7,14 @@ $page = "admin";
 include 'Header.php';
 ?>

-
 <?php
-// Only Lecturer or Admin could access this page
-if ($_SESSION['user_type'] != "Lecturer" && $_SESSION['user_type'] != "Admin") {
-    die("Sorry.  Nothing to see here.");
+if ($_SESSION['user_type'] != "Lecturer") {
+  $_SESSION["info_login"] = "You must log in first.";
+  echo $_SESSION["info_login"];
+  header("Location: index.php");
 }
 ?>

-
 <style>
  .col-md-4 {
    border-right: 1px solid skyblue;
@ -37,21 +36,10 @@ if ($_SESSION['user_type'] != "Lecturer" && $_SESSION['user_type'] != "Admin") {
        <hr>
    -->
  <div class="col-md-6">
+    <h4> User Account Management </h4>
+    <hr>

-  <?php 
-  if ($_SESSION['user_type'] == "Lecturer") {
-           
-        echo " <h4> TA Account Management </h4> 
-        <hr> " ;
-        echo    "<b>TA Accounts </b><br>" ;
-      }
-  else if($_SESSION['user_type'] == "Admin"){
-        echo " <h4> Lecturer Account Management </h4> 
-        <hr> ";
-        echo "<b>Lecturer Accounts </b><br>";
-    }
-    
-  ?>
+    <b>Lecturer / TA Accounts </b><br>

    <div class="container">

@ -63,11 +51,11 @@ if ($_SESSION['user_type'] != "Lecturer" && $_SESSION['user_type'] != "Admin") {
        </li>

        <li class="nav-item">
-          <a class="nav-link" data-toggle="tab" href="#menu2" id="batch_tab">Batch Create New Student Accounts</a>
+          <a class="nav-link" data-toggle="tab" href="#menu2">Batch Create New Student Accounts</a>
        </li>

        <li class="nav-item">
-          <a class="nav-link" data-toggle="tab" href="#menu1" id="existing_accounts_tab">Existing Accounts</a>
+          <a class="nav-link" data-toggle="tab" href="#menu1">Existing Accounts</a>
        </li>

      </ul>
@ -77,45 +65,20 @@ if ($_SESSION['user_type'] != "Lecturer" && $_SESSION['user_type'] != "Admin") {

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

-      <?php 
-        if ($_SESSION['user_type'] == "Lecturer") {
-                
-            echo "<b>Create TA Accounts </b>";
-             
-          }
-        else if($_SESSION['user_type'] == "Admin"){
-           echo "<b>Create Lecturer Accounts </b>";
-          }
-    
-      ?>
-          <form method="post" action="Script.php" id="create_account_form">
+          <b>Create Lecturer/TA Accounts </b>
+          <form method="post" action="Script.php">
            <input type="hidden" name="frm_createlecturrer" value="true" required="" />
-            Full Name
+            Full_Name
            <input type="text" name="fullname" placeholder="Full Name" class="form-control" required="">
            Email
            <input type="text" name="email" placeholder="Email / Student Number" class="form-control" required="">

-            Passport Number / ID (Used as Initial Password)
+            Passport_Number / ID (Used as Intial Password)
            <input type="text" class="form-control" name="passport" placeholder="Passport No./ID" required="">
            <br> User Type :
-
-          <?php 
-
-              if ($_SESSION['user_type'] == "Lecturer") {
-                      
-                    echo ' <input type="radio" name="type" value="TA" required="" id="role_TA"> TA (Teaching Assistant) ';
-
-                }
-              else if($_SESSION['user_type'] == "Admin"){
-                    
-                    echo " <input type='radio' name = 'type' value = 'Lecturer' required = '' id='role_lecturer' > Lecturer ";
-                  
-                }
-
-            ?>  
-
-            <input type="submit" class="btn btn-primary" value="Create" id="create_btn"><br>
-            
+            <input type="radio" name="type" value="Lecturer" required=""> Lecturer
+            <input type="radio" name="type" value="TA" required=""> T/A
+            <input type="submit" class="btn btn-primary" value="Create"><br>
            <?php

            error_reporting(E_ALL);
@ -149,30 +112,19 @@ if ($_SESSION['user_type'] != "Lecturer" && $_SESSION['user_type'] != "Admin") {
            </tr>
            <?php

-          if ($_SESSION['user_type'] == "Lecturer") {
-                                  
-                $result = mysqli_query(
-                  $con,
-                  "SELECT * FROM Users_Table  WHERE UserType in ('TA')"
-                );
-            }
-
-          else if($_SESSION['user_type'] == "Admin"){
-                $result = mysqli_query(
-                  $con,
-                  "SELECT * FROM Users_Table  WHERE UserType in ('Lecturer')"
-                );
-            }
-
+            $result = mysqli_query(
+              $con,
+              "SELECT * FROM Users_Table  WHERE UserType in ('Lecturer','TA')"
+            );
            while ($row = mysqli_fetch_assoc($result)) {
              $pass = $row['Passport_Number'];
              $btn = "<button class='btn-primary' onclick=\"updatePass(" . $row['User_ID'] . ",'$pass')\">Reset</button>";
              if ($row['Status'] == "Active") {
                $newstatus = "Blocked";
-                $btnBlock = "<button class='btn-danger' onclick=\"blockUser(" . $row['User_ID'] . ",'$newstatus')\" id=\"block_account_1\">Block</button>";
+                $btnBlock = "<button class='btn-danger' onclick=\"blockUser(" . $row['User_ID'] . ",'$newstatus')\">Block</button>";
              } else {
                $newstatus = "Active";
-                $btnBlock = "<button class='btn-success' onclick=\"blockUser(" . $row['User_ID'] . ",'$newstatus')\" id=\"activate_account_1\">Activate</button>";
+                $btnBlock = "<button class='btn-success' onclick=\"blockUser(" . $row['User_ID'] . ",'$newstatus')\">Activate</button>";
              }

              echo "<tr><td>" . $row['User_ID'] . "</td><td>" . $row['Full_Name'] . "</td><td>" . $row['Email'] . "</td> <td>" . $row['Passport_Number'] . "</td><td>$btn</td><td>$btnBlock</td></tr>";
@ -186,11 +138,11 @@ if ($_SESSION['user_type'] != "Lecturer" && $_SESSION['user_type'] != "Admin") {

        <div id="menu2" class="container tab-pane fade" style="margin-top:10px">
          <b>Separate two student numbers with a space.</b><br>
-          <form action="batch_insert.php" method="post" id="batch_form">
+          <form action="batch_insert.php" method="post">
            <p>
              <textarea cols="80" rows="16" name="users" required=""></textarea>
            </p>
-            <input type="submit" class="btn btn-primary" value="Register Students" id="register_btn"><br>
+            <input type="submit" class="btn btn-primary" value="Register Students"><br>
          </form>
        </div>

@ -205,7 +157,7 @@ if ($_SESSION['user_type'] != "Lecturer" && $_SESSION['user_type'] != "Admin") {
      <!-- Nav tabs -->
      <ul class="nav nav-tabs" role="tablist">
        <li class="nav-item">
-          <a class="nav-link active" data-toggle="tab" href="#menub" id="existing_courses">Existing Courses</a>
+          <a class="nav-link active" data-toggle="tab" href="#menub">Existing Courses</a>
        </li>

      </ul>
@ -230,7 +182,6 @@ if ($_SESSION['user_type'] != "Lecturer" && $_SESSION['user_type'] != "Admin") {
            $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");
            if (mysqli_num_rows($result) == 0) {
            } else {
-              $counter = 0;
              while ($row = mysqli_fetch_assoc($result)) {
                $name = $row['Course_Name'];
                $code = $row['Course_Code'];
@ -238,7 +189,6 @@ if ($_SESSION['user_type'] != "Lecturer" && $_SESSION['user_type'] != "Admin") {
                $lecturer = $row['Full_Name'];
                $academic = $row['Academic_Year'];
                $c_id = $row['Course_ID'];
-                $counter += 1;

                $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
@ -250,19 +200,24 @@ where course_ta.Course_ID=$c_id");
                }

                echo "  
-                          <tr> <td>$code - $name</td>  <td>$faculty </td> <td>$lecturer</td><td>$ta</td>  <td><form method='get' action='Script.php' id='drop_menu_form_$counter'> <select name='ta' class=''>";
+                          <tr> <td>$code - $name</td>  <td>$faculty </td> <td>$lecturer</td><td>$ta</td>  <td>";

-                $resultx = mysqli_query($con, "SELECT * FROM Users_Table WHERE UserType='TA'");
+                $resultx = mysqli_query($con, "SELECT * FROM Users_Table WHERE UserType='TA' AND User_ID NOT IN (SELECT `TA` FROM `course_ta`
+INNER JOIN users_table on users_table.User_ID=course_ta.TA
+where course_ta.Course_ID=$c_id);");
                if (mysqli_num_rows($resultx) == 0) {
+                  echo "No free TA";
                } else {
+                  echo "<form method='get' action='Script.php'> <select name='ta' class=''>";
                  while ($row = mysqli_fetch_assoc($resultx)) {
                    $id = $row['User_ID'];
                    $name = $row['Full_Name'];
                    echo "<option value='$id'> $name </option>";
                  }
+                    echo "</select>  <input type='hidden' name='assignTA' value='true'> <input type='hidden' name='id' value='$c_id'>  <input type='submit' value='assign'></form>";
                }

-                echo "</select>  <input type='hidden' name='assignTA' value='true'> <input type='hidden' name='id' value='$c_id'>  <input type='submit' value='assign' id='assign_btn_$counter'></form> </td></tr>
+                echo " </td></tr>
                         ";
              }
            } ?>
--- a/Course.php
+++ b/Course.php
--- a/Courses.php
+++ b/Courses.php
--- a/Download.php
+++ b/Download.php
@ -7,11 +7,6 @@ session_start();


 // 修改这一行设置你的文件下载目录
-// IMPORTANT: Do not delete the following conditional test
-if (strpos($_GET['file'], "../") !== false) { // 检查是否有 ../，防止用户构造路径，访问某个他不应该访问的目录
-    die("Sorry.  Nothing to download.");
-}
-
 $file = "./../../lrr_submission".$_GET['file'];
 $filename = basename($file);

@ -25,7 +20,7 @@ $type = filetype($file);
 $today = date("F j, Y, g:i a");
 $time = time();

-if ((isset($_SESSION["user_student_id"]) && strpos($file, $_SESSION["user_student_id"]) > 0) || $_SESSION['user_type'] == "Lecturer" || $_SESSION['user_type'] == "TA" ) {
+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="'.urldecode($filename).'"');
--- a/Footer.php
+++ b/Footer.php
@ -1,4 +1,9 @@
-<br><br><br><br><br><br><br><br><br>
-<div style="background-color:white;width:100%di">
-
-</div>
+ 
+ <footer class="footer bg-primary">
+      <div class="container text-light"> 
+        <p >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  lanhui _at_ zjnu.edu.cn.  Last updated on 18/04/2020 by Ashly. <a href="./homepage" style="color:white;">More information ...</a></p> 
+      <small>© 2018 Copyright: <a href="http://lanlab.org/">lanlab.org</a></small>
+      </div>
+    </footer>
+  
+ 
--- a/Header.php
+++ b/Header.php
@ -18,144 +18,43 @@ if (mysqli_connect_errno()) {
 <html>

 <head>
+ 
+  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"/>
+  <link href="./font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" /><!-- Font-awesome CSS -->
+  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous"><!-- Bootstrap CSS -->

-  <link href="./css/bootstrap.min.css" rel="stylesheet" type="text/css" />
-  <link href="./font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
-  <link href="./css/bootstrap.min.css" rel="stylesheet" type="text/css" />
-  <!-- *this css file can be used across all the websites 
-  and any new css class can be added there.
-  * The reason is to make the css code reusable.
-  * the css file is used by submissions.php
-->
-  <link href = "./css/main.css" rel = "stylesheet" type = "text/css" />
+  <link href="./css/Styles.css" rel="stylesheet" type="text/css" />

  <script src="./css/jquery.min.js" type="text/javascript"></script>
-  <script src="./css/bootsrap.min.js" type="text/javascript"></script>
+  <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
+  
  <script src="./css/jquery.datetimepicker.min.js" type="text/javascript"></script>
+  <script src="./js/CustomDropdown.js" type="text/javascript"></script>
+ <script src="https://code.jquery.com/jquery-1.11.1.min.js"></script>
+ 
+<script src="https://code.jquery.com/ui/1.11.1/jquery-ui.min.js"></script>

-</head>
+<link rel="stylesheet" href="https://code.jquery.com/ui/1.11.1/themes/smoothness/jquery-ui.css" />

-<body>
+    <style>
+      .bd-placeholder-img {
+        font-size: 1.125rem;
+        text-anchor: middle;
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        user-select: none;
+      }

-  <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;height: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>
-
-    <div class="collapse navbar-collapse" id="navbarColor02">
-      <ul class="navbar-nav mr-auto">
-        <li class="nav-item active">
-
-        <li class="nav-item active">
-          <!-- <a class='nav-link' href='~\..\Visitors.php'>     <i class='fa fa-globe'></i>  Visitor Portal <span class='sr-only'>(current)</span></a> -->
-        </li>
-        <?php
-        if (isset($_SESSION["user_fullname"])) {
-
-          echo "       <a class='nav-link' href='~\..\Courses.php'><i class='fa fa-book'></i> Courses <span class='sr-only'>(current)</span></a>";
-        ?>
-          </li>
-      </ul>
-      <form class="form-inline my-2 my-lg-0" style="color:#fff;">
-        Welcome &nbsp; <b> <?php echo $_SESSION['user_fullname']; ?> </b> &nbsp;
-
-        <?php
-          $c_date =  date("Y-m-d H:i");
-          if (isset($_SESSION['user_student_id']))
-            echo "(" . $_SESSION['user_type'] . " - " . $_SESSION['user_student_id'] . ")   ";
-          else
-            echo "(" . $_SESSION['user_type'] . ")   ";
-        ?>
-
-        <?php
-          if ($_SESSION['user_type'] == "Lecturer") {
-            echo  "&nbsp;&nbsp;&nbsp;  <i class=\"fa fa-cog\" style=\"color:#fff;\"> </i> &nbsp;<a style='color:#fff !important' href=\"~\..\Admin.php\" id=\"admin_tab\">Admin </a>";
-          }
-        ?>
-
-        &nbsp;&nbsp;&nbsp; <i class="fa fa-user" style="color:#fff;"> </i>
-        &nbsp;<a href="#" style='color:#fff !important' onclick="updatePass(<?php echo $_SESSION['user_id']; ?>)">Update password</a>
-        &nbsp;&nbsp;&nbsp; <i class="fa fa-lock" style="color:#fff;"> </i> &nbsp;<a style='color:#fff !important' href="~\..\logout.php">Logout </a>
-
-      <?php
+      /*Rule to include a block of CSS properties only if a certain condition is true.*/
+      /*https://www.w3schools.com/css/css_rwd_mediaqueries.asp*/
+      @media (min-width: 768px) {
+        .bd-placeholder-img-lg {
+          font-size: 3.5rem;
        }
-      ?>
-      </form>
-    </div>
-  </nav>
-
-  <style>
-    .nav-item {
-      border-color: #00ff66;
-    }
-
-    .nav-tabs {
-      border-color: #00ff66;
-    }
-
-    .btn-default {
-      border: 2px solid #00ff66;
-      width: 100%;
-      text-align: left;
-      margin: 3px auto;
-      font-weight: bold;
-      font-size: 13pt;
-    }
-
-    .table-bordered {
-      padding: 5px !important;
-    }
-
-    .alert {
-      font-weight: bold;
-    }
-
-    h1,
-    h2,
-    h3,
-    h4 {
-      color: #03407B;
-    }
-
-    a {
-      color: #03407B;
-    }
-
-    .break-word {
-      word-wrap: break-word;
-      white-space: -moz-pre-wrap !important;
-      /* Mozilla, since 1999 */
-      white-space: -pre-wrap;
-      /* Opera 4-6 */
-      white-space: -o-pre-wrap;
-      /* Opera 7 */
-      white-space: pre-wrap;
-      /* css-3 */
-      word-wrap: break-word;
-      /* Internet Explorer 5.5+ */
-      white-space: -webkit-pre-wrap;
-      /* Newer versions of Chrome/Safari*/
-      word-break: break-all;
-      white-space: normal;
-    }
-
-    .ui-widget-content.ui-dialog {
-      border: 2px solid #03488B;
-
-    }
-
-    .ui-dialog>.ui-widget-header {
-      background: #03488B;
-      color: white
-    }
-
-    .ui-button {
-      background: #03488B;
-      color: white
-    }
-  </style>
-
+      }
+    </style>
  <script>
    function updatePass(id) {

@ -174,4 +73,73 @@ if (mysqli_connect_errno()) {
      }
      window.location.href = "\Script.php\?action=statuschange&uid=" + id + "&status=" + status;
    }
-  </script>
+  </script>
+</head>
+
+<body>
+
+ 
+<nav class="navbar navbar-expand-md navbar-dark bg-primary sticky-top">
+  <div class="container-fluid"> 
+    <a class="navbar-brand" href="~\..\index.php"> <img src="logo.png" width="30" height="30"> LRR </a>
+
+        <?php  
+          if (isset($_SESSION["user_fullname"])) 
+          { 
+        ?>
+            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive">
+            <span class="navbar-toggler-icon"></span>
+            </button>
+
+        <?php
+          }
+        ?>
+
+    <div class="collapse navbar-collapse" id="navbarResponsive">
+      
+        <?php
+        if (isset($_SESSION["user_fullname"])) {
+          echo "<ul class=\"navbar-nav mr-auto\">";
+          echo "<li class=\"nav-item active\">";
+          echo "<a class='nav-link' href='~\..\Courses.php'><i class='fa fa-book'></i> Courses</a>";
+          echo "</li></ul>"; 
+        ?>
+        
+    <ul class="nav navbar-nav navbar-right">
+        <li class="nav-item">
+          <a class="nav-link text-light" href="#">Welcome <b> <?php echo $_SESSION['user_fullname']; ?> </b>
+
+          <?php
+            $c_date =  date("Y-m-d H:i");
+            if (isset($_SESSION['user_student_id']))
+              echo "(" . $_SESSION['user_type'] . " - " . $_SESSION['user_student_id'] . ")   ";
+            else
+              echo "(" . $_SESSION['user_type'] . ")   ";
+          ?>
+          </a>
+        </li>
+        <li class="nav-item dropdown">
+          <a class="nav-link dropdown-toggle text-light"  id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> Menu </a>
+          <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+            <a href="#" class="dropdown-item" onclick="updatePass(<?php echo $_SESSION['user_id']; ?>)"><i class="fa fa-user ">Update passwor</i></a>
+           
+            <?php
+                if ($_SESSION['user_type'] == "Lecturer") {
+                  echo  "<a class=\"dropdown-item\" href=\"~\..\Admin.php\"><i class=\"fa fa-cog\" >Admin</i> </a>";
+                }
+              ?>  
+          </div>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link text-light" href="~\..\logout.php"><i class="fa fa-lock" > Logout</i> </a>
+        </li>
+      </ul>
+
+      <?php
+        }
+      ?>
+
+    </div>
+
+  </div>
+</nav> 
--- a/NoDirectPhpAcess.php
+++ b/NoDirectPhpAcess.php
@ -2,6 +2,6 @@
    // https://stackoverflow.com/questions/33999475/prevent-direct-url-access-to-php-file
    if (!isset($_SERVER['HTTP_REFERER']) ) {
        /* choose the appropriate page to redirect users */
-        die( header( 'location: logout.php' ) );
+        die( header( 'location: index.php' ) );
    }
 ?>
--- a/README.md
+++ b/README.md
@ -18,17 +18,15 @@ Our mission is to make the experience of submitting assignments great for tens o
 # Installation Instructions


-## Hui steps
+## Hui's steps

 I spent about two hours installing LRR to a bare, remote Ubuntu server (Ubuntu 20.04 LTS).

-LRR needs Apache and MySQL to run.  I followed [How To Install Linux, Apache, MySQL, PHP (LAMP) stack on Ubuntu 20.04](https://www.digitalocean.com/community/tutorials/how-to-install-linux-apache-mysql-php-lamp-stack-on-ubuntu-20-04) to set up these server applications.  [How to install and configure PHP](https://ubuntu.com/server/docs/programming-php) is also a good guide.
+LRR needs Apache and MySQL to run.  I followed [How To Install Linux, Apache, MySQL, PHP (LAMP) stack on Ubuntu 20.04](https://www.digitalocean.com/community/tutorials/how-to-install-linux-apache-mysql-php-lamp-stack-on-ubuntu-20-04) to set up these server applications.

-LRR uses a database called `lrr`.  So create this database using MySQL root account.  Open MySQL's prompt using `sudo mysql`.  Create the database using command `CREATE DATABASE lrr;`, and grant all privileges to MySQL user `lrr` using command `GRANT ALL PRIVILEGES ON lrr.* TO 'mnc'@'localhost' WITH GRANT OPTION;`.   If MySQL user mnc does not exist, create it using command `CREATE USER 'mnc'@'localhost' IDENTIFIED BY 'password'`.
-
-To facilitate data migration, I need to export the existing `lrr` to a plain text file (including many sql commands) and import that text file to the newly created `lrr` database on the new server.
-The command for exporting the database is `mysqldump -u mnc -p lrr > lrr_database_dump.txt`, where mnc after -u is MySQL's username, and lrr after -p is the database name.
-The command for importing is `mysql -u mnc -p lrr < lrr_database_dump.txt`.  Read [How to Import and Export MySQL Databases in Linux](https://phoenixnap.com/kb/import-and-export-mysql-database) for more detail. Do not have lrr_database_dump.txt?  You can use lrr_database.sql in this repo instead.
+LRR uses a database called `lrr`.  I need to export the existing `lrr` to a plain text file (including many sql commands) and import that text file to the newly created `lrr` database on the new server.
+The command for exporting the database is `mysqldump -u mnc -p lrr > lrr_database_dump.txt`.
+The command for importing is `mysql -u mnc -p lrr < lrr_database_dump.txt`.  Read [How to Import and Export MySQL Databases in Linux](https://phoenixnap.com/kb/import-and-export-mysql-database) for more detail.

 LRR also needs to store assignment submissions.  We store them in a folder called `../../lrr_submission`.  Note that `lrr_submission` is two levels above the project folder (where many PHP files reside).  I copied this folder from the existing one.  I think it is also OK if you create an empty folder.   
 We need to set a proper owner and accessibility for `lrr_submission` using the following two commands:
@ -51,7 +49,7 @@ Enable the site lrr: `sudo a2ensite lrr`.  Restart the apache server: `sudo syst
 Visit the LRR application by entering this URL in a web browser: http://121.4.94.30/.


-## Enock steps
+## Enock's steps

 Enock, a graduate student here, has made a tutorial about how he deployed LRR to a remote server (http://lanlab.org/course/2021s/spm/PuTTY-Server.txt).

@ -173,49 +171,49 @@ We can also communicate through pull requests.  You make a pull request, I revie

 GitHub Account - Full Name - Student number

-CODEwithZAKI - Omar Mohamud Mohamed - 2020041
+CODEwithZAKI - Omar Mohamud Mohamed - 202025800041

-BloudYoussef - Khayat Youssef - 2020042 
+BloudYoussef - Khayat Youssef - 202025800042 

-TanakaMichelle - Tanaka Michelle Sandati - 2017134
+TanakaMichelle - Tanaka Michelle Sandati - 201732120134

-WhyteAsamoah  - Yeboah Martha Asamoah   - 2017135
+WhyteAsamoah  - Yeboah Martha Asamoah   - 201732120135

-xiaoyusoil - ZhengXiaoyu - 2017110
+xiaoyusoil - ZhengXiaoyu - 201732120110

-Benny123-cell - ZhangBin - 2017127
+Benny123-cell - ZhangBin - 201732120127

-421281726 - LiJiaxing - 2017118
+421281726 - LiJiaxing - 201732120118

-zhenghongyu-david - ZhengHongyu - 2017128
+zhenghongyu-david - ZhengHongyu - 201732120128

-wkytz - YeHantao - 2017125
+wkytz - YeHantao - 201732120125

-zego000 - GaoZeng - 2017117
+zego000 - GaoZeng - 201732120117

-Richard1427 - XieJiacong - 2017123
+Richard1427 - XieJiacong - 201732120123

-yutengYing - YingYuteng - 2017126
+yutengYing - YingYuteng - 201732120126

-Samrusike  - Samantha Rusike  - 2016140
+Samrusike  - Samantha Rusike  - 201632120140

 *enockkays* <enockkhondowe94@yahoo.com>

-*Teecloudy*  - Ashly Tafadzwa Dhani - 201150
+*Teecloudy*  - Ashly Tafadzwa Dhani - 201632120150

-GuedaliaBonheurSPM - Guedalia Youma - 2019221
+GuedaliaBonheurSPM - Guedalia Youma - 201925800221

-ACorneille - Alimasi Corneille - 2019168
+ACorneille - Alimasi Corneille - 201925800168

-Tabithakipanga - Kipanga Dorcas - 2019170
+Tabithakipanga - Kipanga Dorcas - 201925800170

-Mary-AK  - Mary Akussah Doe - 2019173
+Mary-AK  - Mary Akussah Doe - 201925800173

-pkkumson  - Kumson Princewill Kum - 2019166
+pkkumson  - Kumson Princewill Kum - 201925800166

-Twizere  -  Twizere Pacifique  -  2019174
+Twizere  -  Twizere Pacifique  -  201925800174

-Nicole-Rutagengwa  - Nicole Rutagengwa  - 2019169
+Nicole-Rutagengwa  - Nicole Rutagengwa  - 201925800169

 *hema-001* - Ibrahim Mohamed Ibrahim Ismail - omitted

--- a/Reset_password.php
+++ b/Reset_password.php
@ -8,8 +8,8 @@


 include 'Header.php';
-$token = htmlspecialchars($_GET['token']);
-$email = htmlspecialchars($_GET['email']);
+$token=$_GET['token'];
+$email=$_GET['email'];
 ?>

 <div class="row">
--- a/Script.php
+++ b/Script.php
@ -34,37 +34,39 @@ function is_valid_student_number($student_id)
 }

 // ############################### SIGN UP ##################################
-if (!empty($_POST["form_signup"])) {
-    $student_id = trim(mysqli_real_escape_string($con, $_POST["user_student_id"]));
+if (!empty($_POST["frm_signup_1"])) {
+
+    $student_id = trim(mysqli_real_escape_string($con, $_POST["student_id"]));

    // validate student number
    if (!is_valid_student_number($student_id)) {
-        $_SESSION["info_signup"] = "Invalid student number.";
-        header("Location: signup.php");
+        $_SESSION["info_signup1"] = "Invalid student number.";
+        header("Location: index.php");
        return;
    }

    // Check if this student number is a legal one
    $result = mysqli_query($con, "SELECT * FROM `students_data` WHERE Student_ID='$student_id'");
    if (mysqli_num_rows($result) == 0) {
-        $_SESSION["info_signup"] = "Your entered student number could not be verified.  Please contact Student Management Office <lanhui at zjnu.edu.cn>.  Thanks.";
-        header("Location: signup.php");
+        $_SESSION["info_signup1"] = "Your entered student number could not be verified.  Please contact Student Management Office <lanhui at zjnu.edu.cn>.  Thanks.";
+        header("Location: index.php");
        return;
    }

-
-    // Check if the student number isn't already registered
-
-    $student_result = mysqli_query($con, "SELECT * FROM `users_table` WHERE Student_ID='$student_id'");
-    if (mysqli_num_rows($student_result) > 0) {
-        $_SESSION["info_signup"] = "This Student ID is already in use! Please contact Student Management Office <lanhui at zjnu.edu.cn> for help.";
+    $result98 = mysqli_query($con, "SELECT * FROM `users_table` WHERE Student_ID='$student_id'");
+    if (mysqli_num_rows($result98) == 0) {
+        $_SESSION['user_student_id'] = $student_id;
        header("Location: signup.php");
        return;
+    } else {
+        $_SESSION["info_signup1"] = "This Student ID is already in use! Please contact Student Management Office <lanhui at zjnu.edu.cn> for help.";
+        header("Location: index.php");
+        return;
    }
 }

 // ############################### CREATE STUDENT USER ##################################
-if (!empty($_POST["form_signup"])) {
+if (!empty($_POST["frm_signup_2"])) {
    $fullname = mysqli_real_escape_string($con, $_POST["fullname"]);
    $student_id = mysqli_real_escape_string($con, $_POST["user_student_id"]);
    $email = mysqli_real_escape_string($con, $_POST["email"]);
@ -77,7 +79,7 @@ if (!empty($_POST["form_signup"])) {

    // check confirmed password
    if (strcasecmp($password, $confirmpassword) != 0) {
-        $_SESSION['info_signup'] = "Password confirmation failed.";
+        $_SESSION['info_signup2'] = "Password confirmation failed.";
        $_SESSION['user_fullname'] = null;  // such that Header.php do not show the header information.        
        header("Location: signup.php");
        return;
@ -85,7 +87,7 @@ if (!empty($_POST["form_signup"])) {

    // validate email
    if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
-        $_SESSION['info_signup'] = "Invalid email address.";
+        $_SESSION['info_signup2'] = "Invalid email address.";
        header("Location: signup.php");
        return;
    }
@ -98,15 +100,16 @@ if (!empty($_POST["form_signup"])) {

    // check for strong password
    if (!$containsAll) {
-        $_SESSION['info_signup'] = "Password must have at least characters that include lowercase letters, uppercase letters, numbers and special characters (e.g., !?.,*^).";
+        $_SESSION['info_signup2'] = "Password must have at least characters that include lowercase letters, uppercase letters, numbers and sepcial characters (e.g., !?.,*^).";
        header("Location: signup.php");
        return;
    }

    // check if email is taken
    $result = mysqli_query($con, "SELECT * FROM users_table WHERE email='$email'");
-    if (mysqli_num_rows($result) != 0) {
-        $_SESSION["info_signup"] = "Email address " . $email . "  is already in use.";
+    if(mysqli_num_rows($result) != 0)
+    {
+        $_SESSION["info_signup2"]="Email address ".$email."  is already in use.";
        $_SESSION['user_fullname'] = null;
        header("Location: signup.php");
        return;
@ -146,7 +149,7 @@ if (!empty($_POST["frm_login"])) {
    $password = mysqli_real_escape_string($con, $_POST["password"]);
    $result = mysqli_query($con, "SELECT * FROM users_table WHERE (Student_ID='$user') OR (Email='$user')");
    if (mysqli_num_rows($result) == 0) {
-        $_SESSION["info_login"] = "Invalid user name information.";
+        $_SESSION["info_login"] = "Inavlid user name information.";
        echo $_SESSION["info_login"];
        header("Location: index.php");
    } else {
@ -195,6 +198,7 @@ if (!empty($_POST["frm_recover_password"])) {
    // validate student number
    if (strlen($student_id) != 12  || is_numeric($student_id) == FALSE) {
        $_SESSION["info_recover_password"] = "Invalid student number.";
+        #echo "Invalid student number.";
        header("Location: recover_password.php");
        return;
    }
@ -246,7 +250,7 @@ if (!empty($_POST["frm_reset_password"])) {

                // Password Update
                $hashed_password = hash('sha512', $password);
-                $sql = "UPDATE users_table set HashPassword='$hashed_password' where User_ID='$userid';";
+                $sql = "UPDATE users_table set HashPassword='$hashed_password' where User_ID=$userid;";
                if ($con->query($sql) === TRUE) {

                    error_reporting(0);
@ -268,22 +272,20 @@ if (!empty($_POST["frm_createlecturrer"])) {
    $email = mysqli_real_escape_string($con, $_POST["email"]);
    $fullname = mysqli_real_escape_string($con, $_POST["fullname"]);
    $type = mysqli_real_escape_string($con, $_POST["type"]);
-    $password = mysqli_real_escape_string($con, $_POST["passport"]);
+    $password = $passport;
    // check if email is taken
-    $result = mysqli_query(
-        $con,
-        "SELECT * FROM Users_Table WHERE email='$email'"
-    );
-    if (mysqli_num_rows($result) != 0) {
-        $_SESSION["info_Admin_Users"] = "Email address : " . $email . " is already in use.";
-        header("Location: Admin.php");
+    $result = mysqli_query($con,
+                           "SELECT * FROM Users_Table WHERE email='$email'");
+    if(mysqli_num_rows($result)!=0)
+    {
+        $_SESSION["info_Admin_Users"]="Email address : ".$email." is already in use.";
+        header("Location: Admin.php");        
    }
-    $password_hash = password_hash("$password", PASSWORD_DEFAULT);
-    $sql = "INSERT INTO `users_table`(`Email`, `Password`, `Full_Name`, `UserType`) VALUES "
-        . "('$email','$password_hash','$fullname','$type')";
+    $sql= "INSERT INTO `users_table`(`Email`, `Password`, `Full_Name`, `UserType`) VALUES "
+        . "('$email','$password','$fullname','$type')";

    if ($con->query($sql) === TRUE) {
-        $_SESSION["info_Admin_Users"] = $type . " user created successfully. Use email " . $email . " as account name and $password as password.";
+        $_SESSION["info_Admin_Users"] = $type . " user Created successfully : email " . $email . " and $password as Password.";
        header("Location: Admin.php");
    } else {
        echo "Error: " . $sql . "<br>" . $con->error;
@ -300,7 +302,7 @@ function is_valid_file_format($file)
        'cvc', 'c', 'class', 'cpp', 'h', 'java', 'sh', 'swift', 'zip', 'rar', 'ods', 'xlr', 'bak', 'ico', 'swf'
    );

-    $filename = $_FILES[$file]['name'];
+    utf8_encode($filename = $_FILES[$file]['name']);
    $ext = pathinfo($filename, PATHINFO_EXTENSION);
    $result = in_array($ext, $allowed);
    return $result;
@ -430,7 +432,7 @@ if (!empty($_POST["frm_uploadlab"])) {

    $sql = "INSERT INTO `lab_reports_table`(`Course_ID`, `Posted_Date`, `Deadline`, `Instructions`,
                     `Title`, `Attachment_link_1`, `Attachment_link_2`, `Attachment_link_3`, `Attachment_link_4`,Marks,Type) 
-                     VALUES ('$course_id','$date','$deadline','$instructions','$title','$targetfile','$targetfile2','$targetfile3','$targetfile3','$marks','$type')";
+                     VALUES ('$course_id','$date','$deadline','$instructions','$title','$targetfile','$targetfile2','$targetfile3','$targetfile3',$marks,'$type')";

    if ($con->query($sql) === TRUE) {

@ -452,8 +454,10 @@ function checksize($file)
 }

 // ############################### Submit Assignment ##################################
+
 if (!empty($_POST["frm_submitlab"])) {

+    /* Posting values to database */
    $lab_id = mysqli_real_escape_string($con, $_POST["lab_id"]);
    $student_id = $_POST["student_id"];
    $group_id = $_POST["group_id"];
@ -467,7 +471,7 @@ if (!empty($_POST["frm_submitlab"])) {
    $date = date("Y-m-d H:i:s");

    // GET UPLOADED FILES
-    $labName = mysqli_query($con, "SELECT * FROM `lab_reports_table` WHERE Lab_Report_ID='$lab_id'");
+    $labName = mysqli_query($con, "SELECT * FROM `lab_reports_table` WHERE Lab_Report_ID=$lab_id");
    while ($row = mysqli_fetch_assoc($labName)) {
        $lab_name = $row['Title'];
        $_SESSION['Sub_Type'] = $row['Type']; // submission type, either Individual or Group
@ -550,19 +554,19 @@ if (!empty($_POST["frm_submitlab"])) {
    $targetfile4 = "";

    if (strlen($_FILES['attachment1']['name']) > 2) { // why greater than 2???
-        $targetfile = "/" . $student_id . "/" . $url . "/" . $lab_name . "/" . rawurlencode($_FILES['attachment1']['name']);
+        $targetfile = "/" . $student_id . "/" . $url . "/" . $lab_name . "/" . $_FILES['attachment1']['name'];
    }

    if (strlen($_FILES['attachment2']['name']) > 2) {
-        $targetfile2 = "/" . $student_id . "/" . $url . "/" . $lab_name . "/" . rawurlencode($_FILES['attachment2']['name']);
+        $targetfile2 = "/" . $student_id . "/" . $url . "/" . $lab_name . "/" . $_FILES['attachment2']['name'];
    }

    if (strlen($_FILES['attachment3']['name']) > 2) {
-        $targetfile3 = "/" . $student_id . "/" . $url . "/" . $lab_name . "/" . rawurlencode($_FILES['attachment3']['name']);
+        $targetfile3 = "/" . $student_id . "/" . $url . "/" . $lab_name . "/" . $_FILES['attachment3']['name'];
    }

    if (strlen($_FILES['attachment4']['name']) > 2) {
-        $targetfile4 = "/" . $student_id . "/" . $url . "/" . $lab_name . "/" . rawurlencode($_FILES['attachment4']['name']);
+        $targetfile4 = "/" . $student_id . "/" . $url . "/" . $lab_name . "/" . $_FILES['attachment4']['name'];
    }

    // When $group_id is not properly initialized, use integer 0 as its value.
@ -571,13 +575,13 @@ if (!empty($_POST["frm_submitlab"])) {
        $group_id = 0; // FIXME
    }

-    $sql1 = "DELETE FROM lab_report_submissions where Lab_Report_ID='$lab_id' and Student_id='$student_id' and Course_Group_id='$group_id'";
+    $sql1 = "DELETE FROM lab_report_submissions where Lab_Report_ID=$lab_id and Student_id=$student_id and Course_Group_id=$group_id";
    if ($con->query($sql1) === TRUE) {
    }

    $sql = "INSERT INTO `lab_report_submissions`(`Submission_Date`, `Lab_Report_ID`, `Student_id`,"
        . " `Course_Group_id`, `Attachment1`, `Notes`, `Attachment2`, `Attachment3`, `Attachment4`, `Status`, `Title`,`Remarking_Reason`)"
-        . " VALUES ('$date','$lab_id','$student_id','$group_id','$targetfile','$instructions','$targetfile2','$targetfile3','$targetfile4',"
+        . " VALUES ('$date',$lab_id,$student_id,$group_id,'$targetfile','$instructions','$targetfile2','$targetfile3','$targetfile4',"
        . "'Pending','$title','')";

    if ($con->query($sql) === TRUE) {
@ -595,9 +599,9 @@ if (!empty($_POST["frm_submitlab"])) {
 // JOIN COURSE
 if (!empty($_GET["JoinCourse"])) {

-    $id = mysqli_real_escape_string($con, $_GET["id"]);
-    $student_id = mysqli_real_escape_string($con, $_GET["std"]);
-    $joining = mysqli_real_escape_string($con, $_GET["joining"]);
+    $id = $_GET["id"];
+    $student_id = $_GET["std"];
+    $joining = $_GET["joining"];
    $status = "Pending";

    if ($joining == 0) {
@ -624,12 +628,12 @@ if (!empty($_GET["JoinCourse"])) {

 if (!empty($_GET["savemarks"])) {

-    $id = mysqli_real_escape_string($con, $_GET["id"]);
-    $marks = mysqli_real_escape_string($con, $_GET["marks"]);
-    $total = mysqli_real_escape_string($con, $_GET["total"]);
-    $feedback = mysqli_real_escape_string($con, $_GET["feedback"]);
-    $header = mysqli_real_escape_string($con, $_GET["header"]);
-    $labid = mysqli_real_escape_string($con, $_GET["labid"]);
+    $id = $_GET["id"];
+    $marks = $_GET["marks"];
+    $total = $_GET["total"];
+    $feedback = $_GET["feedback"];
+    $header = $_GET["header"];
+    $labid = $_GET["labid"];
    $status = "Marked";

    if ($marks > $total) {
@ -658,14 +662,14 @@ if (!empty($_GET["savemarks"])) {
 #Update Report Visibility  
 if (!empty($_GET["updatevisibility"])) {

-    $id = mysqli_real_escape_string($con, $_GET["id"]);
-    $marks = mysqli_real_escape_string($con, $_GET["marks"]);
-    $total = mysqli_real_escape_string($con, $_GET["total"]);
-    $status = mysqli_real_escape_string($con, $_GET["status"]);
-    $header = mysqli_real_escape_string($con, $_GET["header"]);
-    $labid = mysqli_real_escape_string($con, $_GET["labid"]);
+    $id = $_GET["id"];
+    $marks = $_GET["marks"];
+    $total = $_GET["total"];
+    $status = $_GET["status"];
+    $header = $_GET["header"];
+    $labid = $_GET["labid"];

-    $sql = "UPDATE `lab_report_submissions` SET `Visibility`='$status' WHERE Submission_ID='$id'
+    $sql = "UPDATE `lab_report_submissions` SET `Visibility`='$status' WHERE Submission_ID=$id
              ";

    if ($con->query($sql) === TRUE) {
@ -681,18 +685,18 @@ if (!empty($_GET["updatevisibility"])) {

 if (!empty($_GET["remarking"])) {

-    $id = htmlspecialchars(mysqli_real_escape_string($con, $_GET["id"]));
-    $url = htmlspecialchars(mysqli_real_escape_string($con, $_GET["url"]));
+    $id = $_GET["id"];
+    $url = $_GET["url"];

-    $status = htmlspecialchars(mysqli_real_escape_string($con, $_GET["status"]));
-    $details = htmlspecialchars(mysqli_real_escape_string($con, $_GET["details"]));
+    $status = $_GET["status"];
+    $details = $_GET["details"];

-    $sql = "UPDATE `lab_report_submissions` SET `Status`='Remarking',Remarking_Reason='$details' WHERE Submission_ID='$id'
+    $sql = "UPDATE `lab_report_submissions` SET `Status`='Remarking',Remarking_Reason='$details' WHERE Submission_ID=$id
              ";

    if ($con->query($sql) === TRUE) {

-        $_SESSION["info_general"] = "Remarking Request Sent";
+        $_SESSION["info_ReMarking"] = "Remarking Request Sent";
        header("Location: Course.php?url=" . $url);
    } else {
        echo "Error: " . $sql . "<br>" . $con->error;
@ -703,13 +707,13 @@ if (!empty($_GET["remarking"])) {

 if (!empty($_GET["creategroup"])) {

-    $student_id = mysqli_real_escape_string($con, $_GET["student_id"]);
-    $url = mysqli_real_escape_string($con, $_GET["url"]);
-    $id = mysqli_real_escape_string($con, $_GET["id"]);
-    $name = mysqli_real_escape_string($con, $_GET["name"]);
+    $student_id = $_GET["student_id"];
+    $url = $_GET["url"];
+    $id = $_GET["id"];
+    $name = $_GET["name"];

    $sql = "INSERT INTO `course_groups_table`(`Group_Name`, 
-                  `Group_Leader`, `Course_id`) VALUES ('$name','$student_id','$id')";
+                  `Group_Leader`, `Course_id`) VALUES ('$name',$student_id,$id)";

    if ($con->query($sql) === TRUE) {

@ -719,9 +723,9 @@ if (!empty($_GET["creategroup"])) {
        }

        $sql = "INSERT INTO `course_group_members_table`( `Course_Group_id`, `Student_ID`, `Status`) 
-                          VALUES ('$gid','$student_id','Created')";
+                          VALUES ($gid,$student_id,'Created')";
        if ($con->query($sql) === TRUE) {
-            $_SESSION["info_general"] = "Course group Created";
+            $_SESSION["info_ReMarking"] = "Course group Created";
            header("Location: Course.php?url=" . $url);
        } else {
            echo "Error: " . $sql . "<br>" . $con->error;
@ -735,25 +739,18 @@ if (!empty($_GET["creategroup"])) {

 if (!empty($_GET["groupinvite"])) {

-    $student_id = mysqli_real_escape_string($con, $_GET["student_id"]);
-    $url = mysqli_real_escape_string($con, $_GET["url"]);
-    $courseid = mysqli_real_escape_string($con, $_GET["courseid"]);
-    $groupid = mysqli_real_escape_string($con, $_GET["groupid"]);
-    $student = mysqli_query($con, "SELECT * FROM students_data WHERE Student_ID = '$student_id'  ");
+    $student_id = $_GET["student_id"];
+    $url = $_GET["url"];
+    $courseid = $_GET["courseid"];
+    $groupid = $_GET["groupid"];

-    if (mysqli_num_rows($student) > 0) {
-
-        $result = mysqli_query($con, "SELECT * FROM course_group_members_table where Course_Group_id = '$groupid' and Student_ID = '$student_id'");
-        if (mysqli_num_rows($result) > 0) {
-            $_SESSION["info_general"] = $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')";
-        }
-    } else {
-        $_SESSION["info_general"] = $student_id . " is an invalid student number.";
+    $result = mysqli_query($con, "SELECT * FROM course_group_members_table where Course_Group_id = '$groupid' and Student_ID = '$student_id'");
+    if (mysqli_num_rows($result) > 0) {
+        $_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) {
@ -771,26 +768,26 @@ if (!empty($_GET["groupinvite"])) {

            if ($Group_Member == '0') {
                mysqli_query($con, "UPDATE `course_groups_table` SET `Group_Member` = ('" . $student_id . "') WHERE `course_groups_table`.`Course_Group_id` = '$groupid'");
-                $_SESSION["info_general"] = $student_id . " was invited to the group.";
+                $_SESSION["info_ReMarking"] = $student_id . " was invited to the group";
                header("Location: Course.php?url=" . $url);
            } elseif ($Group_Member2 == '0') {
                mysqli_query($con, "UPDATE `course_groups_table` SET `Group_Member2` = ('" . $student_id . "') WHERE `course_groups_table`.`Course_Group_id` = '$groupid'");
-                $_SESSION["info_general"] = $student_id . " was invited to the group.";
+                $_SESSION["info_ReMarking"] = $student_id . " was invited to the group";
                header("Location: Course.php?url=" . $url);
            } elseif ($Group_Member3 == '0') {
                mysqli_query($con, "UPDATE `course_groups_table` SET `Group_Member3` = ('" . $student_id . "') WHERE `course_groups_table`.`Course_Group_id` = '$groupid'");
-                $_SESSION["info_general"] = $student_id . " was invited to the group.";
+                $_SESSION["info_ReMarking"] = $student_id . " was invited to the group";
                header("Location: Course.php?url=" . $url);
            } elseif ($Group_Member4 == '0') {
                mysqli_query($con, "UPDATE `course_groups_table` SET `Group_Member4` = ('" . $student_id . "') WHERE `course_groups_table`.`Course_Group_id` = '$groupid'");
-                $_SESSION["info_general"] = $student_id . " was invited to the group.";
+                $_SESSION["info_ReMarking"] = $student_id . " was invited to the group";
                header("Location: Course.php?url=" . $url);
            } else {
-                $_SESSION["info_general"] = " You cannot add any more members";
+                $_SESSION["info_ReMarking"] = " You cant add any more members";
                header("Location: Course.php?url=" . $url);
            }
        }
-        $_SESSION["info_general"] = $student_id . " was invited to the group.";
+        $_SESSION["info_ReMarking"] = $student_id . " was invited to the group";
        header("Location: Course.php?url=" . $url);
    } else {
        echo "Error: " . $sql . "<br>" . $con->error;
@ -801,57 +798,21 @@ if (!empty($_GET["groupinvite"])) {

 if (!empty($_GET["acceptinvite"])) {

-    $student_id = mysqli_real_escape_string($con, $_GET["student_id"]);
-    $url = mysqli_real_escape_string($con, $_GET["url"]);
-    $action = mysqli_real_escape_string($con, $_GET["action"]);
-    $groupid = mysqli_real_escape_string($con, $_GET["groupid"]);
+    $student_id = $_GET["student_id"];
+    $url = $_GET["url"];
+    $action = $_GET["action"];
+    $groupid = $_GET["groupid"];

    if ($action == 1) {
-        $sql = "Update  `course_group_members_table` set Status='Joined' where  Course_Group_id ='$groupid' and student_id='$student_id' 
+        $sql = "Update  `course_group_members_table` set Status='Joined' where  Course_Group_id =$groupid and student_id=$student_id 
                         ";
    } else {
-        $sql = "Delete from  `course_group_members_table`  where  Course_Group_id ='$groupid' and student_id='$student_id' 
+        $sql = "Delete from  `course_group_members_table`  where  Course_Group_id =$groupid and student_id=$student_id 
                         ";
    }

    if ($con->query($sql) === TRUE) {
-        $_SESSION["info_general"] = " Group Invite Updated";
-        header("Location: Course.php?url=" . $url);
-    } else {
-        echo "Error: " . $sql . "<br>" . $con->error;
-    }
-}
-
-#Remove a member from group
-
-if (!empty($_GET["removemember"])) {
-
-    $student_id = mysqli_real_escape_string($con, $_GET["student_id"]);
-    $group_id = mysqli_real_escape_string($con, $_GET["group_id"]);
-    $url = mysqli_real_escape_string($con, $_GET["url"]);
-
-    $sql = "Delete from  `course_group_members_table`  where  student_id=$student_id and Course_Group_id=$group_id";
-
-    if ($con->query($sql) === TRUE) {
-        $_SESSION["info_general"] = " Member " . $student_id . " removed from the group";
-        header("Location: Course.php?url=" . $url);
-    } else {
-        echo "Error: " . $sql . "<br>" . $con->error;
-    }
-}
-
-#Delete a whole group
-
-if (!empty($_GET["deletegroup"])) {
-
-    $group_id = mysqli_real_escape_string($con, $_GET["group_id"]);
-    $url = mysqli_real_escape_string($con, $_GET["url"]);
-
-    $sql1 = "Delete from  `course_group_members_table`  where  Course_Group_id=$group_id";
-    $sql2 = "Delete from `course_groups_table` where Course_Group_id=$group_id";
-
-    if ($con->query($sql1) === TRUE && $con->query($sql2) === TRUE) {
-        $_SESSION["info_general"] = " Group has been deleted successfully. ";
+        $_SESSION["info_ReMarking"] = " Group Invite Updated";
        header("Location: Course.php?url=" . $url);
    } else {
        echo "Error: " . $sql . "<br>" . $con->error;
@ -862,22 +823,22 @@ if (!empty($_GET["deletegroup"])) {

 if (!empty($_GET["extenddeadline"])) {

-    $id = mysqli_real_escape_string($con, $_GET["id"]);
-    $date = mysqli_real_escape_string($con, $_GET["date"]);
-    $time = mysqli_real_escape_string($con, $_GET["time"]);
-    $type = mysqli_real_escape_string($con, $_GET["type"]);
+    $id = $_GET["id"];
+    $date = $_GET["date"];
+    $time = $_GET["time"];
+    $type = $_GET["type"];

-    $stdid = mysqli_real_escape_string($con, $_GET["stdid"]);
-    $reason = mysqli_real_escape_string($con, $_GET["reason"]);
-    $url = mysqli_real_escape_string($con, $_GET["url"]);
+    $stdid = $_GET["stdid"];
+    $reason = $_GET["reason"];
+    $url = $_GET["url"];
    $deadline = $date . " " . $time;

    if ($type == 1) {
-        $sql = "UPDATE `lab_reports_table` SET  `Deadline`='$deadline'  WHERE Lab_Report_ID='$id'";
+        $sql = "UPDATE `lab_reports_table` SET  `Deadline`='$deadline'  WHERE Lab_Report_ID=$id";
    } else {
        $sql = "INSERT INTO `extended_deadlines_table`(`Student_ID`, "
            . "`Lab_Report_ID`, `Extended_Deadline_Date`,"
-            . " `ReasonsForExtension`) VALUES ('$stdid','$id','$deadline','$reason')";
+            . " `ReasonsForExtension`) VALUES ($stdid,$id,'$deadline','$reason')";
    }

    if ($con->query($sql) === TRUE) {
@ -893,13 +854,13 @@ if (!empty($_GET["extenddeadline"])) {

 if (!empty($_GET["ignoreremarking"])) {

-    $id = mysqli_real_escape_string($con, $_GET["id"]);
-    $total = mysqli_real_escape_string($con, $_GET["total"]);
-    $header = mysqli_real_escape_string($con, $_GET["header"]);
+    $id = $_GET["id"];
+    $total = $_GET["total"];
+    $header = $_GET["header"];

-    $subid = mysqli_real_escape_string($con, $_GET["subid"]);
+    $subid = $_GET["subid"];

-    $sql = "UPDATE lab_report_submissions SET Status='Marked' WHERE Submission_ID='$subid'";
+    $sql = "UPDATE lab_report_submissions SET Status='Marked' WHERE Submission_ID=$subid";

    if ($con->query($sql) === TRUE) {

@ -914,10 +875,10 @@ if (!empty($_GET["ignoreremarking"])) {

 if (!empty($_GET["assignTA"])) {

-    $id = mysqli_real_escape_string($con, $_GET["id"]);
-    $ta = mysqli_real_escape_string($con, $_GET["ta"]);
+    $id = $_GET["id"];
+    $ta = $_GET["ta"];

-    $sql = "INSERT INTO `course_ta`(`Course_ID`, `TA`) VALUES ('$id','$ta')";
+    $sql = "INSERT INTO `course_ta`(`Course_ID`, `TA`) VALUES ($id,$ta)";

    if ($con->query($sql) === TRUE) {

@ -932,13 +893,13 @@ if (!empty($_GET["assignTA"])) {

 if (!empty($_GET["AcceptStudent"])) {

-    $id = mysqli_real_escape_string($con, $_GET["id"]);
-    $rs = mysqli_real_escape_string($con, $_GET["rs"]);
+    $id = $_GET["id"];
+    $rs = $_GET["rs"];

    if ($rs == "yes") {
-        $sql = "Update  course_students_table set Status='Joined' Where ID='$id'";
+        $sql = "Update  course_students_table set Status='Joined' Where ID=$id";
    } else {
-        $sql = "Delete FROM  course_students_table Where ID='$id'";
+        $sql = "Delete FROM  course_students_table Where ID=$id";
    }

    if ($con->query($sql) === TRUE) {
@ -960,12 +921,12 @@ if (!empty($_GET["AcceptStudent"])) {
 if (!empty($_GET["action"])) {

    $action = $_GET["action"];
-    $uid = mysqli_real_escape_string($con, $_GET["uid"]);
+    $uid = $_GET["uid"];

-    $pass = mysqli_real_escape_string($con, $_GET["pass"]);
+    $pass = $_GET["pass"];
    $pass = password_hash($pass, PASSWORD_DEFAULT);

-    $status = mysqli_real_escape_string($con, $_GET["status"]);
+    $status = $_GET["status"];

    // validate uid
    if (intval($uid) < 0) {
@ -973,12 +934,12 @@ if (!empty($_GET["action"])) {
        return;
    }

-    if ($action == "passchange"  && $_SESSION['user_id'] == $uid) {
-        $sql = "UPDATE users_table set Password='$pass' where User_ID='$uid';";
+    if ($action == "passchange") {
+        $sql = "UPDATE users_table set Password='$pass' where User_ID=$uid;";
        if ($con->query($sql) === TRUE) {
            error_reporting(0);
            echo "Password has been changed";
-            //return;
+            // return;
            $_SESSION["infoChangePassword"] = $type . " User password was changed successfully.";
            header("Location: index.php");
        } else {
@ -987,8 +948,8 @@ if (!empty($_GET["action"])) {
        }
    }

-    if ($action == "statuschange" && $_SESSION['user_id'] == $uid && ($_SESSION['user_type'] == "Lecturer" || $_SESSION['user_type'] == "Admin")) {
-        $sql = "UPDATE users_table set Status='$status' where User_ID='$uid';";
+    if ($action == "statuschange") {
+        $sql = "UPDATE users_table set Status='$status' where User_ID=$uid;";
        if ($con->query($sql) === TRUE) {
            $_SESSION["info_Admin_Users"] = $type . " user  Status updated successfully ";
            header("Location: Admin.php");
@ -1048,8 +1009,8 @@ if (!empty($_POST["frm_createCourse"])) {

 if (!empty($_GET["exportgrade"])) {

-    $lab = mysqli_real_escape_string($con, $_GET["lab"]);
-    $lab_name = mysqli_real_escape_string($con, $_GET["lab_name"]);
+    $lab = $_GET["lab"];
+    $lab_name = $_GET["lab_name"];

    error_reporting(0);

@ -1061,7 +1022,7 @@ INNER JOIN lab_reports_table on lab_reports_table.Lab_Report_ID=lab_report_submi

 INNER JOIN users_table on users_table.Student_ID=lab_report_submissions.Student_id

-WHERE lab_report_submissions.Lab_Report_ID='$lab'";
+WHERE lab_report_submissions.Lab_Report_ID=$lab";

    $export  = mysqli_query($con, $select);

@ -1091,7 +1052,7 @@ WHERE lab_report_submissions.Lab_Report_ID='$lab'";
    }

    header("Content-type: application/octet-stream");
-    header("Content-Disposition: attachment; filename=$lab_name Grade Sheet.xls");
+    header("Content-Disposition: attachment; filename=$lab_name Garde Sheet.xls");
    header("Pragma: no-cache");
    header("Expires: 0");
    print "$header\n$data";
--- a/Student.php
+++ b/Student.php
@ -9,7 +9,7 @@ include 'Header.php';
 <div class="row" style="width:80%;margin:auto;">

    <div class="col-md-6">
-        <h1> Student Account Created. Now you can Browse Course Portals </h1>
+        <h1> STUEDNT Account Created , Now you can Browse Course Portals </h1>
    </div>

 </div>
--- a/Submissions.php
+++ b/Submissions.php
@ -10,7 +10,7 @@ $group_id = $_SESSION["user_group_id"];
 $c_date = date("Y-m-d H:i");

 if (!empty($_GET["id"])) {
-    $id = mysqli_real_escape_string($con, $_GET["id"]);
+    $id = $_GET["id"];
    $course_id = $id;
 }

@ -183,7 +183,7 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Pending' order by Sub
                            }

                            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> by: <b> <span class = 'text-selectable'>$submitted_by </span> </b>
+  $title  <br> by: <b> $submitted_by </b>
   <br> <span style='font-size:8pt'>Submitted : $posted   <button class='btn-sm btn-info' style='margin-left:50px;' onclick='mark($Submission_ID,\"$title\",$total)'>  Mark Submission</button><br> Attachments : $full_link </span>  
 </div></k>";
                        }
@ -262,13 +262,8 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Marked'  Order by lab
                            if ($att4 != "") {
                                $full_link = $full_link . "| <a href='~\..\Lab_Report_Submisions\\$att4'>$att4</a>";
                            }
-                            // you will notice why i used span here to wrap the $submitted_by variable
-                            // because if we wrap with span , the css class text-selectable can be used only by the submittedBy variable
-                            // if you want to use text-selectable class on whole div, just call the css class
-
-
-                            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> by : <b> <span class = 'text-selectable'>$submitted_by </span> &nbsp; &nbsp;&nbsp;&nbsp;&nbsp; [ Marked $Marks ] </b>  &nbsp; Visibility : <b>$Visibility </b>  <button class='btn-sm btn-success' style='margin-left:50px;' onclick='updatev($Submission_ID)'>Update visibility</button> 
+                            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> by : <b> $submitted_by  &nbsp; &nbsp;&nbsp;&nbsp;&nbsp; [ Marked $Marks ] </b>  &nbsp; Visibility : <b>$Visibility </b>  <button class='btn-sm btn-success' style='margin-left:50px;' onclick='updatev($Submission_ID)'>Update visibility</button> 
   <hr> Lecturer/TA notes : $notes<br> <span style='font-size:8pt'>Submitted : $posted        <b>  </b> <button class='btn-sm btn-info' style='margin-left:50px;' onclick='mark($Submission_ID,\"$title\",$total)'>  Re-Mark Submission</button><br> Attachments : $full_link </span>  
 </div></k>";
                        }
@ -346,8 +341,8 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Remarking'");
                            if ($att4 != "") {
                                $full_link = $full_link . "| <a href='~\..\Lab_Report_Submisions\\$att4'>$att4</a>";
                            }
-                            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> by : <b> <span class = 'text-selectable'>$submitted_by </span>  &nbsp; &nbsp;&nbsp;&nbsp;&nbsp; [ Marked $Marks ] </b> <br> Remarking Reason : <b>$remarking_reason </b>
+                            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> by : <b> $submitted_by  &nbsp; &nbsp;&nbsp;&nbsp;&nbsp; [ Marked $Marks ] </b> <br> Remarking Reason : <b>$remarking_reason </b>
   <hr> <span style='font-size:8pt'>Submitted : $posted        <b>  </b> "
                                . "<button class='btn-sm btn-info' style='margin-left:50px;' onclick='mark($Submission_ID,\"$title\",$total)'>  Re-Mark Submission</button>"
                                . " &nbsp; &nbsp;&nbsp;&nbsp;<a href='~\..\Script.php?ignoreremarking=yes&id=$id&subid=$Submission_ID&header=$header&total=$total&status=Marked' class='btn-sm btn-warning'>  Ignore Request </a>"
@ -375,12 +370,13 @@ WHERE Course_id=$c_id");
                    if (mysqli_num_rows($result) == 0) {
                        echo "You have no Group in this Course";
                    } else {
+                        echo "<div class=\"container\">";
                        while ($row = mysqli_fetch_assoc($result)) {
                            $name = $row['Group_Name'];
                            $leader = $row['Full_Name'] . "(" . $row['Group_Leader'] . ")";
                            $id = $row['Course_Group_id'];
-
-                            echo "<div  class='btn-default'><small> $name -  Leader : $leader </small></div>";
+                        echo "<div class=\"card\" ><div class=\"card-body\">
+                                <h5 class=\"card-title\">$name -  Leader : $leader </h5>  <ul class=\"list-group list-group-flush\">";

                            $rs2 = mysqli_query($con, "SELECT `ID`, `Course_Group_id`, course_group_members_table.Student_ID, 
                            course_group_members_table.`Status`,users_table.Full_Name FROM `course_group_members_table` 
@ -392,10 +388,13 @@ where course_group_members_table.Course_Group_id=$id");
                                $id = $row['Course_Group_id'];
                                $status = $row['Status'];
                                $Student_ID = $row['Student_ID'];
-
-                                echo "<li><small> $name-$Student_ID ($status)</small></li>";
+ 
+                            echo "<li class=\"list-group-item\">$name-$Student_ID ($status)</li>"; 
+ 
                            }
+                            echo "  </ul></div></div>";
                        }
+                            echo "</div>";
                    }
                    ?>

@ -475,4 +474,4 @@ Update Visibility<br><select name="status"> <option> Public </option><option>Pri
            alert(e);
        }
    }
-</script>
+</script>
--- a/SubmitLab.php
+++ b/SubmitLab.php
@ -3,133 +3,123 @@ include 'NoDirectPhpAcess.php';
 ?>

 <?php
-$page='Submit LAB+';
+$page = 'Submit LAB+';
 include 'Header.php';
 ?>

 <div class='row' style='width:80%;margin:auto;'>

+    <?php

-<?php
+    $c_date =  date("Y-m-d H:i");
+    $student_id = $_SESSION["user_student_id"];

-$c_date =  date("Y-m-d H:i");
-$student_id = $_SESSION["user_student_id"];
-  
-if(!empty($_GET["id"]))
-{
-    $id = mysqli_real_escape_string($con, $_GET["id"]);
-    $url = mysqli_real_escape_string($con, $_GET["url"]);
-      
-    $result1 = mysqli_query($con," SELECT `Type`, `Lab_Report_ID`, `Course_ID`, `Posted_Date`, `Deadline`, `Instructions`, `Title`, `Attachment_link_1`, `Attachment_link_2`, `Attachment_link_3`, `Attachment_link_4` FROM `lab_reports_table` WHERE Lab_Report_ID=$id  and Deadline > '$c_date'  ORDER by Lab_Report_ID DESC");
-    if(mysqli_num_rows($result1) == 0)
-    {
-        echo "No active assignments for this course so far.";
-     
-    } else {
-        
-        while($row = mysqli_fetch_assoc($result1)) {
-        
-            $Course_ID = $row['Course_ID'];
-            $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'];
-            $labid = $row['Lab_Report_ID'];
-            $type = $row['Type'];
-        
-            //----------------------------------Giving both the Group Admin and Group Members same priviledges to submit assignment--------------------------------------
-            if($type=="Group"){
-                $resultx1 = mysqli_query($con,"SELECT Course_Group_id  FROM `course_groups_table` WHERE (Course_id=$Course_ID) and ((Group_Member=$student_id ) or (Group_Member2=$student_id ) or (Group_Member3=$student_id ) or (Group_Member4=$student_id ) or (Group_Leader=$student_id))");
-                while($row = mysqli_fetch_assoc($resultx1)) {
-                    $_SESSION["Group_ID"] = $row['Course_Group_id'];
-                }  
-      
-                if($_SESSION["Group_ID"] < 1) 
-                {
-                    echo" <center><h3> This Lab report can only be submitted by Group Admin  </h3> </center> ";
-                    return;
+    if (!empty($_GET["id"])) {
+        $id = $_GET["id"];
+        $url = $_GET["url"];
+
+        $result1 = mysqli_query($con, " SELECT `Type`, `Lab_Report_ID`, `Course_ID`, `Posted_Date`, `Deadline`, `Instructions`, `Title`, `Attachment_link_1`, `Attachment_link_2`, `Attachment_link_3`, `Attachment_link_4` FROM `lab_reports_table` WHERE Lab_Report_ID=$id  and Deadline > '$c_date'  ORDER by Lab_Report_ID DESC");
+        if (mysqli_num_rows($result1) == 0) {
+            echo "No active assignments for this course so far.";
+        } else {
+
+            while ($row = mysqli_fetch_assoc($result1)) {
+
+                $Course_ID = $row['Course_ID'];
+                $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'];
+                $labid = $row['Lab_Report_ID'];
+                $type = $row['Type'];
+
+                //----------------------------------Giving both the Group Admin and Group Members same priviledges to submit assignment--------------------------------------
+                if ($type == "Group") {
+                    $resultx1 = mysqli_query($con, "SELECT Course_Group_id  FROM `course_groups_table` WHERE (Course_id=$Course_ID) and ((Group_Member=$student_id ) or (Group_Member2=$student_id ) or (Group_Member3=$student_id ) or (Group_Member4=$student_id ) or (Group_Leader=$student_id))");
+                    while ($row = mysqli_fetch_assoc($resultx1)) {
+                        $_SESSION["Group_ID"] = $row['Course_Group_id'];
+                    }
+
+                    if ($_SESSION["Group_ID"] < 1) {
+                        echo " <center><h3> This Lab report can only be submitted by Group Admin  </h3> </center> ";
+                        return;
+                    }
                }
-            }
-                                     
-                                     
-            $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>";    
-            }
-               
-            echo    "  <div class='alert' style='margin-left:20px;border-bottom:2px solid #1D91EF;'> <a href='~\..\Courses.php?course=$url'>
+
+                $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>";
+                }
+
+                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 "";
+                echo "";
+            }
        }
    }
-}

-$Group_ID = $_SESSION["Group_ID"];
+    $Group_ID = $_SESSION["Group_ID"];

-?>
+    ?>

 </div>

-
-
-
 <div style="width:80%;margin:auto;">

-         <h3> Submit Lab Report Assignment </h3>
-         <hr>
+    <h3> Submit Lab Report Assignment </h3>
+    <hr>
    <div class="row">
-     
-         <div class="col-md-6">
-            

-         <form method='post' enctype='multipart/form-data' action='Script.php'>
-         <input type='hidden' name='frm_submitlab' value='true' required=''/>
-         <input type='hidden' name='lab_id' value='<?php echo $id; ?>' required=''/>
-         <input type='hidden' name='student_id' value='<?php echo $student_id; ?>' required=''/>
-         <input type='hidden' name='group_id' value='<?php echo $Group_ID; ?>' required=''/>
-         <input type='hidden' name='url' value='<?php echo $url; ?>' required=''/>
-                              
-         Title
-         <input type='text'  name='title' placeholder='Ttle' class='form-control' required=''>
+        <div class="col-md-6">

-         Attachment 1
-         <input type='file'  name='attachment1' placeholder='Attachment 1' class='form-control' required=''>
+            <form method='post' enctype='multipart/form-data' action='Script.php'>
+                <input type='hidden' name='frm_submitlab' value='true' required='' />
+                <input type='hidden' name='lab_id' value='<?php echo $id; ?>' required='' />
+                <input type='hidden' name='student_id' value='<?php echo $student_id; ?>' required='' />
+                <input type='hidden' name='group_id' value='<?php echo $Group_ID; ?>' required='' />
+                <input type='hidden' name='url' value='<?php echo $url; ?>' required='' />

-         Attachment 2
-         <input type='file' name='attachment2' placeholder='Attachment 2' class='form-control'>
+                Title
+                <input type='text' name='title' placeholder='Ttle' class='form-control' required=''>

-         </div>
+                Attachment 1
+                <input type='file' name='attachment1' placeholder='Attachment 1' class='form-control' required=''>

-         <div class="col-md-6">
+                Attachment 2
+                <input type='file' name='attachment2' placeholder='Attachment 2' class='form-control'>

-         Attachment 3
-         <input type='file'  name='attachment3' placeholder='Attachment 3' class='form-control' >
+        </div>

-         Attachment 4
-         <input type='file'  name='attachment4' placeholder='Attachment 4' class='form-control' >
-         <br>
-         
-         <input type='submit' class='btn btn-primary' value='Submit Lab Assignment'><br>
-         </form>
-   
-         </div>
+        <div class="col-md-6">

-   </div>
-    
-</div> 
+            Attachment 3
+            <input type='file' name='attachment3' placeholder='Attachment 3' class='form-control'>
+
+            Attachment 4
+            <input type='file' name='attachment4' placeholder='Attachment 4' class='form-control'>
+            <br>
+
+            <input type='submit' class='btn btn-primary' value='Submit Lab Assignment'><br>
+            </form>
+
+        </div>
+
+    </div>
+
+</div>
--- a/batch_insert.php
+++ b/batch_insert.php
@ -19,7 +19,7 @@ if (!$conn) {
 }

 //获得用户名数据
-$source = mysqli_real_escape_string($conn,$_POST['users']);
+$source = $_POST['users'];

 //如有多个空格，删除剩一个空格
 $source1 = preg_replace('/\s\s+/', ' ', $source);
@ -31,12 +31,13 @@ $source2 = trim($source1);
 //根据空格拆分
 $user = explode(' ', $source2);

+
 //插入数据
 for($index=0; $index < count($user); $index++) {
    $result = mysqli_query($conn, "SELECT * FROM `students_data` WHERE Student_ID='$user[$index]'");    
    if (mysqli_num_rows($result) < 1) {
        if (! mysqli_query($conn, "REPLACE INTO `students_data`(`Student_ID`, `Passport_Number`) VALUES('$user[$index]', '')" ) ) {
-            echo "SQL Error: " . $sql_stmt . "<br>" .htmlspecialchars(mysqli_error($conn));
+            echo "SQL Error: " . $sql_stmt . "<br>" . mysqli_error($conn);
        } else {
            echo "<p>Student number $user[$index] added.</p>";
        }
--- a/css/Styles.css
+++ b/css/Styles.css
@ -0,0 +1,15 @@
+/* Sticky footer styles
+-------------------------------------------------- */
+html {
+  position: relative;
+  min-height: 100%;
+}
+body {
+  margin-bottom: 100px; /* Margin bottom by footer height */
+}
+.footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  height: 100px; /* Set the fixed height of the footer here */ 
+}
--- a/css/main.css
+++ b/css/main.css
@ -1,11 +0,0 @@
-
-/* this css class is used to enable copying in text with the mouse. */
-.text-selectable {
-     
-    -webkit-user-select: text;
-    -moz-user-select: text;
-    -ms-user-select: text;
-    user-select: text;
-    cursor:auto
-  
-   }
--- a/doc/UserDoc.md
+++ b/doc/UserDoc.md
@ -17,10 +17,5 @@ After that, issue the following commands in the mysql prompt.

 The first one uses a database called lrr in MySQL.  The second one deletes a record from `users_table` where the student number is 201131129138.

-Increasing session duration
-------------------

-By default, the session duration in PHP is set to 1,440 seconds (24 minutes). However, this is not convenient in most software systems. Therefore, we may need to increase the duration to allow users to have more session time. To increase the session duration, we need to edit the variable *session.gc_maxlifetime* in **php.ini**. We can increase its default value to whatever we want (e.g., 7200).
-On Ubuntu, the file is located at */etc/php/7.2/apache2/php.ini*. On XAMPP, the file is located at */xampp/php/php.ini*.
-
-*Last modified on 20 April 2022 by Umar*
+*Last modified on 1 June 2020 by Hui*
--- a/index.php
+++ b/index.php
@ -1,7 +1,7 @@
 <?php
-  $page='Home';
-  require 'Header.php';
-  session_start();
+$page='Home';
+require 'Header.php';
+session_start();
 ?>

 <?php
@ -10,119 +10,78 @@ if (isset($_SESSION["user_fullname"])) {
    header("Location: Courses.php");
 }
 ?>
+<div class="album py-5 bg-white">
+        <div class="container bg-white">

-<br><br><br>
+          <div class="row align-items-center"> 

-<div class="row" style="width:85%;margin:auto;">
-  <div class="col-md-4">
-    <br><br>
-    <img src="logo.png" style="width:40%; position:relative; right:-95px; top:1px;">
-    <br><br>
-    <div style="width:20%; position:relative; right:-90px; font-family: Poppins-Regular;">
-    <h1>Lab Report Repository</h1>
-    <br><br>
-    </div>
-    </div>
-    <br>
-    <div style = "position:relative; left:240px; top:-2px;">
-    <h4 class="list-group-item active" style="font-weight:normal;font-family: Poppins-Regular;"> Sign in </h4>
-    <div class="list-group-item">
+            <div class="col-md-6">
+              <div class="mb-6 box-shadow">
+                 <img class="mx-auto d-block" src="logo.png" />  
+                <div class="card-body">
+                  <h1 style="font-family: Poppins-Regular;">Lab Report Repository</h1>
+                </div>
+              </div>
+            </div> 

-    <div class="panel-body">
+            <div class="col-md-6">
+              <div class="card mb-6 box-shadow">
+                    <div class="card-header bg-primary" >  
+                        <h4 class="list-group-item active" style="font-weight:normal;font-family: Poppins-Regular;"> Sign in </h4>
+                    </div> 
+                 <div class="card-body">
+                   <form  method="post" action="Script.php" name="frm_login">
+                    <input type="hidden" name="frm_login" value="true"/>
+                    <p>Student ID / Instructor Email</p>
+                    <input type="text" name="user" placeholder="Email / Student Number" class="form-control" required="required" />
+                    <br>
+                    <p>Password</p>
+                    <input type="password" class="form-control"  name="password" placeholder="Password" required="required" />
+                    <div class="text-center">
+                        <br><input type="submit" class="btn btn-primary my-2 btn-lg btn-block" value="Login">
+                    </div>
+                    <br> <a href="recover_password.php">Reset my password</a>
+                    <div class="text-center">
+                        <br><span >Don't have an account?</span>
+                        <a href="signup.php" >Sign Up</a> 
+                    </div> 
+
+            <?php 
+
+            error_reporting(E_ALL);
+
+            if(isset($_SESSION['info_login'])) {
+                echo  '<hr><div class="alert alert-danger" role="alert">'.$_SESSION['info_login'].'</div>';
+                $_SESSION['info_login']=null;
+            }

-    <form method="post" action="Script.php" name="frm_login">
-    <input type="hidden" name="frm_login" value="true"/>
-    Student ID / Instructor Email
-    <input type="text" name="user" placeholder="Email / Student Number" class="form-control" required="required" id="user_name" />
-    <br>
-    Password
-    <input type="password" class="form-control"  name="password" placeholder="password" required="required" id="user_password" />
-    <div class="text-center">
-    <br><input type="submit" class="btn-primary" value="Login" id="login_btn">
-    </div>
-    <br> <a href="recover_password.php" style="font-weight:normal;color:#2471A3; font-family: Poppins-Regular;
-    font-size: 17px;">Reset my password</a>
-    <div class="text-center">
-    <br><span class="txt1">Don't have an account?</span>
-         <a class="txt2" href="signup.php" style="font-weight:normal" id="signup_link">Sign Up</a>
-        </a>
-    </div>

-    <?php 
-    
-    error_reporting(E_ALL);
-    
-    if(isset($_SESSION['info_login'])) {
-        echo  '<hr><div class="alert alert-danger" role="alert">'.$_SESSION['info_login'].'</div>';
-        $_SESSION['info_login']=null;
-    }
-    
-    
    // wrong pass
-    if(isset($_SESSION['wrong_pass'])) {
-        echo  '<hr><div class="alert alert-danger" role="alert">'.$_SESSION['wrong_pass'].'</div>';
-        $_SESSION['wrong_pass']=null;
-    }
-    
-    
-    if(isset($_SESSION['infoChangePassword'])) {
-        echo  '<hr><div class="alert alert-danger" role="alert">'.$_SESSION['infoChangePassword'].'</div>';
-        $_SESSION['infoChangePassword']=null;
-    }
-    ?>
-      
-    </div>
-    </form>
-    </div>
-</div>
-</div>
-</div>
-
-</div>
+            if(isset($_SESSION['wrong_pass'])) {
+                echo  '<hr><div class="alert alert-danger" role="alert">'.$_SESSION['wrong_pass'].'</div>';
+                $_SESSION['wrong_pass']=null;
+            }


-<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  lanhui.  Last updated on 18/04/2020 by Ashly. <a href="./homepage" style="color:white;">More information ...</a>
-    </div>
+            if(isset($_SESSION['infoChangePassword'])) {
+                echo  '<hr><div class="alert alert-danger" role="alert">'.$_SESSION['infoChangePassword'].'</div>';
+                $_SESSION['infoChangePassword']=null;
+            }
+            ?>
+ 
+                </form>
+                </div>
+              </div>
+            </div> 
+          </div>
+        </div>
+      </div>
+
+<?php 
+require 'Footer.php'; 
+?>

 </body>

-<style>
-    /*------------------------------------------------------------------
-[ Login Button ]*/
-.btn-primary {
-            color: white;
-            border-radius: 5px;
-            text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-            background: rgb(75, 184, 240);
-            padding:5px 100px;
-            font-family: Poppins-Regular;
-            font-size: 23px;
-            line-height: 1.5;
-        }
-
-#footer{
-position:fixed;
-bottom:0;
-left:0;
-background-color:#03417C;
-color:#FFF;
-text-align:center;
-width:100%;
-}
-.txt1 {
-  font-family: Poppins-Regular;
-  font-size: 18px;
-  line-height: 1.5;
-  color: #666666;
-}
-.txt2 {
-  font-family: Poppins-Regular;
-  font-size: 19px;
-  line-height: 1.5;
-  color: #2471A3;
-}
-
-</style>

 </html>
--- a/js/CustomDropdown.js
+++ b/js/CustomDropdown.js
@ -0,0 +1,9 @@
+$(document).ready(function(e){
+    $('.search-panel .dropdown-menu').find('a').click(function(e) {
+		e.preventDefault();
+		var param = $(this).attr("href").replace("#","");
+		var concept = $(this).text();
+		$('.search-panel span#search_concept').text(concept);
+		$('.input-group #search_param').val(param);
+	});
+});
--- a/logout.php
+++ b/logout.php
@ -1,11 +1,11 @@
 <?php

-// Start a new session
-session_start();
 // Destory sessions & redirect to index
+
 session_destroy();
 session_unset();
-
+// Start a new session
+session_start();

 // Generate a new session ID
 session_regenerate_id(true);
--- a/recover_password.php
+++ b/recover_password.php
@ -27,9 +27,9 @@ include 'Header.php';
      <div class="panel-body">
        <form method="post" action="Script.php">
        <input type="hidden" name="frm_recover_password" value="true"/>
-        Student number  <input type="text" name="sno" placeholder="Enter your student number" class="form-control" required="required" value="<?php echo htmlspecialchars($_SESSION['student_number']); ?>">
+        Student number  <input type="text" name="sno" placeholder="Enter your student number" class="form-control" required="required" value="<?php echo $_SESSION['student_number']; ?>">
 	<br/>
-        Email  <input type="text" name="email" placeholder="Enter your email address" class="form-control" required="required" value="<?php echo htmlspecialchars($_SESSION['user_email']); ?>">
+        Email  <input type="text" name="email" placeholder="Enter your email address" class="form-control" required="required" value="<?php echo $_SESSION['user_email']; ?>">
 	<br/>
        <input type="submit" class="btn-primary" value="Recover">
          
@ -38,7 +38,7 @@ include 'Header.php';
 <?php

 if(isset($_SESSION['info_recover_password'])) {
-  echo  '<hr><div class="alert alert-danger" role="alert">'.htmlspecialchars($_SESSION['info_recover_password']).'</div>';
+  echo  '<hr><div class="alert alert-danger" role="alert">'.$_SESSION['info_recover_password'].'</div>';
  $_SESSION['info_recover_password']=null;
 }

--- a/signup.php
+++ b/signup.php
@ -6,40 +6,42 @@ include 'NoDirectPhpAcess.php';
 include 'Header.php';
 ?>

-<div class="row">
-
-    <div class="col-md-4 list-group" style="margin:auto;">
+<div class="album py-5 bg-white">
+    <div class="container bg-white">
+ 
+    <div class="col-md-6 panel panel-primary" >

        <br>

        <h4 class="list-group-item active"> Please fill in each field below </h4>
        <div class="list-group-item">

-            <div class="panel-body">
+            <div class="panel panel-primary">

-                <form method="post" action="Script.php" id="signup_form">
-                    <input type="hidden" name="form_signup" value="true" />
-                    Full Name
-                    <input type="text" name="fullname" placeholder="Your full name" class="form-control" value="<?php echo $_SESSION['user_fullname']; ?>" required="required" id="full_name"/>
+                <form method="post" action="Script.php">
+                    <input type="hidden" name="frm_signup_2" value="true" />
+                    <p>Full Name</p>
+                    <input type="text" name="fullname" placeholder="Your full name" class="form-control" value="<?php echo $_SESSION['user_fullname']; ?>" required="required" />

-                    Student ID
-                    <input type="text" name="user_student_id" placeholder="Entre your student ID" class="form-control" value="<?php echo $_SESSION['user_student_id']; ?>" required="required" id="student_id">
+                    <p>Student ID</p>
+                    <input type="text" name="user_student_id" placeholder="Entre your student ID" class="form-control" value="<?php echo $_SESSION['user_student_id']; ?>" required="required">

-                    Email
-                    <input type="text" name="email" placeholder="Email" class="form-control" value="<?php echo $_SESSION['user_email']; ?>" required="required" id="email" />
+                    <p>Email</p>
+                    <input type="text" name="email" placeholder="Email" class="form-control" value="<?php echo $_SESSION['user_email']; ?>" required="required" />

-                    Password (<i>must include uppercase and lowercase letters, digits and special characters</i>)
-                    <input type="password" class="form-control" name="password" placeholder="Enter password" required="required" id="password1" />
+                    <p>Password (<i>must include uppercase and lowercase letters, digits and special characters</i>)</p>
+                    <input id="password" type="password" pattern="^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{4,}$" title="Password must have at least characters that include lowercase letters, uppercase letters, numbers and sepcial characters (e.g., !?.,*^)." class="form-control" name="password" placeholder="Enter password" required="required"  onchange="if(this.checkValidity()) form.password_two.pattern = this.value;" />

-                    Confirm Password
-                    <input type="password" class="form-control" name="confirmpassword" placeholder="Confirm password" required="required" id="password2" />
+                    <p>Confirm Password</p>
+                    <input id="password_two" type="password" pattern="^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{4,}$" title="Password must have at least characters that include lowercase letters, uppercase letters, numbers and sepcial characters" class="form-control" name="confirmpassword" placeholder="Confirm password" required="required" onchange="this.setCustomValidity(this.validity.patternMismatch ? 'Please enter the same Password as above' : '');" />
                    <br>
-                    <input type="submit" class="btn-primary" value="Sign up" id="signup_btn">
+
+                    <input type="submit" class="btn btn-primary" value="Sign up">
                    <?php
                    error_reporting(E_ALL);
-                    if (isset($_SESSION['info_signup'])) {
-                        echo  '<hr><div class="alert alert-danger" role="alert">' . $_SESSION['info_signup'] . '</div>';
-                        $_SESSION['info_signup'] = null;
+                    if (isset($_SESSION['info_signup2'])) {
+                        echo  '<hr><div class="alert alert-danger" role="alert">' . $_SESSION['info_signup2'] . '</div>';
+                        $_SESSION['info_signup2'] = null;
                    }
                    ?>
                </form>
@ -48,17 +50,5 @@ include 'Header.php';
        </div>
    </div>
 </div>
-<style>
-    /*------------------------------------------------------------------
-[ Login Button ]*/
-    .btn-primary {
-        color: white;
-        border-radius: 5px;
-        text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-        background: rgb(75, 184, 240);
-        padding: 5px 105px;
-        font-family: Poppins-Regular;
-        font-size: 23px;
-        line-height: 1.5;
-    }
-</style>
+</div>
+
--- a/test/SeleniumIbrahim/test_kit/admin.py
+++ b/test/SeleniumIbrahim/test_kit/admin.py
@ -32,12 +32,12 @@ class Admin(Actor):

 			#Locate "Admin" tab.
 			wait = WebDriverWait(driver, 10)
-			admin = wait.until(EC.presence_of_element_located((By.ID, "admin_tab")))
+			admin = wait.until(EC.presence_of_element_located((By.XPATH, "/html/body/nav/div/form/a[1]")))
 			admin.click()

 			#Locate "Create Lecturer/TA account" form
 			wait2 = WebDriverWait(driver, 10)
-			new_account_form = wait2.until(EC.presence_of_element_located((By.ID, "create_account_form")))
+			new_account_form = wait2.until(EC.presence_of_element_located((By.ID, "frm_create_acc")))

 			#Fill in the form fields
 			name_field = new_account_form.find_element(By.XPATH, "//input[@name='fullname']")
@ -53,13 +53,13 @@ class Admin(Actor):

 			#If "Lecturer" is specified in type parameter, select Lecturer account type, else use default
 			if type == "Lecturer":
-				type_radio = new_account_form.find_element(By.ID, "role_lecturer")
+				type_radio = new_account_form.find_element(By.XPATH, "//input[@value='Lecturer']")
 			else:
-				type_radio = new_account_form.find_element(By.ID, "role_TA")
+				type_radio = new_account_form.find_element(By.XPATH, "//input[@value='TA']")

 			type_radio.click()

-			submit_btn = new_account_form.find_element(By.ID, "create_btn")
+			submit_btn = new_account_form.find_element(By.XPATH, "//input[@type='submit'][@value='Create']")
 			submit_btn.click()

 			return 0
@ -92,23 +92,23 @@ class Admin(Actor):

 			#Locate the "Admin" tab.
 			wait = WebDriverWait(driver, 10)
-			admin = wait.until(EC.presence_of_element_located((By.ID, "admin_tab")))
+			admin = wait.until(EC.presence_of_element_located((By.XPATH, "/html/body/nav/div/form/a[1]")))
 			admin.click()

 			#Navigate to "Batch create form"
 			wait2 = WebDriverWait(driver, 10)
-			batch_tab = wait2.until(EC.presence_of_element_located((By.ID, "batch_tab")))
+			batch_tab = wait2.until(EC.presence_of_element_located((By.XPATH, "/html/body/div[2]/div[1]/div/ul/li[2]/a")))
 			batch_tab.click()

 			#Fill in the form
 			wait3 = WebDriverWait(driver, 10)
-			batch_form = wait3.until(EC.presence_of_element_located((By.ID, "batch_form")))
+			batch_form = wait3.until(EC.presence_of_element_located((By.ID, "frm_batch_acc")))
 			
 			text_area = batch_form.find_element(By.XPATH, "//textarea[@name='users']")
 			for i in range(len(lst)):
 				text_area.send_keys(lst[i]+" ")

-			submit_btn = batch_form.find_element(By.ID, "register_btn")
+			submit_btn = batch_form.find_element(By.XPATH, "//input[@type='submit'][@value='Create All']")
 			submit_btn.click()

 		except:
@ -139,22 +139,22 @@ class Admin(Actor):

 			#Locate the "Admin" tab.
 			wait = WebDriverWait(driver, 10)
-			admin = wait.until(EC.presence_of_element_located((By.ID, "admin_tab")))
+			admin = wait.until(EC.presence_of_element_located((By.XPATH, "/html/body/nav/div/form/a[1]")))
 			admin.click()

 			#Navigate to "Exisitin Accounts" table
 			wait2 = WebDriverWait(driver, 10)
-			exist_acc_tab = wait2.until(EC.presence_of_element_located((By.ID, "existing_accounts_tab")))
+			exist_acc_tab = wait2.until(EC.presence_of_element_located((By.XPATH, "/html/body/div[2]/div[1]/div/ul/li[3]/a")))
 			exist_acc_tab.click()		
 			
 			#Alternate between block and activate
 			if op == "block":
 				#Locate first account and block it on existing account table
 				wait3 = WebDriverWait(driver, 10)
-				button = driver.find_element(By.ID, "block_account_1")
+				button = driver.find_element_by_id("block_acc_1")
 			elif op == "activate":
 				wait3 = WebDriverWait(driver, 10)
-				button = driver.find_element(By.ID, "activate_account_1")
+				button = driver.find_element_by_id("activate_acc_1")
 			
 			driver.execute_script("arguments[0].click();", button)

@ -188,18 +188,18 @@ class Admin(Actor):

 			#Locate the "Admin" tab.
 			wait = WebDriverWait(driver, 10)
-			admin = wait.until(EC.presence_of_element_located((By.ID, "admin_tab")))
+			admin = wait.until(EC.presence_of_element_located((By.XPATH, "/html/body/nav/div/form/a[1]")))
 			admin.click()

 			#Navigate to "Existing Courses" table.
 			wait2 = WebDriverWait(driver, 10)
-			courses_table = wait2.until(EC.presence_of_element_located((By.ID, "existing_courses")))
+			courses_table = wait2.until(EC.presence_of_element_located((By.XPATH, "/html/body/div[2]/div[2]/div/ul/li[2]/a")))
 			courses_table.click()

 			#Assign TA to the first course in "Existing Courses" table
 			wait3 = WebDriverWait(driver, 10)
-			drop_menu_form = wait3.until(EC.presence_of_element_located((By.ID, "drop_menu_form_1")))
-			assign_btn = drop_menu_form.find_element(By.ID, "assign_btn_1")
+			drop_menu_form = wait3.until(EC.presence_of_element_located((By.XPATH, "//*[@id='menub']/table/tbody/tr[2]/td[5]/form")))
+			assign_btn = drop_menu_form.find_element(By.XPATH, "//input[@type='submit'][@value='assign']")
 			assign_btn.click()

 			return 0
--- a/test/SeleniumIbrahim/test_kit/instructor.py
+++ b/test/SeleniumIbrahim/test_kit/instructor.py
@ -60,25 +60,26 @@ class Instructor(Actor):

 			#wait until the lab submission form shows up
 			wait2 = WebDriverWait(driver, 10)
-			new_lab_assignment_form = wait2.until(EC.presence_of_element_located((By.ID, "newlab_form")))
+			new_lab_assignment_form = wait2.until(EC.presence_of_element_located((By.XPATH, "//form[@id='nlaf']")))
 			
 			#Fill the required form fields and submit.
-			lab_date = new_lab_assignment_form.find_element(By.ID, "date")
-			lab_date.send_keys(dateStr)
-			lab_title = new_lab_assignment_form.find_element(By.ID, "lab_title")
+			lab_date = new_lab_assignment_form.find_element(By.XPATH, "//input[@id='date'][@name='deadlinedate']")
+			timeStr = self.utility.getTodayDate()
+			lab_date.send_keys(timeStr)
+			lab_title = new_lab_assignment_form.find_element(By.XPATH, "//form[@id='nlaf']/input[@id='ltitle']")
 			lab_title.send_keys("TESTASSIGNMENT"+str(dateStr))
-			lab_instructions = new_lab_assignment_form.find_element(By.ID, "lab_instructor")
+			lab_instructions = new_lab_assignment_form.find_element(By.XPATH, "//form[@id='nlaf']/textarea[@id='linstruct']")
 			lab_instructions.send_keys("TESTINSTRUCTIONS"+str(dateStr))
-			lab_marks = new_lab_assignment_form.find_element(By.ID, "lab_mark")
+			lab_marks = new_lab_assignment_form.find_element(By.XPATH, "//form[@id='nlaf']/input[@id='lmark']")
 			lab_marks.send_keys("4")

 			#if group == 0 select individual submission, if group == 1 select group submission
 			if group == 0:		
-				submission_type = new_lab_assignment_form.find_element(By.ID, "lab_individual")
+				submission_type = new_lab_assignment_form.find_element(By.XPATH, "//form[@id='nlaf']/input[@id='lindi']")
 			elif group == 1:
-				submission_type = new_lab_assignment_form.find_element(By.ID, "lab_group")
+				submission_type = new_lab_assignment_form.find_element(By.XPATH, "//form[@id='nlaf']/input[@id='lgrp']")
 			submission_type.click()
-			submit = new_lab_assignment_form.find_element(By.ID, "submit_btn")
+			submit = new_lab_assignment_form.find_element(By.XPATH, "//form[@id='nlaf']/input[@id='lbtn']")
 			submit.click()
 			return 0
 		except:
@ -114,25 +115,25 @@ class Instructor(Actor):
 			timeStr = self.utility.getTime()
 			
 			#Fill the required form fields and submit
-			course_name = driver.find_element(By.ID, "course_name")
+			course_name = driver.find_element(By.ID, "cname")
 			course_name.send_keys("TESTCOURSE"+str(dateStr)+str(timeStr))
 			
 			#This URL is needed to access the same created course via its link in post_lab_report() method.
 			global courseURL
 			courseURL = "TESTCOURSE"+str(dateStr)+str(timeStr)
-			course_code = driver.find_element(By.ID, "course_code")
+			course_code = driver.find_element(By.ID, "ccode")
 			course_code.send_keys("TC"+str(dateStr)+str(timeStr))
 			self.utility.storeCourseCode("TC"+str(dateStr)+str(timeStr))#Store course code to be used
-			academic_year = driver.find_element(By.ID, "academic_year")				#later by student.
+			academic_year = driver.find_element(By.ID, "ayear")				#later by student.
 			academic_year.send_keys("2021")
-			faculty = driver.find_element(By.ID, "faculty")
+			faculty = driver.find_element(By.ID, "fac")
 			faculty.send_keys("TESTING DEPARTMENT")

 			#If joining == 0 does not require join approval, if joining == 1 requires join approval
 			if joining == 0 :
-				joining_students = driver.find_element(By.ID, "join_no")
+				joining_students = driver.find_element(By.ID, "jno")
 			elif group == 1:
-				joining_students = driver.find_element(By.ID, "join_yes")
+				joining_students = driver.find_element(By.ID, "jyes")
 			joining_students.click()
 			submit = driver.find_element(By.ID, "portal_btn")
 			submit.click()
@ -164,12 +165,12 @@ class Instructor(Actor):

 			#Wait until the submission portal card appears
 			wait2 = WebDriverWait(driver, 10)
-			view = wait2.until(EC.presence_of_element_located((By.ID, "view_submissions_link_1")))
+			view = wait2.until(EC.presence_of_element_located((By.ID, "view_btn")))
 			view.click()

 			#Locate and click the 'Mark Submission' btn
 			wait3 = WebDriverWait(driver, 10)
-			mark_submission = wait3.until(EC.presence_of_element_located((By.ID, "mark_submission_btn_1")))
+			mark_submission = wait3.until(EC.presence_of_element_located((By.ID, "mark_btn")))
 			mark_submission.click()

 			#Fill and submit marking descision
@ -210,7 +211,7 @@ class Instructor(Actor):

 			#Wait until lab report assignment list appears.
 			wait = WebDriverWait(driver, 10)
-			extend_deadline = wait.until(EC.presence_of_element_located((By.ID, "extend_deadline_link")))
+			extend_deadline = wait.until(EC.presence_of_element_located((By.ID, "ext_btn")))
 			extend_deadline.click()

 			#Wait until the extend deadline popup window shows up.
@ -218,10 +219,10 @@ class Instructor(Actor):
 			extend_deadline_form = wait2.until(EC.presence_of_element_located((By.ID, "frm")))
 			
 			#Insert the new deadline and submit for all.
-			new_date = extend_deadline_form.find_element(By.ID, "new_date")
+			new_date = extend_deadline_form.find_element(By.XPATH, "//form[@id='frm']/input[3]")
 			dateStr = self.utility.getTomorrowDate()
 			new_date.send_keys(str(dateStr))
-			target = extend_deadline_form.find_element(By.ID, "extend_for_all")
+			target = extend_deadline_form.find_element(By.XPATH, "//form[@id='frm']/input[5]")
 			target.click()
 			submit = extend_deadline_form.find_element(By.XPATH, "/html/body/div[3]/div[2]/div/button[1]")
 			submit.click()
--- a/test/SeleniumIbrahim/test_kit/student.py
+++ b/test/SeleniumIbrahim/test_kit/student.py
@ -55,10 +55,10 @@ class Student(Actor):

 			#Wait until the course is found, and join.
 			wait2 = WebDriverWait(driver, 10)
-			join_btn = wait2.until(EC.element_to_be_clickable((By.ID, "join_btn")))
-			join_btn.click()
+			course_card = wait.until(EC.element_to_be_clickable((By.LINK_TEXT, str("Join Course"))))
+			course_card.click()

-			#If joined course successfully, proceed.
+			#If the joined course successfully, proceed.
 			wait3 = WebDriverWait(driver, 10).until(EC.presence_of_element_located((By.XPATH, "/html/body/div[1]/div[1]/span")))
 			return 0

@ -89,19 +89,19 @@ class Student(Actor):

 			#Locate and click assignment submission button.
 			wait2 = WebDriverWait(driver, 10)
-			assignment_card = wait2.until(EC.element_to_be_clickable((By.ID, "submit_lab_report_btn")))
+			assignment_card = wait2.until(EC.element_to_be_clickable((By.LINK_TEXT, "Submit Lab Report")))
 			assignment_card.click()

 			#Locate the assignment submission form and fill in the required data.
 			wait3 = WebDriverWait(driver, 10)
-			assignment_form = wait3.until(EC.presence_of_element_located((By.ID, "submit_lab_report_form")))
+			assignment_form = wait3.until(EC.presence_of_element_located((By.ID, "sub_form")))
 			title = assignment_form.find_element(By.ID, "title")
 			dateStr = self.utility.getTodayDate()
 			timeStr = self.utility.getTime()
 			title.send_keys("TESTSUBMISSIOM"+dateStr+timeStr)
-			attachment = assignment_form.find_element(By.ID, "attachment1")
+			attachment = assignment_form.find_element(By.ID, "att_one")
 			attachment.send_keys(os.getcwd()+"/DUMMY_SUBMISSION.txt")
-			submit = driver.find_element(By.ID, "submit_lab_assignment_btn")
+			submit = driver.find_element(By.ID, "submit_btn")
 			submit.click()
 			return 0

@ -135,7 +135,7 @@ class Student(Actor):
 			wait2 = WebDriverWait(driver, 10)
 			marked_tab = wait2.until(EC.presence_of_element_located((By.ID, "marked_tab")))
 			marked_tab.click()
-			req_remark = driver.find_element(By.ID, "request_remarking_btn")
+			req_remark = driver.find_element(By.ID, "req_remark")
 			req_remark.click()

 			#Fill in the remarking form and submit.
@ -172,7 +172,7 @@ class Student(Actor):

 			#Locate the create course group button and click it.
 			wait2 = WebDriverWait(driver, 10)
-			create_group = wait2.until(EC.presence_of_element_located((By.ID, "create_group_btn")))
+			create_group = wait2.until(EC.presence_of_element_located((By.ID, "g_create_btn")))
 			create_group.click()

 			#Fill in the course group form and create.
@ -180,9 +180,9 @@ class Student(Actor):
 			group_form = wait3.until(EC.presence_of_element_located((By.ID, "frm")))
 			timeStr = self.utility.getTime()
 			dateStr = self.utility.getTodayDate()
-			group_name = group_form.find_element(By.ID, "group_name")
+			group_name = group_form.find_element(By.ID, "g_name")
 			group_name.send_keys("TESTGROUP"+str(dateStr)+str(timeStr))
-			create = driver.find_element(By.XPATH, "/html/body/div[7]/div[2]/div/button[1]")
+			create = group_form.find_element(By.XPATH, "//div[2]/div/button[1]")
 			create.click()
 			return 0

--- a/test/SeleniumIbrahim/test_kit/utility.py
+++ b/test/SeleniumIbrahim/test_kit/utility.py
@ -44,7 +44,6 @@ class MyUtility:
 		"""
 		try:
 			driver = webdriver.Chrome()
-			driver.maximize_window()
 			driver.get(self.getPageURL())
 			return driver
 		except:
@ -70,11 +69,11 @@ class MyUtility:
 		try:
 			driver = self.getSession()
 			WebDriverWait(driver, 10)
-			username = driver.find_element(By.ID, "user_name")
+			username = driver.find_element(By.ID, "uname")
 			username.send_keys(obj.getStudentID())
-			password = driver.find_element(By.ID, "user_password")
+			password = driver.find_element(By.ID, "upass")
 			password.send_keys(obj.getPassword())
-			login = driver.find_element(By.ID, "login_btn")
+			login = driver.find_element(By.ID, "log_btn")
 			login.click()
 			return driver
 		except:
@ -105,35 +104,26 @@ class MyUtility:
 			driver = self.getSession()
 			wait = WebDriverWait(driver, 10, ignored_exceptions='StaleElementReferenceException')

-			#Click the sign up button, and fill the sign up form
-			signup_btn = wait.until(EC.presence_of_element_located((By.ID, "signup_link")))
-			signup_btn.click()
-			
-			#Find and fill full student name
-			wait2 = WebDriverWait(driver, 10)
-			signup_form = wait2.until(EC.presence_of_element_located((By.ID, "signup_form")))
-			name_field = signup_form.find_element(By.ID, "full_name")
-			name_field.send_keys(name)
-
-			#Find and fill student ID
-			student_id = signup_form.find_element(By.ID, "student_id")
+			#Locate the signup form and fill in the student ID
+			signup_form = wait.until(EC.presence_of_element_located((By.ID, "signup_frm")))
+			student_id = signup_form.find_element(By.ID, "std_id")
 			std_id = self.fetch_new_student_id()
 			student_id.send_keys(std_id)
-			
-			#Find and fill email
-			email_field = signup_form.find_element(By.ID, "email")
+			next_btn = signup_form.find_element(By.ID, "next_btn")
+			next_btn.click()
+
+			#Fill in student data and sign up.
+			wait2 = WebDriverWait(driver, 10, ignored_exceptions='StaleElementReferenceException')
+			reg_form = wait2.until(EC.presence_of_element_located((By.ID, "frm")))
+			name_field = reg_form.find_element(By.XPATH, "//form/input[2]")
+			name_field.send_keys(name)
+			email_field = reg_form.find_element(By.XPATH, "//form/input[3]")
 			email_field.send_keys(email)
-			
-			#Find and fill password
-			password_field = signup_form.find_element(By.ID, "password1")
+			password_field = reg_form.find_element(By.XPATH, "//form/input[4]")
 			password_field.send_keys(password)
-			
-			#Find and fill password confirmation
-			re_password_field = signup_form.find_element(By.ID, "password2")
+			re_password_field = reg_form.find_element(By.XPATH, "//form/input[5]")
 			re_password_field.send_keys(password)
-			
-			#Sign up new student
-			submit = signup_form.find_element(By.ID, "signup_btn")
+			submit = reg_form.find_element(By.XPATH, "//form/input[6]")
 			submit.click()
 			return 0

@ -175,9 +165,8 @@ class MyUtility:
 		- date: formatted date string.

 		"""
-		date = datetime.datetime.today() + datetime.timedelta(days=1)
-		date_str = date.strftime ('%m%d%Y')
-		return date_str
+		date = datetime.datetime.today().strftime ('%d%m%Y')
+		return date
 	
 	def getTomorrowDate(self):
 		
@ -188,8 +177,8 @@ class MyUtility:
 		- date: formatted date string.

 		"""		
-		date = datetime.datetime.today() + datetime.timedelta(days=2)
-		date_str = date.strftime('%m%d%Y')
+		date = datetime.datetime.today() + datetime.timedelta(days=1)
+		date_str = date.strftime('%d%m%Y')
 		return date_str

 	def getYesterdayDate(self):
@ -202,7 +191,7 @@ class MyUtility:

 		"""
 		date = datetime.datetime.today() - datetime.timedelta(days=1)
-		date_str = date.strftime('%m%d%Y')
+		date_str = date.strftime('%d%m%Y')
 		return date_str

 	def storeCourseCode(self, course_code):
@ -312,13 +301,4 @@ class MyUtility:
 		for i in range(ch):
 			ls.append(chr(random.randint(97,122)))

-		return ''.join(ls)
-
-	def clean(self, file):
-		"""This method clean the test scripts directory by resetting some
-		.txt files.
-		"""
-
-		#Clean 'course_code.txt' file
-		f = open(file, "w+")
-		f.close()
+		return ''.join(ls)
Author	SHA1	Message	Date
Dmytro Lamashevski	62c708e12f	Bug 34 Update UI	2022-06-16 13:24:24 +02:00
Dmytro Lamashevski	b5bdfa4b03	Merge branch 'Bug37-Dmytro' of http://121.4.94.30:3000/mrlan/LRR into Bug37-Dmytro	2022-06-16 12:28:24 +02:00
Dmytro Lamashevski	24120f1bc4	Fixed 418 Update SQL and change UI	2022-06-16 12:28:12 +02:00
LAMASHEVSKYI DMYTRO	6acac2dbc7	Merge branch 'master' into Bug37-Dmytro	2021-12-01 09:22:55 +08:00
Dmytro Lamashevski	18a41dd1bb	Fixed merge commits Fixed merge commits Added password pattern: https://www.w3schools.com/howto/howto_js_password_validation.asp Validating to make password one and two similar: https://stackoverflow.com/questions/9142527/can-you-require-two-form-fields-to-match-with-html5 Fixed Button and HTML Tags for text in login and registration form	2021-12-01 00:03:37 +01:00
Lan Hui	036489041f	Remove all *.rej files.	2021-11-22 10:46:49 +08:00
Lan Hui	207d12a4a3	LAMASHEVSKYI DMYTRO's work on mobile phone UI adaption. Need more detail? Check the Kanban card at http://118.25.96.118/kanboard/?controller=TaskViewController&action=show&task_id=1483&project_id=170	2021-11-16 22:20:40 +08:00