Skip to content

Clock component #17

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 20 commits into from
Mar 18, 2020
Merged

Clock component #17

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
1ca70b8
time clock in UI
daros10 Mar 12, 2020
c656f2c
added code coverage dependecies
daros10 Mar 16, 2020
aeb6fba
clockIn/out
daros10 Mar 16, 2020
490a689
update folders
daros10 Mar 16, 2020
7ca2d85
resize button
daros10 Mar 16, 2020
31e89a6
get changes
daros10 Mar 17, 2020
e0ed4b8
change tags name
daros10 Mar 17, 2020
26554fb
added validations in form
daros10 Mar 17, 2020
7a87d47
added interpolation in vars
daros10 Mar 17, 2020
b402f40
added validation clock out
daros10 Mar 17, 2020
c34f9fa
added unit test
daros10 Mar 17, 2020
65b5195
added timer
daros10 Mar 17, 2020
ec2d162
added test for clock
daros10 Mar 17, 2020
4fe4adb
Merge branch 'master' into Clock-Component
daros10 Mar 17, 2020
8556927
use back-ticks
daros10 Mar 17, 2020
03e8fa1
Merge branch 'master' of https://github.com/ioet/time-tracker-ui into…
daros10 Mar 18, 2020
f0c823d
added clockIn in hover
daros10 Mar 18, 2020
d097ab1
change value in hover
daros10 Mar 18, 2020
2e0bc6b
remove spaces
daros10 Mar 18, 2020
861434a
Merge branch 'Time_Clock-Clock-In' of https://github.com/ioet/time-tr…
daros10 Mar 18, 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
Next Next commit
added code coverage dependecies
  • Loading branch information
@daros10
daros10 committed Mar 16, 2020
commit c656f2c7553585a5852ab86e01453fd3431dc48d
240 changes: 119 additions & 121 deletions angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,128 +1,126 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"time-tracker": {
"projectType": "application",
"schematics": {},
"root": "",
"sourceRoot": "src",
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/time-tracker",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"aot": true,
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.css"
],
"scripts": []
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"time-tracker": {
"projectType": "application",
"schematics": {},
"root": "",
"sourceRoot": "src",
"prefix": "app",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/time-tracker",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"aot": true,
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.css"
],
"scripts": []
},
"configurations": {
"production": {
"fileReplacements": [{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb",
"maximumError": "10kb"
}
]
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "time-tracker:build"
},
"configurations": {
"production": {
"browserTarget": "time-tracker:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "time-tracker:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"codeCoverage": true,
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.css"
],
"scripts": []
}
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb",
"maximumError": "10kb"
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"tsconfig.app.json",
"tsconfig.spec.json",
"e2e/tsconfig.json"
],
"exclude": [
"**/node_modules/**"
]
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "time-tracker:serve"
},
"configurations": {
"production": {
"devServerTarget": "time-tracker:serve:production"
}
}
}
]
}
}
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "time-tracker:build"
},
"configurations": {
"production": {
"browserTarget": "time-tracker:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "time-tracker:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.css"
],
"scripts": []
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"tsconfig.app.json",
"tsconfig.spec.json",
"e2e/tsconfig.json"
],
"exclude": [
"**/node_modules/**"
]
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "time-tracker:serve"
},
"configurations": {
"production": {
"devServerTarget": "time-tracker:serve:production"
}
}
}
}
},
"defaultProject": "time-tracker",
"cli": {
"analytics": false
}
},
"defaultProject": "time-tracker",
"cli": {
"analytics": false
}
}
27 changes: 25 additions & 2 deletions src/app/components/optionsSidebar/time-clock/time-clock.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ <h3>-</h3>
<div class="col-4">
<h6>Day</h6>
<h3>4:22</h3>

</div>
<div class="col-4">
<h6>Week</h6>
Expand Down Expand Up @@ -55,6 +54,30 @@ <h6 class="text-left"><strong>Projects</strong></h6>
</ul>
<br>


<form>
<div class="form-group row">
<label for="inputActivity" class="col-sm-2 col-form-label text-center"><strong>Activity</strong></label>
<div class="col-sm-10">
<input type="text" class="form-control">
</div>
</div>
<div class="form-group row">
<label for="inputJiraTicket" class="col-sm-2 col-form-label text-center"><strong>Jira Ticket</strong></label>
<div class="col-sm-10">
<input type="text" class="form-control">
</div>
</div>
<div class="form-group row">
<label for="inputTechnology" class="col-sm-2 col-form-label text-center"><strong>Technology</strong></label>
<div class="col-sm-10">
<input type="text" class="form-control">
</div>
</div>
</form>

<hr>

<div class="container">
<div class="row">
<div class="col text-left">
Expand All @@ -63,7 +86,7 @@ <h6 class="text-left"><strong>Projects</strong></h6>
</button>
</div>
<div class="col text-right">
<button class="btn btn-success btn-lg" type="button">Clock In</button>
<button class="btn btn-success btn-lg" type="button" (click)="employeClockIn()">Clock In</button>
</div>

</div>
Expand Down
12 changes: 11 additions & 1 deletion src/app/components/optionsSidebar/time-clock/time-clock.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,17 @@ import { Component, OnInit } from '@angular/core';
})
export class TimeClockComponent implements OnInit {

constructor() { }
isClockIn: boolean;

constructor() {
this.isClockIn = false;
}

employeClockIn(): boolean {
this.isClockIn = true;
console.log('valor es' + this.isClockIn);
return this.isClockIn;
}

ngOnInit(): void {
}
Expand Down