Skip to content
This repository has been archived by the owner on Jul 1, 2020. It is now read-only.

Commit

Permalink
Merge 9f3cbb8 into c9c34ce
Browse files Browse the repository at this point in the history
  • Loading branch information
@Maxelweb
Maxelweb committed May 10, 2020
2 parents c9c34ce + 9f3cbb8 commit 37a1bd0
Show file tree
Hide file tree
Showing 19 changed files with 64 additions and 64 deletions.
4 changes: 3 additions & 1 deletion resources/css/datatables.css
View file
Expand Up @@ -4,7 +4,9 @@
Source: https://cdn.datatables.net/1.10.20/css/dataTables.bootstrap4.css
*/

table.table th,
table.table td,
table.dataTable tbody th,
table.dataTable tbody td {
padding: 8px 10px;
padding: 8px 10px;
}
10 changes: 5 additions & 5 deletions resources/views/alerts/create.blade.php
View file
Expand Up @@ -33,10 +33,10 @@
<label for="inputSensore" class="col-sm-3 col-form-label"><span class="fas fa-temperature-high"></span> Sensore</label>
<div class="col-sm-9">
<div class="input-group mb-3">
<select class="form-control @error('sensor') is-invalid @enderror" name="sensor" id="inputSensor">
<select required class="form-control @error('sensor') is-invalid @enderror" name="sensor" id="inputSensor">
@foreach($devices as $d)
@foreach($sensors[$d->deviceId] as $s)
<option value="{{$s->sensorId}}">{{$d->name . ' - @' . $s->realSensorId}}</option>
<option value="{{$s->sensorId}}">{{$s->type.' S@' . $s->realSensorId.' // '.$d->name . ' D#'.$s->device }}</option>
@endforeach
@endforeach
</select>
Expand All @@ -53,7 +53,7 @@
<label for="inputSoglia" class="col-sm-3 col-form-label"><span class="fas fa-radiation"></span> Soglia</label>
<div class="col-sm-9">
<div class="input-group mb-3">
<select class="form-control @error('type') is-invalid @enderror" name="type" id="inputSoglia">
<select required class="form-control @error('type') is-invalid @enderror" name="type" id="inputSoglia">
<option value="0" selected>maggiore di</option>
<option value="1">minore di</option>
<option value="2">uguale a</option>
Expand All @@ -71,7 +71,7 @@
<label for="inputValue" class="col-sm-3 col-form-label"><span class="fas fa-radiation-alt"></span> Valore di soglia</label>
<div class="col-sm-9">
<div class="input-group mb-3">
<input type="number" step="0.1" class="form-control @error('threshold') is-invalid @enderror" name="threshold" id="inputValue"
<input type="number" step="0.1" required class="form-control @error('threshold') is-invalid @enderror" name="threshold" id="inputValue"
placeholder="Inserisci un valore di soglia" value="valorenumerico">
@error('threshold')
<span class="invalid-feedback" role="alert">
Expand All @@ -81,7 +81,7 @@
</div>
</div>
</div>
<button type="submit" class="btn btn-primary btn-icon-split">
<button type="submit" class="btn btn-success btn-icon-split">
<span class="icon text-white-50">
<span class="fas fa-plus-circle"></span>
</span>
Expand Down
14 changes: 7 additions & 7 deletions resources/views/alerts/edit.blade.php
View file
Expand Up @@ -42,10 +42,10 @@
<label for="inputSensore" class="col-sm-3 col-form-label"><span class="fas fa-temperature-high"></span> Sensore</label>
<div class="col-sm-9">
<div class="input-group mb-3">
<select class="form-control @error('sensor') is-invalid @enderror" name="sensor" id="inputSensor">
<select required class="form-control @error('sensor') is-invalid @enderror" name="sensor" id="inputSensor">
@foreach($devices as $d)
@foreach($sensors[$d->deviceId] as $s)
<option value="{{$s->sensorId}}">{{$d->name . ' - @' . $s->realSensorId}}</option>
<option value="{{$s->sensorId}}">{{$s->type.' S@' . $s->realSensorId.' // '.$d->name . ' D#'.$s->device }}</option>
@endforeach
@endforeach
</select>
Expand All @@ -62,7 +62,7 @@
<label for="inputSoglia" class="col-sm-3 col-form-label"><span class="fas fa-radiation"></span> Soglia</label>
<div class="col-sm-9">
<div class="input-group mb-3">
<select class="form-control @error('type') is-invalid @enderror" name="type" id="inputSoglia">
<select required class="form-control @error('type') is-invalid @enderror" name="type" id="inputSoglia">
<option value="0" @if($alert->type == 0) selected @endif>maggiore di</option>
<option value="1" @if($alert->type == 1) selected @endif>minore di</option>
<option value="2" @if($alert->type == 2) selected @endif>uguale a</option>
Expand All @@ -80,7 +80,7 @@
<label for="inputValue" class="col-sm-3 col-form-label"><span class="fas fa-radiation-alt"></span> Valore di soglia</label>
<div class="col-sm-9">
<div class="input-group mb-3">
<input type="number" step="0.1" class="form-control @error('threshold') is-invalid @enderror" name="threshold" id="inputValue"
<input required type="number" step="0.1" class="form-control @error('threshold') is-invalid @enderror" name="threshold" id="inputValue"
placeholder="Inserisci un valore di soglia" value="{{$alert->threshold}}">
@error('threshold')
<span class="invalid-feedback" role="alert">
Expand All @@ -90,11 +90,11 @@
</div>
</div>
</div>
<button type="submit" class="btn btn-primary btn-icon-split">
<button type="submit" class="btn btn-success btn-icon-split">
<span class="icon text-white-50">
<span class="fas fa-check-circle"></span>
<span class="fas fa-save"></span>
</span>
<span class="text">Modifica</span>
<span class="text">Salva modifiche</span>
</button>
</form>
</div>
Expand Down
6 changes: 3 additions & 3 deletions resources/views/alerts/index.blade.php
View file
Expand Up @@ -58,7 +58,7 @@
<td>{{$list['alert']->threshold}}</td>
<td>{{$list['alert']->lastSent?date("d/m/Y - H:i:s", strtotime($list['alert']->lastSent)):'-'}}</td>
@can(['isMod'])
<td>
<td class="text-center">
<a href="{{route('alerts.edit', ['alertId' => $list['alert']->alertId])}}" class="btn btn-sm btn-warning btn-icon-split">
<span class="icon text-white-50">
<span class="fas fa-edit"></span>
Expand All @@ -68,8 +68,8 @@
</td>
@endcan
@can(['isAdmin'])
<td>
<a class="btn btn-sm btn-danger btn-icon-split mb-3" href="{{ route('alerts.destroy', ['alertId'=>$list['alert']->alertId]) }}"
<td class="text-center">
<a class="btn btn-sm btn-danger btn-icon-split" href="{{ route('alerts.destroy', ['alertId'=>$list['alert']->alertId]) }}"
onclick="event.preventDefault(); return confirm('Sei sicuro di voler rimuovere alert #{{ $list['alert']->alertId }}?') ?
document.getElementById('destroy-alert-{{ $list['alert']->alertId }}').submit() : false;">
<span class="icon text-white-50">
Expand Down
4 changes: 2 additions & 2 deletions resources/views/auth/login.blade.php
View file
Expand Up @@ -21,7 +21,7 @@
@csrf

