Merge pull request #343 from pkpdapp-team/fixes

fixes
pkpdapp-team · Feb 8, 2024 · cea689d · cea689d
2 parents 87c5e5f + 58ea44e
commit cea689d
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 10 deletions.
diff --git a/frontend-v2/src/components/DropdownButton.tsx b/frontend-v2/src/components/DropdownButton.tsx
@@ -80,6 +80,7 @@ const DropdownButton: React.FC<Props> = ({
         data-cy={`dropdown-button-popover`}
         anchorOrigin={{ vertical: "bottom", horizontal: "left" }}
         transformOrigin={{ vertical: "top", horizontal: "left" }}
+        style={{ zIndex: 9999 }}
       >
         {options.map((option, index) => (
           <ListItemButton

diff --git a/frontend-v2/src/features/main/Sidebar.tsx b/frontend-v2/src/features/main/Sidebar.tsx
@@ -252,7 +252,7 @@ export default function Sidebar() {
         sx={{
           width: { sm: `100%` },
           ml: { sm: `${drawerWidth}px` },
-          zIndex: 10010000,
+          zIndex: 9998,
           backgroundColor: "white",
         }}
       >

diff --git a/frontend-v2/src/features/model/Model.tsx b/frontend-v2/src/features/model/Model.tsx
@@ -205,7 +205,8 @@ const Model: React.FC = () => {
   if (model.pk_model === null) {
     tabErrors[tabKeys[0]] = "Please select a PK model to simulate";
   }
-  const isTumourModel = pd_model?.is_library_model && pd_model?.name.startsWith("tumour_growth");
+  const hasPdModel = model.pd_model !== null;
+  const isTumourModel =  hasPdModel && pd_model?.is_library_model && pd_model?.name.startsWith("tumour_growth");
   const noKillModel = !model.pd_model2;
   if (model.pd_model &&  model.mappings.length === 0) {
     // put exception for tumour growth models with no kill

diff --git a/frontend-v2/src/features/simulation/SimulationSliderView.tsx b/frontend-v2/src/features/simulation/SimulationSliderView.tsx
@@ -30,15 +30,15 @@ interface SimulationSliderProps {
   slider: SimulationSlider;
   onChange: (value: number) => void;
   onSave: (value: number) => void;
-  remove: (index: number) => void;
+  onRemove: () => void;
   units: UnitRead[];
 }
 
 const SimulationSliderView: React.FC<SimulationSliderProps> = ({
   index,
   slider,
   onChange,
-  remove,
+  onRemove,
   onSave,
   units,
 }) => {
@@ -88,7 +88,7 @@ const SimulationSliderView: React.FC<SimulationSliderProps> = ({
   };
 
   const handleDelete = () => {
-    remove(index);
+    onRemove();
   };
 
   const handleWider = () => {

diff --git a/frontend-v2/src/features/simulation/Simulations.tsx b/frontend-v2/src/features/simulation/Simulations.tsx
@@ -414,9 +414,9 @@ const Simulations: React.FC = () => {
     return <div>Not found</div>;
   }
 
-  const orderedSliders = sliders.map((slider) => {
+  const orderedSliders = sliders.map((slider, i) => {
     const variable = variables.find((v) => v.id === slider.variable);
-    return { ...slider, priority: variable ? paramPriority(variable) : 0 };
+    return { ...slider, priority: variable ? paramPriority(variable) : 0, fieldArrayIndex: i };
   });
   orderedSliders.sort((a, b) => a.priority - b.priority);
 
@@ -501,6 +501,10 @@ const Simulations: React.FC = () => {
     setSliderValues({ ...sliderValues, [slider.variable]: value });
     setLoadingSimulate(true);
   };
+
+  const handleRemoveSlider = (index: number) => () => {
+    removeSlider(index);
+  }
 
   const handleSaveSlider = (slider: SimulationSlider) => (value: number) => {
     const variable = variables?.find((v) => v.id === slider.variable);
@@ -653,7 +657,7 @@ const Simulations: React.FC = () => {
                 index={index}
                 slider={slider}
                 onChange={handleChangeSlider(slider)}
-                remove={removeSlider}
+                onRemove={handleRemoveSlider(slider.fieldArrayIndex)}
                 onSave={handleSaveSlider(slider)}
                 units={units}
               />

diff --git a/pkpdapp/pkpdapp/migrations/models/TG_Exponential_PDModel.mmt b/pkpdapp/pkpdapp/migrations/models/TG_Exponential_PDModel.mmt
@@ -28,5 +28,5 @@ Growth = if(TS > 1e12,
     kge*TS^gamma) in [mL/h]
 	desc: Tumor growth rate	
 
-dot(TS) = Growth in [mL/h]
+dot(TS) = Growth in [mL]
 	desc: Tumor volume/ size
diff --git a/pkpdapp/pkpdapp/models/dose.py b/pkpdapp/pkpdapp/models/dose.py
@@ -104,6 +104,8 @@ def copy(self, stored_protocol):
             'start_time': self.start_time,
             'amount': self.amount,
             'duration': self.duration,
+            'repeats': self.repeats,
+            'repeat_interval': self.repeat_interval,
             'read_only': True,
         }
         return Dose.objects.create(**stored_dose_kwargs)
diff --git a/pkpdapp/pkpdapp/tests/test_models/test_project.py b/pkpdapp/pkpdapp/tests/test_models/test_project.py
@@ -40,7 +40,9 @@ def test_copy(self):
             project=self.project,
         )
         protocol = Protocol.objects.create(name="my protocol")
-        dose = protocol.doses.create(amount=1.0, start_time=0.0)
+        dose = protocol.doses.create(
+            amount=1.0, start_time=0.0, repeats=2, repeat_interval=1.1
+        )
         protocol.doses.set([dose])
         a1 = pkpd_model.variables.get(qname="PKCompartment.A1")
         a1.protocol = protocol
@@ -98,6 +100,8 @@ def test_copy(self):
         self.assertNotEqual(new_dose.pk, dose.pk)
         self.assertEqual(new_dose.amount, 1.0)
         self.assertEqual(new_dose.start_time, 0.0)
+        self.assertEqual(new_dose.repeats, 2)
+        self.assertEqual(new_dose.repeat_interval, 1.1)
 
         # check that the simulation is there and has the right name
         self.assertEqual(new_project.simulations.count(), 1)