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

Jump to bottom

Issue 6752 - let users continue to delete sole energy source in custom opps #6801

Merged
merged 1 commit into from
May 29, 2024
+18 −16
Merged

Issue 6752 - let users continue to delete sole energy source in custom opps #6801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion src/app/treasure-hunt/treasure-hunt-calculator-services/assessment-opportunity.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,16 @@ export class AssessmentOpportunityService {
let totalCostSavings: number = 0;
let baselineElectricityResult: { energyUse: number, energyCost: number, numItems: number };
let modificationElectricityResult: { energyUse: number, energyCost: number, numItems: number };
let electricityResults: AssessmentOpportunityResult;
let electricityResults: AssessmentOpportunityResult = {
baselineEnergyUse: 0,
baselineEnergyCost: 0,
baselineItems: 0,
modificationEnergyUse: 0,
modificationEnergyCost: 0,
modificationItems: 0,
energySavings: 0,
energyCostSavings: 0
};

let baselineGasResult: { energyUse: number, energyCost: number, numItems: number };
let modificationGasResult: { energyUse: number, energyCost: number, numItems: number };
Expand Down
21 changes: 7 additions & 14 deletions src/app/treasure-hunt/treasure-hunt-report/opportunity-summary.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,11 +367,9 @@ export class OpportunitySummaryService {
owner: oppSheet.businessUnits,
opportunityCost: oppSheet.opportunityCost
}

let treasureHuntOpportunityResults: TreasureHuntOpportunityResults;
let numEnergyTypes: number = this.getNumberOfEnergyTypes(oppSheetResults);


if (oppSheetResults.electricityResults && (oppSheetResults.electricityResults.baselineItems != 0 || oppSheetResults.electricityResults.modificationItems != 0)) {
energyTypeLabel = 'Electricity';
totalEnergySavings = totalEnergySavings + oppSheetResults.electricityResults.energySavings;
Expand Down Expand Up @@ -432,12 +430,9 @@ export class OpportunitySummaryService {
treasureHuntOpportunityResults.modificationCost = 0;
oppSummary = this.getNewOpportunitySummary(opportunityMetaData, treasureHuntOpportunityResults, mixedIndividualSummaries);
} else {
//no energy savings
treasureHuntOpportunityResults.utilityType = '';
treasureHuntOpportunityResults.costSavings = 0;
treasureHuntOpportunityResults.energySavings = 0;
treasureHuntOpportunityResults.baselineCost = 0;
treasureHuntOpportunityResults.modificationCost = 0;
if (!treasureHuntOpportunityResults) {
treasureHuntOpportunityResults = this.setResultsFromOppSheet(oppSheetResults.electricityResults, energyTypeLabel);
}
opportunityMetaData.opportunityCost = undefined;
oppSummary = this.getNewOpportunitySummary(opportunityMetaData, treasureHuntOpportunityResults);
}
Expand Down Expand Up @@ -530,11 +525,9 @@ export class OpportunitySummaryService {
oppSummary = this.getNewOpportunitySummary(opportunityMetaData, treasureHuntOpportunityResults, mixedIndividualSummaries);
} else {
//no energy savings
treasureHuntOpportunityResults.utilityType = 'None';
treasureHuntOpportunityResults.costSavings = 0;
treasureHuntOpportunityResults.energySavings = 0;
treasureHuntOpportunityResults.baselineCost = 0;
treasureHuntOpportunityResults.modificationCost = 0;
if (!treasureHuntOpportunityResults) {
treasureHuntOpportunityResults = this.setResultsFromOppSheet(oppSheetResults.electricityResults, energyTypeLabel);
}
opportunityMetaData.opportunityCost = undefined;
oppSummary = this.getNewOpportunitySummary(opportunityMetaData, treasureHuntOpportunityResults);
}
Expand All @@ -547,7 +540,7 @@ export class OpportunitySummaryService {
energySavings: 0,
baselineCost: 0,
modificationCost: 0,
utilityType: '',
utilityType: 'None',
}

treasureHuntOpportunityResults.baselineCost = sheetResults.baselineEnergyCost;
Expand Down
2 changes: 1 addition & 1 deletion ...treasure-hunt-report/report-graphs/effort-savings-chart/effort-savings-chart.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ export class EffortSavingsChartComponent implements OnInit {

buildTrace() {
this.treasureHuntResults.opportunitySummaries.forEach((summary, index) => {
if (summary.opportunityCost.implementationEffort) {
if (summary.opportunityCost && summary.opportunityCost.implementationEffort) {
let currentColor = graphColors[index % graphColors.length];
let trace: TraceData = {
x: [summary.payback],
Expand Down