BAH-3946 | Bahmniapps CSS bleeding into Intake Output display control

Bahmni · Jun 10, 2024 · a7f171f · a7f171f
1 parent fad9ee8
commit a7f171f
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/build_publish.yml b/.github/workflows/build_publish.yml
@@ -2,7 +2,7 @@ name: 🏗️ Build and Publish
 on:
   push:
     branches:
-      - main
+      - Bahmni-IPD-master
     paths-ignore:
       - "**.md"
   workflow_run:

diff --git a/.github/workflows/validate_pull_request.yml b/.github/workflows/validate_pull_request.yml
@@ -5,7 +5,7 @@ name: Workflow to validate PRs
 
 on:
   pull_request:
-    branches: [main]
+    branches: [Bahmni-IPD-master]
 
 jobs:
   build:

diff --git a/src/features/DisplayControls/IntakeOutput/components/IntakeOutput.jsx b/src/features/DisplayControls/IntakeOutput/components/IntakeOutput.jsx
@@ -196,7 +196,7 @@ const IntakeOutput = () => {
     callFetchIntakeAndOutputData();
   }, []);
   return (
-    <div className="container display-container">
+    <div className="form-dc-container display-container">
       <div className={"navigation"}>
         <div className="period-header">
           <Button

diff --git a/src/features/DisplayControls/IntakeOutput/styles/IntakeOutputTable.scss b/src/features/DisplayControls/IntakeOutput/styles/IntakeOutputTable.scss
@@ -46,7 +46,7 @@
   grid-row: 2;
 }
 
-.container {
+.form-dc-container {
   display: flex;
   flex-direction: column;
   position: relative;

diff --git a/src/features/DisplayControls/PatientFeedingRecord/components/PatientFeedingRecord.jsx b/src/features/DisplayControls/PatientFeedingRecord/components/PatientFeedingRecord.jsx
@@ -201,7 +201,7 @@ const PatientFeedingRecord = () => {
     callFetchPatientFeedingRecordData();
   }, []);
   return (
-    <div className="container display-container">
+    <div className="form-dc-container display-container">
       <div className={"navigation"}>
         <div className="period-header">
           <Button

diff --git a/...splayControls/PatientFeedingRecord/tests/__snapshots__/patientFeedingRecord.spec.jsx.snap b/...splayControls/PatientFeedingRecord/tests/__snapshots__/patientFeedingRecord.spec.jsx.snap
@@ -3,7 +3,7 @@
 exports[`PatientFeedingRecord should render PatientFeedingRecord 1`] = `
 <div>
   <div
-    class="container display-container"
+    class="form-dc-container display-container"
   >
     <div
       class="navigation"
@@ -75,7 +75,7 @@ exports[`PatientFeedingRecord should render PatientFeedingRecord 1`] = `
           <div
             class="period-time"
           >
-            10 May 2024
+            31 Aug 2021
              
             <span
               class="mr-5"
@@ -109,7 +109,7 @@ exports[`PatientFeedingRecord should render PatientFeedingRecord 1`] = `
               to
             </span>
              
-            11 May 2024
+            01 Sep 2021
              
             <span
               class="mr-5"

diff --git a/src/features/DisplayControls/PatientFeedingRecord/tests/patientFeedingRecord.spec.jsx b/src/features/DisplayControls/PatientFeedingRecord/tests/patientFeedingRecord.spec.jsx
@@ -66,6 +66,7 @@ describe("PatientFeedingRecordTable", () => {
 
 describe("PatientFeedingRecord", () => {
   it("should render PatientFeedingRecord", () => {
+    MockDate.set("2021-09-01T00:00:00.000Z");
     const { container } = render(
       <IPDContext.Provider
         value={{ config: mockConfig, visitSummary: mockVisitSummaryData }}