Skip to content

Commit a8db62d

Browse files
committed
feature: TT-430 list and edit status of activities
1 parent 950e4c7 commit a8db62d

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"preinstall": "npx npm-force-resolutions",
66
"ng": "ng",
77
"start": "ng serve",
8-
"build": "ng build",
8+
"build": "ng build --prod",
99
"test": "ng test",
1010
"test-headless": "ng test --browsers ChromeHeadless",
1111
"ci-test": "ng test --no-watch --no-progress --browsers ChromeHeadless",

src/app/modules/activities-management/components/activity-list/activity-list.component.html

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,26 @@
22
<table class="table table-sm table-bordered table-striped">
33
<thead class="thead-blue">
44
<tr class="d-flex">
5-
<th class="col-4 text-center">Activity ID</th>
5+
<th class="col-2 text-center">Activity ID</th>
66
<th class="col-4 text-center">Activity</th>
7-
<th class="col-2 text-center hidden">Options</th>
8-
<th class="col-4 text-center">Status</th>
7+
<th class="col-2 text-center">Status</th>
8+
<th class="col-2 text-center">Options</th>
9+
<th class="col-2 text-center">Status</th>
910
</tr>
1011
</thead>
1112
<app-loading-bar *ngIf="isLoading$ | async"></app-loading-bar>
1213
<tbody *ngIf="(isLoading$ | async) === false">
1314
<tr class="d-flex" *ngFor="let activity of activities">
14-
<td class="col-4 text-break">{{ activity.id }}</td>
15+
<td class="col-2 text-break">{{ activity.id }}</td>
1516
<td class="col-4">{{ activity.name }}</td>
16-
<td class="col-2 text-center hidden">
17+
<td class="col-2">{{ activity.status }}</td>
18+
<td class="col-2 text-center">
1719
<button type="button" class="btn btn-sm btn-primary" (click)="updateActivity(activity.id)">
1820
<i class="fa fa-pencil fa-xs"></i>
1921
</button>
2022
</td>
21-
<td class="col-4 text-center">
22-
<div class="flex justify-center">
23-
<em class="fa mr-2 mt-1" [ngClass]="[activity.btnIcon, activity.iconColor]"></em>
24-
<p> {{ activity.btnName }}</p>
25-
</div>
23+
<td class="col-2 text-center">
24+
<app-dropdown [info]="activity" (updateInfo)="changeOperation($event)"> </app-dropdown>
2625
</td>
2726
</tr>
2827
</tbody>

src/environments/environment.prod.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import * as keys from './keys';
22

33
export const environment = {
4-
production: true
4+
production: true,
5+
timeTrackerApiUrl: 'https://timetracker-api.azurewebsites.net',
6+
stackexchangeApiUrl: 'https://api.stackexchange.com',
57
};
68

79
export const AUTHORITY = keys.AUTHORITY;

src/environments/environment.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import * as keys from './keys';
55

66
export const environment = {
77
production: false,
8-
timeTrackerApiUrl: 'https://timetracker-api.azurewebsites.net',
8+
timeTrackerApiUrl: 'http://localhost:7071/api',
99
stackexchangeApiUrl: 'https://api.stackexchange.com',
1010
};
1111

0 commit comments

Comments
 (0)