Skip to content

Commit 82e6dea

Browse files
codigodehoyLuisMS7
andauthored
Tt 582 improve the summary section of the time clock page QA (#830)
* style: TT-582 improve the summary section with a new row with information of actual clock in register and clock out button * fix: TT-582 add missing unit test to confirm that clockout function in TimeEntriesSummaryComponent emits an event * style: TT-582 add a border radius to current elapsed time box * style: TT-582 improved the clocked in hour text and current time box * style: TT-582 improved the clocked in hour text and current time box * style: TT-582 removed whitespace Co-authored-by: Luis Moyón <[email protected]>
1 parent da50b7a commit 82e6dea

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

src/app/modules/time-clock/components/time-entries-summary/time-entries-summary.component.css

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
border-radius: .25rem;
77
}
88

9+
.c-title{
10+
position: relative;
11+
bottom: 9px;
12+
}
13+
914
.clock-out{
1015
text-align: center;
1116
}
@@ -22,4 +27,4 @@
2227
-webkit-box-shadow: 0px 1px 5px 2px rgba(0,0,0,0.56);
2328
-moz-box-shadow: 0px 1px 5px 2px rgba(0,0,0,0.56);
2429
color: #fff;
25-
}
30+
}
Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,24 @@
1-
<div *ngIf="areFieldsVisible" class="row pb-4">
2-
<div class="col-2 d-flex align-items-center">
3-
<p class="card-title text-left" style="margin: 0; padding: 0;">
1+
<div *ngIf="areFieldsVisible" class="grid grid-cols-2 gap-4 pb-4">
2+
<div class="align-items-center">
3+
<p class="card-title text-left inline-block c-title" style="margin: 0; padding: 0;">
44
You clocked in at
55
<strong>{{ activeTimeEntry?.start_date | date:'shortTime' }}</strong>
66
</p>
7-
</div>
8-
<div class="col-2 col-sm-3">
9-
<div class="current-elapsed-time-box d-flex flex-column justify-content-center align-items-center" style="width: 50%">
7+
<div class="inline-block ml-12 text-center current-elapsed-time-box " style="width: 22%">
108
<h6>Current</h6>
119
<h3>{{ currentWorkingTime }}</h3>
1210
</div>
1311
</div>
14-
<div class="col-7 clock-out">
15-
<button
16-
class="btn bt-clock-out"
17-
type="button"
18-
(click)="clockOut()">
19-
Clock Out
12+
<div class="clock-out pr-28">
13+
<button class="btn bt-clock-out" type="button" (click)="clockOut()">
14+
Clock Out
2015
</button>
2116
</div>
2217
</div>
2318

2419
<h6 class="text-left"><strong>Summary</strong></h6>
2520
<hr class="mb-4" />
26-
<div class ="container px-0">
21+
<div class="container px-0">
2722

2823
<div class="row pb-4">
2924
<div class="col-12 col-sm-4">
@@ -40,4 +35,4 @@ <h3>{{ timeEntriesSummary?.month | timeDetails }}</h3>
4035
</div>
4136
</div>
4237

43-
</div>
38+
</div>

0 commit comments

Comments
 (0)