From 969280f34e02a594d257f6bdf3e16c77cc736179 Mon Sep 17 00:00:00 2001
From: Flavio Barachino <flavio.barachino@gmail.com>
Date: Wed, 24 May 2023 10:10:20 +0200
Subject: [PATCH] rimosso file inutili e modificato stile popup per i movimenti

---
 .../views/conti/categorie/_update.blade.php   |  32 -----
 .../views/conti/movimenti/_update.blade.php   |  67 ----------
 .../views/conti/movimenti/list.blade.php      | 123 ++++++++++--------
 3 files changed, 66 insertions(+), 156 deletions(-)
 delete mode 100644 resources/views/conti/categorie/_update.blade.php
 delete mode 100644 resources/views/conti/movimenti/_update.blade.php

diff --git a/resources/views/conti/categorie/_update.blade.php b/resources/views/conti/categorie/_update.blade.php
deleted file mode 100644
index 77f7b43..0000000
--- a/resources/views/conti/categorie/_update.blade.php
+++ /dev/null
@@ -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
\ No newline at end of file
diff --git a/resources/views/conti/movimenti/_update.blade.php b/resources/views/conti/movimenti/_update.blade.php
deleted file mode 100644
index 5e22d44..0000000
--- a/resources/views/conti/movimenti/_update.blade.php
+++ /dev/null
@@ -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
\ No newline at end of file
diff --git a/resources/views/conti/movimenti/list.blade.php b/resources/views/conti/movimenti/list.blade.php
index b1900c9..6b99ea6 100644
--- a/resources/views/conti/movimenti/list.blade.php
+++ b/resources/views/conti/movimenti/list.blade.php
@@ -52,73 +52,81 @@
 		</div>
 	</div>
 </div>
+
+
+		</div>
+	</div>
+</div>
+<!-- MODAL NEW -->
 <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">
-					<div class="panel panel-default">
-						<div class="panel-heading">Nuovo movimento</div>
-						<div class="panel-body">
-							<form action="" method="POST" id="form">
-								@csrf
-								<div class="row">
-									<div class="col-xs-6">
-										<label for="data" class="form-label">Data</label> <input
-											type="date" class="form-control" id="data" name="mov_data"
-											value="{{ date('Y-m-d'); }}">
-									</div>
-									<div class="col-xs-6">
-										<label for="categoria" class="form-label">Categoria</label> <select
-											name="mov_fk_categoria" class="form-control selectpicker"
-											id="categoria" data-live-search="true"
-											data-live-search-placeholder="Cerca opzioni">
-										</select>
+			<div class="modal-header">
+				<h5 class="modal-title">Nuovo movimento</h5>
+			
+			</div>
+			<div class="modal-body">
+				<div class="row">
+					<div class="col-md-12">
+						<form action="" method="POST" id="form">
+							@csrf
+							<div class="row">
+								<div class="col-xs-6">
+									<label for="data" class="form-label">Data</label> <input
+										type="date" class="form-control" id="data" name="mov_data"
+										value="{{ date('Y-m-d'); }}">
+								</div>
+								<div class="col-xs-6">
+									<label for="categoria" class="form-label">Categoria</label> <select
+										name="mov_fk_categoria" class="form-control selectpicker"
+										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 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 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 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 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 class="row">
+								<div class="col-xs-12">&nbsp;</div>
+							</div>
+							<div class="row">
+								<div class="col-xs-12"></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>
- 
+
 @endsection
 @section('script')
 <script>
@@ -129,12 +137,12 @@
         });
     $(document).on('click','.open_modal_spesa',function(){
                    $('#myModal').modal('show');
-                   $('.panel-heading').append(' spesa');
+                   $('.modal-title').append(' spesa');
                    $('#form').attr('action','movimentis');
                 }); 
     $(document).on('click','.open_modal_entrata',function(){
                    $('#myModal').modal('show');
-                   $('.panel-heading').append(' entrata');
+                   $('.modal-title').append(' entrata');
                    $('#form').attr('action','movimentie');
                 });
     $(document).on('click','.open_modal_modifica',function(){
@@ -143,6 +151,7 @@
                 $.getJSON(url + '/' + riga_id, function (data) {
                     // success data
                     console.log(data[0]);
+                   $('.modal-title').text('Modifica movimento');
                    $('#data').val(data[0].mov_data); 
                    $('#descrizione').val(data[0].mov_descrizione);
                    $('#importo').val(data[0].mov_importo); 
@@ -155,7 +164,7 @@
                    		.prop('selected',true)
                    		.trigger('change');
                    $('#myModal').modal('show');
-                   $('.panel-heading').text('Modifica movimento');
+                   // $('.panel-heading').text('Modifica movimento');
                    $('#form').attr('action','/admin/movmodify');
                    $('#form').append('<input type="hidden" name="id" value="' + riga_id +'">');
                 });