diff --git a/app/Http/Controllers/CategorieController.php b/app/Http/Controllers/CategorieController.php index f637979..ff50560 100644 --- a/app/Http/Controllers/CategorieController.php +++ b/app/Http/Controllers/CategorieController.php @@ -18,7 +18,7 @@ class CategorieController extends Controller public static function insCategorie(Request $request) { - Categorie::inserisci($request['cat_name']); + Categorie::inserisci($request); return view('conti.categorie.list',['categorie'=>Categorie::list()]); } diff --git a/app/Models/Categorie.php b/app/Models/Categorie.php index 8891334..a9e539b 100644 --- a/app/Models/Categorie.php +++ b/app/Models/Categorie.php @@ -30,14 +30,35 @@ class Categorie extends Model return DB::table('categories')->where('cat_entrata','=',1)->get(); } - public static function inserisci($name){ - return DB::table('categories')->insert(['cat_name'=> $name]); + public static function inserisci($request){ + if ($request['cat_entrata']=='on') + { + $entrata=1; + } + else + { + $entrata=0; + } + + if ($request['cat_uscita']=='on') + { + $uscita=1; + } + else + { + $uscita=0; + } + return DB::table('categories')->insert([ + 'cat_name'=> $request['cat_name'], + 'cat_entrata'=>$entrata, + 'cat_uscita'=>$uscita + ]); } public static function deleteById($id){ - DB::table('categories') - ->where('id','=', $id) - ->delete(); + DB::table('categories') + ->where('id','=', $id) + ->delete(); } public static function getById($id) { @@ -46,11 +67,30 @@ class Categorie extends Model ->get(); } - public static function updateNameById($id,$name) { + public static function updateNameById($request) { + if ($request['cat_entrata']=='on') + { + $entrata=1; + } + else + { + $entrata=0; + } + + if ($request['cat_uscita']=='on') + { + $uscita=1; + } + else + { + $uscita=0; + } DB::table('categories') - ->where('id','=', $id) + ->where('id','=', $request['id']) ->update([ - 'cat_name' => $name, + 'cat_name' => $request['name'], + 'cat_entrata' => $entrata, + 'cat_uscita'=>$uscita, ]); } diff --git a/public/js/app/conti_categorie.js b/public/js/app/conti_categorie.js index e51b652..704083a 100644 --- a/public/js/app/conti_categorie.js +++ b/public/js/app/conti_categorie.js @@ -13,19 +13,33 @@ $(document).ready(function() { responsive: true }); }); + $(document).on('click','.open_modal',function(){ var url = "/admin/categorie/modify"; var riga_id= $(this).val(); $.getJSON(url + '/' + riga_id, function (data) { //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); + $('#cat_uscita').prop('checked', true); + } + if (data[0].cat_entrata ===1) + { + $('#cat_entrata').prop('checked', true); + } $('#H_cat_id').val(data[0].id); $('#myModal').modal('show'); }); }); + $(document).on('click','.open_modal_new',function(){ + console.log('richiesto apertura form'); $('#myModal_new').modal('show'); }); diff --git a/resources/views/conti/categorie/list.blade.php b/resources/views/conti/categorie/list.blade.php index 3e1c125..798426c 100644 --- a/resources/views/conti/categorie/list.blade.php +++ b/resources/views/conti/categorie/list.blade.php @@ -47,38 +47,51 @@ - - -