Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Next Next commit
fix: TT-41 Add column in table of projects, also agg and change some …
…variables
  • Loading branch information
kevinjlope committed May 27, 2021
commit 864bce8d1d7302002779b481c08bcb1f74dbc9a2
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,20 @@
<table class="table table-sm table-bordered table-striped">
<thead class="thead-blue">
<tr class="d-flex">
<th scope="col" class="col-4 text-center">Project ID</th>
<th scope="col" class="col-3 text-center">Project ID</th>
<th scope="col" class="col-3 text-center">Project</th>
<th scope="col" class="col-3 text-center">Project Type</th>
<th scope="col" class="col-2 text-center">Technologies</th>
<th scope="col" class="col-2 text-center">Project Type</th>
<th scope="col" class="col-1 text-center">Options</th>
<th scope="col" class="col-1 text-center">Visibility</th>
</tr>
</thead>
<tbody>
<tr class="d-flex" *ngFor="let project of projects">
<td class="col-sm-4">{{ project.id }}</td>
<td class="col-sm-3">{{ project.id }}</td>
<td class="col-sm-3">{{ project.name }}</td>
<td class="col-sm-3">{{ getProjectTypeName(project.project_type_id) }}</td>
<td class="col-sm-2">{{ project.technologies }}</td>
<td class="col-sm-2">{{ getProjectTypeName(project.project_type_id) }}</td>
<td class="col-sm-1 text-center">
<button type="button" class="btn btn-sm btn-primary" (click)="updateProject(project)">
<i class="fa fa-pencil fa-xs"></i>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@import '../../../../../../../styles/colors.scss';

.project-list {
max-height: 300px; overflow: auto; display:inline-block; width: 100%;
height: 300%; overflow: auto; display:inline-block; width: 100%;
Copy link
Collaborator

Choose a reason for hiding this comment

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

you can use auto height: auto

}
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ export class ProjectListComponent implements OnInit, OnDestroy {
const addProps = btnProps.find((prop) => prop.key === this.setActive(project.status));
return { ...project, ...addProps };
});
//console.log(this.projects[0])
Copy link
Collaborator

Choose a reason for hiding this comment

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

Delete this lines


});
}

Expand Down
2 changes: 2 additions & 0 deletions src/app/modules/shared/models/project.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export interface Project {
project_type_id?: string;
search_field?: string;
status?: any;
technologies?: string[]
}

export interface ProjectUI {
Expand All @@ -18,6 +19,7 @@ export interface ProjectUI {
project_type_id?: string;
search_field?: string;
status?: any;
technologies?: string[]
key?: string;
btnColor?: string;
btnIcon?: string;
Expand Down
1 change: 1 addition & 0 deletions src/environments/environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import * as keys from './keys';
export const environment = {
production: false,
timeTrackerApiUrl: 'https://timetracker-api.azurewebsites.net',
// timeTrackerApiUrl: 'https://127.0.0.1:5000',
Copy link
Collaborator

Choose a reason for hiding this comment

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

dele this comment

stackexchangeApiUrl: 'https://api.stackexchange.com',
};

Expand Down