Merge 88dfdfb into 85ab09a

Author: jimmyjaramillo

src/app/modules/login/login.component.spec.ts

@@ -89,12 +89,14 @@ describe('LoginComponent', () => {
     spyOn(azureAdB2CService, 'isLogin').and.returnValue(false);
     spyOn(azureAdB2CService, 'setCookies').and.returnValue();
     spyOn(azureAdB2CService, 'signIn').and.returnValue(of(() => {}));
+    spyOn(azureAdB2CService, 'getUserId').and.returnValue('userId_123');
     spyOn(featureToggleCookiesService, 'setCookies').and.returnValue(featureToggleCookiesService.setCookies());
 
     component.login();
 
     expect(azureAdB2CService.signIn).toHaveBeenCalled();
     expect(azureAdB2CService.setCookies).toHaveBeenCalled();
+    expect(azureAdB2CService.getUserId).toHaveBeenCalled();
     expect(featureToggleCookiesService.setCookies).toHaveBeenCalled();
   }));
 

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

@@ -64,7 +64,7 @@
             formControlName="uri"
             id="uri"
             type="text"
-            placeholder="Enter Jira ticket URL"
+            placeholder="Enter your ticket number"
             class="url-ticket-input form-control"
             aria-label="Small"
             aria-describedby="inputGroup-sizing-sm"

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

@@ -208,7 +208,8 @@ describe('DetailsFieldsComponent', () => {
 
   it('on cleanFieldsForm the project_id and project_name should be kept', () => {
     const entryFormValueExpected = {
-      ...formValues,
+      project_id: '',
+      project_name: '',
       activity_id: '',
       uri: '',
       start_date: formatDate(new Date(), DATE_FORMAT, 'en'),

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

@@ -235,7 +235,7 @@ export class DetailsFieldsComponent implements OnChanges, OnInit {
   }
 
   cleanFieldsForm(): void {
-    this.cleanForm(true);
+    this.cleanForm(false);
   }
 
   selectActiveActivities() {

src/app/modules/time-clock/components/entry-fields/entry-fields.component.html

@@ -13,11 +13,11 @@
   </div>
 
   <div class="form-group">
-    <label>Ticket URI:</label>
+    <label>Ticket Number:</label>
     <input
       (blur)="onSubmit()"
       type="text"
-      placeholder="Enter Jira ticket URL"
+      placeholder="Enter your ticker number"
       id="uri"
       formControlName="uri"
       class="url-ticket-input form-control"

src/app/modules/time-entries/pages/time-entries.component.html

@@ -33,7 +33,7 @@
                     <th class="col">Customer</th>
                     <th class="col">Project</th>
                     <th class="col">Activity</th>
-                    <th class="col"></th>
+                    <th class="col">Actions</th>
                 </tr>
             </thead>
             <app-loading-bar *ngIf="dataSource.isLoading"></app-loading-bar>
@@ -45,13 +45,13 @@
                     <td class="col">{{ entry.customer_name }}</td>
                     <td class="col">{{ entry.project_name }}</td>
                     <td class="col">{{ entry.activity_name }}</td>
-                    <td class="col">
+                    <td class="col actions-buttons">
                         <button class="btn btn-sm btn-primary" data-toggle="modal" data-target="#editRecordsByDate" (click)="editEntry(entry.id)">
-              <i class="fa fa-edit fa-xs"></i>
-            </button>
+                            <i class="fa fa-edit fa-xs"></i>
+                        </button>
                         <button class="btn btn-sm btn-danger ml-2" data-toggle="modal" data-target="#deleteModal" (click)="openModal(entry)">
-              <i class="fa fa-trash fa-xs"></i>
-            </button>
+                            <i class="fa fa-trash fa-xs"></i>
+                        </button>
                     </td>
                 </tr>
             </tbody>

src/app/modules/time-entries/pages/time-entries.component.scss

@@ -26,3 +26,7 @@ table.dataTable thead .sorting_asc,
 table.dataTable thead .sorting_desc {
   background-image: none;
 }
+
+.actions-buttons {
+  text-align: center;
+}