Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
style: TT-582 improve the summary section with a new row with informa…
…tion of actual clock in register and clock out button
  • Loading branch information
codigodehoy committed Mar 14, 2022
commit 3924ee47fddf3306880e5fe919078afdfa4dafef
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
.current{
border-color: #FF5E0A;
border-width: 2px;
background-color: #FF5E0A;
color: white;
}

.clock-out{
text-align: center;
}

.bt-clock-out{
background: #00baee;
color: #fff;
padding: 7px 20px;
}
.bt-clock-out:hover{
background: #10a5ce;
box-shadow: 0px 1px 5px 2px rgba(0,0,0,0.56);
-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;
}


Original file line number Diff line number Diff line change
@@ -1,22 +1,43 @@
<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;">
You clocked in at
<strong>{{ activeTimeEntry?.start_date | date:'shortTime' }}</strong>
</p>
</div>
<div class="col-2 col-sm-3">
<div class="current d-flex flex-column justify-content-center align-items-center" style="width: 50%">
<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
</button>
</div>
</div>

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

<div class="row pb-4">
<div class="col-12 col-sm-3">
<h6>Current</h6>
<h3>{{ currentWorkingTime }}</h3>
</div>
<div class="col-12 col-sm-3">
<div class="col-12 col-sm-4">
<h6>Day</h6>
<h3>{{ timeEntriesSummary?.day | timeDetails }}</h3>
</div>
<div class="col-12 col-sm-3">
<div class="col-12 col-sm-4">
<h6>Week</h6>
<h3>{{ timeEntriesSummary?.week | timeDetails }}</h3>
</div>
<div class="col-12 col-sm-3">
<div class="col-12 col-sm-4">
<h6>Month</h6>
<h3>{{ timeEntriesSummary?.month | timeDetails }}</h3>
</div>
</div>

</div>
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@ import { Entry } from './../../../shared/models/entry.model';
import { TimeEntriesSummary } from '../../models/time.entry.summary';
import { LoadEntriesSummary, LoadActiveEntry, EntryActionTypes } from './../../store/entry.actions';
import { EntryState } from './../../store/entry.reducer';
import { Store, ActionsSubject } from '@ngrx/store';
import { Component, OnInit, OnDestroy } from '@angular/core';
import { Store, ActionsSubject, select } from '@ngrx/store';
import { Component, OnInit, OnDestroy, Output, EventEmitter, Input } from '@angular/core';
import * as moment from 'moment';
import { getActiveTimeEntry } from '../../store/entry.selectors';

@Component({
selector: 'app-time-entries-summary',
Expand All @@ -16,6 +17,10 @@ import * as moment from 'moment';
})
export class TimeEntriesSummaryComponent implements OnInit, OnDestroy {

@Input() activeTimeEntry: Entry;
@Input() areFieldsVisible = false;
@Output() clockoutEvent = new EventEmitter<void>();

timeEntriesSummary: TimeEntriesSummary;
currentWorkingTime: string;
destroyed$ = new Subject<boolean>();
Expand Down Expand Up @@ -103,4 +108,9 @@ export class TimeEntriesSummaryComponent implements OnInit, OnDestroy {
});
}
}

clockOut(): void {
this.clockoutEvent.emit();
}

}
9 changes: 1 addition & 8 deletions src/app/modules/time-clock/pages/time-clock.component.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
<app-time-entries-summary></app-time-entries-summary>
<app-time-entries-summary (clockoutEvent)="clockOut()" [activeTimeEntry]="activeTimeEntry" [areFieldsVisible]="areFieldsVisible"></app-time-entries-summary>

<div class="col-12 col-md-9 px-0">

<div class="row pb-4">
<div class="col-12">
<p *ngIf="areFieldsVisible" class="card-title text-left">
You clocked in at
<strong>{{ activeTimeEntry?.start_date | date:'shortTime' }}</strong>
</p>
<p *ngIf="!areFieldsVisible" class="card-title text-left">
Hi <strong>{{ username }}</strong>, please select a project to clock-in.
</p>
Expand All @@ -19,7 +15,4 @@
<app-entry-fields></app-entry-fields>
</div>

<div class="form-group">
<button *ngIf="areFieldsVisible" class="btn btn-primary btn-block" type="button" (click)="clockOut()">Clock Out</button>
</div>
</div>