From 36113726698605fe8e65c7bfc0afd04a45bf16f1 Mon Sep 17 00:00:00 2001
From: Frank Schubert <fronk@fronk.at>
Date: Wed, 10 Jan 2024 21:29:01 +0100
Subject: [PATCH] Only admins can see new Dashboard

---
 Layout/default/Dashboard/Dashboard.php        | 183 ++++++++++++++++++
 Layout/default/Dashboard/Index.php            | 135 -------------
 application/Dashboard/DashboardController.php |   8 +-
 3 files changed, 187 insertions(+), 139 deletions(-)
 create mode 100644 Layout/default/Dashboard/Dashboard.php

diff --git a/Layout/default/Dashboard/Dashboard.php b/Layout/default/Dashboard/Dashboard.php
new file mode 100644
index 000000000..e318217d5
--- /dev/null
+++ b/Layout/default/Dashboard/Dashboard.php
@@ -0,0 +1,183 @@
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/header.php"); ?>
+
+    <!-- start page title -->
+    <div class="row mb-0">
+      <div class="col-12">
+        <div class="page-title-box">
+          <div class="page-title-right">
+            <ol class="breadcrumb m-0">
+              <li class="breadcrumb-item"><a href="javascript: void(0);"><?=MFAPPNAME_SLUG?></a></li>
+              <li class="breadcrumb-item active">Dashboard</li>
+            </ol>
+          </div>
+          
+        </div>
+      </div>
+    </div>
+    <!-- end page title --> 
+
+    <?php if(is_array($newss) && count($newss)): ?>
+      
+    
+      <?php foreach($newss as $news): ?>
+      <div class="row justify-content-center mt-0">
+        <div class="col-12 col-xl-10">
+          <h4>Neuigkeiten</h4>
+          <div class="card">
+            <div class="card-header bg-info text-white pt-1 pb-1" style="font-size: 1rem; font-weight: 400;">
+              <span><?=date("d.m.Y", $news->create)?>:</span>
+              <?php if($news->subject): ?>
+              <?=$news->subject?>
+              <?php endif; ?>
+            </div>
+            <div class="card-body pb-0 pt-1">
+              <div class="row col-12">
+                <div><?=$news->text?></div>
+              </div>
+            </div>
+            <div class="card-footer pt-1 pb-1 bg-light text-secondary text-monospace font-italic">
+              <?=$news->editor->name?>
+            </div>
+          </div>
+        </div>
+      </div>
+      <?php endforeach; ?>
+    <?php endif; ?>
+    
+    
+    <div class="row mt-4">
+      <div class="col-12">
+        
+        
+      
+        <div class="card border-top-success">
+          <div class="card-body">
+            
+            <div class="row mb-2">
+              <div class="col">
+                <label for="campaign_id">Kampagne:</label>
+                <select name="campaign_id" id="campaign_id" class="form-control">
+                  <option value="0">Alle</option>
+                  <?php foreach($campaigns as $c): ?>
+                    <option value="<?=$c->id?>" <?=($c->id == $campaign_id) ? 'selected="selected"' : ""?>><?=$c->name?></option>
+                  <?php endforeach; ?>
+                </select>
+              </div>
+            </div>
+            
+            <div class="row">
+              <div class="col-xl-3 col-lg-6">
+                <div class="card widget-flat no-shadow">
+                  <div class="card-body p-0 bg-danger">
+                    <div class="p-3 pb-0">
+                      <div class="float-right">
+                        <i class="mdi mdi-cart text-white widget-icon"></i>
+                      </div>
+                      <h5 class="text-white font-weight-normal mt-0">Bestellungen</h5>
+                      <h3 class="mt-2 text-white"><?=$count_orders?> / <?=$max_connections?></h3>
+                    </div>
+                    <div id="sparkline1"></div>
+                  </div> <!-- end card-body-->
+                </div> <!-- end card-->
+              </div> <!-- end col-->
+
+              <div class="col-xl-3 col-lg-6">
+                <div class="card widget-flat no-shadow">
+                  <div class="card-body p-0 bg-primary">
+                    <div class="p-3 pb-0">
+                      <div class="float-right">
+                        <i class="mdi mdi-cart text-white widget-icon"></i>
+                      </div>
+                      <h5 class="text-white font-weight-normal mt-0">Status BEP Installed (244, SD)</h5>
+                      <h3 class="mt-2 text-white"><?=$status_connected_single?> / <?=$count_orders?></h3>
+                    </div>
+                    <div id="sparkline1"></div>
+                  </div> <!-- end card-body-->
+                </div> <!-- end card-->
+              </div> <!-- end col-->
+
+              <div class="col-xl-3 col-lg-6">
+                <div class="card widget-flat no-shadow">
+                  <div class="card-body p-0 bg-info">
+                    <div class="p-3 pb-0">
+                      <div class="float-right">
+                        <i class="mdi mdi-cart text-white widget-icon"></i>
+                      </div>
+                      <h5 class="text-white font-weight-normal mt-0">Status OTO Installed (245, MD)</h5>
+                      <h3 class="mt-2 text-white"><?=$status_connected_multi?> / <?=$count_orders?></h3>
+                    </div>
+                    <div id="sparkline1"></div>
+                  </div> <!-- end card-body-->
+                </div> <!-- end card-->
+              </div> <!-- end col-->
+
+              <div class="col-xl-3 col-lg-6">
+                <div class="card widget-flat no-shadow">
+                  <div class="card-body p-0 bg-warning">
+                    <div class="p-3 pb-0">
+                      <div class="float-right">
+                        <i class="mdi mdi-cart text-dark widget-icon"></i>
+                      </div>
+                      <h5 class="text-dark font-weight-normal mt-0">Aktive Anschlüsse</h5>
+                      <h3 class="mt-2 text-dark"><?=$status_connected?> / <?=$count_orders?></h3>
+                    </div>
+                    <div id="sparkline1"></div>
+                  </div> <!-- end card-body-->
+                </div> <!-- end card-->
+              </div> <!-- end col-->
+            
+            </div>
+            
+            <div class="row mt-2">
+              <div class="col-lg">
+                <h4 class="card-title">Kunden pro Provider</h4>
+                <div class="row">
+                  <?php if(1): ?>
+                  <div class="col-lg-7">
+                    <canvas id="partner-chart" height="200"></canvas>
+                  </div>
+                  <div class="col-lg-5">
+                    <table>
+                      
+                    </table>
+                  </div>
+                  <?php else: ?>
+                    <i>Keine Aktiven Anschlüsse</i>
+                  <?php endif; ?>
+                </div>
+              </div>
+            </div>
+            
+          </div>
+        </div>
+      </div>
+
+    </div>
+    
+    <script type="text/javascript">
+      $(document).ready(function() {
+        $("#campaign_id").select2({
+          
+        });
+
+        $("#campaign_id").change(function() {
+          var cid = parseInt($(this).val());
+          <?php if($campaign_id): ?>
+          if(cid == <?=$campaign_id?>) {
+            return;
+          }
+          <?php endif; ?>
+
+          if(cid > 0) {
+            location.href="<?=self::getUrl("Dashboard")?>?campaign_id=" + cid;
+          } else {
+            location.href="<?=self::getUrl("Dashboard")?>";
+          }
+        });
+        
+        
+      });
+      
+    </script>
+
+<?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>
\ No newline at end of file
diff --git a/Layout/default/Dashboard/Index.php b/Layout/default/Dashboard/Index.php
index e318217d5..6b73dcf73 100644
--- a/Layout/default/Dashboard/Index.php
+++ b/Layout/default/Dashboard/Index.php
@@ -45,139 +45,4 @@
     <?php endif; ?>
     
     
