-
-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
converted input2 screen to entry form, adjusted formatting, renamed "…
…Graphs.tsx" to "HeatLoadAnalysis.tsx", removed placeHolders, removed Standard Deviation of UA graph
- Loading branch information
Showing
9 changed files
with
98 additions
and
160 deletions.
There are no files selected for viewing
99 changes: 69 additions & 30 deletions
99
heat-stack/app/components/ui/heat/CaseSummaryComponents/CurrentHeatingSystem.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,78 @@ | ||
| export function CurrentHeatingSystem() { | ||
| const fuelType = 'Natural Gas' | ||
| const heatingSystemEfficiency = '75' | ||
| const setPoint = '70' | ||
| const setbackTemperature = '65' | ||
| const setbackTime = '7' | ||
| import { Form } from '@remix-run/react' | ||
| // removed temporarily for single-page app format | ||
| // import { Button } from '#/app/components/ui/button.tsx' | ||
| import { Input } from '#/app/components/ui/input.tsx' | ||
| import { Label } from '#/app/components/ui/label.tsx' | ||
|
|
||
| export function CurrentHeatingSystem() { | ||
| const titleClassTailwind = 'text-5xl font-extrabold tracking-wide' | ||
| const subTitleClassTailwind = 'text-2xl font-semibold text-zinc-950' | ||
| return ( | ||
| <div className="section-title"> | ||
| Current Heating System | ||
| <hr /> | ||
| <div className="flex flex-row"> | ||
| <div className="basis-1/2"> | ||
| <div className="item-title"> | ||
| Fuel Type | ||
| <br /> | ||
| <div className="item-big">{fuelType}</div> <br /> | ||
| Heating System Efficiency (%) | ||
| <br /> | ||
| <div className="item-big">{heatingSystemEfficiency}</div> <br /> | ||
| </div> | ||
| <div> | ||
| <h2 className={`${titleClassTailwind}`}>Existing Heating System</h2> | ||
|
|
||
| <Form method="post" action="/current"> | ||
| <div> | ||
| <Label htmlFor="fuelType"> | ||
| <b>Fuel Type</b> | ||
| </Label> | ||
| <Input name="fuelType" id="fuelType" type="text" /> | ||
| </div> | ||
|
|
||
| <div> | ||
| <Label htmlFor="heatingSystemEfficiency"> | ||
| <b>Heating system efficiency %</b> | ||
| </Label> | ||
| <Input | ||
| name="heatingSystemEfficiency" | ||
| id="heatingSystemEfficiency" | ||
| type="text" | ||
| /> | ||
| </div> | ||
|
|
||
| <div> | ||
| <Label htmlFor="designTemperatureOverride"> | ||
| <b>Design temperature override (°F)</b> | ||
| </Label> | ||
| <Input | ||
| name="designTemperatureOverride" | ||
| id="designTemperatureOverride" | ||
| type="text" | ||
| /> | ||
| </div> | ||
|
|
||
| <div className="basis-1/2"> | ||
| <div className="item-group-title">Thermostat Settings</div> | ||
| <div className="item-title"> | ||
| Set Point (°F) <br /> | ||
| <div className="item">{setPoint}</div> <br /> | ||
| Setback Temperature (°F) | ||
| <br /> | ||
| <div className="item">{setbackTemperature}</div> <br /> | ||
| Setback Time (h) | ||
| <div className="item">{setbackTime}</div> | ||
| <h6 className={`${subTitleClassTailwind}`}>Thermostat Settings</h6> | ||
|
|
||
| <div className="flex flex-row"> | ||
| <div className="basis-1/3"> | ||
| <Label htmlFor="setPoint">Set Point (°F) </Label> | ||
| <Input | ||
| name="setPointTemperature" | ||
| id="setPointTemperature" | ||
| type="text" | ||
| /> | ||
| </div> | ||
|
|
||
| <div className="basis-1/3"> | ||
| <Label htmlFor="setPoint">Setback Temperature (°F)</Label> | ||
| <Input | ||
| name="setBackTemperature" | ||
| id="setBackTemperature" | ||
| type="text" | ||
| /> | ||
| </div> | ||
|
|
||
| <div className="basis-1/3"> | ||
| <Label htmlFor="setPoint">Setback hours per day</Label> | ||
| <Input name="setBackTime" id="setBackTime" type="text" /> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </Form> | ||
|
|
||
| {/* removed temporarily for single page app format */} | ||
| {/* <div> | ||
| <Button type="submit">Next ={'>'}</Button> | ||
| </div> */} | ||
| </div> | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 0 additions & 53 deletions
53
heat-stack/app/components/ui/heat/CaseSummaryComponents/Graphs/StandardDeviationOfUA.tsx
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 5 additions & 5 deletions
10
.../ui/heat/CaseSummaryComponents/Graphs.tsx → ...aseSummaryComponents/HeatLoadAnalysis.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,19 @@ | ||
| import { AnalysisHeader } from './AnalysisHeader.tsx' | ||
| import { HeatLoad } from './Graphs/HeatLoad.tsx' | ||
| import { StandardDeviationOfUA } from './Graphs/StandardDeviationOfUA.tsx' | ||
| import { WholeHomeUAComparison } from './Graphs/WholeHomeUAComparison.tsx' | ||
|
|
||
| export function Graphs() { | ||
| const fuelType = 'Natural Gas' | ||
| return ( | ||
| <div className="section-title"> | ||
| Fuel Type <br /> | ||
| <div> | ||
| <h2 className="text-5xl font-extrabold tracking-wide"> | ||
| Heat Load Analysis | ||
| </h2> | ||
| Fuel Type | ||
| {fuelType} | ||
| <AnalysisHeader /> | ||
| <hr /> | ||
| <HeatLoad /> | ||
| <WholeHomeUAComparison /> | ||
| <StandardDeviationOfUA /> | ||
| </div> | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,5 @@ | ||
| import { Graphs } from '../../components/ui/heat/CaseSummaryComponents/Graphs.tsx' | ||
| import { Graphs } from '../../components/ui/heat/CaseSummaryComponents/HeatLoadAnalysis.tsx' | ||
|
|
||
| export default function HeatLoadAnalysis() { | ||
| return ( | ||
| <main className="main-container"> | ||
| <div> | ||
| <h1 className="page-title">Heat Load Analysis</h1> | ||
| <Graphs /> | ||
| </div> | ||
| </main> | ||
| ) | ||
| return <Graphs /> | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,15 @@ | ||
| import { CurrentHeatingSystem } from '../../components/ui/heat/CaseSummaryComponents/CurrentHeatingSystem.tsx' | ||
| import { EnergyUseHistory } from '../../components/ui/heat/CaseSummaryComponents/EnergyUseHistory.tsx' | ||
| import { Graphs } from '../../components/ui/heat/CaseSummaryComponents/Graphs.tsx' | ||
| import { HomeInformation } from '../../components/ui/heat/CaseSummaryComponents/HomeInformation.tsx' | ||
| import HeatLoadAnalysis from './heatloadanalysis.tsx' | ||
|
|
||
| export default function Inputs() { | ||
| return ( | ||
| <div> | ||
| {/* <div className="container items-center justify-between gap-4 md:h-24 md:flex-row"> */} | ||
| <HomeInformation /> | ||
| <CurrentHeatingSystem /> | ||
| <EnergyUseHistory /> | ||
| <h1 className="page-title">Heat Load Analysis</h1> | ||
| <Graphs /> | ||
| <HeatLoadAnalysis /> | ||
| </div> | ||
| ) | ||
| } |