Skip to content

Commit d8cec3d

Browse files
committed
fix: #229 fix general observations
1 parent cd98930 commit d8cec3d

File tree

14 files changed

+94
-70
lines changed

14 files changed

+94
-70
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
>Customer description is required</span
3131
>
3232
</div>
33-
<button type="submit" class="btn btn-sm btn-primary" [disabled]="!customerForm.valid">Save</button>
34-
<button (click)="resetCustomerForm()" id="cancel" type="button" class="btn btn-sm btn-secondary mb-2 ml-2 mt-2">
33+
<button type="submit" class="btn btn-primary" [disabled]="!customerForm.valid">Save</button>
34+
<button (click)="resetCustomerForm()" id="cancel" type="button" class="btn btn-secondary mb-2 ml-2 mt-2">
3535
Cancel
3636
</button>
3737
</form>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
>
1313
<td class="col-sm-9">{{ customer.name }}</td>
1414
<td class="col-sm-3 text-center">
15-
<button (click)="editCustomer(customer.id)" type="button" class="btn btn-sm btn-secondary">
15+
<button (click)="editCustomer(customer.id)" type="button" class="btn btn-sm btn-primary">
1616
<i class="fa fa-pencil fa-xs"></i>
1717
</button>
18-
<button (click)="deleteCustomer(customer.id)" type="button" class="btn btn-sm btn-danger ml-2">
19-
<i class="fas fa-trash-alt fa-xs"></i>
18+
<button (click)="deleteCustomer(customer.id)" type="button" class="btn btn-sm btn-secondary ml-2">
19+
<i class="fa fa-trash-alt fa-xs"></i>
2020
</button>
2121
</td>
2222
</tr>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
<textarea class="form-control form-control-sm mt-2" id="descriptionTextArea" rows="3" placeholder="Description"
1111
formControlName="description"></textarea>
1212
</div>
13-
<button type="submit" class="btn btn-sm btn-primary" [disabled]="!projectTypeForm.valid">
13+
<button type="submit" class="btn btn-primary" [disabled]="!projectTypeForm.valid">
1414
Save
1515
</button>
16-
<button class="btn btn-sm btn-secondary mb-2 ml-2 mt-2" type="reset" [hidden]="!projectTypeToEdit"
16+
<button class="btn btn-secondary mb-2 ml-2 mt-2" type="reset" [hidden]="!projectTypeToEdit"
1717
(click)="cancelButton()">
1818
Cancel
1919
</button>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
>
1515
<td class="col-sm-9">{{ projectType.name }}</td>
1616
<td class="col-sm-3 text-center">
17-
<button type="button" class="btn btn-sm btn-secondary" (click)="updateProjectType(projectType.id)"><i class="fa fa-pencil fa-xs"></i></button>
18-
<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>
17+
<button type="button" class="btn btn-sm btn-primary" (click)="updateProjectType(projectType.id)"><i class="fa fa-pencil fa-xs"></i></button>
18+
<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>
1919
</td>
2020
</tr>
2121
</tbody>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
<option *ngFor="let type of projectsTypes" [value]="type.id">{{ type.name }}</option>
2424
</select>
2525
</div>
26-
<button type="submit" [disabled]="!projectForm.valid" class="btn btn-sm btn-primary">Save</button>
26+
<button type="submit" [disabled]="!projectForm.valid" class="btn btn-primary">Save</button>
2727
<button
2828
type="reset"
2929
[hidden]="!projectToEdit"
3030
(click)="cancelButton()"
31-
class="btn btn-sm btn-secondary mb-2 ml-2 mt-2"
31+
class="btn btn-secondary mb-2 ml-2 mt-2"
3232
>
3333
Cancel
3434
</button>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616
>
1717
<td class="col-sm-9">{{ project.name }}</td>
1818
<td class="col-sm-3 text-center">
19-
<button type="button" class="btn btn-sm btn-secondary" (click)="updateProject(project)">
19+
<button type="button" class="btn btn-sm btn-primary" (click)="updateProject(project)">
2020
<i class="fa fa-pencil fa-xs"></i>
2121
</button>
22-
<button type="button" class="btn btn-sm btn-danger ml-2" (click)="deleteProject(project.id)">
23-
<i class="fas fa-trash-alt fa-xs"></i>
22+
<button type="button" class="btn btn-sm btn-secondary ml-2" (click)="deleteProject(project.id)">
23+
<i class="fa fa-trash-alt fa-xs"></i>
2424
</button>
2525
</td>
2626
</tr>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<img src="../../../assets/img/ioet.png" />
55
</div>
66
<div class="login-body">
7-
<h3>Please login</h3>
7+
<h3>Please log in</h3>
88
</div>
99

1010
<div class="login-controls">
1111
<button (click)="login()" class="btn btn-primary">login</button>
1212
</div>
1313

14-
</div>
14+
</div>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
<div class="modal-footer">
129129
<button type="submit" class="btn btn-primary">Save</button>
130130
<button #closeModal type="button" class="btn btn-secondary" data-dismiss="modal">
131-
Close
131+
Cancel
132132
</button>
133133
</div>
134134
</form>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ export class SidebarComponent implements OnInit {
1616

1717
getItemsSidebar() {
1818
this.itemsSidebar = [
19-
{ route: '/time-clock', icon: 'far fa-clock', text: 'Time Clock' },
20-
{ route: '/time-entries', icon: 'far fa-list-alt', text: 'Time Entries' },
19+
{ route: '/time-clock', icon: 'fas fa-clock', text: 'Time Clock' },
20+
{ route: '/time-entries', icon: 'fas fa-list-alt', text: 'Time Entries' },
2121
{ route: '/reports', icon: 'fas fa-chart-pie', text: 'Reports' },
22-
{ route: '/activities-management', icon: 'far fa-file-alt', text: 'Activities' },
23-
{ route: '/customers-management', icon: 'fas fa-users-cog', text: 'Customers' },
22+
{ route: '/activities-management', icon: 'fas fa-file-alt', text: ' Activities' },
23+
{ route: '/customers-management', icon: 'fas fa-user', text: 'Customers' },
2424
];
2525
}
2626
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
export interface TimeEntriesSummary {
2+
day: TimeDetails;
3+
week: TimeDetails;
4+
month: TimeDetails;
5+
}
6+
7+
export interface TimeDetails {
8+
hours: string;
9+
minutes: string;
10+
seconds: string;
11+
}

0 commit comments

Comments
 (0)