From 83b8946a1e1c3dea195349fc8c42946d70eff16f Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Fri, 26 May 2023 16:59:33 +0200 Subject: [PATCH 01/12] Modifica readme --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index a573490..e4edb7c 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Al momento sono presenti: *Sviluppato in php, mysql, jquery su framework Laravel*. -<<<<<<< HEAD + ## Installazione - clonare il repository - copiare il file .env.example @@ -35,5 +35,3 @@ Flavio Barachino ### Vuoi partecipare? Scrivimi con le tue proposte, le tue critiche, i tuoi suggerimenti. ->>>>>>> 1b6609d0284a739053caeda9936ab9a9b8e7738e -> Written with [StackEdit](https://stackedit.io/). \ No newline at end of file From 933933f6a6a5c9a9a9ea51855a1c95ba6286f672 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Tue, 30 May 2023 07:59:52 +0200 Subject: [PATCH 02/12] Pulizia codice routes admin --- routes/admin.php | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/routes/admin.php b/routes/admin.php index ad40055..04497ec 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -29,7 +29,7 @@ use App\Http\Controllers\ProgettiController; Route::get('/', [MovimentiController::class,'dashboard']); Route::get('logout', function(){ Auth::logout(); return redirect('login'); })->name('logout'); - + // MOVIMENTI Route::get('movimentis', [MovimentiController::class,'newMovimenti'])->name('movimentis'); Route::post('movimentis',[MovimentiController::class,'insMovimentiSpesa']); @@ -45,29 +45,32 @@ Route::get('/', [MovimentiController::class,'dashboard']); Route::post('reportbudget/{anno?}',[MovimentiController::class,'manageRedirect']); Route::get('reportbudgetxls',[MovimentiController::class,'reportCategorieAnnoXLS'])->name('budgetxls'); Route::get('movimenti/test', [MovimentiController::class,'test']); -// CATEGORIE + +// CATEGORIE Route::get('categorie', [CategorieController::class,'listCategorie'])->name('categorie'); Route::post('categorie', [CategorieController::class,'insCategorie']); 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 + +// TAGS Route::get('tags', [TagController::class,'listTags'])->name('tags'); Route::post('tags', [TagController::class,'insTags']); Route::get('tagmodify/{id}', [TagController::class,'updateTag']); Route::post('tagmodify', [TagController::class,'updatePostTag']); -// CONSUMI + +// CONSUMI Route::get('letturegas', [ContatoreGasController::class,'listLettureGas'])->name('gas'); Route::post('letturegas', [ContatoreGasController::class,'insLettureGas']); Route::get('lettureenel', [ContatoreEnElController::class,'listLettureEnel'])->name('enel'); Route::post('lettureenel', [ContatoreEnElController::class,'insLettureEnel']); + // MOVIMENTI - Route::get('movimenti/filter/tags',[MovimentiController::class,'filterByTag']); + Route::get('movimenti/filter/tags',[MovimentiController::class,'filterByTag']); Route::get('movimenti/report/movimenti_categoria', [MovimentiController::class,'listMovPerCateg']); Route::get('movimenti/report/movimentibycat', [MovimentiController::class,'listMovbyCat']); Route::get('movdocs', [DocumentiController::class,'fileForm'])->name('documenti'); @@ -76,6 +79,7 @@ Route::get('/', [MovimentiController::class,'dashboard']); Route::post('movimenti/import', [MovimentiController::class,'importEC_ING']); Route::get('movimenti/importcr', [MovimentiController::class,'importFileCR'])->name('importCR'); Route::post('movimenti/importcr', [MovimentiController::class,'importEC_CR']); + // AUTOMOBILI Route::get('auto', [AutoController::class, 'index'])->name('auto_list'); Route::get('auto/new', [AutoController::class, 'newAuto'])->name('auto_new'); @@ -94,6 +98,7 @@ Route::get('/', [MovimentiController::class,'dashboard']); Route::post('auto/accessori', [AutoController::class, 'saveAccessori']); Route::get('auto/operazioni', [AutoController::class, 'getOperazioni']); Route::get('auto/operazioni/pdf', [AutoController::class, 'exportPdfOperazioni']); + // CONTATTI Route::get('contatti', [AnagraficaController::class, 'listContact'])->name('contatti'); Route::get('contatti/new', [AnagraficaController::class, 'newContact'])->name('newContact'); @@ -102,6 +107,7 @@ Route::get('/', [MovimentiController::class,'dashboard']); Route::get('contatti/scheda', [AnagraficaController::class, 'getScheda']); Route::get('contatti/addOther', [AnagraficaController::class, 'insOtherContact']); Route::post('contatti/addOther', [AnagraficaController::class, 'saveOtherContact']); + // Gruppi e permessi Route::get('group/new', [Utenti::class, 'nuovoGruppo']); Route::post('group/new', [Utenti::class, 'saveNuovoGruppo']); @@ -109,6 +115,7 @@ Route::get('/', [MovimentiController::class,'dashboard']); Route::post('permesso/new', [Utenti::class, 'saveNuovoPermesso']); Route::get('permesso/assign', [Utenti::class, 'vw_assignToGroup']); Route::post('permesso/assign', [Utenti::class, 'assignPermissionToGroup']); + // Progetti Route::get('progetti', [ProgettiController::class, 'listaProgetto'])->name('progetti'); Route::post('progetti/new', [ProgettiController::class, 'salvaProgetto']); @@ -120,9 +127,10 @@ Route::get('/', [MovimentiController::class,'dashboard']); Route::get('progetti/detail/edit/{id}', [RigaProgettoController::class, 'editRiga']); Route::post('progetti/rigaupdate', [RigaProgettoController::class, 'updateRiga']); Route::get('progetti/coordinatori', [ProgettiController::class, 'getCoordinatori']); + /// TEST routes Route::get('fullcalendar', [FullCalenderController::class, 'index']); Route::post('fullcalendar', [FullCalenderController::class, 'ajax']); Route::get('condominio',[CondominioController::class,'testPdf']); - + From 342a86daf11ec7d6dee483e1b6f08c5d0723135e Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Tue, 30 May 2023 09:26:57 +0200 Subject: [PATCH 03/12] Modifiche al routing con pulizia delle rotte in maniera da utilizzare la propria sezione --- .../views/conti/movimenti/list.blade.php | 9 +++--- routes/admin.php | 28 +++++++++---------- 2 files changed, 18 insertions(+), 19 deletions(-) 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/routes/admin.php b/routes/admin.php index 04497ec..55ade6f 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -31,16 +31,16 @@ Route::get('/', [MovimentiController::class,'dashboard']); Route::get('logout', function(){ Auth::logout(); return redirect('login'); })->name('logout'); // MOVIMENTI - Route::get('movimentis', [MovimentiController::class,'newMovimenti'])->name('movimentis'); + // Route::get('movimentis', [MovimentiController::class,'newMovimenti'])->name('movimentis'); Route::post('movimentis',[MovimentiController::class,'insMovimentiSpesa']); - Route::get('movimentie', [MovimentiController::class,'newMovimenti'])->name('movimentie'); + // Route::get('movimentie', [MovimentiController::class,'newMovimenti'])->name('movimentie'); Route::post('movimentie',[MovimentiController::class,'insMovimentiEntrata']); Route::get('movimenti',[MovimentiController::class,'listMovimenti'])->name('movimenti'); - Route::get('export',[MovimentiController::class,'exportMovimenti'])->name('export'); - Route::get('resoconto',[MovimentiController::class,'resocontoMovimenti'])->name('resoconto'); + Route::get('movimenti/export',[MovimentiController::class,'exportMovimenti'])->name('export'); + Route::get('movimenti/resoconto',[MovimentiController::class,'resocontoMovimenti'])->name('resoconto'); Route::get('movmodify/{id}',[MovimentiController::class,'updateMovimenti']); Route::post('movmodify',[MovimentiController::class,'updatePostMovimenti']); - Route::get('movdelete',[MovimentiController::class,'deleteMovimenti']); + Route::get('movimenti/delete',[MovimentiController::class,'deleteMovimenti']); Route::get('reportbudget/{anno?}',[MovimentiController::class,'reportCategorieAnno'])->name('budget'); Route::post('reportbudget/{anno?}',[MovimentiController::class,'manageRedirect']); Route::get('reportbudgetxls',[MovimentiController::class,'reportCategorieAnnoXLS'])->name('budgetxls'); @@ -64,17 +64,17 @@ Route::get('/', [MovimentiController::class,'dashboard']); Route::post('tagmodify', [TagController::class,'updatePostTag']); // CONSUMI - Route::get('letturegas', [ContatoreGasController::class,'listLettureGas'])->name('gas'); - Route::post('letturegas', [ContatoreGasController::class,'insLettureGas']); - Route::get('lettureenel', [ContatoreEnElController::class,'listLettureEnel'])->name('enel'); - Route::post('lettureenel', [ContatoreEnElController::class,'insLettureEnel']); + Route::get('consumi/gas', [ContatoreGasController::class,'listLettureGas'])->name('gas'); + Route::post('consumi/gas', [ContatoreGasController::class,'insLettureGas']); + Route::get('consumi/enel', [ContatoreEnElController::class,'listLettureEnel'])->name('enel'); + Route::post('consumi/enel', [ContatoreEnElController::class,'insLettureEnel']); // MOVIMENTI Route::get('movimenti/filter/tags',[MovimentiController::class,'filterByTag']); Route::get('movimenti/report/movimenti_categoria', [MovimentiController::class,'listMovPerCateg']); Route::get('movimenti/report/movimentibycat', [MovimentiController::class,'listMovbyCat']); - Route::get('movdocs', [DocumentiController::class,'fileForm'])->name('documenti'); - Route::post('movdocs', [DocumentiController::class,'storeFile']); + Route::get('movimenti/docs', [DocumentiController::class,'fileForm'])->name('documenti'); + Route::post('movimenti/docs', [DocumentiController::class,'storeFile']); Route::get('movimenti/import', [MovimentiController::class,'importFile'])->name('importING'); Route::post('movimenti/import', [MovimentiController::class,'importEC_ING']); Route::get('movimenti/importcr', [MovimentiController::class,'importFileCR'])->name('importCR'); @@ -129,8 +129,8 @@ Route::get('/', [MovimentiController::class,'dashboard']); Route::get('progetti/coordinatori', [ProgettiController::class, 'getCoordinatori']); /// TEST routes - Route::get('fullcalendar', [FullCalenderController::class, 'index']); - Route::post('fullcalendar', [FullCalenderController::class, 'ajax']); - Route::get('condominio',[CondominioController::class,'testPdf']); + Route::get('test/fullcalendar', [FullCalenderController::class, 'index']); + Route::post('test/fullcalendar', [FullCalenderController::class, 'ajax']); + Route::get('test/condominio',[CondominioController::class,'testPdf']); From 6ea28232a8801f0e3567740a4fbefce5622e71b0 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Tue, 30 May 2023 10:30:20 +0200 Subject: [PATCH 04/12] modified: public/js/app/movimenti.js modified: routes/admin.php Modifica al routing di inserimento e modifica dei movimenti --- public/js/app/movimenti.js | 8 ++++---- routes/admin.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) 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/routes/admin.php b/routes/admin.php index 55ade6f..b976947 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -32,14 +32,14 @@ Route::get('/', [MovimentiController::class,'dashboard']); // MOVIMENTI // Route::get('movimentis', [MovimentiController::class,'newMovimenti'])->name('movimentis'); - Route::post('movimentis',[MovimentiController::class,'insMovimentiSpesa']); + Route::post('movimenti/spesa',[MovimentiController::class,'insMovimentiSpesa']); // Route::get('movimentie', [MovimentiController::class,'newMovimenti'])->name('movimentie'); - Route::post('movimentie',[MovimentiController::class,'insMovimentiEntrata']); + Route::post('movimenti/entrata',[MovimentiController::class,'insMovimentiEntrata']); Route::get('movimenti',[MovimentiController::class,'listMovimenti'])->name('movimenti'); Route::get('movimenti/export',[MovimentiController::class,'exportMovimenti'])->name('export'); Route::get('movimenti/resoconto',[MovimentiController::class,'resocontoMovimenti'])->name('resoconto'); - Route::get('movmodify/{id}',[MovimentiController::class,'updateMovimenti']); - Route::post('movmodify',[MovimentiController::class,'updatePostMovimenti']); + Route::get('movimenti/modify/{id}',[MovimentiController::class,'updateMovimenti']); + Route::post('movimenti/modify',[MovimentiController::class,'updatePostMovimenti']); Route::get('movimenti/delete',[MovimentiController::class,'deleteMovimenti']); Route::get('reportbudget/{anno?}',[MovimentiController::class,'reportCategorieAnno'])->name('budget'); Route::post('reportbudget/{anno?}',[MovimentiController::class,'manageRedirect']); From 91c7dbe347688d92fa591e392ccef336b1772ece Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Tue, 30 May 2023 10:42:58 +0200 Subject: [PATCH 05/12] Pulizia delle rotte "categorie" --- public/js/app/conti_categorie.js | 10 +++++----- resources/views/conti/categorie/list.blade.php | 8 ++++---- routes/admin.php | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) 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/resources/views/conti/categorie/list.blade.php b/resources/views/conti/categorie/list.blade.php index 33105ab..a3d3c62 100644 --- a/resources/views/conti/categorie/list.blade.php +++ b/resources/views/conti/categorie/list.blade.php @@ -34,7 +34,7 @@     @@ -63,7 +63,7 @@ @csrf - + @@ -92,7 +92,7 @@ @csrf - + @@ -104,7 +104,7 @@ - + diff --git a/routes/admin.php b/routes/admin.php index b976947..f5070c4 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -49,9 +49,9 @@ Route::get('/', [MovimentiController::class,'dashboard']); // CATEGORIE Route::get('categorie', [CategorieController::class,'listCategorie'])->name('categorie'); Route::post('categorie', [CategorieController::class,'insCategorie']); - Route::get('catdelete', [CategorieController::class,'deleteCategorie']); - Route::get('catmodify/{id}', [CategorieController::class,'updateCategorie']); - Route::post('catmodify', [CategorieController::class,'updatePostCategorie']); + Route::get('categorie/delete', [CategorieController::class,'deleteCategorie']); + Route::get('categorie/modify/{id}', [CategorieController::class,'updateCategorie']); + Route::post('categorie/modify', [CategorieController::class,'updatePostCategorie']); // Richiami di servizio da jquery Route::get('service/catlist', [CategorieController::class,'apiList']); From 51b0d71204ada9ba5f752c34d3fc92a4c5bfe111 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Tue, 30 May 2023 10:45:12 +0200 Subject: [PATCH 06/12] bug su modifica categorie --- resources/views/conti/categorie/list.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/conti/categorie/list.blade.php b/resources/views/conti/categorie/list.blade.php index a3d3c62..3e1c125 100644 --- a/resources/views/conti/categorie/list.blade.php +++ b/resources/views/conti/categorie/list.blade.php @@ -59,7 +59,7 @@
-
+ @csrf From 6f16876a69d30e014fa57519a138b62f99bf71d2 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Tue, 30 May 2023 10:59:36 +0200 Subject: [PATCH 07/12] Modifica delle route per i tags --- app/Http/Controllers/TagController.php | 15 ++++++++++----- app/Models/tag.php | 21 ++++++++++++++------- public/js/app/tag.js | 4 ++-- resources/views/conti/tags/list.blade.php | 4 ++-- routes/admin.php | 5 +++-- 5 files changed, 31 insertions(+), 18 deletions(-) diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 7c159f8..f50ce49 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::delete($id); + return redirect(route('tags')); + } } diff --git a/app/Models/tag.php b/app/Models/tag.php index e98174e..796d614 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 delete($id) + { + DB::table('tags') + ->where('id','=',$id) + ->delete(); } } 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/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 @@
- + 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 @@