Skip to content

Commit 3d36d14

Browse files
feat: TTL-910 update ui
1 parent ba7e34b commit 3d36d14

File tree

7 files changed

+10
-8
lines changed

7 files changed

+10
-8
lines changed

src/app/modules/reports/components/time-entries-table/time-entries-table.component.html

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
<div class="row scroll-table mt-5 ml-0">
1+
<div class="flex flex-row justify-center mt-14">
22
<app-search-user [users]="users" (selectedUserId)="user($event)"></app-search-user>
3-
<app-search-project [projects]="listProjects" (selectedProjectId)="project($event)"></app-search-project>
43
<app-search-activity [activities]="activities" (selectedActivityId)="activity($event)"></app-search-activity>
4+
</div>
5+
<div class="flex justify-center">
6+
<app-search-project class="" [projects]="listProjects" (selectedProjectId)="project($event)"></app-search-project>
7+
</div>
8+
<div class="row scroll-table mt-5 ml-0">
9+
510
<table
611
class="table table-striped mb-0"
712
datatable

src/app/modules/shared/components/search-activity/search-activity.component.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<div class="form-group" >
2-
<label>Activity: </label>
32

43
<ng-select [(ngModel)]="selectedActivity" [multiple]="false" placeholder="Select activity" (change)="updateActivity()" class="selectActivity">
54
<ng-option *ngFor="let activity of activities" value={{activity.id}}>{{activity.name}}</ng-option >

src/app/modules/shared/components/search-activity/search-activity.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ label {
33
}
44
.selectActivity {
55
display: inline-block;
6-
width: 350px;
6+
width: 300px;
77
padding: 0 12px 15px 12px;
88
}
99

src/app/modules/shared/components/search-project/search-project.component.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<div class="form-group" >
2-
<label>Projects: </label>
32

43
<ng-select [(ngModel)]="selectedProject" [multiple]="false" placeholder="Select project" (change)="updateProject()" class="selectProject">
54
<ng-option *ngFor="let project of projects" value={{project.id}}> <strong>{{project.customer.name}}</strong> - {{project.name}}</ng-option >

src/app/modules/shared/components/search-project/search-project.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ label {
33
}
44
.selectProject {
55
display: inline-block;
6-
width: 350px;
6+
width: 600px;
77
padding: 0 12px 15px 12px;
88
}
99

src/app/modules/shared/components/search-user/search-user.component.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<div class="form-group" >
2-
<label>Users: </label>
32

43
<ng-select [(ngModel)]="selectedUser" [multiple]="true" placeholder="Select user" (change)="updateUser()" class="selectUser">
54
<ng-option *ngFor="let user of users" value={{user.id}}>👤{{user.name}}📨{{ user.email}}</ng-option >

src/app/modules/shared/components/search-user/search-user.component.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ label {
33
}
44
.selectUser {
55
display: inline-block;
6-
width: 350px;
6+
width: 500px;
77
padding: 0 12px 15px 12px;
88
}
99

0 commit comments

Comments
 (0)