mental map repetition

cvdgit · Nov 2, 2024 · d6ee572 · d6ee572
1 parent 3b6dac9
commit d6ee572
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/frontend/modules/repetition/Testing/StudentRepetitionSearch.php b/frontend/modules/repetition/Testing/StudentRepetitionSearch.php
@@ -47,7 +47,7 @@ private function createMentalMapQuery(int $studentId): Query
         return (new Query())
             ->select([
                 'id' => 't.uuid',
-                'header' => 't.name',
+                new Expression('t.name COLLATE utf8_general_ci AS header'),
                 'date' => $repetitionQuery,
                 'totalItems' => $scheduleTotalQuery,
                 'doneItems' => $repetitionDoneQuery,
@@ -93,7 +93,7 @@ private function createTestingQuery(int $studentId): Query
         return (new Query())
             ->select([
                 'id' => 't.id',
-                'header' => 't.header',
+                new Expression('t.header COLLATE utf8_general_ci AS header'),
                 'date' => $repetitionQuery,
                 'totalItems' => $scheduleTotalQuery,
                 'doneItems' => $repetitionDoneQuery,
@@ -109,14 +109,14 @@ public function search(int $studentId): DataProviderInterface
         $testingQuery = $this->createTestingQuery($studentId);
         $mentalMapQuery = $this->createMentalMapQuery($studentId);
 
-        /*$query = (new Query())
+        $query = (new Query())
             ->select('t.*')
             ->from(['t' => $testingQuery->union($mentalMapQuery)])
-            ->orderBy(['t.header' => SORT_ASC]);*/
+            ->orderBy(['t.header' => SORT_ASC]);
 
         return new SqlDataProvider([
-            'sql' => $testingQuery->createCommand()->getRawSql(),
-            'totalCount' => $testingQuery->count(),
+            'sql' => $query->createCommand()->getRawSql(),
+            'totalCount' => $query->count(),
             'pagination' => false,
             'sort' => [
                 'defaultOrder' => [