From 4f9378899ba673d32b5bd92c636b9674dc50fce3 Mon Sep 17 00:00:00 2001
From: FlavioBarachino <flavio.barachino@gmail.com>
Date: Fri, 7 Jul 2023 15:00:47 +0200
Subject: [PATCH] Problema risolto su editing categorie

---
 app/Http/Controllers/CategorieController.php  |  2 +-
 app/Models/Categorie.php                      | 12 +++--
 public/js/app/conti_categorie.js              |  7 ++-
 public/js/app/movimenti.js                    | 50 ++++++++++---------
 .../views/conti/categorie/list.blade.php      | 13 +++--
 5 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/app/Http/Controllers/CategorieController.php b/app/Http/Controllers/CategorieController.php
index ff50560..5fdda43 100644
--- a/app/Http/Controllers/CategorieController.php
+++ b/app/Http/Controllers/CategorieController.php
@@ -32,7 +32,7 @@ class CategorieController extends Controller
     
     public function updatePostCategorie(Request $request)
     {
-        Categorie::updateNameById($request['id'],$request['cat_name']);
+        Categorie::updateNameById($request);
         return redirect(route('categorie'));
     }
     
diff --git a/app/Models/Categorie.php b/app/Models/Categorie.php
index 8bb6dcd..c76e525 100644
--- a/app/Models/Categorie.php
+++ b/app/Models/Categorie.php
@@ -31,7 +31,7 @@ class Categorie extends Model
     }
     
     public static function inserisci($request){
-        if ($request['cat_entrata']=='on')
+        if ($request['cat_entrata']==='on')
         {
             $entrata=1;
         }
@@ -40,7 +40,7 @@ class Categorie extends Model
             $entrata=0;
         }
 
-        if ($request['cat_uscita']=='on')
+        if ($request['cat_uscita']==='on')
         {
             $uscita=1;
         }
@@ -48,6 +48,7 @@ class Categorie extends Model
         {
             $uscita=0;
         }
