Corrigindo a duplicidade das aulas em aulas ministradas (#882)

ipti · Dec 4, 2024 · 1065124 · 1065124
1 parent 4bd4e2d
commit 1065124
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## [Versão 3.89.204]
+- Corrigindo a duplicidade das aulas em aulas ministradas
+
 ## [Versão 3.89.203]
 - Corrigindo error no tamanho do nome do aluno ao gerar o sagres
 

diff --git a/app/controllers/ClassesController.php b/app/controllers/ClassesController.php
@@ -190,7 +190,7 @@ public function actionGetClassContents()
                         ->queryAll();
 
                     $additionalClasses = Yii::app()->db->createCommand(
-                        "select cc.id, cp.name as cpname, ed.id as edid, ed.name as edname, cc.order, cc.content, cp.id as cpid
+                        "select distinct cc.id, cp.name as cpname, ed.id as edid, ed.name as edname, cc.order, cc.content, cp.id as cpid
                         from course_class cc
                         join course_plan cp on cp.id = cc.course_plan_fk
                         join course_plan_discipline_vs_abilities dvsa on dvsa.course_class_fk = cc.id
@@ -203,6 +203,7 @@ public function actionGetClassContents()
                         ->bindParam(":users_fk", Yii::app()->user->loginInfos->id)
                         ->queryAll();
 
+
                     $courseClasses = array_merge($courseClasses, $additionalClasses);
                 }
             } else {

diff --git a/config.php b/config.php
@@ -7,7 +7,7 @@
 defined('YII_DEBUG') or define('YII_DEBUG', $debug);
 defined("SESSION_MAX_LIFETIME") or define('SESSION_MAX_LIFETIME', 3600);
 
-define("TAG_VERSION", '3.89.203');
+define("TAG_VERSION", '3.89.204');
 
 define("YII_VERSION", Yii::getVersion());
 define("BOARD_MSG", '<div class="alert alert-success">Novas atualizações no TAG. Confira clicando <a class="changelog-link" href="?r=admin/changelog">aqui</a>.</div>');

diff --git a/instance.php b/instance.php
@@ -17,7 +17,7 @@
 $newdb = $domain . '.tag.ong.br';
 
 if ($domain == "localhost") {
-    $newdb = 'boquim.tag.ong.br';
+    $newdb = 'demo.tag.ong.br';
 }
 
 $_GLOBALGROUP = 0;