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

FIX #10619 TIME 0:30 fix css

parent 574c6201
No related branches found
No related tags found
No related merge requests found
...@@ -43,7 +43,9 @@ export class SendExternalSignatoryBookActionComponent implements OnInit { ...@@ -43,7 +43,9 @@ export class SendExternalSignatoryBookActionComponent implements OnInit {
this.http.post('../../rest/resourcesList/users/' + this.data.currentBasketInfo.ownerId + '/groups/' + this.data.currentBasketInfo.groupId + '/baskets/' + this.data.currentBasketInfo.basketId + '/checkExternalSignatoryBook', { resources: this.data.selectedRes }) this.http.post('../../rest/resourcesList/users/' + this.data.currentBasketInfo.ownerId + '/groups/' + this.data.currentBasketInfo.groupId + '/baskets/' + this.data.currentBasketInfo.basketId + '/checkExternalSignatoryBook', { resources: this.data.selectedRes })
.subscribe((data: any) => { .subscribe((data: any) => {
this.additionalsInfos = data.additionalsInfos; this.additionalsInfos = data.additionalsInfos;
this.signatoryBookEnabled = data.signatureBookEnabled; if (this.additionalsInfos.attachments.length > 0) {
this.signatoryBookEnabled = data.signatureBookEnabled;
}
this.errors = data.errors; this.errors = data.errors;
this.loading = false; this.loading = false;
console.log(data); console.log(data);
......
<mat-list *ngIf="!loading"> <mat-list *ngIf="!loading">
<mat-form-field *ngIf="injectDatas.editable" appearance="outline" floatLabel="never" [style.fontSize.px]="10"> <mat-form-field *ngIf="injectDatas.editable" appearance="outline" floatLabel="never" [style.fontSize.px]="10">
<input id="availableUsers" type="text" matInput placeholder="{{lang.addPerson}}" <input id="availableUsers" type="text" matInput placeholder="{{lang.addPerson}}" [matAutocomplete]="auto"
[matAutocomplete]="auto" [formControl]="userCtrl"> [formControl]="userCtrl">
<mat-autocomplete #auto="matAutocomplete" (optionSelected)="addItem($event)" isOpen="true"> <mat-autocomplete #auto="matAutocomplete" (optionSelected)="addItem($event)" isOpen="true">
<mat-option *ngFor="let user of filteredUsers | async" [value]="user"> <mat-option *ngFor="let user of filteredUsers | async" [value]="user">
{{user.idToDisplay}} {{user.idToDisplay}}
...@@ -22,28 +22,22 @@ ...@@ -22,28 +22,22 @@
[ngClass]="{'fa-hourglass': diffusion.process_date == null,'fa-check': diffusion.process_date != null}" [ngClass]="{'fa-hourglass': diffusion.process_date == null,'fa-check': diffusion.process_date != null}"
style="opacity:0.5;"></mat-icon> style="opacity:0.5;"></mat-icon>
</ng-container> </ng-container>
<div mat-line style="display: flex;align-items: center;"> <div mat-line class="workflowLine">
<div style="flex:1;overflow: hidden;text-overflow: ellipsis;"> <div class="workflowLineContainer">
<div style="text-overflow: ellipsis;overflow: hidden;"> <div class="workflowLineLabel">
{{diffusion.labelToDisplay}} {{diffusion.labelToDisplay}}
</div> </div>
<div style="opacity:0.5;flex: 1;text-overflow: ellipsis;overflow: hidden;">{{diffusion.item_entity}}</div> <div class="workflowLineSubLabel">
<div *ngIf="diffusion.process_date != null" {{diffusion.item_entity}}
</div>
<div *ngIf="diffusion.process_date != null" class="workflowLineProcessDate"
title='{{diffusion.process_date | date : lang.onRange + " dd/MM/y " + lang.atRange +" HH:mm"}}' title='{{diffusion.process_date | date : lang.onRange + " dd/MM/y " + lang.atRange +" HH:mm"}}'
style="flex: 1;text-align: right;font-size: 90%;" color="accent">{{diffusion.process_date color="accent">{{diffusion.process_date
| timeAgo}}</div> | timeAgo}}</div>
</div> </div>
<div> <div>
<button class="currentRoleButton" [disabled]="!injectDatas.editable" mat-button [matMenuTriggerFor]="menu" <button class="currentRoleButton" [color]="diffusion.requested_signature ? 'primary': '' " [disabled]="!injectDatas.editable" mat-raised-button
title="{{lang[diffusion.currentRole+'User']}}">{{diffusion.requested_signature ? lang.signUser : lang.visaUser}}</button> title="{{lang[diffusion.currentRole+'User']}}" (click)="changeRole(i)">{{diffusion.requested_signature ? lang.signUser : lang.visaUser}}</button>
<mat-menu [class]="'listMenu'" #menu="matMenu">
<div
style="text-align: center;font-size: 10px;color: white;background: #135F7F;padding: 5px;font-weight: bold;">
{{lang.roles}}
</div>
<button *ngFor="let role of visaWorkflow.roles" mat-menu-item
(click)="changeRole(i)">{{lang[role+'User']}}</button>
</mat-menu>
</div> </div>
</div> </div>
......
...@@ -55,13 +55,6 @@ ...@@ -55,13 +55,6 @@
text-align: center; text-align: center;
} }
::ng-deep.listMenu {
.mat-menu-content {
padding-top: 0;
padding-bottom: 0;
}
}
.emptyContent { .emptyContent {
opacity: 0.5; opacity: 0.5;
text-align: center; text-align: center;
...@@ -71,4 +64,33 @@ ...@@ -71,4 +64,33 @@
.processed { .processed {
background: rgba(0, 128, 0, 0.11); background: rgba(0, 128, 0, 0.11);
}
.workflowLine {
display: flex !important;
align-items: center;
&Container {
flex:1;
overflow: hidden;
text-overflow: ellipsis;
}
&Label {
text-overflow: ellipsis;
overflow: hidden;
}
&SubLabel {
opacity:0.5;
flex: 1;
text-overflow: ellipsis;
overflow: hidden;
}
&ProcessDate {
flex: 1;
text-align: right;
font-size: 90%;
}
} }
\ No newline at end of file
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