Make pages look even better.
parent
e74c018a8c
commit
7d28f987d2
26
Course.php
26
Course.php
|
|
@ -275,7 +275,7 @@ Lab_Report_ID not in (select Lab_Report_ID from lab_report_submissions where (St
|
|||
$id = $row['Lab_Report_ID'];
|
||||
if( $c_date < $deadline)
|
||||
{
|
||||
$submittedx="<a href='~\..\SubmitLab.php?id=$id&url=$url' class='btn-sm btn-default'><i class='fa fa-check-circle'></i> Re-submit </a>";
|
||||
$submittedx="<a href='~\..\SubmitLab.php?id=$id&url=$url' class='btn-sm btn-info'>Re-submit</a>";
|
||||
}
|
||||
|
||||
$full_link = "<a href='~\..\Lab_Report_Assignments\\$att1'>$att1</a>";
|
||||
|
|
@ -292,9 +292,9 @@ Lab_Report_ID not in (select Lab_Report_ID from lab_report_submissions where (St
|
|||
}
|
||||
|
||||
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 ($marks Marks) <br> <span style='font-size:8pt'> $ins</span>
|
||||
<br> <span style='font-size:8pt'>Posted:$posted Deadline:$deadline $submittedx <span class='btn-sm btn-success' style='margin-left:50px;'><i class='fa fa-Edit-circle'></i> Submitted </span>
|
||||
<br> Submitted files: ";
|
||||
$title ($marks Marks) <i class='fa fa-check-circle'></i> Submitted <br> <span style='font-size:8pt'> $ins</span>
|
||||
<br> <span style='font-size:9pt'>Posted:$posted Deadline:$deadline</span> $submittedx
|
||||
<br> <span style='font-size:9pt'>Submitted files: ";
|
||||
|
||||
$Sub_result = mysqli_query($con,"SELECT `Submission_ID`, `Submission_Date`, lab_report_submissions.Lab_Report_ID,
|
||||
lab_report_submissions.Student_id sub_std, lab_report_submissions.Course_Group_id, `Attachment1`,
|
||||
|
|
@ -403,7 +403,7 @@ where Lab_Report_ID=$lab_repo_id and (lab_report_submissions.Student_id='$studen
|
|||
if($status=='Marked')
|
||||
{
|
||||
$rm_data="\Script.php?remarking=yes&id=$Submission_ID&url=$url&status=Remarking";
|
||||
$remarking="<button onclick='remarking(\"$rm_data\")' class='btn-sm btn-success'> Request remarking </button>";
|
||||
$remarking="<button onclick='remarking(\"$rm_data\")' class='btn-sm btn-light'>Request remarking</button>";
|
||||
}
|
||||
if($status=='Remarking')
|
||||
{
|
||||
|
|
@ -412,8 +412,8 @@ where Lab_Report_ID=$lab_repo_id and (lab_report_submissions.Student_id='$studen
|
|||
}
|
||||
|
||||
|
||||
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 <b> ($marks marks out of $Originalmarks)</b><br><small> Lecturer feedback: $notes </small> $remarking <br> Submitted files :";
|
||||
echo "<div class='btn btn-default break-word' style='dislay:block; word-wrap: break-word; border: 1px solid #F0F0F0;border-left: 4px solid #03407B;'>
|
||||
$title <b> ($marks marks out of $Originalmarks)</b><br><small> Lecturer feedback: $notes </small> $remarking <br> <small>Submitted files :";
|
||||
|
||||
$Sub_result = mysqli_query($con,"SELECT `Submission_ID`, `Submission_Date`, lab_report_submissions.Lab_Report_ID,
|
||||
lab_report_submissions.Student_id sub_std, lab_report_submissions.Course_Group_id, `Attachment1`,
|
||||
|
|
@ -453,7 +453,7 @@ where Lab_Report_ID=$lab_repo_id and (lab_report_submissions.Student_id='$studen
|
|||
}
|
||||
|
||||
}}
|
||||
echo "</div></k>";
|
||||
echo "</small></div>";
|
||||
?>
|
||||
|
||||
</div>
|
||||
|
|
@ -462,6 +462,7 @@ where Lab_Report_ID=$lab_repo_id and (lab_report_submissions.Student_id='$studen
|
|||
|
||||
</div>
|
||||
|
||||
<br><br><br><br><br><br><br><br><br>
|
||||
<div class="col-md-3">
|
||||
<h3>My groups</h3>
|
||||
|
||||
|
|
@ -501,8 +502,7 @@ course_groups_table.Course_Group_id=course_group_members_table.Course_Group_id W
|
|||
}
|
||||
|
||||
# Add "delete group" button and allow only group creator to delete it
|
||||
$extra4 = "<button onclick='deleteGroup($id)' class='btn btn-danger' style='height: 25px; width: 95px;
|
||||
line-height: 12px; font-size: 12px'>Delete group</button>";
|
||||
$extra4 = "<button onclick='deleteGroup($id)' class='btn btn-danger' style='height: 25px; width: 95px; line-height: 12px; font-size: 12px'>Delete group</button>";
|
||||
|
||||
echo "<div class='btn-default'><small> $name ($status) $extra $extra2 $extra3" .
|
||||
(($status == "Created")? "$extra4": "")
|
||||
|
|
@ -525,10 +525,10 @@ where course_group_members_table.Course_Group_id=$id");
|
|||
|
||||
#Show group members + remove button next to each member except the creator of the group
|
||||
if($flag){
|
||||
echo "<li><small> $name - $Student_ID ($status)</small> ".(($status != "Created")?"<button onclick='removeMember($Student_ID, $id)'
|
||||
class='btn btn-warning' style='height: 25px; width: 80px; line-height: 10px;'>Kick out</button>":"")."</li>";
|
||||
echo "<li>$name - $Student_ID ($status) ".(($status != "Created")?"<button onclick='removeMember($Student_ID, $id)'
|
||||
class='btn btn-warning' style='line-height: 12px; font-size: 12px'>Kick out</button>":"")."</li>";
|
||||
}else{
|
||||
echo "<li><small> $name-$Student_ID ($status)</small>";
|
||||
echo "<li><small> $name - $Student_ID ($status)</small>";
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
35
Courses.php
35
Courses.php
|
|
@ -496,7 +496,7 @@ if( $_SESSION['user_type']=="Student")
|
|||
<!--STUDENT CODE-->
|
||||
<div class="row" style="width:80%;margin:auto; text-align:left;">
|
||||
<div class="col-md-6">
|
||||
<br> Course Portal > Students <br>
|
||||
|
||||
<?php
|
||||
|
||||
error_reporting(0);
|
||||
|
|
@ -619,31 +619,34 @@ INNER JOIN course_students_table on course_students_table.Course_ID=courses_tabl
|
|||
|
||||
<form method='get' action='Courses.php'>
|
||||
<div class='row'>
|
||||
<div class='col-md-12'>
|
||||
<div class='row'><div class='col-md-5'> Find new course by course code
|
||||
<input type='text' class='form-control' name='search' maxlength='11' placeholder='Enter course code'>
|
||||
</div><div class='col-md-5'>
|
||||
List courses by faculty
|
||||
<div class='col-md-12'>
|
||||
<div class='row'>
|
||||
<div class='col-md-5'>
|
||||
Find new course by course code
|
||||
<input type='text' class='form-control' name='search' maxlength='11' placeholder='Enter course code'>
|
||||
</div>
|
||||
|
||||
<select name='faculty' class='form-control'>";
|
||||
<div class='col-md-5'>
|
||||
List courses by faculty
|
||||
<select name='faculty' class='form-control'>";
|
||||
$result = mysqli_query($con,"SELECT DISTINCT(Faculty) as Faculty FROM `courses_table`");
|
||||
if(mysqli_num_rows($result)==0){
|
||||
|
||||
} else {
|
||||
echo"<option value=''> Search by faculty </option>";
|
||||
echo" <option value=''>Search by faculty</option>";
|
||||
while($row = mysqli_fetch_assoc($result)) {
|
||||
$fname=$row['Faculty'];
|
||||
echo " <option value='$fname'> $fname </option>";
|
||||
echo " <option value='$fname'> $fname </option>";
|
||||
}}
|
||||
|
||||
echo "</select></div></div>
|
||||
echo " </select>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class='col-md-1'> <br>
|
||||
<input type='submit' class='btn btn-primary' value='Find'>
|
||||
<div class='col-md-2'> <br>
|
||||
<input type='submit' class='btn btn-primary' value='Find'>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</form>
|
||||
|
||||
</div></div>";
|
||||
|
|
|
|||
|
|
@ -585,7 +585,7 @@ if (!empty($_POST["frm_submitlab"])) {
|
|||
$con->query($sql = "UPDATE `lab_report_submissions` SET `Course_Group_id` = '0' WHERE `lab_report_submissions`.`Lab_Report_ID` = '$lab_id'");
|
||||
}
|
||||
|
||||
$_SESSION["info_courses"] = "Thanks. Your lab report assignment is submitted successfully.";
|
||||
$_SESSION["info_courses"] = "Thanks. You have successfully submitted your assignment.";
|
||||
header("Location: Course.php?url=" . $url);
|
||||
} else {
|
||||
echo "Error: <br>" . $con->error;
|
||||
|
|
@ -648,7 +648,7 @@ if (!empty($_GET["savemarks"])) {
|
|||
|
||||
if ($con->query($sql) === TRUE) {
|
||||
|
||||
$_SESSION["info_Marking"] = "Lab Report Submission Marked";
|
||||
$_SESSION["info_Marking"] = "Assignment marked";
|
||||
header("Location: Submissions.php?id=" . $labid . "&header=" . $header . "&total=" . $total);
|
||||
} else {
|
||||
echo "Error: " . $sql . "<br>" . $con->error;
|
||||
|
|
@ -692,7 +692,7 @@ if (!empty($_GET["remarking"])) {
|
|||
|
||||
if ($con->query($sql) === TRUE) {
|
||||
|
||||
$_SESSION["info_general"] = "Remarking Request Sent";
|
||||
$_SESSION["info_general"] = "Remarking request sent";
|
||||
header("Location: Course.php?url=" . $url);
|
||||
} else {
|
||||
echo "Error: " . $sql . "<br>" . $con->error;
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Pending' order by Sub
|
|||
}
|
||||
|
||||
if (mysqli_num_rows($result1) == 0) {
|
||||
echo "No Un-Marked Submissions for this Lab Report.";
|
||||
echo "No unmarked submissions.";
|
||||
} else {
|
||||
while ($row = mysqli_fetch_assoc($result1)) {
|
||||
$title = $row['Title'];
|
||||
|
|
@ -159,7 +159,7 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Pending' order by Sub
|
|||
$student_id = $row['sub_std'];
|
||||
|
||||
if ($submitted_group == 0) {
|
||||
$submitted_by = $student_name . "(" . $student_id . ")";
|
||||
$submitted_by = $student_name . " (" . $student_id . ")";
|
||||
} else {
|
||||
$submitted_by = "$student_name ($submitter_student_number) for group $groupname ";
|
||||
}
|
||||
|
|
@ -220,7 +220,7 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Marked' Order by lab
|
|||
echo "No Marked submissions for this lab";
|
||||
} else {
|
||||
|
||||
echo "<h3><a href='~\..\Script.php?exportgrade=true&lab=$id&lab_name=$Report_Title'><i class='fa fa-book'></i> Export Grade Sheet </a></h3>";
|
||||
echo "<h3><a href='~\..\Script.php?exportgrade=true&lab=$id&lab_name=$Report_Title'><i class='fa fa-book'></i> Export grades</a></h3>";
|
||||
|
||||
while ($row = mysqli_fetch_assoc($result)) {
|
||||
$title = $row['Title'];
|
||||
|
|
@ -304,7 +304,7 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Remarking'");
|
|||
}
|
||||
|
||||
if (mysqli_num_rows($resulty) == 0) {
|
||||
echo "No Remarking Request for this lab";
|
||||
echo "No remarking requests.";
|
||||
} else {
|
||||
while ($row = mysqli_fetch_assoc($resulty)) {
|
||||
$title = $row['Title'];
|
||||
|
|
@ -350,7 +350,7 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Remarking'");
|
|||
$title <br> by : <b> <span class = 'text-selectable'>$submitted_by </span> [ 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)'>Remark</button>"
|
||||
. " <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>"
|
||||
. " <a href='~\..\Script.php?ignoreremarking=yes&id=$id&subid=$Submission_ID&header=$header&total=$total&status=Marked' class='btn-sm btn-secondary'>Ignore request</a>"
|
||||
. "<br> Attachments : $full_link </span>
|
||||
</div></k>";
|
||||
}
|
||||
|
|
@ -362,7 +362,7 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Remarking'");
|
|||
|
||||
<div id="menu4" class="container tab-pane"><br>
|
||||
|
||||
<h3>Course Groups</h3>
|
||||
<h3>Course groups</h3>
|
||||
|
||||
<hr>
|
||||
<?php
|
||||
|
|
@ -373,7 +373,7 @@ INNER JOIN users_table on users_table.Student_ID=course_groups_table.Group_Leade
|
|||
WHERE Course_id=$c_id");
|
||||
|
||||
if (mysqli_num_rows($result) == 0) {
|
||||
echo "You have no Group in this Course";
|
||||
echo "No student groups.";
|
||||
} else {
|
||||
while ($row = mysqli_fetch_assoc($result)) {
|
||||
$name = $row['Group_Name'];
|
||||
|
|
|
|||
Loading…
Reference in New Issue