group new rows by subject and group ID

pkpdapp-team · Jan 18, 2025 · 0897c75 · 0897c75
1 parent 584ff60
commit 0897c75
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 15 deletions.
diff --git a/frontend-v2/src/features/data/CreateDosingProtocols.tsx b/frontend-v2/src/features/data/CreateDosingProtocols.tsx
@@ -32,6 +32,44 @@ function findFieldByType(type: string, state: StepperState) {
   );
 }
 
+/**
+ * Assign an administration ID to each dosing row based on the dosing compartment and group ID.
+ * @param dosingRows
+ * @param administrationIdField
+ * @param groupIdField
+ * @returns an array of modified dosing rows.
+ */
+function generateAdministrationIds(
+  dosingRows: Row[],
+  administrationIdField: string,
+  groupIdField: string,
+) {
+  const dosingCompartments = [
+    ...new Set(dosingRows.map((row) => row["Amount Variable"])),
+  ];
+  const groupIds = dosingRows.map((row) => row[groupIdField]);
+  const uniqueGroupIds = [...new Set(groupIds)];
+  const administrationIds: string[] = [];
+  dosingRows.forEach((row) => {
+    const groupIndex = uniqueGroupIds.indexOf(row[groupIdField]) + 1;
+    const compartmentIndex = dosingCompartments.indexOf(row["Amount Variable"]);
+    const adminId = `${compartmentIndex * 10 + groupIndex}`;
+    if (row[administrationIdField] !== adminId) {
+      row[administrationIdField] = adminId;
+    }
+    administrationIds.push(adminId);
+  });
+  return dosingRows;
+}
+
+/**
+ * Create dosing rows for each subject and dosing compartment.
+ * Each row has an administration ID based on the dosing compartment and group ID.
+ * @param state stepper state
+ * @param administrationIdField column name for administration ID
+ * @param dosingCompartments dosing compartments for the model
+ * @param amountUnit amount unit for the model (either pmol or pmol/kg.)
+ */
 function createDosingRows(
   state: StepperState,
   administrationIdField: string,
@@ -49,6 +87,7 @@ function createDosingRows(
   const nextData = [...state.data];
   const uniqueIds = new Set(nextData.map((row) => row[idField]));
   const uniqueGroupIds = [...new Set(nextData.map((row) => row["Group ID"]))];
+  const newRows: Row[] = [];
   dosingCompartments.forEach((compartment, index) => {
     uniqueIds.forEach((id) => {
       const subjectRow = state.data.find((row) => row[idField] === id);
@@ -74,10 +113,11 @@ function createDosingRows(
       covariateFields.forEach((field) => {
         newRow[field] = subjectRow?.[field] || "";
       });
-      nextData.push(newRow);
+      newRows.push(newRow);
     });
   });
-  state.setData(nextData);
+  newRows.sort((a, b) => parseInt(a[idField]) - parseInt(b[idField]));
+  state.setData([...nextData, ...newRows]);
   state.setNormalisedFields(
     new Map([
       ...state.normalisedFields.entries(),
@@ -154,8 +194,9 @@ const CreateDosingProtocols: FC<IDosingProtocols> = ({
   );
   const amountUnitField = findFieldByType("Amount Unit", state);
   const timeField = findFieldByType("Time", state);
+  const groupIdField = findFieldByType("Group ID", state);
   // ignore rows with no amount and administration ID set to 0.
-  const dosingRows: Row[] = state.data.filter((row) =>
+  let dosingRows: Row[] = state.data.filter((row) =>
     parseInt(row[administrationIdField]),
   );
   if (!dosingRows.length) {
@@ -175,10 +216,12 @@ const CreateDosingProtocols: FC<IDosingProtocols> = ({
     state.setNormalisedFields(newNormalisedFields);
     state.setData(newData);
   }
-
-  const administrationIds = administrationIdField
-    ? dosingRows.map((row) => row[administrationIdField])
-    : [];
+  dosingRows = generateAdministrationIds(
+    dosingRows,
+    administrationIdField,
+    groupIdField,
+  );
+  const administrationIds = dosingRows.map((row) => row[administrationIdField]);
   const uniqueAdministrationIds = [...new Set(administrationIds)];
 
   const isAmount = (variable: VariableRead) => {
@@ -297,7 +340,7 @@ const CreateDosingProtocols: FC<IDosingProtocols> = ({
                   <TableRow key={adminId}>
                     <TableCell sx={{ width: "5rem" }}>{adminId}</TableCell>
                     <TableCell sx={{ width: "5rem" }}>
-                      {currentRow?.["Group ID"]}
+                      {currentRow?.[groupIdField]}
                     </TableCell>
                     <TableCell sx={{ width: "10rem" }}>
                       <FormControl fullWidth>

diff --git a/frontend-v2/src/features/data/DosingProtocols.tsx b/frontend-v2/src/features/data/DosingProtocols.tsx
@@ -38,7 +38,7 @@ interface IDosingProtocols {
   };
 }
 
-function findFieldByName(name: string, state: StepperState) {
+function findFieldByType(name: string, state: StepperState) {
   return (
     state.fields.find((field) => state.normalisedFields.get(field) === name) ||
     name
@@ -54,12 +54,12 @@ const DosingProtocols: FC<IDosingProtocols> = ({
   variables,
   notificationsInfo,
 }: IDosingProtocols) => {
-  const amountField = findFieldByName("Amount", state);
-  const amountVariableField = findFieldByName("Amount Variable", state);
-  const timeField = findFieldByName("Time", state);
-  const timeUnitField = findFieldByName("Time Unit", state);
-  const addlDosesField = findFieldByName("Additional Doses", state);
-  const interDoseField = findFieldByName("Interdose Interval", state);
+  const amountField = findFieldByType("Amount", state);
+  const amountVariableField = findFieldByType("Amount Variable", state);
+  const timeField = findFieldByType("Time", state);
+  const timeUnitField = findFieldByType("Time Unit", state);
+  const addlDosesField = findFieldByType("Additional Doses", state);
+  const interDoseField = findFieldByType("Interdose Interval", state);
   const dosingRows: Row[] = amountField
     ? state.data.filter(
         (row) =>