Skip to content
Next Next commit
feature: TT-430 list and edit status of activities
  • Loading branch information
mandres2015 committed Nov 30, 2021
commit a8db62db283aca8a4aa0a63140877a4231504ec8
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"preinstall": "npx npm-force-resolutions",
"ng": "ng",
"start": "ng serve",
"build": "ng build",
"build": "ng build --prod",
"test": "ng test",
"test-headless": "ng test --browsers ChromeHeadless",
"ci-test": "ng test --no-watch --no-progress --browsers ChromeHeadless",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,26 @@
<table class="table table-sm table-bordered table-striped">
<thead class="thead-blue">
<tr class="d-flex">
<th class="col-4 text-center">Activity ID</th>
<th class="col-2 text-center">Activity ID</th>
<th class="col-4 text-center">Activity</th>
<th class="col-2 text-center hidden">Options</th>
<th class="col-4 text-center">Status</th>
<th class="col-2 text-center">Status</th>
<th class="col-2 text-center">Options</th>
<th class="col-2 text-center">Status</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-4 text-break">{{ activity.id }}</td>
<td class="col-2 text-break">{{ activity.id }}</td>
<td class="col-4">{{ activity.name }}</td>
<td class="col-2 text-center hidden">
<td class="col-2">{{ activity.status }}</td>
<td class="col-2 text-center">
<button type="button" class="btn btn-sm btn-primary" (click)="updateActivity(activity.id)">
<i class="fa fa-pencil fa-xs"></i>
</button>
</td>
<td class="col-4 text-center">
<div class="flex justify-center">
<em class="fa mr-2 mt-1" [ngClass]="[activity.btnIcon, activity.iconColor]"></em>
<p> {{ activity.btnName }}</p>
</div>
<td class="col-2 text-center">
<app-dropdown [info]="activity" (updateInfo)="changeOperation($event)"> </app-dropdown>
</td>
</tr>
</tbody>
Expand Down
4 changes: 3 additions & 1 deletion src/environments/environment.prod.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import * as keys from './keys';

export const environment = {
production: true
production: true,
timeTrackerApiUrl: 'https://timetracker-api.azurewebsites.net',
stackexchangeApiUrl: 'https://api.stackexchange.com',
};

export const AUTHORITY = keys.AUTHORITY;
Expand Down
2 changes: 1 addition & 1 deletion src/environments/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import * as keys from './keys';

export const environment = {
production: false,
timeTrackerApiUrl: 'https://timetracker-api.azurewebsites.net',
timeTrackerApiUrl: 'http://localhost:7071/api',
stackexchangeApiUrl: 'https://api.stackexchange.com',
};

Expand Down