Merge branch 'main' into dev-joao-pdf_generator

app/Models/Tabelas/Ensino/EnsinoProjeto.php

@@ -3,6 +3,8 @@
 namespace App\Models\Tabelas\Ensino;
 
 use App\Models\Planejamento;
+use App\Models\Tabelas\Traits\ExpandModel;
+use App\Models\Tabelas\Traits\ExpandTask;
 use App\Models\UserPad;
 use App\Models\Util\Funcao;
 use App\Models\Util\Natureza;
@@ -11,8 +13,11 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Validation\Rule;
 
 class EnsinoProjeto extends Model
-{
-        /**
+{   
+    use ExpandModel;
+    use ExpandTask;
+    
+    /**
      * References table ensino_aulas
      * 
      * @var string
@@ -41,6 +46,18 @@ class EnsinoProjeto extends Model
         return Funcao::listFuncaoProjeto($this->funcao);
     }
 
+    /** @return string|array */
+    public function naturezaToString()
+    {
+        return Natureza::listNatureza($this->natureza);
+    }
+
+    /** @return string|array */
+    public function funcaoToString()
+    {
+        return Funcao::listFuncaoProjeto($this->funcao);
+    }
+
     public static function rules()
     {
         return [

app/Models/Tabelas/Ensino/EnsinoSupervisao.php

@@ -3,6 +3,8 @@
 namespace App\Models\Tabelas\Ensino;
 
 use App\Models\Planejamento;
+use App\Models\Tabelas\Traits\ExpandModel;
+use App\Models\Tabelas\Traits\ExpandTask;
 use App\Models\UserPad;
 use App\Models\Util\Nivel;
 use App\Models\Util\Supervisao;
@@ -11,8 +13,11 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Validation\Rule;
 
 class EnsinoSupervisao extends Model
-{
-        /**
+{   
+    use ExpandModel;
+    use ExpandTask;
+    
+    /**
      * References table ensino_orientacoes
      * 
      * @var string
@@ -41,6 +46,18 @@ class EnsinoSupervisao extends Model
         return Supervisao::listSupervisao($this->type_supervisao);
     }
 
+    /** @return string */
+    public function nivelToString()
+    {
+        return Nivel::listNivel($this->nivel);
+    }
+
+    /** @return string */
+    public function supervisaoToString()
+    {
+        return Supervisao::listSupervisao($this->type_supervisao);
+    }
+
     /** @return string */
     public function chSemanal()
     {

app/Models/Tabelas/Extensao/ExtensaoCoordenacao.php

@@ -5,13 +5,18 @@ namespace App\Models\Tabelas\Extensao;
 use App\Models\Planejamento;
 use App\Models\UserPad;
 use App\Models\Tabelas\Constants;
+use App\Models\Tabelas\Traits\ExpandModel;
+use App\Models\Tabelas\Traits\ExpandTask;
 use App\Queries\Tabelas\Extensao\ExtensaoCoordenacaoQuery;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Validation\Rule;
 
 class ExtensaoCoordenacao extends Model
-{
-        /**
+{   
+    use ExpandModel;
+    use ExpandTask;
+    
+    /**
      * References table ensino_aulas
      * 
      * @var string

app/Models/Tabelas/Extensao/ExtensaoOrientacao.php

@@ -5,13 +5,18 @@ namespace App\Models\Tabelas\Extensao;
 use App\Models\Planejamento;
 use App\Models\UserPad;
 use App\Models\Tabelas\Constants;
+use App\Models\Tabelas\Traits\ExpandModel;
+use App\Models\Tabelas\Traits\ExpandTask;
 use App\Queries\Tabelas\Extensao\ExtensaoOrientacaoQuery;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Validation\Rule;
 
 class ExtensaoOrientacao extends Model
-{
-        /**
+{   
+    use ExpandModel;
+    use ExpandTask;
+    
+    /**
      * References table ensino_aulas
      * 
      * @var string

app/Models/Tabelas/Extensao/ExtensaoOutros.php

@@ -3,12 +3,17 @@
 namespace App\Models\Tabelas\Extensao;
 
 use App\Models\Planejamento;
+use App\Models\Tabelas\Traits\ExpandModel;
+use App\Models\Tabelas\Traits\ExpandTask;
 use App\Models\UserPad;
 use App\Queries\Tabelas\Extensao\ExtensaoOutrosQuery;
 use Illuminate\Database\Eloquent\Model;
 
 class ExtensaoOutros extends Model
-{
+{   
+    use ExpandModel;
+    use ExpandTask;
+    
     /**
      * References table ensino_aulas
      * 

app/Models/Tabelas/Gestao/GestaoCoordenacaoLaboratoriosDidaticos.php

@@ -3,13 +3,18 @@
 namespace App\Models\Tabelas\Gestao;
 
 use App\Models\Planejamento;
+use App\Models\Tabelas\Traits\ExpandModel;
+use App\Models\Tabelas\Traits\ExpandTask;
 use App\Models\UserPad;
 use App\Queries\Tabelas\Gestao\GestaoCoordenacaoLaboratoriosDidaticosQuery;
 use Illuminate\Database\Eloquent\Model;
 
 class GestaoCoordenacaoLaboratoriosDidaticos extends Model
-{
-        /**
+{   
+    use ExpandModel;
+    use ExpandTask;
+    
+    /**
      * References table ensino_aulas
      * 
      * @var string

app/Models/Tabelas/Gestao/GestaoCoordenacaoProgramaInstitucional.php

@@ -3,13 +3,18 @@
 namespace App\Models\Tabelas\Gestao;
 
 use App\Models\Planejamento;
+use App\Models\Tabelas\Traits\ExpandModel;
+use App\Models\Tabelas\Traits\ExpandTask;
 use App\Models\UserPad;
 use App\Queries\Tabelas\Gestao\GestaoCoordenacaoProgramaInstitucionalQuery;
 use Illuminate\Database\Eloquent\Model;
 
 class GestaoCoordenacaoProgramaInstitucional extends Model
-{
-        /**
+{   
+    use ExpandModel;
+    use ExpandTask;
+    
+    /**
      * References table ensino_aulas
      * 
      * @var string

app/Models/Tabelas/Gestao/GestaoMembroCamaras.php

@@ -3,13 +3,18 @@
 namespace App\Models\Tabelas\Gestao;
 
 use App\Models\Planejamento;
+use App\Models\Tabelas\Traits\ExpandModel;
+use App\Models\Tabelas\Traits\ExpandTask;
 use App\Models\UserPad;
 use App\Queries\Tabelas\Gestao\GestaoMembroCamarasQuery;
 use Illuminate\Database\Eloquent\Model;
 
 class GestaoMembroCamaras extends Model
-{
-        /**
+{   
+    use ExpandModel;
+    use ExpandTask;
+    
+    /**
      * References table ensino_aulas
      * 
      * @var string

app/Models/Tabelas/Gestao/GestaoMembroComissao.php

@@ -3,12 +3,17 @@
 namespace App\Models\Tabelas\Gestao;
 
 use App\Models\Planejamento;
+use App\Models\Tabelas\Traits\ExpandModel;
+use App\Models\Tabelas\Traits\ExpandTask;
 use App\Models\UserPad;
 use App\Queries\Tabelas\Gestao\GestaoMembroComissaoQuery;
 use Illuminate\Database\Eloquent\Model;
 
 class GestaoMembroComissao extends Model
 {   
+    use ExpandModel;
+    use ExpandTask;
+    
     protected $table = 'gestao_membro_comissao';
 
     protected $fillable = ['user_pad_id', 'dimensao', 'cod_atividade', 'nome', 'documento', 'ch_semanal'];

app/Models/Tabelas/Gestao/GestaoMembroConselho.php

@@ -3,13 +3,18 @@
 namespace App\Models\Tabelas\Gestao;
 
 use App\Models\Planejamento;
+use App\Models\Tabelas\Traits\ExpandModel;
+use App\Models\Tabelas\Traits\ExpandTask;
 use App\Models\UserPad;
 use App\Queries\Tabelas\Gestao\GestaoMembroConselhoQuery;
 use Illuminate\Database\Eloquent\Model;
 
 class GestaoMembroConselho extends Model
-{
-        /**
+{   
+    use ExpandModel;
+    use ExpandTask;
+    
+    /**
      * References table ensino_aulas
      * 
      * @var string

app/Models/Tabelas/Gestao/GestaoMembroTitularConselho.php

@@ -3,13 +3,18 @@
 namespace App\Models\Tabelas\Gestao;
 
 use App\Models\Planejamento;
+use App\Models\Tabelas\Traits\ExpandModel;
+use App\Models\Tabelas\Traits\ExpandTask;
 use App\Models\UserPad;
 use App\Queries\Tabelas\Gestao\GestaoMembroTitularConselhoQuery;
 use Illuminate\Database\Eloquent\Model;
 
 class GestaoMembroTitularConselho extends Model
-{
-        /**
+{   
+    use ExpandModel;
+    use ExpandTask;
+    
+    /**
      * References table ensino_aulas
      * 
      * @var string

app/Models/Tabelas/Gestao/GestaoOutros.php

@@ -3,12 +3,17 @@
 namespace App\Models\Tabelas\Gestao;
 
 use App\Models\Planejamento;
+use App\Models\Tabelas\Traits\ExpandModel;
+use App\Models\Tabelas\Traits\ExpandTask;
 use App\Models\UserPad;
 use App\Queries\Tabelas\Gestao\GestaoOutrosQuery;
 use Illuminate\Database\Eloquent\Model;
 
 class GestaoOutros extends Model
-{
+{   
+    use ExpandModel;
+    use ExpandTask;
+    
     /**
      * References table ensino_aulas
      * 

app/Models/Tabelas/Gestao/GestaoRepresentanteUnidadeEducacao.php

@@ -3,13 +3,18 @@
 namespace App\Models\Tabelas\Gestao;
 
 use App\Models\Planejamento;
+use App\Models\Tabelas\Traits\ExpandModel;
+use App\Models\Tabelas\Traits\ExpandTask;
 use App\Models\UserPad;
 use App\Queries\Tabelas\Gestao\GestaoRepresentanteUnidadeEducacaoQuery;
 use Illuminate\Database\Eloquent\Model;
 
 class GestaoRepresentanteUnidadeEducacao extends Model
-{
-        /**
+{   
+    use ExpandModel;
+    use ExpandTask;
+    
+    /**
      * References table ensino_aulas
      * 
      * @var string

app/Models/Tabelas/Pesquisa/PesquisaCoordenacao.php

@@ -5,6 +5,8 @@ namespace App\Models\Tabelas\Pesquisa;
 use App\Models\Planejamento;
 use App\Models\UserPad;
 use App\Models\Tabelas\Constants;
+use App\Models\Tabelas\Traits\ExpandModel;
+use App\Models\Tabelas\Traits\ExpandTask;
 use App\Queries\Tabelas\Pesquisa\PesquisaCoordenacaoQuery;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -14,6 +16,9 @@ class PesquisaCoordenacao extends Model
 {   
     use SoftDeletes;
 
+    use ExpandModel;
+    use ExpandTask;
+
     protected $table = 'pesquisa_coordenacao';
 
     protected $fillable = ['orientacao_id', 'cod_dimensao', 'user_pad_id', 'dimensao', 'cod_atividade', 'titulo_projeto', 'linha_grupo_pesquisa', 'funcao', 'ch_semanal'];
@@ -37,6 +42,10 @@ class PesquisaCoordenacao extends Model
     {
         return Constants::listFuncaoProjeto($this->funcao);
     }
+    	
+    public function funcaoToString() {
+        return Constants::listFuncaoProjeto($this->funcao);
+    }
 
     public static function rules()
     {

app/Models/Tabelas/Pesquisa/PesquisaLideranca.php

@@ -5,6 +5,8 @@ namespace App\Models\Tabelas\Pesquisa;
 use App\Models\Planejamento;
 use App\Models\UserPad;
 use App\Models\Tabelas\Constants;
+use App\Models\Tabelas\Traits\ExpandModel;
+use App\Models\Tabelas\Traits\ExpandTask;
 use App\Queries\Tabelas\Pesquisa\PesquisaLiderancaQuery;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -13,6 +15,8 @@ use Illuminate\Validation\Rule;
 class PesquisaLideranca extends Model
 {
     use SoftDeletes;
+    use ExpandModel;
+    use ExpandTask;
 
     protected $table = 'pesquisa_lideranca';
 
@@ -38,6 +42,10 @@ class PesquisaLideranca extends Model
         return Constants::listFuncaoProjeto($this->funcao);
     }
 
+    public function funcaoToString() {
+        return Constants::listFuncaoProjeto($this->funcao);
+    }
+
     public static function rules()
     {
         return [

app/Models/Tabelas/Pesquisa/PesquisaOrientacao.php

@@ -5,6 +5,8 @@ namespace App\Models\Tabelas\Pesquisa;
 use App\Models\Planejamento;
 use App\Models\UserPad;
 use App\Models\Tabelas\Constants;
+use App\Models\Tabelas\Traits\ExpandModel;
+use App\Models\Tabelas\Traits\ExpandTask;
 use App\Queries\Tabelas\Pesquisa\PesquisaOrientacaoQuery;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -13,6 +15,8 @@ use Illuminate\Validation\Rule;
 class PesquisaOrientacao extends Model
 {
     use SoftDeletes;
+    use ExpandModel;
+    use ExpandTask;
 
     protected $table = 'pesquisa_orientacao';
 
@@ -38,6 +42,10 @@ class PesquisaOrientacao extends Model
         return Constants::listFuncaoOrientador($this->funcao);
     }
 
+    public function funcaoToString() {
+        return Constants::listFuncaoOrientador($this->funcao);
+    }
+
     public static function rules()
     {
         return [

app/Models/Tabelas/Pesquisa/PesquisaOutros.php

@@ -3,12 +3,17 @@
 namespace App\Models\Tabelas\Pesquisa;
 
 use App\Models\Planejamento;
+use App\Models\Tabelas\Traits\ExpandModel;
+use App\Models\Tabelas\Traits\ExpandTask;
 use App\Models\UserPad;
 use App\Queries\Tabelas\Pesquisa\PesquisaOutrosQuery;
 use Illuminate\Database\Eloquent\Model;
 
 class PesquisaOutros extends Model
-{
+{   
+    use ExpandModel;
+    use ExpandTask;
+    
     /**
      * References table ensino_aulas
      * 

app/Models/Tabelas/Traits/ExpandModel.php

+<?php
+
+namespace App\Models\Tabelas\Traits;
+
+trait ExpandModel {
+
+    public static function getTableName() {
+
+        $classPath = self::class;
+
+        $model = new $classPath();
+
+        return $model->table;
+    }
+
+    public static function getColumnName($column) {
+
+        $classPath = self::class;
+
+        $model = new $classPath();
+
+        return sprintf("%s.%s", $model->table, $column);
+    }
+}
\ No newline at end of file

app/Models/Tabelas/Traits/ExpandTask.php

+<?php
+
+namespace App\Models\Tabelas\Traits;
+
+use App\Models\Avaliacao;
+
+trait ExpandTask {
+
+    public function avaliacao() {
+        return $this->hasOne(Avaliacao::class, 'tarefa_id', 'id')->whereType(Avaliacao::getTypeByClassPath($this::class));
+    }
+    
+}
\ No newline at end of file

app/Models/Util/Avaliacao.php

@@ -5,6 +5,7 @@ namespace App\Models\Util;
 
 class Avaliacao
 {   
+    //class is depreciated
     const ENSINO_AULA = 1;
     const ENSINO_COORDENACAO_REGENCIA = 2;
     const ENSINO_ORIENTACAO = 3;