FEAT #9156 + 9104 fix front + improve err notif

src/frontend/app/administration/basket/list/list-administration.component.html

@@ -97,7 +97,7 @@
     </div>
 </mat-card>
 <div class="row">
-    <div class="col-md-12 text-center">
+    <div class="col-md-12 text-center" style="margin-top:30px;">
         <button color="primary" mat-raised-button (click)="saveTemplate()" [disabled]="checkModif()">
             {{lang.validate}}
         </button>

src/frontend/app/administration/basket/list/list-administration.component.scss

@@ -139,7 +139,7 @@
   display: flex;
   height: 44px;
   font-size: 10px;
-  margin-bottom: 10px;
+  margin-bottom: 30px;
 
   .area {
     flex: 1;

src/frontend/app/list/basket-list.component.ts

@@ -115,7 +115,7 @@ export class BasketListComponent implements OnInit {
             this.filtersListService.filterMode = false;
             this.selectedRes = [];
             window['MainHeaderComponent'].setSnav(this.sidenavLeft);
-            window['MainHeaderComponent'].setSnavRight(this.sidenavRight);
+            window['MainHeaderComponent'].setSnavRight(null);
 
             this.listProperties = this.filtersListService.initListsProperties(this.currentBasketInfo.ownerId, this.currentBasketInfo.groupId, this.currentBasketInfo.basketId);
 

src/frontend/app/list/export/export.component.html

@@ -4,20 +4,20 @@
         <mat-spinner></mat-spinner>
     </div>
     <div class="row">
-        <div [class.col-md-12]="exportModel.format != 'CSV'" [class.col-md-3]="exportModel.format == 'CSV'">
+        <div [class.col-md-12]="exportModel.format != 'csv'" [class.col-md-3]="exportModel.format == 'csv'">
             <mat-form-field appearance="outline">
                 <mat-label>{{lang.format}}</mat-label>
-                <mat-select placeholder="{{lang.format}}" [(ngModel)]="exportModel.format">
+                <mat-select placeholder="{{lang.format}}" [(ngModel)]="exportModel.format" (selectionChange)="changeTemplate($event)">
                     <mat-option *ngFor="let format of formats" [value]="format">
                         {{format}}
                     </mat-option>
                 </mat-select>
             </mat-form-field>
         </div>
-        <div class="col-md-9" *ngIf="exportModel.format == 'CSV'">
+        <div class="col-md-9" *ngIf="exportModel.format == 'csv'">
             <mat-form-field appearance="outline">
                 <mat-label>{{lang.delimiter}}</mat-label>
-                <mat-select placeholder="{{lang.delimiter}}" [(ngModel)]="exportModel.delimiter" [disabled]="exportModel.format != 'CSV'">
+                <mat-select placeholder="{{lang.delimiter}}" [(ngModel)]="exportModel.delimiter" [disabled]="exportModel.format != 'csv'">
                     <mat-option *ngFor="let delimiter of delimiters" [value]="delimiter">
                         {{delimiter}}
                     </mat-option>

src/frontend/app/list/export/export.component.ts

@@ -19,14 +19,17 @@ export class ExportComponent implements OnInit {
     loadingExport: boolean = false;
 
     delimiters = [';', ',', 'TAB'];
-    formats = ['CSV', 'PDF'];
+    formats = ['csv', 'pdf'];
+
     exportModel: any = {
         delimiter: ';',
-        format: 'CSV',
+        format: 'csv',
         data: [],
         resources: []
     };
 
+    exportModelList: any;
+
     dataAvailable: any[] = [
         {
             value: 'res_id',
@@ -224,6 +227,7 @@ export class ExportComponent implements OnInit {
             isFunction: true
         }
     ];
+    dataAvailableClone: any[] = [];
 
     @ViewChild('listFilter') private listFilter: any;
 
@@ -231,20 +235,16 @@ export class ExportComponent implements OnInit {
     constructor(public http: HttpClient, private notify: NotificationService, @Inject(MAT_DIALOG_DATA) public data: any) { }
 
     ngOnInit(): void {
+        this.dataAvailableClone = JSON.parse(JSON.stringify(this.dataAvailable));
+        
         this.http.get('../../rest/resourcesList/exportTemplate')
             .subscribe((data: any) => {
-                if (data["delimiter"] != '') {
-                    this.exportModel.resources = this.data.selectedRes;
-                    this.exportModel.data = data["template"];
-                    this.exportModel.delimiter = data["delimiter"];
-                    this.exportModel.data.forEach((value: any) => {
-                        this.dataAvailable.forEach((availableValue: any, index: number) => {
-                            if (value.value == availableValue.value) {
-                                this.dataAvailable.splice(index, 1);
-                            }
-                        });
-                    });
-                }
+                this.exportModel.resources = this.data.selectedRes;
+
+                this.exportModelList = data.templates;
+
+                this.exportModel.data = data.templates.csv.data;
+                
                 this.loading = false;
             }, (err: any) => {
                 this.notify.handleErrors(err);
@@ -343,4 +343,9 @@ export class ExportComponent implements OnInit {
         this.dataAvailable = [];
         this.listFilter.nativeElement.value = '';
     }
+
+    changeTemplate(event: any) {
+        this.exportModel.format = event.value;
+        this.exportModel.data = this.exportModelList[event.value].data;
+    }
 }

src/frontend/app/notification.service.ts

@@ -46,8 +46,10 @@ export class NotificationService {
                 }
             } else if (err.error.exception !== undefined) {
                 this.error(err.error.exception[0].message);
-            } else {
+            } else if(err.error.error !== undefined){
                 this.error(err.error.error.message);
+            } else {
+                this.error(err.status + ' : ' + err.statusText);
             }
         }
     }