Merge pull request #286 from ioet/189-display-customer-name

fix: #189 project and customer name displayed

Author: enriquezrene

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

@@ -150,9 +150,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
   /* istanbul ignore next */
   closeEntryModal() {
     this.close();
-    if (this.closeModal.nativeElement) {
-      this.closeModal.nativeElement.click();
-    }
+    this.closeModal?.nativeElement?.click();
   }
 
   close() {

src/app/modules/shared/models/project.model.ts

@@ -1,6 +1,7 @@
 export interface Project {
   id?: string;
   customer_id?: string;
+  customer_name?: string;
   name: string;
   description?: string;
   project_type_id?: string;

src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.html

@@ -4,7 +4,7 @@
     <span class="input-group-text span-width" id="inputGroup-sizing-sm">Project</span>
   </div>
     <select (change)="clockIn()" formControlName="project_id" class="form-control">
-      <option *ngFor="let project of listProjects" value="{{project.id}}">{{ project.name }}</option>
+      <option *ngFor="let project of listProjects" value="{{project.id}}">{{project.customer_name}} - {{project.name}}</option>
     </select>
   </div>
 </form>

src/app/modules/time-clock/store/entry.effects.ts

@@ -21,7 +21,7 @@ export class EntryEffects {
           return new actions.LoadEntriesSummarySuccess(response);
         }),
         catchError((error) => {
-          this.toastrService.success(error);
+          this.toastrService.warning(`Your summary information could not be loaded`);
           return of(new actions.LoadEntriesSummaryFail());
         })
       )
@@ -50,7 +50,7 @@ export class EntryEffects {
       this.entryService.loadEntries().pipe(
         map((entries) => new actions.LoadEntriesSuccess(entries)),
         catchError((error) => {
-          this.toastrService.success(error);
+          this.toastrService.warning(`The data could not be loaded`);
           return of(new actions.LoadEntriesFail(error));
         })
       )