From 9bd69f7a07240f80e0cca38301827c12c0472969 Mon Sep 17 00:00:00 2001
From: ISA <Ismail.ali@littwin-systemtechnik.de>
Date: Thu, 24 Jul 2025 09:32:56 +0200
Subject: [PATCH] =?UTF-8?q?feat=20Schleifeund=20TDR=20in=20sepaterate=20Be?=
 =?UTF-8?q?reiche=20in=20K=C3=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 .env.production                               |   2 +-
 CHANGELOG.md                                  |   5 +
 .../kabelueberwachung/kue705FO/Kue705FO.tsx   | 112 ++++++------------
 .../SERVICE/kabelueberwachungMockData.js      |   2 +-
 package-lock.json                             |   4 +-
 package.json                                  |   2 +-
 7 files changed, 49 insertions(+), 80 deletions(-)

diff --git a/.env.development b/.env.development
index 38804fb..2b6fa78 100644
--- a/.env.development
+++ b/.env.development
@@ -6,6 +6,6 @@ NEXT_PUBLIC_USE_MOCK_BACKEND_LOOP_START=false
 NEXT_PUBLIC_EXPORT_STATIC=false
 NEXT_PUBLIC_USE_CGI=false
 # App-Versionsnummer
-NEXT_PUBLIC_APP_VERSION=1.6.641
+NEXT_PUBLIC_APP_VERSION=1.6.642
 NEXT_PUBLIC_CPL_MODE=json   # json (Entwicklungsumgebung) oder jsSimulatedProd (CPL ->CGI-Interface-Simulator) oder production (CPL-> CGI-Interface Platzhalter)
 
diff --git a/.env.production b/.env.production
index 23c26e7..8b6eb7d 100644
--- a/.env.production
+++ b/.env.production
@@ -5,5 +5,5 @@ NEXT_PUBLIC_CPL_API_PATH=/CPL
 NEXT_PUBLIC_EXPORT_STATIC=true
 NEXT_PUBLIC_USE_CGI=true
 # App-Versionsnummer
-NEXT_PUBLIC_APP_VERSION=1.6.641
+NEXT_PUBLIC_APP_VERSION=1.6.642
 NEXT_PUBLIC_CPL_MODE=production
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1ec4a9..2ecc14e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [1.6.642] – 2025-07-24
+
+- feat: Isowert und Schleifenwiderstanf in schwarzen Display zusammen
+
+---
 ## [1.6.641] – 2025-07-24
 
 - Hide fallsensors
