Merge branch 'master' of https://github.com/ioet/time-tracker-ui into Time_Clock-Clock-In

Author: daros10

src/app/app.module.ts

@@ -1,3 +1,4 @@
+import { CommonModule } from '@angular/common';
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -13,6 +14,9 @@ import { TimeClockComponent } from './components/options-sidebar/time-clock/time
 import { ProjectManagementComponent } from './components/options-sidebar/project-management/project-management.component';
 import { ProjectListComponent } from './components/shared/project-list/project-list.component';
 import { CreateProjectComponent } from './components/shared/create-project/create-project.component';
+import { DetailsFieldsComponent } from './components/shared/details-fields/details-fields.component';
+import { ProjectListHoverComponent } from './components/shared/project-list-hover/project-list-hover.component';
+
 
 @NgModule({
   declarations: [
@@ -24,9 +28,13 @@ import { CreateProjectComponent } from './components/shared/create-project/creat
     TimeClockComponent,
     ProjectManagementComponent,
     ProjectListComponent,
-    CreateProjectComponent
+    CreateProjectComponent,
+    TimeClockComponent,
+    DetailsFieldsComponent,
+    ProjectListHoverComponent,
   ],
   imports: [
+    CommonModule,
     BrowserModule,
     AppRoutingModule,
     FormsModule,

src/app/components/options-sidebar/time-clock/time-clock.component.css

@@ -0,0 +1,10 @@
+.content-ClockIn {
+  padding: 2.1rem 1rem;
+}
+
+.timer {
+  align-items: center;
+  display: flex;
+  height: 100%;
+  justify-content: center;
+}

src/app/components/options-sidebar/time-clock/time-clock.component.html

@@ -42,22 +42,13 @@ <h6 class="text-left"><strong>Projects</strong></h6>
             </form>
             <p class="text-left"><i class="fas fa-folder"></i><strong>  Top</strong></p>
             <ul class="list-group">
-                <li class="list-group-item d-flex justify-content-between align-items-center">
-                    Customer › ernst-and-young
-                    <button type="button" class="btn btn-success btn-sm">Clock In</button>
-                </li>
-                <li class="list-group-item d-flex justify-content-between align-items-center">
-                    Customer
-                    <i class="fas fa-chevron-right"></i>
 
-                </li>
-                <li class="list-group-item d-flex justify-content-between align-items-center">
-                    Training
-                    <i class="fas fa-chevron-right"></i>
-                </li>
+                <app-project-list-hover [projects]="projects" (showFields)="setShowFields($event)"></app-project-list-hover>
+
+
             </ul>
             <br>
-            <form *ngIf="!isClockIn">
+            <form *ngIf="!isClockIn || showFields ">
                 <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">

src/app/components/options-sidebar/time-clock/time-clock.component.spec.ts

@@ -1,10 +1,14 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { DebugElement } from '@angular/core';
 
 import { TimeClockComponent } from './time-clock.component';
+import { ProjectListHoverComponent } from '../../shared/project-list-hover/project-list-hover.component';
 
 describe('TimeClockComponent', () => {
   let component: TimeClockComponent;
   let fixture: ComponentFixture<TimeClockComponent>;
+  let de: DebugElement;
 
   function setup() {
     // tslint:disable-next-line: no-shadowed-variable
@@ -15,14 +19,14 @@ describe('TimeClockComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      declarations: [ TimeClockComponent ]
-    })
-    .compileComponents();
+      declarations: [TimeClockComponent, ProjectListHoverComponent]
+    }).compileComponents();
   }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(TimeClockComponent);
     component = fixture.componentInstance;
+    de = fixture.debugElement;
     fixture.detectChanges();
   });
 
@@ -37,6 +41,28 @@ describe('TimeClockComponent', () => {
     const compile = fixture.debugElement.nativeElement;
     const ptag = compile.querySelector('p');
     expect(ptag.textContent).toBe('Dario clocked out at hh:mm:ss');
+
   }));
 
