Merge pull request #348 from secultce/develop

Merge develop to homolog

Author: Junior-Shyko

src/protected/application/lib/modules/Diligence/assets/css/diligence/style.css

@@ -164,13 +164,16 @@
 
 .btn-diligence-open-desactive {
     background-color: #dfdfdf !important;
-    cursor: not-allowed;
+    cursor: not-allowed !important;
     border: 1px solid #a6a6a6;
+    pointer-events:none;
+    color: white !important;
+    border-radius: 5px;
 }
 
 .btn-diligence-open-desactive:hover {
     background-color: #dfdfdf !important;
-    cursor: not-allowed;
+    cursor: not-allowed ;
     border: 1px solid #a6a6a6 !important;
     box-shadow: 2px 2px 2px #a6a6a6;
 }

src/protected/application/lib/modules/Diligence/assets/js/diligence/entity-diligence.js

@@ -130,6 +130,7 @@ var EntityDiligence = (function(){
     {
         $("#btn-open-diligence").attr('disabled', true);
         $("#btn-open-diligence").addClass('btn-diligence-open-desactive');
+        $(".btn-diligence-open-active").addClass('btn-diligence-open-desactive');
     }
     //Remove o botão de abrir diligencia
     function removeBtnOpenDiligence()

src/protected/application/lib/modules/Diligence/assets/js/diligence/proponent.js

@@ -12,6 +12,8 @@ $(document).ready(function () {
 
     //Bloqueando aba para proponente
     $("#li-tab-diligence-diligence > a").remove();
+    $("#tab-diligence-diligence").remove();
+    
     $("#li-tab-diligence-diligence").append('<label>Diligência</label>');
     $("#li-tab-diligence-diligence > label").addClass('cursor-disabled');
 
@@ -60,7 +62,7 @@ $(document).ready(function () {
             })
 
             MapasCulturais.idDiligence = Math.max.apply(null, idsDiligences);    
-            const ahref ='<a href="#diligence-diligence" rel="noopener noreferrer" onclick="hideRegistration()" id="tab-main-content-diligence-diligence">Diligência</a>';
+            const ahref ='<a href="#diligence-diligence" rel="noopener noreferrer" onclick="hideRegistration()" id="tab-diligence-diligence">Diligência</a>';
                 $("#li-tab-diligence-diligence > label").removeClass('cursor-disabled');
                 $("#li-tab-diligence-diligence > label").remove();
                 $("#li-tab-diligence-diligence").append(ahref);

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

@@ -12,10 +12,7 @@
 DiligenceRepo::getIsAuditor($entity->id);
 
 ?>
-<div>
-    <hr>
-</div>
-<div class="import-financial-report" style="margin-top: 15px">
+<div class="import-financial-report" style="margin-top: 15px;">
 
     <?php
     //Para mostrar o botão de excluir para gestores da oportuniade

src/protected/application/lib/modules/Diligence/layouts/parts/diligence/proponent.php

@@ -17,17 +17,13 @@
 $placeHolder = "Digite aqui a sua resposta";
 
 Carbon::setLocale('pt_BR');
-
+$tado = RepoDiligence::getTado($context['entity']);
 $this->applyTemplateHook('tabs', 'before');
 $this->part('diligence/ul-buttons', ['entity' => $context['entity'], 'sendEvaluation' => $sendEvaluation]);
-//Tado
-$tado = RepoDiligence::getTado($context['entity']);
 ?>
 
 <?php $this->applyTemplateHook('tabs', 'after'); ?>
-<div class="tabs-content">
-    <div id="diligence-principal"></div>
-    <div id="diligence-diligence">
+    <div id="diligence-diligence" class="aba-content">
         <!-- PARA O PROPONENTE -->
         <?php
         $diligenceType = $context['entity']->opportunity->use_multiple_diligence == 'Sim' ? 'multi' : 'common';
@@ -117,4 +113,4 @@
         <?php endif; ?>
         <!-- FIM PROPONENTE -->
     </div>
-</div>
+

src/protected/application/lib/modules/Diligence/layouts/parts/diligence/tabs-parent.php

@@ -29,10 +29,7 @@
 $this->applyTemplateHook('tabs', 'before');
 $this->part('diligence/ul-buttons', ['entity' => $context['entity'], 'sendEvaluation' => $sendEvaluation]);
 ?>
-
-<div class="tabs-content">
-    <div id="diligence-principal"></div>
-    <div id="diligence-diligence">
+    <div id="diligence-diligence" class="aba-content">
         <p id="paragraph_loading_content">
             <label for="">
                 Carregando ... <img id="img-loading-content" />
@@ -129,5 +126,5 @@ class="attachment-title ng-binding ng-scope" target="_blank" rel="noopener noref
             </div>
         </div>
     </div>
-</div>
+
 <?php $this->applyTemplateHook('tabs', 'after'); ?>

src/protected/application/lib/modules/Diligence/layouts/parts/diligence/ul-buttons.php

@@ -1,19 +1,19 @@
 <ul class="abas clearfix">
-    <li class="active">
-        <a href="#diligence-principal" rel="noopener noreferrer" onclick="showRegistration()" id="tab-main-content-diligence-principal">Ficha</a>
+    <li class="active"  id="li-tab-ficha-diligence">
+        <a href="#registration-content-all" rel="noopener noreferrer" onclick="showRegistration()" id="">Ficha</a>
     </li>
     <?php
     if (!$sendEvaluation) : ?>
         <li class="" id="li-tab-diligence-diligence">
-            <a href="#diligence-diligence" rel="noopener noreferrer" onclick="hideRegistration()" id="tab-main-content-diligence-diligence">Diligência</a>
+            <a href="#diligence-diligence" rel="noopener noreferrer" onclick="hideRegistration()" id="">Diligência</a>
         </li>
     <?php endif; ?>
-    <li class="" style="float: right;">
-        <button type="button"
+    <li class="" id="li-btn-opend-diligence" style="float: right;">
+        <a href="#diligence-diligence" rel="noopener noreferrer"
                 class="btn btn-primary btn-diligence-open-active"
                 id="btn-open-diligence"
                 onclick="openDiligence(0)">
             Abrir Diligência
-        </button>
+        </a>
     </li>
 </ul>

src/protected/application/themes/BaseV1/views/registration/single.php

@@ -45,12 +45,15 @@
 
 <article class="main-content registration" ng-controller="OpportunityController">
     <?php $this->part('singles/registration--header', $_params); ?>
-        <?php $this->applyTemplateHook('content-diligence','begin'); ?>
-            <article id="diligence">
-                
-            </article>
+      
+
+    <div class="tabs-content">
+         <?php $this->applyTemplateHook('content-diligence','begin'); ?>
+           
         <?php $this->applyTemplateHook('content-diligence','end'); ?>
-    <article id="registration-content-all">
+
+    <article id="registration-content-all" class="aba-content">
+
         <?php $this->applyTemplateHook('form','begin'); ?>
 
         <?php $this->part('singles/registration-single--header', $_params) ?>
@@ -81,6 +84,7 @@
 
         <?php $this->applyTemplateHook('form','end'); ?>
     </article>
+    </div>
     <?php $this->part('singles/registration--valuers-list', $_params) ?>
 </article>
 <article id="sidebars">