Merge pull request #235 from ucdavis/KL/gpInputs

GP Inputs
ucdavis · Apr 18, 2022 · f433f82 · f433f82
2 parents 4a48403 + 0eb680c
commit f433f82
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/...icationPower/EscalationInflationInput.tsx → ...ationPower/EscalationInflationInputGP.tsx b/...icationPower/EscalationInflationInput.tsx → ...ationPower/EscalationInflationInputGP.tsx
@@ -12,6 +12,7 @@ import {
 interface Props {
   inputs: EscalationInflationInputModGP;
   setInputs: (inputs: any) => void;
+  disabled: boolean;
 }
 
 export const EscalationInflationInputGP = (props: Props) => {
@@ -32,6 +33,7 @@ export const EscalationInflationInputGP = (props: Props) => {
                 GeneralInflation: e.target.value
               })
             }
+            disabled={props.disabled}
           />
           <InputGroupAddon addonType='append'>%</InputGroupAddon>
         </InputGroup>
@@ -52,6 +54,7 @@ export const EscalationInflationInputGP = (props: Props) => {
                 EscalationBiomassFuel: e.target.value
               })
             }
+            disabled={props.disabled}
           />
           <InputGroupAddon addonType='append'>%/year</InputGroupAddon>
         </InputGroup>
@@ -71,6 +74,7 @@ export const EscalationInflationInputGP = (props: Props) => {
                 EscalationDualFuel: e.target.value
               })
             }
+            disabled={props.disabled}
           />
           <InputGroupAddon addonType='append'>%/year</InputGroupAddon>
         </InputGroup>
@@ -90,6 +94,7 @@ export const EscalationInflationInputGP = (props: Props) => {
                 EscalationProductionTaxCredit: e.target.value
               })
             }
+            disabled={props.disabled}
           />
           <InputGroupAddon addonType='append'>%</InputGroupAddon>
         </InputGroup>
@@ -109,6 +114,7 @@ export const EscalationInflationInputGP = (props: Props) => {
                 EscalationHeatSales: e.target.value
               })
             }
+            disabled={props.disabled}
           />
           <InputGroupAddon addonType='append'>%/year</InputGroupAddon>
         </InputGroup>
@@ -126,6 +132,7 @@ export const EscalationInflationInputGP = (props: Props) => {
                 EscalationCharSales: e.target.value
               })
             }
+            disabled={props.disabled}
           />
           <InputGroupAddon addonType='append'>%/year</InputGroupAddon>
         </InputGroup>
@@ -145,6 +152,7 @@ export const EscalationInflationInputGP = (props: Props) => {
                 EscalationOther: e.target.value
               })
             }
+            disabled={props.disabled}
           />
           <InputGroupAddon addonType='append'>%/year</InputGroupAddon>
         </InputGroup>

diff --git a/src/components/Inputs/Technoeconomic/GasificationPower/ExpensesBaseYearInputGP.tsx b/src/components/Inputs/Technoeconomic/GasificationPower/ExpensesBaseYearInputGP.tsx
@@ -228,7 +228,7 @@ export const ExpensesBaseYearInputGP = (props: Props) => {
         <FormText color='muted'>Cost of maintaining the plant</FormText>
       </FormGroup>
       <FormGroup>
-        <Label>WasteTreatment</Label>
+        <Label>Waste Treatment</Label>
         <InputGroup>
           <Input
             type='text'

diff --git a/src/components/Inputs/Technoeconomic/GasificationPower/GasificationPower.tsx b/src/components/Inputs/Technoeconomic/GasificationPower/GasificationPower.tsx
@@ -20,11 +20,11 @@ import {
 import { HeatBaseYearInput } from '../HeatBaseYearInput';
 import { TaxesInput } from '../TaxesInput';
 import { FinancingInput } from '../FinancingInput';
-import { IncomeOtherThanEnergyInput } from '../IncomeOtherThanEnergyInput';
-import { EscalationInflationInput } from '../EscalationInflationInput';
 import { ElectricalAndFuelBaseYearInputGP } from './ElectricalAndFuelBaseYearInputGP';
 import { ExpensesBaseYearInputGP } from './ExpensesBaseYearInputGP';
 import { CarbonCreditInput } from '../CarbonCreditInput';
+import { IncomeOtherThanEnergyInputGP } from './IncomeOtherThanEnergyInputGP';
+import { EscalationInflationInputGP } from './EscalationInflationInputGP';
 
 interface Props {
   // inputs: InputModGP;
@@ -96,7 +96,7 @@ export const GasificationPower = (props: Props) => {
         }
         disabled={props.disabled}
       />
-      <IncomeOtherThanEnergyInput
+      <IncomeOtherThanEnergyInputGP
         inputs={props.inputs.IncomeOtherThanEnergy}
         setInputs={(inputs: IncomeOtherThanEnergyInputModGP) =>
           props.setInputs({ ...props.inputs, IncomeOtherThanEnergy: inputs })
@@ -117,7 +117,7 @@ export const GasificationPower = (props: Props) => {
         }}
         disabled={props.disabled}
       ></CarbonCreditInput> */}
-      <EscalationInflationInput
+      <EscalationInflationInputGP
         inputs={props.inputs.EscalationInflation}
         setInputs={(inputs: EscalationInflationInputModGP) =>
           props.setInputs({ ...props.inputs, EscalationInflation: inputs })

diff --git a/src/components/Inputs/Technoeconomic/GasificationPower/IncomeOtherThanEnergyInputGP.tsx b/src/components/Inputs/Technoeconomic/GasificationPower/IncomeOtherThanEnergyInputGP.tsx
@@ -8,11 +8,11 @@ import {
   Input,
   InputGroupAddon
 } from 'reactstrap';
-import { IncomeOtherThanEnergyInputModGPClass } from '../../../../models/GPClasses';
 
 interface Props {
   inputs: IncomeOtherThanEnergyInputModGP;
   setInputs: (inputs: any) => void;
+  disabled: boolean;
 }
 
 export const IncomeOtherThanEnergyInputGP = (props: Props) => {
@@ -33,6 +33,7 @@ export const IncomeOtherThanEnergyInputGP = (props: Props) => {
                 CapacityPayment: e.target.value
               })
             }
+            disabled={props.disabled}
           />
           <InputGroupAddon addonType='append'>$/kW-year</InputGroupAddon>
         </InputGroup>
@@ -53,6 +54,7 @@ export const IncomeOtherThanEnergyInputGP = (props: Props) => {
                 InterestRateOnDebtReserve: e.target.value
               })
             }
+            disabled={props.disabled}
           />
           <InputGroupAddon addonType='append'>%/year</InputGroupAddon>
         </InputGroup>
@@ -73,6 +75,7 @@ export const IncomeOtherThanEnergyInputGP = (props: Props) => {
                 SalesPriceForChar: e.target.value
               })
             }
+            disabled={props.disabled}
           />
           <InputGroupAddon addonType='append'>$/t</InputGroupAddon>
         </InputGroup>