From 76d7379599b3e2988285c486aa757e3e79332b1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20V=C3=B6lkl?= <benjamin.voelkl@areya.de>
Date: Sun, 4 Sep 2022 21:45:21 +0200
Subject: [PATCH] :

---
 .idea/workspace.xml                    |   8 +-
 content/contents/solarmodule.blade.php | 143 ++++++++++++++++++-------
 content/index.blade.php                |   2 +-
 3 files changed, 114 insertions(+), 39 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2cf561a..0e50336 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="63513c45-0a61-435e-8541-3831c195f7c0" name="Changes" comment="" />
+    <list default="true" id="63513c45-0a61-435e-8541-3831c195f7c0" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/content/contents/solarmodule.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/content/contents/solarmodule.blade.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/content/index.blade.php" beforeDir="false" afterPath="$PROJECT_DIR$/content/index.blade.php" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -57,7 +61,7 @@
       <workItem from="1662027309116" duration="11385000" />
       <workItem from="1662115692620" duration="1346000" />
       <workItem from="1662283223529" duration="4523000" />
-      <workItem from="1662312260637" duration="5464000" />
+      <workItem from="1662312260637" duration="7391000" />
     </task>
     <servers />
   </component>
diff --git a/content/contents/solarmodule.blade.php b/content/contents/solarmodule.blade.php
index 3562a37..e67b343 100644
--- a/content/contents/solarmodule.blade.php
+++ b/content/contents/solarmodule.blade.php
@@ -43,53 +43,124 @@
 
       </div>
 
