Merge branch 'devel' con modifiche effettuate

This commit is contained in:
Amministratore 2023-05-24 21:44:57 +02:00
commit 9a14f95ad7
11 changed files with 419 additions and 253 deletions

2
.gitignore vendored
View File

@ -17,3 +17,5 @@ yarn-error.log
*.sql *.sql
/.idea /.idea
/.vscode /.vscode
resources/views/tmp/*

View File

@ -123,4 +123,15 @@ class AutoController extends Controller
{ {
$pdf=Operazione::exportPdfOperazioni($id['id']); $pdf=Operazione::exportPdfOperazioni($id['id']);
} }
public function getAutoById($id)
{
return json_encode(Auto::getAutoById($id));
}
public function udateAuto(Request $request)
{
Auto::updateAuto($request);
return redirect('/admin/auto');
}
} }

View File

@ -41,4 +41,21 @@ class Auto extends Model
{ {
DB::table('autos')->delete($id['id']); DB::table('autos')->delete($id['id']);
} }
public static function updateAuto($data)
{
DB::table('autos')->where('id','=',$data['id'])->update([
'targa'=>$data['targa'],
'marca'=>$data['marca'],
'modello'=>$data['modello'],
'cilindrata'=>$data['cilindrata'],
'cvfiscali'=>$data['cvfiscali'],
'alimentazione'=>$data['alimentazione'],
'ntelaio'=>$data['ntelaio'],
'nmotore'=>$data['nmotore'],
'data_acquisto'=>$data['data_acquisto'],
'note'=>$data['note'],
]);
}
} }

View File

@ -63,10 +63,10 @@
@section('script') @section('script')
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$('#automobili').DataTable({ $('#automobili').DataTable({
responsive: true responsive: true
});
}); });
</script> });
</script>
@endsection @endsection

View File

@ -93,5 +93,11 @@
responsive: true responsive: true
}); });
}); });
$(document).on('click','.open_modal_nuovo',function(){
$('#myModal_nuovo').modal('show');
// $('.modal-title').append(' entrata');
$('#form').attr('action','movimentie');
});
</script> </script>
@endsection @endsection

View File

@ -1,4 +1,7 @@
@extends('admin') @extends('admin')
@section('head_additional')
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@48,400,0,0" />
@endsection
@section('content') @section('content')
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
@ -9,7 +12,7 @@
<!-- Content here --> <!-- Content here -->
<div class="row"> <div class="row">
<div class="col-sx-12"> <div class="col-sx-12">
<a class="btn btn-primary" href="auto/new"><i class="fa fa-pencil-square-o fw"></i></a> <a class="btn btn-primary open_modal_new"><i class="fa fa-pencil-square-o fw"></i></a>
</div> </div>
</div> </div>
@ -40,13 +43,19 @@
<td>{{ $automobile->modello; }}</td> <td>{{ $automobile->modello; }}</td>
<td>{{ $automobile->targa; }}</td> <td>{{ $automobile->targa; }}</td>
<td> <td>
<a class="btn btn-primary" href="auto/rifornimento?id={{ $automobile->id; }}">Rifornimento</a>&nbsp; <button class="btn btn-primary open_modal_rifornimento" value="{{ $automobile->id; }}"><span class="material-symbols-outlined">local_gas_station</span></button>&nbsp;
<a class="btn btn-primary" href="auto/revisione?id={{ $automobile->id; }}">Revisione</a>&nbsp; <a class="btn btn-primary" href="auto/revisione?id={{ $automobile->id; }}"><span class="material-symbols-outlined">
<a class="btn btn-primary" href="auto/manutenzione?id={{ $automobile->id; }}">Manutenzione</a>&nbsp; checklist
<a class="btn btn-primary" href="auto/accessori?id={{ $automobile->id; }}">Accessori</a>&nbsp; </span></a>&nbsp;
<a class="btn btn-primary" href="auto/manutenzione?id={{ $automobile->id; }}"><span class="material-symbols-outlined">
plumbing
</span></a>&nbsp;
<a class="btn btn-primary" href="auto/accessori?id={{ $automobile->id; }}"><span class="material-symbols-outlined">
park
</span></a>&nbsp;
</td> </td>
<td> <td>
<a class="btn btn-primary" href="auto/modify?id={{ $automobile->id; }}"><i class="fa fa-pencil-square-o fw"></i></a>&nbsp; <button class="btn btn-primary open_modal_modify" value="{{ $automobile->id; }}"><i class="fa fa-pencil-square-o fw"></i></button>&nbsp;
<a class="btn btn-danger" href="auto/delete?id={{ $automobile->id; }}"><i class="fa fa-trash-o fa-fw"></i></a>&nbsp; <a class="btn btn-danger" href="auto/delete?id={{ $automobile->id; }}"><i class="fa fa-trash-o fa-fw"></i></a>&nbsp;
</td> </td>
</tr> </tr>
@ -59,7 +68,153 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<!-- MODAL AUTO-->
<div class="modal fade" id="myModal_new" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Inserisci Auto</h5>
</div>
<div class="modal-body">
<div class="row">
<div class="col-md-8">
<form action="" method="POST" id="form">
@csrf
<div class="row">
<div class="col-xs-6">
<label for="marca" class="form-label">Marca</label> <input
type="text" class="form-control" id="marca" name="marca">
</div>
<div class="col-xs-6">
<label for="modello" class="form-label">Modello</label> <input
type="text" class="form-control" id="modello" name="modello">
</div>
</div>
<div class="row">
<div class="col-xs-6">
<label for="targa" class="form-label">Targa</label> <input
type="text" class="form-control" id="targa" name="targa">
</div>
<div class="col-xs-6">
<label for="alimentazione" class="form-label">Alimentazione</label>
<input type="text" class="form-control" id="alimentazione"
name="alimentazione">
</div>
</div>
<div class="row">
<div class="col-xs-6">
<label for="cilindrata" class="form-label">Cilindrata</label>
<input type="text" class="form-control" id="cilindrata"
name="cilindrata">
</div>
<div class="col-xs-6">
<label for="cvfiscali" class="form-label">Cavalli Fiscali</label>
<input type="text" class="form-control" id="cvfiscali"
name="cvfiscali">
</div>
</div>
<div class="row">
<div class="col-xs-6">
<label for="ntelaio" class="form-label">Num. Telaio</label> <input
type="text" class="form-control" id="ntelaio" name="ntelaio">
</div>
<div class="col-xs-6">
<label for="nmotore" class="form-label">Num. Motore</label> <input
type="text" class="form-control" id="nmotore" name="nmotore">
</div>
</div>
<div class="row">
<div class="col-xs-6">
<label for="data_acquisto" class="form-label">Data di Acquisto</label>
<input type="date" class="form-control" id="data_acquisto"
name="data_acquisto">
</div>
<div class="col-xs-6">
<label for="note" class="form-label">Note</label> <input
type="text" class="form-control" id="note" name="note">
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="submit" class="btn btn-primary">Submit</button>
</div>
</form>
</div>
</div>
</div>
<!-- /MODAL -->
<!-- MODAL Rifornimento -->
<div class="modal fade" id="myModal_rifornimento" tabindex="-1"
role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Rifornimento auto</h5>
</div>
<div class="modal-body">
<form action="" method="POST" id="form_rifornimento">
@csrf
<div class="row">
<div class="col-xs-6">
<label for="data" class="form-label">Data</label> <input
type="date" class="form-control" id="Rifdata" name="data"
value="{{ date('Y-m-d');}}">
</div>
<div class="col-xs-6">
<label for="km" class="form-label">Km</label> <input type="text"
class="form-control" id="Rifkm" minlength="3" name="km">
</div>
</div>
<div class="row">
<div class="col-xs-6">
<label for="eurolitro" class="form-label">Costo al litro</label>
<input type="text" class="form-control" id="Rifeurolitro"
name="eurolitro">
</div>
<div class="col-xs-6">
<label for="litri" class="form-label">Litri</label> <input
type="text" class="form-control" id="Riflitri" name="litri">
</div>
</div>
<div class="row">
<div class="col-xs-6">
<label for="importo" class="form-label">Importo totale</label> <input
type="text" class="form-control" id="Rifimporto" name="importo">
</div>
<div class="col-xs-6">
<label for="distributore" class="form-label">Distributore</label>
<input type="text" class="form-control" id="Rifdistributore"
name="distributore">
</div>
</div>
<div class="row">
<div class="col-xs-6">
<label for="inMovimenti" class="form-label">Inserire nei
movimenti?</label> <input type="checkbox" id="RifinMovimenti"
name="inMovimenti">
</div>
</div>
<div class="modal-footer">
<div class="row">
<div class="col-xs-12">
<input type="hidden" name="type" value="rifornimento">
<button type="submit" id="submit" class="btn btn-primary">Submit</button>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
<!-- /MODAL Rifornimento -->
<!-- /.col-lg-12 --> <!-- /.col-lg-12 -->
@endsection @endsection
@ -71,5 +226,54 @@
responsive: true responsive: true
}); });
}); });
$(document).on('click','.open_modal_new',function(){
$('#myModal_new').modal('show');
// $('.modal-title').append(' entrata');
$('#form').attr('action','auto/new');
$('#targa').val('');
$('#marca').val('');
$('#modello').val('');
$('#cilindrata').val('');
$('#alimentazione').val('');
$('#cvfiscali').val('');
$('#ntelaio').val('');
$('#nmotore').val('');
$('#data_acquisto').val('');
$('#note').val('');
});
$(document).on('click','.open_modal_modify',function(){
var url = "auto/getAuto";
var riga_id= $(this).val();
$.getJSON(url + '/' + riga_id, function (data) {
$('.modal-title').text('Modifica Automobile');
// $('#id').val(data.mov_data);
$('#targa').val(data.targa);
$('#marca').val(data.marca);
$('#modello').val(data.modello);
$('#cilindrata').val(data.cilindrata);
$('#alimentazione').val(data.alimentazione);
$('#cvfiscali').val(data.cvfiscali);
$('#ntelaio').val(data.ntelaio);
$('#nmotore').val(data.nmotore);
$('#data_acquisto').val(data.data_acquisto);
$('#note').val(data.note);
$('#myModal_new').modal('show');
// $('.panel-heading').text('Modifica movimento');
$('#form').attr('action','auto/modify');
$('#form').append('<input type="hidden" name="id" value="' + riga_id +'">');
});
});
$(document).on('click','.open_modal_rifornimento',function(){
var riga_id= $(this).val();
$('#form_rifornimento').attr('action','auto/rifornimento');
$('#form_rifornimento').append('<input type="hidden" name=""type" value="rifornimento">');
$('#form_rifornimento').append('<input type="hidden" name="auto" value="' + riga_id +'">');
$('#myModal_rifornimento').modal('show');
});
</script> </script>
@endsection @endsection

View File

@ -1,32 +0,0 @@
@extends('admin')
@section('content')
<div class="row">
<div class="col-lg-12">
<h1 class="page-header">Categorie</h1>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<div class="panel panel-default">
<div class="panel-heading">
Modifica categorie
</div>
<div class="panel-body">
<form action="" method="POST">
@foreach($categorie as $categoria)
@csrf
<div class="mb-3">
<label for="categoria" class="form-label">Categoria</label>
<input type="text" class="form-control" id="categoria" size="50" name="cat_name" value="{{ $categoria->cat_name }}">
</div>
<input type="hidden" name="id" value="{{ $_GET['id']; }}">
<button type="submit" class="btn btn-primary">Submit</button>
@endforeach
</form>
</div>
</div>
</div>
</div>
@endsection

View File

@ -1,100 +1,114 @@
@extends('admin') @extends('admin')
@section('content') @section('content')
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<h1 class="page-header">Lista categorie</h1> <h1 class="page-header">Lista categorie</h1>
</div> </div>
</div> </div>
<div class="container"> <div class="container">
<!-- Content here --> <!-- Content here -->
<button class="btn btn-warning btn-detail open_modal_new" > Nuova Categoria </button> <button class="btn btn-warning btn-detail open_modal_new">Nuova
<div class="row"> Categoria</button>
<div class="col-lg-12"> <div class="row">
<div class="panel panel-default"> <div class="col-lg-12">
<div class="panel-heading"> <div class="panel panel-default">
Lista delle categorie <div class="panel-heading">Lista delle categorie</div>
</div> <div class="panel-body">
<div class="panel-body"> <div class="table-responsive">
<div class="table-responsive"> <table class="table table-striped table-bordered table-hover"
<table class="table table-striped table-bordered table-hover" id="categorie"> id="categorie">
<thead> <thead>
<tr> <tr>
<th>Categoria</th> <th>Categoria</th>
<th>Azione</th> <th>Azione</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($categorie as $categoria) @foreach($categorie as $categoria)
<tr> <tr>
<td><a href="movimenti/report/movimentibycat?cat={{ $categoria->id }}">{{ $categoria->cat_name; }}</a></td> <td><a
<td> href="movimenti/report/movimentibycat?cat={{ $categoria->id }}">{{
<button class="btn btn-warning btn-detail open_modal" value="{{$categoria->id}}">Edit</button>&nbsp; $categoria->cat_name; }}</a></td>
<a class="btn btn-danger" href="/admin/catdelete?id={{ $categoria->id; }}"><i class="fa fa-trash-o fa-fw"></i></a>&nbsp; <td>
</td> <button class="btn btn-warning btn-detail open_modal"
</tr> value="{{$categoria->id}}">Edit</button>&nbsp; <a
@endforeach class="btn btn-danger"
</tbody> href="/admin/catdelete?id={{ $categoria->id; }}"><i
class="fa fa-trash-o fa-fw"></i></a>&nbsp;
</td>
</tr>
@endforeach
</tbody>
</table> </table>
</div>
</div>
</div>
</div>
</div>
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="row">
<div class="col-lg-12">
<h1 class="page-header">Categorie</h1>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<div class="panel panel-default">
<div class="panel-heading">Modifica categorie</div>
<div class="panel-body">
<form action="catmodify" method="POST">
@csrf
<div class="mb-3">
<label for="H_cat_cat_name" class="form-label">Categoria</label> <input
type="text" class="form-control" id="H_cat_cat_name" size="50"
name="cat_name" value="">
</div>
<input type="hidden" name="id" id="H_cat_id" >
<button type="submit" class="btn btn-primary">Submit</button>
</form>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="modal fade" id="myModal_new" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <!-- MODAL MODIFICA -->
<div class="modal fade" id="myModal" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
<!-- FORM INSERIMENTO NUOVA CATEGORIA --> <div class="modal-header">
<form action="" method="POST"> <h4 class="modal-title">Modifica Categoria</h4>
@csrf </div>
<div class="mb-3"> <div class="modal-body">
<label for="categoria" class="form-label">Categoria</label> <div class="row">
<input type="text" class="form-control" id="categoria" name="cat_name"> <div class="col-md-8">
<form action="catmodify" method="POST">
@csrf <label for="H_cat_cat_name" class="form-label">Categoria</label>
<input type="text" class="form-control" id="H_cat_cat_name"
size="50" name="cat_name" value="" size="50">
</div> </div>
</div>
</div>
<div class="modal-footer">
<input type="hidden" name="id" id="H_cat_id">
<button type="submit" class="btn btn-primary">Modifica</button>
</div>
</form>
</div>
</div>
</div>
<!-- FINE MODAL MODIFICA -->
<!-- MODAL INSERIMENTO -->
<div class="modal fade" id="myModal_new" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Categoria</h4>
</div>
<div class="modal-body">
<div class="row">
<div class="col-md-8">
<!-- FORM INSERIMENTO NUOVA CATEGORIA -->
<form action="" method="POST">
@csrf <label for="categoria" class="form-label">Categoria</label>
<input type="text" class="form-control" id="categoria"
name="cat_name" size="50">
<button type="submit" class="btn btn-primary">Submit</button> </div>
</form> </div>
<!-- FINE FORM INSERIMENTO NUOVA CATEGORIA --> </div>
</div> <div class="modal-footer">
</div> <button type="submit" class="btn btn-primary">Submit</button>
</div> </form>
<!-- /.col-lg-12 --> <!-- FINE FORM INSERIMENTO NUOVA CATEGORIA -->
</div>
</div>
</div>
<!-- FINE MODAL INSERIMENTO -->
<!-- /.col-lg-12 -->
@endsection @endsection

View File

@ -1,67 +0,0 @@
@extends('admin')
@section('content')
<div class="row">
<div class="col-lg-12">
<h1 class="page-header">Movimenti</h1>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<div class="panel panel-default">
<div class="panel-heading">
Modifica movimento
</div>
<div class="panel-body">
<form action="" method="POST">
@foreach($movimenti as $movimento)
@csrf
<div class="mb-3">
<label for="data" class="form-label">Data</label>
<input type="date" class="form-control" id="data" name="mov_data" value="{{ $movimento->mov_data; }}">
</div>
<div class="mb-3">
<label for="categoria" class="form-label">Categoria</label>
<select name="mov_fk_categoria" class="form-control" id="categoria">
@foreach($categorie as $categoria)
@if(($categoria->id)===($movimento->mov_fk_categoria))
<option value="{{ $categoria->id; }}" selected>{{ $categoria->cat_name }}</option>
@else
<option value="{{ $categoria->id; }}">{{ $categoria->cat_name }}</option>
@endif
@endforeach
</select>
</div>
<div class="mb-3">
<label for="descrizione" class="form-label">Descrizione</label>
<input type="text" class="form-control" id="descrizione" size="50" name="mov_descrizione" value="{{ $movimento->mov_descrizione; }}">
</div>
<div class="mb-3">
<label for="importo" class="form-label">Importo</label>
<div class="input-group">
<span class="input-group-addon">
<i class="fa fa-eur"></i>
</span>
<input type="number" step="0.01" min="-999999" max="999999" class="form-control" id="importo" size="50" name="mov_importo" value="{{ $movimento->mov_importo; }}" aria-describedby="importo">
</div>
<div id="importo" class="form-text">inserire l'importo (se spesa far precedere da il simbolo "-")</div>
<label for="tags" class="form-label">Tag</label>
<select name="mov_fk_tags" class="form-control" id="tags">
@foreach($tags as $tag)
@if(($tag->id)===($movimento->mov_fk_tags))
<option value="{{ $tag->id; }}" selected>{{ $tag->tag_name }}</option>
@else
<option value="{{ $tag->id; }}">{{ $tag->tag_name }}</option>
@endif
@endforeach
</select>
</div>
<button type="submit" class="btn btn-primary">Submit</button>
<input type="hidden" name="id" value="{{ $_GET['id']; }}">
<input type="hidden" name="userid" value="{{ Auth::user()->id }}">
@endforeach
</form>
</div>
</div>
</div>
</div>
@endsection

View File

@ -14,7 +14,7 @@
<div class="panel-body"> <div class="panel-body">
<div class="row"> <div class="row">
<button class="btn btn-warning btn-detail open_modal_spesa">Nuova Spesa</button>&nbsp; <button class="btn btn-warning btn-detail open_modal_spesa">Nuova Spesa</button>&nbsp;
<button class="btn btn-warning btn-detail open_modal_entrata">Nuova Entrata</button</a> <button class="btn btn-warning btn-detail open_modal_entrata">Nuova Entrata</button>
</div> </div>
<div class="row"> <div class="row">
<div class="table-responsive"> <div class="table-responsive">
@ -52,69 +52,77 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
</div>
<!-- MODAL NEW -->
<div class="modal fade" id="myModal" tabindex="-1" role="dialog" <div class="modal fade" id="myModal" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true"> aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="row"> <div class="modal-header">
<div class="col-lg-12"> <h4 class="modal-title">Nuovo movimento</h4>
<div class="panel panel-default">
<div class="panel-heading">Nuovo movimento</div> </div>
<div class="panel-body"> <div class="modal-body">
<form action="" method="POST" id="form"> <div class="row">
@csrf <div class="col-md-12">
<div class="row"> <form action="" method="POST" id="form">
<div class="col-xs-6"> @csrf
<label for="data" class="form-label">Data</label> <input <div class="row">
type="date" class="form-control" id="data" name="mov_data" <div class="col-xs-6">
value="{{ date('Y-m-d'); }}"> <label for="data" class="form-label">Data</label> <input
</div> type="date" class="form-control" id="data" name="mov_data"
<div class="col-xs-6"> value="{{ date('Y-m-d'); }}">
<label for="categoria" class="form-label">Categoria</label> <select </div>
name="mov_fk_categoria" class="form-control selectpicker" <div class="col-xs-6">
id="categoria" data-live-search="true" <label for="categoria" class="form-label">Categoria</label> <select
data-live-search-placeholder="Cerca opzioni"> name="mov_fk_categoria" class="form-control selectpicker"
</select> id="categoria" data-live-search="true"
data-live-search-placeholder="Cerca opzioni">
</select>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<label for="descrizione" class="form-label">Descrizione</label>
<input type="text" class="form-control" id="descrizione"
size="50" name="mov_descrizione">
</div>
</div>
<div class="row">
<div class="col-xs-5">
<label for="importo" class="form-label">Importo</label>
<div class="input-group">
<span class="input-group-addon"> <i class="fa fa-eur"></i>
</span> <input type="number" step="0.01" min="-999999"
max="999999" class="form-control" id="importo" size="50"
name="mov_importo" aria-describedby="importo">
</div> </div>
</div> </div>
<div class="row">
<div class="col-xs-12"> <div class="col-xs-7">
<label for="descrizione" class="form-label">Descrizione</label> <label for="tags" class="form-label">Tag</label> <select
<input type="text" class="form-control" id="descrizione" name="mov_fk_tags" class="form-control" id="tags"></select>
size="50" name="mov_descrizione">
</div>
</div> </div>
<div class="row"> </div>
<div class="col-xs-5"> <div class="row">
<label for="importo" class="form-label">Importo</label> <div class="col-xs-12">&nbsp;</div>
<div class="input-group"> </div>
<span class="input-group-addon"> <i class="fa fa-eur"></i> <div class="row">
</span> <input type="number" step="0.01" min="-999999" <div class="col-xs-12"></div>
max="999999" class="form-control" id="importo" size="50" </div>
name="mov_importo" aria-describedby="importo">
</div>
</div>
<!-- <div id="importo" class="form-text">inserire l'importo (se spesa far precedere da il simbolo "-")</div>-->
<div class="col-xs-7">
<label for="tags" class="form-label">Tag</label> <select
name="mov_fk_tags" class="form-control" id="tags"></select>
</div>
</div>
<div class="row">
<div class="col-xs-12">&nbsp;</div>
</div>
<div class="row">
<div class="col-xs-12">
<input type="hidden" name="userid"
value="{{ Auth::user()->id }}">
<button type="submit" class="btn btn-primary">Submit</button>
</div>
</div>
</form>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="modal-footer">
<input type="hidden" name="userid" value="{{ Auth::user()->id }}">
<button type="submit" class="btn btn-primary">Submit</button>
</form>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -129,12 +137,12 @@
}); });
$(document).on('click','.open_modal_spesa',function(){ $(document).on('click','.open_modal_spesa',function(){
$('#myModal').modal('show'); $('#myModal').modal('show');
$('.panel-heading').append(' spesa'); $('.modal-title').append(' spesa');
$('#form').attr('action','movimentis'); $('#form').attr('action','movimentis');
}); });
$(document).on('click','.open_modal_entrata',function(){ $(document).on('click','.open_modal_entrata',function(){
$('#myModal').modal('show'); $('#myModal').modal('show');
$('.panel-heading').append(' entrata'); $('.modal-title').append(' entrata');
$('#form').attr('action','movimentie'); $('#form').attr('action','movimentie');
}); });
$(document).on('click','.open_modal_modifica',function(){ $(document).on('click','.open_modal_modifica',function(){
@ -143,6 +151,7 @@
$.getJSON(url + '/' + riga_id, function (data) { $.getJSON(url + '/' + riga_id, function (data) {
// success data // success data
console.log(data[0]); console.log(data[0]);
$('.modal-title').text('Modifica movimento');
$('#data').val(data[0].mov_data); $('#data').val(data[0].mov_data);
$('#descrizione').val(data[0].mov_descrizione); $('#descrizione').val(data[0].mov_descrizione);
$('#importo').val(data[0].mov_importo); $('#importo').val(data[0].mov_importo);
@ -155,7 +164,7 @@
.prop('selected',true) .prop('selected',true)
.trigger('change'); .trigger('change');
$('#myModal').modal('show'); $('#myModal').modal('show');
$('.panel-heading').text('Modifica movimento'); // $('.panel-heading').text('Modifica movimento');
$('#form').attr('action','/admin/movmodify'); $('#form').attr('action','/admin/movmodify');
$('#form').append('<input type="hidden" name="id" value="' + riga_id +'">'); $('#form').append('<input type="hidden" name="id" value="' + riga_id +'">');
}); });

View File

@ -28,8 +28,8 @@ use App\Http\Controllers\ProgettiController;
Route::get('/', [MovimentiController::class,'dashboard']); Route::get('/', [MovimentiController::class,'dashboard']);
Route::get('logout', function(){ Auth::logout(); return redirect('login'); })->name('logout'); Route::get('logout', function(){ Auth::logout(); return redirect('login'); })->name('logout');
// MOVIMENTI // MOVIMENTI
Route::get('movimentis', [MovimentiController::class,'newMovimenti'])->name('movimentis'); Route::get('movimentis', [MovimentiController::class,'newMovimenti'])->name('movimentis');
Route::post('movimentis',[MovimentiController::class,'insMovimentiSpesa']); Route::post('movimentis',[MovimentiController::class,'insMovimentiSpesa']);
@ -80,9 +80,11 @@ Route::get('/', [MovimentiController::class,'dashboard']);
Route::get('auto', [AutoController::class, 'index'])->name('auto_list'); Route::get('auto', [AutoController::class, 'index'])->name('auto_list');
Route::get('auto/new', [AutoController::class, 'newAuto'])->name('auto_new'); Route::get('auto/new', [AutoController::class, 'newAuto'])->name('auto_new');
Route::post('auto/new', [AutoController::class, 'saveAuto'])->name('auto_save'); Route::post('auto/new', [AutoController::class, 'saveAuto'])->name('auto_save');
Route::get('auto/getAuto/{id}', [AutoController::class, 'getAutoById']);
Route::post('auto/modify', [AutoController::class, 'udateAuto']);
Route::get('auto/delete', [AutoController::class, 'delAuto']); Route::get('auto/delete', [AutoController::class, 'delAuto']);
Route::get('auto/detail', [AutoController::class, 'getAutoDetails']); Route::get('auto/detail', [AutoController::class, 'getAutoDetails']);
Route::get('auto/rifornimento', [AutoController::class, 'rifornimentoAuto'])->name('auto_rifornimento'); Route::get('auto/rifornimento/{id}', [AutoController::class, 'rifornimentoAuto'])->name('auto_rifornimento');
Route::post('auto/rifornimento', [AutoController::class, 'saveRifornimento']); Route::post('auto/rifornimento', [AutoController::class, 'saveRifornimento']);
Route::get('auto/revisione', [AutoController::class, 'revisioneAuto']); Route::get('auto/revisione', [AutoController::class, 'revisioneAuto']);
Route::post('auto/revisione', [AutoController::class, 'saveRevisione']); Route::post('auto/revisione', [AutoController::class, 'saveRevisione']);