mrlan
/
LRR
3
0
Fork 2
Code Issues Pull Requests 7 Projects Releases Wiki Activity

Make Submissions.php look better.

Bug430-Eden2
Lan Hui 2023-08-02 14:57:08 +08:00
parent a56b4c00dd
commit 02da71b130
5 changed files with 58 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
#**scratch**# Normal file
View File

@ -0,0 +1,28 @@
function mark(id, title, marks) {
try {
$('<form id="submit-form" method="get" action="Script.php">'
+ title + ' (' + marks + ' marks)' +
'<input type="hidden" name="savemarks" value="true">\n\ <input type="hidden" name="total" value="' + marks + '" > <input type="hidden" name="id" value="' + id + '" ><br> Marks <input type="text" name="marks">\n\
Comments <textarea name="feedback"></textarea> \n\
<input type="hidden" name="labid" value="<?php echo $course_id; ?>"> <input type="hidden" name="header" value="<?php echo $header; ?>"> </form>').dialog({
modal: true,
title: 'Mark submission',
buttons: {
'Submit': function() {
$('#submit-form').submit();
$(this).dialog('close');
},
'Cancel': function() {
$(this).dialog('close');
}
}
});
} catch (e) {
alert(e);
}
}

1
.#**scratch** Symbolic link
View File

@ -0,0 +1 @@
root@lenovo-xiaoxin-2019.49005:1690466109

4
Footer.php
View File

@ -1,4 +1,2 @@
<br><br><br><br><br><br><br><br><br> <br><br><br><br><br><br><br><br><br>
<div style="background-color:white;width:100%di"> <div style="background-color:white;width:100%di"></div>
</div>

3
Header.php
View File

