From c90552212766be1ebf99817dad9bb09006eb00f1 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Tue, 30 May 2023 11:30:42 +0200 Subject: [PATCH] Pulizia delle routes --- app/Http/Controllers/MovimentiController.php | 106 +++++++++--------- app/Http/Controllers/TagController.php | 15 ++- app/Models/tag.php | 21 ++-- public/js/app/conti_categorie.js | 10 +- public/js/app/movimenti.js | 8 +- public/js/app/tag.js | 4 +- .../views/conti/categorie/list.blade.php | 10 +- .../views/conti/movimenti/list.blade.php | 9 +- resources/views/conti/tags/list.blade.php | 4 +- routes/admin.php | 96 ++++++++-------- 10 files changed, 151 insertions(+), 132 deletions(-) diff --git a/app/Http/Controllers/MovimentiController.php b/app/Http/Controllers/MovimentiController.php index 7ccd73d..ab00e77 100644 --- a/app/Http/Controllers/MovimentiController.php +++ b/app/Http/Controllers/MovimentiController.php @@ -20,35 +20,35 @@ class MovimentiController extends Controller 'tags'=>$tags, ]); } - + public static function listMovimenti(){ $categorie=Categorie::list(); $tags=tag::getList(); /* Query per visualizzare anche il totale dei documenti presenti per il record */ $movimenti=Movimenti::getList(); - - + + return view('conti.movimenti.list',[ 'categorie'=>$categorie, 'movimenti'=>$movimenti, - 'tags'=>$tags + 'tags'=>$tags ]); } - + public static function dashboard() { - $bilancio=Movimenti::getSaldo(date('Y')); + $bilancio=Movimenti::getSaldo(date('Y')); $saldo=Movimenti::getSaldoTot(); return view('layouts.dashboard',[ 'bilancio'=>$bilancio, 'saldo'=>$saldo, ]); } - + public static function insMovimentiSpesa(Request $request) { Movimenti::insSpesa($request); - $mov=Movimenti::getList(); + $mov=Movimenti::getList(); $categorie=Categorie::list(); $tags=tag::getList(); return view('conti.movimenti.list', @@ -57,8 +57,8 @@ class MovimentiController extends Controller 'movimenti'=> $mov, 'tags'=>$tags, ]); - - /* return dd($mov);*/ + + /* return dd($mov);*/ } public static function insMovimentiEntrata(Request $request) { @@ -72,7 +72,7 @@ class MovimentiController extends Controller 'movimenti'=> $mov, 'tags'=>$tags, ]); - + /* return dd($mov);*/ } public function exportMovimenti() @@ -91,7 +91,7 @@ class MovimentiController extends Controller return (new FastExcel($lista))->download('movimenti_al_'.date('d-m-Y').'.xls'); // return dd($movimenti); } - + public function resocontoMovimenti(Request $request) { if(!$request['Year']) @@ -101,7 +101,7 @@ class MovimentiController extends Controller else { $year=$request['Year']; } - + if (!$request['Month']) { $month=date('m'); @@ -109,16 +109,16 @@ class MovimentiController extends Controller else { $month=$request['Month']; } - + $reportSpesa = Movimenti::reportSpesa($year, $month); $reportEntrate = Movimenti::reportEntrate($year,$month); - + return view('components.charts',[ 'dataSpesa'=>$reportSpesa, - 'dataEntrate'=>$reportEntrate, + 'dataEntrate'=>$reportEntrate, ]); } - + /*public function updateMovimenti(Request $request) { $id=$request['id']; @@ -132,37 +132,37 @@ class MovimentiController extends Controller 'tags'=>$tags, ]); }*/ - + public function updatePostMovimenti(Request $request) { Movimenti::updateMovimenti($request); return redirect(route('movimenti')); } - + public function deleteMovimenti(Request $request) { Movimenti::deleteMovimento($request['id']); return redirect(route('movimenti')); - + } - + public function listMovPerCateg(Request $request) { if($request['year']) { $anno=$request['year']; } - else + else { $anno=date('Y'); } $mov=Movimenti::listByCatMonth($request['month'], $request['cat'],$anno); return view('conti.movimenti.list', [ - 'movimenti'=> $mov, + 'movimenti'=> $mov, ]); } - + public function listMovByCat(Request $request) { $mov=Movimenti::listByCategory($request['cat']); @@ -171,17 +171,17 @@ class MovimentiController extends Controller 'movimenti'=> $mov, ]); } - + public function reportCategorieAnno($anno = 0) { if ($anno <= 1970) { - $anno = date('Y'); + $anno = date('Y'); } - + $mesi=['Gennaio','Febbraio','Marzo','Aprile','Maggio','Giugno','Luglio','Agosto','Settembre','Ottobre','Novembre','Dicembre']; $categorie=Categorie::list(); - + foreach ($categorie as $categoria) { $id=$categoria->id; @@ -211,17 +211,17 @@ class MovimentiController extends Controller 'sel_anni'=>$anni, ]); } - + public function reportCategorieAnnoXLS($anno = 0) { if ($anno <= 1970) { $anno = date('Y'); } - + $intestazione=['Categoria','Gennaio','Febbraio','Marzo','Aprile','Maggio','Giugno','Luglio','Agosto','Settembre','Ottobre','Novembre','Dicembre']; $categorie=DB::table('categories')->orderBy('cat_name')->get(); - + foreach ($categorie as $categoria) { $id=$categoria->id; @@ -234,15 +234,15 @@ class MovimentiController extends Controller ->where('mov_fk_categoria','=',$id) ->sum('mov_importo'); $coll[] = $movrow; - + } - + $row[]=array_combine($intestazione,array_merge(array($ncategoria),$coll)); - unset($coll); + unset($coll); } - return (new FastExcel($row))->download('report_al_'.date('d-m-Y').'.xls'); + return (new FastExcel($row))->download('report_al_'.date('d-m-Y').'.xls'); } - + public function filterByTag(Request $tag) { $mov=Movimenti::getByTag($tag['tag']); @@ -251,14 +251,14 @@ class MovimentiController extends Controller 'movimenti'=> $mov, ]); } - - + + public function apiList() { $movments = Movimenti::getList(); return json_encode($movments); } - + private function dateFormat($type,$string) { if($type) @@ -270,57 +270,57 @@ class MovimentiController extends Controller return $year.'-'.$month.'-'.$day; } } - + public function importEC_ING(Request $request) { if ($request->hasFile('filename')) { $filename=$request->file('filename')->store('EC'); Movimenti::importEstrattoIng($filename); - + return redirect(Route('movimenti')); } else { return 'Nessun File trovato'; - + } } - + public function importEC_CR(Request $request) { if ($request->hasFile('filename')) { $filename=$request->file('filename')->store('EC'); Movimenti::importEstrattoCR($filename); - + return redirect(Route('movimenti')); } else { return 'Nessun File trovato'; - + } } - + public function importFile() { return view('conti.import'); } - + public function importFileCR() { return view('conti.importCR'); } - - public function test() + + /* public function test() { Movimenti::getYearsFromMovimenti(); - } - + }*/ + public function manageRedirect(Request $request) { - return redirect('/admin/reportbudget/'.$request['anno']); + return redirect('/admin/movimenti/reportbudget/'.$request['anno']); } - + public function updateMovimenti($id) { $mov=Movimenti::getMovimentoById($id); diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 7c159f8..7751209 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -12,34 +12,39 @@ class TagController extends Controller $tags = tag::getList(); return view('conti.tags.list',['tags'=>$tags]); } - + public static function insTags(Request $request) { tag::inserisci($request); $tags = tag::getList(); return view('conti.tags.list',['tags'=>$tags]); } - + public function calendartest() { return view('components.calendar'); } - + public function updateTag($id) { $tags=tag::getById($id); return json_encode($tags); } - + public function updatePostTag(Request $request) { tag::updateById($request); return redirect(route('tags')); } - + public function apiList() { $tags=tag::getList(); return json_encode($tags); } + + public function deleteTag($id){ + tag::deleteTag($id); + return redirect(route('tags')); + } } diff --git a/app/Models/tag.php b/app/Models/tag.php index e98174e..f4e2991 100644 --- a/app/Models/tag.php +++ b/app/Models/tag.php @@ -9,28 +9,35 @@ use Illuminate\Support\Facades\DB; class tag extends Model { use HasFactory; - + public static function getList() { - return DB::table('tags')->orderBy('tag_name')->get(); + return DB::table('tags')->orderBy('tag_name')->get(); } - + public static function inserisci($param) { DB::table('tags')->insert(['tag_name'=> $param['tag_name']]); } - + public static function getById($param) { return DB::table('tags') ->where('tags.id','=',$param) ->get(); - + } - + public static function updateById($param) { DB::table('tags') ->where('id','=', $param['id']) ->update([ 'tag_name' => $param['tag_name'], ]); - + + } + + public static function deleteTag($id) + { + DB::table('tags') + //->where('id','=',$id) + ->delete($id); } } diff --git a/public/js/app/conti_categorie.js b/public/js/app/conti_categorie.js index bb20387..870e28d 100644 --- a/public/js/app/conti_categorie.js +++ b/public/js/app/conti_categorie.js @@ -13,9 +13,9 @@ $(document).ready(function() { $('#categorie').DataTable({ responsive: true }); - + $(document).on('click','.open_modal',function(){ - var url = "catmodify"; + var url = "/admin/categorie/modify"; var riga_id= $(this).val(); $.getJSON(url + '/' + riga_id, function (data) { //success data @@ -24,10 +24,10 @@ $(document).ready(function() { $('#H_cat_cat_name').val(data[0].cat_name); $('#H_cat_id').val(data[0].id); $('#myModal').modal('show'); - }); + }); }); $(document).on('click','.open_modal_new',function(){ $('#myModal_new').modal('show'); - + }); - }); \ No newline at end of file + }); diff --git a/public/js/app/movimenti.js b/public/js/app/movimenti.js index 8063de4..e753492 100644 --- a/public/js/app/movimenti.js +++ b/public/js/app/movimenti.js @@ -21,7 +21,7 @@ $(document).on('click', '.open_modal_spesa', function() { $('#form').find('input[type="date"]').val(strDate); $('#myModal').modal('show'); $('.modal-title').text(' Nuovo movimento in uscita'); - $('#form').attr('action', 'movimentis'); + $('#form').attr('action', '/admin/movimenti/spesa'); }); $(document).on('click', '.open_modal_entrata', function() { @@ -30,11 +30,11 @@ $(document).on('click', '.open_modal_entrata', function() { $('#form').find('input[type="date"]').val(strDate); $('#myModal').modal('show'); $('.modal-title').text('Nuovo movimento in entrata'); - $('#form').attr('action', 'movimentie'); + $('#form').attr('action', '/admin/movimenti/entrata'); }); $(document).on('click', '.open_modal_modifica', function() { - var url = "/admin/movmodify"; + var url = "/admin/movimenti/modify"; var riga_id = $(this).val(); $.getJSON(url + '/' + riga_id, function(data) { // success data @@ -53,7 +53,7 @@ $(document).on('click', '.open_modal_modifica', function() { .trigger('change'); $('#myModal').modal('show'); // $('.panel-heading').text('Modifica movimento'); - $('#form').attr('action', '/admin/movmodify'); + $('#form').attr('action', '/admin/movimenti/modify'); $('#form').append(''); }); }); diff --git a/public/js/app/tag.js b/public/js/app/tag.js index 5f4e580..864b749 100644 --- a/public/js/app/tag.js +++ b/public/js/app/tag.js @@ -3,7 +3,7 @@ $(document).ready(function() { responsive: true }); $(document).on('click', '.open_modal', function() { - var url = "tagmodify"; + var url = "tags/modify"; var riga_id = $(this).val(); $.getJSON(url + '/' + riga_id, function(data) { //success data @@ -18,4 +18,4 @@ $(document).ready(function() { $('#myModal_new').modal('show'); }); -}); \ No newline at end of file +}); diff --git a/resources/views/conti/categorie/list.blade.php b/resources/views/conti/categorie/list.blade.php index 33105ab..3e1c125 100644 --- a/resources/views/conti/categorie/list.blade.php +++ b/resources/views/conti/categorie/list.blade.php @@ -34,7 +34,7 @@     @@ -59,11 +59,11 @@
-
+ @csrf - +
@@ -92,7 +92,7 @@ @csrf - + @@ -104,7 +104,7 @@ - + diff --git a/resources/views/conti/movimenti/list.blade.php b/resources/views/conti/movimenti/list.blade.php index 0b65c70..00cb8ab 100644 --- a/resources/views/conti/movimenti/list.blade.php +++ b/resources/views/conti/movimenti/list.blade.php @@ -37,8 +37,8 @@ € {{ $movimento->mov_importo; }}   -   -   +   +   ( {{ $movimento->quanti ?? ''; }} ) @@ -64,7 +64,7 @@

Nuovo movimento

- +
@@ -114,7 +114,7 @@
- +
@@ -132,4 +132,3 @@ @endsection - \ No newline at end of file diff --git a/resources/views/conti/tags/list.blade.php b/resources/views/conti/tags/list.blade.php index 37ec20f..fa6ae82 100644 --- a/resources/views/conti/tags/list.blade.php +++ b/resources/views/conti/tags/list.blade.php @@ -23,7 +23,7 @@ $tag->tag_name; }}     @endforeach @@ -34,7 +34,7 @@