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

* fixed multiple username bug

Browse Source 
* added table to devices page
This commit is contained in:
lukas-heiligenbrunner 2020-01-10 18:18:06 +01:00
parent 0518c1c809
commit f7383474ac
1 changed files with 63 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,20 +51,6 @@
<span class="brand-text font-weight-light">Waste Control</span> <span class="brand-text font-weight-light">Waste Control</span>
</a> </a>
<!-- Sidebar -->
<div class="sidebar">
<!-- Sidebar user panel (optional) -->
<div class="user-panel mt-3 pb-3 mb-3 d-flex">
<div class="image">
<!-- <img src="lib/AdminLTE/dist/img/user2-160x160.jpg" class="img-circle elevation-2" alt="User Image"> -->
<i class="nav-icon fas fa-user img-circle elevation-2" style="color:white"></i>
</div>
<!-- <i class="nav-icon fas fa-tachometer-alt"></i> -->
<div class="info">
<a href="user.html" class="d-block" id="userlabel">Username to set!</a>
</div>
</div>
<!-- Sidebar --> <!-- Sidebar -->
<div class="sidebar"> <div class="sidebar">
<!-- Sidebar user panel (optional) --> <!-- Sidebar user panel (optional) -->
@ -193,42 +179,32 @@
<div class="card-header"> <div class="card-header">
<h3 class="card-title"> <h3 class="card-title">
<i class="fas fa-chart-pie mr-1"></i> <i class="fas fa-chart-pie mr-1"></i>
User Data All Devices
</h3> </h3>
<button id="btn-newdevice" type="button" class="btn btn-success"
style="float:right;">Save
</button>
</div><!-- /.card-header --> </div><!-- /.card-header -->
<div class="card-body"> <div class="card-body">
<div class="form-group" style="margin-top: 15px; width: 10cm;"> <table id="table-pickupdates" class="table table-bordered table-hover">
<!-- todo todo --> <thead>
<label for="new_city_cityname">City/Village name</label> <tr>
<input type="email" class="form-control" id="new_city_cityname" <th>City</th>
aria-describedby="emailHelp" placeholder="Enter city name here"> <th>Zone</th>
<small class="form-text text-muted">Please try to use no special <th>Waste Type</th>
characters</small> <th>Date</th>
</div> <th>X</th>
<div class="form-group" style="width: 10cm;"> </tr>
<label for="new_city_zonename">Zone Name</label> </thead>
<input type="email" class="form-control" id="new_city_zonename" <tbody id="picupdates-tablebody">
aria-describedby="emailHelp" placeholder="Enter Zone name here"> </tbody>
<small class="form-text text-muted">Please try to use no special <tfoot>
characters</small> <tr>
</div> <th>City</th>
<th>Zone</th>
<div class="input-group-prepend"> <th>Waste Type</th>
<button id="dropdown-wastetype" type="button" <th>Date</th>
class="btn btn-outline-dark dropdown-toggle" <th>X</th>
data-toggle="dropdown"> </tr>
Select waste type </tfoot>
</button> </table>
<div class="dropdown-menu">
<a class="dropdown-item" href="#">Plastic</a>
<a class="dropdown-item" href="#">Metal</a>
<a class="dropdown-item" href="#">Residual waste</a>
<a class="dropdown-item" href="#">Biowaste</a>
</div>
</div>
</div><!-- /.card-body --> </div><!-- /.card-body -->
</div> </div>