Merge pull request #14548 from transcom/B-22055-QAE-Report

B-22055
transcom · Jan 10, 2025 · 0974c86 · 0974c86
2 parents 60288aa + ee318f0
commit 0974c86
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/src/pages/Office/EvaluationReports/EvaluationReports.jsx b/src/pages/Office/EvaluationReports/EvaluationReports.jsx
@@ -113,6 +113,24 @@ const EvaluationReports = ({ customerInfo, grade, destinationDutyLocationPostalC
         <Grid row>
           <h1>Quality assurance reports</h1>
         </Grid>
+        <GridContainer className={evaluationReportsStyles.evaluationReportSection}>
+          <Grid row>
+            <ShipmentQAEReports
+              reports={shipmentEvaluationReports}
+              shipments={shipments}
+              moveCode={moveCode}
+              customerInfo={customerInfo}
+              grade={grade}
+              destinationDutyLocationPostalCode={destinationDutyLocationPostalCode}
+              emptyText="No QAE reports have been submitted for this shipment"
+              setReportToDelete={setReportToDelete}
+              setIsDeleteModalOpen={setIsDeleteModalOpen}
+              isDeleteModalOpen={isDeleteModalOpen}
+              deleteReport={deleteReport}
+              isMoveLocked={isMoveLocked}
+            />
+          </Grid>
+        </GridContainer>
         <GridContainer className={evaluationReportsStyles.evaluationReportSection}>
           <Grid row className={evaluationReportsStyles.counselingHeadingContainer}>
             <h2>Counseling QAE reports ({counselingEvaluationReports.length})</h2>
@@ -143,24 +161,6 @@ const EvaluationReports = ({ customerInfo, grade, destinationDutyLocationPostalC
             />
           </Grid>
         </GridContainer>
-        <GridContainer className={evaluationReportsStyles.evaluationReportSection}>
-          <Grid row>
-            <ShipmentQAEReports
-              reports={shipmentEvaluationReports}
-              shipments={shipments}
-              moveCode={moveCode}
-              customerInfo={customerInfo}
-              grade={grade}
-              destinationDutyLocationPostalCode={destinationDutyLocationPostalCode}
-              emptyText="No QAE reports have been submitted for this shipment"
-              setReportToDelete={setReportToDelete}
-              setIsDeleteModalOpen={setIsDeleteModalOpen}
-              isDeleteModalOpen={isDeleteModalOpen}
-              deleteReport={deleteReport}
-              isMoveLocked={isMoveLocked}
-            />
-          </Grid>
-        </GridContainer>
       </GridContainer>
     </div>
   );

diff --git a/src/pages/Office/EvaluationReports/EvaluationReports.test.jsx b/src/pages/Office/EvaluationReports/EvaluationReports.test.jsx
@@ -75,8 +75,8 @@ describe('EvaluationReports', () => {
       const h1 = await screen.getByRole('heading', { name: 'Quality assurance reports', level: 1 });
       expect(h1).toBeInTheDocument();
 
-      expect(await screen.getByRole('heading', { name: 'Counseling QAE reports (0)', level: 2 })).toBeInTheDocument();
       expect(await screen.getByRole('heading', { name: 'Shipment QAE reports (0)', level: 2 })).toBeInTheDocument();
+      expect(await screen.getByRole('heading', { name: 'Counseling QAE reports (0)', level: 2 })).toBeInTheDocument();
     });
 
     it('create report button is disabled when move is locked', async () => {