Skip to content

Commit 12d55d3

Browse files
committed
fix: TT-60 Change the position of the component displaying the latest projects
1 parent c647855 commit 12d55d3

File tree

1 file changed

+39
-37
lines changed

1 file changed

+39
-37
lines changed

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

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
11

2-
<form [formGroup]="projectsForm">
3-
<div class="form-group">
4-
<label>Project:</label>
5-
<div class="form-control autocomplete">
6-
<ng-select
7-
formControlName="project_id"
8-
bindLabel="search_field"
9-
placeholder="Enter the project name"
10-
notFoundText="No projects found"
11-
[items]="listProjectsShowed"
12-
(search)="onSearch($event)"
13-
(change)="onSelect($event)"
14-
(close)="loadActiveTimeEntry()">
15-
16-
<ng-template ng-option-tmp let-item="item">
2+
<div class="table-responsive">
3+
<table class="table table-sm table-striped table-bordered mb-0" aria-hidden="true">
4+
<thead class="thead-blue">
5+
<tr class="d-flex">
6+
<th class="col md-col">Quick selections</th>
7+
</tr>
8+
</thead>
9+
<tbody>
10+
<tr class="d-flex" *ngFor="let item of listRecentProjects" >
11+
<td class="col md-col">
1712
<div class="flex flex-wrap flex-row justify-between">
1813
<div class="p-2 text-xs">
1914
<span>{{item.customer.name}}</span> -
@@ -23,6 +18,7 @@
2318
<button
2419
*ngIf="showClockIn"
2520
class="btn btn-sm btn-primary btn-select"
21+
(click)="clockIn(item.id, item.customer.name, item.name)"
2622
>
2723
Clock In
2824
</button>
@@ -38,22 +34,29 @@
3834
</button>
3935
</div>
4036
</div>
41-
</ng-template>
42-
</ng-select>
43-
</div>
44-
</div>
45-
</form>
46-
47-
<div class="table-responsive">
48-
<table class="table table-sm table-striped table-bordered mb-0" aria-hidden="true">
49-
<thead class="thead-blue">
50-
<tr class="d-flex">
51-
<th class="col md-col">Latest projects you worked on</th>
37+
</td>
5238
</tr>
53-
</thead>
54-
<tbody>
55-
<tr class="d-flex" *ngFor="let item of listRecentProjects" >
56-
<td class="col md-col">
39+
</tbody>
40+
41+
</table>
42+
<br>
43+
</div>
44+
45+
<form [formGroup]="projectsForm">
46+
<div class="form-group">
47+
<label>Project:</label>
48+
<div class="form-control autocomplete">
49+
<ng-select
50+
formControlName="project_id"
51+
bindLabel="search_field"
52+
placeholder="Enter the project name"
53+
notFoundText="No projects found"
54+
[items]="listProjectsShowed"
55+
(search)="onSearch($event)"
56+
(change)="onSelect($event)"
57+
(close)="loadActiveTimeEntry()">
58+
59+
<ng-template ng-option-tmp let-item="item">
5760
<div class="flex flex-wrap flex-row justify-between">
5861
<div class="p-2 text-xs">
5962
<span>{{item.customer.name}}</span> -
@@ -63,7 +66,6 @@
6366
<button
6467
*ngIf="showClockIn"
6568
class="btn btn-sm btn-primary btn-select"
66-
(click)="clockIn(item.id, item.customer.name, item.name)"
6769
>
6870
Clock In
6971
</button>
@@ -79,10 +81,10 @@
7981
</button>
8082
</div>
8183
</div>
82-
</td>
83-
</tr>
84-
</tbody>
84+
</ng-template>
85+
</ng-select>
86+
</div>
87+
</div>
88+
</form>
89+
8590

86-
</table>
87-
<br>
88-
</div>

0 commit comments

Comments
 (0)