-    <div class="row mt-4">
-      <div class="col-12">
-        
-        
-      
-        <div class="card border-top-success">
-          <div class="card-body">
-            
-            <div class="row mb-2">
-              <div class="col">
-                <label for="campaign_id">Kampagne:</label>
-                <select name="campaign_id" id="campaign_id" class="form-control">
-                  <option value="0">Alle</option>
-                  <?php foreach($campaigns as $c): ?>
-                    <option value="<?=$c->id?>" <?=($c->id == $campaign_id) ? 'selected="selected"' : ""?>><?=$c->name?></option>
-                  <?php endforeach; ?>
-                </select>
-              </div>
-            </div>
-            
-            <div class="row">
-              <div class="col-xl-3 col-lg-6">
-                <div class="card widget-flat no-shadow">
-                  <div class="card-body p-0 bg-danger">
-                    <div class="p-3 pb-0">
-                      <div class="float-right">
-                        <i class="mdi mdi-cart text-white widget-icon"></i>
-                      </div>
-                      <h5 class="text-white font-weight-normal mt-0">Bestellungen</h5>
-                      <h3 class="mt-2 text-white"><?=$count_orders?> / <?=$max_connections?></h3>
-                    </div>
-                    <div id="sparkline1"></div>
-                  </div> <!-- end card-body-->
-                </div> <!-- end card-->
-              </div> <!-- end col-->
-
-              <div class="col-xl-3 col-lg-6">
-                <div class="card widget-flat no-shadow">
-                  <div class="card-body p-0 bg-primary">
-                    <div class="p-3 pb-0">
-                      <div class="float-right">
-                        <i class="mdi mdi-cart text-white widget-icon"></i>
-                      </div>
-                      <h5 class="text-white font-weight-normal mt-0">Status BEP Installed (244, SD)</h5>
-                      <h3 class="mt-2 text-white"><?=$status_connected_single?> / <?=$count_orders?></h3>
-                    </div>
-                    <div id="sparkline1"></div>
-                  </div> <!-- end card-body-->
-                </div> <!-- end card-->
-              </div> <!-- end col-->
-
-              <div class="col-xl-3 col-lg-6">
-                <div class="card widget-flat no-shadow">
-                  <div class="card-body p-0 bg-info">
-                    <div class="p-3 pb-0">
-                      <div class="float-right">
-                        <i class="mdi mdi-cart text-white widget-icon"></i>
-                      </div>
-                      <h5 class="text-white font-weight-normal mt-0">Status OTO Installed (245, MD)</h5>
-                      <h3 class="mt-2 text-white"><?=$status_connected_multi?> / <?=$count_orders?></h3>
-                    </div>
-                    <div id="sparkline1"></div>
-                  </div> <!-- end card-body-->
-                </div> <!-- end card-->
-              </div> <!-- end col-->
-
-              <div class="col-xl-3 col-lg-6">
-                <div class="card widget-flat no-shadow">
-                  <div class="card-body p-0 bg-warning">
-                    <div class="p-3 pb-0">
-                      <div class="float-right">
-                        <i class="mdi mdi-cart text-dark widget-icon"></i>
-                      </div>
-                      <h5 class="text-dark font-weight-normal mt-0">Aktive Anschlüsse</h5>
-                      <h3 class="mt-2 text-dark"><?=$status_connected?> / <?=$count_orders?></h3>
-                    </div>
-                    <div id="sparkline1"></div>
-                  </div> <!-- end card-body-->
-                </div> <!-- end card-->
-              </div> <!-- end col-->
-            
-            </div>
-            
-            <div class="row mt-2">
-              <div class="col-lg">
-                <h4 class="card-title">Kunden pro Provider</h4>
-                <div class="row">
-                  <?php if(1): ?>
-                  <div class="col-lg-7">
-                    <canvas id="partner-chart" height="200"></canvas>
-                  </div>
-                  <div class="col-lg-5">
-                    <table>
-                      
-                    </table>
-                  </div>
-                  <?php else: ?>
-                    <i>Keine Aktiven Anschlüsse</i>
-                  <?php endif; ?>
-                </div>
-              </div>
-            </div>
-            
-          </div>
-        </div>
-      </div>
-
-    </div>
-    
-    <script type="text/javascript">
-      $(document).ready(function() {
-        $("#campaign_id").select2({
-          
-        });
-
-        $("#campaign_id").change(function() {
-          var cid = parseInt($(this).val());
-          <?php if($campaign_id): ?>
-          if(cid == <?=$campaign_id?>) {
-            return;
-          }
-          <?php endif; ?>
-
-          if(cid > 0) {
-            location.href="<?=self::getUrl("Dashboard")?>?campaign_id=" + cid;
-          } else {
-            location.href="<?=self::getUrl("Dashboard")?>";
-          }
-        });
-        
-        
-      });
-      
-    </script>
-
 <?php include(realpath(dirname(__FILE__)."/../../$mfLayoutPackage")."/footer.php"); ?>
\ No newline at end of file
diff --git a/application/Dashboard/DashboardController.php b/application/Dashboard/DashboardController.php
index 2687c4d0d..86178eabc 100644
--- a/application/Dashboard/DashboardController.php
+++ b/application/Dashboard/DashboardController.php
@@ -23,18 +23,18 @@ class DashboardController extends mfBaseController {
     $newss = NewsModel::getAll();
     $this->layout()->set("newss", $newss);
 
-    
-    if($this->me->is(["Admin", "netowner", "salespartner"]) || $this->me->can("Preorder")) {
+    //if($this->me->is(["Admin", "netowner", "salespartner"]) || $this->me->can("Preorder")) {
+    if($this->me->is("Admin")) {
       return $this->dashboardAction();
     }
     
   }
 
   protected function dashboardAction() {
+    $this->layout()->setTemplate("Dashboard/Dashboard");
+    
     $r = $this->request;
     
-    
-    
     $campaign_ids = $r->campaign_id;
     if($campaign_ids && !is_array($campaign_ids)) {
       $campaign_ids = [$campaign_ids];