From 100355d3b550271e31ba742ee1cb83b10741fa51 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Fri, 23 Mar 2018 15:40:17 +0100
Subject: [PATCH] [REFACTORING] Display baskets after deactivate absence
---
.../Views/user-administration.component.html | 15 ++++++---------
.../user-administration.component.ts | 3 ---
2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/apps/maarch_entreprise/Views/user-administration.component.html b/apps/maarch_entreprise/Views/user-administration.component.html
index f1f13e940f6..e164edaba37 100755
--- a/apps/maarch_entreprise/Views/user-administration.component.html
+++ b/apps/maarch_entreprise/Views/user-administration.component.html
@@ -51,7 +51,6 @@
<mat-tab-group [(selectedIndex)]="selectedTabIndex" (selectChange)="initService()">
<mat-tab label="Informations">
<div *ngIf="user.status == 'ABS'" class="text-warning" style="position: absolute;opacity: 0.1;font-size: 120px;transform: rotate(324deg);-webkit-transform: rotate(324deg);margin-left: 35%;margin-top: 90px;">{{user.status}}</div>
-
<form class="form-horizontal" (ngSubmit)="onSubmit()" #profileForm="ngForm">
<div class="form-group">
<div class="col-sm-12">
@@ -64,7 +63,6 @@
<mat-form-field>
<input matInput *ngIf="creationMode" type="text" title="{{lang.id}}" name="user_id" [(ngModel)]="user.userId" placeholder="{{lang.id}}"
pattern="^[\w.@-]*$" required>
-
<input matInput *ngIf="!creationMode" type="text" title="{{lang.id}}" value="{{user.user_id}}" placeholder="{{lang.id}}"
disabled>
</mat-form-field>
@@ -121,7 +119,6 @@
</div>
</div>
</form>
-
</mat-tab>
<mat-tab *ngIf="!creationMode" label="Groupe(s)">
<mat-nav-list>
@@ -174,12 +171,12 @@
<div [ngClass]="[signatureModel.size != '' ? 'col-md-10' : 'col-md-12']">
<div class="upload-drop-zone" (click)="clickOnUploader('uploadSignFile')" style="cursor:pointer">
{{lang.clickOn}}
- <i class="fa fa-upload fa-2x"></i> (
- < 2MB) </div>
- </div>
- <div class="col-md-2" *ngIf="signatureModel.size">
- <img id="signaturePreview" src="{{signatureModel.base64ForJs}}" alt="Invalid image" style="width: 100%;">
+ <i class="fa fa-upload fa-2x"></i> ( < 2MB )
</div>
+ </div>
+ <div class="col-md-2" *ngIf="signatureModel.size">
+ <img id="signaturePreview" src="{{signatureModel.base64ForJs}}" alt="Invalid image" style="width: 100%;">
+ </div>
</form>
</mat-tab>
<mat-tab *ngIf="!creationMode" label="Historique">
@@ -360,4 +357,4 @@
</mat-list>
</mat-sidenav>
</mat-sidenav-container>
- </div>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/apps/maarch_entreprise/js/angular/app/administration/user-administration.component.ts b/apps/maarch_entreprise/js/angular/app/administration/user-administration.component.ts
index 51be6a665ad..bbae4c5f8d4 100644
--- a/apps/maarch_entreprise/js/angular/app/administration/user-administration.component.ts
+++ b/apps/maarch_entreprise/js/angular/app/administration/user-administration.component.ts
@@ -432,9 +432,6 @@ export class UserAdministrationComponent extends AutoCompletePlugin implements O
this.http.put(this.coreUrl + "rest/users/" + this.serialId + "/status", { "status": "OK" })
.subscribe((data: any) => {
this.user.status = data.user.status;
- for (let i in this.user.baskets) {
- this.user.baskets[i].userToDisplay = '';
- }
this.notify.success(this.lang.absOff);
}, (err) => {
this.notify.error(err.error.errors);
--
GitLab