Merge branch 'main' into energy_use

codeforboston · Apr 4, 2024 · bba5b2d · bba5b2d
2 parents ad5e98d + 5787b7d
commit bba5b2d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/heat-stack/app/components/ui/heat/CaseSummaryComponents/HomeInformation.tsx b/heat-stack/app/components/ui/heat/CaseSummaryComponents/HomeInformation.tsx
@@ -42,7 +42,8 @@ import { FieldMetadata, useForm } from '@conform-to/react'
 
 // 	// return redirect(`/inputs1`)
 // }
-type HomeInformationProps = {fields: Conform};
+
+type HomeInformationProps = {fields: any};
 
 export function HomeInformation(props: HomeInformationProps) {
 

diff --git a/heat-stack/app/routes/_heat+/single.tsx b/heat-stack/app/routes/_heat+/single.tsx
@@ -20,7 +20,7 @@ import { z } from 'zod'
 //   - parseMultipartFormData
 //   - avoid dealing with the server for now
 //   - pass the data to the rules engine/pyodide either in the component or the action (probably the action for validation, etc.)
-// - [ ] (On hold) Build table form
+// - [ ] (On hold for data format from rules engine) Build table form
 // - [ ] Form errors (if we think of a use case - 2 fields conflicting...)
 
 // Ours
@@ -58,6 +58,7 @@ const CurrentHeatingSystemSchema = Home.pick({
 	thermostatSetPoint: true,
 	setbackTemperature: true,
 	setbackHoursPerDay: true,
+
 })
 
 const Schema = HomeFormSchema.and(CurrentHeatingSystemSchema)