FEAT #5233 Add Consigne + Fix converted_pdf + Fix showTopLeftPanel

apps/maarch_entreprise/Models/UsersModelAbstract.php

@@ -78,4 +78,22 @@ class UsersModelAbstract extends Apps_Table_Service {
         return $aSignature;
     }
 
+    public static function getConsigneForCurrentUserById(array $aArgs = []) {
+        static::checkRequired($aArgs, ['resId']);
+        static::checkNumeric($aArgs, ['resId']);
+
+
+        $aReturn = static::select([
+            'select'    => ['process_comment'],
+            'table'     => ['listinstance'],
+            'where'     => ['res_id = ?', 'item_id = ?'],
+            'data'      => [$aArgs['resId'], $_SESSION['user']['UserId']],
+        ]);
+
+        if (empty($aReturn[0]['process_comment'])) {
+            return 'No Consigne Found';
+        }
+
+        return $aReturn[0]['process_comment'];
+    }
 }
\ No newline at end of file

modules/visa/Controllers/VisaController.php

@@ -122,6 +122,12 @@ class VisaController {
 				$attachments[$key]['dest_contact_id'], $attachments[$key]['dest_address_id']);
 		}
 
+		foreach ($attachments as $key => $value) {
+			if ($value['attachment_type'] == 'converted_pdf') {
+				unset($attachments[$key]);
+			}
+		}
+
 		$attachments = array_values($attachments);
 
 		$incomingMailAttachments = \ResModel::getAvailableLinkedAttachmentsIn([
@@ -197,6 +203,7 @@ class VisaController {
 		$datas['histories'] = $history;
 		$datas['resList'] = $resList;
 		$datas['signature'] = \UsersModel::getSignatureForCurrentUser()['pathToSignatureOnTmp'];
+		$datas['consigne'] = \UsersModel::getConsigneForCurrentUserById(['resId' => $resId]);
 
 		return $response->withJson($datas);
 	}

modules/visa/Views/signatureBook.html

 <div class='visaContent'>
     <div class="titleSignatureBook">
-        <span>{{::signatureBook.currentAction.actionLabel}}</span><span><i style="cursor: pointer" ng-click="backToBasket()" class="fa fa-times-circle fa-2x"></i></span>    </div>
+        <span>{{::signatureBook.currentAction.actionLabel}}</span>
+        <span><i style="cursor: pointer" ng-click="backToBasket()" class="fa fa-times-circle fa-2x"></i></span>
+    </div>
     <div class="headerSignatureBook">
         <div class="item" ng-class="{'activeTabSignatureBook': signatureBook.headerTab == 1}" ng-click="changeSignatureBookLeftContent(1)">
             <i class="fa fa-dashboard fa-2x"></i>
@@ -19,7 +21,9 @@
             <i class="itemLabel">Avancement</i>
         </div>
         <div class="others">
-            <span id="consigne"><input type="text" value="VEUILLEZ SIGNER" readonly="readonly"></span>
+            <span id="consigne">
+                <input type="text" value="{{::signatureBook.consigne}}" title="Consigne" readonly="readonly">
+            </span>
         </div>
         <div class="actions">
             <select id="signatureBookActions">
@@ -56,9 +60,9 @@
         <div class="contentLeft">
             <div class="contentShow" ng-if="signatureBook.headerTab == 1">
                 <div class="pjDoc">
-                    <div ng-click="displayTopPanel('LEFT')" ng-hide="signatureBook.showTopLeftPanel" style="padding: 5px;cursor:pointer;"><strong>{{signatureBook.documents.length - 1}} pièce(s) jointe(s)</strong></div>
+                    <div ng-click="displayTopPanel('LEFT')" ng-if="!signatureBook.showTopLeftPanel" style="padding: 5px;cursor:pointer;"><strong>{{signatureBook.documents.length - 1}} pièce(s) jointe(s)</strong></div>
 
-                    <img id="thumnails_img" ng-show="signatureBook.showTopLeftPanel" ng-repeat="(index, document) in signatureBook.documents" ng-click="changeLeftViewer(index)" ng-src="{{document.thumbnailLink}}"
+                    <img id="thumnails_img" ng-if="signatureBook.showTopLeftPanel" ng-repeat="(index, document) in signatureBook.documents" ng-click="changeLeftViewer(index)" ng-src="{{document.thumbnailLink}}"
                              class="leftPanelThumbnails" ng-class="{'panelSelectedThumbnail': index == signatureBook.leftSelectedThumbnail}"/>
                     <!--<label>PJ1</label>-->
                 </div>

modules/visa/js/aController.js

@@ -56,6 +56,7 @@ mainApp.controller("visaCtrl", ["$scope", "$http", "$routeParams", "$interval",
 
     $scope.changeSignatureBookLeftContent = function(id) {
       $scope.signatureBook.headerTab = id;
+      $scope.signatureBook.showTopLeftPanel = false;
     };
 
     $scope.changeRightViewer = function(index) {
@@ -169,8 +170,8 @@ mainApp.controller("visaCtrl", ["$scope", "$http", "$routeParams", "$interval",
 
         valid_action_form(
           'empty',
-          'http://127.0.0.1/maarch_trunk_git/apps/maarch_entreprise/index.php?display=true&page=manage_action&module=core',
-          $scope.signatureBook.currentAction,
+          'index.php?display=true&page=manage_action&module=core',
+          $scope.signatureBook.currentAction.id,
           $routeParams.resId,
           'res_letterbox',
           'null',