+        
        return DB::table('categories')->insert([
         'cat_name'=> $request['cat_name'],
         'cat_entrata'=>$entrata,
@@ -68,7 +69,7 @@ class Categorie extends Model
     }
     
     public static function updateNameById($request) {
-        if ($request['cat_entrata']=='on')
+        if ($request['cat_entrata']==='on')
         {
             $entrata=1;
         }
@@ -77,7 +78,7 @@ class Categorie extends Model
             $entrata=0;
         }
 
-        if ($request['cat_uscita']=='on')
+        if ($request['cat_uscita']==='on')
         {
             $uscita=1;
         }
@@ -85,10 +86,11 @@ class Categorie extends Model
         {
             $uscita=0;
         }
+
         DB::table('categories')
         ->where('id','=', $request['id'])
         ->update([
-            'cat_name' => $request['name'],
+            'cat_name' => $request['cat_name'],
             'cat_entrata' => $entrata,
             'cat_uscita'=>$uscita,
         ]);
diff --git a/public/js/app/conti_categorie.js b/public/js/app/conti_categorie.js
index 704083a..fe79ec9 100644
--- a/public/js/app/conti_categorie.js
+++ b/public/js/app/conti_categorie.js
@@ -21,9 +21,13 @@ $(document).on('click','.open_modal',function(){
         //success data
         $('#cat_entrata').prop('checked', false);
         $('#cat_uscita').prop('checked', false);
+       
+       
         console.log(data[0]);
         console.log(data[0].cat_name);
-        $('#H_cat_cat_name').val(data[0].cat_name);
+
+       
+
         if (data[0].cat_uscita === 1)
         {
             // $('.myCheckbox').prop('checked', true);
@@ -34,6 +38,7 @@ $(document).on('click','.open_modal',function(){
             $('#cat_entrata').prop('checked', true);
         }
         $('#H_cat_id').val(data[0].id);
+        $('#H_cat_cat_name').val(data[0].cat_name);
         $('#myModal').modal('show');
     });
 });
diff --git a/public/js/app/movimenti.js b/public/js/app/movimenti.js
index feafdaa..de6f277 100644
--- a/public/js/app/movimenti.js
+++ b/public/js/app/movimenti.js
@@ -80,39 +80,41 @@ $(document).on('click', '.open_modal_modifica', function() {
 	$.getJSON(url + '/' + riga_id, function(data) {
 		// success data
 		console.log(data[0]);
+		$.getJSON("/admin/service/taglist", {}, function(tags) {
+			$.each(tags, function(i, tag) {
+				$("select[name='mov_fk_tags']").append(
+					new Option(tag.tag_name, tag.id)
+				)
+				$('#tags')
+					.find('option:contains(' + data[0].tag_name + ')')
+					.prop('selected', true)
+					.trigger('change');
+			});
+		});
+		$.getJSON("/admin/service/catlist", {}, function(cats) {
+			$.each(cats, function(i, cat) {
+				$("select[name='mov_fk_categoria']").append(
+					new Option(cat.cat_name, cat.id)
+				)
+				$('#categoria')
+					.find('option:contains(' + data[0].cat_name + ')')
+					.prop('selected', true)
+					.trigger('change');
+			}
+			);
+		});
 		$('.modal-title').text('Modifica movimento');
 		$('#data').val(data[0].mov_data);
 		$('#descrizione').val(data[0].mov_descrizione);
 		$('#importo').val(data[0].mov_importo);
-		$('#tags')
-			.find('option:contains(' + data[0].tag_name + ')')
-			.prop('selected', true)
-			.trigger('change');
-		$('#categoria')
-			.find('option:contains(' + data[0].cat_name + ')')
-			.prop('selected', true)
-			.trigger('change');
+		
 		$('#myModal').modal('show');
 		// $('.panel-heading').text('Modifica movimento');
 		$('#form').attr('action', '/admin/movimenti/modify');
 		$('#form').append('<input type="hidden" name="id" value="' + riga_id + '">');
-		$.getJSON("/admin/service/taglist", {}, function(data) {
-			$.each(data, function(i, item) {
-				$("select[name='mov_fk_tags']").append(
-					new Option(item.tag_name, item.id)
-				)
-			});
-		});
-		$.getJSON("/admin/service/catlist", {}, function(data) {
-			$.each(data, function(i, item) {
-				$("select[name='mov_fk_categoria']").append(
-					new Option(item.cat_name, item.id)
-				)
-			}
-			);
-		});
+		
 	});
-
+		
 });
 
 /*$.getJSON("/admin/service/taglist", {}, function(data) {
diff --git a/resources/views/conti/categorie/list.blade.php b/resources/views/conti/categorie/list.blade.php
index acc199e..64b6280 100644
--- a/resources/views/conti/categorie/list.blade.php
+++ b/resources/views/conti/categorie/list.blade.php
@@ -61,17 +61,19 @@
 	<div class="modal fade" id="myModal" tabindex="-1" role="dialog"
 		aria-labelledby="myModalLabel" aria-hidden="true">
 		<div class="modal-dialog" role="document">
+		<form action="/admin/categorie/modify" method="POST">
 			<div class="modal-content">
 				<div class="modal-header">
 					<h4 class="modal-title">Modifica Categoria</h4>
 				</div>
 				<div class="modal-body">
+					
 					<div class="row">
 						<div class="col-md-8">
-							<form action="/admin/categorie/modify" 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">
+							
+								@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">
 
 						</div>
 					</div>
@@ -94,8 +96,9 @@
 					<input type="hidden" name="id" id="H_cat_id">
 					<button type="submit" class="btn btn-primary">Modifica</button>
 				</div>
-				</form>
+				
 			</div>
+		</form>
 		</div>
 	</div>
 	<!-- FINE MODAL MODIFICA -->