Skip to content

fix: #249 display activities as table #301

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
enriquezrene merged 1 commit into from
May 26, 2020
Merged

fix: #249 display activities as table #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 20 additions & 30 deletions src/app/modules/activities-management/components/activity-list/activity-list.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,21 @@
<div class="card-body pt-0 mt-4">
<div class="scroll">
<div class="accordion" id="accordionActivities">
<div *ngIf="activities?.length > 0; else notShow">
<div class="card" *ngFor="let activity of activities; let rowIndex = index">
<div class="card-header style-list-project">
<h2 class="mb-0">
<a type="button" data-toggle="collapse" [attr.data-target]="'#row' + rowIndex">
{{ activity.name }}
</a>
<div class="btn-group float-right" role="group">
<i class="far fa-edit btn btn-link text-white" (click)="updateActivity(activity.id)"></i>
<i (click)="deleteActivity(activity.id)" class="far fa-trash-alt btn btn-link text-white"></i>
</div>
</h2>
</div>

<div [id]="'row' + rowIndex" class="collapse" data-parent="#accordionActivities">
<div class="card-body">
<h5>Description:</h5>
<p>{{ activity.description }}</p>
</div>
</div>
</div>
</div>
<ng-template #notShow>
<app-empty-state></app-empty-state>
</ng-template>
</div>
</div>
<div class="activity-list">
<table class="table table-sm table-bordered table-striped">
<thead class="thead-orange">
<tr class="d-flex">
<th class="col-9">Activity</th>
<th class="col-3 text-center"></th>
</tr>
</thead>
<tbody>
<tr class="d-flex" *ngFor="let activity of activities">
<td class="col-sm-9">{{ activity.name }}</td>
<td class="col-sm-3 text-center">
<button type="button" class="btn btn-sm btn-primary" (click)="updateActivity(activity.id)"><i
class="fa fa-pencil fa-xs"></i></button>
<button type="button" class="btn btn-sm btn-danger ml-2" (click)="deleteActivity(activity.id)"><i
class="fas fa-trash-alt fa-xs"></i></button>
</td>
</tr>
</tbody>
</table>
</div>
10 changes: 2 additions & 8 deletions src/app/modules/activities-management/components/activity-list/activity-list.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
@import '../../../../../styles/colors.scss';

.style-list-project {
background-color: $primary;
color: white;
}

.scroll {
max-height: 400px;
overflow-y: auto;
.activity-list {
max-height: 400px; overflow: auto; display:inline-block; width: 60%;
}
46 changes: 21 additions & 25 deletions ...p/modules/activities-management/components/create-activity/create-activity.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,31 @@
<div class="card mt-4">
<form class="card-body" [formGroup]="activityForm" (ngSubmit)="onSubmit(activityForm.value)">
<h1 class="card-title">Activity</h1>
<div class="form-group">
<label for="name">Name:</label>
<input
class="form-control"
id="name"
type="text"
formControlName="name"
[class.is-invalid]="name.invalid && name.touched"
required
/>
<h4>Activities</h4>
<hr/>
<div style="width: 60%;">

<form [formGroup]="activityForm" (ngSubmit)="onSubmit(activityForm.value)">
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text span-width">Name</span>
</div>
<input class="form-control" id="name" type="text" formControlName="name"
[class.is-invalid]="name.invalid && name.touched" required />
<div class="text-danger" *ngIf="(name.dirty || name.touched) && name.invalid && name.errors.required">
Activity name is required.
</div>
</div>

<div class="form-group">
<label for="details">Description:</label>
<textarea class="form-control" rows="3" id="description" type="text" formControlName="description"></textarea>
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text span-width">Description</span>
</div>
<textarea class="form-control" rows="2" id="description" type="text" formControlName="description"></textarea>
</div>

<div class="btn-toolbar" role="toolbar">
<div class="btn-group mr-2" role="group">
<button class="btn btn-primary mb-2" type="submit" [disabled]="!activityForm.valid">Save</button>
</div>
<div class="btn-group mr-2" role="group">
<button class="btn btn-secondary mb-2" type="reset" [hidden]="!activityToEdit" (click)="cancelButton()">
Cancel
</button>
</div>
<div class="form-group" style="text-align: right;">
<button class="btn btn-primary" type="submit" [disabled]="!activityForm.valid">Save</button>
<button class="btn btn-secondary mb-2 ml-2 mt-2" type="reset" [hidden]="!activityToEdit" (click)="cancelButton()">
Cancel
</button>
</div>
</form>
</div>
10 changes: 10 additions & 0 deletions ...p/modules/activities-management/components/create-activity/create-activity.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,11 @@
@import '../../../../../styles/colors.scss';

.span-width {
width: 6rem;
background-color: $primary;
color: white;
}

.hidden {
display: none;
}
10 changes: 2 additions & 8 deletions src/app/modules/activities-management/pages/activities-management.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
<div class="container">
<div class="row">
<div class="col">
<app-create-activity></app-create-activity>
</div>
<div class="col">
<app-activity-list></app-activity-list>
</div>
</div>
<app-create-activity></app-create-activity>
<app-activity-list></app-activity-list>
</div>
10 changes: 7 additions & 3 deletions src/app/modules/time-clock/components/entry-fields/entry-fields.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,18 @@
[selectedTechnologies]="selectedTechnologies">
</app-technologies>

<div class="form-group text-left">
<label for="NotesTextarea">Description</label>

<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text span-width">Description</span>
</div>
<textarea
(blur)="onSubmit()"
formControlName="description"
class="form-control"
id="NotesTextarea"
rows="3">
rows="2">
</textarea>
</div>

</form>