Skip to content

Commit d737d06

Browse files
committed
remaining minor issues resolved
1 parent b1710d1 commit d737d06

File tree

3 files changed

+20
-21
lines changed

3 files changed

+20
-21
lines changed

frontend/app/api/sqlload/route.ts

+14
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,20 @@ export async function POST(request: NextRequest) {
8383
}
8484
}
8585
}
86+
87+
// Update Census Start/End Dates
88+
const combinedQuery = `
89+
UPDATE ${schema}.census c
90+
JOIN (
91+
SELECT CensusID, MIN(MeasurementDate) AS FirstMeasurementDate, MAX(MeasurementDate) AS LastMeasurementDate
92+
FROM ${schema}.coremeasurements
93+
WHERE CensusID = ${censusID}
94+
GROUP BY CensusID
95+
) m ON c.CensusID = m.CensusID
96+
SET c.StartDate = m.FirstMeasurementDate, c.EndDate = m.LastMeasurementDate
97+
WHERE c.CensusID = ${censusID};`;
98+
99+
await connectionManager.executeQuery(combinedQuery);
86100
await connectionManager.closeConnection();
87101
return new NextResponse(JSON.stringify({ message: 'Insert to SQL successful', idToRows: idToRows }), { status: HTTPResponses.OK });
88102
}

frontend/components/processors/processcensus.tsx

-13
Original file line numberDiff line numberDiff line change
@@ -96,19 +96,6 @@ export async function processCensus(props: Readonly<SpecialProcessingProps>): Pr
9696
}
9797
}
9898

99-
// Update Census Start/End Dates
100-
const combinedQuery = `
101-
UPDATE ${schema}.census c
102-
JOIN (
103-
SELECT CensusID, MIN(MeasurementDate) AS FirstMeasurementDate, MAX(MeasurementDate) AS LastMeasurementDate
104-
FROM ${schema}.coremeasurements
105-
WHERE CensusID = ${censusID}
106-
GROUP BY CensusID
107-
) m ON c.CensusID = m.CensusID
108-
SET c.StartDate = m.FirstMeasurementDate, c.EndDate = m.LastMeasurementDate
109-
WHERE c.CensusID = ${censusID};`;
110-
111-
await connectionManager.executeQuery(combinedQuery);
11299
console.log('Upsert successful. CoreMeasurement ID generated:', coreMeasurementID);
113100
return coreMeasurementID;
114101
}

frontend/components/uploadsystem/segments/uploadfireazure.tsx

+6-8
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,15 @@ const UploadFireAzure: React.FC<UploadFireAzureProps> = ({
9999
};
100100

101101
if (!hasUploaded.current) {
102-
uploadFiles().catch(console.error);
103-
hasUploaded.current = true;
102+
uploadFiles()
103+
.catch(console.error)
104+
.then(() => {
105+
hasUploaded.current = true;
106+
setReviewState(ReviewStates.COMPLETE);
107+
});
104108
}
105109
}, [acceptedFiles, uploadToStorage, uploadForm, setIsDataUnsaved]);
106110

107-
useEffect(() => {
108-
if (!loading && completedOperations === totalOperations && !refreshError) {
109-
setReviewState(ReviewStates.COMPLETE);
110-
}
111-
}, [loading, completedOperations, totalOperations, refreshError]);
112-
113111
return (
114112
<>
115113
{loading ? (

0 commit comments

Comments
 (0)