-
+
{{project.name}}
-
-
+
\ No newline at end of file
diff --git a/src/app/modules/project-management/components/project-list/project-list.component.spec.ts b/src/app/modules/project-management/components/project-list/project-list.component.spec.ts
index 71168eb8a..86685cd59 100644
--- a/src/app/modules/project-management/components/project-list/project-list.component.spec.ts
+++ b/src/app/modules/project-management/components/project-list/project-list.component.spec.ts
@@ -1,6 +1,7 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { ProjectListComponent } from './project-list.component';
+import { FilterProjectPipe } from 'src/app/modules/shared/pipes/filter-project/filter-project.pipe';
describe('ProjectListComponent', () => {
let component: ProjectListComponent;
@@ -8,9 +9,9 @@ describe('ProjectListComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [ ProjectListComponent ]
+ declarations: [ProjectListComponent, FilterProjectPipe]
})
- .compileComponents();
+ .compileComponents();
}));
beforeEach(() => {
diff --git a/src/app/modules/project-management/components/project-list/project-list.component.ts b/src/app/modules/project-management/components/project-list/project-list.component.ts
index 047b981e3..35382305a 100644
--- a/src/app/modules/project-management/components/project-list/project-list.component.ts
+++ b/src/app/modules/project-management/components/project-list/project-list.component.ts
@@ -21,6 +21,8 @@ export class ProjectListComponent implements OnInit {
projectToDelete: Project;
openDeleteModal = false;
+ filterProjects: string = '';
+
constructor() { }
ngOnInit(): void {
diff --git a/src/app/modules/project-management/pages/project-management.component.html b/src/app/modules/project-management/pages/project-management.component.html
index 5ad9c163f..540d88b70 100644
--- a/src/app/modules/project-management/pages/project-management.component.html
+++ b/src/app/modules/project-management/pages/project-management.component.html
@@ -4,14 +4,12 @@
[projectToEdit]="project"
(savedProject)="updateProject($event)"
(cancelForm)="cancelForm()"
- >
-
+ >
-
+ >
diff --git a/src/app/modules/project-management/pages/project-management.component.spec.ts b/src/app/modules/project-management/pages/project-management.component.spec.ts
index 6caae8b40..09e56a653 100644
--- a/src/app/modules/project-management/pages/project-management.component.spec.ts
+++ b/src/app/modules/project-management/pages/project-management.component.spec.ts
@@ -6,6 +6,7 @@ import { CreateProjectComponent, ProjectListComponent } from '../components';
import { Project } from '../../shared/models';
import { ProjectManagementComponent } from './project-management.component';
import { ProjectService } from '../services/project.service';
+import { FilterProjectPipe } from '../../shared/pipes/filter-project/filter-project.pipe';
describe('ProjectManagementComponent', () => {
let component: ProjectManagementComponent;
@@ -44,14 +45,14 @@ describe('ProjectManagementComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [ ProjectManagementComponent, CreateProjectComponent, ProjectListComponent ],
- providers: [ { provide: ProjectService, useValue: projectServiceStub }],
+ declarations: [ProjectManagementComponent, CreateProjectComponent, ProjectListComponent, FilterProjectPipe],
+ providers: [{ provide: ProjectService, useValue: projectServiceStub }],
imports: [
FormsModule,
ReactiveFormsModule
]
})
- .compileComponents();
+ .compileComponents();
}));
beforeEach(() => {
diff --git a/src/app/modules/project-management/pages/project-management.component.ts b/src/app/modules/project-management/pages/project-management.component.ts
index 600ddffc8..177b2e189 100644
--- a/src/app/modules/project-management/pages/project-management.component.ts
+++ b/src/app/modules/project-management/pages/project-management.component.ts
@@ -5,18 +5,16 @@ import { ProjectService } from '../services/project.service';
@Component({
selector: 'app-project-management',
templateUrl: './project-management.component.html',
- styleUrls: ['./project-management.component.scss']
+ styleUrls: ['./project-management.component.scss'],
})
export class ProjectManagementComponent implements OnInit {
-
editedProjectId;
project: Project;
projects: Project[] = [];
- constructor(private projectService: ProjectService) {
- }
+ constructor(private projectService: ProjectService) {}
ngOnInit(): void {
this.getProjects();
@@ -24,14 +22,18 @@ export class ProjectManagementComponent implements OnInit {
updateProject(projectData): void {
if (this.editedProjectId) {
- const projectIndex = this.projects.findIndex((project => project.id === this.editedProjectId));
+ const projectIndex = this.projects.findIndex((project) => project.id === this.editedProjectId);
this.projects[projectIndex].name = projectData.name;
this.projects[projectIndex].details = projectData.details;
this.projects[projectIndex].status = projectData.status;
this.projects[projectIndex].completed = projectData.completed;
} else {
- const newProject: Project = { id: (this.projects.length + 1).toString(), name: projectData.name,
- details: projectData.details, status: projectData.status, completed: false
+ const newProject: Project = {
+ id: (this.projects.length + 1).toString(),
+ name: projectData.name,
+ details: projectData.details,
+ status: projectData.status,
+ completed: false,
};
this.projects = this.projects.concat(newProject);
}
@@ -50,8 +52,8 @@ export class ProjectManagementComponent implements OnInit {
this.project = null;
}
- getProjects() {
- this.projectService.getProjects().subscribe(data => {
+ getProjects() {
+ this.projectService.getProjects().subscribe((data) => {
this.projects = data;
});
}
diff --git a/src/app/modules/shared/components/clock/clock.component.html b/src/app/modules/shared/components/clock/clock.component.html
index 1a4412038..3f11a09b4 100644
--- a/src/app/modules/shared/components/clock/clock.component.html
+++ b/src/app/modules/shared/components/clock/clock.component.html
@@ -1,8 +1,6 @@
-
{{project.name}}
-
+
@@ -34,8 +36,5 @@ Completed project:
Completed project:
- ;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [SearchProjectComponent]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(SearchProjectComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+
+ it('called method', () => {
+ component.changeFilterProject.emit('angular');
+ component.filterProject = 'angular';
+ component.changeFilterValue();
+ expect(component.filterProject).toEqual('angular');
+ });
+});
diff --git a/src/app/modules/shared/components/search-project/search-project.component.ts b/src/app/modules/shared/components/search-project/search-project.component.ts
new file mode 100644
index 000000000..921bed28b
--- /dev/null
+++ b/src/app/modules/shared/components/search-project/search-project.component.ts
@@ -0,0 +1,22 @@
+import { Component, OnInit, Output, EventEmitter } from '@angular/core';
+
+@Component({
+ selector: 'app-search-project',
+ templateUrl: './search-project.component.html',
+ styleUrls: ['./search-project.component.scss']
+})
+export class SearchProjectComponent implements OnInit {
+
+ filterProject: string;
+ @Output() changeFilterProject = new EventEmitter();
+
+ constructor() { }
+
+ ngOnInit(): void {
+ }
+
+ changeFilterValue() {
+ this.changeFilterProject.emit(this.filterProject);
+ }
+
+}
diff --git a/src/app/modules/shared/components/sidebar/sidebar.component.html b/src/app/modules/shared/components/sidebar/sidebar.component.html
index d702f91e2..d342c003d 100644
--- a/src/app/modules/shared/components/sidebar/sidebar.component.html
+++ b/src/app/modules/shared/components/sidebar/sidebar.component.html
@@ -1,18 +1,20 @@
-
-
-
-
+{{ hour | number: '2.0-2' }}:{{ minutes | number: '2.0-2' }}:{{ seconds | number: '2.0-2' }}
-
+
+
+
+
\ No newline at end of file
diff --git a/src/app/modules/shared/components/clock/clock.component.scss b/src/app/modules/shared/components/clock/clock.component.scss
index 73f372045..4d408af9b 100644
--- a/src/app/modules/shared/components/clock/clock.component.scss
+++ b/src/app/modules/shared/components/clock/clock.component.scss
@@ -1,3 +1,4 @@
.time-clock-color {
- color: white;
+ color: black
}
+
diff --git a/src/app/modules/shared/components/clock/clock.component.spec.ts b/src/app/modules/shared/components/clock/clock.component.spec.ts
index 73172557f..2b70f7d2b 100644
--- a/src/app/modules/shared/components/clock/clock.component.spec.ts
+++ b/src/app/modules/shared/components/clock/clock.component.spec.ts
@@ -8,9 +8,9 @@ describe('ClockComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [ ClockComponent ]
+ declarations: [ClockComponent]
})
- .compileComponents();
+ .compileComponents();
}));
beforeEach(() => {
@@ -44,4 +44,18 @@ describe('ClockComponent', () => {
expect(component.showClock).toHaveBeenCalled();
});
-});
+ it('should be verify the init state of vars', () => {
+ expect(component.hour).toEqual(0);
+ expect(component.minutes).toEqual(0);
+ expect(component.seconds).toEqual(0);
+ expect(component.displayTime).toBeFalsy();
+ });
+
+ it('should enter if and assign the value to vars', () => {
+ component.showClock();
+ expect(component.hour).toEqual(0);
+ expect(component.minutes).toEqual(0);
+ expect(component.seconds).toEqual(0);
+ });
+
+});
\ No newline at end of file
diff --git a/src/app/modules/shared/components/clock/clock.component.ts b/src/app/modules/shared/components/clock/clock.component.ts
index e8598ca05..f01f8ee7f 100644
--- a/src/app/modules/shared/components/clock/clock.component.ts
+++ b/src/app/modules/shared/components/clock/clock.component.ts
@@ -17,22 +17,25 @@ export class ClockComponent implements OnInit {
constructor() {
this.showClock();
this.displayTime = false;
+ this.hour = 0;
+ this.minutes = 0;
+ this.seconds = 0;
setTimeout(() => {
this.displayTime = true;
}, 3000);
- }
+ }
- showClock() {
+ showClock() {
const timenInterval = interval(1000);
- timenInterval.subscribe( (data) => {
+ timenInterval.subscribe((data) => {
this.currentDate = new Date();
this.hour = this.currentDate.getHours();
this.minutes = this.currentDate.getMinutes();
this.seconds = this.currentDate.getSeconds();
});
- }
+ }
ngOnInit(): void {
}
-}
+}
\ No newline at end of file
diff --git a/src/app/modules/shared/components/month-picker/month-picker.component.html b/src/app/modules/shared/components/month-picker/month-picker.component.html
index 32c6d361a..3bf463937 100644
--- a/src/app/modules/shared/components/month-picker/month-picker.component.html
+++ b/src/app/modules/shared/components/month-picker/month-picker.component.html
@@ -1,10 +1,5 @@
{{ hour | number: '2.0-2' }}:{{ minutes | number: '2.0-2' }}:{{ seconds | number: '2.0-2' }}
-
\ No newline at end of file
diff --git a/src/app/modules/shared/components/month-picker/month-picker.component.scss b/src/app/modules/shared/components/month-picker/month-picker.component.scss
index ab3f8099a..17fbe74b5 100644
--- a/src/app/modules/shared/components/month-picker/month-picker.component.scss
+++ b/src/app/modules/shared/components/month-picker/month-picker.component.scss
@@ -10,3 +10,7 @@
.active {
background-color: #005ce0;
}
+
+.title-card {
+ background-color: #FF3F56;
+}
\ No newline at end of file
diff --git a/src/app/modules/shared/components/navbar/navbar.component.html b/src/app/modules/shared/components/navbar/navbar.component.html
index 0f28be942..86fa710c0 100644
--- a/src/app/modules/shared/components/navbar/navbar.component.html
+++ b/src/app/modules/shared/components/navbar/navbar.component.html
@@ -1,8 +1,8 @@
-
+
\ No newline at end of file
diff --git a/src/app/modules/shared/components/search-project/search-project.component.html b/src/app/modules/shared/components/search-project/search-project.component.html
new file mode 100644
index 000000000..f473bc821
--- /dev/null
+++ b/src/app/modules/shared/components/search-project/search-project.component.html
@@ -0,0 +1,3 @@
+
+
-
+{{ month }}
+
+
\ No newline at end of file
diff --git a/src/app/modules/shared/components/search-project/search-project.component.scss b/src/app/modules/shared/components/search-project/search-project.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/modules/shared/components/search-project/search-project.component.spec.ts b/src/app/modules/shared/components/search-project/search-project.component.spec.ts
new file mode 100644
index 000000000..bf25e5eee
--- /dev/null
+++ b/src/app/modules/shared/components/search-project/search-project.component.spec.ts
@@ -0,0 +1,32 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SearchProjectComponent } from './search-project.component';
+
+describe('SearchProjectComponent', () => {
+ let component: SearchProjectComponent;
+ let fixture: ComponentFixture
-
-
- {{item.text}}
+
+
-
-
-
+ 
+
+
+
-
-
+
\ No newline at end of file
diff --git a/src/app/modules/shared/components/sidebar/sidebar.component.scss b/src/app/modules/shared/components/sidebar/sidebar.component.scss
index 3165ed4a1..2f1094782 100644
--- a/src/app/modules/shared/components/sidebar/sidebar.component.scss
+++ b/src/app/modules/shared/components/sidebar/sidebar.component.scss
@@ -4,7 +4,7 @@ body {
#sidebar-wrapper {
min-height: 100vh;
- margin-left: -15rem;
+ margin-left: -15vw;
-webkit-transition: margin .25s ease-out;
-moz-transition: margin .25s ease-out;
-o-transition: margin .25s ease-out;
@@ -40,3 +40,26 @@ body {
margin-left: -15rem;
}
}
+
+.items-navbar-style {
+ border-color: transparent;
+ background-color: transparent;
+ font-weight: bold;
+ color: white;
+}
+
+.sidebar-background {
+background-image: linear-gradient(to left top, #fc5630, #fe503a, #ff4a44, #ff444d, #ff3f56);
+}
+
+.bg-item-active {
+ background-color: #FD927D;
+ border-top-right-radius: 25px;
+ border-bottom-right-radius: 25px;
+}
+
+.items-sidebar-hover :hover {
+ background-color: #FD927D;
+ border-top-right-radius: 25px;
+ border-bottom-right-radius: 25px;
+}
\ No newline at end of file
diff --git a/src/app/modules/shared/components/user/user.component.html b/src/app/modules/shared/components/user/user.component.html
index 76fed457e..8b5af3021 100644
--- a/src/app/modules/shared/components/user/user.component.html
+++ b/src/app/modules/shared/components/user/user.component.html
@@ -1,19 +1,8 @@
+
-
-
+
+
-
+
Dario Herrera
-
-
+
\ No newline at end of file
diff --git a/src/app/modules/shared/components/user/user.component.scss b/src/app/modules/shared/components/user/user.component.scss
index 60a21fecc..8f59c8218 100644
--- a/src/app/modules/shared/components/user/user.component.scss
+++ b/src/app/modules/shared/components/user/user.component.scss
@@ -1,5 +1,10 @@
-.help-color {
- color: white;
+.user-profile {
+ color: black;
+}
+
+.user-profile-hover:hover {
+ background-color: #F8F9FA;
+ cursor: pointer;
}
.dropdown-menu {
diff --git a/src/app/modules/shared/models/entry.model.ts b/src/app/modules/shared/models/entry.model.ts
index 62904c0b3..a52f04c15 100644
--- a/src/app/modules/shared/models/entry.model.ts
+++ b/src/app/modules/shared/models/entry.model.ts
@@ -1,11 +1,10 @@
export interface Entry {
- id: string,
- project: string,
- startDate: string,
- endDate: string,
- activity: string,
- technology: string,
- comments?: string,
- ticket?: string
+ id: string;
+ project: string;
+ startDate: string;
+ endDate: string;
+ activity: string;
+ technology: string;
+ comments?: string;
+ ticket?: string;
}
-
diff --git a/src/app/modules/shared/pipes/filter-project/filter-project.pipe.spec.ts b/src/app/modules/shared/pipes/filter-project/filter-project.pipe.spec.ts
new file mode 100644
index 000000000..0a1941587
--- /dev/null
+++ b/src/app/modules/shared/pipes/filter-project/filter-project.pipe.spec.ts
@@ -0,0 +1,12 @@
+import { FilterProjectPipe } from './filter-project.pipe';
+
+describe('FilterProjectPipe', () => {
+ it('create an instance', () => {
+ const pipe = new FilterProjectPipe();
+ expect(pipe).toBeTruthy();
+ });
+
+ it('test method of pipe', () => {
+ expect(new FilterProjectPipe().transform([], '')).toEqual([]);
+ });
+});
diff --git a/src/app/modules/shared/pipes/filter-project/filter-project.pipe.ts b/src/app/modules/shared/pipes/filter-project/filter-project.pipe.ts
new file mode 100644
index 000000000..0551d9803
--- /dev/null
+++ b/src/app/modules/shared/pipes/filter-project/filter-project.pipe.ts
@@ -0,0 +1,20 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { Project } from 'src/app/modules/shared/models/project.model';
+
+@Pipe({
+ name: 'filterProject'
+})
+export class FilterProjectPipe implements PipeTransform {
+
+ transform(value: Project[] = [], arg: string): string[] {
+ const restultProjects = [];
+ // tslint:disable-next-line: prefer-for-of
+ for (let i = 0; i < value.length; i++) {
+ if (value[i].name.toLowerCase().indexOf(arg.toLowerCase()) > -1) {
+ restultProjects.push(value[i]);
+ }
+ }
+ return restultProjects;
+ }
+
+}
diff --git a/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.html b/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.html
index 212bf4d2d..39b5ddfbc 100644
--- a/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.html
+++ b/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.html
@@ -1,17 +1,12 @@
--
-
- - {{ item.name }} - Clock In - -
+
\ No newline at end of file
diff --git a/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.scss b/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.scss
index a715a449b..83cc0e0c3 100644
--- a/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.scss
+++ b/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.scss
@@ -13,3 +13,8 @@
font-size: 0.7rem;
padding: 0 0.3rem;
}
+
+.active {
+ background-image: linear-gradient(to left top, #fc5630, #fe503a, #ff4a44, #ff444d, #ff3f56);
+ border-radius: 15px;
+}
diff --git a/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.spec.ts b/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.spec.ts
index 9b097131e..5e37bdaf6 100644
--- a/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.spec.ts
+++ b/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.spec.ts
@@ -1,6 +1,9 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed, inject } from '@angular/core/testing';
import { ProjectListHoverComponent } from './project-list-hover.component';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { ProjectService } from 'src/app/modules/project-management/services/project.service';
+import { FilterProjectPipe } from 'src/app/modules/shared/pipes/filter-project/filter-project.pipe';
describe('ProjectListHoverComponent', () => {
let component: ProjectListHoverComponent;
@@ -8,7 +11,9 @@ describe('ProjectListHoverComponent', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [ProjectListHoverComponent]
+ imports: [HttpClientTestingModule],
+ declarations: [ProjectListHoverComponent, FilterProjectPipe],
+ providers: [ProjectService]
}).compileComponents();
}));
@@ -18,6 +23,16 @@ describe('ProjectListHoverComponent', () => {
fixture.detectChanges();
});
+ it('service should be created', () => {
+ const service: ProjectService = TestBed.get(ProjectService);
+ expect(service).toBeTruthy();
+ });
+
+ it('should have getProjects function', () => {
+ const service: ProjectService = TestBed.get(ProjectService);
+ expect(service.getProjects).toBeTruthy();
+ });
+
it('should create', () => {
expect(component).toBeTruthy();
});
diff --git a/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.ts b/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.ts
index df6c79908..aa243e124 100644
--- a/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.ts
+++ b/src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.ts
@@ -1,4 +1,6 @@
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { Project } from 'src/app/modules/shared/models/project.model';
+import { ProjectService } from 'src/app/modules/project-management/services/project.service';
@Component({
selector: 'app-project-list-hover',
@@ -11,12 +13,16 @@ export class ProjectListHoverComponent implements OnInit {
selectedId: string;
showButton: number;
+ filterProjects: string = '';
+ listProjects: Project[] = [];
- constructor() {
+ constructor(private projectService: ProjectService) {
this.showButton = -1;
}
- ngOnInit(): void {}
+ ngOnInit(): void {
+ this.projectService.getProjects().subscribe(data => this.listProjects = data);
+ }
clockIn(id: string) {
this.selectedId = id;
diff --git a/src/app/modules/time-clock/pages/time-clock.component.html b/src/app/modules/time-clock/pages/time-clock.component.html
index b7dfb02f9..c94c0d41a 100644
--- a/src/app/modules/time-clock/pages/time-clock.component.html
+++ b/src/app/modules/time-clock/pages/time-clock.component.html
@@ -1,89 +1,70 @@
--
+
- + {{ item.name }} + {{ item.status }} + Clock In + +
+
+
-
-
- Field technology is requiered. Enter this field for clock out.
-
-
-
-
+
+
+
-
-
+
Time clock
-
-
-
-
-
{{ username }} clocked in at {{ hour | number: '2.0-2' }}:{{ minute | number: '2.0-2' }}:{{ seconds | number: '2.0-2' }}
-{{ username }} clocked out at {{ hour | number: '2.0-2' }}:{{ minute | number: '2.0-2' }}:{{ seconds | number: '2.0-2' }}
-Totals
+{{ username }} clocked in at + {{ hour | number: '2.0-2' }}:{{ minute | number: '2.0-2' }}:{{ seconds | number: '2.0-2' }}
+{{ username }} clocked out at + {{ hour | number: '2.0-2' }}:{{ minute | number: '2.0-2' }}:{{ seconds | number: '2.0-2' }}
Current
-{{ hour | number: '2.0-2' }}:{{ minute | number: '2.0-2' }}:{{ seconds | number: '2.0-2' }}
++ {{ hourCounterRealTime | number: '2.0-2' }}:{{ minuteCounterRealTime | number: '2.0-2' }}:{{ secondsCounterRealTime | number: '2.0-2' }} +
Day
-4:22
+00:00
Week
-14:00
+00:00
Projects
- -Top
--
+
+
-