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

FEAT #9082 remove filters param for actions tool

parent bc2893fc
No related branches found
No related tags found
No related merge requests found
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<div class="row" style="margin:0px;"> <div class="row" style="margin:0px;">
<div class="col-md-12" style="display:flex;"> <div class="col-md-12" style="display:flex;">
<app-filters-tool style="flex:1;" #filtersTool [currentBasketInfo]="currentBasketInfo" <app-filters-tool style="flex:1;" #filtersTool [currentBasketInfo]="currentBasketInfo"
[listProperties]="this.listProperties" [snavR]="snav2" [nbSelectedRes]="selectedRes.length" (toggleAllRes)="toggleAllRes($event)" (refreshEvent)="refreshDao()"></app-filters-tool> [listProperties]="this.listProperties" [snavR]="snav2" [selectedRes]="selectedRes" (toggleAllRes)="toggleAllRes($event)" (refreshEvent)="refreshDao()"></app-filters-tool>
<mat-paginator #paginatorResultList [length]="resultsLength" [pageSize]="10" class="paginatorResultList"></mat-paginator> <mat-paginator #paginatorResultList [length]="resultsLength" [pageSize]="10" class="paginatorResultList"></mat-paginator>
</div> </div>
</div> </div>
......
...@@ -256,7 +256,6 @@ export class BasketListComponent implements OnInit { ...@@ -256,7 +256,6 @@ export class BasketListComponent implements OnInit {
element[key] = this.lang.undefined; element[key] = this.lang.undefined;
} else if (["senders", "recipients"].indexOf(key) > 0) { } else if (["senders", "recipients"].indexOf(key) > 0) {
if (element[key].length > 1) { if (element[key].length > 1) {
console.log(element[key]);
element[key] = this.lang.isMulticontact; element[key] = this.lang.isMulticontact;
} else { } else {
element[key] = element[key][0]; element[key] = element[key][0];
......
...@@ -44,19 +44,19 @@ ...@@ -44,19 +44,19 @@
<button mat-icon-button [matMenuTriggerFor]="menuParamList"> <button mat-icon-button [matMenuTriggerFor]="menuParamList">
<mat-icon color="primary" fontSet="fas" fontIcon="fa-cog fa-2x"></mat-icon> <mat-icon color="primary" fontSet="fas" fontIcon="fa-cog fa-2x"></mat-icon>
</button> </button>
<mat-menu #menuParamList="matMenu"> <mat-menu class="actionsTool" #menuParamList="matMenu">
<div style="text-align: center;font-size: 10px;opacity: 0.5;margin-top:-10px;"> <div style="text-align: center;font-size: 10px;opacity: 0.5;margin-top:-10px;">
{{nbSelectedRes}} {{lang.selectedElements}} {{selectedRes.length}} {{lang.selectedElements}}
</div> </div>
<button mat-menu-item [disabled]="nbSelectedRes == 0"> <button mat-menu-item [disabled]="selectedRes.length == 0">
<mat-icon fontSet="fas" fontIcon="fa-print fa-2x"></mat-icon> <mat-icon fontSet="fas" fontIcon="fa-print fa-2x"></mat-icon>
<span>{{lang.printResultList}}</span> <span>{{lang.printResultList}}</span>
</button> </button>
<button mat-menu-item (click)="openSummarySheet();" [disabled]="nbSelectedRes == 0"> <button mat-menu-item (click)="openSummarySheet();" [disabled]="selectedRes.length == 0">
<mat-icon fontSet="fas" fontIcon="fa-link fa-2x"></mat-icon> <mat-icon fontSet="fas" fontIcon="fa-link fa-2x"></mat-icon>
<span>{{lang.summarySheets}}</span> <span>{{lang.summarySheets}}</span>
</button> </button>
<button mat-menu-item (click)="openListAdmin();" [disabled]="nbSelectedRes == 0"> <button mat-menu-item (click)="openListAdmin();" [disabled]="selectedRes.length == 0">
<mat-icon fontSet="fas" fontIcon="fa-file-export fa-2x"></mat-icon> <mat-icon fontSet="fas" fontIcon="fa-file-export fa-2x"></mat-icon>
<span>{{lang.exportDatas}}</span> <span>{{lang.exportDatas}}</span>
</button> </button>
......
...@@ -103,4 +103,10 @@ ...@@ -103,4 +103,10 @@
.mat-menu-content:not(:empty) { .mat-menu-content:not(:empty) {
padding-top: 18px; padding-top: 18px;
}
.actionsTool {
.mat-icon {
height: auto;
}
} }
\ No newline at end of file
...@@ -63,7 +63,7 @@ export class FiltersToolComponent implements OnInit { ...@@ -63,7 +63,7 @@ export class FiltersToolComponent implements OnInit {
@Input('currentBasketInfo') currentBasketInfo: any; @Input('currentBasketInfo') currentBasketInfo: any;
@Input('snavR') sidenavRight: MatSidenav; @Input('snavR') sidenavRight: MatSidenav;
@Input('nbSelectedRes') nbSelectedRes: number; @Input('selectedRes') selectedRes: any;
@Output('refreshEvent') refreshEvent = new EventEmitter<string>(); @Output('refreshEvent') refreshEvent = new EventEmitter<string>();
@Output('toggleAllRes') toggleAllRes = new EventEmitter<string>(); @Output('toggleAllRes') toggleAllRes = new EventEmitter<string>();
...@@ -294,7 +294,7 @@ export class FiltersToolComponent implements OnInit { ...@@ -294,7 +294,7 @@ export class FiltersToolComponent implements OnInit {
ownerId: this.currentBasketInfo.ownerId, ownerId: this.currentBasketInfo.ownerId,
groupId: this.currentBasketInfo.groupId, groupId: this.currentBasketInfo.groupId,
basketId: this.currentBasketInfo.basketId, basketId: this.currentBasketInfo.basketId,
filters: this.filtersListService.getUrlFilters() selectedRes: this.selectedRes,
} }
}); });
} }
......
...@@ -138,12 +138,11 @@ export class SummarySheetComponent implements OnInit { ...@@ -138,12 +138,11 @@ export class SummarySheetComponent implements OnInit {
} }
}); });
console.log(this.dataAvailable); this.http.get('../../rest/resourcesList/users/' + this.data.ownerId + '/groups/' + this.data.groupId + '/baskets/' + this.data.basketId + '/summarySheets?units=' + btoa(JSON.stringify(currElemData)), { responseType: "blob" })
this.http.get('../../rest/resourcesList/users/' + this.data.ownerId + '/groups/' + this.data.groupId + '/baskets/' + this.data.basketId + '/summarySheets?units=' + btoa(JSON.stringify(currElemData)) + '&init' + this.data.filters, { responseType: "blob" })
.subscribe((data) => { .subscribe((data) => {
let downloadLink = document.createElement('a'); let downloadLink = document.createElement('a');
downloadLink.href = window.URL.createObjectURL(data); downloadLink.href = window.URL.createObjectURL(data);
downloadLink.setAttribute('download', "summary_sheet.pdf"); downloadLink.setAttribute('download', this.lang.summarySheet.replace(' ','_') + ".pdf");
document.body.appendChild(downloadLink); document.body.appendChild(downloadLink);
downloadLink.click(); downloadLink.click();
......
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