[FEAT] [PARA V2] Add details button + hasWorkflow attribute

apps/maarch_entreprise/js/angular/app/Views/signatureBook.html

@@ -26,7 +26,7 @@
             </span>
         </div>
         <div class="actions">
-            <i style="cursor: pointer;vertical-align: middle;" title="Accédez à la fiche détaillée" class="fa fa-info-circle fa-2x"></i>&nbsp;
+            <i style="cursor: pointer;vertical-align: middle;" title="Accédez à la fiche détaillée" class="fa fa-info-circle fa-2x" (click)="backToDetails()"></i>&nbsp;
             <select id="signatureBookActions">
                 <option *ngFor="let option of signatureBook.actions" value="{{option.value}}">{{option.label}}</option>
             </select>
@@ -39,7 +39,7 @@
                 <div class="resListContentFrame" *ngFor="let res of signatureBook.resList" (click)="changeLocation(res.res_id)" [ngClass]="{'resListContentFrameSelected': resId == res.res_id}">
                     <div class="resListContentInfo">
                         <i class="fa fa-compass" title="Numéro chrono"></i> {{res.alt_identifier}}
-                        <i ng-if="res.allSigned" class="fa fa-certificate"></i>&nbsp;
+                        <i *ngIf="res.allSigned" class="fa fa-certificate"></i>&nbsp;
                         <i class="fa fa-circle" aria-hidden="true" [ngStyle]="{'color': res.priorityColor}" style="position: absolute;right: 0px;top: -10px;font-size: 25px;"></i>
                     </div>
                     <div class="resListContentInfo">
@@ -104,7 +104,7 @@
             <i class="fa fa-chevron-right" aria-hidden="true" *ngIf="!showLeftPanel"></i>
         </div>
         <div class="contentRight" id="contentRight" [ngStyle]="{'width': rightContentWidth}">
-            <div class="contentShow" *ngIf="signatureBook.attachments[rightSelectedThumbnail] && !showAttachmentEditionPanel && signatureBook.consigne != 'No Consigne Found'">
+            <div class="contentShow" *ngIf="signatureBook.attachments[rightSelectedThumbnail] && !showAttachmentEditionPanel && signatureBook.hasWorkflow">
                 <div class="pjDetails" [ngStyle]="{'height': showTopRightPanel ? '100px' : '30px'}">
                     <div class="infoPj" title="{{signatureBook.attachments[rightSelectedThumbnail].attachment_type}}">
                         <label>Type : </label>
@@ -167,10 +167,10 @@
                     </span>
                 </div>
             </div>
-            <div *ngIf="signatureBook.consigne == 'No Consigne Found'" style="height: 80vh;font-size: 40px;border: dashed;font-weight: bold;opacity: 0.5;white-space: normal;margin-top: 10px;">
+            <div *ngIf="!signatureBook.hasWorkflow" style="height: 80vh;font-size: 40px;border: dashed;font-weight: bold;opacity: 0.5;white-space: normal;margin-top: 10px;">
                 <div style="margin-top:200px;">Aucun circuit de visa paramétré.<br/><sub>Aucune signature possible.</sub></div>
             </div>
-            <div *ngIf="!signatureBook.attachments[rightSelectedThumbnail] && signatureBook.consigne != 'No Consigne Found'" style="height: 80vh;font-size: 40px;border: dashed;font-weight: bold;opacity: 0.5;white-space: normal;margin-top: 10px;">
+            <div *ngIf="!signatureBook.attachments[rightSelectedThumbnail] && signatureBook.hasWorkflow" style="height: 80vh;font-size: 40px;border: dashed;font-weight: bold;opacity: 0.5;white-space: normal;margin-top: 10px;">
                 <div style="margin-top:200px;">Aucune pièce jointe disponible<br/><sub>Cliquez sur <i class="fa fa-plus"></i> pour en ajouter une</sub></div>
             </div>
             <!--<div class="contentShow" ng-if="signatureBook.showAttachmentEditionPanel">-->
@@ -232,7 +232,7 @@
                 <!--</div>-->
             <!--</div>-->
         </div>
-        <div class="panelRight"  *ngIf="signatureBook.consigne != 'No Consigne Found'">
+        <div class="panelRight"  *ngIf="signatureBook.hasWorkflow">
             <div class="item panelRightAddPj" (click)="addAttachmentIframe()">
                 <i class="fa fa-plus fa-2x" title="Créer une pièce jointe"></i>
             </div>
