diff --git a/modules/visa/Views/signatureBook.html b/modules/visa/Views/signatureBook.html
index 9d9d1b22048563650078d668049b80ba60f21516..608d9ba029bfe453149c0d6bb16659b41f6e2a14 100644
--- a/modules/visa/Views/signatureBook.html
+++ b/modules/visa/Views/signatureBook.html
@@ -54,13 +54,14 @@
</div>
</div>
- <div class="hideresListContent">
- <i class="fa fa-chevron-left" aria-hidden="true"></i>
+ <div class="hideresListContent" ng-click="displayPanel('LEFT')">
+ <i class="fa fa-chevron-left" aria-hidden="true" ng-if="signatureBook.showLeftPanel"></i>
+ <i class="fa fa-chevron-right" aria-hidden="true" ng-if="!signatureBook.showLeftPanel"></i>
</div>
<div class="contentLeft">
<div class="contentShow" ng-if="signatureBook.headerTab == 1">
<div class="pjDoc">
- <div ng-click="displayTopPanel('LEFT')" ng-if="!signatureBook.showTopLeftPanel" style="padding: 5px;cursor:pointer;">
+ <div ng-click="displayPanel('TOPLEFT')" ng-if="!signatureBook.showTopLeftPanel" style="padding: 5px;cursor:pointer;">
<strong>{{::signatureBook.documents.length - 1}} pièce(s) jointe(s)</strong>
</div>
@@ -68,7 +69,7 @@
class="leftPanelThumbnails" ng-class="{'panelSelectedThumbnail': index == signatureBook.leftSelectedThumbnail}"/>
<!--<label>PJ1</label>-->
</div>
- <div class="pjDetailsMore" ng-click="displayTopPanel('LEFT')">
+ <div class="pjDetailsMore" ng-click="displayPanel('TOPLEFT')">
<i ng-hide="signatureBook.showTopLeftPanel" class="fa fa-chevron-down" aria-hidden="true"></i>
<i ng-show="signatureBook.showTopLeftPanel" class="fa fa-chevron-up" aria-hidden="true"></i>
</div>
@@ -96,6 +97,10 @@
</table>
</div>
</div>
+ <div class="hideLeftContent" ng-click="displayPanel('RESLEFT')">
+ <i class="fa fa-chevron-left" aria-hidden="true" ng-if="signatureBook.showResLeftPanel"></i>
+ <i class="fa fa-chevron-right" aria-hidden="true" ng-if="!signatureBook.showResLeftPanel"></i>
+ </div>
<div class="contentRight">
<div class="contentShow" ng-if="!signatureBook.showAttachmentEditionPanel">
<div class="pjDetails">
@@ -138,7 +143,7 @@
</div>
</div>
</div>
- <div class="pjDetailsMore" ng-click="displayTopPanel('RIGHT')">
+ <div class="pjDetailsMore" ng-click="displayPanel('TOPRIGHT')">
<i ng-hide="signatureBook.showTopRightPanel" class="fa fa-chevron-down" aria-hidden="true"></i>
<i ng-show="signatureBook.showTopRightPanel" class="fa fa-chevron-up" aria-hidden="true"></i>
</div>
@@ -153,7 +158,62 @@
</div>
</div>
<div class="contentShow" ng-if="signatureBook.showAttachmentEditionPanel">
- <span>Edition de PJ</span>
+ <h1>Créer une pièce jointe</h1>
+ <div class="pjCreate">
+ <div class="infoPj" title="Type">
+ <div class="input-group margin-bottom-sm">
+ <span class="input-group-addon"><i class="fa fa-file fa-fw"></i></span>
+ <select><option>Projet d réponse</option></select>
+ </div>
+ </div>
+ <div class="infoPj" title="Objet">
+ <div class="input-group margin-bottom-sm">
+ <span class="input-group-addon"><i class="fa fa-info fa-fw"></i></span>
+ <input class="form-control" type="text" placeholder="Objet">
+ </div>
+ </div>
+ <div class="infoPj" title="Personne concerné">
+ <div class="input-group margin-bottom-sm">
+ <span class="input-group-addon"><i class="fa fa-book fa-fw"></i></span>
+ <input class="form-control" type="text" placeholder="Personne concerné">
+ </div>
+ </div>
+ <div class="infoPj" title="Numéro chrono">
+ <div class="input-group margin-bottom-sm">
+ <span class="input-group-addon"><i class="fa fa-compass fa-fw"></i></span>
+ <input class="form-control" type="text" placeholder="Numéro chrono">
+ </div>
+ </div>
+ <div class="infoPj" title="Crée par">
+ <div class="input-group margin-bottom-sm">
+ <span class="input-group-addon"><i class="fa fa-user fa-fw"></i></span>
+ <input class="form-control" type="text" placeholder="Crée par">
+ </div>
+ </div>
+ <div class="infoPj" title="Crée le">
+ <div class="input-group margin-bottom-sm">
+ <span class="input-group-addon"><i class="fa fa-calendar-o fa-fw"></i></span>
+ <input class="form-control" type="text" placeholder="Crée le">
+ </div>
+ </div>
+ <div class="infoPj" title="Retour">
+ <div class="input-group margin-bottom-sm">
+ <span class="input-group-addon"><i class="fa fa-calendar-o fa-fw"></i></span>
+ <input class="form-control" type="text" placeholder="Retour">
+ </div>
+ </div>
+ <div class="infoPj">
+ <div class="input-group margin-bottom-sm" title="Version">
+ <span class="input-group-addon"><i class="fa fa-code-fork fa-fw"></i></span>
+ <input class="form-control" type="text" placeholder="Version">
+ </div>
+ </div>
+ </div>
+ <div class="pjCreateFile">
+ <i class="fa fa-upload" aria-hidden="true" title="Tranférer un fichier depuis votre ordinateur"></i>
+ <i> / </i>
+ <i class="fa fa-pencil-square-o" aria-hidden="true" title="Editer un modèle de document"></i>
+ </div>
</div>
<div class="panelRight">
<div class="item panelRightAddPj" ng-click="changeRightViewer(-1)" ng-class="{'panelSelectedThumbnail': signatureBook.rightSelectedThumbnail == -1}">
diff --git a/modules/visa/css/module.css b/modules/visa/css/module.css
index 4ef37e3cceaa2bafb8d1c9c197fb07a57f731650..7af3564298b6df68a1a8829929cfb90d94d6317b 100644
--- a/modules/visa/css/module.css
+++ b/modules/visa/css/module.css
@@ -223,6 +223,13 @@
margin-top: 10px;
}
+.visaContent h1{
+ display: block !important;
+ position: initial !important;
+ padding: 10px;
+ text-align: center !important;
+}
+
.headerSignatureBook .others{
border-right: solid 1px black;
display: table-cell;
@@ -234,7 +241,7 @@
.headerSignatureBook .others input{
background: #E6E6E6;
border-radius: 2px;
- width: 50%;
+ width: 350px;
border: none;
padding: 5px;
}
@@ -280,7 +287,7 @@
overflow-y: auto;
}
-.hideresListContent{
+.hideresListContent,.hideLeftContent{
display: inline-block;
height:100%;
text-align: center;
@@ -293,10 +300,15 @@
.contentLeft{
border-right: solid 1px;
vertical-align: top;
+ width:41%;
+}
+
+.contentRight{
+ width:42%;
}
+
.contentLeft, .contentRight{
display: inline-block;
- width:42%;
height:100%;
text-align: center;
}
@@ -351,8 +363,8 @@
width:90%;
}
-.pjDetails,.pjSign{
- display: table;
+.pjDetails,.pjSign,.pjCreate{
+ display: block;
width: 97%;
text-align: left;
-moz-box-shadow: inset 0px 0px 5px 0px #656565;
@@ -376,6 +388,25 @@
cursor: pointer;
}
+.pjCreate{
+ height: auto;
+ white-space: initial;
+}
+
+.pjCreateFile{
+ border: dashed 12px #ccc;
+ height: 60%;
+ border-radius: 5px;
+ margin-top: 10px;
+}
+
+.pjCreateFile i{
+ font-size: 100px;
+ opacity: 0.5;
+ margin-top: 20%;
+ cursor: pointer;
+}
+
.pjDetails div{
white-space: initial;
}
diff --git a/modules/visa/js/aController.js b/modules/visa/js/aController.js
index c781683cb9e0c35ce29fcde4f0c727ff68d233e1..8a84baae65d9b89f5018804b9f77137baa0dba38 100644
--- a/modules/visa/js/aController.js
+++ b/modules/visa/js/aController.js
@@ -37,6 +37,8 @@ mainApp.controller("visaCtrl", ["$scope", "$http", "$routeParams", "$interval",
$scope.signatureBook.headerTab = 1;
$scope.signatureBook.showTopRightPanel = false;
$scope.signatureBook.showTopLeftPanel = false;
+ $scope.signatureBook.showResLeftPanel = true;
+ $scope.signatureBook.showLeftPanel = true;
$scope.signatureBook.showAttachmentEditionPanel = false;
$scope.historyTable = new NgTableParams({
@@ -74,15 +76,27 @@ mainApp.controller("visaCtrl", ["$scope", "$http", "$routeParams", "$interval",
$scope.signatureBook.leftSelectedThumbnail = index;
};
- $scope.displayTopPanel = function(panel) {
- if (panel == "RIGHT") {
+ $scope.displayPanel = function(panel) {
+ if (panel == "TOPRIGHT") {
$scope.signatureBook.showTopRightPanel = !$scope.signatureBook.showTopRightPanel;
$scope.signatureBook.showTopRightPanel == true ? $j(".pjDetails").css("height", "100px") : $j(".pjDetails").css("height", "30px");
$scope.signatureBook.showTopRightPanel == true ? $j("#rightPanelShowDocumentIframe").css("height", "69vh") : $j("#rightPanelShowDocumentIframe").css("height", "75vh");
- } else if (panel == "LEFT") {
+ } else if (panel == "TOPLEFT") {
$scope.signatureBook.showTopLeftPanel = !$scope.signatureBook.showTopLeftPanel;
$scope.signatureBook.showTopLeftPanel == true ? $j(".pjDoc").css("height", "100px") : $j(".pjDoc").css("height", "30px");
$scope.signatureBook.showTopLeftPanel == true ? $j("#leftPanelShowDocumentIframe").css("height", "69vh") : $j("#leftPanelShowDocumentIframe").css("height", "75vh");
+ } else if (panel == "LEFT") {
+ $scope.signatureBook.showLeftPanel = !$scope.signatureBook.showLeftPanel;
+ $scope.signatureBook.showLeftPanel == true ? $j(".resListContent").css("display", "inline-block") : $j(".resListContent").css("display", "none");
+ $scope.signatureBook.showLeftPanel == true ? $j(".contentLeft").css("width", "41%") : $j(".contentLeft").css("width", "48.5%");
+ $scope.signatureBook.showLeftPanel == true ? $j(".contentRight").css("width", "42%") : $j(".contentRight").css("width", "50%");
+ } else if (panel == "RESLEFT") {
+ $scope.signatureBook.showResLeftPanel = !$scope.signatureBook.showResLeftPanel;
+ $scope.signatureBook.showResLeftPanel == true ? $j(".contentLeft").css("display", "inline-block") : $j(".contentLeft").css("display", "none");
+ $scope.signatureBook.showResLeftPanel == true ? $j(".resListContent").css("display", "inline-block") : $j(".resListContent").css("display", "none");
+ $scope.signatureBook.showResLeftPanel == true ? $j(".hideresListContent").css("display", "inline-block") : $j(".hideresListContent").css("display", "none");
+ $scope.signatureBook.showResLeftPanel == true ? $j(".contentRight").css("width", "42%") : $j(".contentRight").css("width", "99%");
+ $scope.signatureBook.showResLeftPanel == true ? $j(".contentRight .contentShow").css("width", "90%") : $j(".contentRight .contentShow").css("width", "96%");
}
};
@@ -189,7 +203,6 @@ mainApp.controller("visaCtrl", ["$scope", "$http", "$routeParams", "$interval",
vm.resId = $routeParams.resId;
getDatas($routeParams.basketId, $routeParams.resId);
-
lockDocument($routeParams.resId);
$interval(function () {
lockDocument($routeParams.resId);