Skip to content

Commit d4025c3

Browse files
committed
Fixing days counter if the end day has hours set correctly.
Changing some of the styling.
1 parent 576f686 commit d4025c3

File tree

3 files changed

+27
-18
lines changed

3 files changed

+27
-18
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
{{row['softwareVersion']}}
114114
<div *ngIf="row['softwareVersionIsValid'] === false">
115115
<span [matTooltip]="'Needs update!' | translate "><mat-icon
116-
color="accent">warning</mat-icon></span>
116+
color="#DB0D0D">warning</mat-icon></span>
117117
</div>
118118
</div>
119119
</div>

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

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,35 @@
11
//.background-yellow{background-color: var(--yellow) !important;}
22
.grey-background {
3-
background-color: #f3f4f6 !important;
4-
border-right: 5px solid white !important;
3+
background-color: #EBEFF2 !important;
4+
border-right: 5px solid #EBEFF2 !important;
55
padding-right: 5px !important;
6-
border-bottom: 1px solid white !important;
6+
border-bottom: 1px solid #EBEFF2 !important;
77
}
88

99
.white-background {
10-
border-right: 5px solid white !important;
10+
border-right: 5px solid #EBEFF2 !important;
1111
margin-right: 5px !important;
12-
border-bottom: 1px solid white !important;
12+
border-bottom: 1px solid #EBEFF2 !important;
1313
}
1414

1515
.green-background {
16-
background-color: #0bbe60 !important;
17-
border-bottom: 1px solid white !important;
18-
border-right: 5px solid white !important;
16+
background-color: #E2F7E7 !important;
17+
border-bottom: 1px solid #EBEFF2 !important;
18+
border-right: 5px solid #EBEFF2 !important;
1919
margin-right: 5px !important;
2020
}
2121

2222
.red-background {
23-
background-color: #da4259 !important;
24-
border-bottom: 1px solid white !important;
25-
border-right: 5px solid white !important;
23+
background-color: #FFE1E1 !important;
24+
border-bottom: 1px solid #EBEFF2 !important;
25+
border-right: 5px solid #EBEFF2 !important;
2626
margin-right: 5px !important;
2727
}
2828

2929
.neutral-icon {
3030
position: relative !important;
3131
top: 5px !important;
32+
color: #B3B9BF !important;
3233
}
3334

3435
.black-text {
@@ -40,15 +41,19 @@
4041
}
4142

4243
.white-text {
43-
color: white !important;
44+
color: black !important;
4445
}
4546

4647
.red-text {
47-
color: #da4259 !important;
48+
color: #DB0D0D !important;
4849
}
4950

5051
.blue-text {
51-
color: #007bff !important;
52+
color: #0D96DB !important;
53+
}
54+
55+
.grey-text {
56+
color: #B3B9BF !important;
5257
}
5358

5459
.progress-circle {
@@ -57,8 +62,8 @@
5762
height: 50px;
5863
border-radius: 50%;
5964
background: conic-gradient(
60-
#0bbe60 0%,
61-
#0bbe60 calc(var(--percentage) * 1%),
65+
#319C4C 0%,
66+
#319C4C calc(var(--percentage) * 1%),
6267
lightgrey calc(var(--percentage) * 1%),
6368
lightgrey 100%
6469
);

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,14 @@ export class TimePlanningsTableComponent implements OnInit, OnChanges {
7373
private updateTableHeaders(): void {
7474
this.tableHeaders = [];
7575
this.cdr.detectChanges();
76+
// debugger;
7677
const startDate = new Date(this.dateFrom);
7778
const endDate = new Date(this.dateTo);
7879
const today = new Date();
79-
const daysCount = Math.ceil((endDate.getTime() - startDate.getTime()) / (1000 * 3600 * 24));
80+
let daysCount = Math.ceil((endDate.getTime() - startDate.getTime()) / (1000 * 3600 * 24));
81+
if (endDate.getHours() === 23) {
82+
daysCount--;
83+
}
8084
let todayTranslated = this.translateService.stream('Today');
8185

8286
this.tableHeaders = [

0 commit comments

Comments
 (0)