Merge branch 'development' of https://github.com/EyeSeeTea/amr-surveys …

…into fix/remove-treatment-and-indication-action
EyeSeeTea · Dec 20, 2024 · a2b532e · a2b532e
2 parents eb219f9 + 0a24903
commit a2b532e
Showing 1 changed file with 21 additions and 19 deletions.
diff --git a/src/webapp/components/survey/SurveyForm.tsx b/src/webapp/components/survey/SurveyForm.tsx
@@ -116,25 +116,7 @@ export const SurveyForm: React.FC<SurveyFormProps> = props => {
                     return (
                         <PaddedDiv key={stage.id}>
                             <Typography>{i18n.t(`Stage - ${stage.title}`)}</Typography>
-                            {stage.repeatable && (
-                                <RightAlignedDiv>
-                                    <Button
-                                        variant="contained"
-                                        color="primary"
-                                        onClick={() => addProgramStage(stage.code)}
-                                    >
-                                        {i18n.t(`Add Another ${stage.title}`)}
-                                    </Button>
-                                    {stage.isAddedByUser && (
-                                        <CancelButton
-                                            variant="outlined"
-                                            onClick={() => removeProgramStage(stage.id)}
-                                        >
-                                            {i18n.t(`Remove ${stage.title}`)}
-                                        </CancelButton>
-                                    )}
-                                </RightAlignedDiv>
-                            )}
+
                             {stage.sections.map(section => {
                                 if (!section.isVisible || section.isAntibioticSection) return null;
 
@@ -172,6 +154,26 @@ export const SurveyForm: React.FC<SurveyFormProps> = props => {
                                     />
                                 );
                             })}
+
+                            {stage.repeatable && (
+                                <RightAlignedDiv>
+                                    <Button
+                                        variant="contained"
+                                        color="primary"
+                                        onClick={() => addProgramStage(stage.code)}
+                                    >
+                                        {i18n.t(`Add Another ${stage.title}`)}
+                                    </Button>
+                                    {stage.isAddedByUser && (
+                                        <CancelButton
+                                            variant="outlined"
+                                            onClick={() => removeProgramStage(stage.id)}
+                                        >
+                                            {i18n.t(`Remove ${stage.title}`)}
+                                        </CancelButton>
+                                    )}
+                                </RightAlignedDiv>
+                            )}
                         </PaddedDiv>
                     );
                 })}