Skip to content

Issue 2144: updated date parsing in template v3 upload logic #2145

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
rmroot merged 1 commit into from
Nov 12, 2025
Merged

Issue 2144: updated date parsing in template v3 upload logic #2145

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
8 changes: 5 additions & 3 deletions src/app/data-evaluation/account/account-reports/account-reports.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,10 @@ export class AccountReportsService {
this.compareBaselineYearToReportYearError = new BehaviorSubject<boolean>(false);

this.accountReportDbService.selectedReport.subscribe(report => {
this.validateReport(report);
this.compareBaselineYearToReportYear(report);
if (report) {
this.validateReport(report);
this.compareBaselineYearToReportYear(report);
}
});
}

Expand Down Expand Up @@ -493,7 +495,7 @@ export class AccountReportsService {
}
};
}

accountSavingsReportSetup.analysisItemId = form.controls.analysisItemId.value;
accountSavingsReportSetup.includeAnnualResults = form.controls.includeAnnualResults.value;
accountSavingsReportSetup.includeAnnualResultsTable = form.controls.includeAnnualResultsTable.value;
Expand Down
24 changes: 17 additions & 7 deletions src/app/data-management/data-management-import/import-services/upload-data-v3.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ export class UploadDataV3Service {
let readDateStr: string = dataPoint['Read Date'];
let totalUsage: number = checkImportCellNumber(dataPoint['Total Usage']);
if (meterNumber && readDateStr && isNaN(totalUsage) == false) {
let readDate: Date = new Date(readDateStr);
const readDate = this.getTemplateReadDate(readDateStr);
let meter: IdbUtilityMeter = importMeters.find(meter => { return meter.meterNumber == meterNumber });
if (meter) {
let dbDataPoint: IdbUtilityMeterData = this.getExistingDbEntry(utilityMeterData, meter, readDate);
Expand Down Expand Up @@ -532,7 +532,7 @@ export class UploadDataV3Service {
let readDateStr: string = dataPoint['Read Date'];
let totalUsage: number = checkImportCellNumber(dataPoint['Total Usage']);
if (meterNumber && readDateStr && isNaN(totalUsage) == false) {
let readDate: Date = new Date(readDateStr);
let readDate: Date = this.getTemplateReadDate(readDateStr);
let meter: IdbUtilityMeter = importMeters.find(meter => { return meter.meterNumber == meterNumber });
if (meter) {
let dbDataPoint: IdbUtilityMeterData = this.getExistingDbEntry(utilityMeterData, meter, readDate);
Expand Down Expand Up @@ -577,7 +577,7 @@ export class UploadDataV3Service {
let readDateStr: string = dataPoint['Read Date'];
let totalUsage: number = checkImportCellNumber(dataPoint['Total Usage or Distance']);
if (meterNumber && readDateStr && isNaN(totalUsage) == false) {
let readDate: Date = new Date(readDateStr);
let readDate: Date = this.getTemplateReadDate(readDateStr);
let meter: IdbUtilityMeter = importMeters.find(meter => { return meter.meterNumber == meterNumber });
if (meter) {
let dbDataPoint: IdbUtilityMeterData = this.getExistingDbEntry(utilityMeterData, meter, readDate);
Expand Down Expand Up @@ -617,7 +617,7 @@ export class UploadDataV3Service {
let readDateStr: string = dataPoint['Read Date'];
let totalUsage: number = checkImportCellNumber(dataPoint['Total Usage']);
if (meterNumber && readDateStr && isNaN(totalUsage) == false) {
let readDate: Date = new Date(readDateStr);
let readDate: Date = this.getTemplateReadDate(readDateStr);
let meter: IdbUtilityMeter = importMeters.find(meter => { return meter.meterNumber == meterNumber });
if (meter) {
let dbDataPoint: IdbUtilityMeterData = this.getExistingDbEntry(utilityMeterData, meter, readDate);
Expand Down Expand Up @@ -663,7 +663,7 @@ export class UploadDataV3Service {
let readDateStr: string = dataPoint['Read Date'];
let totalUsage: number = checkImportCellNumber(dataPoint['Total Usage or Emission']);
if (meterNumber && readDateStr && isNaN(totalUsage) == false) {
let readDate: Date = new Date(readDateStr);
let readDate: Date = this.getTemplateReadDate(readDateStr);
let meter: IdbUtilityMeter = importMeters.find(meter => { return meter.meterNumber == meterNumber });
if (meter) {
let dbDataPoint: IdbUtilityMeterData = this.getExistingDbEntry(utilityMeterData, meter, readDate);
Expand All @@ -690,7 +690,7 @@ export class UploadDataV3Service {
let readDateStr: string = dataPoint['Read Date'];
let totalUsage: number = checkImportCellNumber(dataPoint['Total Usage']);
if (meterNumber && readDateStr && isNaN(totalUsage) == false) {
let readDate: Date = new Date(readDateStr);
let readDate: Date = this.getTemplateReadDate(readDateStr);
let meter: IdbUtilityMeter = importMeters.find(meter => { return meter.meterNumber == meterNumber });
if (meter) {
let dbDataPoint: IdbUtilityMeterData = this.getExistingDbEntry(utilityMeterData, meter, readDate);
Expand Down Expand Up @@ -956,7 +956,7 @@ export class UploadDataV3Service {
if (facilityName && readDateStr) {
let facility: IdbFacility = importFacilities.find(facility => { return facility.name == facilityName });
if (facility) {
let readDate: Date = new Date(readDateStr);
let readDate: Date = this.getTemplateReadDate(readDateStr);
for (let i = 1; i < 16; i++) {
let predictorName: string = excelPredictorData['Predictor ' + i + ' Name'];
if (predictorName) {
Expand Down Expand Up @@ -990,4 +990,14 @@ export class UploadDataV3Service {
});
return importPredictorData;
}

getTemplateReadDate(readDateStr: string): Date {
//Check for YYYY-MM-DD format
if (/^\d{4}-\d{2}-\d{2}$/.test(readDateStr)) {
const [year, month, day] = readDateStr.split('-').map(Number);
const readDate = new Date(year, month - 1, day);
return readDate;
}
return new Date(readDateStr)
}
}