Skip to content

Commit 17011ed

Browse files
renemadsenrenemadsen
committed
Fixing the excel icon issue.
Since the first column modal parts now will be integrated into the property worker modal of backend configuration plugin. The current modal is only allowed for admin aka the testing env.
1 parent 6c045cc commit 17011ed

File tree

3 files changed

+67
-61
lines changed

3 files changed

+67
-61
lines changed

‎eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-plannings-container/time-plannings-container.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<mat-date-range-picker #picker></mat-date-range-picker>
5555
</mat-form-field>
5656
<button
57-
id="backwards"
57+
id="file-export-excel"
5858
class="btn-secondary btn-secondary--icon-rounded-border"
5959
(click)="openDownloadExcelDialog()"
6060
matTooltip="{{ 'Download Excel' | translate }}">

‎eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-plannings-container/time-plannings-container.component.ts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ import {
1010
TimePlanningPnSettingsService,
1111
} from '../../../services';
1212
import {startOfWeek, endOfWeek, format} from 'date-fns';
13-
import {PARSING_DATE_FORMAT} from 'src/app/common/const';
13+
import {ExcelIcon, iOSIcon, PARSING_DATE_FORMAT} from 'src/app/common/const';
1414
import {Store} from '@ngrx/store';
1515
import {selectCurrentUserLocale} from 'src/app/state';
1616
import {MatDialog} from '@angular/material/dialog';
1717
import {DownloadExcelDialogComponent} from 'src/app/plugins/modules/time-planning-pn/components';
1818
import {MatDatepickerInputEvent} from '@angular/material/datepicker';
19+
import {MatIconRegistry} from "@angular/material/icon";
20+
import {DomSanitizer} from "@angular/platform-browser";
1921