-        @isset($content->data_fields['preis_5'])
+        <div class="row">
+                @isset($content->data_fields['preis_5'])
+                <div class="col-6">
 
 
-            <p>
-                <button class="btn btn-link text-muted text-decoration-none" type="button" data-bs-toggle="collapse" data-bs-target="#collapseWidthExample" aria-expanded="false" aria-controls="collapseWidthExample">
-                    <svg style="fill: currentColor; width: 20px; margin-right: 2px; margin-bottom: 2px;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M349.66 173.65l-11.31-11.31c-3.12-3.12-8.19-3.12-11.31 0l-164.7 164.69c-3.12 3.12-3.12 8.19 0 11.31l11.31 11.31c3.12 3.12 8.19 3.12 11.31 0l164.69-164.69c3.13-3.12 3.13-8.18.01-11.31zM240 192c0-26.47-21.53-48-48-48s-48 21.53-48 48 21.53 48 48 48 48-21.53 48-48zm-64 0c0-8.83 7.19-16 16-16s16 7.17 16 16-7.19 16-16 16-16-7.17-16-16zm144 80c-26.47 0-48 21.53-48 48s21.53 48 48 48 48-21.53 48-48-21.53-48-48-48zm0 64c-8.81 0-16-7.17-16-16s7.19-16 16-16 16 7.17 16 16-7.19 16-16 16zm192-80c0-35.5-19.4-68.2-49.6-85.5 9.1-33.6-.3-70.4-25.4-95.5s-61.9-34.5-95.5-25.4C324.2 19.4 291.5 0 256 0s-68.2 19.4-85.5 49.6c-33.6-9.1-70.4.3-95.5 25.4s-34.5 61.9-25.4 95.5C19.4 187.8 0 220.5 0 256s19.4 68.2 49.6 85.5c-9.1 33.6.3 70.4 25.4 95.5 26.5 26.5 63.4 34.1 95.5 25.4 17.4 30.2 50 49.6 85.5 49.6s68.1-19.4 85.5-49.6c32.7 8.9 69.4.7 95.5-25.4 25.1-25.1 34.5-61.9 25.4-95.5 30.2-17.3 49.6-50 49.6-85.5zm-91.1 68.3c5.3 11.8 29.5 54.1-6.5 90.1-28.9 28.9-57.5 21.3-90.1 6.5C319.7 433 307 480 256 480c-52.1 0-64.7-49.5-68.3-59.1-32.6 14.8-61.3 22.2-90.1-6.5-36.8-36.7-10.9-80.5-6.5-90.1C79 319.7 32 307 32 256c0-52.1 49.5-64.7 59.1-68.3-5.3-11.8-29.5-54.1 6.5-90.1 36.8-36.9 80.8-10.7 90.1-6.5C192.3 79 205 32 256 32c52.1 0 64.7 49.5 68.3 59.1 11.8-5.3 54.1-29.5 90.1 6.5 36.8 36.7 10.9 80.5 6.5 90.1C433 192.3 480 205 480 256c0 52.1-49.5 64.7-59.1 68.3z"/></svg>
-                    Mengenrabate
-                </button>
-            </p>
-            <div class="collapse" id="collapseWidthExample">
-                <div class="card card-body">
-                    <table class="table">
-                        <thead>
-                        <tr>
-                            <th scope="col">Abnahme</th>
-                            <th scope="col">Preis pro Einheit</th>
-                        </tr>
-                        </thead>
-                        <tbody>
+                    <p>
+                        <button class="btn btn-link text-muted text-decoration-none" type="button" data-bs-toggle="collapse" data-bs-target="#collapseWidthExample" aria-expanded="false" aria-controls="collapseWidthExample">
+                            <svg style="fill: currentColor; width: 20px; margin-right: 2px; margin-bottom: 2px;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M349.66 173.65l-11.31-11.31c-3.12-3.12-8.19-3.12-11.31 0l-164.7 164.69c-3.12 3.12-3.12 8.19 0 11.31l11.31 11.31c3.12 3.12 8.19 3.12 11.31 0l164.69-164.69c3.13-3.12 3.13-8.18.01-11.31zM240 192c0-26.47-21.53-48-48-48s-48 21.53-48 48 21.53 48 48 48 48-21.53 48-48zm-64 0c0-8.83 7.19-16 16-16s16 7.17 16 16-7.19 16-16 16-16-7.17-16-16zm144 80c-26.47 0-48 21.53-48 48s21.53 48 48 48 48-21.53 48-48-21.53-48-48-48zm0 64c-8.81 0-16-7.17-16-16s7.19-16 16-16 16 7.17 16 16-7.19 16-16 16zm192-80c0-35.5-19.4-68.2-49.6-85.5 9.1-33.6-.3-70.4-25.4-95.5s-61.9-34.5-95.5-25.4C324.2 19.4 291.5 0 256 0s-68.2 19.4-85.5 49.6c-33.6-9.1-70.4.3-95.5 25.4s-34.5 61.9-25.4 95.5C19.4 187.8 0 220.5 0 256s19.4 68.2 49.6 85.5c-9.1 33.6.3 70.4 25.4 95.5 26.5 26.5 63.4 34.1 95.5 25.4 17.4 30.2 50 49.6 85.5 49.6s68.1-19.4 85.5-49.6c32.7 8.9 69.4.7 95.5-25.4 25.1-25.1 34.5-61.9 25.4-95.5 30.2-17.3 49.6-50 49.6-85.5zm-91.1 68.3c5.3 11.8 29.5 54.1-6.5 90.1-28.9 28.9-57.5 21.3-90.1 6.5C319.7 433 307 480 256 480c-52.1 0-64.7-49.5-68.3-59.1-32.6 14.8-61.3 22.2-90.1-6.5-36.8-36.7-10.9-80.5-6.5-90.1C79 319.7 32 307 32 256c0-52.1 49.5-64.7 59.1-68.3-5.3-11.8-29.5-54.1 6.5-90.1 36.8-36.9 80.8-10.7 90.1-6.5C192.3 79 205 32 256 32c52.1 0 64.7 49.5 68.3 59.1 11.8-5.3 54.1-29.5 90.1 6.5 36.8 36.7 10.9 80.5 6.5 90.1C433 192.3 480 205 480 256c0 52.1-49.5 64.7-59.1 68.3z"/></svg>
+                            Mengenrabate
+                        </button>
+                    </p>
+                </div>
+                @endisset
 
