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

FIX #284 update css baskets user

parent b9fce7e7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
apps/maarch_entreprise/Views/user-administration.component.html
+ 108
− 94
View file @ 847005cf
...@@ -119,9 +119,9 @@ ...@@ -119,9 +119,9 @@
</mat-form-field> </mat-form-field>
</div> </div>
<div class="col-sm-12"> <div class="col-sm-12">
<mat-checkbox color="primary" matTooltip="{{lang.webserviceAccountDesc}}" name="loginmode" <mat-checkbox color="primary" matTooltip="{{lang.webserviceAccountDesc}}" name="loginmode" (change)="setUserModeLogin($event)"
(change)="setUserModeLogin($event)" [checked]="user.loginmode == 'restMode'"> [checked]="user.loginmode == 'restMode'">
{{lang.webserviceAccount}} {{lang.webserviceAccount}}
</mat-checkbox> </mat-checkbox>
</div> </div>
</div> </div>
...@@ -150,97 +150,111 @@ ...@@ -150,97 +150,111 @@
<div id="jstree"></div> <div id="jstree"></div>
</mat-tab> </mat-tab>
<mat-tab *ngIf="!creationMode" label="{{lang.baskets}}"> <mat-tab *ngIf="!creationMode" label="{{lang.baskets}}">
<ng-container *ngFor="let basket of user.baskets;let i = index"> <div class="col-sm-6" style="overflow:hidden;">
<mat-list-item *ngIf="basket.group_id && basket.userToDisplay == ''"> <mat-list>
<mat-icon mat-list-icon color="primary" *ngIf="basket.enabled" style="margin-top:-70px;"> <ng-container *ngFor="let basket of user.baskets;let i = index">
<mat-slide-toggle matTooltip="activer / désactiver la bannette" color="primary" [(ngModel)]="basket.allowed" (change)="toggleBasket(basket)" <mat-list-item *ngIf="basket.group_id && basket.userToDisplay == ''">
[disabled]="basket.userToDisplay != ''"></mat-slide-toggle> <mat-icon mat-list-icon color="primary" *ngIf="basket.enabled" style="margin-top:-70px;">
</mat-icon> <mat-slide-toggle matTooltip="activer / désactiver la bannette" color="primary" [(ngModel)]="basket.allowed" (change)="toggleBasket(basket)"
<h4 mat-line [ngStyle]="{'opacity': basket.allowed ? '1' : '0.5'}" [attr.color]="basket.userToDisplay != '' ? 'primary': ''">{{basket.basket_name}} [disabled]="basket.userToDisplay != ''"></mat-slide-toggle>
<span class="label label-primary" style="font-weight:normal">{{basket.group_desc}}</span> </mat-icon>
</h4> <h4 mat-line [ngStyle]="{'opacity': basket.allowed ? '1' : '0.5'}" [attr.color]="basket.userToDisplay != '' ? 'primary': ''">{{basket.basket_name}}
<p mat-line [ngStyle]="{'opacity': basket.allowed ? '1' : '0.5'}"> <span class="label label-primary" style="font-weight:normal">{{basket.group_desc}}</span>
<mat-form-field *ngIf="basket.allowed" floatLabel="never"> </h4>
<input matTooltip="{{lang.redirectWhenAbscence}}" matTooltipPosition="above" type="text" placeholder="{{ lang.userToRedirect }}" <p mat-line [ngStyle]="{'opacity': basket.allowed ? '1' : '0.5'}">
matInput [matAutocomplete]="auto" [formControl]="userCtrl" [disabled]="!basket.allowed"> <mat-form-field *ngIf="basket.allowed" floatLabel="never">
<mat-autocomplete #auto="matAutocomplete"> <input matTooltip="{{lang.redirectWhenAbscence}}" matTooltipPosition="above" type="text" placeholder="{{ lang.userToRedirect }}"
<mat-option *ngFor="let user of filteredUsers | async" [value]="user.id" (click)="addBasketRedirection(user.id,basket)"> matInput [matAutocomplete]="auto" [formControl]="userCtrl" [disabled]="!basket.allowed">
<p mat-line matTooltip="{{ user.otherInfo }}"> <mat-autocomplete #auto="matAutocomplete">
<span class="col-xm-1"> <mat-option *ngFor="let user of filteredUsers | async" [value]="user.id" (click)="addBasketRedirection(user.id,basket)">
<mat-icon color="primary" class="fa fa-user fa-2x" style="margin-right:0px;"></mat-icon> <p mat-line matTooltip="{{ user.otherInfo }}">
</span> <span class="col-xm-1">
<span class="col-xm-11"> <mat-icon color="primary" class="fa fa-user fa-2x" style="margin-right:0px;"></mat-icon>
{{ user.idToDisplay }} </span>
<small>{{ user.otherInfo }}</small> <span class="col-xm-11">
</span> {{ user.idToDisplay }}
</p> <small>{{ user.otherInfo }}</small>
</mat-option> </span>
</mat-autocomplete> </p>
</mat-form-field> </mat-option>
<mat-form-field> </mat-autocomplete>
<input type="text" color="warn" matInput disabled value=""> </mat-form-field>
</mat-form-field> <mat-form-field>
</p> <input type="text" color="warn" matInput disabled value="">
</mat-list-item> </mat-form-field>
</ng-container> </p>
<mat-divider></mat-divider> </mat-list-item>
<h4>{{lang.basketsRedirected}}</h4> </ng-container>
<ng-container *ngFor="let basket of user.baskets;let i = index"> </mat-list>
<mat-list-item *ngIf="basket.group_id && basket.userToDisplay != ''"> </div>
<mat-icon mat-list-icon color="primary" *ngIf="basket.enabled" style="margin-top:-60px;" class="fa fa-paper-plane-o"> <div class="col-sm-6" style="overflow:hidden;">
</mat-icon> <mat-list>
<h4 mat-line [ngStyle]="{'opacity': basket.allowed ? '1' : '0.5'}" [attr.color]="basket.userToDisplay != '' ? 'primary': ''">{{basket.basket_name}} <h4>{{lang.basketsRedirected}}</h4>
<span class="label label-primary" style="font-weight:normal">{{basket.group_id}}</span> <mat-divider></mat-divider>
</h4> <div style="margin-top:40px">
<p mat-line [ngStyle]="{'opacity': basket.allowed ? '1' : '0.5'}"> <ng-container *ngFor="let basket of user.baskets;let i = index">
<mat-form-field> <mat-list-item *ngIf="basket.group_id && basket.userToDisplay != ''">
<input type="text" color="warn" matInput disabled value="{{lang.redirectedTo}} {{basket.userToDisplay}}"> <mat-icon mat-list-icon color="primary" *ngIf="basket.enabled" style="margin-top:-60px;" class="fa fa-paper-plane-o">
<button mat-button color="warn" matSuffix mat-icon-button aria-label="Clear" (click)="delBasketRedirection(basket)" matTooltip="Supprimer la redirection"> </mat-icon>
<mat-icon color="warn" class="fa fa-times text-danger"></mat-icon> <h4 mat-line [ngStyle]="{'opacity': basket.allowed ? '1' : '0.5'}" [attr.color]="basket.userToDisplay != '' ? 'primary': ''">{{basket.basket_name}}
</button> <span class="label label-primary" style="font-weight:normal">{{basket.group_id}}</span>
</mat-form-field> </h4>
</p> <p mat-line [ngStyle]="{'opacity': basket.allowed ? '1' : '0.5'}">
</mat-list-item> <mat-form-field>
</ng-container> <input type="text" color="warn" matInput disabled value="{{lang.redirectedTo}} {{basket.userToDisplay}}">
<mat-divider></mat-divider> <button mat-button color="warn" matSuffix mat-icon-button aria-label="Clear" (click)="delBasketRedirection(basket)" matTooltip="Supprimer la redirection">
<h4>{{lang.basketsAssigned}}</h4> <mat-icon color="warn" class="fa fa-times text-danger"></mat-icon>
<ng-container *ngFor="let basket of user.baskets;let i = index"> </button>
<mat-list-item *ngIf="!basket.group_id"> </mat-form-field>
<mat-icon mat-list-icon color="primary" style="margin-top:-60px;" class="fa fa-reply"> </p>
</mat-icon> </mat-list-item>
<h4 mat-line [attr.color]="basket.userToDisplay != '' ? 'primary': ''">{{basket.basket_name}} </ng-container>
<span class="label label-primary" style="font-weight:normal">{{basket.group_id}}</span> </div>
</h4>
<p mat-line> <h4>{{lang.basketsAssigned}}</h4>
<mat-form-field *ngIf="basket.userToDisplay == ''" floatLabel="never"> <mat-divider></mat-divider>
<input matTooltip="{{lang.redirectBasket}}" matTooltipPosition="above" type="text" placeholder="{{lang.userToRedirect}}" <div style="margin-top:40px">
matInput [matAutocomplete]="auto" [formControl]="userCtrl"> <ng-container *ngFor="let basket of user.baskets;let i = index">
<mat-autocomplete #auto="matAutocomplete"> <mat-list-item *ngIf="!basket.group_id">
<mat-option *ngFor="let user of filteredUsers | async" [value]="user.id" (click)="reassignBasketRedirection(user.id,basket)"> <mat-icon mat-list-icon color="primary" style="margin-top:-60px;" class="fa fa-reply">
<p mat-line matTooltip="{{ user.otherInfo }}"> </mat-icon>
<span class="col-xm-1"> <h4 mat-line [attr.color]="basket.userToDisplay != '' ? 'primary': ''">{{basket.basket_name}}
<mat-icon color="primary" class="fa fa-user fa-2x" style="margin-right:0px;"></mat-icon> <span class="label label-primary" style="font-weight:normal">{{basket.group_id}}</span>
</span> </h4>
<span class="col-xm-11"> <p mat-line>
{{ user.idToDisplay }} <mat-form-field *ngIf="basket.userToDisplay == ''" floatLabel="never">
<small>{{ user.otherInfo }}</small> <input matTooltip="{{lang.redirectBasket}}" matTooltipPosition="above" type="text" placeholder="{{lang.userToRedirect}}"
</span> matInput [matAutocomplete]="auto" [formControl]="userCtrl">
</p> <mat-autocomplete #auto="matAutocomplete">
</mat-option> <mat-option *ngFor="let user of filteredUsers | async" [value]="user.id" (click)="reassignBasketRedirection(user.id,basket)">
</mat-autocomplete> <p mat-line matTooltip="{{ user.otherInfo }}">
</mat-form-field> <span class="col-xm-1">
<mat-form-field> <mat-icon color="primary" class="fa fa-user fa-2x" style="margin-right:0px;"></mat-icon>
<input type="text" color="warn" matInput disabled value="{{lang.assignBy}} {{basket.userToDisplay}}"> </span>
<button mat-button color="warn" matSuffix mat-icon-button aria-label="Clear" (click)="basket.userToDisplay =''" matTooltip="{{lang.reassign}}"> <span class="col-xm-11">
<mat-icon color="primary" class="fa fa-edit"></mat-icon> {{ user.idToDisplay }}
</button> <small>{{ user.otherInfo }}</small>
<button mat-button color="warn" matSuffix mat-icon-button aria-label="Clear" (click)="delBasketRedirection(basket)" matTooltip="{{lang.deleteAssignation}}"> </span>
<mat-icon color="warn" class="fa fa-times text-danger"></mat-icon> </p>
</button> </mat-option>
</mat-form-field> </mat-autocomplete>
</p> </mat-form-field>
</mat-list-item> <mat-form-field>
</ng-container> <input type="text" color="warn" matInput disabled value="{{lang.assignBy}} {{basket.userToDisplay}}">
<button mat-button color="warn" matSuffix mat-icon-button aria-label="Clear" (click)="basket.userToDisplay =''" matTooltip="{{lang.reassign}}">
<mat-icon color="primary" class="fa fa-edit"></mat-icon>
</button>
<button mat-button color="warn" matSuffix mat-icon-button aria-label="Clear" (click)="delBasketRedirection(basket)" matTooltip="{{lang.deleteAssignation}}">
<mat-icon color="warn" class="fa fa-times text-danger"></mat-icon>
</button>
</mat-form-field>
</p>
</mat-list-item>
</ng-container>
</div>
</mat-list>
</div>
</mat-tab> </mat-tab>
<mat-tab *ngIf="!creationMode" label="{{lang.signatures}}"> <mat-tab *ngIf="!creationMode" label="{{lang.signatures}}">
<div dnd-droppable matTooltip="{{lang.uploadSignFileInfo}}" (click)="clickOnUploader('uploadSignFile')" [class.dndFileHighlighted]="highlightMe" <div dnd-droppable matTooltip="{{lang.uploadSignFileInfo}}" (click)="clickOnUploader('uploadSignFile')" [class.dndFileHighlighted]="highlightMe"
......
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