From e28cfd4a2075f5ff14a91e52c07e545a482d999a Mon Sep 17 00:00:00 2001
From: Lukas-Heiligenbrunner <lukas.heiligenbrunner@gmail.com>
Date: Fri, 28 Feb 2020 11:55:30 +0100
Subject: [PATCH] added new page to shedule tasks

---
 src/resources/wwwroot/ShedulePickUp.html   | 45 +++++++++-------------
 src/resources/wwwroot/adminpanel.html      |  8 ++++
 src/resources/wwwroot/dashboard.html       | 36 +++++++++++------
 src/resources/wwwroot/device.html          | 10 ++++-
 src/resources/wwwroot/js/sheduledpickup.js |  3 ++
 src/resources/wwwroot/user.html            |  9 +++++
 6 files changed, 71 insertions(+), 40 deletions(-)
 create mode 100644 src/resources/wwwroot/js/sheduledpickup.js

diff --git a/src/resources/wwwroot/ShedulePickUp.html b/src/resources/wwwroot/ShedulePickUp.html
index 036be7f..c9a1eda 100644
--- a/src/resources/wwwroot/ShedulePickUp.html
+++ b/src/resources/wwwroot/ShedulePickUp.html
@@ -72,6 +72,14 @@
                 <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu"
                     data-accordion="false">
 
+                    <li class="nav-item">
+                        <a href="dashboard.html" class="nav-link">
+                            <i class="nav-icon fas fa-columns"></i>
+                            <p>
+                                Dashboard
+                            </p>
+                        </a>
+                    </li>
 
                     <li class="nav-item">
                         <a href="ShedulePickUp.html" class="nav-link">
@@ -82,15 +90,6 @@
                         </a>
                     </li>
 
-                    <li class="nav-item">
-                        <a href="dashboard.html" class="nav-link">
-                            <i class="nav-icon fas fa-columns"></i>
-                            <p>
-                                Dashboard
-                            </p>
-                        </a>
-                    </li>
-
                     <li id="devicepanel" class="nav-item">
                         <a href="device.html" class="nav-link">
                             <i class="nav-icon fas fa-desktop"></i>
@@ -100,14 +99,6 @@
                         </a>
                     </li>
 
-                    <li class="nav-item">
-                        <a href="#todo" class="nav-link">
-                            <i class="nav-icon fas fa-plus-circle"></i>
-                            <p>
-                                New Entry
-                            </p>
-                        </a>
-                    </li>
 
                     <li id="adminpanel" class="nav-item hideit">
                         <a href="adminpanel.html" class="nav-link">
@@ -156,7 +147,7 @@
                     <div class="col-sm-6">
                         <ol class="breadcrumb float-sm-right">
                             <li class="breadcrumb-item"><a href="#">Home</a></li>
-                            <li class="breadcrumb-item active">Shedule Puck-up</li>
+                            <li class="breadcrumb-item active">Shedule Pick-up</li>
                         </ol>
                     </div><!-- /.col -->
                 </div><!-- /.row -->
@@ -173,9 +164,9 @@
                         <!-- small box -->
                         <div class="small-box bg-info">
                             <div class="inner">
-                                <h3 id="total-connection-labels">42</h3>
+                                <h3 id="total-sheduled-actions-label">42</h3>
 
-                                <p>Total collections</p>
+                                <p>Sheduled actions</p>
                             </div>
                             <div class="icon">
                                 <i class="ion ion-bag"></i>
@@ -188,9 +179,9 @@
                         <!-- small box -->
                         <div class="small-box bg-gray">
                             <div class="inner">
-                                <h3 id="total-city-number-label">42</h3>
+                                <h3 id="next-action-label">42</h3>
 
-                                <p>total collect zones</p>
+                                <p>next Action</p>
                             </div>
                             <div class="icon">
                                 <i class="ion ion-android-globe" style="color: lightgrey"></i>
@@ -203,9 +194,9 @@
                         <!-- small box -->
                         <div class="small-box bg-warning">
                             <div class="inner">
-                                <h3 id="planed-collection-label">44</h3>
+                                <h3 id="last-added-label">44</h3>
 
-                                <p>Planned Collections</p>
+                                <p>last Added</p>
                             </div>
                             <div class="icon">
                                 <i class="ion ion-calendar"></i>
@@ -218,9 +209,9 @@
                         <!-- small box -->
                         <div class="small-box bg-success">
                             <div class="inner">
-                                <h3 id="finished-collection-label">65</h3>
+                                <h3 id="todo-label">65</h3>
 
-                                <p>Finished Collections</p>
+                                <p>TODO</p>
                             </div>
                             <div class="icon">
                                 <i class="ion ion-android-checkmark-circle"></i>
@@ -504,7 +495,7 @@
 
 <!-- OWN -->
 
-<script type="text/javascript" src="js/dashboard.js"></script>
+<script type="text/javascript" src="js/sheduledpickup.js"></script>
 <script src="js/userManager.js"></script>
 
 </body>
