Merge pull request #5 from UCD-GW-Nitrate/develop

feat(step1): add porosity
UCD-GW-Nitrate · Oct 1, 2024 · 55a0a8b · 55a0a8b
2 parents 929d5a9 + ae714b5
commit 55a0a8b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/src/components/steps/Step1/Step1.tsx b/src/components/steps/Step1/Step1.tsx
@@ -16,6 +16,7 @@ import {
   setModelSimEndYear,
   setModelUnsatScenario,
   setModelWaterContent,
+  setModelPorosity,
   setModelWelltypeScenario,
 } from '@/store/slices/modelSlice';
 
@@ -67,6 +68,7 @@ const Step1 = ({ onNext }: StepBase) => {
     dispatch(setModelWelltypeScenario(scenarios[data.welltype_scenario]!));
     dispatch(setModelUnsatScenario(scenarios[data.unsat_scenario]!));
     dispatch(setModelWaterContent(Math.floor(data.water_content) / 100));
+    dispatch(setModelPorosity(Math.floor(data.porosity / 10) / 10));
     dispatch(setModelSimEndYear((data.sim_end_year as dayjs.Dayjs).year()));
     dispatch(
       setModelReductionStartYear(
@@ -119,6 +121,14 @@ const Step1 = ({ onNext }: StepBase) => {
             ))}
           </Select>
         </Form.Item>
+        <Form.Item
+          name="porosity"
+          label="Porosity"
+          rules={defaultRules('Please enter porosity')}
+          initialValue={model.porosity ? model.porosity * 100 : 10}
+        >
+          <InputNumber min={10} max={100} step={10} keyboard={false} formatter={(v) => `${Math.floor((v ?? 10) / 10) * 10}%`} />
+        </Form.Item>
         <Form.Item
           name="load_scenario"
           label="Load scenario"
@@ -148,7 +158,7 @@ const Step1 = ({ onNext }: StepBase) => {
         >
           <Select>
             {welltypeScenarioOptions.map((scen) => (
-              <Select.Option value={scen.id} key={scen.id}>
+              <Select.Option value={scen.id} key={scen.id} disabled={scen.id == 14}>
                 <>
                   {scen.name}{' '}
                   {scen.description ? (

diff --git a/src/store/apis/modelApi.ts b/src/store/apis/modelApi.ts
@@ -46,6 +46,7 @@ const modelApi = createApi({
               name: params.name,
               description: params.description,
               water_content: params.water_content,
+              porosity: params.porosity,
               sim_end_year: params.sim_end_year,
               reduction_start_year: params.reduction_start_year,
               reduction_end_year: params.reduction_end_year,

diff --git a/src/store/slices/modelSlice.ts b/src/store/slices/modelSlice.ts
@@ -21,6 +21,9 @@ const modelSlice = createSlice({
     setModelWaterContent(state, action: PayloadAction<number>) {
       return { ...state, water_content: action.payload };
     },
+    setModelPorosity(state, action: PayloadAction<number>) {
+      return { ...state, porosity: action.payload };
+    },
     setModelSimEndYear(state, action: PayloadAction<number>) {
       return { ...state, sim_end_year: action.payload };
     },
@@ -85,6 +88,7 @@ export const {
   setModelName,
   setModelDescription,
   setModelWaterContent,
+  setModelPorosity,
   setModelSimEndYear,
   setModelReductionStartYear,
   setModelReductionEndYear,

diff --git a/src/types/model/FormModel.ts b/src/types/model/FormModel.ts
@@ -6,6 +6,7 @@ export interface FormModel {
   name?: string;
   description?: string;
   water_content?: number;
+  porosity?: number;
   sim_end_year?: number;
   reduction_start_year?: number;
   reduction_end_year?: number;