2022
@AutoUnsubscribe()
2123
@Component({
@@ -29,6 +31,8 @@ export class TimePlanningsContainerComponent implements OnInit, OnDestroy {
2931
private planningsService = inject(TimePlanningPnPlanningsService);
3032
private settingsService = inject(TimePlanningPnSettingsService);
3133
private dialog = inject(MatDialog);
34+
private iconRegistry = inject(MatIconRegistry);
35+
private sanitizer = inject(DomSanitizer);
3236

3337
timePlanningsRequest: TimePlanningsRequestModel;
3438
availableSites: SiteDto[] = [];
@@ -45,10 +49,8 @@ export class TimePlanningsContainerComponent implements OnInit, OnDestroy {
4549
public selectCurrentUserLocale$ = this.store.select(selectCurrentUserLocale);
4650
locale: string;
4751

48-
49-
5052
ngOnInit(): void {
51-
53+
this.iconRegistry.addSvgIconLiteral('file-excel', this.sanitizer.bypassSecurityTrustHtml(ExcelIcon));
5254
if (!this.showResignedSites) {
5355
this.settingsService
5456
.getAvailableSites()

‎eform-client/src/app/plugins/modules/time-planning-pn/components/plannings/time-plannings-table/time-plannings-table.component.ts‎

Lines changed: 60 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -249,66 +249,70 @@ export class TimePlanningsTableComponent implements OnInit, OnChanges {
249249
}
250250

251251
onFirstColumnClick(row: any): void {
252-
const siteId = row.siteId; // Adjust this according to your data structure
253-
this.timePlanningPnSettingsService.getAssignedSite(siteId).subscribe(result => {
254-
if (result && result.success) {
255-
this.dialog.open(AssignedSiteDialogComponent, {
256-
data: result.model,
257-
minWidth: '50%',
258-
})
259-
.afterClosed().subscribe((data: any) => {
260-
if (data !== '' && data !== undefined) {
261-
data.autoBreakSettings.monday.breakMinutesDivider =
262-
this.convertStringToMinutes(data.autoBreakSettings.monday.breakMinutesDivider as string);
263-
data.autoBreakSettings.monday.breakMinutesPrDivider =
264-
this.convertStringToMinutes(data.autoBreakSettings.monday.breakMinutesPrDivider as string);
265-
data.autoBreakSettings.monday.breakMinutesUpperLimit =
266-
this.convertStringToMinutes(data.autoBreakSettings.monday.breakMinutesUpperLimit as string);
267-
data.autoBreakSettings.tuesday.breakMinutesDivider =
268-
this.convertStringToMinutes(data.autoBreakSettings.tuesday.breakMinutesDivider as string);
269-
data.autoBreakSettings.tuesday.breakMinutesPrDivider =
270-
this.convertStringToMinutes(data.autoBreakSettings.tuesday.breakMinutesPrDivider as string);
271-
data.autoBreakSettings.tuesday.breakMinutesUpperLimit =
272-
this.convertStringToMinutes(data.autoBreakSettings.tuesday.breakMinutesUpperLimit as string);
273-
data.autoBreakSettings.wednesday.breakMinutesDivider =
274-
this.convertStringToMinutes(data.autoBreakSettings.wednesday.breakMinutesDivider as string);
275-
data.autoBreakSettings.wednesday.breakMinutesPrDivider =
276-
this.convertStringToMinutes(data.autoBreakSettings.wednesday.breakMinutesPrDivider as string);
277-
data.autoBreakSettings.wednesday.breakMinutesUpperLimit =
278-
this.convertStringToMinutes(data.autoBreakSettings.wednesday.breakMinutesUpperLimit as string);
279-
data.autoBreakSettings.thursday.breakMinutesDivider =
280-
this.convertStringToMinutes(data.autoBreakSettings.thursday.breakMinutesDivider as string);
281-
data.autoBreakSettings.thursday.breakMinutesPrDivider =
282-
this.convertStringToMinutes(data.autoBreakSettings.thursday.breakMinutesPrDivider as string);
283-
data.autoBreakSettings.thursday.breakMinutesUpperLimit =
284-
this.convertStringToMinutes(data.autoBreakSettings.thursday.breakMinutesUpperLimit as string);
285-
data.autoBreakSettings.friday.breakMinutesDivider =
286-
this.convertStringToMinutes(data.autoBreakSettings.friday.breakMinutesDivider as string);
287-
data.autoBreakSettings.friday.breakMinutesPrDivider =
288-
this.convertStringToMinutes(data.autoBreakSettings.friday.breakMinutesPrDivider as string);
289-
data.autoBreakSettings.friday.breakMinutesUpperLimit =
290-
this.convertStringToMinutes(data.autoBreakSettings.friday.breakMinutesUpperLimit as string);
291-
data.autoBreakSettings.saturday.breakMinutesDivider =
292-
this.convertStringToMinutes(data.autoBreakSettings.saturday.breakMinutesDivider as string);
293-
data.autoBreakSettings.saturday.breakMinutesPrDivider =
294-
this.convertStringToMinutes(data.autoBreakSettings.saturday.breakMinutesPrDivider as string);
295-
data.autoBreakSettings.saturday.breakMinutesUpperLimit =
296-
this.convertStringToMinutes(data.autoBreakSettings.saturday.breakMinutesUpperLimit as string);
297-
data.autoBreakSettings.sunday.breakMinutesDivider =
298-
this.convertStringToMinutes(data.autoBreakSettings.sunday.breakMinutesDivider as string);
299-
data.autoBreakSettings.sunday.breakMinutesPrDivider =
300-
this.convertStringToMinutes(data.autoBreakSettings.sunday.breakMinutesPrDivider as string);
301-
data.autoBreakSettings.sunday.breakMinutesUpperLimit =
302-
this.convertStringToMinutes(data.autoBreakSettings.sunday.breakMinutesUpperLimit as string);
303-
this.timePlanningPnSettingsService.updateAssignedSite(data).subscribe(result => {
304-
if (result && result.success) {
305-
this.assignedSiteChanged.emit(data);
252+
// only do something if the selectAuthIsAdmin$ is true
253+
this.selectAuthIsAdmin$.subscribe(value => {
254+
if (value) {
255+
const siteId = row.siteId; // Adjust this according to your data structure
256+
this.timePlanningPnSettingsService.getAssignedSite(siteId).subscribe(result => {
257+
if (result && result.success) {
258+
this.dialog.open(AssignedSiteDialogComponent, {
259+
data: result.model,
260+
minWidth: '50%',
261+
})
262+
.afterClosed().subscribe((data: any) => {
263+
if (data !== '' && data !== undefined) {
264+
data.autoBreakSettings.monday.breakMinutesDivider =
265+
this.convertStringToMinutes(data.autoBreakSettings.monday.breakMinutesDivider as string);
266+
data.autoBreakSettings.monday.breakMinutesPrDivider =
267+
this.convertStringToMinutes(data.autoBreakSettings.monday.breakMinutesPrDivider as string);
268+
data.autoBreakSettings.monday.breakMinutesUpperLimit =
269+
this.convertStringToMinutes(data.autoBreakSettings.monday.breakMinutesUpperLimit as string);
270+
data.autoBreakSettings.tuesday.breakMinutesDivider =
271+
this.convertStringToMinutes(data.autoBreakSettings.tuesday.breakMinutesDivider as string);
272+
data.autoBreakSettings.tuesday.breakMinutesPrDivider =
273+
this.convertStringToMinutes(data.autoBreakSettings.tuesday.breakMinutesPrDivider as string);
274+
data.autoBreakSettings.tuesday.breakMinutesUpperLimit =
275+
this.convertStringToMinutes(data.autoBreakSettings.tuesday.breakMinutesUpperLimit as string);
276+
data.autoBreakSettings.wednesday.breakMinutesDivider =
277+
this.convertStringToMinutes(data.autoBreakSettings.wednesday.breakMinutesDivider as string);
278+
data.autoBreakSettings.wednesday.breakMinutesPrDivider =
279+
this.convertStringToMinutes(data.autoBreakSettings.wednesday.breakMinutesPrDivider as string);
280+
data.autoBreakSettings.wednesday.breakMinutesUpperLimit =
281+
this.convertStringToMinutes(data.autoBreakSettings.wednesday.breakMinutesUpperLimit as string);
282+
data.autoBreakSettings.thursday.breakMinutesDivider =
283+
this.convertStringToMinutes(data.autoBreakSettings.thursday.breakMinutesDivider as string);
284+
data.autoBreakSettings.thursday.breakMinutesPrDivider =
285+
this.convertStringToMinutes(data.autoBreakSettings.thursday.breakMinutesPrDivider as string);
286+
data.autoBreakSettings.thursday.breakMinutesUpperLimit =
287+
this.convertStringToMinutes(data.autoBreakSettings.thursday.breakMinutesUpperLimit as string);
288+
data.autoBreakSettings.friday.breakMinutesDivider =
289+
this.convertStringToMinutes(data.autoBreakSettings.friday.breakMinutesDivider as string);
290+
data.autoBreakSettings.friday.breakMinutesPrDivider =
291+
this.convertStringToMinutes(data.autoBreakSettings.friday.breakMinutesPrDivider as string);
292+
data.autoBreakSettings.friday.breakMinutesUpperLimit =
293+
this.convertStringToMinutes(data.autoBreakSettings.friday.breakMinutesUpperLimit as string);
294+
data.autoBreakSettings.saturday.breakMinutesDivider =
295+
this.convertStringToMinutes(data.autoBreakSettings.saturday.breakMinutesDivider as string);
296+
data.autoBreakSettings.saturday.breakMinutesPrDivider =
297+
this.convertStringToMinutes(data.autoBreakSettings.saturday.breakMinutesPrDivider as string);
298+
data.autoBreakSettings.saturday.breakMinutesUpperLimit =
299+
this.convertStringToMinutes(data.autoBreakSettings.saturday.breakMinutesUpperLimit as string);
300+
data.autoBreakSettings.sunday.breakMinutesDivider =
301+
this.convertStringToMinutes(data.autoBreakSettings.sunday.breakMinutesDivider as string);
302+
data.autoBreakSettings.sunday.breakMinutesPrDivider =
303+
this.convertStringToMinutes(data.autoBreakSettings.sunday.breakMinutesPrDivider as string);
304+
data.autoBreakSettings.sunday.breakMinutesUpperLimit =
305+
this.convertStringToMinutes(data.autoBreakSettings.sunday.breakMinutesUpperLimit as string);
306+
this.timePlanningPnSettingsService.updateAssignedSite(data).subscribe(result => {
307+
if (result && result.success) {
308+
this.assignedSiteChanged.emit(data);
309+
}
310+
});
306311
}
307312
});
308313
}
309314
});
310-
}
311-
});
315+
}});
312316
}
313317

314318
onDayColumnClick(row: any, field: string): void {

0 commit comments

Comments
 (0)