<div class="form-group">
<input id="email" type="email"
<input id="email" type="email" required
class="form-control form-control-user @error('email') is-invalid @enderror"
name="email" value="{{ old('email') }}" required autocomplete="email" autofocus
placeholder="Indirizzo Email">
Expand All @@ -33,7 +33,7 @@ class="form-control form-control-user @error('email') is-invalid @enderror"
</div>

<div class="form-group">
<input id="password" type="password"
<input id="password" type="password" required
class="form-control form-control-user @error('password') is-invalid @enderror"
name="password" required autocomplete="current-password"
placeholder="Password">
Expand Down
2 changes: 1 addition & 1 deletion resources/views/auth/tfaLogin.blade.php
View file
Expand Up @@ -20,7 +20,7 @@
<form class="user" method="POST" action="{{ route('login') }}">
@csrf
<div class="form-group">
<input id="code" type="text"
<input id="code" type="text" required
class="form-control form-control-user form-codice-tfa @error('code') is-invalid @enderror"
name="code" placeholder="Inserisci il codice" autocomplete="off">

Expand Down
12 changes: 6 additions & 6 deletions resources/views/devices/create.blade.php
View file
Expand Up @@ -34,7 +34,7 @@
<div class="form-group row">
<label for="inputDeviceId" class="col-sm-3 col-form-label"><span class="real-id"></span> ID dispositivo</label>
<div class="col-sm-9">
<input type="text" class="form-control @error('realDeviceId') is-invalid @enderror" id="inputDeviceId" placeholder="Id dispositivo" value="{{old('realDeviceId')}}" name="realDeviceId">
<input required type="number" class="form-control @error('realDeviceId') is-invalid @enderror" id="inputDeviceId" placeholder="Id dispositivo" value="{{old('realDeviceId')}}" name="realDeviceId">
@error('realDeviceId')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
Expand All @@ -45,7 +45,7 @@
<div class="form-group row">
<label for="inputDeviceName" class="col-sm-3 col-form-label"><span class="fas fa-tag"></span> Nome dispositivo</label>
<div class="col-sm-9">
<input type="text" class="form-control @error('name') is-invalid @enderror" id="inputDeviceName" placeholder="Nome dispositivo" value="{{old("name")}}" name="name">
<input required type="text" class="form-control @error('name') is-invalid @enderror" id="inputDeviceName" placeholder="Nome dispositivo" value="{{old("name")}}" name="name">
@error('name')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
Expand All @@ -57,7 +57,7 @@
<label for="inputGatewayName" class="col-sm-3 col-form-label"><span class="fas fa-dungeon"></span> Seleziona gateway</label>
<div class="col-sm-9">
<div class="input-group mb-3">
<select class="form-control @error('gatewayId') is-invalid @enderror" name="gatewayId" id="inputGatewayName">
<select required class="form-control @error('gatewayId') is-invalid @enderror" name="gatewayId" id="inputGatewayName">
@foreach($gateways as $gateway)
<option value="{{$gateway->gatewayId}}">{{$gateway->name}}</option>
@endforeach
Expand All @@ -74,7 +74,7 @@
<label for="inputFrequency" class="col-sm-3 col-form-label"><span class="fas fa-history"></span> Frequenza ricezione dati</label>
<div class="col-sm-9">
<div class="input-group mb-3">
<select class="form-control @error('frequency') is-invalid @enderror" name="frequency" id="inputFrequency">
<select required class="form-control @error('frequency') is-invalid @enderror" name="frequency" id="inputFrequency">
<option value="1">1s</option>
<option value="2">2s</option>
<option value="3">3s</option>
Expand Down Expand Up @@ -152,7 +152,7 @@
<div class="form-group row">
<label for="inputSensorId" class="col-sm-3 col-form-label"><span class="real-id"></span> ID sensore</label>
<div class="col-sm-9">
<input type="text" class="form-control @error('sensorId') is-invalid @enderror" id="inputSensorId" placeholder="Id sensore" value="" name="sensorId[]">
<input type="number" class="form-control @error('sensorId') is-invalid @enderror" id="inputSensorId" placeholder="Id sensore" value="" name="sensorId[]">
@error('sensorId')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
Expand All @@ -174,7 +174,7 @@
<div class="form-group row">
<label for="commandCheck" class="col-sm-3 col-form-label"><span class="fas fa-satellite-dish"></span> Ricezione comandi *</label>
<div class="col-sm-9">
<select class="form-control" id="commandCheck">
<select class="form-control" id="commandCheck">
<option value="true">Abilitato</option>
<option value="false" selected="selected" >Disabilitato</option>
</select>
Expand Down

0 comments on commit 37a1bd0

Please sign in to comment.