From 8d0576099ca2b87c62f5dc6868d61ebac2fbf970 Mon Sep 17 00:00:00 2001 From: FlavioBarachino Date: Thu, 6 Jul 2023 17:39:23 +0200 Subject: [PATCH] creazione della separazzione delle categorie --- app/Http/Controllers/CategorieController.php | 12 ++++++ app/Http/Controllers/MovimentiController.php | 4 +- app/Models/Categorie.php | 12 +++++- ...update_categories_adding_spesa_entrata.php | 37 +++++++++++++++++++ public/js/app/movimenti.js | 23 ++++++++++-- routes/admin.php | 2 + 6 files changed, 84 insertions(+), 6 deletions(-) create mode 100644 database/migrations/2023_07_06_142451_update_categories_adding_spesa_entrata.php diff --git a/app/Http/Controllers/CategorieController.php b/app/Http/Controllers/CategorieController.php index 7fbe00e..60648a1 100644 --- a/app/Http/Controllers/CategorieController.php +++ b/app/Http/Controllers/CategorieController.php @@ -48,4 +48,16 @@ class CategorieController extends Controller $categorie = Categorie::getById($id); return json_encode($categorie); } + + public function apiListSpesa() + { + $categorie=Categorie::listSpesa(); + return json_encode($categorie); + } + + public function apiListEntrata() + { + $categorie=Categorie::listEntrata(); + return json_encode($categorie); + } } diff --git a/app/Http/Controllers/MovimentiController.php b/app/Http/Controllers/MovimentiController.php index 59087ff..3e855bd 100644 --- a/app/Http/Controllers/MovimentiController.php +++ b/app/Http/Controllers/MovimentiController.php @@ -53,7 +53,7 @@ class MovimentiController extends Controller { Movimenti::insSpesa($request); $mov=Movimenti::getList(); - $categorie=Categorie::list(); + $categorie=Categorie::listSpesa(); $tags=tag::getList(); return view('conti.movimenti.list', [ @@ -68,7 +68,7 @@ class MovimentiController extends Controller { Movimenti::insEntrata($request); $mov=Movimenti::getList(); - $categorie=Categorie::list(); + $categorie=Categorie::listEntrata(); $tags=tag::getList(); return view('conti.movimenti.list', [ diff --git a/app/Models/Categorie.php b/app/Models/Categorie.php index 84fe57c..42414bf 100644 --- a/app/Models/Categorie.php +++ b/app/Models/Categorie.php @@ -17,7 +17,17 @@ class Categorie extends Model public static function list() { - return DB::table('categories')->orderBy('cat_name')->get(); + return self::all(); + } + + public static function listSpesa() + { + return DB::table('categories')->where('cat_spesa','=',1)->get(); + } + + public static function listEntrata() + { + return DB::table('categories')->where('cat_entrata','=',1)->get(); } public static function inserisci($name){ diff --git a/database/migrations/2023_07_06_142451_update_categories_adding_spesa_entrata.php b/database/migrations/2023_07_06_142451_update_categories_adding_spesa_entrata.php new file mode 100644 index 0000000..943251e --- /dev/null +++ b/database/migrations/2023_07_06_142451_update_categories_adding_spesa_entrata.php @@ -0,0 +1,37 @@ +smallInteger('cat_entrata')->after('cat_name')->default(0); + $table->smallInteger('cat_uscita')->after('cat_entrata')->default(0); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::table('categories', function (Blueprint $table) { + $table->dropColumn('cat_entrata'); + $table->dropColumn('cat_uscita'); + }); + } +} diff --git a/public/js/app/movimenti.js b/public/js/app/movimenti.js index da07e9f..627a726 100644 --- a/public/js/app/movimenti.js +++ b/public/js/app/movimenti.js @@ -23,20 +23,36 @@ var strDate = d.getFullYear() + '-' + $(document).on('click', '.open_modal_spesa', function() { console.log(strDate); - $('#form').find('input[type="text"], textarea, input[type="number"],input[type="date"]').val(""); + $('#form').find('input[type="text"], textarea, input[type="number"],input[type="date"],select').val(""); $('#form').find('input[type="date"]').val(strDate); $('#myModal').modal('show'); $('.modal-title').text(' Nuovo movimento in uscita'); $('#form').attr('action', '/admin/movimenti/spesa'); + $.getJSON("/admin/service/catlistSpesa", {}, function(data) { + $.each(data, function(i, item) { + $("select[name='mov_fk_categoria']").append( + new Option(item.cat_name, item.id) + ) + } + ); + }); }); $(document).on('click', '.open_modal_entrata', function() { console.log(strDate); - $('#form').find('input[type="text"], textarea, input[type="number"]').val(""); + $('#form').find('input[type="text"], textarea, input[type="number"],select').val(""); $('#form').find('input[type="date"]').val(strDate); $('#myModal').modal('show'); $('.modal-title').text('Nuovo movimento in entrata'); $('#form').attr('action', '/admin/movimenti/entrata'); + $.getJSON("/admin/service/catlistEntrata", {}, function(data) { + $.each(data, function(i, item) { + $("select[name='mov_fk_categoria']").append( + new Option(item.cat_name, item.id) + ) + } + ); + }); }); $(document).on('click', '.open_modal_modifica', function() { @@ -62,7 +78,7 @@ $(document).on('click', '.open_modal_modifica', function() { $('#form').attr('action', '/admin/movimenti/modify'); $('#form').append(''); }); -}); + $.getJSON("/admin/service/catlist", {}, function(data) { $.each(data, function(i, item) { @@ -72,6 +88,7 @@ $.getJSON("/admin/service/catlist", {}, function(data) { } ); }); +}); $.getJSON("/admin/service/taglist", {}, function(data) { $.each(data, function(i, item) { diff --git a/routes/admin.php b/routes/admin.php index 222292e..25da45f 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -67,6 +67,8 @@ Route::group(['middleware'=>['permission:conti']], function(){ Route::get('service/catlist', [CategorieController::class,'apiList']); Route::get('service/taglist', [TagController::class,'apiList']); Route::get('service/rolesList', [Utenti::class,'listRoles']); + Route::get('service/catlistSpesa', [CategorieController::class,'apiListSpesa']); + Route::get('service/catlistEntrata', [CategorieController::class,'apiListEntrata']); // TAGS Route::get('tags', [TagController::class,'listTags'])->name('tags');