Skip to content

Tt 582 improve the summary section of the time clock page QA #830

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Mar 17, 2022
Merged

Tt 582 improve the summary section of the time clock page QA #830

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3924ee4
style: TT-582 improve the summary section with a new row with informa…
codigodehoy Mar 14, 2022
6c16256
fix: TT-582 add missing unit test to confirm that clockout function i…
LuisMS7 Mar 14, 2022
a1db874
style: TT-582 add a border radius to current elapsed time box
LuisMS7 Mar 15, 2022
ee212af
style: TT-582 improved the clocked in hour text and current time box
codigodehoy Mar 17, 2022
a8e7e79
style: TT-582 improved the clocked in hour text and current time box
codigodehoy Mar 17, 2022
f9ba78f
style: TT-582 removed whitespace
codigodehoy Mar 17, 2022
8f76348
Merge branch 'master' into TT-582-improve-the-summary-section-of-the-…
codigodehoy Mar 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
style: TT-582 improved the clocked in hour text and current time box
  • Loading branch information
@codigodehoy
codigodehoy committed Mar 17, 2022
commit ee212af19da9d01cff1bb2db3f0c814145659c2e
6 changes: 5 additions & 1 deletion ...app/modules/time-clock/components/time-entries-summary/time-entries-summary.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@
color: white;
border-radius: .25rem;
}
.c-title{
position: relative;
bottom: 9px;
}

.clock-out{
text-align: center;
Expand All @@ -22,4 +26,4 @@
-webkit-box-shadow: 0px 1px 5px 2px rgba(0,0,0,0.56);
-moz-box-shadow: 0px 1px 5px 2px rgba(0,0,0,0.56);
color: #fff;
}
}
23 changes: 9 additions & 14 deletions ...pp/modules/time-clock/components/time-entries-summary/time-entries-summary.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,24 @@
<div *ngIf="areFieldsVisible" class="row pb-4">
<div class="col-2 d-flex align-items-center">
<p class="card-title text-left" style="margin: 0; padding: 0;">
<div *ngIf="areFieldsVisible" class="grid grid-cols-2 gap-4 pb-4">
<div class="align-items-center">
<p class="card-title text-left inline-block c-title" style="margin: 0; padding: 0;">
You clocked in at
<strong>{{ activeTimeEntry?.start_date | date:'shortTime' }}</strong>
</p>
</div>
<div class="col-2 col-sm-3">
<div class="current-elapsed-time-box d-flex flex-column justify-content-center align-items-center" style="width: 50%">
<div class="inline-block ml-12 text-center current-elapsed-time-box " style="width: 22%">
<h6>Current</h6>
<h3>{{ currentWorkingTime }}</h3>
</div>
</div>
<div class="col-7 clock-out">
<button
class="btn bt-clock-out"
type="button"
(click)="clockOut()">
Clock Out
<div class="clock-out pr-28">
<button class="btn bt-clock-out" type="button" (click)="clockOut()">
Clock Out
</button>
</div>
</div>

<h6 class="text-left"><strong>Summary</strong></h6>
<hr class="mb-4" />
<div class ="container px-0">
<div class="container px-0">

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

</div>
</div>