fix: #571 resolving comments

scastillo-jp · scastillo-jp · commit 6ef257898377 · 2020-11-20T15:49:35.000-05:00
diff --git a/src/app/modules/reports/components/time-range-form/time-range-form.component.ts b/src/app/modules/reports/components/time-range-form/time-range-form.component.ts
@@ -2,6 +2,7 @@ import { ToastrService } from 'ngx-toastr';
 import { formatDate } from '@angular/common';
 import { Component, OnInit } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
+import { DATE_FORMAT } from 'src/environments/environment';
 import * as entryActions from '../../../time-clock/store/entry.actions';
 import {Store} from '@ngrx/store';
 import {EntryState} from '../../../time-clock/store/entry.reducer';
@@ -28,8 +29,8 @@ export class TimeRangeFormComponent implements OnInit {
 
   setInitialDataOnScreen() {
     this.reportForm.setValue({
-      startDate: formatDate(moment().startOf('week').toString(), 'yyyy-MM-dd', 'en'),
-      endDate: formatDate(moment().endOf('week').toString(), 'yyyy-MM-dd', 'en')
+      startDate: formatDate(moment().startOf('week').toString(), DATE_FORMAT, 'en'),
+      endDate: formatDate(moment().endOf('week').toString(), DATE_FORMAT, 'en')
     });
     this.onSubmit();
   }
diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts b/src/app/modules/shared/components/details-fields/details-fields.component.spec.ts
@@ -18,7 +18,8 @@ import { TechnologiesComponent } from './../technologies/technologies.component'
 import { DetailsFieldsComponent } from './details-fields.component';
 import { ProjectSelectedEvent } from './project-selected-event';
 import { SaveEntryEvent } from './save-entry-event';
-
+import { DATE_FORMAT } from 'src/environments/environment';
+import { DATE_FORMAT_YEAR } from 'src/environments/environment';
 
 describe('DetailsFieldsComponent', () => {
   type Merged = TechnologyState & ProjectState & EntryState;
@@ -66,7 +67,7 @@ describe('DetailsFieldsComponent', () => {
     project_name: '',
     activity_id: '',
     uri: '',
-    entry_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'),
+    entry_date: formatDate(new Date(), DATE_FORMAT, 'en'),
     start_hour: '00:00:00',
     end_hour: '00:00:00',
     description: '',
@@ -176,7 +177,7 @@ describe('DetailsFieldsComponent', () => {
       project_name: '',
       activity_id: '',
       uri: '',
-      entry_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'),
+      entry_date: formatDate(new Date(), DATE_FORMAT, 'en'),
       start_hour: '00:00:00',
       end_hour: '00:00:00',
       description: '',
@@ -310,7 +311,7 @@ describe('DetailsFieldsComponent', () => {
   it('displays error message when the date selected is in the future', () => {
     spyOn(toastrServiceStub, 'error');
 
-    const futureDate = moment().add(1, 'days').format('YYYY-MM-DD');
+    const futureDate = moment().add(1, 'days').format(DATE_FORMAT_YEAR);
     component.entryForm.setValue({ ...formValues, entry_date: futureDate });
     component.onSubmit();
 
diff --git a/src/app/modules/shared/components/details-fields/details-fields.component.ts b/src/app/modules/shared/components/details-fields/details-fields.component.ts
@@ -17,6 +17,7 @@ import { TechnologyState } from '../../store/technology.reducers';
 import { EntryActionTypes } from './../../../time-clock/store/entry.actions';
 import { SaveEntryEvent } from './save-entry-event';
 import { ProjectSelectedEvent } from './project-selected-event';
+import { DATE_FORMAT } from 'src/environments/environment';
 
 
 type Merged = TechnologyState & ProjectState & ActivityState & EntryState;
@@ -129,7 +130,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
         project_id: this.entryToEdit.project_id,
         activity_id: this.entryToEdit.activity_id,
         description: this.entryToEdit.description,
-        entry_date: this.entryToEdit.start_date ? formatDate(this.entryToEdit.start_date, 'yyyy-MM-dd', 'en') : '',
+        entry_date: this.entryToEdit.start_date ? formatDate(this.entryToEdit.start_date, DATE_FORMAT, 'en') : '',
         start_hour: this.entryToEdit.start_date ? formatDate(this.entryToEdit.start_date, 'HH:mm:ss', 'en') : '00:00:00',
         end_hour: this.entryToEdit.end_date ? formatDate(this.entryToEdit.end_date, 'HH:mm:ss', 'en') : '00:00:00',
         uri: this.entryToEdit.uri,
@@ -147,7 +148,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
       project_id: '',
       activity_id: '',
       description: '',
-      entry_date: formatDate(new Date(), 'yyyy-MM-dd', 'en'),
+      entry_date: formatDate(new Date(), DATE_FORMAT, 'en'),
       start_hour: '00:00:00',
       end_hour: '00:00:00',
       uri: '',
diff --git a/src/app/modules/shared/models/entry.model.ts b/src/app/modules/shared/models/entry.model.ts
@@ -15,6 +15,7 @@ export interface Entry {
 
   customer_id?: string;
   customer_name?: string;
+  comments?: string;
 }
 
 export interface NewEntry {
@@ -26,3 +27,4 @@ export interface NewEntry {
   activity_id?: string;
   timezone_offset?: number;
 }
+
diff --git a/src/app/modules/shared/pipes/substract-date/substract-date.pipe.ts b/src/app/modules/shared/pipes/substract-date/substract-date.pipe.ts
@@ -1,6 +1,8 @@
 import { NumberFormatter } from './../../formatters/number.formatter';
 import { Pipe, PipeTransform } from '@angular/core';
 import * as moment from 'moment';
+import { DATE_FORMAT_YEAR } from 'src/environments/environment';
+
 @Pipe({
   name: 'substractDate'
 })
@@ -12,8 +14,8 @@ export class SubstractDatePipe implements PipeTransform {
       return '--:--';
     }
 
-    const startDate = moment(substractDate, 'YYYY-MM-DD HH:mm:ss');
-    let endDate = moment(fromDate, 'YYYY-MM-DD HH:mm:ss');
+    const startDate = moment(substractDate, `${DATE_FORMAT_YEAR} HH:mm:ss`);
+    let endDate = moment(fromDate, `${DATE_FORMAT_YEAR} HH:mm:ss`);
     let duration: moment.Duration = moment.duration(endDate.diff(startDate));
 
     if (duration.asSeconds() > 60 && !displaySeconds) {
diff --git a/src/app/modules/technology-report/components/technology-report-table/technology-report-table.component.spec.ts b/src/app/modules/technology-report/components/technology-report-table/technology-report-table.component.spec.ts
diff --git a/src/app/modules/technology-report/components/technology-report-table/technology-report-table.component.ts b/src/app/modules/technology-report/components/technology-report-table/technology-report-table.component.ts
@@ -120,12 +120,10 @@ export class TechnologyReportTableComponent implements OnInit, OnDestroy, AfterV
     this.reportDataSource$ = this.store.pipe(select(getReportDataSource));
   }
 
-
   ngOnInit(): void {
     this.reportDataSource$.subscribe((ds) => {
       this.rerenderDataTable();
     });
-    console.log('data', dataMock);
   }
 
   ngAfterViewInit(): void {
diff --git a/src/app/modules/technology-report/components/time-range-form/time-range-form.component.html b/src/app/modules/technology-report/components/time-range-form/time-range-form.component.html
diff --git a/src/app/modules/technology-report/components/time-range-form/time-range-form.component.ts b/src/app/modules/technology-report/components/time-range-form/time-range-form.component.ts
@@ -2,10 +2,10 @@ import { ToastrService } from 'ngx-toastr';
 import { formatDate } from '@angular/common';
 import { Component, OnInit } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
-import * as entryActions from '../../time-clock/store/entry.actions';
-
+import * as entryActions from '../../../time-clock/store/entry.actions';
+import { DATE_FORMAT } from 'src/environments/environment';
 import {Store} from '@ngrx/store';
-import {EntryState} from '../../time-clock/store/entry.reducer';
+import {EntryState} from '../../../time-clock/store/entry.reducer';
 import * as moment from 'moment';
 
 @Component({
@@ -29,8 +29,8 @@ export class TimeRangeFormComponent implements OnInit {
 
   setInitialDataOnScreen() {
     this.reportForm.setValue({
-      startDate: formatDate(moment().startOf('week').toString(), 'yyyy-MM-dd', 'en'),
-      endDate: formatDate(moment().endOf('week').toString(), 'yyyy-MM-dd', 'en')
+      startDate: formatDate(moment().startOf('week').toString(), DATE_FORMAT, 'en'),
+      endDate: formatDate(moment().endOf('week').toString(), DATE_FORMAT, 'en')
     });
     this.onSubmit();
   }
diff --git a/src/app/modules/technology-report/components/time-range-form/time-range.component.spec.ts b/src/app/modules/technology-report/components/time-range-form/time-range.component.spec.ts
@@ -1,11 +1,12 @@
+import { Entry } from 'src/app/modules/shared/models';
 import { ToastrService, IndividualConfig } from 'ngx-toastr';
 import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { MockStore, provideMockStore } from '@ngrx/store/testing';
 import { TimeRangeFormComponent } from './time-range-form.component';
-import { EntryState } from '../../time-clock/store/entry.reducer';
+import { EntryState } from '../../../time-clock/store/entry.reducer';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { InputDateComponent } from '../../shared/components/input-date/input-date.component';
-import * as entryActions from '../../time-clock/store/entry.actions';
+import { InputDateComponent } from '../../../shared/components/input-date/input-date.component';
+import * as entryActions from '../../../time-clock/store/entry.actions';
 import * as moment from 'moment';
 
 describe('Reports Page', () => {
@@ -17,7 +18,7 @@ describe('Reports Page', () => {
       error: (message?: string, title?: string, override?: Partial<IndividualConfig>) => { }
     };
 
-    const timeEntry = {
+    const timeEntry: Entry = {
       id: '123',
       start_date: new Date(),
       end_date: new Date(),
@@ -28,7 +29,7 @@ describe('Reports Page', () => {
       project_id: '123'
     };
 
-    const state = {
+    const state: EntryState = {
       active: timeEntry,
       entryList: [timeEntry],
       isLoading: false,
diff --git a/src/app/modules/technology-report/pages/technology-report.component.spec.ts b/src/app/modules/technology-report/pages/technology-report.component.spec.ts
diff --git a/src/app/modules/time-clock/components/entry-fields/entry-fields.component.spec.ts b/src/app/modules/time-clock/components/entry-fields/entry-fields.component.spec.ts
@@ -13,6 +13,7 @@ import { ActionsSubject } from '@ngrx/store';
 import { IndividualConfig, ToastrService } from 'ngx-toastr';
 import { formatDate } from '@angular/common';
 import * as moment from 'moment';
+import { DATE_FORMAT_YEAR } from 'src/environments/environment';
 
 describe('EntryFieldsComponent', () => {
   type Merged = TechnologyState & ProjectState;
@@ -66,7 +67,7 @@ describe('EntryFieldsComponent', () => {
     project_id: 'project-id-15',
     description: 'description for active entry',
     uri: 'abc',
-    start_date : moment().format('YYYY-MM-DD'),
+    start_date : moment().format(DATE_FORMAT_YEAR),
     start_hour : moment().format('HH:mm:ss'),
   };
 
@@ -115,7 +116,7 @@ describe('EntryFieldsComponent', () => {
         uri: entryDataForm.uri,
         activity_id: entryDataForm.activity_id,
         start_hour:  formatDate(entry.start_date, 'HH:mm:ss', 'en'),
-        start_date : moment().format('YYYY-MM-DD'),
+        start_date : moment().format(DATE_FORMAT_YEAR),
       }
     );
     expect(component.selectedTechnologies).toEqual([]);
diff --git a/src/app/modules/time-clock/components/entry-fields/entry-fields.component.ts b/src/app/modules/time-clock/components/entry-fields/entry-fields.component.ts
@@ -15,6 +15,7 @@ import * as entryActions from '../../store/entry.actions';
 import * as moment from 'moment';
 import { ToastrService } from 'ngx-toastr';
 import { formatDate } from '@angular/common';
+import { DATE_FORMAT } from 'src/environments/environment';
 
 type Merged = TechnologyState & ProjectState & ActivityState;
 
@@ -118,7 +119,7 @@ export class EntryFieldsComponent implements OnInit {
   }
 
   onUpdateStartHour() {
-    const startDate = formatDate(this.activeEntry.start_date, 'yyyy-MM-dd', 'en');
+    const startDate = formatDate(this.activeEntry.start_date, DATE_FORMAT, 'en');
     const newHourEntered = new Date(`${startDate}T${this.entryForm.value.start_hour.trim()}`).toISOString();
     const isEntryDateInTheFuture = moment(newHourEntered).isAfter(moment());
     if (isEntryDateInTheFuture) {
diff --git a/src/app/modules/time-clock/store/entry.reducer.ts b/src/app/modules/time-clock/store/entry.reducer.ts
@@ -2,16 +2,17 @@ import { Entry } from '../../shared/models';
 import { DataSource } from '../../shared/models/data-source.model';
 import { TimeDetails, TimeEntriesSummary } from '../models/time.entry.summary';
 import { EntryActions, EntryActionTypes } from './entry.actions';
-
 export interface EntryState {
   active: Entry;
+  entryList?: Entry[];
   isLoading: boolean;
   message: string;
   createError: boolean;
   updateError: boolean;
   timeEntriesSummary: TimeEntriesSummary;
-  reportDataSource: DataSource<Entry>;
-  timeEntriesDataSource: DataSource<Entry>;
+  reportDataSource?: DataSource<Entry>;
+  timeEntriesDataSource?: DataSource<Entry>;
+  entriesForReport?: Entry[];
 }
 
 const emptyTimeDetails: TimeDetails = { hours: '--:--', minutes: '--:--', seconds: '--:--' };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -16,6 +16,8 @@ export const ITEMS_PER_PAGE = 5;
 export const STACK_EXCHANGE_ID = keys.STACK_EXCHANGE_ID;
 export const STACK_EXCHANGE_ACCESS_TOKEN = keys.STACK_EXCHANGE_ACCESS_TOKEN;
 export const AZURE_APP_CONFIGURATION_CONNECTION_STRING = keys.AZURE_APP_CONFIGURATION_CONNECTION_STRING;
+export const DATE_FORMAT = 'yyyy-MM-dd';
+export const DATE_FORMAT_YEAR = 'YYYY-MM-DD';
 
 /*
  * For easier debugging in development mode, you can import the following file

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ export interface Entry {`
`15`	`15`
`16`	`16`	`customer_id?: string;`
`17`	`17`	`customer_name?: string;`
	`18`	`+ comments?: string;`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`export interface NewEntry {`
`@@ -26,3 +27,4 @@ export interface NewEntry {`
`26`	`27`	`activity_id?: string;`
`27`	`28`	`timezone_offset?: number;`
`28`	`29`	`}`
	`30`	`+`
Original file line number	Diff line number	Diff line change
`@@ -120,12 +120,10 @@ export class TechnologyReportTableComponent implements OnInit, OnDestroy, AfterV`
`120`	`120`	`this.reportDataSource$ = this.store.pipe(select(getReportDataSource));`
`121`	`121`	`}`
`122`	`122`
`123`		`-`
`124`	`123`	`ngOnInit(): void {`
`125`	`124`	`this.reportDataSource$.subscribe((ds) => {`
`126`	`125`	`this.rerenderDataTable();`
`127`	`126`	`});`
`128`		`- console.log('data', dataMock);`
`129`	`127`	`}`
`130`	`128`
`131`	`129`	`ngAfterViewInit(): void {`