Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,16 @@
<table class="table table-sm table-bordered table-striped">
<thead class="thead-blue">
<tr class="d-flex">
<th class="col-9">Activity</th>
<th class="col-4">Activity ID</th>
<th class="col-5">Activity</th>
<th class="col-3 text-center"></th>
</tr>
</thead>
<app-loading-bar *ngIf="(isLoading$ | async)"></app-loading-bar>
<tbody *ngIf="(isLoading$ | async) === false">
<tr class="d-flex" *ngFor="let activity of activities">
<td class="col-sm-9">{{ activity.name }}</td>
<td class="col-sm-4">{{ activity.id }}</td>
<td class="col-sm-5">{{ activity.name }}</td>
<td class="col-sm-3 text-center">
<button
type="button"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<div class="container">
<form style="width: 600px;" [formGroup]="customerForm" (ngSubmit)="onSubmit(customerForm.value)">
<div class="form-group">
<div class="form-group">
Copy link
Contributor

@enriquezrene enriquezrene Nov 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not going to solve the problem, what we need to do instead is to show the uuid in the table. Please add this column in the customer list, project list, project type and activities list as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it, Working on that!

<input
class="form-control form-control-sm"
id="customerName"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@
>
<thead class="thead-blue">
<tr class="d-flex">
<th class="col-9">Name</th>
<th class="col-4">Customer ID</th>
<th class="col-5">Name</th>
<th class="col-3 text-center">Options</th>
</tr>
</thead>
<app-loading-bar *ngIf="(isLoading$ | async)"></app-loading-bar>
<tbody *ngIf="((isLoading$ | async) === false)">
<tr class="d-flex" *ngFor="let customer of customers">
<td class="col-sm-9">{{ customer.name }}</td>
<td class="col-sm-4">{{ customer.id }}</td>
<td class="col-sm-5">{{ customer.name }}</td>
<td class="col-sm-3 text-center">
<button
(click)="editCustomer(customer.id)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@
<table class="table table-sm table-bordered table-striped">
<thead class="thead-blue">
<tr class="d-flex">
<th class="col-9">Project type</th>
<th class="col-4">Project Type ID</th>
<th class="col-5">Project type</th>
<th class="col-3 text-center"></th>
</tr>
</thead>
<tbody>
<tr class="d-flex" *ngFor="let projectType of projectTypes">
<td class="col-sm-9">{{ projectType.name }}</td>
<td class="col-sm-4">{{ projectType.id }}</td>
<td class="col-sm-5">{{ projectType.name }}</td>
<td class="col-sm-3 text-center">
<button type="button" class="btn btn-sm btn-primary" (click)="updateProjectType(projectType.id)">
<i class="fa fa-pencil fa-xs"></i>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@
<table class="table table-sm table-bordered table-striped">
<thead class="thead-blue">
<tr class="d-flex">
<th class="col-9">Project</th>
<th class="col-4">Project ID</th>
<th class="col-5">Project</th>
<th class="col-3 text-center"></th>
</tr>
</thead>
<tbody>
<tr class="d-flex" *ngFor="let project of projects">
<td class="col-sm-9">{{ project.name }}</td>
<td class="col-sm-4">{{ project.id }}</td>
<td class="col-sm-5">{{ project.name }}</td>
<td class="col-sm-3 text-center">
<button type="button" class="btn btn-sm btn-primary" (click)="updateProject(project)">
<i class="fa fa-pencil fa-xs"></i>
Expand Down