taubem
/
ChangeCalendar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'syncfusion-upgrade' of https://dev.azure.com/asfinag/Tech-Supporting.ITSM/_git/Tech-Supporting.ITSM.ChangeKalender into syncfusion-upgrade

main
Said Gedik 2024-08-06 18:34:36 +02:00
parent 8f906885e2 d8c58f7837
commit fbf57337f5
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/package-lock.json generated
View File

@ -19,8 +19,8 @@
"@angular/platform-browser": "^16.0.0",
"@angular/platform-browser-dynamic": "^16.0.0",
"@angular/router": "^16.0.0",
"@syncfusion/ej2-angular-gantt": "^26.1.35",
"@syncfusion/ej2-material-theme": "^26.1.35",
"@syncfusion/ej2-angular-gantt": "^26.2.4",
"@syncfusion/ej2-material-theme": "^26.2.4",
"jquery": "^3.6.1",
"moment": "^2.29.4",
"rxjs": "^7.8.0",

4
frontend/package.json
View File

@ -22,8 +22,8 @@
"@angular/platform-browser": "^16.0.0",
"@angular/platform-browser-dynamic": "^16.0.0",
"@angular/router": "^16.0.0",
"@syncfusion/ej2-angular-gantt": "^26.1.35",
"@syncfusion/ej2-material-theme": "^26.1.35",
"@syncfusion/ej2-angular-gantt": "^26.2.4",
"@syncfusion/ej2-material-theme": "^26.2.4",
"jquery": "^3.6.1",
"moment": "^2.29.4",
"rxjs": "^7.8.0",

2
frontend/src/app/ntt-gantt/ntt-gantt.component.html
View File

@ -107,7 +107,7 @@
<div class="right">
<!-- Scale Picker -->
<mat-button-toggle-group style="height: 70%; font-size: 13px; border-radius: 8px;" (change)="changeScalar()"
<mat-button-toggle-group color="primary" style="height: 70%; font-size: 13px; border-radius: 8px;" (change)="changeScalar()"
name="fontStyle" aria-label="Font Style" [(ngModel)]="selectedScalar">
<mat-button-toggle style="display: flex; align-items: center;" value="bold" *ngFor="let scalar of scalars"
[value]="scalar">

6
frontend/src/app/ntt-gantt/ntt-gantt.component.ts
View File

@ -904,7 +904,7 @@ export class NttGanttComponent implements OnInit {
*/
public queryTaskbarInfo(args: any) {
// console.log(args.data.taskData);
console.log(args);
if (args.taskbarType == 'Milestone' && args.data.taskData.TaskID.includes("D2")) {
if (args.data.taskData.isFixed == false) {
args.taskbarElement.children[1].classList.add('e-gantt-milestone-border1');
@ -915,7 +915,7 @@ export class NttGanttComponent implements OnInit {
if (args.data.taskData.TaskID.includes("D2")) {
// console.log(args.data.taskData.resources[0]);
if (args.data.taskData.resources[0].state == 0) {
args.milestoneColor = "#f83200"; //red
args.milestoneColor = "rgb(248, 50, 0)"; //red
// console.log("red");
}
if (args.data.taskData.resources[0].state == 1) {
@ -961,7 +961,7 @@ export class NttGanttComponent implements OnInit {
// console.log("\nisRes: ", args.data.taskData.isRes);
// console.log("\nisD2", args.data.taskData.TaskID.includes("D2"));
// console.log("\nMilestone Color ready:",args.milestoneColor);
console.log(args.milestoneColor);
}
}
else {