Merge pull request #230 from ioet/229-general-observations

fix: #229 fix general observations

Author: enriquezrene

src/app/modules/customer-management/components/customer-info/components/create-customer/create-customer.html

@@ -30,8 +30,8 @@
         >Customer description is required</span
       >
     </div>
-      <button type="submit" class="btn btn-sm btn-primary" [disabled]="!customerForm.valid">Save</button>
-      <button (click)="resetCustomerForm()" id="cancel" type="button" class="btn btn-sm btn-secondary mb-2 ml-2 mt-2">
+      <button type="submit" class="btn btn-primary" [disabled]="!customerForm.valid">Save</button>
+      <button (click)="resetCustomerForm()" id="cancel" type="button" class="btn btn-secondary mb-2 ml-2 mt-2">
         Cancel
       </button>
   </form>

src/app/modules/customer-management/components/customer-info/components/customer-list/customer-list.component.html

@@ -12,11 +12,11 @@
     >
       <td class="col-sm-9">{{ customer.name }}</td>
       <td class="col-sm-3 text-center">
-        <button (click)="editCustomer(customer.id)" type="button" class="btn btn-sm btn-secondary">
+        <button (click)="editCustomer(customer.id)" type="button" class="btn btn-sm btn-primary">
           <i class="fa fa-pencil fa-xs"></i>
         </button>
-        <button (click)="deleteCustomer(customer.id)" type="button" class="btn btn-sm btn-danger ml-2">
-          <i class="fas fa-trash-alt fa-xs"></i>
+        <button (click)="deleteCustomer(customer.id)" type="button" class="btn btn-sm btn-secondary ml-2">
+          <i class="fa fa-trash-alt fa-xs"></i>
         </button>
       </td>
     </tr>

src/app/modules/customer-management/components/projects-type/components/create-project-type/create-project-type.component.html

@@ -10,10 +10,10 @@
     <textarea class="form-control form-control-sm mt-2" id="descriptionTextArea" rows="3" placeholder="Description"
       formControlName="description"></textarea>
   </div>
-  <button type="submit" class="btn btn-sm btn-primary" [disabled]="!projectTypeForm.valid">
+  <button type="submit" class="btn btn-primary" [disabled]="!projectTypeForm.valid">
     Save
   </button>
-  <button class="btn btn-sm btn-secondary mb-2 ml-2 mt-2" type="reset" [hidden]="!projectTypeToEdit"
+  <button class="btn btn-secondary mb-2 ml-2 mt-2" type="reset" [hidden]="!projectTypeToEdit"
     (click)="cancelButton()">
     Cancel
   </button>

src/app/modules/customer-management/components/projects-type/components/project-type-list/project-type-list.component.html

@@ -14,8 +14,8 @@
     >
       <td class="col-sm-9">{{ projectType.name }}</td>
       <td class="col-sm-3 text-center">
-        <button type="button" class="btn btn-sm btn-secondary"  (click)="updateProjectType(projectType.id)"><i class="fa fa-pencil fa-xs"></i></button>
-        <button type="button" class="btn btn-sm btn-danger ml-2" (click)="deleteProjectType(projectType.id)"><i class="fas fa-trash-alt fa-xs"></i></button>
+        <button type="button" class="btn btn-sm btn-primary"  (click)="updateProjectType(projectType.id)"><i class="fa fa-pencil fa-xs"></i></button>
+        <button type="button" class="btn btn-sm btn-secondary ml-2" (click)="deleteProjectType(projectType.id)"><i class="fas fa-trash-alt fa-xs"></i></button>
       </td>
     </tr>
   </tbody>

src/app/modules/customer-management/components/projects/components/create-project/create-project.component.html

@@ -23,12 +23,12 @@
       <option *ngFor="let type of projectsTypes" [value]="type.id">{{ type.name }}</option>
     </select>
   </div>
-  <button type="submit" [disabled]="!projectForm.valid" class="btn btn-sm btn-primary">Save</button>
+  <button type="submit" [disabled]="!projectForm.valid" class="btn btn-primary">Save</button>
   <button
     type="reset"
     [hidden]="!projectToEdit"
     (click)="cancelButton()"
-    class="btn btn-sm btn-secondary mb-2 ml-2 mt-2"
+    class="btn btn-secondary mb-2 ml-2 mt-2"
   >
     Cancel
   </button>

src/app/modules/customer-management/components/projects/components/project-list/project-list.component.html

@@ -16,11 +16,11 @@
     >
       <td class="col-sm-9">{{ project.name }}</td>
       <td class="col-sm-3 text-center">
-        <button type="button" class="btn btn-sm btn-secondary" (click)="updateProject(project)">
+        <button type="button" class="btn btn-sm btn-primary" (click)="updateProject(project)">
           <i class="fa fa-pencil fa-xs"></i>
         </button>
-        <button type="button" class="btn btn-sm btn-danger ml-2" (click)="deleteProject(project.id)">
-          <i class="fas fa-trash-alt fa-xs"></i>
+        <button type="button" class="btn btn-sm btn-secondary ml-2" (click)="deleteProject(project.id)">
+          <i class="fa fa-trash-alt fa-xs"></i>
         </button>
       </td>
     </tr>

src/app/modules/login/login.component.html

@@ -4,11 +4,11 @@
     <img src="../../../assets/img/ioet.png" />
   </div>
   <div class="login-body">
-    <h3>Please login</h3>
+    <h3>Please log in</h3>
   </div>
 
   <div class="login-controls">
     <button (click)="login()" class="btn btn-primary">login</button>
   </div>
 
-</div>
+</div>

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

@@ -128,7 +128,7 @@
     <div class="modal-footer">
       <button type="submit" class="btn btn-primary">Save</button>
       <button #closeModal type="button" class="btn btn-secondary" data-dismiss="modal">
-        Close
+        Cancel
       </button>
     </div>
   </form>

src/app/modules/shared/components/sidebar/sidebar.component.ts

@@ -16,11 +16,11 @@ export class SidebarComponent implements OnInit {
 
   getItemsSidebar() {
     this.itemsSidebar = [
-      { route: '/time-clock', icon: 'far fa-clock', text: 'Time Clock' },
-      { route: '/time-entries', icon: 'far fa-list-alt', text: 'Time Entries' },
+      { route: '/time-clock', icon: 'fas fa-clock', text: 'Time Clock' },
+      { route: '/time-entries', icon: 'fas fa-list-alt', text: 'Time Entries' },
       { route: '/reports', icon: 'fas fa-chart-pie', text: 'Reports' },
-      { route: '/activities-management', icon: 'far fa-file-alt', text: 'Activities' },
-      { route: '/customers-management', icon: 'fas fa-users-cog', text: 'Customers' },
+      { route: '/activities-management', icon: 'fas fa-file-alt', text: ' Activities' },
+      { route: '/customers-management', icon: 'fas fa-user', text: 'Customers' },
     ];
   }
 }

src/app/modules/time-clock/models/time.entry.summary.ts

@@ -0,0 +1,11 @@
+export interface TimeEntriesSummary {
+  day: TimeDetails;
+  week: TimeDetails;
+  month: TimeDetails;
+}
+
+export interface TimeDetails {
+  hours: string;
+  minutes: string;
+  seconds: string;
+}