Skip to content

Time clock timer component #26

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 13 commits into from
Mar 24, 2020
Merged

Time clock timer component #26

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ba7f7d5
timer working
daros10 Mar 19, 2020
f2dbf42
added time to entry and out
daros10 Mar 19, 2020
5a6e41e
added time to entry and out in projects
daros10 Mar 19, 2020
31bf129
clean field technology
daros10 Mar 19, 2020
c21fc61
added start time ih hover project
daros10 Mar 19, 2020
7803290
fixed test
daros10 Mar 19, 2020
8b5dce7
Merge branch 'master' of https://github.com/ioet/time-tracker-ui into…
daros10 Mar 19, 2020
ed7dcd2
remove hash routes
daros10 Mar 20, 2020
014aece
fixed bugs
daros10 Mar 23, 2020
f9aa410
fixed typo
daros10 Mar 23, 2020
9b86107
Merge branch 'master' of https://github.com/ioet/time-tracker-ui into…
daros10 Mar 23, 2020
1197078
reafactor code and names
daros10 Mar 24, 2020
ce0682b
remove test method
daros10 Mar 24, 2020
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
remove test method
  • Loading branch information
@daros10
daros10 committed Mar 24, 2020
commit ce0682b13255fa2651f5678acedf755d6c0fe71e
2 changes: 1 addition & 1 deletion src/app/components/options-sidebar/time-clock/time-clock.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ <h6 class="text-left"><strong>Projects</strong></h6>
<div class="col-sm-10">
<input *ngIf="!showAlertEnterTecnology" #data type="text" (keyup)="enterTechnology(data.value)" class="form-control">
<input *ngIf="showAlertEnterTecnology" #data type="text" (keyup)="enterTechnology(data.value)" class="form-control border-danger">
<div class="">
<div>
<h6 *ngIf="showAlertEnterTecnology" class="text-danger text-left">Technology field is required. Enter this field to clock out.</h6>
</div>
</div>
Expand Down
25 changes: 1 addition & 24 deletions src/app/components/options-sidebar/time-clock/time-clock.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { async, ComponentFixture, TestBed, fakeAsync } from '@angular/core/testing';
import { async, ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { DebugElement, Component } from '@angular/core';
import { TimeClockComponent } from './time-clock.component';
Expand Down Expand Up @@ -102,27 +102,4 @@ describe('TimeClockComponent', () => {
expect(component.enterTechnology).toHaveBeenCalled();
});

// it('show init state of vars', () => {
// spyOn(component, 'employeClockIn');
// const isClockIn = true;
// const isEnterTechnology = false;
// const hourCounterRealTime = 0;
// const minuteCounterRealTime = 0;
// const secondsCounterRealTime = 0;
// const hour = 0;
// const minute = 0;
// const seconds = 0;
// expect(component.isClockIn).toBe(isClockIn);
// expect(component.isEnterTechnology).toBe(isEnterTechnology);
// expect(component.hourCounterRealTime).toBe(hourCounterRealTime);
// expect(component.minuteCounterRealTime).toBe(minuteCounterRealTime);
// expect(component.secondsCounterRealTime).toBe(secondsCounterRealTime);
// expect(component.hour).toBe(hour);
// expect(component.minute).toBe(minute);
// expect(component.seconds).toBe(hour);
// });




});