[TCDA-214] Feat/class plan validate

CHANGELOG.md

@@ -1,14 +1,18 @@
+## [Versão 3.78.135]
+- Adicionando funcionalidade de validação de planos de aula
+- Criando novo tipo de usuário e visibilidade "Coordenador"
+
 ## [Versão 3.77.135]
 - Adicionado novas inconsistências para a falta de componentes curriculasres
 
 ## [Versão 3.77.134]
 - Consertado tela de frequencia para os professores
-- 
+-
 ## [Versão 3.77.133]
 - Realizado correções nas validações das datas para Professor, Estudante e Escola
 
 ## [Versão 3.78.132]
-- Adicionado campo para a assinatura do diretor 
+- Adicionado campo para a assinatura do diretor
 
 ## [Versão 3.77.132]
 - Criando as telas relacionadas a agricultor no novo módulo de merenda escolar

app/config/main.php

@@ -94,7 +94,8 @@
         'curricularcomponents',
         'stages',
         'foods',
-        'dashboard'
+        'dashboard',
+        'courseplan'
     ),
     // application components
     'components' => array(

app/messages/pt_br/default.php

@@ -742,13 +742,20 @@
     //Course Plan
     'Course Plan' => 'Plano de aula',
     'Create Plan' => 'Criar plano',
+    'Pendent Plan' => 'Planos pendentes',
+    'Pending Course Plan' => 'Planos de aula pendentes',
     'Class'  => 'Aula',
     'Objective' => 'Objetivo',
     'New' => 'Novo',
     'Content' => 'Conteúdo',
     'Type' => 'Tipo',
     'Resource' => 'Recurso',
     'Add Resource' => 'Novo Recurso',
+    'Start Date' => 'Data Inicial',
+    'Situation' => 'Situação',
+    'Save Approval' => 'Salvar Aprovação',
+    'Plan Approval' => 'Aprovação do plano',
+    'Observation' => 'Observação',
 
     //Labels
     'User' => 'Usuário',
@@ -857,6 +864,8 @@
     'Users' => 'Usuários',
     'manager' => 'Gestor Escolar',
     'instructor' => 'Professor',
+    'coordinator' => 'Coordenador Pedagógico',
+    'nutritionist' => 'Nutricionista',
     'admin' => 'Administrador',
     'Edit Password' => 'Alterar Senha',
 

app/migrations/2024-22-04_courseplan_validate/sql.sql

@@ -0,0 +1,7 @@
+ALTER TABLE course_plan ADD COLUMN situation ENUM('APROVADO', 'PENDENTE', 'REJEITADO') NOT NULL;
+
+ALTER TABLE course_plan ADD COLUMN start_date DATE NOT NULL;
+
+ALTER TABLE course_plan ADD COLUMN observation VARCHAR(500);
+
+INSERT INTO `demo.tag.ong.br`.auth_item (name,`type`,`data`) VALUES ('coordinator',2,'N;');

app/models/CoursePlan.php

@@ -12,17 +12,22 @@
  * @property integer $users_fk
  * @property string $creation_date
  * @property string $fkid
+ * @property string $situation
+ * @property string $start_date
+ * @property string $observation
  *
  * The followings are the available model relations:
  * @property ClassroomHasCoursePlan[] $classroomHasCoursePlans
  * @property CourseClass[] $courseClasses
+ * @property CourseClassTypes[] $courseClassTypes
  * @property Users $usersFk
  * @property SchoolIdentification $schoolInepFk
  * @property EdcensoStageVsModality $modalityFk
  * @property EdcensoDiscipline $disciplineFk
  */
 class CoursePlan extends CActiveRecord
 {
+    public const STATUS_PENNDING = "PENDENTE";
 	/**
 	 * @return string the associated database table name
 	 */
@@ -39,15 +44,17 @@ public function rules()
 		// NOTE: you should only define rules for those attributes that
 		// will receive user inputs.
 		return array(
-			array('name, school_inep_fk, modality_fk, discipline_fk', 'required'),
+			array('name, school_inep_fk, modality_fk, discipline_fk, situation, start_date', 'required'),
 			array('modality_fk, discipline_fk, users_fk', 'numerical', 'integerOnly'=>true),
 			array('name', 'length', 'max'=>100),
 			array('school_inep_fk', 'length', 'max'=>8),
 			array('fkid', 'length', 'max'=>40),
+			array('situation', 'length', 'max'=>9),
+			array('observation', 'length', 'max'=>500),
 			array('creation_date', 'safe'),
 			// The following rule is used by search().
 			// @todo Please remove those attributes that should not be searched.
-			array('id, name, school_inep_fk, modality_fk, discipline_fk, users_fk, creation_date, fkid', 'safe', 'on'=>'search'),
+			array('id, name, school_inep_fk, modality_fk, discipline_fk, users_fk, creation_date, fkid, situation, start_date, observation', 'safe', 'on'=>'search'),
 		);
 	}
 
@@ -61,6 +68,7 @@ public function relations()
 		return array(
 			'classroomHasCoursePlans' => array(self::HAS_MANY, 'ClassroomHasCoursePlan', 'course_plan_fk'),
 			'courseClasses' => array(self::HAS_MANY, 'CourseClass', 'course_plan_fk'),
+			'courseClassTypes' => array(self::HAS_MANY, 'CourseClassTypes', 'course_class_fk'),
 			'usersFk' => array(self::BELONGS_TO, 'Users', 'users_fk'),
 			'schoolInepFk' => array(self::BELONGS_TO, 'SchoolIdentification', 'school_inep_fk'),
 			'modalityFk' => array(self::BELONGS_TO, 'EdcensoStageVsModality', 'modality_fk'),
@@ -82,6 +90,9 @@ public function attributeLabels()
 			'users_fk' => 'Users Fk',
 			'creation_date' => 'Creation Date',
 			'fkid' => 'Fkid',
+			'situation' => 'Situation',
+			'start_date' => 'Start Date',
+			'observation' => 'Observation',
 		);
 	}
 
