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.

Sign up for GitHub

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

Fixed the condition in resource forecast report #1521

Merged
merged 2 commits into from
Jan 3, 2024
Merged

Fixed the condition in resource forecast report #1521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e21a548
resource forecast fixes
dinesh-aot Jan 3, 2024
cf269f7
Merge branch 'develop' of https://github.com/dinesh-aot/EPIC.track in…
dinesh-aot Jan 3, 2024
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
12 changes: 11 additions & 1 deletion epictrack-api/src/api/models/role.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,23 @@
# See the License for the specific language governing permissions and
# limitations under the License.
"""Model to handle all operations related to Role."""

import enum
from sqlalchemy import Column, Integer, String

from .code_table import CodeTableVersioned
from .db import db


class RoleEnum(enum.Enum):
"""Enum for role"""

RESPONSIBLE_EPD = 1
TEAM_LEAD = 2
OFFICER_ANALYST = 3
FN_CAIRT = 4
OTHER = 5


class Role(db.Model, CodeTableVersioned):
"""Model class for Role."""

Expand Down
87 changes: 49 additions & 38 deletions epictrack-api/src/api/reports/resource_forecast_report.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,27 @@
from reportlab.lib.units import inch
from reportlab.pdfgen.canvas import Canvas
from reportlab.platypus import Paragraph, Table, TableStyle
from sqlalchemy import and_, func, select
from sqlalchemy import and_, or_, func, select
from sqlalchemy.dialects.postgresql import DATERANGE
from sqlalchemy.orm import aliased

from api.models import (
EAAct, EAOTeam, Event, FederalInvolvement, PhaseCode, Project, Region, Staff, StaffWorkRole, SubType, Type, Work,
WorkPhase, WorkType, db)
EAAct,
EAOTeam,
Event,
FederalInvolvement,
PhaseCode,
Project,
Region,
Staff,
StaffWorkRole,
SubType,
Type,
Work,
WorkPhase,
WorkType,
db,
)
from api.models.event_configuration import EventConfiguration
from api.models.event_template import EventPositionEnum, EventTemplateVisibilityEnum

Expand Down Expand Up @@ -72,8 +86,9 @@ def __init__(self, filters):
EventConfiguration.work_phase_id,
)
.filter(
EventConfiguration.visibility == EventTemplateVisibilityEnum.MANDATORY.value,
EventConfiguration.start_at == "0",
EventConfiguration.visibility
== EventTemplateVisibilityEnum.MANDATORY.value,
EventConfiguration.event_position == EventPositionEnum.START.value,
)
.group_by(EventConfiguration.work_phase_id)
.all()
Expand Down Expand Up @@ -228,18 +243,12 @@ def _fetch_data(self, report_date: datetime): # pylint: disable=too-many-locals
responsible_epd = aliased(Staff)
work_lead = aliased(Staff)
project_phase = aliased(PhaseCode)
work_phase = aliased(WorkPhase)