diff --git a/components/main/kabelueberwachung/kue705FO/Kue705FO.tsx b/components/main/kabelueberwachung/kue705FO/Kue705FO.tsx
index a40ac51..070c5eb 100644
--- a/components/main/kabelueberwachung/kue705FO/Kue705FO.tsx
+++ b/components/main/kabelueberwachung/kue705FO/Kue705FO.tsx
@@ -168,7 +168,7 @@ const Kue705FO: React.FC<Kue705FOProps> = ({
 
   return (
     <div
-      className="relative bg-gray-300 w-[7.25rem] h-[24.375rem] border border-gray-400 transform laptop:-translate-y-12 2xl:-translate-y-0
+      className="relative bg-gray-300 w-[7.25rem] h-[30.375rem] border border-gray-400 transform laptop:-translate-y-12 2xl:-translate-y-0
              scale-100 sm:scale-95 md:scale-100 lg:scale-105 xl:scale-90 2xl:scale-125 top-3 qhd:scale-150 qhd:-translate-y-0"
     >
       {kueOnline === 1 ? (
@@ -295,96 +295,60 @@ const Kue705FO: React.FC<Kue705FOProps> = ({
               {kueVersion}
             </div>
           </div>
-          <div className="flex mt-3 space-x-[0.063rem] ">
-            <button
-              onClick={() =>
-                handleButtonClick(
-                  "Schleife",
-                  setActiveButton,
-                  setloopTitleText,
-                  (value) =>
-                    setLoopDisplayValue(
-                      typeof value === "number" ? value : Number(value)
-                    ), // Hier sicherstellen, dass nur number übergeben wird
-                  Number(schleifenwiderstand), // <- Stelle sicher, dass es eine Zahl ist
-                  tdrLocation,
-                  dispatch,
-                  slotIndex
-                )
-              }
-              className={`w-[50%] h-[1.563rem] text-white text-[0.625rem] flex items-center justify-center ${
-                activeButton === "Schleife" ? "bg-littwin-blue" : "bg-gray-400"
-              }`}
-            >
-              Schleife
-            </button>
-            <button
-              onClick={() => {
-                setActiveButton("TDR");
-                setloopTitleText("Entfernung [km]");
 
-                const latestTdrDistanceMeters =
-                  Array.isArray(tdmChartData?.[slotIndex]) &&
-                  tdmChartData[slotIndex].length > 0 &&
-                  typeof tdmChartData[slotIndex][0].d === "number"
-                    ? tdmChartData[slotIndex][0].d
-                    : 0;
-
-                const latestTdrDistance = Number(
-                  (latestTdrDistanceMeters / 1000).toFixed(3)
-                );
-                setLoopDisplayValue(latestTdrDistance);
-              }}
-              className={`w-[50%] h-[1.563rem] text-white text-[0.625rem] flex items-center justify-center ${
-                Array.isArray(tdrActive) && tdrActive[slotIndex] === 0
-                  ? "bg-gray-200 cursor-not-allowed" // Deaktiviert: Hellgrau
-                  : activeButton === "TDR"
-                  ? "bg-littwin-blue" // Aktiviert: Littwin Blau
-                  : "bg-gray-400" // Nicht geklickt: Dunkelgrau
-              }`}
-              disabled={Array.isArray(tdrActive) && tdrActive[slotIndex] === 0} // Button deaktiviert, wenn TDR für diesen Slot nicht aktiv ist
-            >
-              TDR
-            </button>
-          </div>
-
-          {/* loopDisplay: Zeigt Schleifenwiderstand oder TDR-Distanz an, je nach Modus */}
-          <div className="absolute bottom-[0.063rem] left-[0.068rem] w-[7.074rem] h-[4.1rem] bg-gray-300 border-[0.094rem] border-gray-400 p-[0.063rem]">
+          {/* Schleifenwiderstand Bereich */}
+          <div className="absolute bottom-[5.963rem] left-[0.068rem] w-[7.074rem] h-[4.1rem] bg-gray-300 border-[0.094rem] border-gray-400 p-[0.063rem]">
             <span className="text-black text-[0.438rem] absolute top-[0.125rem] left-[0.063rem] mt-1">
-              {loopTitleText}
+              Schleifenwiderstand [kOhm]
             </span>
-
-            <div className="relative w-full h-[2.813rem]  bg-gray-100 border border-gray-400 flex items-center justify-center mt-4">
+            <div className="relative w-full h-[2.813rem] bg-gray-100 border border-gray-400 flex items-center justify-center mt-4">
               <button
-                onClick={refreshClick} // Dynamische Funktion basierend auf aktivem Button
+                onClick={() =>
+                  handleRefreshClick("Schleife", slotIndex, setLoading)
+                }
                 className="absolute -top-[0.063rem] -right-[0.063rem] w-[1.25rem] h-[1.25rem] bg-gray-400 flex items-center justify-center"
-                disabled={loading} // Disable button while loading
+                disabled={loading}
               >
                 <span className="text-white text-[1.125rem]">⟳</span>
               </button>
-
               <div className="absolute bottom-[0.313rem] left-1/2 transform -translate-x-1/2 w-[6.25rem] flex justify-center items-center">
                 <div className="text-center text-black text-[0.625rem]">
                   <p>
-                    {loopDisplayValue +
-                      (activeButton === "Schleife" ? " kOhm" : " km")}
+                    {typeof schleifenwiderstand === "number"
+                      ? schleifenwiderstand
+                      : Number(schleifenwiderstand)}{" "}
+                    kOhm
                   </p>
                 </div>
               </div>
             </div>
-
-            {/* Messkurven-Button moved below the module */}
-            {/* Sensoren anzeigen */}
-            {
-              /* if Kabelüberwachungsmodul online (kue_online ) */
-              kueOnline === 1 && win_fallSensorsActive === 1 && false && (
-                <div className="mt-4 w-full flex justify-center">
-                  <FallSensors />
-                </div>
-              )
-            }
           </div>
 
+          {/* TDR Bereich */}
+          {Array.isArray(tdrActive) && tdrActive[slotIndex] === 1 && (
+            <div className="absolute bottom-[0.063rem] left-[0.068rem] w-[7.074rem] h-[4.1rem] bg-gray-300 border-[0.094rem] border-gray-400 p-[0.063rem]">
+              <span className="text-black text-[0.438rem] absolute top-[0.125rem] left-[0.063rem] mt-1">
+                TDR Entfernung [km]
+              </span>
+              <div className="relative w-full h-[2.813rem] bg-gray-100 border border-gray-400 flex items-center justify-center mt-4">
+                <button
+                  onClick={() =>
+                    handleRefreshClick("TDR", slotIndex, setLoading)
+                  }
+                  className="absolute -top-[0.063rem] -right-[0.063rem] w-[1.25rem] h-[1.25rem] bg-gray-400 flex items-center justify-center"
+                  disabled={loading}
+                >
+                  <span className="text-white text-[1.125rem]">⟳</span>
+                </button>
+                <div className="absolute bottom-[0.313rem] left-1/2 transform -translate-x-1/2 w-[6.25rem] flex justify-center items-center">
+                  <div className="text-center text-black text-[0.625rem]">
+                    <p>{latestTdrDistance} km</p>
+                  </div>
+                </div>
+              </div>
+            </div>
+          )}
+
           {/* Modal für Einstellungen */}
         </>
       ) : (
diff --git a/mocks/device-cgi-simulator/SERVICE/kabelueberwachungMockData.js b/mocks/device-cgi-simulator/SERVICE/kabelueberwachungMockData.js
index 262281b..ded1757 100644
--- a/mocks/device-cgi-simulator/SERVICE/kabelueberwachungMockData.js
+++ b/mocks/device-cgi-simulator/SERVICE/kabelueberwachungMockData.js
@@ -171,7 +171,7 @@ var win_kueName = [
 
 //-------------TDR---------------------------------------------------
 var win_tdrActive = [
-  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+  1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
   1, 1, 1, 1, 1, 1,
 ];
 //----------------------------------------------------
diff --git a/package-lock.json b/package-lock.json
index 5857b12..84bda10 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "cpl-v4",
-  "version": "1.6.641",
+  "version": "1.6.642",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cpl-v4",
-      "version": "1.6.641",
+      "version": "1.6.642",
       "dependencies": {
         "@fontsource/roboto": "^5.1.0",
         "@headlessui/react": "^2.2.4",
diff --git a/package.json b/package.json
index 6f931ab..f7a70fe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cpl-v4",
-  "version": "1.6.641",
+  "version": "1.6.642",
   "private": true,
   "scripts": {
     "dev": "next dev",