@@ -241,7 +241,6 @@
                     <span class="fa-stack fa-lg">
                         <i class="fa fa-file-o fa-stack-2x"></i><i class="fa {{attachment.icon}} fa-stack-1x"></i>
                     </span>
-                    <!-- TO DO : ADD IF FOR PJ SIGN -->
                     <i *ngIf="attachment.status == 'SIGN'" style="position: absolute;top: 2px;right: 2px;" class="fa fa-circle"></i>
                     <i *ngIf="attachment.status != 'SIGN'" style="position: absolute;top: 2px;right: 2px;" class="fa fa-circle-o"></i>
                 </div>

apps/maarch_entreprise/js/angular/app/signature-book.component.js

@@ -296,6 +296,10 @@ var SignatureBookComponent = (function () {
         location.hash = "";
         location.reload();
     };
+    SignatureBookComponent.prototype.backToDetails = function () {
+        location.hash = "";
+        location.search = "?page=details&dir=indexing_searching&id=" + this.resId;
+    };
     SignatureBookComponent.prototype.changeLocation = function (resId) {
         var path = "/" + this.basketId + "/signatureBook/" + resId;
         this.router.navigate([path]);

apps/maarch_entreprise/js/angular/app/signature-book.component.ts

@@ -304,6 +304,11 @@ export class SignatureBookComponent implements OnInit {
         location.reload();
     }
 
+    backToDetails() {
+        location.hash = "";
+        location.search = "?page=details&dir=indexing_searching&id=" + this.resId;
+    }
+
     changeLocation(resId: number) {
         let path = "/" + this.basketId + "/signatureBook/" + resId;
         this.router.navigate([path]);

modules/visa/Controllers/VisaController.php

@@ -12,6 +12,7 @@ require_once 'apps/maarch_entreprise/Models/ContactsModel.php';
 require_once 'apps/maarch_entreprise/Models/UsersModel.php';
 require_once 'modules/basket/Models/BasketsModel.php';
 require_once 'modules/notes/Models/NotesModel.php';
+require_once 'modules/visa/Models/VisaModel.php';
 
 
 class VisaController
@@ -115,6 +116,7 @@ class VisaController
 		$datas['nbNotes'] 		= \NotesModel::countByResId(['resId' => $resId]);;
 		$datas['signature'] 	= \UsersModel::getSignatureForCurrentUser()['pathToSignatureOnTmp'];
 		$datas['consigne'] 		= \UsersModel::getCurrentConsigneById(['resId' => $resId]);
+		$datas['hasWorkflow'] 	= \VisaModel::hasVisaWorkflowByResId(['resId' => $resId]);
 
 		return $response->withJson($datas);
 	}

modules/visa/Models/VisaModel.php

+<?php
+
+/**
+ * Copyright Maarch since 2008 under licence GPLv3.
+ * See LICENCE.txt file at the root folder for more details.
+ * This file is part of Maarch software.
+ *
+ */
+
+require_once 'modules/visa/Models/VisaModelAbstract.php';
+
+class VisaModel extends VisaModelAbstract
+{
+    // Do your stuff in this class
+}
\ No newline at end of file

modules/visa/Models/VisaModelAbstract.php

+<?php
+
+/**
+ * Copyright Maarch since 2008 under licence GPLv3.
+ * See LICENCE.txt file at the root folder for more details.
+ * This file is part of Maarch software.
+ *
+ */
+
+require_once 'apps/maarch_entreprise/services/Table.php';
+
+class VisaModelAbstract extends Apps_Table_Service
+{
+
+    public static function hasVisaWorkflowByResId(array $aArgs = [])
+    {
+        static::checkRequired($aArgs, ['resId']);
+        static::checkNumeric($aArgs, ['resId']);
+
+
+        $aReturn = static::select([
+            'select'    => ['COUNT(*)'],
+            'table'     => ['listinstance'],
+            'where'     => ['res_id = ?', 'item_mode in (?)'],
+            'data'      => [$aArgs['resId'], ['visa', 'sign']]
+        ]);
+
+
+        return ((int)$aReturn[0]['count'] > 0);
+    }
+}
\ No newline at end of file