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

Compare commits

base: School:sheduledtaskpage
Branches Tags
School:master School:sheduledtaskpage School:kotlinjssubproject School:gson
School:v1.1.1 School:v1.1.0 School:v1.0.1 School:v1.0.0 School:v0.3.1-Beta School:v0.3.0-Beta School:v0.2.1-Beta School:0.1-Beta
..
compare: School:v1.0.0
Branches Tags
School:master School:sheduledtaskpage School:kotlinjssubproject School:gson
School:v1.1.1 School:v1.1.0 School:v1.0.1 School:v1.0.0 School:v0.3.1-Beta School:v0.3.0-Beta School:v0.2.1-Beta School:0.1-Beta

2 Commits
sheduledta ... v1.0.0

Author SHA1 Message Date
Lukas-Heiligenbrunner
aa023aeb95 compile also kotlin plugin into jar 2020-02-28 12:16:29 +01:00
Lukas-Heiligenbrunner
8b1d2bd583 release version 1.0.0 2020-02-28 11:59:16 +01:00
7 changed files with 42 additions and 73 deletions
Expand all files Collapse all files

4
build.gradle
View File

@ -6,7 +6,7 @@ plugins {
}
group 'com.wasteinformationserver'
version '0.3.1-Beta'
version '1.0.0'
sourceCompatibility = 1.8
@ -29,7 +29,7 @@ sourceSets {
dependencies {
compile group: 'org.eclipse.paho', name: 'org.eclipse.paho.client.mqttv3', version: '1.2.2'
compile group: 'mysql',name:'mysql-connector-java',version: '8.0.18'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
}
task run (type: JavaExec){

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

@ -72,14 +72,6 @@
<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">
@ -90,6 +82,15 @@
</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>
@ -99,6 +100,14 @@
</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">
@ -147,7 +156,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 Pick-up</li>
<li class="breadcrumb-item active">Shedule Puck-up</li>
</ol>
</div><!-- /.col -->
</div><!-- /.row -->
@ -164,9 +173,9 @@
<!-- small box -->
<div class="small-box bg-info">
<div class="inner">
<h3 id="total-sheduled-actions-label">42</h3>
<h3 id="total-connection-labels">42</h3>
<p>Sheduled actions</p>
<p>Total collections</p>
</div>
<div class="icon">
<i class="ion ion-bag"></i>
@ -179,9 +188,9 @@
<!-- small box -->
<div class="small-box bg-gray">
<div class="inner">
<h3 id="next-action-label">42</h3>
<h3 id="total-city-number-label">42</h3>
<p>next Action</p>
<p>total collect zones</p>
</div>
<div class="icon">
<i class="ion ion-android-globe" style="color: lightgrey"></i>
@ -194,9 +203,9 @@
<!-- small box -->
<div class="small-box bg-warning">
<div class="inner">
<h3 id="last-added-label">44</h3>
<h3 id="planed-collection-label">44</h3>
<p>last Added</p>
<p>Planned Collections</p>
</div>
<div class="icon">
<i class="ion ion-calendar"></i>
@ -209,9 +218,9 @@
<!-- small box -->
<div class="small-box bg-success">
<div class="inner">
<h3 id="todo-label">65</h3>
<h3 id="finished-collection-label">65</h3>
<p>TODO</p>
<p>Finished Collections</p>
</div>
<div class="icon">
<i class="ion ion-android-checkmark-circle"></i>
@ -495,7 +504,7 @@
<!-- OWN -->
<script type="text/javascript" src="js/sheduledpickup.js"></script>
<script type="text/javascript" src="js/dashboard.js"></script>
<script src="js/userManager.js"></script>
</body>

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

@ -79,14 +79,6 @@
</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,18 +80,6 @@
</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>
@ -102,6 +90,7 @@
</li>
<li id="adminpanel" class="nav-item hideit">
<a href="adminpanel.html" class="nav-link">
<i class="nav-icon fas fa-plus-circle"></i>
@ -112,13 +101,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">
@ -379,14 +368,11 @@
<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,14 +80,6 @@
</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">
@ -98,6 +90,8 @@
</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
View File

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

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

@ -70,15 +70,6 @@
<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>