Merge branch 'uat' into quy_fe

src/_components/boxChart/boxChart.scss

@@ -7,6 +7,10 @@
   display: flex;
   flex-direction: column;
 
+  @media (max-width: 1750px) {
+    max-width: 250px;
+  }
+
   .box-chart-title {
     font-size: 2rem;
     font-weight: 700;
@@ -50,12 +54,12 @@
   }
 
   .chart-container {
-    // max-width: 360px;
     overflow-x: scroll;
     height: 100%;
+    width: 300px;
 
     @media (max-width: 1750px) {
-      max-width: 300px;
+      max-width: 220px;
     }
   }
 }

src/_screens/home/detail-room-education/detailRoomEducation.style.scss

@@ -4,7 +4,7 @@
   display: flex;
 
   .detail-room-education-left-side {
-    width: 48%;
+    width: 43%;
     border-right: 1px solid #c7c7c7;
     display: flex;
     flex-direction: column;
@@ -29,6 +29,7 @@
     .detail-room-education-right-p-h {
       padding-right: 32px;
     }
+
     .detail-room-education-list-container {
       padding: 2rem 0;
       display: flex;
@@ -37,13 +38,16 @@
 
       .detail-room-education-header {
         width: 100%;
+
         .detail-room-education-list-header {
           justify-content: space-around;
-          margin: 12px 32px;
-          gap: 32px;
+          margin: 12px;
+          gap: 12px;
+
           .criteria-manage-search-input {
             height: 46px;
             border-radius: 40px;
+
             @include screen_pc_sm {
               height: 36px;
             }
@@ -62,7 +66,7 @@
         display: flex;
         flex-direction: column;
         padding-bottom: 16px;
-        padding-left: 32px;
+        padding-left: 16px;
 
         @include screen_pc_sm {
           gap: 16px;

src/_screens/home/detail-room-education/index.js

@@ -441,24 +441,24 @@ export default function DetailRoomEducation() {
                     </PrimaryButton>
                 </div>
               </div>
-              <div className="flex gap-16 align-item-center" style={{padding: '1rem 3.2rem'}}>
+              <div className="flex gap-16 align-item-center" style={{padding: '1rem'}}>
                 <RootSelect
                   data={LIST_SCHOOL_YEAR}
                   value={schoolYear}
                   setValue={setSchoolYear}
-                  style={{flex: 1,minWidth: '100px'}}
+                  style={{flex: 1, minWidth: '200px', padding:'0 10px'}}
                 />
                 <RootSelect
                   data={LIST_SEMESTER}
                   value={semester}
                   setValue={changeSemester}
-                  style={{flex: 0.5,minWidth: '200px'}}
+                  style={{flex: 0.5, minWidth: '151px', padding:'0 10px'}}
                 />
                 <RootSelect
                   data={getListMonthBySemester(semester.value)}
                   value={month}
                   setValue={setMonth}
-                  style={{flex: 0.5,minWidth: '180px'}}
+                  style={{flex: 0.5, minWidth: '150px', padding:'0 10px'}}
                 />
                 <PrimaryButton onClick={handleFilter}>
                   Áp dụng