Skip to content

Commit 864bce8

Browse files
committed
fix: TT-41 Add column in table of projects, also agg and change some variables
1 parent 94ce9d5 commit 864bce8

File tree

5 files changed

+12
-5
lines changed

5 files changed

+12
-5
lines changed

src/app/modules/customer-management/components/projects/components/project-list/project-list.component.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,20 @@
22
<table class="table table-sm table-bordered table-striped">
33
<thead class="thead-blue">
44
<tr class="d-flex">
5-
<th scope="col" class="col-4 text-center">Project ID</th>
5+
<th scope="col" class="col-3 text-center">Project ID</th>
66
<th scope="col" class="col-3 text-center">Project</th>
7-
<th scope="col" class="col-3 text-center">Project Type</th>
7+
<th scope="col" class="col-2 text-center">Technologies</th>
8+
<th scope="col" class="col-2 text-center">Project Type</th>
89
<th scope="col" class="col-1 text-center">Options</th>
910
<th scope="col" class="col-1 text-center">Visibility</th>
1011
</tr>
1112
</thead>
1213
<tbody>
1314
<tr class="d-flex" *ngFor="let project of projects">
14-
<td class="col-sm-4">{{ project.id }}</td>
15+
<td class="col-sm-3">{{ project.id }}</td>
1516
<td class="col-sm-3">{{ project.name }}</td>
16-
<td class="col-sm-3">{{ getProjectTypeName(project.project_type_id) }}</td>
17+
<td class="col-sm-2">{{ project.technologies }}</td>
18+
<td class="col-sm-2">{{ getProjectTypeName(project.project_type_id) }}</td>
1719
<td class="col-sm-1 text-center">
1820
<button type="button" class="btn btn-sm btn-primary" (click)="updateProject(project)">
1921
<i class="fa fa-pencil fa-xs"></i>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@import '../../../../../../../styles/colors.scss';
22

33
.project-list {
4-
max-height: 300px; overflow: auto; display:inline-block; width: 100%;
4+
height: 300%; overflow: auto; display:inline-block; width: 100%;
55
}

src/app/modules/customer-management/components/projects/components/project-list/project-list.component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ export class ProjectListComponent implements OnInit, OnDestroy {
5858
const addProps = btnProps.find((prop) => prop.key === this.setActive(project.status));
5959
return { ...project, ...addProps };
6060
});
61+
//console.log(this.projects[0])
62+
6163
});
6264
}
6365

src/app/modules/shared/models/project.model.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ export interface Project {
77
project_type_id?: string;
88
search_field?: string;
99
status?: any;
10+
technologies?: string[]
1011
}
1112

1213
export interface ProjectUI {
@@ -18,6 +19,7 @@ export interface ProjectUI {
1819
project_type_id?: string;
1920
search_field?: string;
2021
status?: any;
22+
technologies?: string[]
2123
key?: string;
2224
btnColor?: string;
2325
btnIcon?: string;

src/environments/environment.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import * as keys from './keys';
66
export const environment = {
77
production: false,
88
timeTrackerApiUrl: 'https://timetracker-api.azurewebsites.net',
9+
// timeTrackerApiUrl: 'https://127.0.0.1:5000',
910
stackexchangeApiUrl: 'https://api.stackexchange.com',
1011
};
1112

0 commit comments

Comments
 (0)