Verified Commit afc1e0bf authored by Alex ORLUC's avatar Alex ORLUC

FIX #11641 TIME 1:30 fix refresh folder after aucotomplete + autoclose basket…

FIX #11641 TIME 1:30 fix refresh folder after aucotomplete + autoclose basket panel in folder list + fix icon size header and left panel
parent 9a8eac8a
<mat-divider *ngIf="homeData.regroupedBaskets.length > 0 || homeData.assignedBaskets.length > 0">
</mat-divider>
<mat-expansion-panel class="basketList" expanded *ngIf="homeData.regroupedBaskets.length > 0 || homeData.assignedBaskets.length > 0">
<mat-expansion-panel class="basketList" [expanded]="appService.getStateBasketMenu()" *ngIf="homeData.regroupedBaskets.length > 0 || homeData.assignedBaskets.length > 0">
<mat-expansion-panel-header>
<mat-panel-title>
<i class="fa fa-inbox"></i>&nbsp;{{lang.myBaskets}}
<i class="fa fa-inbox panelIconMenu"></i>&nbsp;{{lang.myBaskets}}
</mat-panel-title>
</mat-expansion-panel-header>
<mat-form-field floatLabel="never" appearance="outline" class="basketsFilter" style="padding-left:20px;padding-right:20px;font-size: 11px;">
......
......@@ -56,4 +56,8 @@
padding : 0px;
padding-bottom: 5px;
}
}
.panelIconMenu {
font-size: 22px;
}
\ No newline at end of file
......@@ -22,6 +22,7 @@ export class BasketHomeComponent implements OnInit {
basketId: ''
};
@Input() snavL: MatSidenav;
@Input('opened') opened: boolean;
@Output('refreshEvent') refreshEvent = new EventEmitter<string>();
constructor(
......
......@@ -84,7 +84,10 @@ export class FolderDocumentListComponent implements OnInit {
allResInBasket: number[] = [];
selectedDiffusionTab: number = 0;
folderInfo: any = {
id: 0
id: 0,
'label': '',
'ownerDisplayName': '',
'entitiesSharing': []
};
private destroy$ = new Subject<boolean>();
......@@ -115,6 +118,7 @@ export class FolderDocumentListComponent implements OnInit {
}
ngOnInit(): void {
this.appService.openBasketMenu(false);
this.loading = false;
this.http.get("../../rest/home")
......
......@@ -447,6 +447,8 @@ export class FolderTreeComponent implements OnInit {
}
goTo(folder: any) {
this.seletedId = folder.id;
this.getFolders();
this.router.navigate(["/folders/" + folder.id]);
}
}
<mat-expansion-panel class="folderList" expanded>
<mat-expansion-panel-header>
<mat-panel-title>
<i class="fa fa-folder"></i>&nbsp;{{lang.folders}}
<i class="fa fa-folder panelIconMenu"></i>&nbsp;{{lang.folders}}
</mat-panel-title>
</mat-expansion-panel-header>
<folder-tree #folderTree [selectedId]="id" (refreshDocList)="refreshDocList()"></folder-tree>
......
......@@ -24,4 +24,8 @@
font-size: 12px;
font-weight: bold;
}
}
.panelIconMenu {
font-size: 22px;
}
\ No newline at end of file
......@@ -2,5 +2,5 @@
<button *ngIf="!snavLeft.opened" mat-icon-button (click)="snavLeft.open()" style="font-size:20px;">
<mat-icon class="fa fa-stream"></mat-icon>
</button>
<i *ngIf="headerService.headerMessageIcon !== ''" class="{{headerService.headerMessageIcon}}"></i> {{headerService.headerMessage}} <span class="admin-toolbar-title-small">{{headerService.subHeaderMessage}}</span>
<i *ngIf="headerService.headerMessageIcon !== ''" class="{{headerService.headerMessageIcon}} headerIcon"></i> {{headerService.headerMessage}} <span class="admin-toolbar-title-small">{{headerService.subHeaderMessage}}</span>
</div>
\ No newline at end of file
......@@ -4,4 +4,8 @@
margin-left: -35px;
margin-top: -10px;
}
}
.headerIcon {
font-size: 22px;
}
\ No newline at end of file
......@@ -9,6 +9,9 @@ export class AppService {
currentUser: any;
isBasketMenuOpen: boolean = true;
isFolderMenuOpen: boolean = true;
constructor(changeDetectorRef: ChangeDetectorRef, media: MediaMatcher) {
this.mobileQuery = media.matchMedia('(max-width: 768px)');
this._mobileQueryListener = () => changeDetectorRef.detectChanges();
......@@ -29,5 +32,21 @@ export class AppService {
ngOnDestroy(): void {
this.mobileQuery.removeListener(this._mobileQueryListener);
}
}
openBasketMenu(state: boolean) {
return this.isBasketMenuOpen = state;
}
openFolderMenu(state: boolean) {
return this.isFolderMenuOpen = state;
}
getStateBasketMenu() {
return this.isBasketMenuOpen;
}
getStateFolderMenu() {
return this.isFolderMenuOpen;
}
}
Markdown is supported
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