School/WasteInformationServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4 from IngProjDutzlerHeiligenbrunnerMeindl/sheduledtaskpage

Browse Source 
added new page to shedule tasks
This commit is contained in:
Lukas-Heiligenbrunner
2020-03-13 13:38:17 +01:00
committed by GitHub
parent 5fde74eb15 e28cfd4a20
commit b4d7e2e691
6 changed files with 71 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/resources/wwwroot/ShedulePickUp.html
View File

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

8
src/resources/wwwroot/adminpanel.html
View File

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

36
src/resources/wwwroot/dashboard.html
View File

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

10
src/resources/wwwroot/device.html
View File

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

3
src/resources/wwwroot/js/sheduledpickup.js Normal file
View File

@@ -0,0 +1,3 @@
$(function () {
console.log("bla");
})

9
src/resources/wwwroot/user.html
View File

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