Skip to content
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.

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

My workplans #1444

Merged
merged 3 commits into from
Dec 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
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
1 change: 1 addition & 0 deletions epictrack-api/src/api/services/work.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ def _serialize_work(work, work_staffs, works_statuses, work_phase):
"eao_team",
"title",
"is_active",
"project.name"
)
).dump(work)
if work_phase and len(work_phase) > 0:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const CardHeader = ({ workplan }: CardProps) => {
whiteSpace: "nowrap",
}}
>
{workplan.title}
{workplan?.project?.name}
</ETCaption1>
</Grid>
<Grid item container xs={2} justifyContent="flex-end">
Expand Down
4 changes: 4 additions & 0 deletions epictrack-web/src/models/workplan.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ export interface WorkPlan {
work_type: WorkType;
work_state: string;

project: {
name: string;
};

phase_info: {
days_left: number;
milestone_progress: number;
Expand Down
Loading