Fehler bei Sortierung der Themen und Fächer behoben
This commit is contained in:
@@ -49,6 +49,11 @@ class SubjectData
|
|||||||
|
|
||||||
$subjectDirectory = "config/subjects";
|
$subjectDirectory = "config/subjects";
|
||||||
$subjectNames = scandir($subjectDirectory);
|
$subjectNames = scandir($subjectDirectory);
|
||||||
|
|
||||||
|
usort($subjectNames, function ($a, $b) {
|
||||||
|
return strcmp($a, $b);
|
||||||
|
});
|
||||||
|
|
||||||
foreach ($subjectNames as $subjectName) {
|
foreach ($subjectNames as $subjectName) {
|
||||||
if ($subjectName == "." || $subjectName == "..") {
|
if ($subjectName == "." || $subjectName == "..") {
|
||||||
continue;
|
continue;
|
||||||
@@ -62,10 +67,6 @@ class SubjectData
|
|||||||
$result[$subjectData->id] = $subjectData;
|
$result[$subjectData->id] = $subjectData;
|
||||||
}
|
}
|
||||||
|
|
||||||
usort($result, function ($a, $b) {
|
|
||||||
return strcmp($a->displayName, $b->displayName);
|
|
||||||
});
|
|
||||||
|
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -54,6 +54,11 @@ class TopicData
|
|||||||
|
|
||||||
$topicDirectory = "config/subjects/$subjectId/topics";
|
$topicDirectory = "config/subjects/$subjectId/topics";
|
||||||
$topicNames = scandir($topicDirectory);
|
$topicNames = scandir($topicDirectory);
|
||||||
|
|
||||||
|
usort($topicNames, function ($a, $b) {
|
||||||
|
return strcmp($a, $b);
|
||||||
|
});
|
||||||
|
|
||||||
foreach ($topicNames as $topicName) {
|
foreach ($topicNames as $topicName) {
|
||||||
if ($topicName == "." || $topicName == "..") {
|
if ($topicName == "." || $topicName == "..") {
|
||||||
continue;
|
continue;
|
||||||
@@ -66,10 +71,6 @@ class TopicData
|
|||||||
$result[$topicData->id] = $topicData;
|
$result[$topicData->id] = $topicData;
|
||||||
}
|
}
|
||||||
|
|
||||||
usort($result, function ($a, $b) {
|
|
||||||
return strcmp($a->displayName, $b->displayName);
|
|
||||||
});
|
|
||||||
|
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user