Skip to content
Snippets Groups Projects
Commit 6dc62796 authored by Alex ORLUC's avatar Alex ORLUC
Browse files

FEAT #13271 TIME 1 fix some issues

parent 275cf0fb
No related branches found
No related tags found
No related merge requests found
<div style="font-size: 60px;opacity: 0.1;padding-bottom: 30px;text-align: center;"> <div style="font-size: 60px;opacity: 0.1;padding-bottom: 30px;text-align: center;">
<mat-icon fontSet="fas" fontIcon="{{icon}} fa-2x"></mat-icon> <mat-icon fontSet="fas" fontIcon="{{icon}} fa-2x"></mat-icon>
</div> </div>
<div style="position: sticky;top: 0px;background:white;z-index: 1;display:flex;justify-content: center;align-items: center;color: #666;padding: 10px;"> <div
<mat-icon *ngIf="this.currentResource.statusImage !== undefined" style="position: sticky;top: 0px;background:white;z-index: 1;display:flex;justify-content: center;align-items: center;color: #666;padding: 10px;">
<mat-icon *ngIf="this.currentResource.statusImage !== undefined" style="width: auto;"
[ngStyle]="{'color': this.currentResource.priorityColor}" color="primary" [ngStyle]="{'color': this.currentResource.priorityColor}" color="primary"
class="{{this.currentResource.statusImage.charAt(0)}}{{this.currentResource.statusImage.charAt(1)}} {{this.currentResource.statusImage}} {{this.currentResource.statusImage.charAt(0)}}{{this.currentResource.statusImage.charAt(1)}}-2x"> class="{{this.currentResource.statusImage.charAt(0)}}{{this.currentResource.statusImage.charAt(1)}} {{this.currentResource.statusImage}} {{this.currentResource.statusImage.charAt(0)}}{{this.currentResource.statusImage.charAt(1)}}-2x">
</mat-icon>&nbsp;{{this.currentResource.chrono}} </mat-icon>&nbsp;<span [innerHTML]="this.currentResource.chrono"></span>
</div> </div>
<div style="text-align: center;font-weight: bold;margin-bottom: 30px;padding-left: 10px;padding-right: 10px;" <div style="text-align: center;font-weight: bold;margin-bottom: 30px;padding-left: 10px;padding-right: 10px;"
title="{{this.currentResource.subject}}"> title="{{this.currentResource.subject}}" [innerHTML]="this.currentResource.subject | shorten: 50: '...'">
{{this.currentResource.subject | shorten: 50: '...'}}
</div> </div>
<mat-tab-group *ngIf="this.mode == 'diffusion'" [(selectedIndex)]="selectedDiffusionTab" class="diffusionTab"> <mat-tab-group *ngIf="this.mode == 'diffusion'" [(selectedIndex)]="selectedDiffusionTab" class="diffusionTab">
<mat-tab label="{{'lang.diffusionList' | translate}}"> <mat-tab label="{{'lang.diffusionList' | translate}}">
...@@ -22,5 +22,7 @@ ...@@ -22,5 +22,7 @@
<app-avis-workflow #appAvisWorkflow [adminMode]="false" [injectDatas]="injectDatasParam"></app-avis-workflow> <app-avis-workflow #appAvisWorkflow [adminMode]="false" [injectDatas]="injectDatasParam"></app-avis-workflow>
</mat-tab> </mat-tab>
</mat-tab-group> </mat-tab-group>
<app-notes-list #appNotesList *ngIf="this.mode == 'note'" [editMode]="true" [injectDatas]="injectDatasParam" (reloadBadgeNotes)="reloadBadgeNotes($event)"></app-notes-list> <app-notes-list #appNotesList *ngIf="this.mode == 'note'" [editMode]="true" [injectDatas]="injectDatasParam"
<app-attachments-list #appAttachmentsList *ngIf="this.mode == 'attachment'" [injectDatas]="injectDatasParam" (reloadBadgeAttachments)="reloadBadgeAttachments($event)"></app-attachments-list> (reloadBadgeNotes)="reloadBadgeNotes($event)"></app-notes-list>
\ No newline at end of file <app-attachments-list #appAttachmentsList *ngIf="this.mode == 'attachment'" [injectDatas]="injectDatasParam"
(reloadBadgeAttachments)="reloadBadgeAttachments($event)"></app-attachments-list>
\ No newline at end of file
...@@ -253,6 +253,8 @@ export class SearchResultListComponent implements OnInit, OnDestroy { ...@@ -253,6 +253,8 @@ export class SearchResultListComponent implements OnInit, OnDestroy {
} }
launchSearch(criteria: any = this.criteria, initSearch = false) { launchSearch(criteria: any = this.criteria, initSearch = false) {
this.listProperties.page = 0;
this.listProperties.pageSize = 0;
if (initSearch) { if (initSearch) {
this.dataFilters = {}; this.dataFilters = {};
} }
...@@ -279,6 +281,7 @@ export class SearchResultListComponent implements OnInit, OnDestroy { ...@@ -279,6 +281,7 @@ export class SearchResultListComponent implements OnInit, OnDestroy {
startWith({}), startWith({}),
switchMap(() => { switchMap(() => {
if (!this.isLoadingResults) { if (!this.isLoadingResults) {
this.sidenavRight.close();
this.isLoadingResults = true; this.isLoadingResults = true;
return this.resultListDatabase!.getRepoIssues( return this.resultListDatabase!.getRepoIssues(
this.sort.active, this.sort.direction, this.paginator.pageIndex, this.searchUrl, this.listProperties, this.paginator.pageSize, this.criteria, this.dataFilters); this.sort.active, this.sort.direction, this.paginator.pageIndex, this.searchUrl, this.listProperties, this.paginator.pageSize, this.criteria, this.dataFilters);
...@@ -298,8 +301,13 @@ export class SearchResultListComponent implements OnInit, OnDestroy { ...@@ -298,8 +301,13 @@ export class SearchResultListComponent implements OnInit, OnDestroy {
}), }),
catchError((err: any) => { catchError((err: any) => {
this.notify.handleErrors(err); this.notify.handleErrors(err);
// this.router.navigate(['/home']); this.selectedRes = [];
this.data = [];
this.resultsLength = 0;
this.dataFilters = {};
this.allResInBasket = [];
this.isLoadingResults = false; this.isLoadingResults = false;
this.initSearch = false;
return of(false); return of(false);
}) })
).subscribe(data => this.data = data); ).subscribe(data => this.data = data);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment