Merge pull request #387 from secultce/homolog

Merge Homolog to Main

Author: Junior-Shyko

CHANGELOG.md

@@ -4,6 +4,11 @@ Todas as mudanças notáveis no projeto serão documentadas neste arquivo.
 O formato é baseado no [Keep a Changelog](https://keepachangelog.com/pt-BR/1.0.0/)
 e este projeto adere ao [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [5.9.8] - 2025-02-17
+### Modificado
+- Atualizando a referência do plugin de Recurso
+- Corrigido textos da Prestação de Contas
+
 ## [5.9.7] - 2025-02-10
 ### Modificado
 - Ativação para LGPD

src/protected/application/lib/MapasCulturais/Entities/Registration.php

@@ -336,8 +336,8 @@ function jsonSerialize() {
         }else{
             $json = null;
         }
-        
-        if($this->canUser("viewUserEvaluation") && !$this->canUser("@control")){
+
+        if($this->canUser("viewUserEvaluation") && !$this->canUser("@control") && !$this->canSeeRecources()){
             $checkList = 'projectName,category,files,field,owner';
             $values = ['files' => []];
 
@@ -373,6 +373,15 @@ function jsonSerialize() {
         return $values;
     }
 
+    private function canSeeRecources()
+    {
+        $uri = $_SERVER["REQUEST_URI"];
+
+        if (str_contains($uri, 'recursos') && str_contains($uri, 'todos') && $this->canUser("viewUserEvaluation")) return true;
+
+        return false;
+    }
+
     public function canSee($key)
     {
         $avaliableEvaluationFields = ($this->opportunity->avaliableEvaluationFields != "null") ? $this->opportunity->avaliableEvaluationFields : [];

src/protected/application/lib/modules/Diligence/assets/js/multi/multi.js

@@ -41,11 +41,16 @@ $(document).ready(function () {
     //Retornando o valor da situação
     getSituacion();
     $( "#situacion-refo-multi" ).on( "change", function(e) {
+
         sendSituacion(e.target.value);
         $("#label-status-actual").html($(this).find("option:selected").text());
+        if(e.target.value == 'disapproved' ) {
+            $("#btn-generate-tado").hide();
+        }else{
+            $("#btn-generate-tado").show();
+        }
         $(".multi-itens-select").show();
         $("#p-btn-tado").show();
-        
     });
 
     $('#import-financial-report .mc-submit').on('click', () => {

src/protected/application/lib/modules/Diligence/layouts/parts/multi/multi-select.php

@@ -7,9 +7,9 @@
     <select name="" id="situacion-refo-multi" class="form-control-multi">
         <option value="all" disabled selected>-- Selecione --</option>
         <option value="under_analysis">Em Análise</option>
-        <option value="approved">Aprovada</option>
-        <option value="partially">Parcialmente aprovada</option>
-        <option value="disapproved">Reprovada</option>
+        <option value="approved">Regular</option>
+        <option value="partially">Regular com ressalva</option>
+        <option value="disapproved">Irregular</option>
     </select>
 </div>
 
@@ -28,7 +28,9 @@
     </p>
 
     <p style="text-align: center;width: 100%; margin-bottom: 15px" id="p-btn-tado">
-        <a href="<?= $app->createUrl('tado', 'emitir/' . $reg->id); ?>" target="_blank" class="btn btn-primary" title="Gera o relatório TADO" style="display: block;">
+        <a href="<?= $app->createUrl('tado', 'emitir/' . $reg->id); ?>"
+           id="btn-generate-tado"
+           target="_blank" class="btn btn-primary" title="Gera o relatório TADO" style="display: block;">
             Finalizar e emitir TADO
         </a>
     </p>

src/protected/application/plugins/Recourse

@@ -1,10 +1,10 @@
 <?php 
 $entity = $this->controller->requestedEntity;
-$sentDate = $entity->sentTimestamp; 
+$sentDate = $entity->sentTimestamp;
+if(!$entity->opportunity->getMetadata('use_multiple_diligence')) :
 ?>
-
 <h3 class="registration-header"><?php \MapasCulturais\i::_e("Formulário de Inscrição");?></h3>
-
+<?php endif; ?>
 <?php $this->applyTemplateHook('header-fieldset', 'before');?>
 <div class="registration-fieldset clearfix">
 

src/protected/application/themes/BaseV1/layouts/parts/singles/registration-single--header.php

@@ -7,8 +7,8 @@
                 <label for="">
                     <strong>Secretaria da Cultura do Ceara</strong>
                 </label><br>
-                <label for="">Rua Major Facundo, 500 - Centro. CEP: 60.025-100</label><br>
-                <label for="">Fortaleza/CE. Fone: (85) 31016767</label>
+                <label for="">Rua Dr. João Moreira, 500 - Centro. CEP: 60.030-000</label><br>
+                <label for="">Fortaleza/CE. Fone: (85) 981152400</label>
             </p>
         </div>
         <img

src/protected/application/themes/BaseV1/views/pdf/footer-pdf.php

@@ -1 +1 @@
-5.9.7
+5.9.8