@@ -111,6 +122,9 @@ public function search()
 		$criteria->compare('users_fk',$this->users_fk);
 		$criteria->compare('creation_date',$this->creation_date,true);
 		$criteria->compare('fkid',$this->fkid,true);
+		$criteria->compare('situation',$this->situation,true);
+		$criteria->compare('start_date',$this->start_date,true);
+		$criteria->compare('observation',$this->observation,true);
 
 		return new CActiveDataProvider($this, array(
 			'criteria'=>$criteria,

app/modules/courseplan/CourseplanModule.php

@@ -0,0 +1,36 @@
+<?php
+
+class CourseplanModule extends CWebModule
+{
+    public $defaultController = 'courseplan';
+    public $baseScriptUrl;
+    public $baseUrl;
+	public function init()
+	{
+		// this method is called when the module is being created
+		// you may place code here to customize the module or the application
+        $this->baseUrl = Yii::app()->createUrl("courseplan");
+
+        $this->baseScriptUrl = Yii::app()->getAssetManager()
+            ->publish(Yii::getPathOfAlias('application.modules.courseplan.resources'));
+		// import the module-level models and components
+		$this->setImport(array(
+			'courseplan.models.*',
+			'courseplan.components.*',
+            'courseplan.controllers.*',
+		));
+	}
+
+	public function beforeControllerAction($controller, $action)
+	{
+        $controller->layout = 'webroot.themes.default.views.layouts.fullmenu';
+        if(parent::beforeControllerAction($controller, $action))
+		{
+			// this method is called before any module controller action is performed
+			// you may place customized code here
+			return true;
+		}
+		else
+			return false;
+	}
+}

app/controllers/CourseplanController.php → app/modules/courseplan/controllers/CourseplanController.php

@@ -31,7 +31,8 @@ public function accessRules()
             array('allow', // allow authenticated user to perform 'create' and 'update' actions
                 'actions' => array('create', 'update', 'index', 'delete',
                     'getDisciplines', 'save', 'getCourseClasses', 'getAbilitiesInitialStructure',
-                    'getAbilitiesNextStructure', 'addResources', 'getResources'),
+                    'getAbilitiesNextStructure', 'addResources', 'getResources', 'pendingPlans',
+                    'validatePlan', 'enableCoursePlanEdition'),
                 'users' => array('*'),
             ),
             array('deny', // deny all users
@@ -46,15 +47,17 @@ public function accessRules()
      */
     public function actionCreate()
     {
+        $coursePlan = new CoursePlan();
         if (isset($_POST['CoursePlan'])) {
             $this->actionSave();
         } else {
             $resources = CourseClassResources::model()->findAll(array('order'=>'name'));
-            $this->render('form', array(
-                'coursePlan' => new CoursePlan(),
+            $this->render('create', array(
+                'coursePlan' => $coursePlan,
                 'stages' => $this->getStages(),
                 'resources' => $resources,
             ));
+            Yii::app()->end();
         }
     }
 
@@ -65,13 +68,16 @@ public function actionCreate()
      */
     public function actionUpdate($id)
     {
-        if (isset($_POST['CoursePlan'])) {
+        if (isset($_POST['CoursePlan']))
+        {
             $this->actionSave($id);
-        } else {
+        }
+        if (!isset($_POST['CoursePlan']))
+        {
             $coursePlan = $this->loadModel($id);
             $resources = CourseClassResources::model()->findAll(array('order'=>'name'));
 
-            $this->render('form', array(
+            $this->render('update', array(
                 'coursePlan' => $coursePlan,
                 'stages' => $this->getStages(),
                 'resources' => $resources,
@@ -199,12 +205,13 @@ public function actionGetAbilitiesNextStructure()
         echo CJSON::encode($result);
     }
 
-
     /**
      * Sabe the Course Plan, and yours course classes.
      */
     public function actionSave($id = null)
     {
+        $request = Yii::app()->request->getPost("CoursePlan");
+
         if ($id !== null) {
             $coursePlan = CoursePlan::model()->findByPk($id);
             $logSituation = "U";
@@ -214,7 +221,10 @@ public function actionSave($id = null)
             $coursePlan->users_fk = Yii::app()->user->loginInfos->id;
             $logSituation = "C";
         }
-        $coursePlan->attributes = $_POST["CoursePlan"];
+        $startTimestamp = $this->dataConverter($request["start_date"], 0);
+        $request["start_date"] = $startTimestamp;
+        $coursePlan->attributes = $request;
+        $coursePlan->situation = 'PENDENTE';
         $coursePlan->save();
         $courseClassIds = [];
         $i = 1;
@@ -290,6 +300,25 @@ public function actionAddResources(){
         }
     }
 
+    public static function dataConverter($data, $case)
+    {
+        // Caso 0: converte dd/mm/yyyy para yyyy-mm-dd
+        if($case == 0){
+            $dataObj = date_create_from_format('d/m/Y', $data);
+            if(!$dataObj == false)
+                return date_format($dataObj, 'Y-m-d');
+        }
+
+        // Caso 1: converte yyyy-mm-dd para dd/mm/yyyy
+        if($case == 1){
+            $dataObj = date_create_from_format('Y-m-d', $data);
+            if(!$dataObj == false)
+                return date_format($dataObj, 'd/m/Y');
+        }
+
+        return false;
+    }
+
     public function actionGetResources()
     {
         $resources = CourseClassResources::model()->findAll();
@@ -323,7 +352,8 @@ public function actionDelete($id)
             Log::model()->saveAction("courseplan", $id, "D", $coursePlan->name);
             echo json_encode(["valid" => true, "message" => "Plano de aula excluído com sucesso!"]);
         } else {
-            echo json_encode(["valid" => false, "message" => "Não se pode remover plano de aula utilizado em alguma turma."]);
+            echo json_encode(["valid" => false,
+            "message" => "Não se pode remover plano de aula utilizado em alguma turma."]);
         }
     }
 
@@ -333,14 +363,18 @@ public function actionDelete($id)
 
     public function actionIndex()
     {
-        if (Yii::app()->getAuthManager()->checkAccess('instructor', Yii::app()->user->loginInfos->id)) {
+        if (Yii::app()->getAuthManager()->checkAccess('instructor', Yii::app()->user->loginInfos->id))
+        {
             $dataProvider = new CActiveDataProvider('CoursePlan', array(
                 'criteria' => array(
                     'condition' => 'users_fk=' . Yii::app()->user->loginInfos->id,
                 ),
                 'pagination' => false
             ));
-        } else {
+        }
+
+        if(!Yii::app()->getAuthManager()->checkAccess('instructor', Yii::app()->user->loginInfos->id))
+        {
             $dataProvider = new CActiveDataProvider('CoursePlan', array(
                 'pagination' => false
             ));
@@ -351,6 +385,51 @@ public function actionIndex()
         ));
     }
 
+    public function actionPendingPlans()
+    {
+        $criteria = new CDbCriteria;
+        $criteria->condition = "situation = 'PENDENTE'";
+        $dataProvider = new CActiveDataProvider('CoursePlan', array(
+            'criteria' => $criteria,
+            'pagination' => false
+        ));
+
+        $this->render('pendingPlans', array(
+            'dataProvider' => $dataProvider,
+        ));
+    }
+
+    public function actionValidatePlan($id)
+    {
+        $requestApproval = Yii::app()->request->getPost("approval_field");
+        $requestObservation = Yii::app()->request->getPost("observation");
+        $coursePlan = $this->loadModel($id);
+        if(!isset($requestApproval))
+        {
+            $this->render('formValidate', array(
+                'coursePlan' => $coursePlan,
+                'stages' => $this->getStages(),
+            ));
+        }
+        if(isset($requestApproval))
+        {
+            if ($requestApproval == "true") {
+                $coursePlan->situation = 'APROVADO';
+            }
+            $coursePlan->observation = $requestObservation;
+            $coursePlan->save();
+        }
+    }
+
+    public function actionEnableCoursePlanEdition($id)
+    {
+        $coursePlan = $this->loadModel($id);
+        $coursePlan->situation = 'PENDENTE';
+        $coursePlan->save();
+        Yii::app()->user->setFlash('success', Yii::t('default', 'Plano de Curso Liberado para Edição!'));
+        $this->redirect(array('index'));
+    }
+
     /**
      * Returns the data model based on the primary key given in the GET variable.
      * If the data model is not found, an HTTP exception will be raised.