project_phase_query = (
end_work_phase_query = (
db.session.query(
Event.work_id,
func.max(Event.actual_date).label("max_start_date"),
func.max(WorkPhase.id).label("end_phase_id"),
)
.filter(
Event.actual_date <= first_month,
Event.event_configuration_id.in_(self.start_event_configurations),
)
.group_by(Event.work_id)
.group_by(WorkPhase.work_id)
.subquery()
)

Expand All @@ -250,12 +259,18 @@ def _fetch_data(self, report_date: datetime): # pylint: disable=too-many-locals
EventConfiguration,
and_(
EventConfiguration.work_phase_id == WorkPhase.id,
EventConfiguration.event_position == EventPositionEnum.START.value,
EventConfiguration.event_position
== EventPositionEnum.START.value,
WorkPhase.sort_order == 1,
),
)
.join(Event, Event.event_configuration_id == EventConfiguration.id)
.where(
func.coalesce(Event.actual_date, Event.anticipated_date) <= self.end_date
and_(
func.coalesce(Event.actual_date, Event.anticipated_date)
<= self.end_date,
WorkPhase.sort_order == 1,
)
)
.order_by(WorkPhase.work_id, WorkPhase.phase_id.asc())
.distinct(WorkPhase.work_id)
Expand All @@ -271,11 +286,16 @@ def _fetch_data(self, report_date: datetime): # pylint: disable=too-many-locals
EventConfiguration,
and_(
EventConfiguration.work_phase_id == WorkPhase.id,
EventConfiguration.event_position == EventPositionEnum.END.value,
EventConfiguration.event_position
== EventPositionEnum.END.value,
),
)
.join(Event, Event.event_configuration_id == EventConfiguration.id)
.where(Event.actual_date >= report_date)
.join(
end_work_phase_query,
WorkPhase.id == end_work_phase_query.c.end_phase_id,
)
.where(or_(Event.actual_date.is_(None), Event.actual_date >= report_date))
.order_by(WorkPhase.work_id, WorkPhase.phase_id.desc())
.distinct(WorkPhase.work_id)
)
Expand Down Expand Up @@ -320,21 +340,7 @@ def _fetch_data(self, report_date: datetime): # pylint: disable=too-many-locals
.join(WorkType, Work.work_type_id == WorkType.id)
.join(EAAct, Work.ea_act_id == EAAct.id)
.outerjoin(EAOTeam, Work.eao_team_id == EAOTeam.id)
.join(FederalInvolvement)
.join(project_phase_query, project_phase_query.c.work_id == Work.id)
.join(
Event,
and_(
project_phase_query.c.work_id == Event.work_id,
Event.actual_date == project_phase_query.c.max_start_date,
# Event.event_configuration_id.in_(self.start_event_configurations),
),
)
.join(
EventConfiguration,
Event.event_configuration_id == EventConfiguration.id,
)
.join(work_phase, EventConfiguration.work_phase_id == work_phase.id)
.join(FederalInvolvement, Work.federal_involvement_id == FederalInvolvement.id)
.join(SubType, Project.sub_type_id == SubType.id)
.join(Type, Project.type_id == Type.id)
.join(env_region, env_region.id == Project.region_id_env)
Expand Down Expand Up @@ -390,7 +396,8 @@ def _fetch_data(self, report_date: datetime): # pylint: disable=too-many-locals
Event.query.filter(
Event.work_id.in_(work_ids),
Event.event_configuration_id.in_(self.start_event_configurations),
func.coalesce(Event.actual_date, Event.anticipated_date) <= self.end_date,
func.coalesce(Event.actual_date, Event.anticipated_date)
<= self.end_date,
)
.join(
EventConfiguration,
Expand Down Expand Up @@ -497,7 +504,8 @@ def _format_data(self, data): # pylint: disable=too-many-locals
EventConfiguration,
and_(
EventConfiguration.work_phase_id == WorkPhase.id,
EventConfiguration.visibility == EventTemplateVisibilityEnum.MANDATORY,
EventConfiguration.visibility
== EventTemplateVisibilityEnum.MANDATORY,
),
)
.join(Event, EventConfiguration.id == Event.event_configuration_id)
Expand All @@ -518,7 +526,8 @@ def _format_data(self, data): # pylint: disable=too-many-locals
referral_timing_obj = referral_timing_query.first()
referral_timing = (
Event.query.filter(
Event.event_configuration_id == referral_timing_obj.event_configuration_id
Event.event_configuration_id
== referral_timing_obj.event_configuration_id
)
.add_columns(
func.coalesce(Event.actual_date, Event.anticipated_date).label(
Expand Down Expand Up @@ -601,7 +610,8 @@ def generate_report(
Paragraph(
f"<b>{ea_type_label.upper()}({len(projects)})</b>", normal_style
)
] + [""] * (len(table_headers[1]) - 1)
]
+ [""] * (len(table_headers[1]) - 1)
)
normal_style.textColor = colors.black
styles.append(("SPAN", (0, row_index), (-1, row_index)))
Expand Down Expand Up @@ -653,7 +663,8 @@ def generate_report(
("ALIGN", (0, 2), (-1, -1), "LEFT"),
("FONTNAME", (0, 2), (-1, -1), "Helvetica"),
("FONTNAME", (0, 0), (-1, 1), "Helvetica-Bold"),
] + styles
]
+ styles
)
)

Expand Down
Loading