From 193c4d886c69b69c54809dbed78cf36a6e488be1 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Thu, 20 Dec 2018 12:17:30 +0100
Subject: [PATCH] FEAT #9011 reforing redirect baskets profile
---
src/frontend/app/profile.component.html | 33 +++++++++--------
src/frontend/app/profile.component.ts | 48 +++++++++++++++++++++----
2 files changed, 57 insertions(+), 24 deletions(-)
diff --git a/src/frontend/app/profile.component.html b/src/frontend/app/profile.component.html
index 22e26f2df2f..d71eadf4ae2 100755
--- a/src/frontend/app/profile.component.html
+++ b/src/frontend/app/profile.component.html
@@ -205,7 +205,7 @@
<input matTooltip="{{lang.redirectWhenAbscence}}" matTooltipPosition="above" type="text" placeholder="{{ lang.redirectBaskets }}"
matInput [matAutocomplete]="auto" [formControl]="userCtrl">
<mat-autocomplete #auto="matAutocomplete">
- <mat-option *ngFor="let user of filteredUsers | async" [value]="user.id" (click)="addBasketRedirection(user.id)">
+ <mat-option *ngFor="let user of filteredUsers | async" [value]="user.id" (click)="addBasketRedirection(user)">
<p mat-line matTooltip="{{ user.otherInfo }}">
<span class="col-xm-1">
<mat-icon color="primary" class="fa fa-user fa-2x" style="margin-right:0px;"></mat-icon>
@@ -222,15 +222,14 @@
</mat-list-item>
<mat-divider></mat-divider>
<ng-container *ngFor="let basket of user.baskets;let i = index">
- <mat-list-item *ngIf="basket.group_id && basket.userToDisplay == null" (mouseover)="showActions(basket)" (mouseout)="hideActions(basket)"
+ <mat-list-item *ngIf="basket.userToDisplay == null" (mouseover)="showActions(basket)" (mouseout)="hideActions(basket)"
style="cursor: pointer;">
<mat-icon mat-list-icon color="primary" *ngIf="basket.enabled">
<mat-checkbox (click)="$event.stopPropagation()" (change)="$event ? selectionBaskets.toggle(basket) : null" [checked]="selectionBaskets.isSelected(basket)"
color="primary"></mat-checkbox>
</mat-icon>
- <h4 mat-line [attr.color]="basket.userToDisplay != null ? 'primary': ''" style="display: flex;align-items: center;">
- <span (click)="selectionBaskets.toggle(basket);" matTooltip="{{basket.basket_name}} [{{basket.group_desc}}]" [ngStyle]="{'opacity': basket.allowed ? '1' : '0.5'}"
- style="flex: 2;overflow: hidden;text-overflow: ellipsis;">
+ <h4 mat-line color="primary" style="display: flex;align-items: center;">
+ <span (click)="selectionBaskets.toggle(basket);" matTooltip="{{basket.basket_name}} [{{basket.group_desc}}]" style="flex: 2;overflow: hidden;text-overflow: ellipsis;">
{{basket.basket_name}}
<span class="label label-primary" style="font-weight:normal">{{basket.group_desc}}</span>
</span>
@@ -243,17 +242,17 @@
<mat-tab-group>
<mat-tab label="{{lang.basketsRedirected}}">
<mat-list>
- <ng-container *ngFor="let basket of user.baskets;let i = index">
- <mat-list-item *ngIf="basket.group_id && basket.userToDisplay != null">
- <mat-icon mat-list-icon color="primary" *ngIf="basket.enabled" style="margin-top:-60px;" class="fa fa-paper-plane">
+ <ng-container *ngFor="let basket of user.redirectedBaskets;let i = index">
+ <mat-list-item>
+ <mat-icon mat-list-icon color="primary" style="margin-top:-60px;" class="fa fa-paper-plane">
</mat-icon>
- <h4 mat-line [ngStyle]="{'opacity': basket.allowed ? '1' : '0.5'}" [attr.color]="basket.userToDisplay != null ? 'primary': ''">{{basket.basket_name}}
+ <h4 mat-line color="primary">{{basket.basket_name}}
<span class="label label-primary" style="font-weight:normal">{{basket.group_desc}}</span>
</h4>
- <p mat-line [ngStyle]="{'opacity': basket.allowed ? '1' : '0.5'}">
+ <p mat-line>
<mat-form-field>
<input type="text" color="warn" matInput disabled value="{{lang.redirectedTo}} {{basket.userToDisplay}}">
- <button mat-button color="warn" matSuffix mat-icon-button aria-label="Clear" (click)="delBasketRedirection(basket)" matTooltip="Supprimer la redirection">
+ <button mat-button color="warn" matSuffix mat-icon-button aria-label="Clear" (click)="delBasketRedirection(basket,i)" matTooltip="Supprimer la redirection">
<mat-icon color="warn" class="fa fa-times text-danger"></mat-icon>
</button>
</mat-form-field>
@@ -267,11 +266,11 @@
<mat-tab-group>
<mat-tab label="{{lang.basketsAssigned}}">
<mat-list>
- <ng-container *ngFor="let basket of user.baskets;let i = index">
- <mat-list-item *ngIf="!basket.group_id">
+ <ng-container *ngFor="let basket of user.assignedBaskets;let i = index">
+ <mat-list-item>
<mat-icon mat-list-icon color="primary" style="margin-top:-60px;" class="fa fa-reply">
</mat-icon>
- <h4 mat-line [attr.color]="basket.userToDisplay != null ? 'primary': ''">{{basket.basket_name}}
+ <h4 mat-line color="primary">{{basket.basket_name}}
<span class="label label-primary" style="font-weight:normal">{{basket.group_desc}}</span>
</h4>
<p mat-line>
@@ -279,7 +278,7 @@
<input matTooltip="{{lang.redirectBasket}}" matTooltipPosition="above" type="text" placeholder="{{lang.redirectBasket}}"
matInput [matAutocomplete]="auto" [formControl]="userCtrl">
<mat-autocomplete #auto="matAutocomplete">
- <mat-option *ngFor="let user of filteredUsers | async" [value]="user.id" (click)="reassignBasketRedirection(user.id,basket)">
+ <mat-option *ngFor="let user of filteredUsers | async" [value]="user.id" (click)="reassignBasketRedirection(user,basket,i)">
<p mat-line matTooltip="{{ user.otherInfo }}">
<span class="col-xm-1">
<mat-icon color="primary" class="fa fa-user fa-2x" style="margin-right:0px;"></mat-icon>
@@ -294,10 +293,10 @@
</mat-form-field>
<mat-form-field>
<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}}">
+ <button mat-button color="warn" matSuffix mat-icon-button aria-label="Clear" (click)="basket.userToDisplay=null" 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}}">
+ <button mat-button color="warn" matSuffix mat-icon-button aria-label="Clear" (click)="delBasketAssignRedirection(basket,i)" matTooltip="{{lang.deleteAssignation}}">
<mat-icon color="warn" class="fa fa-times text-danger"></mat-icon>
</button>
</mat-form-field>
diff --git a/src/frontend/app/profile.component.ts b/src/frontend/app/profile.component.ts
index 4adbf83e8b4..68512b373e7 100755
--- a/src/frontend/app/profile.component.ts
+++ b/src/frontend/app/profile.component.ts
@@ -147,8 +147,6 @@ export class ProfileComponent extends AutoCompletePlugin implements OnInit {
this.dataSourceContactsList.filter = filterValue;
}
-
-
//History
displayedColumns = ['event_date', 'info'];
dataSource: any;
@@ -408,6 +406,7 @@ export class ProfileComponent extends AutoCompletePlugin implements OnInit {
.subscribe((data: any) => {
this.user = data;
+
this.user.baskets.forEach((value: any, index: number) => {
this.user.baskets[index]['disabled'] = false;
this.user.redirectedBaskets.forEach((value2: any) => {
@@ -416,6 +415,7 @@ export class ProfileComponent extends AutoCompletePlugin implements OnInit {
}
});
});
+ console.log(this.user);
this.loading = false;
});
}
@@ -512,7 +512,14 @@ export class ProfileComponent extends AutoCompletePlugin implements OnInit {
let basketsRedirect:any[] = [];
this.user.baskets.forEach((elem: any) => {
if (this.selectionBaskets.selected.map((e:any) => { return e.basket_id; }).indexOf(elem.basket_id) != -1 && this.selectionBaskets.selected.map((e:any) => { return e.group_id; }).indexOf(elem.group_id) != -1) {
- basketsRedirect.push({newUser: newUser,basketId:elem.basket_id,basketOwner:this.user.user_id,virtual:elem.is_virtual})
+ basketsRedirect.push(
+ {
+ actual_user_id: newUser.serialId,
+ basket_id:elem.basket_id,
+ group_id:elem.groupSerialId,
+ originalOwner: null
+ }
+ )
}
});
let r = confirm(this.lang.confirmAction + ' ' + this.lang.redirectBasket);
@@ -520,8 +527,10 @@ export class ProfileComponent extends AutoCompletePlugin implements OnInit {
if (r) {
this.http.post(this.coreUrl + "rest/users/" + this.user.id + "/redirectedBaskets", basketsRedirect)
.subscribe((data: any) => {
+ console.log(data);
this.userCtrl.setValue('');
this.user.baskets = data["baskets"];
+ this.user.redirectedBaskets = data["redirectedBaskets"];
this.selectionBaskets.clear();
this.notify.success(this.lang.basketUpdated);
}, (err) => {
@@ -530,14 +539,31 @@ export class ProfileComponent extends AutoCompletePlugin implements OnInit {
}
}
- delBasketRedirection(basket: any) {
+ delBasketRedirection(basket: any,i: number) {
+ let r = confirm(this.lang.confirmAction);
+
+ if (r) {
+ this.http.request('DELETE', this.coreUrl + "rest/users/" + this.user.id + "/redirectedBaskets/" + basket.id)
+ .subscribe((data: any) => {
+ this.userCtrl.setValue('');
+ this.user.baskets = data["baskets"];
+ this.user.redirectedBaskets.splice(i, 1);
+ this.notify.success(this.lang.basketUpdated);
+ }, (err) => {
+ this.notify.error(err.error.errors);
+ });
+ }
+ }
+
+ delBasketAssignRedirection(basket: any,i: number) {
let r = confirm(this.lang.confirmAction);
if (r) {
- this.http.request('DELETE', this.coreUrl + "rest/users/" + this.user.id + "/redirectedBaskets/" + basket.basket_id, { body: { "basketOwner": basket.basket_owner } })
+ this.http.request('DELETE', this.coreUrl + "rest/users/" + this.user.id + "/redirectedBaskets/" + basket.id)
.subscribe((data: any) => {
this.userCtrl.setValue('');
this.user.baskets = data["baskets"];
+ this.user.assignedBaskets.splice(i, 1);
this.notify.success(this.lang.basketUpdated);
}, (err) => {
this.notify.error(err.error.errors);
@@ -545,14 +571,22 @@ export class ProfileComponent extends AutoCompletePlugin implements OnInit {
}
}
- reassignBasketRedirection(newUser: any, basket: any) {
+ reassignBasketRedirection(newUser: any, basket: any, i: number) {
let r = confirm(this.lang.confirmAction + ' ' + this.lang.redirectBasket);
if (r) {
- this.http.post(this.coreUrl + "rest/users/" + this.user.id + "/redirectedBaskets", [{ "newUser": newUser, "basketId": basket.basket_id, "basketOwner": basket.basket_owner, "virtual": basket.is_virtual }])
+ this.http.post(this.coreUrl + "rest/users/" + this.user.id + "/redirectedBaskets", [
+ {
+ "actual_user_id": newUser.serialId,
+ "basket_id": basket.basket_id,
+ "group_id": basket.group_id,
+ "originalOwner": basket.owner_user_id,
+ }
+ ])
.subscribe((data: any) => {
this.userCtrl.setValue('');
this.user.baskets = data["baskets"];
+ this.user.assignedBaskets.splice(i, 1);
this.notify.success(this.lang.basketUpdated);
}, (err) => {
this.notify.error(err.error.errors);
--
GitLab