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

Merge branch 'legend'

main
Said Gedik 2024-07-24 15:32:46 +02:00
parent 0017b43173 af1535c354
commit fde5044f83
4 changed files with 86 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/src/app/language.service.ts
View File

@ -27,6 +27,17 @@ export class LanguageService {
* The constructor sets all the language values and does the default mapping
*/
constructor() {
this.deMap.set('routeDraft', "Entwurf"); this.enMap.set('routeDraft', 'Draft');
this.deMap.set('routeRFA', "Atorisierungsanforderung"); this.enMap.set('routeRFA', 'Request for Authorization');
this.deMap.set('routePIP', "Planung in Bearbeitung"); this.enMap.set('routePIP', 'Planning in Progress');
this.deMap.set('routeScheduled', "Geplant"); this.enMap.set('routeScheduled', 'Scheduled');
this.deMap.set('routeCancelled', "Storniert"); this.enMap.set('routeCancelled', 'Cancelled');
this.deMap.set('routeCFRR', "Fertiggestellt (Endüberprüfung Erforderlich)"); this.enMap.set('routeCFRR', 'Completed (final review required)');
this.deMap.set('routeFRF', "Fertiggestellt (Endüberprüfung Abgeschlossen)"); this.enMap.set('routeFRF', 'Completed (final review finished)');
this.deMap.set('routeClosed', "Abgeschlossen"); this.enMap.set('routeClosed', 'Closed');
this.deMap.set('routeRB', "Abgelehnt (Beginn)"); this.enMap.set('routeRB', 'Rejected (begin)');
this.deMap.set('routeRE', "Abgelehnt (Ende)"); this.enMap.set('routeRE', 'Rejected (end)');
this.deMap.set('detailButton', 'Details anzeigen');
this.enMap.set('detailButton', 'Show Details');
this.deMap.set('filterButton', 'Filter anwenden');

10
frontend/src/app/ntt-gantt/ntt-gantt.component.css
View File

@ -262,7 +262,7 @@
/* Semi-transparent background */
border: solid rgba(0, 0, 0, 0.1) 1px;
border-bottom: none;
border-radius: 10px 10px 0px 0px;
border-radius: 5px 5px 0px 0px;
height: 60px;
padding-left: 10px;
padding-right: 15px;
@ -458,11 +458,12 @@
width: 100%;
font-family: Arial, sans-serif;
font-size: 13px;
display: flex;
flex-direction: column;
gap: 4px;
background-color: rgb(210, 217, 224);
padding: 10px;
display: flex;
flex-wrap: wrap;
justify-content: center;
}
.inner-legend {
@ -473,11 +474,14 @@
border-radius: 50px;
background-color: aliceblue;
width: fit-content;
white-space: nowrap;
}
.route {
height: 12px;
width: 12px;
min-width: 12px;
min-height: 12px;
transform: rotate(45deg);
}
.gantt-container {

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

@ -57,48 +57,7 @@
</div>
</div>
<div class="legend">
<div class="inner-legend">
<div class="route" style="background-color: #f83200;"></div>
Draft
</div>
<div class="inner-legend">
<div class="route" style="background-color: #f98700;"></div>
Request for Authorization
</div>
<div class="inner-legend">
<div class="route" style="background-color: #f98700;"></div>
Planning in Progress
</div>
<div class="inner-legend">
<div class="route" style="background-color: #f4fa00;"></div>
Scheduled
</div>
<div class="inner-legend">
<div class="route" style="background-color: #f4fa00;"></div>
Cancelled
</div>
<div class="inner-legend">
<div class="route" style="background-color: #008642;"></div>
Completed (final review required)
</div>
<div class="inner-legend">
<div class="route" style="background-color: #32cd32;"></div>
Completed (final review finished)
</div>
<div class="inner-legend">
<div class="route" style="background-color: #ffffff;"></div>
Closed
</div>
<div class="inner-legend">
<div class="route" style="background-color: #d3d3d3;"></div>
Rejected (begin)
</div>
<div class="inner-legend">
<div class="route" style="background-color: #808080;"></div>
Rejected (end)
</div>
</div>
@ -276,6 +235,49 @@
[pageIndex]="0" aria-label="Seite auswählen">
</mat-paginator>
<div class="legend">
<div class="inner-legend">
<div class="route" style="background-color: #f83200;"></div>
{{languageService.lMap.get('routeDraft')}}
</div>
<div class="inner-legend">
<div class="route" style="background-color: #f98700;"></div>
{{languageService.lMap.get('routeRFA')}}
</div>
<div class="inner-legend">
<div class="route" style="background-color: #ffc006;"></div>
{{languageService.lMap.get('routePIP')}}
</div>
<div class="inner-legend">
<div class="route" style="background-color: #f4fa00;"></div>
{{languageService.lMap.get('routeScheduled')}}
</div>
<div class="inner-legend">
<div class="route" style="background-color: #131313;"></div>
{{languageService.lMap.get('routeCancelled')}}
</div>
<div class="inner-legend">
<div class="route" style="background-color: #008642;"></div>
{{languageService.lMap.get('routeCFRR')}}
</div>
<div class="inner-legend">
<div class="route" style="background-color: #32cd32;"></div>
{{languageService.lMap.get('routeFRF')}}
</div>
<div class="inner-legend">
<div class="route" style="background-color: #ffffff; border: solid 1px #8e8e8e;"></div>
{{languageService.lMap.get('routeClosed')}}
</div>
<div class="inner-legend">
<div class="route" style="background-color: #d3d3d3;"></div>
{{languageService.lMap.get('routeRB')}}
</div>
<div class="inner-legend">
<div class="route" style="background-color: #808080;"></div>
{{languageService.lMap.get('routeRE')}}
</div>
</div>
<mat-card style="width: 50%; margin: auto;" *ngIf="errorService.rsso">
<mat-card-header>
<mat-card-title><mat-icon style="color: red;">error</mat-icon>

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

@ -911,11 +911,11 @@ export class NttGanttComponent implements OnInit {
// console.log("orange");
}
if (args.data.taskData.resources[0].state == 3) {
args.milestoneColor = "#ff9248"; //light orange
args.milestoneColor = "#ffc006"; //light orange
// console.log("light orange");
}
if (args.data.taskData.resources[0].state >= 6) {
args.milestoneColor = "#ffff00"; //yellow
args.milestoneColor = "#000000"; //yellow
// console.log("yellow");
}
if (args.data.taskData.resources[0].state == 7) {