Skip to content
Snippets Groups Projects
Commit e7786f47 authored by Damien's avatar Damien
Browse files

FEAT #5233 Back button

parent c0817c68
No related branches found
No related tags found
No related merge requests found
...@@ -64,6 +64,8 @@ class VisaController { ...@@ -64,6 +64,8 @@ class VisaController {
} }
} }
$attachments[$key]['truncateTitle'] = ((strlen($value['title']) > 20) ? (substr($value['title'], 0, 20) . '...') : $value['title']);
$attachments[$key]['thumbnailLink'] = "index.php?page=doc_thumb&module=thumbnails&res_id={$realId}&coll_id={$collId}&display=true&advanced=true"; $attachments[$key]['thumbnailLink'] = "index.php?page=doc_thumb&module=thumbnails&res_id={$realId}&coll_id={$collId}&display=true&advanced=true";
$attachments[$key]['viewerLink'] = "index.php?display=true&module=visa&page=view_pdf_attachement&res_id_master={$resId}&id={$viewerId}"; $attachments[$key]['viewerLink'] = "index.php?display=true&module=visa&page=view_pdf_attachement&res_id_master={$resId}&id={$viewerId}";
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<i class="fa fa-line-chart fa-2x"></i> <i class="fa fa-line-chart fa-2x"></i>
</div> </div>
<div class="others"> <div class="others">
<i style="cursor: pointer" ng-click="backToBasket()" class="fa fa-backward fa-lg"></i>
</div> </div>
<div class="actions"> <div class="actions">
<select id="signatureBookActions"> <select id="signatureBookActions">
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<div class="contentShow"> <div class="contentShow">
<div class="pjDetails"> <div class="pjDetails">
<div class="infoPj"><label>Type : </label><span>{{signatureBook.attachments[signatureBook.rightSelectedThumbnail].attachment_type}}</span></div> <div class="infoPj"><label>Type : </label><span>{{signatureBook.attachments[signatureBook.rightSelectedThumbnail].attachment_type}}</span></div>
<div class="infoPj"><label>Objet : </label><span>{{signatureBook.attachments[signatureBook.rightSelectedThumbnail].title}}</span></div> <div class="infoPj"><label>Objet : </label><span>{{signatureBook.attachments[signatureBook.rightSelectedThumbnail].truncateTitle}}</span></div>
<div class="infoPj"><label>Contact : </label><span>Laurent GIOVANONNI - 11 boulevard du sud est</span></div> <div class="infoPj"><label>Contact : </label><span>Laurent GIOVANONNI - 11 boulevard du sud est</span></div>
</div> </div>
<div class="pjDetailsMore"> <div class="pjDetailsMore">
......
...@@ -84,7 +84,6 @@ ...@@ -84,7 +84,6 @@
height: 96%; height: 96%;
width: 100%; width: 100%;
overflow-y: scroll; overflow-y: scroll;
overflow-x: none;
} }
.listDocsBasket div{ .listDocsBasket div{
...@@ -252,6 +251,7 @@ ...@@ -252,6 +251,7 @@
display: table-cell; display: table-cell;
padding: 5px; padding: 5px;
vertical-align: middle; vertical-align: middle;
text-align: right;
} }
.headerSignatureBook .item.activeTabSignatureBook,.panelRight .panelSelectedThumbnail{ .headerSignatureBook .item.activeTabSignatureBook,.panelRight .panelSelectedThumbnail{
...@@ -406,13 +406,6 @@ ...@@ -406,13 +406,6 @@
vertical-align: middle; vertical-align: middle;
} }
.headerSignatureBook .others{
border-right: solid 1px black;
display: table-cell;
padding: 5px;
vertical-align: middle;
}
.headerSignatureBook .item.activeTabSignatureBook,.panelRight .panelSelectedThumbnail{ .headerSignatureBook .item.activeTabSignatureBook,.panelRight .panelSelectedThumbnail{
background: #009DC5; background: #009DC5;
color:white; color:white;
......
...@@ -35,6 +35,11 @@ mainApp.controller("visaCtrl", ["$scope", "$http", "$routeParams", "$interval", ...@@ -35,6 +35,11 @@ mainApp.controller("visaCtrl", ["$scope", "$http", "$routeParams", "$interval",
$scope.signatureBook.leftSelectedThumbnail = index; $scope.signatureBook.leftSelectedThumbnail = index;
}; };
$scope.backToBasket = function() {
location.hash = "";
location.reload();
};
$scope.validForm = function() { $scope.validForm = function() {
//$interval.cancel(intervalPromise); //$interval.cancel(intervalPromise);
unlockDocument($routeParams.resId); unlockDocument($routeParams.resId);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment