Skip to content

fix: TT-60 Change the position of the component displaying the latest… #885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 20, 2022
Merged

fix: TT-60 Change the position of the component displaying the latest… #885

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12d55d3
fix: TT-60 Change the position of the component displaying the latest…
wilc0519 Jun 14, 2022
63ad385
Blank space removed
wilc0519 Jun 15, 2022
98d20ca
blank spaces elimited
wilc0519 Jun 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 36 additions & 38 deletions src/app/modules/time-clock/components/project-list-hover/project-list-hover.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@

<form [formGroup]="projectsForm">
<div class="form-group">
<label>Project:</label>
<div class="form-control autocomplete">
<ng-select
formControlName="project_id"
bindLabel="search_field"
placeholder="Enter the project name"
notFoundText="No projects found"
[items]="listProjectsShowed"
(search)="onSearch($event)"
(change)="onSelect($event)"
(close)="loadActiveTimeEntry()">

<ng-template ng-option-tmp let-item="item">
<div class="table-responsive">
<table class="table table-sm table-striped table-bordered mb-0" aria-hidden="true">
<thead class="thead-blue">
<tr class="d-flex">
<th class="col md-col">Quick selections</th>
</tr>
</thead>
<tbody>
<tr class="d-flex" *ngFor="let item of listRecentProjects" >
<td class="col md-col">
<div class="flex flex-wrap flex-row justify-between">
<div class="p-2 text-xs">
<span>{{item.customer.name}}</span> -
Expand All @@ -23,6 +18,7 @@
<button
*ngIf="showClockIn"
class="btn btn-sm btn-primary btn-select"
(click)="clockIn(item.id, item.customer.name, item.name)"
>
Clock In
</button>
Expand All @@ -38,22 +34,27 @@
</button>
</div>
</div>
</ng-template>
</ng-select>
</div>
</div>
</form>

<div class="table-responsive">
<table class="table table-sm table-striped table-bordered mb-0" aria-hidden="true">
<thead class="thead-blue">
<tr class="d-flex">
<th class="col md-col">Latest projects you worked on</th>
</td>
</tr>
</thead>
<tbody>
<tr class="d-flex" *ngFor="let item of listRecentProjects" >
<td class="col md-col">
</tbody>
</table>
<br>
</div>

<form [formGroup]="projectsForm">
<div class="form-group">
<label>Project:</label>
<div class="form-control autocomplete">
<ng-select
formControlName="project_id"
bindLabel="search_field"
placeholder="Enter the project name"
notFoundText="No projects found"
[items]="listProjectsShowed"
(search)="onSearch($event)"
(change)="onSelect($event)"
(close)="loadActiveTimeEntry()">
<ng-template ng-option-tmp let-item="item">
<div class="flex flex-wrap flex-row justify-between">
<div class="p-2 text-xs">
<span>{{item.customer.name}}</span> -
Expand All @@ -63,7 +64,6 @@
<button
*ngIf="showClockIn"
class="btn btn-sm btn-primary btn-select"
(click)="clockIn(item.id, item.customer.name, item.name)"
>
Clock In
</button>
Expand All @@ -79,10 +79,8 @@
</button>
</div>
</div>
</td>
</tr>
</tbody>

</table>
<br>
</div>
</ng-template>
</ng-select>
</div>
</div>
</form>