From bc8eadc783aa8e582ffac4963c75a8c5bbce367f Mon Sep 17 00:00:00 2001
From: mdulko <mdulko@soldevelo.com>
Date: Thu, 14 Mar 2024 18:39:23 +0100
Subject: [PATCH] OLMIS-7903: Adjust BUQ colours with core UI and fix
 displaying district names

---
 src/buq/_buq.scss                                   |  4 ++--
 src/buq/components/approveBuq/ApproveBuq.jsx        |  2 +-
 .../CreateAuthorizeForecasting.jsx                  |  2 +-
 .../_createAuthorizeForecasting.scss                | 13 ++++++++-----
 src/react-hooks/useGeographicZoneGroup.jsx          |  2 +-
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/buq/_buq.scss b/src/buq/_buq.scss
index c7b1e9c3..e0549e4d 100644
--- a/src/buq/_buq.scss
+++ b/src/buq/_buq.scss
@@ -28,8 +28,8 @@
 
     .category-row {
       td {
-        background: linear-gradient(to bottom, #1eb2bb, #1b9da5 10%, #17888F);
-        color: white;
+        background-color: #3A95BC;
+        color: #fff;
       }
     }
 
diff --git a/src/buq/components/approveBuq/ApproveBuq.jsx b/src/buq/components/approveBuq/ApproveBuq.jsx
index 7ffda017..ddf65940 100644
--- a/src/buq/components/approveBuq/ApproveBuq.jsx
+++ b/src/buq/components/approveBuq/ApproveBuq.jsx
@@ -157,7 +157,7 @@ const ApproveBuq = ({
         accessor: "id",
         Cell: ({ value }) => (
           <Link to={`/buq/approve/${value}`}>
-            <ResponsiveButton className="proceed">
+            <ResponsiveButton className="primary">
               <span>View</span>
             </ResponsiveButton>
           </Link>
diff --git a/src/buq/components/createAuthorizeForecasting/CreateAuthorizeForecasting.jsx b/src/buq/components/createAuthorizeForecasting/CreateAuthorizeForecasting.jsx
index 0a7d4a62..8b7245d8 100644
--- a/src/buq/components/createAuthorizeForecasting/CreateAuthorizeForecasting.jsx
+++ b/src/buq/components/createAuthorizeForecasting/CreateAuthorizeForecasting.jsx
@@ -152,7 +152,7 @@ const CreateAuthorizeForecasting = ({ loadingModalService }) => {
           Cell: ({ value, row }) => {
             return (
               <ResponsiveButton
-                className='proceed'
+                className='primary'
                 onClick={() =>
                   checkRightsAndProceed(row.original.status, value)
                 }
diff --git a/src/buq/components/createAuthorizeForecasting/_createAuthorizeForecasting.scss b/src/buq/components/createAuthorizeForecasting/_createAuthorizeForecasting.scss
index 38e7df8c..45752717 100644
--- a/src/buq/components/createAuthorizeForecasting/_createAuthorizeForecasting.scss
+++ b/src/buq/components/createAuthorizeForecasting/_createAuthorizeForecasting.scss
@@ -18,12 +18,15 @@
     }
 
     .proceed {
+      padding: 8px 16px;
       border-radius: 4px;
-      border: 1px solid $brand-blue;
-      background: $brand-blue;
-      color: #FFF;
-      text-shadow: 0 0 0.1em #333;
-      background-image: linear-gradient(to bottom, #1eb2bb, #1b9da5 10%, #17888F);
+      border-top: #3A95BC 1px solid;
+      border-right: #3A95BC 1px solid;
+      border-left: #3A95BC 1px solid;
+      border-bottom: #3A95BC 1px solid;
+      color: #fff;
+      text-shadow: 0px 0px 0.1em #333;
+      background: #3A95BC linear-gradient(to bottom, #5cabcd, #49a1c7 10%, #3A95BC);
 
       &:hover {
         background-image: none;
diff --git a/src/react-hooks/useGeographicZoneGroup.jsx b/src/react-hooks/useGeographicZoneGroup.jsx
index 3c4efe76..747f4784 100644
--- a/src/react-hooks/useGeographicZoneGroup.jsx
+++ b/src/react-hooks/useGeographicZoneGroup.jsx
@@ -45,7 +45,7 @@ const useGeographicZoneGroup = () => {
       const region = allGeographicZone?.find((reg) => reg.id === item.value);
       return {
         ...item,
-        name: `${region?.name} - ${region?.level.name}` || '',
+        name: `${region?.name} - ${region?.level.code}` || '',
       };
     });
     setGeographicZoneParams(newResult);