Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
feat: TTL-910 update ui
  • Loading branch information
Santiago220991 committed Aug 1, 2023
commit 3d36d14393d73b1c66fb79e49e2370c8e8dc4353
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
<div class="row scroll-table mt-5 ml-0">
<div class="flex flex-row justify-center mt-14">
<app-search-user [users]="users" (selectedUserId)="user($event)"></app-search-user>
<app-search-project [projects]="listProjects" (selectedProjectId)="project($event)"></app-search-project>
<app-search-activity [activities]="activities" (selectedActivityId)="activity($event)"></app-search-activity>
</div>
<div class="flex justify-center">
<app-search-project class="" [projects]="listProjects" (selectedProjectId)="project($event)"></app-search-project>
</div>
<div class="row scroll-table mt-5 ml-0">

<table
class="table table-striped mb-0"
datatable
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<div class="form-group" >
<label>Activity: </label>

<ng-select [(ngModel)]="selectedActivity" [multiple]="false" placeholder="Select activity" (change)="updateActivity()" class="selectActivity">
<ng-option *ngFor="let activity of activities" value={{activity.id}}>{{activity.name}}</ng-option >
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ label {
}
.selectActivity {
display: inline-block;
width: 350px;
width: 300px;
padding: 0 12px 15px 12px;
}

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<div class="form-group" >
<label>Projects: </label>

<ng-select [(ngModel)]="selectedProject" [multiple]="false" placeholder="Select project" (change)="updateProject()" class="selectProject">
<ng-option *ngFor="let project of projects" value={{project.id}}> <strong>{{project.customer.name}}</strong> - {{project.name}}</ng-option >
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ label {
}
.selectProject {
display: inline-block;
width: 350px;
width: 600px;
padding: 0 12px 15px 12px;
}

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<div class="form-group" >
<label>Users: </label>

<ng-select [(ngModel)]="selectedUser" [multiple]="true" placeholder="Select user" (change)="updateUser()" class="selectUser">
<ng-option *ngFor="let user of users" value={{user.id}}>👤{{user.name}}📨{{ user.email}}</ng-option >
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ label {
}
.selectUser {
display: inline-block;
width: 350px;
width: 500px;
padding: 0 12px 15px 12px;
}