Skip to content
This repository was archived by the owner on Feb 23, 2023. It is now read-only.

Commit df22d5d

Browse files
author
Nathan Shaaban
committed
Merge branch 'dev' of github.com:ctrlaltf24/assignmentsmanager into staging
2 parents 35636d5 + f76b133 commit df22d5d

File tree

4 files changed

+23
-21
lines changed

4 files changed

+23
-21
lines changed

‎public_html/teacher/postQuestion.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
$query=preg_replace('/(, (?!.*, ))/', '', $query);
1515
//TODO: ADD TEACHER PERMISSION CHECK RIGHT HERE! is this needed due to being in a teacher folder though?
1616
if($query===""){
17-
log_error("Nothing given","query is empty",$conn->error);
17+
// simply ignore this post.
18+
exit();
1819
}
1920
if(!$conn->query("UPDATE `questions` SET ".$query." WHERE `key`=".$_GET["key"])){
2021
log_error("question update","database error",$conn->error);

‎public_html/teacher/viewAssignments.php‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
$HTMLClasses=array();
1818
$HTMLHeaderClasses=array();
1919
require_once "../../../staging_resources/assignmentFunctions.php";
20-
$header=array("Checkbox"=>"","Chapter"=>"Chapter","Name"=>"Name","Time Accessible"=>"Time Accessible","Time Due"=>"Time Due","Time Hide"=>"Time Hide","Edit"=>"Edit","Responces"=>"Responces");
21-
require_once "../../../staging_resources/assignmentFunctions.php";
20+
$header=array("Checkbox"=>"","Chapter"=>"Chapter","Name"=>"Name","Edit"=>"Edit","Responces"=>"Responces","Time Accessible"=>"Time Accessible","Time Due"=>"Time Due","Time Hide"=>"Time Hide");
2221
$year=date("Y");
2322
if(date("m")>=5){// School is out
2423
if (date("m")>=9) { //School has started again
@@ -30,23 +29,25 @@
3029
$year=date("Y")-1;
3130
}
3231
foreach (sql_to_array($conn,"SELECT * FROM assignments WHERE `teacherKey`=".$user["key"]." ORDER BY `key` DESC") as $row) {
33-
$data[$row["key"]]["Checkbox"]=template_checkbox($row["key"]."-checkbox","",false);
34-
$data[$row["key"]]["Chapter"]=$row["chapter"];
35-
$data[$row["key"]]["Name"]=$row["name"];
36-
$data[$row["key"]]["Time Accessible"]=$row["timeAccessible"];
37-
$data[$row["key"]]["Time Due"]=$row["timeDue"];
38-
$data[$row["key"]]["Time Hide"]=$row["timeHide"];
39-
$data[$row["key"]]["Edit"]=template_ripple_a("Edit","href=createAssignment.php?key=".$row["key"]);
40-
$data[$row["key"]]["Responces"]=template_ripple_a("Responces","href=noShowViewAssignment.php?key=".$row["key"]);
41-
$HTMLClasses[$row["key"]]="\"filter-subject-".stripFieldNames($row["subject"])." filter-chapter-".stripFieldNames($row["chapter"])." filter-concept-".stripFieldNames($row["concept"]);
32+
$identifer=$row["name"]." ".$row["key"];
33+
$data[$identifer]["Checkbox"]=template_checkbox($row["key"]."-checkbox","",false);
34+
$data[$identifer]["Name"]=$row["name"];
35+
$data[$identifer]["Chapter"]=$row["chapter"];
36+
$data[$identifer]["Edit"]=template_ripple_a("Edit","href=createAssignment.php?key=".$row["key"]);
37+
$data[$identifer]["Responces"]=template_ripple_a("Responces","href=noShowViewAssignment.php?key=".$row["key"]);
38+
$data[$identifer]["Time Accessible"]=$row["timeAccessible"];
39+
$data[$identifer]["Time Due"]=$row["timeDue"];
40+
$data[$identifer]["Time Hide"]=$row["timeHide"];
41+
$HTMLClasses[$identifer]="\"filter-subject-".stripFieldNames($row["subject"])." filter-chapter-".stripFieldNames($row["chapter"])." filter-concept-".stripFieldNames($row["concept"]);
4242
foreach (sql_to_array($conn,"SELECT `key` FROM classes WHERE (`year`=$year) AND assignmentKeys LIKE '%;".$row["key"].";%'","key") as $class){
43-
$HTMLClasses[$row["key"]].=" filter-class-".$class;
43+
$HTMLClasses[$identifer].=" filter-class-".$class;
4444
}
45-
if(!(strpos($HTMLClasses[$row["key"]]," filter-class-")!==false)){
46-
$HTMLClasses[$row["key"]].=" filter-class-unspecified";// add a non-specified class
45+
if(!(strpos($HTMLClasses[$identifer]," filter-class-")!==false)){
46+
$HTMLClasses[$identifer].=" filter-class-unspecified";// add a non-specified class
4747
}
48-
$HTMLClasses[$row["key"]].="\"";
48+
$HTMLClasses[$identifer].="\"";
4949
}
50+
ksort($data);
5051
echo template_table($data,$header,"assignment-table",$HTMLClasses,$HTMLHeaderClasses);
5152
?>
5253
</div>

‎public_html/template/miscElements.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,27 +128,27 @@ function template_filters($conn,$user,$fields=NULL,$year=-1,$includeUnspecified=
128128
echo template_ripple_a("None","style='width: calc(30% - 32px);' id=filter-$field-none onclick='$(this).parent().find(\"input:checked\").click().click().prop(\"checked\",false).parent().removeClass(\"is-checked\");'".($val?"":" onload='alert(\"test\");$(this).click();'"));
129129
switch ($field) {
130130
case "class":
131-
foreach (sql_to_array($conn,"SELECT name,period,`key`,`year` FROM `classes` WHERE `teacherKey`=".$user["key"]." AND (`year`= $year) ORDER BY `key`") as $key => $row) {
131+
foreach (sql_to_array($conn,"SELECT name,period,`key`,`year` FROM `classes` WHERE `teacherKey`=".$user["key"]." AND (`year`= $year) ORDER BY `name`") as $key => $row) {
132132
echo template_checkbox("filter-class-".stripFieldNames($row["key"]),(($year==date("Y")||$year==date("Y")-1)?"":($row["year"]." ")).$row["name"]." (P".$row["period"].")");
133133
}
134134
if($includeUnspecified) {
135135
echo template_checkbox("filter-class-unspecified","Unspecified Class");
136136
}
137137
break;
138138
case "subject":
139-
foreach (sql_to_array($conn,"SELECT DISTINCT subject FROM `assignments` WHERE `teacherKey`=".$user["key"],"subject") as $key => $value) {
139+
foreach (sql_to_array($conn,"SELECT DISTINCT subject FROM `assignments` WHERE `teacherKey`=".$user["key"]." ORDER BY `subject`","subject") as $key => $value) {
140140
if($value==""){$value="empty";}
141141
echo template_checkbox("filter-subject-".stripFieldNames($value),$value);
142142
}
143143
break;
144144
case "chapter":
145-
foreach (sql_to_array($conn,"SELECT DISTINCT chapter FROM `assignments` WHERE `teacherKey`=".$user["key"],"chapter") as $key => $value) {
145+
foreach (sql_to_array($conn,"SELECT DISTINCT chapter FROM `assignments` WHERE `teacherKey`=".$user["key"]." ORDER BY `chapter`","chapter") as $key => $value) {
146146
if($value==""){$value="empty";}
147147
echo template_checkbox("filter-chapter-".stripFieldNames($value),$value,true);
148148
}
149149
break;
150150
case "concept":
151-
foreach (sql_to_array($conn,"SELECT DISTINCT concept FROM `assignments` WHERE `teacherKey`=".$user["key"],"concept") as $key => $value) {
151+
foreach (sql_to_array($conn,"SELECT DISTINCT concept FROM `assignments` WHERE `teacherKey`=".$user["key"]." ORDER BY `concept`","concept") as $key => $value) {
152152
if($value==""){$value="empty";}
153153
echo template_checkbox("filter-concept-".stripFieldNames($value),$value);
154154
}

‎resources/logError.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
function log_error($human_readable,$admin_readable="",$data="") {
44
$id=time().hash("sha256",$human_readable.$admin_readable.$data.time());
55
$e=new Exception();
6-
error_log("ERROR ".$id.": ".$human_readable." (".$admin_readable.")". $data. " Stack trace: ".$e->getTraceAsString());
6+
error_log("ERROR ".$id.": when visiting ".$_SERVER[REQUEST_URI]." ".$human_readable." (".$admin_readable.")". $data. " Stack trace: ".$e->getTraceAsString());
77
echo("An ERROR has occurred, please tell the website administrator this code: ".$id);
88
http_response_code(500);
99
exit(500);

0 commit comments

Comments
 (0)