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

[FEAT] [PARA V2] Resize panel

parent e83a5cc8
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
apps/maarch_entreprise/js/angular/app/Views/signatureBook.html
+ 5
− 5
View file @ 240aed65
...@@ -73,13 +73,13 @@ ...@@ -73,13 +73,13 @@
</div> </div>
<iframe *ngIf="leftViewerLink != ''" id="leftPanelShowDocumentIframe" [src]="leftViewerLink | safeUrl" [ngStyle]="{'height': showTopLeftPanel ? '80%' : '95%'}"></iframe> <iframe *ngIf="leftViewerLink != ''" id="leftPanelShowDocumentIframe" [src]="leftViewerLink | safeUrl" [ngStyle]="{'height': showTopLeftPanel ? '80%' : '95%'}"></iframe>
</div> </div>
<div *ngIf="headerTab == 2" class="contentShow" style="width:100%;"> <div *ngIf="headerTab == 2" class="contentShow" style="width:98%;">
<iframe [src]="notesViewerLink | safeUrl"></iframe> <iframe [src]="notesViewerLink | safeUrl"></iframe>
</div> </div>
<div *ngIf="headerTab == 3" class="contentShow" style="width:100%;overflow-x: hidden;"> <div *ngIf="headerTab == 3" class="contentShow" style="width:98%;overflow-x: hidden;">
<iframe [src]="visaViewerLink | safeUrl"></iframe> <iframe [src]="visaViewerLink | safeUrl"></iframe>
</div> </div>
<div *ngIf="headerTab == 4" class="contentShow" style="width:100%;"> <div *ngIf="headerTab == 4" class="contentShow" style="width:98%;">
<iframe [src]="histViewerLink | safeUrl"></iframe> <iframe [src]="histViewerLink | safeUrl"></iframe>
<!--<table ng-table="historyTable" class="table" id="historyTable">--> <!--<table ng-table="historyTable" class="table" id="historyTable">-->
<!--<tr ng-repeat="history in $data">--> <!--<tr ng-repeat="history in $data">-->
...@@ -146,12 +146,12 @@ ...@@ -146,12 +146,12 @@
</div> </div>
</div> </div>
</div> </div>
<div class="pjDetailsMore" (click)="displayPanel('TOPRIGHT')"> <div class="pjDetailsMore" (click)="displayPanel('TOPRIGHT')" title="Détails">
<i *ngIf="!showTopRightPanel" class="fa fa-chevron-down" aria-hidden="true"></i> <i *ngIf="!showTopRightPanel" class="fa fa-chevron-down" aria-hidden="true"></i>
<i *ngIf="showTopRightPanel" class="fa fa-chevron-up" aria-hidden="true"></i> <i *ngIf="showTopRightPanel" class="fa fa-chevron-up" aria-hidden="true"></i>
</div> </div>
<iframe *ngIf="signatureBook.attachments[rightSelectedThumbnail].format == 'pdf' || signatureBook.attachments[rightSelectedThumbnail].isConverted" id="rightPanelShowDocumentIframe" [src]="rightViewerLink | safeUrl" [ngStyle]="{'height': showTopRightPanel ? '80%' : '95%'}"></iframe> <iframe *ngIf="signatureBook.attachments[rightSelectedThumbnail].format == 'pdf' || signatureBook.attachments[rightSelectedThumbnail].isConverted" id="rightPanelShowDocumentIframe" [src]="rightViewerLink | safeUrl" [ngStyle]="{'height': showTopRightPanel ? '80%' : '95%'}"></iframe>
<div class="visaNoPdfWarning" *ngIf="signatureBook.attachments[rightSelectedThumbnail].format != 'pdf' && !signatureBook.attachments[rightSelectedThumbnail].isConverted"> <div *ngIf="signatureBook.attachments[rightSelectedThumbnail].format != 'pdf' && !signatureBook.attachments[rightSelectedThumbnail].isConverted" [ngStyle]="{'height': showTopRightPanel ? '80%' : '95%'}" class="visaNoPdfWarning">
<div style="padding-top: 25%;">Aucun aperçu disponible<br/><sub>La version PDF de ce format n'a pas été trouvée.</sub></div> <div style="padding-top: 25%;">Aucun aperçu disponible<br/><sub>La version PDF de ce format n'a pas été trouvée.</sub></div>
</div> </div>
<div *ngIf="signatureBook.attachments[rightSelectedThumbnail].sign && (signatureBook.attachments[rightSelectedThumbnail].format == 'pdf' || signatureBook.attachments[rightSelectedThumbnail].isConverted)" class="pjSign"> <div *ngIf="signatureBook.attachments[rightSelectedThumbnail].sign && (signatureBook.attachments[rightSelectedThumbnail].format == 'pdf' || signatureBook.attachments[rightSelectedThumbnail].isConverted)" class="pjSign">
......
apps/maarch_entreprise/js/angular/app/signature-book.component.js
+ 8
− 8
View file @ 240aed65
...@@ -54,8 +54,8 @@ var SignatureBookComponent = (function () { ...@@ -54,8 +54,8 @@ var SignatureBookComponent = (function () {
this.showAttachmentEditionPanel = false; this.showAttachmentEditionPanel = false;
this.loading = false; this.loading = false;
this.loadingSign = false; this.loadingSign = false;
this.leftContentWidth = "39%"; this.leftContentWidth = "42%";
this.rightContentWidth = "39%"; this.rightContentWidth = "42%";
this.notesViewerLink = ""; this.notesViewerLink = "";
this.visaViewerLink = ""; this.visaViewerLink = "";
this.histViewerLink = ""; this.histViewerLink = "";
...@@ -70,7 +70,7 @@ var SignatureBookComponent = (function () { ...@@ -70,7 +70,7 @@ var SignatureBookComponent = (function () {
$j('#viewBasketsTitle').remove(); $j('#viewBasketsTitle').remove();
$j('#homePageWelcomeTitle').remove(); $j('#homePageWelcomeTitle').remove();
$j('#footer').remove(); $j('#footer').remove();
$j('#container').width("98%"); $j('#container').width("99%");
}; };
SignatureBookComponent.prototype.ngOnInit = function () { SignatureBookComponent.prototype.ngOnInit = function () {
var _this = this; var _this = this;
...@@ -107,8 +107,8 @@ var SignatureBookComponent = (function () { ...@@ -107,8 +107,8 @@ var SignatureBookComponent = (function () {
_this.notesViewerLink = "index.php?display=true&module=notes&page=notes&identifier=" + _this.resId + "&origin=document&coll_id=letterbox_coll&load&size=full"; _this.notesViewerLink = "index.php?display=true&module=notes&page=notes&identifier=" + _this.resId + "&origin=document&coll_id=letterbox_coll&load&size=full";
_this.visaViewerLink = "index.php?display=true&page=show_visa_tab&module=visa&resId=" + _this.resId + "&collId=letterbox_coll&visaStep=true"; _this.visaViewerLink = "index.php?display=true&page=show_visa_tab&module=visa&resId=" + _this.resId + "&collId=letterbox_coll&visaStep=true";
_this.histViewerLink = "index.php?display=true&dir=indexing_searching&page=document_workflow_history&id=" + _this.resId + "&coll_id=letterbox_coll&load&size=full"; _this.histViewerLink = "index.php?display=true&dir=indexing_searching&page=document_workflow_history&id=" + _this.resId + "&coll_id=letterbox_coll&load&size=full";
_this.leftContentWidth = "39%"; _this.leftContentWidth = "42%";
_this.rightContentWidth = "39%"; _this.rightContentWidth = "42%";
if (_this.signatureBook.documents[0]) { if (_this.signatureBook.documents[0]) {
_this.leftViewerLink = _this.signatureBook.documents[0].viewerLink; _this.leftViewerLink = _this.signatureBook.documents[0].viewerLink;
} }
...@@ -181,7 +181,7 @@ var SignatureBookComponent = (function () { ...@@ -181,7 +181,7 @@ var SignatureBookComponent = (function () {
this.showLeftPanel = !this.showLeftPanel; this.showLeftPanel = !this.showLeftPanel;
this.showResLeftPanel = false; this.showResLeftPanel = false;
if (!this.showLeftPanel) { if (!this.showLeftPanel) {
this.rightContentWidth = "95%"; this.rightContentWidth = "96%";
} }
else { else {
this.rightContentWidth = "47%"; this.rightContentWidth = "47%";
...@@ -195,8 +195,8 @@ var SignatureBookComponent = (function () { ...@@ -195,8 +195,8 @@ var SignatureBookComponent = (function () {
this.leftContentWidth = "47%"; this.leftContentWidth = "47%";
} }
else { else {
this.rightContentWidth = "39%"; this.rightContentWidth = "42%";
this.leftContentWidth = "39%"; this.leftContentWidth = "42%";
} }
} }
}; };
......
apps/maarch_entreprise/js/angular/app/signature-book.component.ts
+ 8
− 8
View file @ 240aed65
...@@ -50,8 +50,8 @@ export class SignatureBookComponent implements OnInit { ...@@ -50,8 +50,8 @@ export class SignatureBookComponent implements OnInit {
loading : boolean = false; loading : boolean = false;
loadingSign : boolean = false; loadingSign : boolean = false;
leftContentWidth : string = "39%"; leftContentWidth : string = "42%";
rightContentWidth : string = "39%"; rightContentWidth : string = "42%";
notesViewerLink : string = ""; notesViewerLink : string = "";
visaViewerLink : string = ""; visaViewerLink : string = "";
...@@ -71,7 +71,7 @@ export class SignatureBookComponent implements OnInit { ...@@ -71,7 +71,7 @@ export class SignatureBookComponent implements OnInit {
$j('#viewBasketsTitle').remove(); $j('#viewBasketsTitle').remove();
$j('#homePageWelcomeTitle').remove(); $j('#homePageWelcomeTitle').remove();
$j('#footer').remove(); $j('#footer').remove();
$j('#container').width("98%"); $j('#container').width("99%");
} }
ngOnInit(): void { ngOnInit(): void {
...@@ -111,8 +111,8 @@ export class SignatureBookComponent implements OnInit { ...@@ -111,8 +111,8 @@ export class SignatureBookComponent implements OnInit {
this.visaViewerLink = "index.php?display=true&page=show_visa_tab&module=visa&resId=" + this.resId + "&collId=letterbox_coll&visaStep=true"; this.visaViewerLink = "index.php?display=true&page=show_visa_tab&module=visa&resId=" + this.resId + "&collId=letterbox_coll&visaStep=true";
this.histViewerLink = "index.php?display=true&dir=indexing_searching&page=document_workflow_history&id=" + this.resId + "&coll_id=letterbox_coll&load&size=full"; this.histViewerLink = "index.php?display=true&dir=indexing_searching&page=document_workflow_history&id=" + this.resId + "&coll_id=letterbox_coll&load&size=full";
this.leftContentWidth = "39%"; this.leftContentWidth = "42%";
this.rightContentWidth = "39%"; this.rightContentWidth = "42%";
if (this.signatureBook.documents[0]) { if (this.signatureBook.documents[0]) {
this.leftViewerLink = this.signatureBook.documents[0].viewerLink; this.leftViewerLink = this.signatureBook.documents[0].viewerLink;
} }
...@@ -188,7 +188,7 @@ export class SignatureBookComponent implements OnInit { ...@@ -188,7 +188,7 @@ export class SignatureBookComponent implements OnInit {
this.showLeftPanel = !this.showLeftPanel; this.showLeftPanel = !this.showLeftPanel;
this.showResLeftPanel = false; this.showResLeftPanel = false;
if (!this.showLeftPanel) { if (!this.showLeftPanel) {
this.rightContentWidth = "95%"; this.rightContentWidth = "96%";
} else { } else {
this.rightContentWidth = "47%"; this.rightContentWidth = "47%";
this.leftContentWidth = "47%"; this.leftContentWidth = "47%";
...@@ -199,8 +199,8 @@ export class SignatureBookComponent implements OnInit { ...@@ -199,8 +199,8 @@ export class SignatureBookComponent implements OnInit {
this.rightContentWidth = "47%"; this.rightContentWidth = "47%";
this.leftContentWidth = "47%"; this.leftContentWidth = "47%";
} else { } else {
this.rightContentWidth = "39%"; this.rightContentWidth = "42%";
this.leftContentWidth = "39%"; this.leftContentWidth = "42%";
} }
} }
} }
......
apps/maarch_entreprise/js/angular/main.bundle.min.js
+ 1
− 1
View file @ 240aed65
This diff is collapsed.
modules/visa/css/module.css
+ 5
− 8
View file @ 240aed65
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
.visaContent{ .visaContent{
position: relative; position: relative;
height:95vh; height:95vh;
margin-top: 10px; margin-top: 5px;
} }
.visaContent h1{ .visaContent h1{
...@@ -260,13 +260,13 @@ ...@@ -260,13 +260,13 @@
} }
.resListContent{ .resListContent{
display: inline-block; width:10%;
width:15%;
height:100%; height:100%;
text-align: center; text-align: center;
border-right: solid 1px; border-right: solid 1px;
vertical-align: top; vertical-align: top;
overflow: auto; overflow: auto;
font-size: 10px;
} }
.resListContentInfo{ .resListContentInfo{
...@@ -483,10 +483,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{ ...@@ -483,10 +483,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
.titleSignatureBook{ .titleSignatureBook{
display: block; display: block;
width:100%; width:100%;
border-right: solid 1px black; border: solid 1px black;
border-top: solid 1px black;
border-left: solid 1px black;
/*padding: 5px;*/
vertical-align: middle; vertical-align: middle;
font-weight: bold; font-weight: bold;
background: #009DC5; background: #009DC5;
...@@ -570,6 +567,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{ ...@@ -570,6 +567,7 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
background-color: #CEE9F1; background-color: #CEE9F1;
margin-top: 5px;
} }
.headerSignatureBook .item{ .headerSignatureBook .item{
...@@ -878,7 +876,6 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{ ...@@ -878,7 +876,6 @@ img.panelSelectedThumbnail,img:hover.panelSelectedThumbnail{
font-weight: bold; font-weight: bold;
opacity: 0.5; opacity: 0.5;
white-space: normal; white-space: normal;
height: 85%;
font-size: 40px; font-size: 40px;
} }
.visaNoWorkflowWarning{ .visaNoWorkflowWarning{
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment