Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-new-dashboard' into 'master'

Browse Source 
Fix new dashboard

See merge request fronk/thetool!919
This commit is contained in:
Luca Haid
2025-01-16 15:13:40 +00:00
parent e9422e2991 2fb22b11f4
commit 0e883aca0c
2 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/DashboardNew/DashboardNewController.php
View File

@@ -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"]),

19
public/js/pages/DashboardNew/DashboardNew.js
View File

@@ -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>