From a2802a1cc4b31f2df1ecc67c598d17b12d5b1c11 Mon Sep 17 00:00:00 2001
From: PaulRC-ioet <73141380+PaulRC-ioet@users.noreply.github.com>
Date: Thu, 28 Jan 2021 12:58:35 -0500
Subject: [PATCH 1/7] fix: TT-142 Remove role field from User model (#633)

---
 .../users-list/users-list.component.spec.ts   | 34 +------------------
 src/app/modules/users/models/users.ts         |  1 -
 .../modules/users/store/user.reducer.spec.ts  | 12 +++----
 3 files changed, 7 insertions(+), 40 deletions(-)

diff --git a/src/app/modules/users/components/users-list/users-list.component.spec.ts b/src/app/modules/users/components/users-list/users-list.component.spec.ts
index b95e9e4ad..1eff7f73a 100644
--- a/src/app/modules/users/components/users-list/users-list.component.spec.ts
+++ b/src/app/modules/users/components/users-list/users-list.component.spec.ts
@@ -18,7 +18,6 @@ describe('UsersListComponent', () => {
       {
         name: 'name',
         email: 'email',
-        role: null,
         roles: ['admin', 'test'],
         id: 'id',
         tenant_id: 'tenant id',
@@ -111,7 +110,7 @@ describe('UsersListComponent', () => {
     });
   });
 
-  it('on success load users, the data of roles should be an array and role null', () => {
+  it('on success load users, the data of roles should be an array', () => {
     const actionSubject = TestBed.inject(ActionsSubject) as ActionsSubject;
     const action = {
       type: UserActionTypes.LOAD_USERS_SUCCESS,
@@ -121,41 +120,10 @@ describe('UsersListComponent', () => {
     actionSubject.next(action);
 
     component.users.map((user) => {
-      expect(user.role).toEqual(null);
       expect(user.roles).toEqual(['admin', 'test']);
     });
   });
 
-  it('on success load users, the data of roles should be null and role a string', () => {
-    const actionSubject = TestBed.inject(ActionsSubject) as ActionsSubject;
-    const mockState: UserState = {
-      data: [
-        {
-          name: 'name',
-          email: 'email',
-          role: 'admin',
-          roles: null,
-          id: 'id',
-          tenant_id: 'tenant id',
-          deleted: 'delete',
-        },
-      ],
-      isLoading: false,
-      message: '',
-    };
-    const action = {
-      type: UserActionTypes.LOAD_USERS_SUCCESS,
-      payload: mockState.data,
-    };
-
-    actionSubject.next(action);
-
-    component.users.map((user) => {
-      expect(user.role).toEqual('admin');
-      expect(user.roles).toEqual(null);
-    });
-  });
-
   it('on success load users, the datatable should be reloaded', async () => {
     const actionSubject = TestBed.inject(ActionsSubject);
     const action = {
diff --git a/src/app/modules/users/models/users.ts b/src/app/modules/users/models/users.ts
index 481fe3d5d..74c8d33df 100644
--- a/src/app/modules/users/models/users.ts
+++ b/src/app/modules/users/models/users.ts
@@ -1,7 +1,6 @@
 export interface User {
   name: string;
   email: string;
-  role?: string;
   roles?: string[];
   id: string;
   tenant_id?: string;
diff --git a/src/app/modules/users/store/user.reducer.spec.ts b/src/app/modules/users/store/user.reducer.spec.ts
index 4f89e5d4e..7c9f39c67 100644
--- a/src/app/modules/users/store/user.reducer.spec.ts
+++ b/src/app/modules/users/store/user.reducer.spec.ts
@@ -38,13 +38,13 @@ describe('userReducer', () => {
     expect(state.isLoading).toEqual(true);
   });
 
-  it('on GrantRoleUserSuccess, user role should change', () => {
+  it('on GrantRoleUserSuccess, user roles should change', () => {
     const currentState: UserState = {
-      data: [{ id: 'id', name: 'name', email: 'email', role: null }],
+      data: [{ id: 'id', name: 'name', email: 'email', roles: null }],
       isLoading: false,
       message: '',
     };
-    const userGranted: User = { id: 'id', name: 'name', email: 'email', role: 'admin' };
+    const userGranted: User = { id: 'id', name: 'name', email: 'email', roles: ['admin'] };
     const action = new actions.GrantRoleUserSuccess(userGranted);
     const state = userReducer(currentState, action);
 
@@ -70,13 +70,13 @@ describe('userReducer', () => {
     expect(state.isLoading).toEqual(true);
   });
 
-  it('on RevokeRoleUserSuccess, user role should change', () => {
+  it('on RevokeRoleUserSuccess, user roles should change', () => {
     const currentState: UserState = {
-      data: [{ id: 'id', name: 'name', email: 'email', role: 'admin' }],
+      data: [{ id: 'id', name: 'name', email: 'email', roles: ['admin'] }],
       isLoading: false,
       message: '',
     };
-    const userRevoked: User = { id: 'id', name: 'name', email: 'email', role: null };
+    const userRevoked: User = { id: 'id', name: 'name', email: 'email', roles: null };
     const action = new actions.RevokeRoleUserSuccess(userRevoked);
     const state = userReducer(currentState, action);
 

From 767487a53630a46a36319ab0079c38f2a0fe4e7a Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Thu, 28 Jan 2021 18:00:15 +0000
Subject: [PATCH 2/7] chore(release): 1.31.9 [skip ci]nn

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dbbf1089a..df51a51c1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "time-tracker",
-  "version": "1.31.8",
+  "version": "1.31.9",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 8b1e26d3e..e44d467d5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "time-tracker",
-  "version": "1.31.8",
+  "version": "1.31.9",
   "scripts": {
     "preinstall": "npx npm-force-resolutions",
     "ng": "ng",

From ccf71365ef1dc38a69cd117b723b1dfdd9593b50 Mon Sep 17 00:00:00 2001
From: Israel  Leon <israelpat42@gmail.com>
Date: Thu, 28 Jan 2021 17:33:28 -0500
Subject: [PATCH 3/7] fix: TT-138 The table users does not adapt to mobile
 screens (#632)

* fix: TT-138 The table users does not adapt to mobile screens

* fix: TT-138 delete space
---
 .../users-list/users-list.component.html      | 78 ++++++++++---------
 1 file changed, 40 insertions(+), 38 deletions(-)

diff --git a/src/app/modules/users/components/users-list/users-list.component.html b/src/app/modules/users/components/users-list/users-list.component.html
index b13c0206f..bab11ae27 100644
--- a/src/app/modules/users/components/users-list/users-list.component.html
+++ b/src/app/modules/users/components/users-list/users-list.component.html
@@ -1,38 +1,40 @@
-<table
-  *ngIf="users"
-  class="table table-sm table-bordered table-striped mb-0"
-  datatable
-  [dtTrigger]="dtTrigger"
-  [dtOptions]="dtOptions"
->
-  <thead class="thead-blue">
-    <tr class="d-flex">
-      <th class="col-4">User Email</th>
-      <th class="col-5">Names</th>
-      <th class="col-3">Roles</th>
-    </tr>
-  </thead>
-  <app-loading-bar *ngIf="isLoading$ | async"></app-loading-bar>
-  <tbody>
-    <tr class="d-flex" *ngFor="let user of users">
-      <td class="col-4">{{ user.email }}</td>
-      <td class="col-5">{{ user.name }}</td>
-      <td class="col-3 text-center">
-        <div>
-          <ui-switch
-            size="small"
-            (change)="switchRole(user.id, user.roles, 'admin', 'time-tracker-admin')"
-            [checked]="user.roles.includes('time-tracker-admin')"
-          ></ui-switch>
-          admin
-          <ui-switch
-            size="small"
-            (change)="switchRole(user.id, user.roles, 'test', 'time-tracker-tester')"
-            [checked]="user.roles.includes('time-tracker-tester')"
-          ></ui-switch>
-          test
-        </div>
-      </td>
-    </tr>
-  </tbody>
-</table>
+<div class="table-responsive">
+  <table
+    *ngIf="users"
+    class="table table-sm table-bordered table-striped mb-0"
+    datatable
+    [dtTrigger]="dtTrigger"
+    [dtOptions]="dtOptions"
+  >
+    <thead class="thead-blue">
+      <tr class="d-flex flex-wrap">
+        <th class="col-4">User Email</th>
+        <th class="col-5">Names</th>
+        <th class="col-3">Roles</th>
+      </tr>
+    </thead>
+    <app-loading-bar *ngIf="isLoading$ | async"></app-loading-bar>
+    <tbody>
+      <tr class="d-flex flex-wrap" *ngFor="let user of users">
+        <td class="col-4 text-break">{{ user.email }}</td>
+        <td class="col-5 text-break">{{ user.name }}</td>
+        <td class="col-3 text-center">
+          <div>
+            <ui-switch
+              size="small"
+              (change)="switchRole(user.id, user.roles, 'admin', 'time-tracker-admin')"
+              [checked]="user.roles.includes('time-tracker-admin')"
+            ></ui-switch>
+            admin
+            <ui-switch
+              size="small"
+              (change)="switchRole(user.id, user.roles, 'test', 'time-tracker-tester')"
+              [checked]="user.roles.includes('time-tracker-tester')"
+            ></ui-switch>
+            test
+          </div>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div>

From e72fd551f5f7269855573ac7cc3fd60f8ef85c44 Mon Sep 17 00:00:00 2001
From: semantic-release-bot <semantic-release-bot@martynus.net>
Date: Thu, 28 Jan 2021 22:34:56 +0000
Subject: [PATCH 4/7] chore(release): 1.31.10 [skip ci]nn

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index df51a51c1..06a2dbb45 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "time-tracker",
-  "version": "1.31.9",
+  "version": "1.31.10",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index e44d467d5..f7ce1959a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "time-tracker",
-  "version": "1.31.9",
+  "version": "1.31.10",
   "scripts": {
     "preinstall": "npx npm-force-resolutions",
     "ng": "ng",

From 1f556ef8d586498368e02bc5c45ab38b2d9bcb09 Mon Sep 17 00:00:00 2001
From: jr-98 <jonathan.tillaguango@unl.edu.ec>
Date: Wed, 27 Jan 2021 11:11:46 -0500
Subject: [PATCH 5/7] fix: TT-139  Reduce the left margin on coutome page

---
 .../customer-list/customer-list.component.html     | 14 +++++++-------
 .../customer-list/customer-list.component.ts       |  5 +++--
 .../pages/customer.component.html                  |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.html b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.html
index 784ddf685..f8af93e2d 100644
--- a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.html
+++ b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.html
@@ -1,23 +1,23 @@
 <table
   *ngIf="customers"
-  class="table table-sm table-bordered table-striped mb-0"
+  class="table table-responsive-sm table-bordered table-striped mb-0"
   datatable
   [dtTrigger]="dtTrigger"
   [dtOptions]="dtOptions"
 >
   <thead class="thead-blue">
     <tr class="d-flex">
-      <th class="col-4">Customer ID</th>
-      <th class="col-5">Name</th>
-      <th class="col-3 text-center">Options</th>
+      <th class="col-sm-4">Customer ID</th>
+      <th class="col-sm-5">Name</th>
+      <th class="col-sm-3 text-center">Options</th>
     </tr>
   </thead>
   <app-loading-bar *ngIf="(isLoading$ | async)"></app-loading-bar>
   <tbody *ngIf="((isLoading$ | async) === false)">
     <tr class="d-flex" *ngFor="let customer of customers">
-      <td class="col-sm-4">{{ customer.id }}</td>
-      <td class="col-sm-5">{{ customer.name }}</td>
-      <td class="col-sm-3 text-center">
+      <td class="col col-sm-4">{{ customer.id }}</td>
+      <td class="col col-sm-5">{{ customer.name }}</td>
+      <td class="col col-sm-3 text-center">
         <button
           (click)="editCustomer(customer.id)"
           type="button"
diff --git a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.ts b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.ts
index ed46b8b94..e5c9785ed 100644
--- a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.ts
+++ b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.ts
@@ -40,8 +40,9 @@ export class CustomerListComponent implements OnInit, OnDestroy, AfterViewInit {
 
   ngOnInit(): void {
     this.dtOptions = {
-      scrollY: '290px',
+      scrollY: '325px',
       paging: false,
+      responsive: true,
     };
     this.loadCustomersSubscription = this.actionsSubject$
       .pipe(filter((action: any) => action.type === CustomerManagementActionTypes.LOAD_CUSTOMERS_SUCCESS))
@@ -49,7 +50,6 @@ export class CustomerListComponent implements OnInit, OnDestroy, AfterViewInit {
         this.customers = action.payload;
         this.rerenderDataTable();
       });
-
     this.changeCustomerSubscription = this.actionsSubject$
       .pipe(
         filter(
@@ -109,4 +109,5 @@ export class CustomerListComponent implements OnInit, OnDestroy, AfterViewInit {
     this.message = `Are you sure you want to delete ${item.name}?`;
     this.showModal = true;
   }
+
 }
diff --git a/src/app/modules/customer-management/pages/customer.component.html b/src/app/modules/customer-management/pages/customer.component.html
index c56abeef8..a97e5d8aa 100644
--- a/src/app/modules/customer-management/pages/customer.component.html
+++ b/src/app/modules/customer-management/pages/customer.component.html
@@ -1,4 +1,4 @@
-<div class="container">
+<div class="container-fluid px-0 full-height">
   <div class="row">
     <div style="padding: 15px;">
       <button (click)="activateCustomerForm()" class="btn btn-primary">Add new customer</button>

From b63712aa5e6d82e20762a2f1f43911316d4eb6b0 Mon Sep 17 00:00:00 2001
From: jr-98 <jonathan.tillaguango@unl.edu.ec>
Date: Wed, 27 Jan 2021 22:28:15 -0500
Subject: [PATCH 6/7] fix: TT-139-Reduce-the-left-margin-on-the-customer-page2

---
 .../activity-list/activity-list.component.html |  2 +-
 .../customer-list/customer-list.component.html | 18 ++++++++++--------
 .../customer-list/customer-list.component.scss |  4 ++++
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/app/modules/activities-management/components/activity-list/activity-list.component.html b/src/app/modules/activities-management/components/activity-list/activity-list.component.html
index a4582ed10..903587928 100644
--- a/src/app/modules/activities-management/components/activity-list/activity-list.component.html
+++ b/src/app/modules/activities-management/components/activity-list/activity-list.component.html
@@ -4,7 +4,7 @@
       <tr class="d-flex">
         <th class="col-4">Activity ID</th>
         <th class="col-5">Activity</th>
-        <th class="col-3 text-center"></th>
+        <th class="col-3 text-center">Options</th>
       </tr>
     </thead>
     <app-loading-bar *ngIf="(isLoading$ | async)"></app-loading-bar>
diff --git a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.html b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.html
index f8af93e2d..711471409 100644
--- a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.html
+++ b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.html
@@ -1,23 +1,24 @@
-<table
+<div class="table table-responsive">
+  <table
   *ngIf="customers"
-  class="table table-responsive-sm table-bordered table-striped mb-0"
+class="table table-bordered table-striped"
   datatable
   [dtTrigger]="dtTrigger"
   [dtOptions]="dtOptions"
 >
   <thead class="thead-blue">
     <tr class="d-flex">
-      <th class="col-sm-4">Customer ID</th>
-      <th class="col-sm-5">Name</th>
-      <th class="col-sm-3 text-center">Options</th>
+      <th class="col-5 text-center">Customer ID</th>
+      <th class="col-3 text-center">Name</th>
+      <th class="col-4 text-center">Options</th>
     </tr>
   </thead>
   <app-loading-bar *ngIf="(isLoading$ | async)"></app-loading-bar>
   <tbody *ngIf="((isLoading$ | async) === false)">
     <tr class="d-flex" *ngFor="let customer of customers">
-      <td class="col col-sm-4">{{ customer.id }}</td>
-      <td class="col col-sm-5">{{ customer.name }}</td>
-      <td class="col col-sm-3 text-center">
+      <td class="col-5">{{ customer.id }}</td>
+      <td class="col-3">{{ customer.name }}</td>
+      <td class="col-4 text-center">
         <button
           (click)="editCustomer(customer.id)"
           type="button"
@@ -38,6 +39,7 @@
     </tr>
   </tbody>
 </table>
+</div>
 
 <app-dialog
   *ngIf="showModal"
diff --git a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.scss b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.scss
index e69de29bb..9d5a604f4 100644
--- a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.scss
+++ b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.scss
@@ -0,0 +1,4 @@
+.col-3 .col-4 .col-5 {
+  padding: 1rem 0rem 2rem;
+  overflow: hidden;
+}

From b0a9190d5abdeb62da61e698ecbc2828ed88e51c Mon Sep 17 00:00:00 2001
From: jr-98 <jonathan.tillaguango@unl.edu.ec>
Date: Thu, 28 Jan 2021 19:35:30 -0500
Subject: [PATCH 7/7] fix: TT-139 Resolved the cometaries on GitHub about
 identation and bootstrap

---
 .../customer-list.component.html              | 80 +++++++++----------
 .../customer-list.component.scss              |  5 +-
 2 files changed, 41 insertions(+), 44 deletions(-)

diff --git a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.html b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.html
index 711471409..09b7a0b76 100644
--- a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.html
+++ b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.html
@@ -1,44 +1,44 @@
-<div class="table table-responsive">
+<div class="table-responsive-sm">
   <table
-  *ngIf="customers"
-class="table table-bordered table-striped"
-  datatable
-  [dtTrigger]="dtTrigger"
-  [dtOptions]="dtOptions"
->
-  <thead class="thead-blue">
-    <tr class="d-flex">
-      <th class="col-5 text-center">Customer ID</th>
-      <th class="col-3 text-center">Name</th>
-      <th class="col-4 text-center">Options</th>
-    </tr>
-  </thead>
-  <app-loading-bar *ngIf="(isLoading$ | async)"></app-loading-bar>
-  <tbody *ngIf="((isLoading$ | async) === false)">
-    <tr class="d-flex" *ngFor="let customer of customers">
-      <td class="col-5">{{ customer.id }}</td>
-      <td class="col-3">{{ customer.name }}</td>
-      <td class="col-4 text-center">
-        <button
-          (click)="editCustomer(customer.id)"
-          type="button"
-          class="btn btn-sm btn-primary"
-        >
-          <i class="fa fa-pencil fa-xs"></i>
-        </button>
-        <button
-          data-toggle="modal"
-          data-target="#deleteModal"
-          (click)="openModal(customer)"
-          type="button"
-          class="btn btn-sm btn-danger ml-2"
-        >
-          <i class="fa fa-trash-alt fa-xs"></i>
-        </button>
-      </td>
-    </tr>
-  </tbody>
-</table>
+    *ngIf="customers"
+    class="table table-bordered table-striped mb-0"
+    datatable
+    [dtTrigger]="dtTrigger"
+    [dtOptions]="dtOptions"
+  >
+    <thead class="thead-blue">
+      <tr class="d-flex">
+        <th class="col-5 text-center">Customer ID</th>
+        <th class="col-3 text-center">Name</th>
+        <th class="col-4 text-center">Options</th>
+      </tr>
+    </thead>
+    <app-loading-bar *ngIf="(isLoading$ | async)"></app-loading-bar>
+    <tbody *ngIf="((isLoading$ | async) === false)">
+      <tr class="d-flex" *ngFor="let customer of customers">
+        <td class="col-5 text-break">{{ customer.id }}</td>
+        <td class="col-3 text-break">{{ customer.name }}</td>
+        <td class="col-4 text-center">
+          <button
+            (click)="editCustomer(customer.id)"
+            type="button"
+            class="btn btn-sm btn-primary"
+          >
+            <i class="fa fa-pencil fa-xs"></i>
+          </button>
+          <button
+            data-toggle="modal"
+            data-target="#deleteModal"
+            (click)="openModal(customer)"
+            type="button"
+            class="btn btn-sm btn-danger ml-2"
+          >
+            <i class="fa fa-trash-alt fa-xs"></i>
+          </button>
+        </td>
+      </tr>
+    </tbody>
+  </table>
 </div>
 
 <app-dialog
diff --git a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.scss b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.scss
index 9d5a604f4..8b1378917 100644
--- a/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.scss
+++ b/src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.scss
@@ -1,4 +1 @@
-.col-3 .col-4 .col-5 {
-  padding: 1rem 0rem 2rem;
-  overflow: hidden;
-}
+