Set household defaults consistently

The same as battery and generation assets.

Author: Erikvv

webtool/frontend/src/components/default.ts

@@ -2,15 +2,14 @@ import {FormEvent, FunctionComponent} from "react"
 import {HouseholdGroup} from "local4local"
 import {Button, Card} from "@radix-ui/themes"
 import {HouseholdHeading} from "./household-heading.tsx"
-import {getWithDefault} from "../default.ts"
 import {LabelWithInfo} from "../info/label-with-info.tsx"
 import { titles } from '../info/titles.tsx';
 
 export const HouseholdForm: FunctionComponent<{
-    initialData?: HouseholdGroup | null;
+    initialData?: HouseholdGroup,
     save: (householdGroup: HouseholdGroup) => void,
     hide: () => void,
-}> = ({initialData, save, hide}) => {
+}> = ({initialData = new HouseholdGroup, save, hide}) => {
     const onSubmit = (event: FormEvent<HTMLFormElement>) => {
         event.preventDefault()
         const form = event.currentTarget
@@ -34,31 +33,31 @@ export const HouseholdForm: FunctionComponent<{
             <form onSubmit={onSubmit}>
                 <div className="radix-grid">
                     <LabelWithInfo data={titles["type"]} />
-                    <input className="form-input" type="text" id="type" name="type" defaultValue={initialData?.type || "Huishoudens"} />
+                    <input className="form-input" type="text" id="type" name="type" defaultValue={initialData.type} />
                 </div>
                 <div className="radix-grid">
                     <LabelWithInfo data={titles["households_n"]} />
-                    <input className="form-input" type="number" id="households_n" name="households_n" defaultValue={initialData?.households_n || 200} min={0} />
+                    <input className="form-input" type="number" id="households_n" name="households_n" defaultValue={initialData.households_n} min={0} />
                 </div>
                 <div className="radix-grid">
                     <LabelWithInfo data={titles["hasPV_r"]} />
-                    <input className="form-input" type="number" id="hasPV_r" name="hasPV_r" defaultValue={getWithDefault(initialData?.hasPV_r, 0.2) * 100} min={0} max={100} />
+                    <input className="form-input" type="number" id="hasPV_r" name="hasPV_r" defaultValue={initialData.hasPV_r * 100} min={0} max={100} />
                 </div>
                 <div className="radix-grid">
                     <LabelWithInfo data={titles["hasHeatPump_r"]} />
-                    <input className="form-input" type="number" id="hasHeatPump_r" name="hasHeatPump_r" defaultValue={getWithDefault(initialData?.hasHeatPump_r, 0.1) * 100} min={0} max={100} />
+                    <input className="form-input" type="number" id="hasHeatPump_r" name="hasHeatPump_r" defaultValue={initialData.hasHeatPump_r * 100} min={0} max={100} />
                 </div>
                 <div className="radix-grid">
                     <LabelWithInfo data={titles["hasChargePoint_r"]} />
-                    <input className="form-input" type="number" id="hasChargePoint_r" name="hasChargePoint_r" defaultValue={getWithDefault(initialData?.hasChargePoint_r, 0.2) * 100} min={0} max={100} />
+                    <input className="form-input" type="number" id="hasChargePoint_r" name="hasChargePoint_r" defaultValue={initialData.hasChargePoint_r * 100} min={0} max={100} />
                 </div>
                 <div className="radix-grid">
                     <LabelWithInfo data={titles["hasHomeBattery_r"]} />
-                    <input className="form-input" type="number" id="hasHomeBattery_r" name="hasHomeBattery_r" defaultValue={getWithDefault(initialData?.hasHomeBattery_r, 0.01) * 100} min={0} max={100} />
+                    <input className="form-input" type="number" id="hasHomeBattery_r" name="hasHomeBattery_r" defaultValue={initialData.hasHomeBattery_r * 100} min={0} max={100} />
                 </div>
                 <div className="radix-grid">
                     <LabelWithInfo data={titles["annualBaseConsumptionAvg_kWh"]} />
-                    <input className="form-input" type="number" id="annualBaseConsumptionAvg_kWh" name="annualBaseConsumptionAvg_kWh" defaultValue={initialData?.annualBaseConsumptionAvg_kWh || 3000} min={0} />
+                    <input className="form-input" type="number" id="annualBaseConsumptionAvg_kWh" name="annualBaseConsumptionAvg_kWh" defaultValue={initialData.annualBaseConsumptionAvg_kWh} min={0} />
                 </div>
                 <Button type="button" onClick={hide} style={{ marginRight: '10px' }} highContrast variant="soft">Annuleren</Button>
                 <Button type="submit">Opslaan</Button>

webtool/frontend/src/components/household/household-form.tsx

@@ -94,15 +94,7 @@ fun pilotFromJson(json: String) = Json.decodeFromString<Pilot>(json)
 fun createDefaultStartPilot() = Pilot(
     name = "start",
     householdGroups = listOf(
-        HouseholdGroup(
-            type = "Huishoudens",
-            households_n = 200,
-            hasPV_r = 0.2,
-            hasHeatPump_r = 0.1,
-            hasChargePoint_r = 0.2,
-            hasHomeBattery_r = 0.0,
-            annualBaseConsumptionAvg_kWh = 3000.0,
-        )
+        HouseholdGroup(),
     )
 )
 
@@ -145,14 +137,14 @@ data class AssetCost(
 @JsExport
 @Serializable
 data class HouseholdGroup(
-    val type: String,
-    val households_n: Int,
-    val hasPV_r: Double,
-    val hasHeatPump_r: Double,
-    val hasChargePoint_r: Double,
-    val hasHomeBattery_r: Double,
+    val type: String = "Huishoudens",
+    val households_n: Int = 400,
+    val hasPV_r: Double = .3,
+    val hasHeatPump_r: Double = .1,
+    val hasChargePoint_r: Double = .2,
+    val hasHomeBattery_r: Double = .01,
      /**Jaarlijks gemiddeld basisverbruik zonder warmtepomp, elektrische voertuigen en zonnepanelen */
-    val annualBaseConsumptionAvg_kWh: Double,
+    val annualBaseConsumptionAvg_kWh: Double = 3000.0,
     val id: String = "HouseholdGroup_${idCounter++}"
 ) {
     fun hasPV_n() = (hasPV_r * households_n).roundToInt()