This repository has been archived by the owner on Jul 1, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #40 from RedRoundRobin/feature/latestFrontendFix
Feature/latest frontend fix
- Loading branch information
Showing
12 changed files
with
321 additions
and
70 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| @extends('layouts.app') | ||
| @section('breadcrumbs', Breadcrumbs::render('alerts')) | ||
| @section('content') | ||
|
|
||
| <div class="container-fluid"> | ||
| <div class="d-sm-flex mb-4"> | ||
| <h1 class="h3 mb-0 text-gray-800"> Crea alert</h1> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col-auto mb-4 "> | ||
| <a href="{{route('dashboard.index')}}" class="btn btn-sm btn-danger btn-icon-split"> | ||
| <span class="icon text-white-50"> | ||
| <span class="fas fa-arrow-circle-left"></span> | ||
| </span> | ||
| <span class="text">Torna indietro</span> | ||
| </a> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="row"> | ||
| <div class="col-lg-12"> | ||
| <div class="card shadow mb-4"> | ||
| <div class="card-header py-3"> | ||
| <h6 class="m-0 font-weight-bold text-primary"><span class="fas fa-bell"></span> Creazione alert</h6> | ||
| </div> | ||
| <div class="card-body"> | ||
| <div class="table-responsive-sm"> | ||
| <form action="{{route('settings.updateAlerts')}}" method="POST"> | ||
| @csrf | ||
| @method('POST') | ||
|
|
||
| <div class="form-group row"> | ||
| <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="sensorId" id="inputSensor"> | ||
| <option value="idlogicosensore">Nome dispositivo - id reale sensore (vedi pagina view)</option> | ||
| </select> | ||
| @error('sensor') | ||
| <span class="invalid-feedback" role="alert"> | ||
| <strong>{{ $message }}</strong> | ||
| </span> | ||
| @enderror | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="form-group row"> | ||
| <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('sensor') is-invalid @enderror" name="threshold" id="inputSoglia"> | ||
| <option value="tiponumerosoglia">maggiore di o minore di o uguale a</option> | ||
| </select> | ||
| @error('sensor') | ||
| <span class="invalid-feedback" role="alert"> | ||
| <strong>{{ $message }}</strong> | ||
| </span> | ||
| @enderror | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="form-group row"> | ||
| <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" class="form-control @error('sensor') is-invalid @enderror" name="thresholdvalue" id="inputValue" | ||
| placeholder="Inserisci un valore di soglia" value="valorenumerico"> | ||
| @error('sensor') | ||
| <span class="invalid-feedback" role="alert"> | ||
| <strong>{{ $message }}</strong> | ||
| </span> | ||
| @enderror | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| </form> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| @endsection |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| @extends('layouts.app') | ||
| @section('breadcrumbs', Breadcrumbs::render('alerts')) | ||
| @section('content') | ||
|
|
||
| <div class="container-fluid"> | ||
| <div class="d-sm-flex mb-4"> | ||
| <h1 class="h3 mb-0 text-gray-800"> Modifica alerts</h1> | ||
| </div> | ||
| <div class="d-flex justify-content-between"> | ||
| <a href="{{route('dashboard.index')}}" class="btn btn-sm btn-danger btn-icon-split mb-3"> | ||
| <span class="icon text-white-50"> | ||
| <span class="fas fa-arrow-circle-left"></span> | ||
| </span> | ||
| <span class="text">Torna indietro</span> | ||
| </a> | ||
| <a class="btn btn-sm btn-danger btn-icon-split mb-3" href="{{ route('alerts.destroy', ['alertId'=>$view->viewId]) }}" | ||
| onclick="event.preventDefault(); document.getElementById('destroy-view').submit();"> | ||
| <span class="icon text-white-50"> | ||
| <span class="fas fa-trash-alt"></span> | ||
| </span> | ||
| <span class="text">Elimina alerts</span> | ||
| </a> | ||
| <form id="destroy-view" action="{{ route('alerts.destroy', ['viewId'=>$view->viewId]) }}" method="POST" style="display: none;"> | ||
| @csrf | ||
| @method('DELETE') | ||
| </form> | ||
| </div> | ||
|
|
||
| <div class="row"> | ||
| <div class="col-lg-12"> | ||
| <div class="card shadow mb-4"> | ||
| <div class="card-header py-3"> | ||
| <h6 class="m-0 font-weight-bold text-primary"><span class="fas fa-bell"></span> Modifica alerts</h6> | ||
| </div> | ||
| <div class="card-body"> | ||
| <div class="table-responsive-sm"> | ||
| <form action="{{route('settings.updateAlerts')}}" method="POST"> | ||
| @csrf | ||
| @method('PUT') | ||
|
|
||
| <div class="form-group row"> | ||
| <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="sensorId" id="inputSensor"> | ||
| <option value="idlogicosensore">Nome dispositivo - id reale sensore (vedi pagina view)</option> | ||
| </select> | ||
| @error('sensor') | ||
| <span class="invalid-feedback" role="alert"> | ||
| <strong>{{ $message }}</strong> | ||
| </span> | ||
| @enderror | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="form-group row"> | ||
| <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('sensor') is-invalid @enderror" name="threshold" id="inputSoglia"> | ||
| <option value="tiponumerosoglia">maggiore di o minore di o uguale a</option> | ||
| </select> | ||
| @error('sensor') | ||
| <span class="invalid-feedback" role="alert"> | ||
| <strong>{{ $message }}</strong> | ||
| </span> | ||
| @enderror | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="form-group row"> | ||
| <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" class="form-control @error('sensor') is-invalid @enderror" name="thresholdvalue" id="inputValue" | ||
| placeholder="Inserisci un valore di soglia" value="valorenumerico"> | ||
| @error('sensor') | ||
| <span class="invalid-feedback" role="alert"> | ||
| <strong>{{ $message }}</strong> | ||
| </span> | ||
| @enderror | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| </form> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| @endsection |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,77 @@ | ||
| @extends('layouts.app') | ||
|
|
||
| @section('breadcrumbs', Breadcrumbs::render('alerts')) | ||
| @section('content') | ||
| @dd($alertsWithSensors); | ||
|
|
||
| <div class="container-fluid"> | ||
| <div class="d-sm-flex mb-4"> | ||
| <h1 class="h3 mb-0 text-gray-800"> Alerts</h1> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col-auto mb-4 "> | ||
| <a href="{{route('dashboard.index')}}" class="btn btn-sm btn-danger btn-icon-split"> | ||
| <span class="icon text-white-50"> | ||
| <span class="fas fa-arrow-circle-left"></span> | ||
| </span> | ||
| <span class="text">Torna indietro</span> | ||
| </a> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="row"> | ||
| <div class="col-lg-12"> | ||
| <div class="card shadow mb-4"> | ||
| <div class="card-header py-3"> | ||
| <h6 class="m-0 font-weight-bold text-primary"><span class="fas fa-bell"></span> Lista alerts</h6> | ||
| </div> | ||
| <div class="card-body"> | ||
| <div class="table-responsive-sm"> | ||
| <form action="{{route('settings.updateAlerts')}}" method="POST"> | ||
| @csrf | ||
| @method('POST') | ||
| <table class="table table-bordered table-striped border-secondary"> | ||
| <thead class="thead-dark table-borderless"> | ||
| <tr> | ||
| <th class="text-center"><span class="fas fa-list-ul"></span></th> | ||
| <th>Dispositivo</th> | ||
| <th>Sensore</th> | ||
| <th>Soglia</th> | ||
| <th>Valore</th> | ||
| <th>Ultimo invio</th> | ||
| @canany(['isMod', 'isAdmin']) | ||
| <th class="bg-secondary"> </th> | ||
| @endcanany | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| @foreach($alertsWithSensors as $status => $a) | ||
| @foreach($a as $list) | ||
| <tr> | ||
| <td><span class="logic-id">{{$list['alert']->alertId}}</span></td> | ||
| <td><a href="{{route('devices.show', ['deviceId' => $list['device']->deviceId])}}">{{$list['device']->name}}</a></td> | ||
| <td><a href="{{route('sensors.show', ['deviceId' => $list['device']->deviceId, 'sensorId' => $list['sensor']->realSensorId])}}"><span class="real-id">{{$list['sensor']->realSensorId}}</span></td> | ||
| <td>{{$list['alert']->getType()}}</td> | ||
| <td>{{$list['alert']->threshold}}</td> | ||
| <td>{{$list['alert']->lastSent??'-'}}</td> | ||
| @canany(['isMod', 'isAdmin']) | ||
| <td> | ||
| <a href="{{route('alerts.edit', $list['alert']->alertId)}}" class="btn btn-sm btn-warning btn-icon-split"> | ||
| <span class="icon text-white-50"> | ||
| <span class="fas fa-edit"></span> | ||
| </span> | ||
| <span class="text">Modifica</span> | ||
| </a> | ||
| </td> | ||
| @endcanany | ||
| </tr> | ||
| @endforeach | ||
| @endforeach | ||
| </tbody> | ||
| </table> | ||
| </form> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| @endsection |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.