Merge pull request I-TECH-UW#507 from mozzy11/2.8

improve pathology case view Dash board
mozzy11 · Aug 14, 2023 · 4be1839 · 4be1839
2 parents 89b2e46 + a2c330b
commit 4be1839
Show file tree

Hide file tree

Showing 5 changed files with 380 additions and 314 deletions.
diff --git a/frontend/src/components/admin/calculatedValue/CalculatedValueForm.tsx b/frontend/src/components/admin/calculatedValue/CalculatedValueForm.tsx
@@ -55,7 +55,7 @@ const CalculatedValue: React.FC<CalculatedValueProps> = () => {
  const [showConfirmBox, setShowConfirmBox] = useState(true);
  const [sampleList, setSampleList] = useState([]);
  const [sampleTestList, setSampleTestList] = useState(TestListObj);
- const [loaded, setLoaded] = useState(false);
+ const [loading, setLoading] = useState(true);
  const { notificationVisible, setNotificationVisible, setNotificationBody } = useContext<NotificationContextType>(NotificationContext);
  const [mathFunctions, setMathFunctions] = useState([mathFunction]);
 
@@ -89,6 +89,7 @@ const CalculatedValue: React.FC<CalculatedValueProps> = () => {
  })
  });
  }
+ setLoading(false)
  }
  }
 
@@ -208,7 +209,6 @@ const CalculatedValue: React.FC<CalculatedValueProps> = () => {
 
  const fetchTests = (testList: any, field: TestListField, index: number, item_index: number) => {
  loadSampleTestList(field, index, item_index, testList);
- setLoaded(true)
  }
 
  function handleTestSelection(id: number, index: number) {
@@ -454,6 +454,9 @@ const CalculatedValue: React.FC<CalculatedValueProps> = () => {
  return (
  <div className='adminPageContent'>
  {notificationVisible === true ? <AlertDialog /> : ""}
+ {loading && (
+ <Loading></Loading>
+ )}
  {calculationList.map((calculation, index) => (
  <div key={index} className="rules" >
  <div className="first-division">