Skip to content
Snippets Groups Projects
Verified Commit 4a7b32e3 authored by Alex ORLUC's avatar Alex ORLUC
Browse files

FEAT #10702 TIME 3:30 fix display mobile view

parent 4bef7e4f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 268 additions and 140 deletions
src/frontend/app/document/document-list/document-list.component.html
+ 20
− 35
View file @ 4a7b32e3
<ng-container *ngIf="!loading"> <div class="panel-content" *ngIf="!loading">
<div style="font-size: 30px;opacity: 0.1;padding-bottom: 30px;text-align: center;"> <div class="panel-header">
<mat-icon fontSet="fas" fontIcon="fa-list-ol fa-2x"></mat-icon> Documents <button class="closePanel" mat-icon-button type="button" (tap)="snavRightComponent.close();">
<mat-icon fontSet="fas" fontIcon="fa-arrow-right fa-2x"></mat-icon>
</button>
<mat-icon fontSet="fas" fontIcon="fa-file fa-2x"></mat-icon> <b>{{mainDocument.attachments.length + 1}}</b>&nbsp;document(s)
</div> </div>
<div *ngIf="attachments.length == 0" style="text-align:center;font-size:24px;font-weight:bold;opacity:0.3;"> <div class="pjListContent">
{{'lang.noAttachment' | translate}} <mat-card [style.background-image]="'url('+mainDocument.thumbnailUrl+')'" [class.current]="mainDocument.id == currentDocId"
</div> style="padding:0;margin-top: 30px;height: 400px;width: 100%;background-size: contain;background-repeat: no-repeat;background-position: center;"
<!--<mat-list> (click)="loadDoc(mainDocument.id)">
<h3 mat-subheader>Document à signer / annoter</h3> <div class="pjToolsContent">
<mat-list-item *ngFor="let attachment of attachments"> Main doc
<ng-container *ngIf="attachment.main == true"> </div>
<p mat-line style="width: 100%;"> <button mat-raised-button </mat-card>
[style.background-image]="'url('+attachment.thumbnailUrl+')'" <mat-card *ngFor="let attachment of mainDocument.attachments;let i=index"
style="margin:10px;height: 400px;width: 100%;background-size: contain;background-repeat: no-repeat;background-position: center;"></button> [style.background-image]="'url('+attachment.thumbnailUrl+')'" [class.current]="attachment == currentDocId"
</p> style="padding:0;margin-top: 30px;height: 400px;width: 100%;background-size: contain;background-repeat: no-repeat;background-position: center;"
</ng-container> (click)="loadDoc(attachment)">
</mat-list-item>
<mat-divider></mat-divider>
<h3 mat-subheader>Annexes</h3>
<mat-list-item *ngFor="let attachment of attachments">
<ng-container *ngIf="attachment.main == false">
<p mat-line style="width: 100%;"> <button mat-raised-button
[style.background-image]="'url('+attachment.thumbnailUrl+')'"
style="margin:10px;height: 400px;width: 100%;background-size: contain;background-repeat: no-repeat;background-position: center;"></button>
</p>
</ng-container>
</mat-list-item>
</mat-list>-->
<div style="padding-left:30px;padding-right: 30px;">
<mat-card *ngFor="let attachment of attachments;let i=index" [style.background-image]="'url('+attachment.thumbnailUrl+')'"
style="padding:0;margin-top: 30px;height: 400px;width: 100%;background-size: contain;background-repeat: no-repeat;background-position: center;">
<div class="pjToolsContent"> <div class="pjToolsContent">
Annexes {{i}} Annexes {{i}}
</div> </div>
</mat-card> </mat-card>
</div> </div>
</div>
\ No newline at end of file
</ng-container>
\ No newline at end of file
src/frontend/app/document/document-list/document-list.component.scss
+ 35
− 0
View file @ 4a7b32e3
...@@ -51,4 +51,39 @@ ...@@ -51,4 +51,39 @@
border-bottom-left-radius: 5px; border-bottom-left-radius: 5px;
background: white; background: white;
padding: 10px; padding: 10px;
}
.current {
box-shadow: 0px 0px 20px 0px #656565;
}
.panel-header {
box-shadow: 0px 0px 10px 0px #656565;
color: white;
background: $primary;
height: 65px;
display: flex;
justify-content: center;
position: relative;
font-size: 20px;
align-items: center;
}
.pjListContent {
padding-left: 30px;
padding-right: 30px;
flex: 1;
overflow: auto;
}
.panel-content {
display: flex;
flex-direction: column;
position: relative;
height: 100%;
overflow: hidden;
}
.closePanel {
position: absolute;
left: 0px;
font-size: 24px;
} }
\ No newline at end of file
src/frontend/app/document/document-list/document-list.component.ts
+ 14
− 21
View file @ 4a7b32e3
import { Component, Input, OnInit } from '@angular/core'; import { Component, Input, OnInit, Output, EventEmitter } from '@angular/core';
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { NotificationService } from '../../service/notification.service'; import { NotificationService } from '../../service/notification.service';
import { MatSidenav } from '@angular/material';
@Component({ @Component({
selector: 'app-document-list', selector: 'app-document-list',
...@@ -11,30 +12,22 @@ export class DocumentListComponent implements OnInit { ...@@ -11,30 +12,22 @@ export class DocumentListComponent implements OnInit {
loading: boolean = false; loading: boolean = false;
attachments: any = []; // tslint:disable-next-line:no-input-rename
@Input('mainDocument') mainDocument: any;
// tslint:disable-next-line:no-input-rename
@Input('currentDocId') currentDocId: any;
// tslint:disable-next-line:no-input-rename
@Input('snavRightComponent') snavRightComponent: MatSidenav;
@Output() triggerEvent = new EventEmitter<string>();
constructor(public http: HttpClient, public notificationService: NotificationService) { } constructor(public http: HttpClient, public notificationService: NotificationService) { }
ngOnInit(): void { } ngOnInit(): void { }
loadDocumentList(mainDocid: number) {
if (this.attachments.length === 0 || mainDocid !== this.attachments[0].id) { loadDoc(id: string) {
this.attachments = [{ this.triggerEvent.emit(id);
'id': 1408, this.snavRightComponent.close();
'main' : true,
'filename': '0024_878476521.txt',
'thumbnailUrl': 'http://10.2.95.136/maarch_courrier_develop/rest/res/1529/attachments/1408/thumbnail'
}, {
'id': 1407,
'main' : false,
'filename': '0024_878476521.txt',
'thumbnailUrl': 'http://10.2.95.136/maarch_courrier_develop/rest/res/1529/attachments/1408/thumbnail'
}, {
'id': 1406,
'main' : false,
'filename': '0023_1165105382.txt',
'thumbnailUrl': 'http://10.2.95.136/maarch_courrier_develop/rest/res/1529/attachments/1408/thumbnail'
}];
}
} }
} }
src/frontend/app/document/document.component.html
+ 2
− 8
View file @ 4a7b32e3
...@@ -88,15 +88,9 @@ ...@@ -88,15 +88,9 @@
<ng-container *ngIf="!freezeSidenavClose"> <ng-container *ngIf="!freezeSidenavClose">
<button class="btn-previous" [disabled]="snapshot == null" (tap)="prevPage()" <button class="btn-previous" [disabled]="snapshot == null" (tap)="prevPage()"
*ngIf="pageNum > 1 && !this.signaturesService.annotationMode"><i class="fas fa-chevron-left fa-3x"></i></button> *ngIf="pageNum > 1 && !this.signaturesService.annotationMode"><i class="fas fa-chevron-left fa-3x"></i></button>
<button class="btn-previous" (tap)="prevDoc()"
*ngIf="currentDoc > 0 && pageNum === 1 && !this.signaturesService.annotationMode"><i
class="fas fa-chevron-left fa-3x"></i><i class="fas fa-chevron-left fa-3x"></i></button>
<button class="btn-next" [disabled]="snapshot == null" (tap)="nextPage()" <button class="btn-next" [disabled]="snapshot == null" (tap)="nextPage()"
*ngIf="pageNum < totalPages && !this.signaturesService.annotationMode"><i *ngIf="pageNum < totalPages && !this.signaturesService.annotationMode"><i
class="fas fa-chevron-right fa-3x"></i></button> class="fas fa-chevron-right fa-3x"></i></button>
<button class="btn-next" (tap)="nextDoc()"
*ngIf="pageNum == totalPages && docList.length > currentDoc+1 && !this.signaturesService.annotationMode"><i
class="fas fa-chevron-right fa-3x"></i><i class="fas fa-chevron-right fa-3x"></i></button>
</ng-container> </ng-container>
<div [style.width]="widthDoc" style="height:100%;overflow:hidden;background:grey;"> <div [style.width]="widthDoc" style="height:100%;overflow:hidden;background:grey;">
...@@ -125,7 +119,7 @@ ...@@ -125,7 +119,7 @@
</mat-sidenav-content> </mat-sidenav-content>
<mat-sidenav #snavRight mode="over" fixedInViewport="true" [style.width]="signaturesService.sideNavRigtDatas.width" position='end' [disableClose]='signaturesService.sideNavRigtDatas.locked'> <mat-sidenav #snavRight mode="over" fixedInViewport="true" [style.width]="signaturesService.sideNavRigtDatas.width" position='end' [disableClose]='signaturesService.sideNavRigtDatas.locked'>
<app-my-profile *ngIf="signaturesService.sideNavRigtDatas.mode == 'profile'" [snavLeftComponent]="this.snav" [snavRightComponent]="this.snavRight"></app-my-profile> <app-my-profile *ngIf="signaturesService.sideNavRigtDatas.mode == 'profile'" [snavLeftComponent]="this.snav" [snavRightComponent]="this.snavRight"></app-my-profile>
<app-visa-workflow [visaWorkflow]="mainDocument.workflow" *ngIf="signaturesService.sideNavRigtDatas.mode == 'visaWorkflow'"></app-visa-workflow> <app-visa-workflow [visaWorkflow]="mainDocument.workflow" [snavRightComponent]="this.snavRight" *ngIf="signaturesService.sideNavRigtDatas.mode == 'visaWorkflow'"></app-visa-workflow>
<app-document-list #appDocumentList *ngIf="signaturesService.sideNavRigtDatas.mode == 'documentList'"></app-document-list> <app-document-list #appDocumentList [currentDocId]="docList[currentDoc].id" [snavRightComponent]="this.snavRight" [mainDocument]="mainDocument" *ngIf="signaturesService.sideNavRigtDatas.mode == 'documentList'" (triggerEvent)="loadDoc($event)"></app-document-list>
</mat-sidenav> </mat-sidenav>
</mat-sidenav-container> </mat-sidenav-container>
\ No newline at end of file
src/frontend/app/document/document.component.ts
+ 31
− 8
View file @ 4a7b32e3
...@@ -444,6 +444,35 @@ export class DocumentComponent implements OnInit { ...@@ -444,6 +444,35 @@ export class DocumentComponent implements OnInit {
} }
} }
loadDoc(id: any) {
const index = this.docList.map((doc: any) => (doc.id)).indexOf(id);
if (this.docList[index] && this.docList[index].id && this.docList[index].encodedDocument === '') {
this.loadingDoc = true;
this.http.get('../rest/attachments/' + this.docList[index].id)
.subscribe((dataPj: any) => {
this.docList[index] = dataPj.attachment;
this.signaturesService.renderingDoc = true;
if (index > 0) {
this.signaturesService.isTaggable = false;
}
this.pageNum = 1;
this.currentDoc = index;
this.pdfRender(this.docList[this.currentDoc]);
this.loadingDoc = false;
}, (err: any) => {
this.notificationService.handleErrors(err);
});
} else {
this.signaturesService.renderingDoc = true;
if (index > 0) {
this.signaturesService.isTaggable = false;
}
this.pageNum = 1;
this.currentDoc = index;
this.pdfRender(this.docList[this.currentDoc]);
}
}
launchEvent(action: any) { launchEvent(action: any) {
this.signaturesService.currentAction = action.id; this.signaturesService.currentAction = action.id;
this[action.event](); this[action.event]();
...@@ -488,26 +517,20 @@ export class DocumentComponent implements OnInit { ...@@ -488,26 +517,20 @@ export class DocumentComponent implements OnInit {
} }
openVisaWorkflow() { openVisaWorkflow() {
this.snavRight.open();
this.signaturesService.sideNavRigtDatas = { this.signaturesService.sideNavRigtDatas = {
mode : 'visaWorkflow', mode : 'visaWorkflow',
width : '450px', width : '450px',
locked : false, locked : false,
}; };
this.snavRight.open();
} }
openDocumentList() { openDocumentList() {
this.snavRight.open();
this.signaturesService.sideNavRigtDatas = { this.signaturesService.sideNavRigtDatas = {
mode : 'documentList', mode : 'documentList',
width : '450px', width : '450px',
locked : false, locked : false,
}; };
this.snavRight.open();
setTimeout(() => {
this.appDocumentList.loadDocumentList(this.mainDocument.id);
}, 0);
} }
} }
src/frontend/app/document/visa-workflow/visa-workflow.component.html
+ 38
− 32
View file @ 4a7b32e3
<mat-list *ngIf="!loading"> <div class="panel-container" *ngIf="!loading">
<div class="panelTitle"> <div class="panel-header">
<button class="closePanel" mat-icon-button type="button" (tap)="snavRightComponent.close();">
<mat-icon fontSet="fas" fontIcon="fa-arrow-right fa-2x"></mat-icon>
</button>
<mat-icon fontSet="fas" fontIcon="fa-list-ol fa-2x"></mat-icon> {{'lang.visaWorkflow' | translate}} <mat-icon fontSet="fas" fontIcon="fa-list-ol fa-2x"></mat-icon> {{'lang.visaWorkflow' | translate}}
</div> </div>
<div> <div class="panel-content">
<div *ngIf="visaWorkflow.length === 0" class="noWorkflow"> <mat-list>
{{'lang.noPerson' | translate}} <div *ngIf="visaWorkflow.length === 0" class="noWorkflow">
</div> {{'lang.noPerson' | translate}}
<mat-list-item *ngFor="let diffusion of visaWorkflow;let i=index" [class.current]="diffusion.current"> </div>
<mat-icon class="avatar" mat-list-icon color="primary" <mat-list-item *ngFor="let diffusion of visaWorkflow;let i=index" [class.current]="diffusion.current">
[style.background-image]="'url('+diffusion.userPicture+')'"></mat-icon> <mat-icon class="avatar" mat-list-icon color="primary"
<h4 mat-line class="userDisplay primary"> [style.background-image]="'url('+diffusion.userPicture+')'"></mat-icon>
{{diffusion.userDisplay}} <h4 mat-line class="userDisplay primary">
</h4> {{diffusion.userDisplay}}
<p mat-line style="display: flex;"> </h4>
<span class="workflowData" style="text-align:left"> <p mat-line style="display: flex;">
<span class="workflowSubData" *ngIf="diffusion.processDate == null && diffusion.current"> <span class="workflowData" style="text-align:left">
<i mat-list-icon class="fa fa-hourglass statusIcon"></i> <span class="workflowSubData" *ngIf="diffusion.processDate == null && diffusion.current">
{{'lang.inProgress' | translate}} <i mat-list-icon class="fa fa-hourglass statusIcon"></i>
{{'lang.inProgress' | translate}}
</span>
<span class="workflowSubData" *ngIf="diffusion.processDate == null && !diffusion.current">
<i mat-list-icon class="fa fa-question statusIcon"></i>
{{'lang.waiting' | translate}}
</span>
<span *ngIf="diffusion.processDate != null">
<i mat-list-icon class="fa fa-check green statusIcon"></i>
<span class="green">{{'lang.'+diffusion.mode+'ProcessInfo' | translate}}
{{diffusion.processDate}}</span>
</span>
</span> </span>
<span class="workflowSubData" *ngIf="diffusion.processDate == null && !diffusion.current"> <span class="workflowData workflowSubData">{{'lang.'+diffusion.mode+'User' | translate}}</span>
<i mat-list-icon class="fa fa-question statusIcon"></i> </p>
{{'lang.waiting' | translate}} <mat-divider></mat-divider>
</span> </mat-list-item>
<span *ngIf="diffusion.processDate != null"> </mat-list>
<i mat-list-icon class="fa fa-check green statusIcon"></i> </div>
<span class="green">{{'lang.'+diffusion.mode+'ProcessInfo' | translate}} </div>
{{diffusion.processDate}}</span> \ No newline at end of file
</span>
</span>
<span class="workflowData workflowSubData">{{'lang.'+diffusion.mode+'User' | translate}}</span>
</p>
<mat-divider></mat-divider>
</mat-list-item>
</div>
\ No newline at end of file
src/frontend/app/document/visa-workflow/visa-workflow.component.scss
+ 35
− 0
View file @ 4a7b32e3
...@@ -56,4 +56,39 @@ ...@@ -56,4 +56,39 @@
text-align: center; text-align: center;
font-size: 10px; font-size: 10px;
padding: 10px; padding: 10px;
}
.panel-container {
display: flex;
flex-direction: column;
position: relative;
height: 100%;
overflow: hidden;
}
.panel-header {
box-shadow: 0px 0px 10px 0px #656565;
color: white;
background: $primary;
height: 65px;
display: flex;
justify-content: center;
position: relative;
font-size: 20px;
align-items: center;
}
.panel-content {
flex: 1;
overflow: auto;
}
.mat-icon {
height:auto;
}
.closePanel {
position: absolute;
left: 0px;
font-size: 24px;
} }
\ No newline at end of file
src/frontend/app/document/visa-workflow/visa-workflow.component.ts
+ 5
− 0
View file @ 4a7b32e3
import { Component, Input, OnInit } from '@angular/core'; import { Component, Input, OnInit } from '@angular/core';
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { NotificationService } from '../../service/notification.service'; import { NotificationService } from '../../service/notification.service';
import { MatSidenav } from '@angular/material';
@Component({ @Component({
selector: 'app-visa-workflow', selector: 'app-visa-workflow',
...@@ -11,8 +12,12 @@ export class VisaWorkflowComponent implements OnInit { ...@@ -11,8 +12,12 @@ export class VisaWorkflowComponent implements OnInit {
loading: boolean = false; loading: boolean = false;
// tslint:disable-next-line:no-input-rename
@Input('visaWorkflow') visaWorkflow: any; @Input('visaWorkflow') visaWorkflow: any;
// tslint:disable-next-line:no-input-rename
@Input('snavRightComponent') snavRightComponent: MatSidenav;
constructor(public http: HttpClient, public notificationService: NotificationService) { } constructor(public http: HttpClient, public notificationService: NotificationService) { }
ngOnInit(): void { } ngOnInit(): void { }
......
src/frontend/app/profile/profile.component.html
+ 38
− 30
View file @ 4a7b32e3
<nav class="sidebar" *ngIf="this.signaturesService.sideNavRigtDatas.mode == 'profile'"> <div class="panel-container" *ngIf="!loading">
<div class="main-header"> <div class="panel-header">
<header class="profile-header"> <div class="user">
<div class="user" style="color: #F99830"> {{'lang.myProfil' | translate}}
{{'lang.myProfil' | translate}} </div>
</div> <div class="avatarProfile"
<div class="avatarProfile" [ngStyle]="{'background': 'url(' + this.profileInfo.picture + ') no-repeat scroll center center / cover'}"
[ngStyle]="{'background': 'url(' + this.profileInfo.picture + ') no-repeat scroll center center / cover'}" (tap)="uploadFile.click();">
(tap)="uploadFile.click();"> </div>
</div>
<input #uploadFile type="file" style="display:none;" (change)="handleFileInput($event.target.files)">
</header>
</div> </div>
<div class="nav"> <div class="panel-content">
<form (ngSubmit)="submitProfile()" #profileForm="ngForm"> <form (ngSubmit)="submitProfile()" #profileForm="ngForm">
<mat-tab-group #tabProfile (selectedTabChange)="initProfileTab($event);" <mat-tab-group #tabProfile (selectedTabChange)="initProfileTab($event);"
(swipeleft)="siwtchToleft(tabProfile)" (swiperight)="siwtchToRight(tabProfile)"> (swipeleft)="siwtchToleft(tabProfile)" (swiperight)="siwtchToRight(tabProfile)">
...@@ -24,14 +21,16 @@ ...@@ -24,14 +21,16 @@
</mat-form-field> </mat-form-field>
<mat-form-field class="input-row"> <mat-form-field class="input-row">
<input name="email" matInput placeholder="{{'lang.email' | translate}}" type="mail" <input name="email" matInput placeholder="{{'lang.email' | translate}}" type="mail"
[(ngModel)]="profileInfo.email" pattern="(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)" required> [(ngModel)]="profileInfo.email"
pattern="(^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$)" required>
</mat-form-field> </mat-form-field>
<mat-form-field class="input-row"> <mat-form-field class="input-row">
<input name="firstname" matInput placeholder="{{'lang.firstname' | translate}}" [(ngModel)]="profileInfo.firstname" <input name="firstname" matInput placeholder="{{'lang.firstname' | translate}}"
required> [(ngModel)]="profileInfo.firstname" required>
</mat-form-field> </mat-form-field>
<mat-form-field class="input-row"> <mat-form-field class="input-row">
<input name="nom" matInput placeholder="{{'lang.lastname' | translate}}" [(ngModel)]="profileInfo.lastname" required> <input name="nom" matInput placeholder="{{'lang.lastname' | translate}}"
[(ngModel)]="profileInfo.lastname" required>
</mat-form-field> </mat-form-field>
<mat-accordion> <mat-accordion>
<mat-expansion-panel (closed)="showPassword=false" (opened)="changePasswd()" <mat-expansion-panel (closed)="showPassword=false" (opened)="changePasswd()"
...@@ -71,7 +70,8 @@ ...@@ -71,7 +70,8 @@
class="fa fa-2x" class="fa fa-2x"
[ngClass]="[hideNewPasswordConfirm ? 'fa-eye-slash' : 'fa-eye']"></mat-icon> [ngClass]="[hideNewPasswordConfirm ? 'fa-eye-slash' : 'fa-eye']"></mat-icon>
<mat-hint style="color:red;" <mat-hint style="color:red;"
*ngIf="password.passwordConfirmation !== password.newPassword">{{'lang.passwordNotMatch' | translate}}</mat-hint> *ngIf="password.passwordConfirmation !== password.newPassword">
{{'lang.passwordNotMatch' | translate}}</mat-hint>
<mat-hint style="color:green;" <mat-hint style="color:green;"
*ngIf="password.passwordConfirmation === password.newPassword && password.newPassword.length > 0 && password.passwordConfirmation.length> 0"> *ngIf="password.passwordConfirmation === password.newPassword && password.newPassword.length > 0 && password.passwordConfirmation.length> 0">
{{'lang.samePassword' | translate}}</mat-hint> {{'lang.samePassword' | translate}}</mat-hint>
...@@ -104,8 +104,10 @@ ...@@ -104,8 +104,10 @@
<div class="form-container"> <div class="form-container">
<div class="form-2-col"> <div class="form-2-col">
<mat-form-field> <mat-form-field>
<mat-select #langSelect name="langUser" [(ngModel)]="this.profileInfo.preferences.lang"> <mat-select #langSelect name="langUser"
<mat-option *ngFor="let lang of this.profileInfo['availableLanguages']" [value]="lang">{{'lang.'+lang | translate }}</mat-option> [(ngModel)]="this.profileInfo.preferences.lang">
<mat-option *ngFor="let lang of this.profileInfo['availableLanguages']"
[value]="lang">{{'lang.'+lang | translate }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
...@@ -124,16 +126,19 @@ ...@@ -124,16 +126,19 @@
<mat-select name="writingMode" <mat-select name="writingMode"
[(ngModel)]="this.profileInfo.preferences.writingMode"> [(ngModel)]="this.profileInfo.preferences.writingMode">
<mat-option value="direct">{{'lang.free' | translate}}</mat-option> <mat-option value="direct">{{'lang.free' | translate}}</mat-option>
<mat-option value="stylus">{{'lang.appleStylus' | translate}} <i class="fab fa-apple"></i> <mat-option value="stylus">{{'lang.appleStylus' | translate}} <i
class="fab fa-apple"></i>
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
<div *ngIf="this.profileInfo.preferences.writingMode == 'stylus'" class="form-2-col" <div *ngIf="this.profileInfo.preferences.writingMode == 'stylus'" class="form-2-col"
style="text-align: justify;font-size: 12px;" [innerHTML]="'lang.freeModeInfo' | translate"> style="text-align: justify;font-size: 12px;"
[innerHTML]="'lang.freeModeInfo' | translate">
</div> </div>
<div *ngIf="this.profileInfo.preferences.writingMode == 'direct'" class="form-2-col" <div *ngIf="this.profileInfo.preferences.writingMode == 'direct'" class="form-2-col"
style="text-align: justify;font-size: 12px;" [innerHTML]="'lang.standardModeInfo' | translate"> style="text-align: justify;font-size: 12px;"
[innerHTML]="'lang.standardModeInfo' | translate">
</div> </div>
</div> </div>
...@@ -167,9 +172,12 @@ ...@@ -167,9 +172,12 @@
<mat-form-field> <mat-form-field>
<mat-select name="writingColor" <mat-select name="writingColor"
[(ngModel)]="this.profileInfo.preferences.writingColor"> [(ngModel)]="this.profileInfo.preferences.writingColor">
<mat-option style="color:#000000" value="#000000">{{'lang.black' | translate}}</mat-option> <mat-option style="color:#000000" value="#000000">
<mat-option style="color:#1a75ff" value="#1a75ff">{{'lang.blue' | translate}}</mat-option> {{'lang.black' | translate}}</mat-option>
<mat-option style="color:#FF0000" value="#FF0000">{{'lang.red' | translate}}</mat-option> <mat-option style="color:#1a75ff" value="#1a75ff">
{{'lang.blue' | translate}}</mat-option>
<mat-option style="color:#FF0000" value="#FF0000">
{{'lang.red' | translate}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
</div> </div>
...@@ -183,7 +191,8 @@ ...@@ -183,7 +191,8 @@
</div> </div>
</div> </div>
</mat-tab> </mat-tab>
<mat-tab label="{{'lang.administrations' | translate}}" *ngIf="signaturesService.userLogged.canManageRestUsers"> <mat-tab label="{{'lang.administrations' | translate}}"
*ngIf="signaturesService.userLogged.canManageRestUsers">
<div class="profile-content"> <div class="profile-content">
<div class="input-row"> <div class="input-row">
<fieldset> <fieldset>
...@@ -224,12 +233,11 @@ ...@@ -224,12 +233,11 @@
<span class="actions"> <span class="actions">
<button class="validate" mat-button color="primary" type="submit" <button class="validate" mat-button color="primary" type="submit"
[disabled]="allowValidate() || !profileForm.form.valid">{{ [disabled]="allowValidate() || !profileForm.form.valid">{{
msgButton | translate}}</button> msgButton | translate}}</button>
<button class="cancel" mat-icon-button type="button" (tap)="closeProfile();"> <button class="cancel" mat-icon-button type="button" (tap)="closeProfile();">
<mat-icon fontSet="fas" fontIcon="fa-arrow-left fa-2x"></mat-icon> <mat-icon fontSet="fas" fontIcon="fa-arrow-left fa-2x"></mat-icon>
</button> </button>
</span> </span>
</form> </form>
</div> </div>
</nav> </div>
\ No newline at end of file \ No newline at end of file
src/frontend/app/profile/profile.component.scss
+ 32
− 1
View file @ 4a7b32e3
...@@ -75,7 +75,9 @@ ...@@ -75,7 +75,9 @@
.user { .user {
color: white; color: white;
padding-top: 10px; color: #F99830;
position: absolute;
top: 15px;
font-weight: bold; font-weight: bold;
font-size: 20px; font-size: 20px;
} }
...@@ -156,4 +158,33 @@ legend { ...@@ -156,4 +158,33 @@ legend {
.notification { .notification {
text-align: left; text-align: left;
padding : 10px; padding : 10px;
}
.panel-container {
display: flex;
flex-direction: column;
position: relative;
height: 100%;
overflow: hidden;
}
.panel-header {
box-shadow: 0px 0px 10px 0px #656565;
color: white;
background: $primary;
height: 95px;
display: flex;
justify-content: center;
position: relative;
font-size: 20px;
align-items: center;
}
.panel-content {
flex: 1;
overflow: auto;
}
.mat-icon {
height:auto;
} }
\ No newline at end of file
src/frontend/app/sidebar/sidebar.component.html
+ 4
− 1
View file @ 4a7b32e3
...@@ -2,7 +2,10 @@ ...@@ -2,7 +2,10 @@
<div class="main-header"> <div class="main-header">
<header class="profile-header"> <header class="profile-header">
<button class="logout-button" mat-icon-button (click)="logout()"> <button class="logout-button" mat-icon-button (click)="logout()">
<mat-icon fontSet="fas" fontIcon="fa-sign-out-alt"></mat-icon> <mat-icon fontSet="fas" fontIcon="fa-power-off"></mat-icon>
</button>
<button *ngIf="signaturesService.mainDocumentId > 0" class="closePanel" mat-icon-button type="button" (tap)="snavLeftComponent.close();">
<mat-icon fontSet="fas" fontIcon="fa-arrow-left fa-2x"></mat-icon>
</button> </button>
<div class="user" style="color: #F99830"> <div class="user" style="color: #F99830">
{{signaturesService.userLogged.firstname}} {{signaturesService.userLogged.lastname}} {{signaturesService.userLogged.firstname}} {{signaturesService.userLogged.lastname}}
......
src/frontend/app/sidebar/sidebar.component.scss
+ 8
− 1
View file @ 4a7b32e3
...@@ -147,10 +147,17 @@ ...@@ -147,10 +147,17 @@
} }
.logout-button { .logout-button {
font-size: 30px; font-size: 24px;
color: white;
position: absolute;
left: 0px;
}
.closePanel {
color: white; color: white;
position: absolute; position: absolute;
right: 10px; right: 10px;
font-size: 24px;
} }
.filter { .filter {
......
src/frontend/app/sidebar/sidebar.component.ts
+ 6
− 3
View file @ 4a7b32e3
...@@ -15,18 +15,21 @@ import { TranslateService } from '@ngx-translate/core'; ...@@ -15,18 +15,21 @@ import { TranslateService } from '@ngx-translate/core';
}) })
export class SidebarComponent implements OnInit { export class SidebarComponent implements OnInit {
loadingList : boolean = false; loadingList: boolean = false;
offset : number = 0; offset: number = 0;
limit : number = 25; limit: number = 25;
@ViewChild('listContent') listContent: ElementRef; @ViewChild('listContent') listContent: ElementRef;
// tslint:disable-next-line:no-input-rename
@Input('snavRightComponent') snavRightComponent: MatSidenav; @Input('snavRightComponent') snavRightComponent: MatSidenav;
// tslint:disable-next-line:no-input-rename
@Input('snavLeftComponent') snavLeftComponent: MatSidenav; @Input('snavLeftComponent') snavLeftComponent: MatSidenav;
constructor(private translate: TranslateService, public http: HttpClient, public signaturesService: SignaturesContentService, private sidenav: MatSidenav, private router: Router, public notificationService: NotificationService) { constructor(private translate: TranslateService, public http: HttpClient, public signaturesService: SignaturesContentService, private sidenav: MatSidenav, private router: Router, public notificationService: NotificationService) {
} }
ngOnInit() { ngOnInit() {
console.log(this.signaturesService);
$('.avatar').css({'background': 'url(data:image/png;base64,' + this.signaturesService.userLogged.picture + ') no-repeat #135F7F'}).css({'background-size': 'cover'}).css({'background-position': 'center'}); $('.avatar').css({'background': 'url(data:image/png;base64,' + this.signaturesService.userLogged.picture + ') no-repeat #135F7F'}).css({'background-size': 'cover'}).css({'background-position': 'center'});
this.http.get('../rest/documents?limit=' + this.limit + '&offset=' + this.offset + '&mode=' + this.signaturesService.mode) this.http.get('../rest/documents?limit=' + this.limit + '&offset=' + this.offset + '&mode=' + this.signaturesService.mode)
.subscribe((data: any) => { .subscribe((data: any) => {
......
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