@ -26,8 +26,7 @@ if (mysqli_connect_errno()) {
* The reason is to make the css code reusable. * The reason is to make the css code reusable.
* the css file is used by submissions.php * the css file is used by submissions.php
--> -->
<link href = "./css/main.css" rel = "stylesheet" type = "text/css" /> <link href = "./css/main.css" rel="stylesheet" type="text/css" />
<script src="./css/jquery.min.js" type="text/javascript"></script> <script src="./css/jquery.min.js" type="text/javascript"></script>
<script src="./css/bootsrap.min.js" type="text/javascript"></script> <script src="./css/bootsrap.min.js" type="text/javascript"></script>
<script src="./css/jquery.datetimepicker.min.js" type="text/javascript"></script> <script src="./css/jquery.datetimepicker.min.js" type="text/javascript"></script>

76
Submissions.php
View File

@ -93,22 +93,22 @@ echo "<div class='alert' style='margin-left:20px;border-bottom:2px solid #1D91EF
?> ?>
<b>Lab Report Submissions (<?php echo $count_subs; ?>)</b> <b>Assignment submissions (<?php echo $count_subs; ?>)</b>
<!-- Nav tabs --> <!-- Nav tabs -->
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link active" data-toggle="tab" href="#menu1">Un-Marked Submissions<b> (<?php echo $count_unmarked; ?>)</b></a> <a class="nav-link active" data-toggle="tab" href="#menu1">Unmarked submissions<b> (<?php echo $count_unmarked; ?>)</b></a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#menu2">Marked Submissions <b>(<?php echo $count_marked; ?>)</b></a> <a class="nav-link" data-toggle="tab" href="#menu2">Marked submissions <b>(<?php echo $count_marked; ?>)</b></a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#menu3">Re-Marking Requests <b>(<?php echo $count_remark; ?>)</b></a> <a class="nav-link" data-toggle="tab" href="#menu3">Remarking requests <b>(<?php echo $count_remark; ?>)</b></a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" data-toggle="tab" href="#menu4"> View Course Groups</a> <a class="nav-link" data-toggle="tab" href="#menu4">Course groups</a>
</li> </li>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
@ -184,7 +184,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;'> 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> <span class = 'text-selectable'>$submitted_by </span> </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> <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</button><br> Attachments : $full_link </span>
</div></k>"; </div></k>";
} }
} }
@ -268,8 +268,8 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Marked' Order by lab
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;'> 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> $title <br> by : <b> <span class = 'text-selectable'>$submitted_by </span> &nbsp; &nbsp;&nbsp;&nbsp;&nbsp; [ Marks: $Marks ] </b> &nbsp;
<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> <hr> Marking 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)'>Remark</button><br> Attachments : $full_link </span>
</div></k>"; </div></k>";
} }
} }
@ -349,7 +349,7 @@ where Lab_Report_ID=$id and lab_report_submissions.Status='Remarking'");
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;'> 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> $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>
<hr> <span style='font-size:8pt'>Submitted : $posted <b> </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>" . "<button class='btn-sm btn-info' style='margin-left:50px;' onclick='mark($Submission_ID,\"$title\",$total)'>Remark</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>" . " &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>"
. "<br> Attachments : $full_link </span> . "<br> Attachments : $full_link </span>
</div></k>"; </div></k>";
@ -412,31 +412,34 @@ where course_group_members_table.Course_Group_id=$id");
include 'Footer.php'; include 'Footer.php';
?> ?>
<script src="http://118.25.96.118/nor/css/jquery-1.11.1.min.js"></script> <script src="./css/jquery-1.11.1.min.js"></script>
<script src="./css/jquery-ui.min.js"></script>
<script src="http://118.25.96.118/nor/css/jquery-ui.min.js"></script> <link rel="stylesheet" href="./css/jquery-ui.css" />
<link rel="stylesheet" href="http://118.25.96.118/nor/css/jquery-ui.css" />
<script> <script>
function mark(id, title, marks) { function mark(id, title, marks) {
try { try {
$('<form id="submit-form" method="get" action="Script.php">' + title + '(' + marks + ' marks) <input type="hidden" name="savemarks" value="true">\n\ $(`<form id="submit-form" method="get" action="Script.php">
<input type="hidden" name="total" value="' + marks + '" > <input type="hidden" name="id" value="' + id + '" ><br> Marks <input type="text" name="marks">\n\ ${title} (${marks} marks)
<input type="hidden" name="savemarks" value="true">
<input type="hidden" name="total" value="${marks}" >
<input type="hidden" name="id" value="${id}" >
<br> Marks
<input type="text" name="marks">\n\
Comments <textarea name="feedback"></textarea> \n\ Comments <textarea name="feedback"></textarea> \n\
<input type="hidden" name="labid" value="<?php echo $course_id; ?>"> <input type="hidden" name="header" value="<?php echo $header; ?>"> </form>').dialog({ <input type="hidden" name="labid" value="<?php echo $course_id; ?>">
<input type="hidden" name="header" value="<?php echo $header; ?>">
</form>`).dialog({
modal: true, modal: true,
title: 'Mark Submission', title: 'Mark submission',
buttons: { buttons: {
'Submit Marking': function() { 'Submit': function() {
$('#submit-form').submit(); $('#submit-form').submit();
$(this).dialog('close'); $(this).dialog('close');
}, },
'X': function() { 'Cancel': function() {
$(this).dialog('close'); $(this).dialog('close');
} }
@ -448,31 +451,4 @@ where course_group_members_table.Course_Group_id=$id");
} }
} }
function updatev(id) {
try {
$('<form id="submit-form" method="get" action="Script.php"> <input type="hidden" name="updatevisibility" value="true">\n\
<input type="hidden" name="id" value="' + id + '" > <br>\n\
Update Visibility<br><select name="status"> <option> Public </option><option>Private</option> </select> \n\
<input type="hidden" name="labid" value="<?php echo $id; ?>"> <input type="hidden" name="total" value="<?php echo $total; ?>" > <input type="hidden" name="header" value="<?php echo $header; ?>"> </form>').dialog({
modal: true,
title: 'Update Report Visibility',
buttons: {
'Update': function() {
$('#submit-form').submit();
$(this).dialog('close');
},
'X': function() {
$(this).dialog('close');
}
}
});
} catch (e) {
alert(e);
}
}
</script> </script>