From bbc2d4cdf30fa16e2e18eef4317287f4993269e5 Mon Sep 17 00:00:00 2001 From: Manuel Tauber Date: Wed, 12 Jun 2024 16:57:19 +0200 Subject: [PATCH 1/2] t --- .../src/app/ntt-gantt/ntt-gantt.component.html | 3 +-- .../src/app/ntt-gantt/ntt-gantt.component.ts | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.html b/frontend/src/app/ntt-gantt/ntt-gantt.component.html index 8dca7e5..ba90d4b 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.html +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.html @@ -208,7 +208,6 @@ - @@ -222,7 +221,7 @@ diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts index 141f8ad..5c9c244 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts @@ -114,7 +114,7 @@ export class NttGanttComponent implements OnInit { public horizontalPosition: MatSnackBarHorizontalPosition = 'end'; public verticalPosition: MatSnackBarVerticalPosition = 'bottom'; public inputForTimeline = []; - public renderplanTime: boolean = false; + public renderplanTime: boolean = true; public planTimeScrollLeft: number = 0; public stateList: any[] = []; @@ -209,7 +209,8 @@ export class NttGanttComponent implements OnInit { this.renderGantt = false; this.firstLoad = true; this.sliceStart = 0; - this.sliceEnd = 200; + this.sliceEnd = 20; + this.dataService.getUser().then((res: any) => { console.log(res); @@ -428,7 +429,8 @@ export class NttGanttComponent implements OnInit { this.userPreferences = res.userPreferences; this.showDetails = res.userPreferences.showDetails; this.selectedScalar = this.scalars[res.userPreferences.view]; - this.changeScalar(); + console.log() + console.log("SELECETEDSCALAR########"+this.selectedScalar); this.dataService.fetchUserSupportGroup().then((res: any) => { @@ -454,6 +456,8 @@ export class NttGanttComponent implements OnInit { + + /**###################################################################### Data Mapping, Filter and Sorting Functions ######################################################################*/ /** @@ -542,6 +546,7 @@ export class NttGanttComponent implements OnInit { this.spin = false; this.showNoResultsError = true; this.renderplanTime = false; + } }); } @@ -713,14 +718,17 @@ export class NttGanttComponent implements OnInit { if (this.selectedScalar == this.scalars[0]) { this.timelineSettings = { topTier: { unit: 'Week' }, bottomTier: { format: 'dd', unit: 'Day', count: 1 } }; this.renderplanTime = false; + } if (this.selectedScalar == this.scalars[1]) { this.timelineSettings = { topTier: { unit: 'Month' }, bottomTier: { format: 'WW', unit: 'Week', count: 1 } }; this.renderplanTime = true; + } if (this.selectedScalar == this.scalars[2]) { this.timelineSettings = { topTier: { unit: 'Year' }, bottomTier: { format: 'MM', unit: 'Month', count: 1 } }; this.renderplanTime = false; + } this.editUserPreferences(); @@ -754,6 +762,7 @@ export class NttGanttComponent implements OnInit { this.plantimeComponent.changeDateRange(this.projectStartDate, this.projectEndDate); this.renderplanTime = true; + } } @@ -767,6 +776,7 @@ export class NttGanttComponent implements OnInit { this.plantimeComponent.changeDateRange(this.projectStartDate, this.projectEndDate); this.renderplanTime = true; + } } /** From fc8036b3cfdb45bf597c12a6810f4f065a5d7e70 Mon Sep 17 00:00:00 2001 From: Manuel Tauber Date: Mon, 24 Jun 2024 12:58:15 +0200 Subject: [PATCH 2/2] fixes --- frontend/src/app/ntt-gantt/ntt-gantt.component.css | 10 +++++++++- frontend/src/app/ntt-gantt/ntt-gantt.component.html | 3 +++ frontend/src/app/ntt-gantt/ntt-gantt.component.ts | 3 ++- frontend/src/styles.css | 4 ++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.css b/frontend/src/app/ntt-gantt/ntt-gantt.component.css index a2f07eb..5f22f1d 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.css +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.css @@ -437,4 +437,12 @@ ::ng-deep .mat-calendar-cell-content{ color: #d56100; -} */ \ No newline at end of file +} */ + +.gantt-container { + height: 75vh; /* Höhe relativ zur Viewport-Höhe */ +} +:host { + display: block; + height: 100%; /* Die Komponente füllt den verfügbaren Raum des übergeordneten Containers */ +} diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.html b/frontend/src/app/ntt-gantt/ntt-gantt.component.html index ba90d4b..8fa1439 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.html +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.html @@ -151,7 +151,9 @@ +
+
diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts index 5c9c244..4ffb408 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts @@ -21,6 +21,7 @@ import { DeletePresetDialogComponent } from '../delete-preset-dialog/delete-pres import { SavePresetUnderDialogComponent } from '../save-preset-under-dialog/save-preset-under-dialog.component'; import { Location } from '@angular/common'; import { environment } from 'src/environments/environment'; +import { GanttModule, ResizeService } from '@syncfusion/ej2-angular-gantt'; export const MY_DATE_FORMATS = { @@ -52,7 +53,7 @@ interface presetGroup { selector: 'ntt-gantt', templateUrl: './ntt-gantt.component.html', styleUrls: ['./ntt-gantt.component.css'], - providers: [ + providers: [ResizeService, { provide: MAT_DATE_FORMATS, useValue: MY_DATE_FORMATS } ] }) diff --git a/frontend/src/styles.css b/frontend/src/styles.css index cb0d05a..7dddc7e 100644 --- a/frontend/src/styles.css +++ b/frontend/src/styles.css @@ -32,3 +32,7 @@ color: white !important; border: none; } + +html, body { + overflow: hidden !important; +}