Skip to content

WFPREV-866, 868, 873 performance update #1096

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

Merged
sukhpalp merged 19 commits into from
Feb 4, 2026
Merged

WFPREV-866, 868, 873 performance update #1096

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
3513240
Component and draft markup
JLeenk Jan 9, 2026
98540a6
Added GET request in service, component and svg files
JLeenk Jan 15, 2026
bf1fa9c
added style for Date section
JLeenk Jan 16, 2026
4cf33ac
View for modal window
JLeenk Jan 21, 2026
9e96f84
Update implementation to meet Technical Acceptance Criteria
JLeenk Jan 23, 2026
2d368a9
typo and naming fixes
JLeenk Jan 27, 2026
6a668ff
remove the mock-backend and added usage the snackbarService
JLeenk Jan 27, 2026
9782386
Create a new docker profile for development (#703)
sukhpalp Jun 2, 2025
65835a5
initial implementation for WFPREV-866
JLeenk Feb 2, 2026
358b09c
Default value of progress status must be "On Track"
JLeenk Feb 2, 2026
ad85187
If statement refactoring
JLeenk Feb 3, 2026
9b68ed1
Cleaned debugger
JLeenk Feb 3, 2026
947c9cc
typo fix
JLeenk Feb 3, 2026
5af7603
added defaultZero for every amount
JLeenk Feb 3, 2026
81bd56a
Added annotation
JLeenk Feb 3, 2026
da2371d
added Transactional annotation
JLeenk Feb 3, 2026
32bd62a
Replaced forecastAdjustmentAmount to forecastAmount
JLeenk Feb 3, 2026
c72f9c6
Extract validator into separate file and add tests
JLeenk Feb 3, 2026
75fb395
Merge branch 'main' into WFPREV-866-Performance-Update-CRUD
sukhpalp Feb 4, 2026
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
5 changes: 4 additions & 1 deletion ...in/angular/src/app/components/edit-project/project-fiscals/project-fiscals.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,10 @@
</div>
</mat-expansion-panel>
<div class="activities-map-container">
<wfprev-activities class="activities-panel" [isReadonly]="isCurrentFiscalReadonly()" [fiscalGuid]="currentFiscalGuid" (boundariesUpdated)="onBoundariesChanged()"></wfprev-activities>
<div>
<wfprev-activities class="activities-panel" [isReadonly]="isCurrentFiscalReadonly()" [fiscalGuid]="currentFiscalGuid" (boundariesUpdated)="onBoundariesChanged()"></wfprev-activities>
<wfprev-performance-updates [fiscalGuid]="fiscal.projectPlanFiscalGuid"></wfprev-performance-updates>
</div>
<div class="fiscal-and-endorsement">
<wfprev-fiscal-map class="fiscal-map-panel" *ngIf="selectedTabIndex === i" [fiscalGuid]="selectedTabIndex" [selectedFiscalYear]="projectFiscals[selectedTabIndex]?.fiscalYear" #fiscalMapRef></wfprev-fiscal-map>
<wfprev-endorsement-approval [fiscal]="projectFiscals[i]" [currentUser]="currentUser" [currentIdir]="currentIdir" (saveEndorsement)="onSaveEndorsement($event)" [isSaving]="isSavingFiscal[i]"></wfprev-endorsement-approval>
Expand Down
6 changes: 4 additions & 2 deletions ...main/angular/src/app/components/edit-project/project-fiscals/project-fiscals.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import { TokenService } from 'src/app/services/token.service';
import { TimestampComponent } from 'src/app/components/shared/timestamp/timestamp.component';
import { TextareaComponent } from 'src/app/components/shared/textarea/textarea.component';
import { capitalizeFirstLetter } from 'src/app/utils';
import { PerformanceUpdatesComponent } from "../wfprev-performance-update/wfprev-performance-updates.component";

@Component({
selector: 'wfprev-project-fiscals',
Expand Down Expand Up @@ -58,8 +59,9 @@ import { capitalizeFirstLetter } from 'src/app/utils';
StatusBadgeComponent,
EndorsementApprovalComponent,
TimestampComponent,
TextareaComponent
]
TextareaComponent,
PerformanceUpdatesComponent
]
})
export class ProjectFiscalsComponent implements OnInit, CanComponentDeactivate {
@Input() focusedFiscalId: string | null = null;
Expand Down
253 changes: 253 additions & 0 deletions ...mponents/edit-project/wfprev-performance-update/wfprev-performance-updates.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,253 @@
<div class="performance-update-container">
<mat-expansion-panel [expanded]='true' class="expansion-panel" #performanceUpdatesPanels>
<mat-expansion-panel-header>
<div class="header-container">
<wfprev-expansion-indicator
[isExpanded]="performanceUpdatesPanels.expanded"></wfprev-expansion-indicator>
<span class="project-title">Performance Updates</span>
<wfprev-icon-button [text]="'New Update'" [icon]="'/assets/add-button.svg'" [alt]="'add-update'"
[iconSize]="19" (clicked)="openDialog()">
</wfprev-icon-button>
</div>
</mat-expansion-panel-header>
@if(updates.length > 0) {
@for (update of updates; track update.submittedTimestamp; let i = $index) {
<mat-expansion-panel [expanded]='i === 0' class="expansion-panel" #updatePanel>
<mat-expansion-panel-header class="performance-update-header">
<wfprev-expansion-indicator [isExpanded]="updatePanel.expanded"></wfprev-expansion-indicator>
<div class="performance-update-title">
<div>
<p class="project-title"><b>Date: {{update.submittedTimestamp | date:'yyyy-MM-dd'}}</b></p>
</div>
</div>
<div class="content-status-indicators">
@if (update.reportingPeriod === other.value) {
<span>
<span>Reporting Period: {{other.description}}</span>
</span>
}
@if (update.reportingPeriod === march7.value) {
<span>
<span>Reporting Period: {{march7.description}}</span>
</span>
}
@if (update.reportingPeriod === q1.value) {
<span>
<span>Reporting Period: {{q1.description}}</span>
</span>
}
@if (update.reportingPeriod === q2.value) {
<span>
<span>Reporting Period: {{q2.description}}</span>
</span>
}
@if (update.reportingPeriod === q3.value) {
<span>
<span>Reporting Period: {{q3.description}}</span>
</span>
}
@if (update.progressStatusCode === delayedProgressStatus.value) {
<span>
<img alt="status" class="status-icon" src="/assets/progress-status-delayed.svg">
{{delayedProgressStatus.description}}
</span>
}
@if (update.progressStatusCode === onTrackProgressStatus.value) {
<span>
<img alt="status" class="status-icon" src="/assets/progress-status-ontrack.svg">
{{onTrackProgressStatus.description}}
</span>
}
@if (update.progressStatusCode === defferedProgressStatus.value) {
<span>
<img alt="status" class="status-icon" src="/assets/progress-status-deferred.svg">
{{defferedProgressStatus.description}}
</span>
}
@if (update.progressStatusCode === cancelledProgressStatus.value) {
<span>
<img alt="status" class="status-icon" src="/assets/progress-status-cancelled.svg">
{{cancelledProgressStatus.description}}
</span>
}
@if(update.forecastAdjustmentAmount < 0){
<span>
<img alt="status" class="status-icon" src="/assets/budget-change-decreased.svg">
Forecast Decreased
</span>
}
@if(update.forecastAdjustmentAmount > 0){
<span>
<img alt="status" class="status-icon" src="/assets/budget-change-increased.svg">
Forecast Increased
</span>
}
</div>
@if(update.updateGeneralStatus === cancelledUpdateGeneralStatus.value) {
<div class="status-indicators">
<span class="status-tag">
<img alt="status" class="status-icon" src="/assets/cancelled-icon.svg">
{{cancelledUpdateGeneralStatus.description}}
</span>
</div>
}
@if(update.updateGeneralStatus === completeUpdateGeneralStatus.value) {
<div class="status-indicators">
<span class="status-tag">
<img alt="status" class="status-icon" src="/assets/complete-icon.svg">
{{completeUpdateGeneralStatus.description}}
</span>
</div>
}
@if(update.updateGeneralStatus === draftUpdateGeneralStatus.value) {
<div class="status-indicators">
<span class="status-tag">
<img alt="status" class="status-icon" src="/assets/draft-icon.svg">
{{draftUpdateGeneralStatus.description}}
</span>
</div>
}
@if(update.updateGeneralStatus === inProgressUpdateGeneralStatus.value) {
<div class="status-indicators">
<span class="status-tag">
<img alt="status" class="status-icon" src="/assets/in-progress-icon-only.svg">
{{inProgressUpdateGeneralStatus.description}}
</span>
</div>
}
@if(update.updateGeneralStatus === preparedUpdateGeneralStatus.value) {
<div class="status-indicators">
<span class="status-tag">
<img alt="status" class="status-icon" src="/assets/prepared-icon.svg">
{{preparedUpdateGeneralStatus.description}}
</span>
</div>
}
@if(update.updateGeneralStatus === proposedUpdateGeneralStatus.value) {
<div class="status-indicators">
<span class="status-tag">
<img alt="status" class="status-icon" src="/assets/proposed-icon.svg">
{{proposedUpdateGeneralStatus.description}}
</span>
</div>
}
</mat-expansion-panel-header>
<div class="form-grid">
<div class="general-updates-container">
<div class="updates-header">
<div class="updates-header-title">
<p>General Updates (Successes, Challenges, Progress)</p>
</div>
<div class="submitted-by">
<p>Submited by: {{update.submittedBy}}</p>
</div>
</div>
<div>
<p>{{update.generalUpdateComment}}</p>
</div>
</div>
<div class="budget-adjustment-container">
<div class="budget-adjustment-header">
<div class="budget-adjustment-title">
<span>Budget adjustment</span>
</div>
<div class="budget-adjustment-lable">
@if(update.forecastAdjustmentAmount < 0){
<span>
<img alt="status" class="status-icon" src="/assets/budget-change-decreased.svg">
Forecast Decreased
</span>
}

@if(update.forecastAdjustmentAmount > 0){
<span>
<img alt="status" class="status-icon" src="/assets/budget-change-increased.svg">
Forecast Increased
</span>
}
</div>
</div>
<div class="budget-adjustment-ditails">
<div class="budget-adjustment-item">
<p class="budget-title">Revised Forecast Amount</p>
<p>{{update.forecastAmount | currency}}</p>
</div>
<div class="budget-adjustment-item">
<p class="budget-title">Forecast Adjustment Amount</p>
<p>{{update.forecastAdjustmentAmount | currency}}</p>
</div>
<div class="budget-adjustment-item">
<p class="budget-title">Forecast Adjustment Rationale</p>
<p>{{update.forecastAdjustmentRationale}}</p>
</div>
</div>
</div>
<div class="budget-breackdown-container">
<div class="budget-breakdown-header">
<p>Budget Risk Breakdown</p>
</div>
<div class="budget-breackdown-table">
<div class="budget-breackdown-row">
<div class="budget-breackdown-cell1">
<img alt="status" class="status-icon" src="/assets/high-risk.svg">
<p>High risk</p>
</div>
<div class="budget-breackdown-cell2">
<p>{{update.budgetHighRiskAmount | currency}}</p>
</div>
<div>
<p>{{update.budgetHighRiskRationale}}</p>
</div>
</div>
<div class="budget-breackdown-row">
<div class="budget-breackdown-cell1">
<img alt="status" class="status-icon" src="/assets/medium-risk.svg">
<p>Medium risk</p>
</div>
<div class="budget-breackdown-cell2">
<p>{{update.budgetMediumRiskAmount | currency}}</p>
</div>
<div>
<p>{{update.budgetMediumRiskRationale}}</p>
</div>
</div>
<div class="budget-breackdown-row">
<div class="budget-breackdown-cell1">
<img alt="status" class="status-icon" src="/assets/low-risk.svg">
<p>Low risk</p>
</div>
<div class="budget-breackdown-cell2">
<p>{{update.budgetLowRiskAmount | currency}}</p>
</div>
<div>
<p>{{update.budgetLowRiskRationale}}</p>
</div>
</div>
<div class="budget-breackdown-row">
<div class="budget-breackdown-cell1">
<img alt="status" class="status-icon" src="/assets/none-risk.svg">
<p>Complete</p>
</div>
<div class="budget-breackdown-cell2">
<p>{{update.budgetCompletedAmount | currency}}</p>
</div>
<div>
<p>{{update.budgetCompletedDescription}}</p>
</div>
</div>
<div class="budget-breackdown-last-row">
<div class="budget-breackdown-cell1">
<p>Total:</p>
</div>
<div class="budget-breackdown-cell2">
<p>{{update.totalAmount | currency}}</p>
</div>
</div>
</div>
</div>
</div>
</mat-expansion-panel>
}
}
</mat-expansion-panel>
</div>
Loading
Loading