-                        @isset($content->data_fields['preis_5'])
+            <div class="col-6">
+
+
+                    <p>
+                        <button class="btn btn-link text-muted text-decoration-none" type="button" data-bs-toggle="modal" data-bs-target="#price_timeline">
+                            <svg style="fill: currentColor; width: 20px; margin-right: 2px; margin-bottom: 2px;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M504 416H32V72c0-4.42-3.58-8-8-8H8c-4.42 0-8 3.58-8 8v360c0 8.84 7.16 16 16 16h488c4.42 0 8-3.58 8-8v-16c0-4.42-3.58-8-8-8zM98.34 263.03c-3.12 3.12-3.12 8.19 0 11.31l11.31 11.31c3.12 3.12 8.19 3.12 11.31 0l72.69-72.01 84.69 84.69c6.25 6.25 16.38 6.25 22.63 0l93.53-93.53 44.04 44.04c4.95 4.95 11.03 7.16 17 7.16 12.48 0 24.46-9.7 24.46-24.34V112.19c0-8.94-7.25-16.19-16.19-16.19H344.34c-21.64 0-32.47 26.16-17.17 41.46l44.71 44.71-82.22 82.22-84.63-84.63c-6.23-6.23-16.32-6.25-22.57-.05l-84.12 83.32zM362.96 128H448v85.04L362.96 128z"/></svg>
+                           Preisverlauf
+                        </button>
+                    </p>
+
+                <!-- Modal -->
+                <div class="modal fade" id="price_timeline" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+                    <div class="modal-dialog modal-md">
+                        <div class="modal-content">
+                            <div class="modal-header" style="background-color: #546c8a; color: white;">
+                                <h5 class="modal-title" id="exampleModalLabel">Preisverlauf</h5>
+                                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                            </div>
+                            <div class="modal-body">
+                                <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/3.9.1/chart.min.js" integrity="sha512-ElRFoEQdI5Ht6kZvyzXhYG9NqjtkmlkfYk0wr6wHxU9JEHakS7UJZNeml5ALk+8IKlU6jDgMabC3vkumRokgJA==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+
+
+                                <canvas id="myChart" width="400" height="400"></canvas>
+                                <script>
+const ctx = document.getElementById('myChart').getContext('2d');
+const myChart = new Chart(ctx, {
+    type: 'line',
+    data: {
+        labels: ['Red', 'Blue', 'Yellow', 'Green', 'Purple', 'Orange'],
+        datasets: [{
+            label: 'Modulpreis in €',
+            data: [12, 19, 3, 5, 2, 3],
+            backgroundColor: [
+                'rgba(255, 99, 132, 0.2)',
+                'rgba(54, 162, 235, 0.2)',
+                'rgba(255, 206, 86, 0.2)',
+                'rgba(75, 192, 192, 0.2)',
+                'rgba(153, 102, 255, 0.2)',
+                'rgba(255, 159, 64, 0.2)'
+            ],
+            borderColor: [
+                'rgba(255, 99, 132, 1)',
+                'rgba(54, 162, 235, 1)',
+                'rgba(255, 206, 86, 1)',
+                'rgba(75, 192, 192, 1)',
+                'rgba(153, 102, 255, 1)',
+                'rgba(255, 159, 64, 1)'
+            ],
+            borderWidth: 1
+        }]
+    }
+});
+</script>
+
+                            </div>
+
+                        </div>
+                    </div>
+                </div>
+
+
+            </div>
+
+            <div class="col-12">
+                <div class="collapse" id="collapseWidthExample">
+                    <div class="card card-body mb-5">
+                        <table class="table">
+                            <thead>
                             <tr>
-                                <td>ab 5 Stück</td>
-                                <td>{{$content->data_fields['preis_5']}} €</td>
+                                <th scope="col">Abnahme</th>
+                                <th scope="col">Preis pro Einheit</th>
                             </tr>
-                        @endisset
+                            </thead>
+                            <tbody>
 
-                        @isset($content->data_fields['preis_10'])
-                            <tr>
-                                <td>ab 5 Stück</td>
-                                <td>{{$content->data_fields['preis_10']}} €</td>
-                            </tr>
-                        @endisset
+                            @isset($content->data_fields['preis_5'])
+                                <tr>
+                                    <td>ab 5 Stück</td>
+                                    <td>{{$content->data_fields['preis_5']}} €</td>
+                                </tr>
+                            @endisset
 
-                        @isset($content->data_fields['preis_palette'])
-                            <tr>
-                                <td>Palette ({{$content->data_fields['module_pro_palette']}} Stück)</td>
-                                <td>{{$content->data_fields['preis_palette']}} €</td>
-                            </tr>
-                        @endisset
+                            @isset($content->data_fields['preis_10'])
+                                <tr>
+                                    <td>ab 10 Stück</td>
+                                    <td>{{$content->data_fields['preis_10']}} €</td>
+                                </tr>
+                            @endisset
+
+                            @isset($content->data_fields['preis_palette'])
+                                <tr>
+                                    <td>Palette ({{$content->data_fields['module_pro_palette']}} Stück)</td>
+                                    <td>{{$content->data_fields['preis_palette']}} €</td>
+                                </tr>
+                            @endisset
 
 
-                        </tbody>
-                    </table>
+                            </tbody>
+                        </table>
+                    </div>
                 </div>
             </div>
-        @endisset
+        </div>
+
 
         <table class="table">
 
diff --git a/content/index.blade.php b/content/index.blade.php
index 0bae29e..03847f0 100644
--- a/content/index.blade.php
+++ b/content/index.blade.php
@@ -41,7 +41,7 @@
             </div>
 
 
-            @foreach($contents as $content)
+            @foreach(filterByContentType($contents, "Balkonkraftwerk") as $content)
 
                 <div class="col-12 col-md-6 mt-5">
                     <a href="{{route_content($content)}}" class="text-decoration-none">