Merge branch 'master' into fronkdev
This commit is contained in:
Frank Schubert
@@ -34,7 +34,6 @@ endforeach;
|
||||
type="text/css"/>
|
||||
<link href="<?= self::getResourcePath() ?>css/pages/Calendar/View.css?<?= $git_merge_ts ?>" rel="stylesheet"
|
||||
type="text/css"/>
|
||||
<link href="<?= self::getResourcePath() ?>plugins/summernote/summernote-bs4.min.css" rel="stylesheet">
|
||||
|
||||
<script type="text/javascript"
|
||||
src="<?= self::getResourcePath() ?>assets/js/calendar/rrule/rrule.min.js?<?= $git_merge_ts ?>"></script>
|
||||
@@ -99,6 +98,10 @@ endforeach;
|
||||
class="btn btn-light btn-light-search top-search-filter"><i
|
||||
class="fa-duotone fa-solid fa-triangle-exclamation fa-calendar-alert fa-calendar-alert-search"></i>
|
||||
</button>
|
||||
<button title="Support Gespräch" data-ctype="6"
|
||||
class="btn btn-light btn-light-search top-search-filter"><i
|
||||
class="fa-duotone fa-solid fa-phone-volume fa-calendar-call fa-calendar-call-search"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<?php if (!$rights) : ?>
|
||||
@@ -370,12 +373,13 @@ endforeach;
|
||||
<div class="col-3">
|
||||
<div class="input-group mb-2">
|
||||
<span title="Erinnerung" class="input-group-text spanwidht">Typ</span>
|
||||
<select class="form-control form-select" aria-label="Default select" id="type">
|
||||
<select class="form-control form-select select-2" aria-label="Default select" id="type">
|
||||
<option value="1">Termin</option>
|
||||
<option value="2">IBN Xinon</option>
|
||||
<option value="3">IBN ESTMK</option>
|
||||
<option value="4">IBN SNOPP</option>
|
||||
<option value="5">Störung</option>
|
||||
<option value="6">Support Gespräch</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
@@ -648,8 +652,7 @@ endforeach;
|
||||
|
||||
<div id="output"></div>
|
||||
<script type="text/javascript" src="<?= self::getResourcePath() ?>plugins/select2/js/i18n/de.js?<?= $git_merge_ts ?>"></script>
|
||||
<script type="text/javascript" src="<?=self::getResourcePath()?>plugins/summernote/summernote-bs4.min.js?<?= $git_merge_ts ?>"></script>
|
||||
<script type="text/javascript" src="<?=self::getResourcePath()?>plugins/summernote/lang/summernote-de-DE.min.js?<?= $git_merge_ts ?>"></script>
|
||||
<script type="text/javascript" src="<?=self::getResourcePath()?>plugins/tinymce/tinymce.min.js?<?= $git_merge_ts ?>"></script>
|
||||
|
||||
<script>
|
||||
let requestUrl = "<?= self::getUrl("Calendar", "api", ['do' => 'getCalendarEvents']) ?>";
|
||||
|
||||
@@ -33,7 +33,7 @@ $pagination_entity_name = "Zustimmungserklärungen";
|
||||
<form method="get" action="<?=self::getUrl("ConstructionConsent")?>">
|
||||
<div class="row">
|
||||
|
||||
<div class="col-3">
|
||||
<div class="col-2">
|
||||
<label class="form-label" for="filter_project_id">Projekt</label>
|
||||
<select name="filter[project_id]" id="filter_project_id" class="form-control">
|
||||
<option value="">Alle</option>
|
||||
@@ -43,15 +43,6 @@ $pagination_entity_name = "Zustimmungserklärungen";
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-2">
|
||||
<label class="form-label" for="filter_object_type">Objektart</label>
|
||||
<select name="filter[object_type]" id="filter_object_type" class="form-control">
|
||||
<option value="">Alle</option>
|
||||
<option value="building" <?=(array_key_exists("object_type", $filter) && $filter["object_type"] == "building") ? "selected='selected'" : ""?>>Gebäude</option>
|
||||
<option value="street" <?=(array_key_exists("object_type", $filter) && $filter["object_type"] == "street") ? "selected='selected'" : ""?>>Straße</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-2">
|
||||
<label class="form-label" for="filter_network">Netzgebiet</label>
|
||||
<select name="filter[network]" id="filter_network" class="form-control">
|
||||
@@ -70,14 +61,81 @@ $pagination_entity_name = "Zustimmungserklärungen";
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-1">
|
||||
<label class="form-label" for="filter_object_type">Objektart</label>
|
||||
<select name="filter[object_type]" id="filter_object_type" class="form-control">
|
||||
<option value="">Alle</option>
|
||||
<option value="building" <?=(array_key_exists("object_type", $filter) && $filter["object_type"] == "building") ? "selected='selected'" : ""?>>Gebäude</option>
|
||||
<option value="street" <?=(array_key_exists("object_type", $filter) && $filter["object_type"] == "street") ? "selected='selected'" : ""?>>Straße</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-1">
|
||||
<label class="form-label" for="filter_status_light">Ampelstatus</label>
|
||||
<select name="filter[status_light]" id="filter_status_light" class="form-control">
|
||||
<option value="">Alle</option>
|
||||
<option value="blue" <?=(array_key_exists("status_light", $filter) && $filter["status_light"] == "blue") ? "selected='selected'" : ""?>>Blau</option>
|
||||
<option value="green" <?=(array_key_exists("status_light", $filter) && $filter["status_light"] == "green") ? "selected='selected'" : ""?>>Grün</option>
|
||||
<option value="yellow" <?=(array_key_exists("status_light", $filter) && $filter["status_light"] == "yellow") ? "selected='selected'" : ""?>>Gelb</option>
|
||||
<option value="red" <?=(array_key_exists("status_light", $filter) && $filter["status_light"] == "red") ? "selected='selected'" : ""?>>Rot</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-2">
|
||||
<label class="form-label" for="filter_inspection_planner">Begehung Planer</label>
|
||||
<select name="filter[inspection_planner]" id="filter_inspection_planner" class="form-control">
|
||||
<option value="">Alle</option>
|
||||
<option value="!NULL" <?=(array_key_exists("inspection_planner", $filter) && $filter["inspection_planner"] == "!NULL") ? "selected='selected'" : ""?>>Ja</option>
|
||||
<option value="NULL" <?=(array_key_exists("inspection_planner", $filter) && $filter["inspection_planner"] == "NULL") ? "selected='selected'" : ""?>>Nein</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-2">
|
||||
<label class="form-label" for="filter_conduit_installed_building">Leerrohr im Gebäude</label>
|
||||
<select name="filter[conduit_installed_building]" id="filter_conduit_installed_building" class="form-control">
|
||||
<option value="">Alle</option>
|
||||
<option value="!NULL" <?=(array_key_exists("conduit_installed_building", $filter) && $filter["conduit_installed_building"] == "!NULL") ? "selected='selected'" : ""?>>Ja</option>
|
||||
<option value="NULL" <?=(array_key_exists("conduit_installed_building", $filter) && $filter["conduit_installed_building"] == "NULL") ? "selected='selected'" : ""?>>Nein</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-2">
|
||||
<label class="form-label" for="filter_conduit_installed_ftu">Leerrohr bis HAK</label>
|
||||
<select name="filter[conduit_installed_ftu]" id="filter_conduit_installed_ftu" class="form-control">
|
||||
<option value="">Alle</option>
|
||||
<option value="!NULL" <?=(array_key_exists("conduit_installed_ftu", $filter) && $filter["conduit_installed_ftu"] == "!NULL") ? "selected='selected'" : ""?>>Ja</option>
|
||||
<option value="NULL" <?=(array_key_exists("conduit_installed_ftu", $filter) && $filter["conduit_installed_ftu"] == "NULL") ? "selected='selected'" : ""?>>Nein</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="row mt-2">
|
||||
|
||||
<div class="col-2">
|
||||
<label class="form-label" for="filter_inhouse_cabling">Inhouse erledigt</label>
|
||||
<select name="filter[inhouse_cabling]" id="filter_inhouse_cabling" class="form-control">
|
||||
<option value="">Alle</option>
|
||||
<option value="!NULL" <?=(array_key_exists("inhouse_cabling", $filter) && $filter["inhouse_cabling"] == "!NULL") ? "selected='selected'" : ""?>>Ja</option>
|
||||
<option value="NULL" <?=(array_key_exists("inhouse_cabling", $filter) && $filter["inhouse_cabling"] == "NULL") ? "selected='selected'" : ""?>>Nein</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col-2">
|
||||
<label class="form-label" for="filter_address">Objektadresse</label>
|
||||
<input type="text" class="form-control" name="filter[address]" id="filter_address" value="<?=(array_key_exists('address', $filter)) ? $filter['address'] : ""?>" />
|
||||
</div>
|
||||
|
||||
<div class="col-2">
|
||||
<label class="form-label" for="filter_gst">GST</label>
|
||||
<input type="text" class="form-control" name="filter[gst]" id=filter_gst value="<?=(array_key_exists('gst', $filter)) ? $filter['gst'] : ""?>" />
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="row mt-2">
|
||||
<div class="col">
|
||||
<button type="submit" class="btn btn-primary"><i class="far fa-search fa-fw"></i> Filter anwenden</button>
|
||||
@@ -89,6 +147,150 @@ $pagination_entity_name = "Zustimmungserklärungen";
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php
|
||||
// if results are more than 0
|
||||
if (count($items) > 0) : ?>
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<button class="btn btn-primary collapsed"
|
||||
type="button"
|
||||
data-toggle="collapse"
|
||||
data-target="#collapsibleCard"
|
||||
aria-expanded="true"
|
||||
aria-controls="collapsibleCard">
|
||||
<i class="fas fa-chevron-up chevron-icon"></i>
|
||||
Statistiken umschalten
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div id="collapsibleCard" class="collapse">
|
||||
<div class="card-body mb-3">
|
||||
<div style="display: grid; grid-template-columns: 1fr 1fr 1fr; grid-gap: 10px;">
|
||||
|
||||
<?php
|
||||
$cardConfig = [
|
||||
[
|
||||
'key' => null,
|
||||
'header' => 'Liste der Zustimmungserklärungen',
|
||||
'icon' => 'fas fa-file-signature',
|
||||
'text' => 'Objekttyp',
|
||||
'sub' => [
|
||||
'Straße/Grundstück ['.$stats['street'].']',
|
||||
'Gebäude ['.$stats['building'].']'
|
||||
],
|
||||
'color' => '#6c757d'
|
||||
],
|
||||
[
|
||||
'key' => 'inspection_planner',
|
||||
'header' => 'Begehung Planer durchgeführt',
|
||||
'icon' => 'fas fa-clipboard-check',
|
||||
'denominator' => $stats['building'] + $stats['street'],
|
||||
'color' => '#28a745'
|
||||
],
|
||||
[
|
||||
'key' => 'conduit_installed_building',
|
||||
'header' => 'Leerrohr im Gebäude',
|
||||
'icon' => 'fas fa-house-user',
|
||||
'denominator' => $stats['building'],
|
||||
'color' => '#17a2b8'
|
||||
],
|
||||
[
|
||||
'key' => 'conduit_installed_ftu',
|
||||
'header' => 'Leerrohr bis HAK',
|
||||
'icon' => 'fas fa-road',
|
||||
'denominator' => $stats['street'],
|
||||
'color' => '#f5b902'
|
||||
],
|
||||
[
|
||||
'key' => 'inhouse_cabling',
|
||||
'header' => 'Inhouse erledigt',
|
||||
'icon' => 'fas fa-plug',
|
||||
'denominator' => $stats['building'],
|
||||
'color' => '#007bff'
|
||||
]
|
||||
];
|
||||
|
||||
foreach ($cardConfig as $config) {
|
||||
$height = 96 + 25 * (isset($config['sub']) ? count($config['sub']) : 0);
|
||||
$text = $config['key'] ?
|
||||
$stats[$config['key']].' / '.$config['denominator'].' ('.
|
||||
round(($config['denominator'] != 0 ? ($stats[$config['key']] / $config['denominator']) : 0) * 100) . '%)' :
|
||||
$config['text'];
|
||||
?>
|
||||
<div class="card">
|
||||
<div class="card-body p-0" style="background-color: <?= $config['color'] ?>">
|
||||
<div class="p-2" style="height: <?= $height ?>px">
|
||||
<div class="float-right">
|
||||
<i class="<?= $config['icon'] ?> text-white widget-icon font-24"></i>
|
||||
</div>
|
||||
<h5 class="text-white font-weight-normal mt-0"><?= $config['header'] ?></h5>
|
||||
<h3 class="mt-2 text-white"><?= $text ?></h3>
|
||||
<?php if(isset($config['sub'])): ?>
|
||||
<div class="text-white font-weight-light tt-dashboard-display-card-sub-header-container">
|
||||
<?php foreach($config['sub'] as $sub): ?>
|
||||
<p class="mb-0"><?= $sub ?></p>
|
||||
<?php endforeach; ?>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
<!-- i have added this to stats and need to show a "traffic light kinda thing round etc" with a grid 2 row 2 col
|
||||
|
||||
"status_light_blue" => $status_light_blue,
|
||||
"status_light_red" => $status_light_red,
|
||||
"status_light_yellow" => $status_light_yellow,
|
||||
"status_light_green" => $status_light_green
|
||||
-->
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body p-0">
|
||||
<div class="p-2" style="background-color: #f8f9fa">
|
||||
<h5 class="font-weight-normal mt-0">Anfrageresultat</h5>
|
||||
</div>
|
||||
|
||||
<!-- Horizontal Traffic Light -->
|
||||
<div style="padding: 20px; background: #333; display: flex; gap: 15px; justify-content: center;">
|
||||
<div style="display: flex; flex-direction: row; transform: rotate(0deg); gap: 20px;">
|
||||
<!-- Blue -->
|
||||
<div style="position: relative; width: 60px; height: 60px;">
|
||||
<div style="width: 100%; height: 100%; background-color: #337ab7; border-radius: 50%;"></div>
|
||||
<span style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); color: white; font-weight: bold;"><?php echo $stats['status_light_blue']; ?></span>
|
||||
</div>
|
||||
|
||||
<!-- Red -->
|
||||
<div style="position: relative; width: 60px; height: 60px;">
|
||||
<div style="width: 100%; height: 100%; background-color: #d9534f; border-radius: 50%;"></div>
|
||||
<span style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); color: white; font-weight: bold;"><?php echo $stats['status_light_red']; ?></span>
|
||||
</div>
|
||||
|
||||
<!-- Yellow -->
|
||||
<div style="position: relative; width: 60px; height: 60px;">
|
||||
<div style="width: 100%; height: 100%; background-color: #f0ad4e; border-radius: 50%;"></div>
|
||||
<span style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); color: white; font-weight: bold;"><?php echo $stats['status_light_yellow']; ?></span>
|
||||
</div>
|
||||
|
||||
<!-- Green -->
|
||||
<div style="position: relative; width: 60px; height: 60px;">
|
||||
<div style="width: 100%; height: 100%; background-color: #5cb85c; border-radius: 50%;"></div>
|
||||
<span style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); color: white; font-weight: bold;"><?php echo $stats['status_light_green']; ?></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
|
||||
<div class="card">
|
||||
<div class="card-body mb-3">
|
||||
|
||||
Reference in New Issue
Block a user