From 2fb22b11f4c0ece3dba8b73f165c065501546efe Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Thu, 16 Jan 2025 15:13:39 +0000
Subject: [PATCH] Fix new dashboard

---
 .../DashboardNew/DashboardNewController.php   |  6 +++---
 public/js/pages/DashboardNew/DashboardNew.js  | 19 +++----------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/application/DashboardNew/DashboardNewController.php b/application/DashboardNew/DashboardNewController.php
index 739184b4a..9e6b12c89 100644
--- a/application/DashboardNew/DashboardNewController.php
+++ b/application/DashboardNew/DashboardNewController.php
@@ -191,7 +191,7 @@ class DashboardNewController extends mfBaseController {
                 'type' => 'rml',
                 'order_max_home_addrdb' => $order_max_homes,
                 'order_actual_order' => $countFunction([]),
-                'order_energie_steiermark' => $countFunction(["partner_id" => [20,5033, 3151, 7685, 7754, 7764]]),
+                'order_energie_steiermark' => $countFunction(["partner_id" => [209,5033, 3151, 7685, 7754, 7764]]),
                 'order_magenta' => $countFunction(["partner_id" => 4803]),
                 'order_salzburg_ag' => $countFunction(["partner_id" => 5668]),
                 'baufortschritt_140' => $baufortschritt_140,
@@ -212,10 +212,10 @@ class DashboardNewController extends mfBaseController {
                 'timeline_ont_installed' => $timeline_ont_installiert_300,
 
                 // status 244 245 -
-                'status_244_245_energie_steiermark' => $countFunction(["partner_id" => [20,5033, 3151, 7685, 7754, 7764], ">status_code" => "243", "<status_code" => "899"]),
+                'status_244_245_energie_steiermark' => $countFunction(["partner_id" => [209,5033, 3151, 7685, 7754, 7764], ">status_code" => "243", "<status_code" => "899"]),
                 'status_244_245_magenta' => $countFunction(["partner_id" => 4803, ">status_code" => "243", "<status_code" => "899"]),
                 'status_244_245_salzburg_ag' => $countFunction(["partner_id" => 5668, ">status_code" => "243", "<status_code" => "899"]),
-                'status_500_energy_steiermark' => $countFunction(["partner_id" => [20,5033, 3151, 7685, 7754, 7764], "status_code" => "500"]),
+                'status_500_energy_steiermark' => $countFunction(["partner_id" => [209,5033, 3151, 7685, 7754, 7764], "status_code" => "500"]),
                 'status_500_magenta' => $countFunction(["partner_id" => 4803, "status_code" => "500"]),
                 'status_500_salzburg_ag' => $countFunction(["partner_id" => 5668, "status_code" => "500"]),
 
diff --git a/public/js/pages/DashboardNew/DashboardNew.js b/public/js/pages/DashboardNew/DashboardNew.js
index e81393003..f0aa492e7 100644
--- a/public/js/pages/DashboardNew/DashboardNew.js
+++ b/public/js/pages/DashboardNew/DashboardNew.js
@@ -402,10 +402,6 @@ Vue.component('dashboard-rml', {
                      header="BEP installiert EFH"
                      icon="fas fa-plug"
                      :text="dashboardData.inhouse_kabel_verlegt_efh + ' / ' + dashboardData.order_efh + ' (' + Math.round((dashboardData.inhouse_kabel_verlegt_efh / dashboardData.order_efh) * 100) + '%)'"
-                     :sub-headers="[
-                'Magenta: ' + dashboardData.inhouse_kabel_verlegt_efh_magenta + ' (' + Math.round((dashboardData.inhouse_kabel_verlegt_efh_magenta / dashboardData.order_magenta) * 100) + '%)',
-                'Salzburg AG: ' + dashboardData.inhouse_kabel_verlegt_efh_salzburg + ' (' + Math.round((dashboardData.inhouse_kabel_verlegt_efh_salzburg / dashboardData.order_salzburg_ag) * 100) + '%)'
-                ]"
                      color="#007bff"
                  />
                  <tt-dashboard-display-card
@@ -422,30 +418,21 @@ Vue.component('dashboard-rml', {
                  <tt-dashboard-display-card
                      header="Installationsfortschritt Energie Steiermark"
                      icon="fas fa-bolt"
-                     :text="dashboardData.status_244_245_energie_steiermark + ' / ' + dashboardData.order_energie_steiermark + ' (' + Math.round((dashboardData.status_244_245_energie_steiermark / dashboardData.order_energie_steiermark) * 100) + '%)'"
-                     :sub-headers="[
-        'Status 500: ' + dashboardData.status_500_energy_steiermark + ' (' + Math.round((dashboardData.status_500_energy_steiermark / dashboardData.status_244_245_energie_steiermark) * 100) + '%)'
-    ]"
+                     :text="dashboardData.status_500_energy_steiermark + ' / ' + dashboardData.order_energie_steiermark + ' (' + Math.round((dashboardData.status_500_energy_steiermark / dashboardData.order_energie_steiermark) * 100) + '%)'"
                      color="#28a745"
                  />
 
                  <tt-dashboard-display-card
                      header="Installationsfortschritt Magenta"
                      icon="fas fa-mobile-alt"
-                     :text="dashboardData.status_244_245_magenta + ' / ' + dashboardData.order_magenta + ' (' + Math.round((dashboardData.status_244_245_magenta / dashboardData.order_magenta) * 100) + '%)'"
-                     :sub-headers="[
-        'Status 500: ' + dashboardData.status_500_magenta + ' (' + Math.round((dashboardData.status_500_magenta / dashboardData.status_244_245_magenta) * 100) + '%)'
-    ]"
+                        :text="dashboardData.status_500_magenta + ' / ' + dashboardData.order_magenta + ' (' + Math.round((dashboardData.status_500_magenta / dashboardData.order_magenta) * 100) + '%)'"
                      color="#E20074"
                  />
 
                  <tt-dashboard-display-card
                      header="Installationsfortschritt Salzburg AG"
                      icon="fas fa-plug"
-                     :text="dashboardData.status_244_245_salzburg_ag + ' / ' + dashboardData.order_salzburg_ag + ' (' + Math.round((dashboardData.status_244_245_salzburg_ag / dashboardData.order_salzburg_ag) * 100) + '%)'"
-                     :sub-headers="[
-        'Status 500: ' + dashboardData.status_500_salzburg_ag + ' (' + Math.round((dashboardData.status_500_salzburg_ag / dashboardData.status_244_245_salzburg_ag) * 100) + '%)'
-    ]"
+                        :text="dashboardData.status_500_salzburg_ag + ' / ' + dashboardData.order_salzburg_ag + ' (' + Math.round((dashboardData.status_500_salzburg_ag / dashboardData.order_salzburg_ag) * 100) + '%)'"
                      color="#0066B3"
                  />
                </div>