From 447dcac84c211e01aa46f1372349fa8f0d680c47 Mon Sep 17 00:00:00 2001
From: Flavio Barachino <flavio.barachino@gmail.com>
Date: Fri, 19 May 2023 13:39:58 +0200
Subject: [PATCH] Popup modale Nuova Spesa e Nuova Entrata da lista movimenti 
 aggiornato e funzionante

---
 app/Http/Controllers/CategorieController.php  | 14 +--
 .../views/conti/movimenti/list.blade.php      | 97 ++++++++++++++++++-
 routes/admin.php                              |  5 +
 3 files changed, 103 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/CategorieController.php b/app/Http/Controllers/CategorieController.php
index 3ac1a0d..7fbe00e 100644
--- a/app/Http/Controllers/CategorieController.php
+++ b/app/Http/Controllers/CategorieController.php
@@ -28,17 +28,7 @@ class CategorieController extends Controller
         Categorie::deleteById($request['id']);
         return redirect(route('categorie'));  
     }
-     /*public function updateCategorie(Request $request)
-    {
-        $id=$request['id'];
-        
-        $categorie = Categorie::getById($id);
-       return view('conti.categorie.update',
-            [
-                'categorie'=> $categorie,
-            ]);
-        
-    }*/
+  
     
     public function updatePostCategorie(Request $request)
     {
@@ -50,7 +40,7 @@ class CategorieController extends Controller
     public function apiList()
     {
         $categorie=Categorie::list();
-        return response()->json($categorie);
+        return json_encode($categorie);
     }
     
     public function updateCategorie($id)
diff --git a/resources/views/conti/movimenti/list.blade.php b/resources/views/conti/movimenti/list.blade.php
index 6df35a2..0f9f8c2 100644
--- a/resources/views/conti/movimenti/list.blade.php
+++ b/resources/views/conti/movimenti/list.blade.php
@@ -12,7 +12,10 @@
                 Lista movimenti
             </div>
             <div class="panel-body">
-            	<div class="row"><a class="btn btn-primary" href="{{ route('movimentis'); }}">Nuova Spesa</a>&nbsp;<a class="btn btn-primary" href="{{ route('movimentie'); }}">Nuova Entrata</a></div>
+            	<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_entrata">Nuova Entrata</button</a>
+            	</div>
             	<div class="row">
             <div class="table-responsive">
                    <table class="table table-striped table-bordered table-hover" id="listamovimenti" data-page-length='25'>
@@ -49,6 +52,72 @@
 		</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">
+					<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>
+								</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 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>
  
 @endsection
 @section('script')
@@ -58,7 +127,33 @@
                 "responsive": true,
                 "order": [[0,"desc"]]                       	
         });
+    $(document).on('click','.open_modal_spesa',function(){
+                   $('#myModal').modal('show');
+                   $('.panel-heading').append(' spesa');
+                   $('#form').attr('action','movimentis');
+                }); 
+    $(document).on('click','.open_modal_entrata',function(){
+                   $('#myModal').modal('show');
+                   $('.panel-heading').append(' entrata');
+                   $('#form').attr('action','movimentie');
+                });         
+    $.getJSON("service/catlist",{},function(data){
+        	$.each(data,function(i,item){
+        		$("select[name='mov_fk_categoria']").append(
+        		 	new Option(item.cat_name,item.id)
+        		 )}
+        	);
+        });
+        
+        $.getJSON("service/taglist",{},function(data){
+        	$.each(data,function(i,item){
+        		$("select[name='mov_fk_tags']").append(
+        		 	new Option(item.tag_name,item.id)
+        		 )}
+        	);
+        });
     });
+    
 </script>
 @endsection
 
diff --git a/routes/admin.php b/routes/admin.php
index b83b245..b634545 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -51,6 +51,11 @@ Route::get('/', [MovimentiController::class,'dashboard']);
     Route::get('catdelete', [CategorieController::class,'deleteCategorie']);
     Route::get('catmodify/{id}', [CategorieController::class,'updateCategorie']);
     Route::post('catmodify', [CategorieController::class,'updatePostCategorie']);
+    
+// Richiami di servizio da jquery
+    Route::get('service/catlist', [CategorieController::class,'apiList']);
+    Route::get('service/taglist', [TagController::class,'apiList']);
+    
 // TAGS    
     Route::get('tags', [TagController::class,'listTags'])->name('tags');
     Route::post('tags', [TagController::class,'insTags']);