diff --git a/src/resources/wwwroot/adminpanel.html b/src/resources/wwwroot/adminpanel.html
index 1047f59..d9e76f1 100644
--- a/src/resources/wwwroot/adminpanel.html
+++ b/src/resources/wwwroot/adminpanel.html
@@ -79,6 +79,14 @@
                         </a>
                     </li>
 
+                    <li class="nav-item">
+                        <a href="ShedulePickUp.html" class="nav-link">
+                            <i class="nav-icon fas fa-calendar-alt"></i>
+                            <p>
+                                Shedule Pick-up
+                            </p>
+                        </a>
+                    </li>
 
                     <li id="devicepanel" class="nav-item">
                         <a href="device.html" class="nav-link">
diff --git a/src/resources/wwwroot/dashboard.html b/src/resources/wwwroot/dashboard.html
index 2c0a1da..2ba8a2b 100644
--- a/src/resources/wwwroot/dashboard.html
+++ b/src/resources/wwwroot/dashboard.html
@@ -80,6 +80,18 @@
                             </p>
                         </a>
                     </li>
+
+
+                    <li class="nav-item">
+                        <a href="ShedulePickUp.html" class="nav-link">
+                            <i class="nav-icon fas fa-calendar-alt"></i>
+                            <p>
+                                Shedule Pick-up
+                            </p>
+                        </a>
+                    </li>
+
+
                     <li id="devicepanel" class="nav-item">
                         <a href="device.html" class="nav-link">
                             <i class="nav-icon fas fa-desktop"></i>
@@ -90,7 +102,6 @@
                     </li>
 
 
-
                     <li id="adminpanel" class="nav-item hideit">
                         <a href="adminpanel.html" class="nav-link">
                             <i class="nav-icon fas fa-plus-circle"></i>
@@ -101,13 +112,13 @@
                     </li>
 
                     <li class="nav-item">
-                    <a href="#todo" class="nav-link">
-                        <i class="nav-icon fas fa-cog"></i>
-                        <p>
-                            Settings
-                        </p>
-                    </a>
-                </li>
+                        <a href="#todo" class="nav-link">
+                            <i class="nav-icon fas fa-cog"></i>
+                            <p>
+                                Settings
+                            </p>
+                        </a>
+                    </li>
 
 
                     <li class="nav-item">
@@ -368,11 +379,14 @@
                                     <tr>
                                         <th>
                                             <i class="fas fa-city"></i>
-                                            City</th>
+                                            City
+                                        </th>
                                         <th><i class="fas fa-search-location"></i>
-                                            Zone</th>
+                                            Zone
+                                        </th>
                                         <th><i class="fas fa-recycle"></i>
-                                            Waste Type</th>
+                                            Waste Type
+                                        </th>
                                         <th><i class="fas fa-trash-alt"></i>
                                         </th>
                                     </tr>
diff --git a/src/resources/wwwroot/device.html b/src/resources/wwwroot/device.html
index 9426568..95fa7ae 100644
--- a/src/resources/wwwroot/device.html
+++ b/src/resources/wwwroot/device.html
@@ -80,6 +80,14 @@
                         </a>
                     </li>
 
+                    <li class="nav-item">
+                        <a href="ShedulePickUp.html" class="nav-link">
+                            <i class="nav-icon fas fa-calendar-alt"></i>
+                            <p>
+                                Shedule Pick-up
+                            </p>
+                        </a>
+                    </li>
 
                     <li id="devicepanel" class="nav-item">
                         <a href="device.html" class="nav-link">
@@ -90,8 +98,6 @@
                         </a>
                     </li>
 
-
-
                     <li id="adminpanel" class="nav-item hideit">
                         <a href="adminpanel.html" class="nav-link">
                             <i class="nav-icon fas fa-plus-circle"></i>
diff --git a/src/resources/wwwroot/js/sheduledpickup.js b/src/resources/wwwroot/js/sheduledpickup.js
new file mode 100644
index 0000000..43549a3
--- /dev/null
+++ b/src/resources/wwwroot/js/sheduledpickup.js
@@ -0,0 +1,3 @@
+$(function () {
+    console.log("bla");
+})
\ No newline at end of file
diff --git a/src/resources/wwwroot/user.html b/src/resources/wwwroot/user.html
index c79bbe8..c029ecb 100644
--- a/src/resources/wwwroot/user.html
+++ b/src/resources/wwwroot/user.html
@@ -70,6 +70,15 @@
                 <ul class="nav nav-pills nav-sidebar flex-column" data-widget="treeview" role="menu"
                     data-accordion="false">
 
+                    <li class="nav-item">
+                        <a href="ShedulePickUp.html" class="nav-link">
+                            <i class="nav-icon fas fa-calendar-alt"></i>
+                            <p>
+                                Shedule Pick-up
+                            </p>
+                        </a>
+                    </li>
+
                     <li class="nav-item">
                         <a href="#todo" class="nav-link">
                             <i class="nav-icon fas fa-cog"></i>