+  it('should set showfileds as true', () => {
+    const show = true;
+    component.setShowFields(show);
+    expect(component.showFields).toBe(true);
+  });
+
+  it('should be called the setShowFields event #1', () => {
+    spyOn(component, 'setShowFields');
+    const showFields = de.query(By.directive(ProjectListHoverComponent));
+    const cmp = showFields.componentInstance;
+    cmp.showFields.emit(true);
+    expect(component.setShowFields).toHaveBeenCalledWith(true);
+  });
+
+  it('should be called the setShowFields event #2', () => {
+    spyOn(component, 'setShowFields');
+    const showFields = de.query(By.directive(ProjectListHoverComponent));
+    const li = showFields.query(By.css('li'));
+    li.nativeElement.click();
+    expect(component.setShowFields).toHaveBeenCalledWith(true);
+  });
 });

src/app/components/options-sidebar/time-clock/time-clock.component.ts

@@ -5,7 +5,15 @@ import { Component, OnInit } from '@angular/core';
   templateUrl: './time-clock.component.html',
   styleUrls: ['./time-clock.component.css']
 })
-export class TimeClockComponent {
+export class TimeClockComponent  implements OnInit {
+  projects = [
+    { id: 'P1', name: 'Project 1' },
+    { id: 'P2', name: 'Project 2' },
+    { id: 'P3', name: 'Project 3' },
+    { id: 'P4', name: 'Project 4' }
+  ];
+
+  showFields: boolean;
 
   username = 'Dario';
   clockInUsername = 'hh:mm:ss';
@@ -43,4 +51,10 @@ export class TimeClockComponent {
        this.isEnterTechnology = false;
      }
    }
+
+   setShowFields(show: boolean) {
+    this.showFields = show;
+  }
+
+  ngOnInit(): void {}
 }

src/app/components/shared/details-fields/details-fields.component.css

@@ -0,0 +1,3 @@
+.span-width {
+  width: 6rem;
+}

src/app/components/shared/details-fields/details-fields.component.html

@@ -0,0 +1,44 @@
+<form>
+  <div class="input-group input-group-sm mb-3">
+    <div class="input-group-prepend">
+      <label class="input-group-text span-width" for="inputGroupSelect01">Activity</label>
+    </div>
+    <select class="custom-select" id="inputGroupSelect01">
+      <option selected>Choose...</option>
+      <option value="1">One</option>
+      <option value="2">Two</option>
+      <option value="3">Three</option>
+    </select>
+  </div>
+  <div class="input-group input-group-sm mb-3">
+    <div class="input-group-prepend">
+      <span class="input-group-text span-width" id="inputGroup-sizing-sm"
+        >Jira Ticket</span
+      >
+    </div>
+    <input
+      type="text"
+      class="form-control"
+      aria-label="Small"
+      aria-describedby="inputGroup-sizing-sm"
+    />
+  </div>
+  <div class="input-group input-group-sm mb-3">
+    <div class="input-group-prepend">
+      <span class="input-group-text span-width" id="inputGroup-sizing-sm">Technology</span>
+    </div>
+    <input
+      type="text"
+      class="form-control"
+      aria-label="Small"
+      aria-describedby="inputGroup-sizing-sm"
+    />
+  </div>
+  <div class="form-group">
+    <label for="NotesTextarea">Notes</label>
+    <textarea class="form-control" id="NotesTextarea" rows="3"></textarea>
+  </div>
+</form>
+<button class="btn btn-danger btn-sm">
+  Clock Out
+</button>

src/app/components/shared/details-fields/details-fields.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DetailsFieldsComponent } from './details-fields.component';
+
+describe('DetailsFieldsComponent', () => {
+  let component: DetailsFieldsComponent;
+  let fixture: ComponentFixture<DetailsFieldsComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ DetailsFieldsComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DetailsFieldsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/components/shared/details-fields/details-fields.component.ts

@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-details-fields',
+  templateUrl: './details-fields.component.html',
+  styleUrls: ['./details-fields.component.css']
+})
+export class DetailsFieldsComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit(): void {
+  }
+
+}

src/app/components/shared/project-list-hover/project-list-hover.component.css

@@ -0,0 +1,15 @@
+.content-projects {
+  max-height: 10rem;
+  overflow-x: auto;
+}
+
+.content-projects > li {
+  cursor: pointer;
+  font-size: 0.8rem;
+  padding: 0.5rem 0.8rem;
+}
+
+.button-clockIn {
+  font-size: 0.7rem;
+  padding: 0 0.3rem;
+}