From 83ce999b383f5d04d7e7ae784ae0481779dbb53e Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Mon, 17 Apr 2023 13:51:28 +0200 Subject: [PATCH 01/41] Pulizia e gestione saldo totale in dashboard --- app/Http/Controllers/MovimentiController.php | 12 +-- app/Models/Movimenti.php | 14 ++-- resources/views/anagrafica/dettagli.blade.php | 16 ++-- resources/views/layouts/dashboard.blade.php | 81 ++++++++++--------- 4 files changed, 59 insertions(+), 64 deletions(-) diff --git a/app/Http/Controllers/MovimentiController.php b/app/Http/Controllers/MovimentiController.php index b409fef..2de60be 100644 --- a/app/Http/Controllers/MovimentiController.php +++ b/app/Http/Controllers/MovimentiController.php @@ -37,9 +37,11 @@ class MovimentiController extends Controller 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, ]); } @@ -191,14 +193,8 @@ class MovimentiController extends Controller ->whereYear('mov_data','=',$anno) ->where('mov_fk_categoria','=',$id) ->sum('mov_importo'); - - $coll[]=$movrow; $collx[]=$movrow; - //$coll[] = ['totale' => $movrow]; - // $coll[]=array_push(array_sum($coll['totale'])); - - // $coll[]=array_push($coll,$totale); } $totale[]=array_sum($collx); unset($collx); @@ -234,8 +230,6 @@ class MovimentiController extends Controller ->whereYear('mov_data','=',$anno) ->where('mov_fk_categoria','=',$id) ->sum('mov_importo'); - - //$coll[] = str_replace(".",",",$movrow); $coll[] = $movrow; } diff --git a/app/Models/Movimenti.php b/app/Models/Movimenti.php index 9081b49..c7195fa 100644 --- a/app/Models/Movimenti.php +++ b/app/Models/Movimenti.php @@ -11,7 +11,6 @@ class Movimenti extends Model { use HasFactory; - public static function getList() { return DB::table('movimentis') ->join('categories','movimentis.mov_fk_categoria','=','categories.id') @@ -26,6 +25,10 @@ class Movimenti extends Model return DB::table('movimentis')->whereYear('mov_data','=',$date)->sum('mov_importo'); } + public static function getSaldoTot() { + return DB::table('movimentis')->sum('mov_importo'); + } + public static function insSpesa($request) { DB::table('movimentis')->insert( [ @@ -145,7 +148,6 @@ class Movimenti extends Model public static function importEstrattoIng($filename) { - //$file = str_replace('/EC/','',$filename); $inputPath='/var/www/html/bubofamily/public/storage/'.$filename; $outputPath='/var/www/html/bubofamily/public/'.$filename; rename($inputPath,$outputPath); @@ -162,14 +164,11 @@ class Movimenti extends Model 'userid'=>1, ]); } - }); - //dd($outputPath); } public static function importEstrattoCR($filename) { - //$file = str_replace('/EC/','',$filename); $inputPath='/var/www/html/bubofamily/public/storage/'.$filename; $outputPath='/var/www/html/bubofamily/public/'.$filename.'.csv'; rename($inputPath,$outputPath); @@ -200,12 +199,10 @@ class Movimenti extends Model ]; } Movimenti::insEntrata($dati); - // dd($dati); } - }); - //dd($outputPath); } + private static function dateFormat($type,$string) { if($type) @@ -217,4 +214,5 @@ class Movimenti extends Model return $year.'-'.$month.'-'.$day; } } + } diff --git a/resources/views/anagrafica/dettagli.blade.php b/resources/views/anagrafica/dettagli.blade.php index bebe1bd..4405962 100644 --- a/resources/views/anagrafica/dettagli.blade.php +++ b/resources/views/anagrafica/dettagli.blade.php @@ -8,7 +8,7 @@
-
+
Contatto @@ -65,7 +65,7 @@
-
+
Nuovo Altro Contatto
@@ -99,10 +99,10 @@ @section('script') + $(document).ready(function() { + $('#contatti').DataTable({ + responsive: true + }); + }); + @endsection diff --git a/resources/views/layouts/dashboard.blade.php b/resources/views/layouts/dashboard.blade.php index e564cee..fbb866e 100644 --- a/resources/views/layouts/dashboard.blade.php +++ b/resources/views/layouts/dashboard.blade.php @@ -34,79 +34,82 @@
-
- -
-
-
{{ $bilancio }}
-
Bilancio attuale
-
+
+ +
+
+
{{ $saldo }}
+
Saldo attuale
+
- +
- Report annuo - -
+ Report annuo + +
- + +
-
- -
-
-
{{ $bilancio }}
-
Bilancio attuale
-
+
+ +
+
+
{{ $bilancio }}
+
Bilancio attuale
+
- Report annuo - -
+ Report annuo + +
- + +
-
- -
-
-
{{ $bilancio }}
-
Bilancio attuale
-
+
+ +
+
+
{{ $bilancio }}
+
Bilancio attuale
+
- Report annuo - -
+ Report annuo + +
+
@endsection @section('script') + $(document).ready(function() { + $('#categorie').DataTable({ + responsive: true + }); + }); + @endsection \ No newline at end of file From 25c1050e4a36acbbec6b96090c4f96c136eff858 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Wed, 3 May 2023 10:49:50 +0200 Subject: [PATCH 02/41] modificato la pagina routes/web --- routes/web.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/routes/web.php b/routes/web.php index d62386b..cc96654 100644 --- a/routes/web.php +++ b/routes/web.php @@ -21,11 +21,8 @@ Route::get('/', function () { }); -//Auth::routes(['register' => false]); // Production only - Auth::routes(); //development mode +Auth::routes(['register' => false]); // Production only +// Auth::routes(); //development mode Route::get('/calendar', [TagController::class,'calendartest'])->name('calendar'); Route::get('/home', [App\Http\Controllers\HomeController::class, 'index'])->name('home'); - -Auth::routes(); - Route::get('/home', [App\Http\Controllers\HomeController::class, 'index'])->name('home'); From bac43417dab6a045e7a746dda8ca4706599a9617 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Wed, 3 May 2023 13:15:46 +0200 Subject: [PATCH 03/41] aggiunto selezione anno per il report per categorie Per riuscire a vedere il report degli anni anche passati --- app/Http/Controllers/MovimentiController.php | 14 +++++++++++++- app/Models/Movimenti.php | 8 ++++++++ resources/views/conti/report/catanno.blade.php | 11 +++++++++++ routes/admin.php | 5 +++-- 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/MovimentiController.php b/app/Http/Controllers/MovimentiController.php index 2de60be..8fc49bf 100644 --- a/app/Http/Controllers/MovimentiController.php +++ b/app/Http/Controllers/MovimentiController.php @@ -200,12 +200,15 @@ class MovimentiController extends Controller unset($collx); } /*dd($totale);*/ + $anni=Movimenti::getYearsFromMovimenti(); + // dd($anni); return view('conti.report.catanno',[ 'categorie'=>$categorie, 'mesi'=>$mesi, 'matrice'=>array_chunk($coll, 12), 'totale'=>$totale, - 'anno'=>$anno + 'anno'=>$anno, + 'sel_anni'=>$anni, ]); } @@ -308,5 +311,14 @@ class MovimentiController extends Controller return view('conti.importCR'); } + public function test() + { + Movimenti::getYearsFromMovimenti(); + } + + public function manageRedirect(Request $request) + { + return redirect('/admin/reportbudget/'.$request['anno']); + } } diff --git a/app/Models/Movimenti.php b/app/Models/Movimenti.php index c7195fa..5e7c3c0 100644 --- a/app/Models/Movimenti.php +++ b/app/Models/Movimenti.php @@ -203,6 +203,14 @@ class Movimenti extends Model }); } + public static function getYearsFromMovimenti() + { + $anni=DB::table('movimentis')->select(DB::raw('DISTINCT YEAR(mov_data) as anno'))->get(); + // dd($anni); // for test purposes + return $anni; + } + + private static function dateFormat($type,$string) { if($type) diff --git a/resources/views/conti/report/catanno.blade.php b/resources/views/conti/report/catanno.blade.php index 2e40aae..42ffb30 100644 --- a/resources/views/conti/report/catanno.blade.php +++ b/resources/views/conti/report/catanno.blade.php @@ -18,6 +18,17 @@ Rapporto spese per categoria nell'arco dell'anno {{ $anno ?? '' }}
+
+
+ @csrf + + +
+
diff --git a/routes/admin.php b/routes/admin.php index 73404e9..dea85b1 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -40,9 +40,10 @@ Route::get('/', [MovimentiController::class,'dashboard']); Route::get('movmodify',[MovimentiController::class,'updateMovimenti']); Route::post('movmodify',[MovimentiController::class,'updatePostMovimenti']); Route::get('movdelete',[MovimentiController::class,'deleteMovimenti']); - Route::get('reportbudget',[MovimentiController::class,'reportCategorieAnno'])->name('budget'); + Route::get('reportbudget/{anno?}',[MovimentiController::class,'reportCategorieAnno'])->name('budget'); + Route::post('reportbudget/{anno?}',[MovimentiController::class,'manageRedirect']); Route::get('reportbudgetxls',[MovimentiController::class,'reportCategorieAnnoXLS'])->name('budgetxls'); - + Route::get('movimenti/test', [MovimentiController::class,'test']); Route::get('categorie', [CategorieController::class,'listCategorie'])->name('categorie'); Route::post('categorie', [CategorieController::class,'insCategorie']); From e508f555967921c3c63f1de69301d3018d616962 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Wed, 3 May 2023 13:28:42 +0200 Subject: [PATCH 04/41] rimosso link non collegato al website su menu in alto --- resources/views/admin.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/admin.blade.php b/resources/views/admin.blade.php index 14683a2..327fe2f 100644 --- a/resources/views/admin.blade.php +++ b/resources/views/admin.blade.php @@ -57,7 +57,7 @@
    From 82ade6194ee75b47d79c00a6ee0f2296950d1fd4 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Wed, 3 May 2023 14:08:38 +0200 Subject: [PATCH 05/41] rimosso da dashboard widget non utilizzati MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit modificato anche le diciture in maniera da rendere più coerente con l'indicazione --- resources/views/layouts/dashboard.blade.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/views/layouts/dashboard.blade.php b/resources/views/layouts/dashboard.blade.php index fbb866e..77585cb 100644 --- a/resources/views/layouts/dashboard.blade.php +++ b/resources/views/layouts/dashboard.blade.php @@ -7,7 +7,7 @@
    -
    +
    @@ -16,7 +16,7 @@
    {{ $bilancio }}
    -
    Bilancio attuale
    +
    Bilancio attuale anno {{ date('Y') }}
    @@ -30,7 +30,7 @@
    -
    +
    @@ -39,7 +39,7 @@
    {{ $saldo }}
    -
    Saldo attuale
    +
    Saldo attuale negli anni
    @@ -54,7 +54,7 @@
    -
    + -
    +
    @endsection From 4423230e3f5d66203d464901cb6d3b510fc256af Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Wed, 3 May 2023 12:14:52 +0000 Subject: [PATCH 06/41] README.md modificato online con Bitbucket --- README.md | 67 +------------------------------------------------------ 1 file changed, 1 insertion(+), 66 deletions(-) diff --git a/README.md b/README.md index 8878ec1..b6cc4dc 100644 --- a/README.md +++ b/README.md @@ -1,66 +1 @@ -

    - -

    -Build Status -Total Downloads -Latest Stable Version -License -

    - -## About Laravel - -Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel takes the pain out of development by easing common tasks used in many web projects, such as: - -- [Simple, fast routing engine](https://laravel.com/docs/routing). -- [Powerful dependency injection container](https://laravel.com/docs/container). -- Multiple back-ends for [session](https://laravel.com/docs/session) and [cache](https://laravel.com/docs/cache) storage. -- Expressive, intuitive [database ORM](https://laravel.com/docs/eloquent). -- Database agnostic [schema migrations](https://laravel.com/docs/migrations). -- [Robust background job processing](https://laravel.com/docs/queues). -- [Real-time event broadcasting](https://laravel.com/docs/broadcasting). - -Laravel is accessible, powerful, and provides tools required for large, robust applications. - -## Learning Laravel - -Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework. - -If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 1500 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library. - -## Laravel Sponsors - -We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell). - -### Premium Partners - -- **[Vehikl](https://vehikl.com/)** -- **[Tighten Co.](https://tighten.co)** -- **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)** -- **[64 Robots](https://64robots.com)** -- **[Cubet Techno Labs](https://cubettech.com)** -- **[Cyber-Duck](https://cyber-duck.co.uk)** -- **[Many](https://www.many.co.uk)** -- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)** -- **[DevSquad](https://devsquad.com)** -- **[Curotec](https://www.curotec.com/services/technologies/laravel/)** -- **[OP.GG](https://op.gg)** -- **[CMS Max](https://www.cmsmax.com/)** -- **[WebReinvent](https://webreinvent.com/?utm_source=laravel&utm_medium=github&utm_campaign=patreon-sponsors)** -- **[Lendio](https://lendio.com)** -- **[Romega Software](https://romegasoftware.com)** - -## Contributing - -Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions). - -## Code of Conduct - -In order to ensure that the Laravel community is welcoming to all, please review and abide by the [Code of Conduct](https://laravel.com/docs/contributions#code-of-conduct). - -## Security Vulnerabilities - -If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [taylor@laravel.com](mailto:taylor@laravel.com). All security vulnerabilities will be promptly addressed. - -## License - -The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT). +*** BuboFamily (gestionale di famiglia) *** \ No newline at end of file From 6380b2c5d9c3f92eb3ea6ba0ebe401c9d75f0b28 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Wed, 3 May 2023 12:28:50 +0000 Subject: [PATCH 07/41] README.md modificato online con Bitbucket --- README.md | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b6cc4dc..f3ea8de 100644 --- a/README.md +++ b/README.md @@ -1 +1,21 @@ -*** BuboFamily (gestionale di famiglia) *** \ No newline at end of file +# Gestionale di Famiglia +Piccolo sistema di gestione famigliare. +Al momento sono presenti: + + - Gestione delle Entrate e uscite con possibilità di inserimento delle foto degli scontrini ed eventuali documenti in PDF. + - Possibilità di importare gli estratti conto da un file excel o csv. + - Un sistema di gestione delle letture dei contatori per il GAS e per l'Energia elettrica + - Un sistema di gestione delle autovetture e relative operazioni effettuate su di esse. + - Una rubrica telefonica e degli indirizzi + - Una gestione dei progetti (ancora in sviluppo) + - Una gestione degli utenti e dei gruppi e relativi permessi. + +*Sviluppato in php, mysql, jquery su framework Laravel*. + +## Sviluppatori +Flavio Barachino + +### Vuoi partecipare? +Scrivimi con le tue proposte, le tue critiche, i tuoi suggerimenti. + +> Written with [StackEdit](https://stackedit.io/). \ No newline at end of file From 159d0fe30d859941f4ddf47cbe5d6ea16c5aa02f Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Wed, 3 May 2023 14:46:39 +0200 Subject: [PATCH 08/41] referenziato nome utente sulla lista dei progetti --- app/Models/Progetti.php | 2 +- resources/views/progetti/list.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/Progetti.php b/app/Models/Progetti.php index daa8954..8c81e58 100644 --- a/app/Models/Progetti.php +++ b/app/Models/Progetti.php @@ -11,7 +11,7 @@ class Progetti extends Model use HasFactory; public static function getProgetti() { - return DB::table('progettis')->get(); + return DB::table('progettis')->join('users','progettis.fk_user','=','users.id')->get(); } public static function getProgettoById($id){ diff --git a/resources/views/progetti/list.blade.php b/resources/views/progetti/list.blade.php index 16e72b2..1c2e96f 100644 --- a/resources/views/progetti/list.blade.php +++ b/resources/views/progetti/list.blade.php @@ -40,7 +40,7 @@
- + @foreach($progetti ?? '' as $progetto) - + @endforeach diff --git a/routes/admin.php b/routes/admin.php index dea85b1..bba09c9 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -110,7 +110,8 @@ Route::get('/', [MovimentiController::class,'dashboard']); Route::post('progetti/new', [ProgettiController::class, 'salvaProgetto']); Route::get('progetti/new', [ProgettiController::class, 'nuovoProgetto'])->name('nuovoProgetto'); Route::get('progetti/delete',[ProgettiController::class, 'deleteProgetto']); - + Route::get('progetti/detail', [ProgettiController::class, 'dettaglioProgetto']); + Route::post('progetti/detail', [ProgettiController::class, 'inserisciTask']); /// TEST routes Route::get('fullcalendar', [FullCalenderController::class, 'index']); From 5ae84a0d6c1b604dcb8e24a8ffe00cd22a72f3f8 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Wed, 3 May 2023 15:40:31 +0200 Subject: [PATCH 10/41] rivisto view dettaglio progetto TODO: rivedere meglio parte grafica da riordinare magari con dei bordini --- resources/views/progetti/dettaglio.blade.php | 101 +++++++++++++------ 1 file changed, 70 insertions(+), 31 deletions(-) diff --git a/resources/views/progetti/dettaglio.blade.php b/resources/views/progetti/dettaglio.blade.php index e5009df..1bdb171 100644 --- a/resources/views/progetti/dettaglio.blade.php +++ b/resources/views/progetti/dettaglio.blade.php @@ -20,37 +20,76 @@ Dettaglio Progetto
- -
-
{{ $progetto->nome; }} {{ $progetto->data_creazione; }} {{ $progetto->stato; }}{{ $progetto->fk_user; }}{{ $progetto->name; }} {{ $progetto->budget; }} Cancella From fc5b8fd3abec34142794ed91e075691fc60e137f Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Wed, 3 May 2023 15:21:40 +0200 Subject: [PATCH 09/41] gestito collegamento a dettaglio MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TODO: pagina di view da realizzare attualmente è una brutta copia della lista --- app/Http/Controllers/ProgettiController.php | 15 ++++- app/Models/Progetti.php | 16 ++++- resources/views/progetti/dettaglio.blade.php | 71 ++++++++++++++++++++ resources/views/progetti/list.blade.php | 4 +- routes/admin.php | 3 +- 5 files changed, 103 insertions(+), 6 deletions(-) create mode 100644 resources/views/progetti/dettaglio.blade.php diff --git a/app/Http/Controllers/ProgettiController.php b/app/Http/Controllers/ProgettiController.php index 34a0060..0dde7fe 100644 --- a/app/Http/Controllers/ProgettiController.php +++ b/app/Http/Controllers/ProgettiController.php @@ -11,7 +11,9 @@ class ProgettiController extends Controller // public function listaProgetto() { - return view('progetti.list',[ + /* $progetti=Progetti::getProgetti(); + dd($progetti);*/ + return view('progetti.list',[ 'progetti'=>Progetti::getProgetti() ]); } @@ -32,4 +34,15 @@ class ProgettiController extends Controller return redirect(Route('progetti')); } + public function inserisciTask(Request $id) + { + + } + + public function dettaglioProgetto(Request $id) + { + $progetto = Progetti::getProgettoById($id['id']); + return view('progetti.dettaglio',['dettaglio'=>$progetto]); + } + } diff --git a/app/Models/Progetti.php b/app/Models/Progetti.php index 8c81e58..d21e545 100644 --- a/app/Models/Progetti.php +++ b/app/Models/Progetti.php @@ -11,11 +11,23 @@ class Progetti extends Model use HasFactory; public static function getProgetti() { - return DB::table('progettis')->join('users','progettis.fk_user','=','users.id')->get(); + return DB::table('progettis') + ->select( + 'progettis.id as progetto', + 'users.id as userid', + 'nome', + 'name', + 'descrizione', + 'data_creazione', + 'data_fine', + 'budget', + 'stato', + 'note') + ->join('users','progettis.fk_user','=','users.id')->get(); } public static function getProgettoById($id){ - return DB::table('progettis')->where('id','=',$id)->get(); + return DB::table('progettis')->join('users','progettis.fk_user','=','users.id')->where('progettis.id','=',$id)->get(); } public static function saveProgetto($progetto){ diff --git a/resources/views/progetti/dettaglio.blade.php b/resources/views/progetti/dettaglio.blade.php new file mode 100644 index 0000000..e5009df --- /dev/null +++ b/resources/views/progetti/dettaglio.blade.php @@ -0,0 +1,71 @@ +@extends('admin') +@section('content') +
+
+

Lista Progetti

+
+
+
+ +
+
+ +
+
+ +
+
+
+
+ Dettaglio Progetto +
+
+ +
+ + + + + + + + + + + + + + @foreach($dettaglio ?? '' as $progetto) + + + + + + + + + @endforeach + + +
NomeData CreazioneStatoCoordinatoreBudgetAzioni
{{ $progetto->nome; }}{{ $progetto->data_creazione; }}{{ $progetto->stato; }}{{ $progetto->name; }}{{ $progetto->budget; }} + +
+
+
+
+
+
+ + + +@endsection + +@section('script') + +@endsection \ No newline at end of file diff --git a/resources/views/progetti/list.blade.php b/resources/views/progetti/list.blade.php index 1c2e96f..891b361 100644 --- a/resources/views/progetti/list.blade.php +++ b/resources/views/progetti/list.blade.php @@ -37,13 +37,13 @@
{{ $progetto->nome; }}{{ $progetto->nome; }} {{ $progetto->data_creazione; }} {{ $progetto->stato; }} {{ $progetto->name; }} {{ $progetto->budget; }} - Cancella + Cancella
- - - - - - - - - - - - - @foreach($dettaglio ?? '' as $progetto) - - - - - - - - - @endforeach - - -
NomeData CreazioneStatoCoordinatoreBudgetAzioni
{{ $progetto->nome; }}{{ $progetto->data_creazione; }}{{ $progetto->stato; }}{{ $progetto->name; }}{{ $progetto->budget; }} - -
-
+ @foreach($dettaglio ?? '' as $progetto) +
+
+ Nome +
+
+ {{ $progetto->nome; }} +
+
+ +
+
+ Descrizione +
+
+ {{ $progetto->descrizione; }} +
+
+
+
+ Data Inizio +
+
+ {{ $progetto->data_inizio }} +
+
+ Data Termine +
+
+ {{ $progetto->data_fine }} +
+
+
+
+ Stato +
+
+ {{ $progetto->stato }} +
+
+ Data Creazione +
+
+ {{ $progetto->data_creazione }} +
+
+
+
+ Budget +
+
+ € {{ $progetto->budget }} +
+
+ Coordinatore +
+
+ {{ $progetto->name }} +
+
+
+
+ Note +
+
+ {{ $progetto->note; }} +
+
+ @endforeach +
From eb6b3f0cf5b04cba3add26bf22aaa365993b626b Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Wed, 3 May 2023 16:13:01 +0200 Subject: [PATCH 11/41] rivisto disposizione elementi in dettaglio progetto --- resources/views/progetti/dettaglio.blade.php | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/resources/views/progetti/dettaglio.blade.php b/resources/views/progetti/dettaglio.blade.php index 1bdb171..68c6c41 100644 --- a/resources/views/progetti/dettaglio.blade.php +++ b/resources/views/progetti/dettaglio.blade.php @@ -22,7 +22,7 @@
@foreach($dettaglio ?? '' as $progetto)
-
+
Nome
@@ -31,7 +31,7 @@
-
+
Descrizione
@@ -39,41 +39,41 @@
-
+
Data Inizio
- {{ $progetto->data_inizio }} + {{ date('d/m/Y',strtotime($progetto->data_inizio)) }}
-
+
Data Termine
- {{ $progetto->data_fine }} + {{ date('d/m/Y',strtotime($progetto->data_fine)) }}
-
+
Stato
{{ $progetto->stato }}
-
+
Data Creazione
- {{ $progetto->data_creazione }} + {{ date('d/m/Y',strtotime($progetto->data_creazione)) }}
-
+
Budget
€ {{ $progetto->budget }}
-
+
Coordinatore
@@ -81,7 +81,7 @@
-
+
Note
From 70f75b901d024a509db3dc3582f7e99999940696 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Wed, 3 May 2023 17:47:41 +0200 Subject: [PATCH 12/41] test aggiunta form per sistema dinamico con ajax ancora da trovare sistema jquery --- resources/views/progetti/dettaglio.blade.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/resources/views/progetti/dettaglio.blade.php b/resources/views/progetti/dettaglio.blade.php index 68c6c41..07b084a 100644 --- a/resources/views/progetti/dettaglio.blade.php +++ b/resources/views/progetti/dettaglio.blade.php @@ -94,7 +94,14 @@
- +
+
+
+ + +
+
+
@endsection From 4e5cd6bc29d3a2ca0dabc7d3ad153a58b6221fb1 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Wed, 3 May 2023 18:45:22 +0200 Subject: [PATCH 13/41] sistemazione form per inserimento task/costi progetto e creazione model migration e controller RigaProgetto --- .../Controllers/RigaProgettoController.php | 10 ++++ app/Models/RigaProgetto.php | 11 ++++ ..._03_164304_create_riga_progettos_table.php | 31 ++++++++++++ resources/views/progetti/dettaglio.blade.php | 50 ++++++++++++++++--- 4 files changed, 95 insertions(+), 7 deletions(-) create mode 100644 app/Http/Controllers/RigaProgettoController.php create mode 100644 app/Models/RigaProgetto.php create mode 100644 database/migrations/2023_05_03_164304_create_riga_progettos_table.php diff --git a/app/Http/Controllers/RigaProgettoController.php b/app/Http/Controllers/RigaProgettoController.php new file mode 100644 index 0000000..e58e9a0 --- /dev/null +++ b/app/Http/Controllers/RigaProgettoController.php @@ -0,0 +1,10 @@ +id(); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('riga_progettos'); + } +} diff --git a/resources/views/progetti/dettaglio.blade.php b/resources/views/progetti/dettaglio.blade.php index 07b084a..8467474 100644 --- a/resources/views/progetti/dettaglio.blade.php +++ b/resources/views/progetti/dettaglio.blade.php @@ -93,14 +93,50 @@
-
+ +
-
-
- - -
-
+
+
+
+ Inserisci riga +
+
+
+
+ @csrf +
+ + + + + +
+
+ + + + + +
+
+ + + + +
+
+ + + + +
+ +
+
+
+
+
From 62566f28f4e7c1be1c127fbc3f657a8803d5d501 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Wed, 3 May 2023 21:34:39 +0200 Subject: [PATCH 14/41] (JQUERY) aggiunto effetti di nascondimento a form e settagli progetto --- resources/views/progetti/dettaglio.blade.php | 38 +++++++++++++------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/resources/views/progetti/dettaglio.blade.php b/resources/views/progetti/dettaglio.blade.php index 8467474..f6a5ee3 100644 --- a/resources/views/progetti/dettaglio.blade.php +++ b/resources/views/progetti/dettaglio.blade.php @@ -2,7 +2,7 @@ @section('content')
-

Lista Progetti

+

Dettaglio Progetto

@@ -16,21 +16,21 @@
-
+
Dettaglio Progetto
@foreach($dettaglio ?? '' as $progetto)
- Nome + Nome:
{{ $progetto->nome; }}
-
+
Descrizione
@@ -38,7 +38,7 @@ {{ $progetto->descrizione; }}
-
+
Data Inizio
@@ -52,7 +52,7 @@ {{ date('d/m/Y',strtotime($progetto->data_fine)) }}
-
+
Stato
@@ -66,7 +66,7 @@ {{ date('d/m/Y',strtotime($progetto->data_creazione)) }}
-
+
Budget
@@ -80,7 +80,7 @@ {{ $progetto->name }}
-
+
Note
@@ -98,10 +98,10 @@
-
- Inserisci riga +
+ Inserisci riga (click show/hide)
-
+
@csrf @@ -109,10 +109,10 @@ - +
-
+
@@ -131,6 +131,10 @@
+
+ + +
@@ -148,6 +152,14 @@ $('#tab_progetti').DataTable({ responsive: true }); + + $('#form').click(function(){ + $('form').toggle(); + }); + + $("#dettaglio").click(function(){ + $("[hidable]").toggle(500); + }); }); @endsection \ No newline at end of file From 2723211c5c3df839dadfddea41445fa79014edaf Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Wed, 3 May 2023 21:39:41 +0200 Subject: [PATCH 15/41] (JQUERY) aggiunto effetti di nascondimento a form e settagli progetto --- resources/views/progetti/dettaglio.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/progetti/dettaglio.blade.php b/resources/views/progetti/dettaglio.blade.php index f6a5ee3..158bc0d 100644 --- a/resources/views/progetti/dettaglio.blade.php +++ b/resources/views/progetti/dettaglio.blade.php @@ -158,7 +158,7 @@ }); $("#dettaglio").click(function(){ - $("[hidable]").toggle(500); + $("[hidable]").toggle(400); }); }); From f7b7d007c0e6be5a6b975a9e74a4c5bb3d816606 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Thu, 4 May 2023 13:42:46 +0200 Subject: [PATCH 16/41] (JQUERY) cambiato effetto in slide su progetti --- resources/views/progetti/dettaglio.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/progetti/dettaglio.blade.php b/resources/views/progetti/dettaglio.blade.php index 158bc0d..3660168 100644 --- a/resources/views/progetti/dettaglio.blade.php +++ b/resources/views/progetti/dettaglio.blade.php @@ -154,11 +154,11 @@ }); $('#form').click(function(){ - $('form').toggle(); + $('form').slideToggle(500); }); $("#dettaglio").click(function(){ - $("[hidable]").toggle(400); + $("[hidable]").slideToggle(500); }); }); From 5fed6fdf1615f4961e4b0cf3fde9a92baf16c749 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Sun, 7 May 2023 07:12:39 +0200 Subject: [PATCH 17/41] Modificato Javascript per nascondere il form e i dettagli del progetto --- resources/views/progetti/dettaglio.blade.php | 303 ++++++++++--------- 1 file changed, 156 insertions(+), 147 deletions(-) diff --git a/resources/views/progetti/dettaglio.blade.php b/resources/views/progetti/dettaglio.blade.php index 3660168..d7da7df 100644 --- a/resources/views/progetti/dettaglio.blade.php +++ b/resources/views/progetti/dettaglio.blade.php @@ -1,153 +1,162 @@ -@extends('admin') -@section('content') +@extends('admin') @section('content')
-
-

Dettaglio Progetto

-
-
-
- -
-
- -
-
- -
-
-
-
- Dettaglio Progetto -
-
- @foreach($dettaglio ?? '' as $progetto) -
-
- Nome: -
-
- {{ $progetto->nome; }} -
-
- -
-
- Descrizione -
-
- {{ $progetto->descrizione; }} -
-
-
-
- Data Inizio -
-
- {{ date('d/m/Y',strtotime($progetto->data_inizio)) }} -
-
- Data Termine -
-
- {{ date('d/m/Y',strtotime($progetto->data_fine)) }} -
-
-
-
- Stato -
-
- {{ $progetto->stato }} -
-
- Data Creazione -
-
- {{ date('d/m/Y',strtotime($progetto->data_creazione)) }} -
-
-
-
- Budget -
-
- € {{ $progetto->budget }} -
-
- Coordinatore -
-
- {{ $progetto->name }} -
-
-
-
- Note -
-
- {{ $progetto->note; }} -
-
- @endforeach -
-
-
-
- - -
-
-
-
- Inserisci riga (click show/hide) -
-
-
-
- @csrf -
- - - - - -
-
- - - - - -
-
- - - - -
-
- - - - -
-
- - -
- -
-
+
+

Dettaglio Progetto

-
-
- +
+ +
+
+ +
+
-@endsection +
+
+
+
Dettaglio Progetto
+
+ @foreach($dettaglio ?? '' as $progetto) +
+
Nome:
+
+ {{ $progetto->nome; }} +
+
-@section('script') - -@endsection \ No newline at end of file + + @endsection \ No newline at end of file From 10d5766975e413139d43a61ce2a10ba8a3511db2 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Tue, 9 May 2023 21:11:23 +0200 Subject: [PATCH 18/41] lavori sulla parte dei progetti. --- app/Http/Controllers/ProgettiController.php | 13 ++++--- app/Models/Progetti.php | 6 +++- app/Models/RigaProgetto.php | 17 +++++++++ ..._03_164304_create_riga_progettos_table.php | 6 ++++ resources/views/progetti/dettaglio.blade.php | 36 ++++++++++++------- routes/admin.php | 2 +- 6 files changed, 62 insertions(+), 18 deletions(-) diff --git a/app/Http/Controllers/ProgettiController.php b/app/Http/Controllers/ProgettiController.php index 0dde7fe..176ad13 100644 --- a/app/Http/Controllers/ProgettiController.php +++ b/app/Http/Controllers/ProgettiController.php @@ -5,6 +5,7 @@ namespace App\Http\Controllers; use App\Models\Progetti; use App\Models\User; use Illuminate\Http\Request; +use App\Models\RigaProgetto; class ProgettiController extends Controller { @@ -34,15 +35,19 @@ class ProgettiController extends Controller return redirect(Route('progetti')); } - public function inserisciTask(Request $id) + public function inserisciTask(Request $args) { - + RigaProgetto::saveRiga($args); + return redirect(Route('detail',['id'=>$args['fk_id_progetto']])); } public function dettaglioProgetto(Request $id) { - $progetto = Progetti::getProgettoById($id['id']); - return view('progetti.dettaglio',['dettaglio'=>$progetto]); + $progetto_id=$id['id']; + $progetto = Progetti::getProgettoById($progetto_id); + $righe = RigaProgetto::getRigheProgetto($progetto_id); + return view('progetti.dettaglio',['dettaglio'=>$progetto, 'righe'=>$righe,]); + //dd($righe); } } diff --git a/app/Models/Progetti.php b/app/Models/Progetti.php index d21e545..7d4564a 100644 --- a/app/Models/Progetti.php +++ b/app/Models/Progetti.php @@ -27,7 +27,11 @@ class Progetti extends Model } public static function getProgettoById($id){ - return DB::table('progettis')->join('users','progettis.fk_user','=','users.id')->where('progettis.id','=',$id)->get(); + return DB::table('progettis')-> + join('users','progettis.fk_user','=','users.id')-> + select('users.id as userid', 'users.name as name', 'progettis.*')-> + where('progettis.id','=',$id)-> + get(); } public static function saveProgetto($progetto){ diff --git a/app/Models/RigaProgetto.php b/app/Models/RigaProgetto.php index 6d49d50..afa16a0 100644 --- a/app/Models/RigaProgetto.php +++ b/app/Models/RigaProgetto.php @@ -4,8 +4,25 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Facades\DB; class RigaProgetto extends Model { use HasFactory; + + public static function getRigheProgetto($progetto_id) + { + return DB::table('riga_progettos')->where('fk_id_progetto','=',$progetto_id)->get(); + } + + public static function saveRiga($args) + { + DB::table('riga_progettos')->insert([ + 'fk_id_progetto'=>$args['fk_id_progetto'], + 'data'=>$args['data'], + 'descrizione'=>$args['descrizione'], + 'prezzo'=>$args['prezzo'], + 'ore'=>$args['ore'], + ]); + } } diff --git a/database/migrations/2023_05_03_164304_create_riga_progettos_table.php b/database/migrations/2023_05_03_164304_create_riga_progettos_table.php index e92b7d5..36067a1 100644 --- a/database/migrations/2023_05_03_164304_create_riga_progettos_table.php +++ b/database/migrations/2023_05_03_164304_create_riga_progettos_table.php @@ -16,6 +16,12 @@ class CreateRigaProgettosTable extends Migration Schema::create('riga_progettos', function (Blueprint $table) { $table->id(); $table->timestamps(); + $table->date('data'); + $table->longText('descrizione'); + $table->decimal('prezzo',10,2)->nullable(); + $table->decimal('ore',10,2)->nullable(); + $table->unsignedBigInteger('fk_id_progetto'); + $table->foreign('fk_id_progetto')->references('id')->on('progettis'); }); } diff --git a/resources/views/progetti/dettaglio.blade.php b/resources/views/progetti/dettaglio.blade.php index d7da7df..a211062 100644 --- a/resources/views/progetti/dettaglio.blade.php +++ b/resources/views/progetti/dettaglio.blade.php @@ -81,14 +81,14 @@
Inserisci riga (click show/hide)
-
+
@csrf
@@ -96,7 +96,7 @@ + type="text" name="descrizione" class="form-control" id="desc">
@@ -108,10 +108,11 @@
- +
+
@@ -128,8 +129,9 @@
Elementi e costi del progetto
- + +
+
@@ -140,19 +142,29 @@ @foreach($righe as $riga) + @if(isset($riga->data)) - + + @else + + + + + + + @endif @endforeach - +
Data
{{ date('d/m/Y',strtotime($riga->data)) }}{{ date('d/m/Y',strtotime($riga->data)) }} {{ $riga->descrizione }} {{ $riga->ore }} {{ $riga->prezzo }}
non c'ènon c'ènon c'ènon c'è
+
- <
+
@endsection @section('script') @@ -161,13 +173,13 @@ $('#tab_progetti').DataTable({ responsive: true }); - + $('#form').click(function(){ - $('form').slideToggle(500); + $('form').toggle(); }); $("#dettaglio").click(function(){ - $("[hidable]").slideToggle(500); + $('[hidable]').toggle(); }); }); diff --git a/routes/admin.php b/routes/admin.php index bba09c9..d7f5c9c 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -110,7 +110,7 @@ Route::get('/', [MovimentiController::class,'dashboard']); Route::post('progetti/new', [ProgettiController::class, 'salvaProgetto']); Route::get('progetti/new', [ProgettiController::class, 'nuovoProgetto'])->name('nuovoProgetto'); Route::get('progetti/delete',[ProgettiController::class, 'deleteProgetto']); - Route::get('progetti/detail', [ProgettiController::class, 'dettaglioProgetto']); + Route::get('progetti/detail', [ProgettiController::class, 'dettaglioProgetto'])->name('detail'); Route::post('progetti/detail', [ProgettiController::class, 'inserisciTask']); /// TEST routes From 92276adb8a4377a851800b50baebd1febecef29a Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Thu, 11 May 2023 10:28:47 +0200 Subject: [PATCH 19/41] aggiunto pulsante di cancellazione alla riga di progetto --- resources/views/progetti/dettaglio.blade.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/views/progetti/dettaglio.blade.php b/resources/views/progetti/dettaglio.blade.php index a211062..352f06b 100644 --- a/resources/views/progetti/dettaglio.blade.php +++ b/resources/views/progetti/dettaglio.blade.php @@ -138,6 +138,7 @@ Descrizione Ore lavoro Costo + Azioni @@ -148,6 +149,7 @@ {{ $riga->descrizione }} {{ $riga->ore }} {{ $riga->prezzo }} + X @else From 731b188f4de70d62159f3a3724db92717a566c2b Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Thu, 11 May 2023 10:59:54 +0200 Subject: [PATCH 20/41] Creato funzione di cancellazione riga dal progetto eritorno su pagina di dettaglio. --- app/Http/Controllers/RigaProgettoController.php | 9 +++++++++ app/Models/RigaProgetto.php | 5 +++++ resources/views/progetti/dettaglio.blade.php | 2 +- routes/admin.php | 2 ++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/RigaProgettoController.php b/app/Http/Controllers/RigaProgettoController.php index e58e9a0..802f3fd 100644 --- a/app/Http/Controllers/RigaProgettoController.php +++ b/app/Http/Controllers/RigaProgettoController.php @@ -3,8 +3,17 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; +use App\Models\RigaProgetto; class RigaProgettoController extends Controller { // + public function deleterow($id_row,$id_prog) + { + $id_riga = $id_row; + $id_progetto = $id_prog; + + RigaProgetto::deleteRow($id_riga); + return redirect('/admin/progetti/detail/?id='.$id_progetto); + } } diff --git a/app/Models/RigaProgetto.php b/app/Models/RigaProgetto.php index afa16a0..7b2f4a2 100644 --- a/app/Models/RigaProgetto.php +++ b/app/Models/RigaProgetto.php @@ -25,4 +25,9 @@ class RigaProgetto extends Model 'ore'=>$args['ore'], ]); } + + public static function deleteRow($id) + { + DB::table('riga_progettos')->delete($id); + } } diff --git a/resources/views/progetti/dettaglio.blade.php b/resources/views/progetti/dettaglio.blade.php index 352f06b..c037c3e 100644 --- a/resources/views/progetti/dettaglio.blade.php +++ b/resources/views/progetti/dettaglio.blade.php @@ -149,7 +149,7 @@ {{ $riga->descrizione }} {{ $riga->ore }} {{ $riga->prezzo }} - X + X @else diff --git a/routes/admin.php b/routes/admin.php index d7f5c9c..7bacf8f 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -8,6 +8,7 @@ use App\Http\Controllers\ContatoreEnElController; use App\Http\Controllers\ContatoreGasController; use App\Http\Controllers\DocumentiController; use App\Http\Controllers\MovimentiController; +use App\Http\Controllers\RigaProgettoController; use App\Http\Controllers\TagController; use App\Http\Controllers\FullCalenderController; use App\Http\Controllers\AutoController; @@ -110,6 +111,7 @@ Route::get('/', [MovimentiController::class,'dashboard']); Route::post('progetti/new', [ProgettiController::class, 'salvaProgetto']); Route::get('progetti/new', [ProgettiController::class, 'nuovoProgetto'])->name('nuovoProgetto'); Route::get('progetti/delete',[ProgettiController::class, 'deleteProgetto']); + Route::get('progetti/delete_row/{id_row}/return/{id_prog}',[RigaProgettoController::class, 'deleterow']); Route::get('progetti/detail', [ProgettiController::class, 'dettaglioProgetto'])->name('detail'); Route::post('progetti/detail', [ProgettiController::class, 'inserisciTask']); From b3110cb63b7afba5a1260c586929a8a9e6cba784 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Fri, 12 May 2023 09:53:04 +0200 Subject: [PATCH 21/41] Aggiunto funzione di cancellazione della riga del progetto --- app/Http/Controllers/RigaProgettoController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Http/Controllers/RigaProgettoController.php b/app/Http/Controllers/RigaProgettoController.php index 802f3fd..e491569 100644 --- a/app/Http/Controllers/RigaProgettoController.php +++ b/app/Http/Controllers/RigaProgettoController.php @@ -14,6 +14,7 @@ class RigaProgettoController extends Controller $id_progetto = $id_prog; RigaProgetto::deleteRow($id_riga); + // Ritorna alla pagina dei dettagli del progetto return redirect('/admin/progetti/detail/?id='.$id_progetto); } } From e1819586e2ce9583176087b4b2492756c713c85c Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Mon, 15 May 2023 17:57:13 +0200 Subject: [PATCH 22/41] aggiunto script su rifornimento view --- resources/views/auto/rifornimento.blade.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/views/auto/rifornimento.blade.php b/resources/views/auto/rifornimento.blade.php index cac6f16..a0ddfd9 100644 --- a/resources/views/auto/rifornimento.blade.php +++ b/resources/views/auto/rifornimento.blade.php @@ -14,7 +14,7 @@
- + @csrf
@@ -23,7 +23,7 @@
- +
@@ -56,7 +56,7 @@
- +
@@ -74,6 +74,7 @@ $('#automobili').DataTable({ responsive: true }); + $('#form').validate({rules: {km : {required:true, minlenght:3}}}); }); @endsection From 1b6609d0284a739053caeda9936ab9a9b8e7738e Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Mon, 15 May 2023 18:21:11 +0200 Subject: [PATCH 23/41] Delete bubofamily_db.sql eliminazione file di esempio --- bubofamily_db.sql | 382 ---------------------------------------------- 1 file changed, 382 deletions(-) delete mode 100644 bubofamily_db.sql diff --git a/bubofamily_db.sql b/bubofamily_db.sql deleted file mode 100644 index f9a133d..0000000 --- a/bubofamily_db.sql +++ /dev/null @@ -1,382 +0,0 @@ --- MySQL dump 10.13 Distrib 8.0.28, for Linux (x86_64) --- --- Host: localhost Database: bubofamily_db --- ------------------------------------------------------ --- Server version 8.0.28-0ubuntu0.21.10.3 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!50503 SET NAMES utf8mb4 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Current Database: `bubofamily_db` --- - -CREATE DATABASE /*!32312 IF NOT EXISTS*/ `bubofamily_db` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci */ /*!80016 DEFAULT ENCRYPTION='N' */; - -USE `bubofamily_db`; - --- --- Table structure for table `anagraficas` --- - -DROP TABLE IF EXISTS `anagraficas`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `anagraficas` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT, - `created_at` timestamp NULL DEFAULT NULL, - `updated_at` timestamp NULL DEFAULT NULL, - `ang_cognome` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `ang_nome` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `ang_ragioneSociale` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `ang_codiceFiscale` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `ang_partitaIva` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `ang_note` longtext COLLATE utf8mb4_unicode_ci, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `anagraficas` --- - -LOCK TABLES `anagraficas` WRITE; -/*!40000 ALTER TABLE `anagraficas` DISABLE KEYS */; -/*!40000 ALTER TABLE `anagraficas` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `categories` --- - -DROP TABLE IF EXISTS `categories`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `categories` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT, - `created_at` timestamp NULL DEFAULT NULL, - `updated_at` timestamp NULL DEFAULT NULL, - `cat_name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `categories` --- - -LOCK TABLES `categories` WRITE; -/*!40000 ALTER TABLE `categories` DISABLE KEYS */; -INSERT INTO `categories` VALUES (1,NULL,NULL,'Alimentari'),(2,NULL,NULL,'Abbigliamento'),(3,NULL,NULL,'Salute'),(4,NULL,NULL,'Casalinghi'),(5,NULL,NULL,'Vizi'),(6,NULL,NULL,'Hobbie'),(7,NULL,NULL,'Vacanze'),(8,NULL,NULL,'Benessere e Bellezza'),(9,NULL,NULL,'Macchinetta Caffè'),(10,NULL,NULL,'Stipendio'),(11,NULL,NULL,'Rimborsi'),(12,NULL,NULL,'Affitto'),(13,NULL,NULL,'Anticipi Affitto'),(14,NULL,NULL,'Spese bancarie'),(15,NULL,NULL,'Dolomiti Energia'),(16,NULL,NULL,'Acqua'),(17,NULL,NULL,'Internet'),(18,NULL,NULL,'Beneficenza Offerte'),(19,NULL,NULL,'Telefoni Cellulari'),(20,NULL,NULL,'Sport ed attività'),(21,NULL,NULL,'Automobile'); -/*!40000 ALTER TABLE `categories` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `contatore_en_els` --- - -DROP TABLE IF EXISTS `contatore_en_els`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `contatore_en_els` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT, - `created_at` timestamp NULL DEFAULT NULL, - `updated_at` timestamp NULL DEFAULT NULL, - `enel_date` date NOT NULL, - `enel_A` int NOT NULL, - `enel_R` int NOT NULL, - `enel_F1` int NOT NULL, - `enel_F2` int NOT NULL, - `enel_F3` int NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `contatore_en_els` --- - -LOCK TABLES `contatore_en_els` WRITE; -/*!40000 ALTER TABLE `contatore_en_els` DISABLE KEYS */; -/*!40000 ALTER TABLE `contatore_en_els` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `contatore_gases` --- - -DROP TABLE IF EXISTS `contatore_gases`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `contatore_gases` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT, - `created_at` timestamp NULL DEFAULT NULL, - `updated_at` timestamp NULL DEFAULT NULL, - `gas_date` date NOT NULL, - `gas_lettura` decimal(10,3) NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `contatore_gases` --- - -LOCK TABLES `contatore_gases` WRITE; -/*!40000 ALTER TABLE `contatore_gases` DISABLE KEYS */; -INSERT INTO `contatore_gases` VALUES (1,NULL,NULL,'2021-11-13',304.526),(2,NULL,NULL,'2021-11-14',307.251),(3,NULL,NULL,'2021-11-27',339.481),(4,NULL,NULL,'2021-12-18',450.030),(5,NULL,NULL,'2021-12-19',456.843),(6,NULL,NULL,'2021-12-27',503.762),(7,NULL,NULL,'2022-01-08',568.309),(8,NULL,NULL,'2022-02-11',760.517); -/*!40000 ALTER TABLE `contatore_gases` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `contattos` --- - -DROP TABLE IF EXISTS `contattos`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `contattos` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT, - `created_at` timestamp NULL DEFAULT NULL, - `updated_at` timestamp NULL DEFAULT NULL, - `cnt_fk_anagraficaId` bigint unsigned NOT NULL, - `cnt_tipo` int NOT NULL, - `cnt_valore` longtext COLLATE utf8mb4_unicode_ci NOT NULL, - `cnt_note` longtext COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`id`), - KEY `contattos_cnt_fk_anagraficaid_foreign` (`cnt_fk_anagraficaId`), - CONSTRAINT `contattos_cnt_fk_anagraficaid_foreign` FOREIGN KEY (`cnt_fk_anagraficaId`) REFERENCES `anagraficas` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `contattos` --- - -LOCK TABLES `contattos` WRITE; -/*!40000 ALTER TABLE `contattos` DISABLE KEYS */; -/*!40000 ALTER TABLE `contattos` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `failed_jobs` --- - -DROP TABLE IF EXISTS `failed_jobs`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `failed_jobs` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT, - `uuid` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `connection` text COLLATE utf8mb4_unicode_ci NOT NULL, - `queue` text COLLATE utf8mb4_unicode_ci NOT NULL, - `payload` longtext COLLATE utf8mb4_unicode_ci NOT NULL, - `exception` longtext COLLATE utf8mb4_unicode_ci NOT NULL, - `failed_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - UNIQUE KEY `failed_jobs_uuid_unique` (`uuid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `failed_jobs` --- - -LOCK TABLES `failed_jobs` WRITE; -/*!40000 ALTER TABLE `failed_jobs` DISABLE KEYS */; -/*!40000 ALTER TABLE `failed_jobs` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `migrations` --- - -DROP TABLE IF EXISTS `migrations`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `migrations` ( - `id` int unsigned NOT NULL AUTO_INCREMENT, - `migration` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `batch` int NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `migrations` --- - -LOCK TABLES `migrations` WRITE; -/*!40000 ALTER TABLE `migrations` DISABLE KEYS */; -INSERT INTO `migrations` VALUES (1,'2014_10_12_000000_create_users_table',1),(2,'2014_10_12_100000_create_password_resets_table',1),(3,'2019_08_19_000000_create_failed_jobs_table',1),(4,'2019_12_14_000001_create_personal_access_tokens_table',1),(5,'2022_02_04_100210_create_tags_table',1),(6,'2022_02_04_134225_create_categories_table',1),(7,'2022_02_04_134245_create_movimentis_table',1),(8,'2022_02_08_093657_create_anagraficas_table',1),(9,'2022_02_08_122700_create_contattos_table',1),(10,'2022_02_12_153430_create_contatore_gases_table',1),(11,'2022_02_12_153454_create_contatore_en_els_table',1); -/*!40000 ALTER TABLE `migrations` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `movimentis` --- - -DROP TABLE IF EXISTS `movimentis`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `movimentis` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT, - `created_at` timestamp NULL DEFAULT NULL, - `updated_at` timestamp NULL DEFAULT NULL, - `mov_data` date NOT NULL, - `mov_fk_categoria` bigint unsigned NOT NULL, - `mov_descrizione` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `mov_importo` decimal(8,2) NOT NULL, - `mov_inserito_da` bigint unsigned NOT NULL, - `mov_fk_tags` bigint unsigned NOT NULL, - PRIMARY KEY (`id`), - KEY `movimentis_mov_fk_categoria_foreign` (`mov_fk_categoria`), - KEY `movimentis_mov_inserito_da_foreign` (`mov_inserito_da`), - KEY `movimentis_mov_fk_tags_foreign` (`mov_fk_tags`), - CONSTRAINT `movimentis_mov_fk_categoria_foreign` FOREIGN KEY (`mov_fk_categoria`) REFERENCES `categories` (`id`), - CONSTRAINT `movimentis_mov_fk_tags_foreign` FOREIGN KEY (`mov_fk_tags`) REFERENCES `tags` (`id`), - CONSTRAINT `movimentis_mov_inserito_da_foreign` FOREIGN KEY (`mov_inserito_da`) REFERENCES `users` (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `movimentis` --- - -LOCK TABLES `movimentis` WRITE; -/*!40000 ALTER TABLE `movimentis` DISABLE KEYS */; -INSERT INTO `movimentis` VALUES (3,NULL,NULL,'2022-02-14',1,'Spesa all\'Aldi',-8.60,1,1),(7,NULL,NULL,'2022-02-15',18,'Prelievo automatico Telethon',-10.00,1,1),(8,NULL,NULL,'2022-02-14',19,'Prelievo automatico Iliad Cellulare',-5.99,1,3),(9,NULL,NULL,'2022-02-16',19,'Prelievo automatico Iliad Cellulare',-5.99,1,2),(10,NULL,NULL,'2022-02-11',20,'Piscina Giulio',-20.00,1,4),(11,NULL,NULL,'2022-02-11',1,'Spesa alimentari Aldi',-13.98,1,1),(12,NULL,NULL,'2022-02-11',1,'Spesa Poli',-22.40,1,1),(13,NULL,NULL,'2022-02-11',5,'Stecca sigarette Flavio',-48.00,1,2),(14,NULL,NULL,'2022-02-10',3,'Visita campo Visivo Paola',-19.00,1,3),(15,NULL,NULL,'2022-02-10',1,'Spesa alimentari Aldi',-50.09,1,1),(16,NULL,NULL,'2022-02-09',3,'Ticket Pronto soccorso Flavio',-50.00,1,2),(17,NULL,NULL,'2022-02-09',17,'Addebito Fibra Aruba.it mese Gennaio',-33.67,1,1),(18,NULL,NULL,'2022-02-08',9,'Macchinetta caffè e integrazione pranzi',-10.00,1,3),(19,NULL,NULL,'2022-02-06',1,'Formaggio caseificio Coredo',-50.00,1,1),(20,NULL,NULL,'2022-02-05',3,'Acquisto cerotti Diclofenac Farmacia Castelnuovo per Flavio',-15.90,1,2),(21,NULL,NULL,'2022-02-05',1,'Spesa alimentari ortoval (Silvia)',-28.00,1,1),(22,NULL,NULL,'2022-02-04',4,'Acquisto casalinghi e divertimenti Giulio',-12.62,1,1),(23,NULL,NULL,'2022-02-04',1,'Acquisto pesce Dallagiacoma',-45.86,1,1),(24,NULL,NULL,'2022-02-03',3,'Acquisto Lasonil e aspirina Farmacia comunale Castelnuovo',-15.45,1,1),(25,NULL,NULL,'2022-02-02',5,'Sigarette Flavio',-48.00,1,2),(26,NULL,NULL,'2022-02-02',1,'Spesa alimentari Daniele',-32.40,1,1),(27,NULL,NULL,'2022-02-01',19,'Addebito Iliad SIM Paola',-5.99,1,3),(28,NULL,NULL,'2022-02-16',6,'Abbonamento ad Audible',-9.99,1,1),(29,NULL,NULL,'2022-02-14',1,'Spesa all\'Aldi',-8.68,1,1),(31,NULL,NULL,'2022-02-01',12,'Affitto Cadine mese di Febbraio',600.00,1,1),(32,NULL,NULL,'2022-02-01',12,'Anticipo spese condominio',60.00,1,1),(33,NULL,NULL,'2022-02-17',21,'Pieno (serbatoio a metà) gasolio TIPO',-47.55,1,2); -/*!40000 ALTER TABLE `movimentis` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `password_resets` --- - -DROP TABLE IF EXISTS `password_resets`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `password_resets` ( - `email` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `token` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `created_at` timestamp NULL DEFAULT NULL, - KEY `password_resets_email_index` (`email`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `password_resets` --- - -LOCK TABLES `password_resets` WRITE; -/*!40000 ALTER TABLE `password_resets` DISABLE KEYS */; -/*!40000 ALTER TABLE `password_resets` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `personal_access_tokens` --- - -DROP TABLE IF EXISTS `personal_access_tokens`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `personal_access_tokens` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT, - `tokenable_type` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `tokenable_id` bigint unsigned NOT NULL, - `name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `token` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL, - `abilities` text COLLATE utf8mb4_unicode_ci, - `last_used_at` timestamp NULL DEFAULT NULL, - `created_at` timestamp NULL DEFAULT NULL, - `updated_at` timestamp NULL DEFAULT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `personal_access_tokens_token_unique` (`token`), - KEY `personal_access_tokens_tokenable_type_tokenable_id_index` (`tokenable_type`,`tokenable_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `personal_access_tokens` --- - -LOCK TABLES `personal_access_tokens` WRITE; -/*!40000 ALTER TABLE `personal_access_tokens` DISABLE KEYS */; -/*!40000 ALTER TABLE `personal_access_tokens` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `tags` --- - -DROP TABLE IF EXISTS `tags`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `tags` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT, - `created_at` timestamp NULL DEFAULT NULL, - `updated_at` timestamp NULL DEFAULT NULL, - `tag_name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `tags` --- - -LOCK TABLES `tags` WRITE; -/*!40000 ALTER TABLE `tags` DISABLE KEYS */; -INSERT INTO `tags` VALUES (1,NULL,NULL,'Casa'),(2,NULL,NULL,'Flavio'),(3,NULL,NULL,'Paola'),(4,NULL,NULL,'Giulio'); -/*!40000 ALTER TABLE `tags` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `users` --- - -DROP TABLE IF EXISTS `users`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `users` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT, - `name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `email` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `email_verified_at` timestamp NULL DEFAULT NULL, - `password` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `remember_token` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `created_at` timestamp NULL DEFAULT NULL, - `updated_at` timestamp NULL DEFAULT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `users_email_unique` (`email`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `users` --- - -LOCK TABLES `users` WRITE; -/*!40000 ALTER TABLE `users` DISABLE KEYS */; -INSERT INTO `users` VALUES (1,'Flavio Barachino','flavio.barachino@gmail.com',NULL,'$2y$10$cR7SkowifYAkxY0YXDvmj.rHF.t.n3cshgUbfCgaSLEFkW/Jyz.wa',NULL,'2022-02-14 06:08:16','2022-02-14 06:08:16'); -/*!40000 ALTER TABLE `users` ENABLE KEYS */; -UNLOCK TABLES; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2022-02-20 10:21:13 From 4038070c825dc2eb8c00d5e5b4dd86f1ccbcb37a Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Mon, 15 May 2023 18:27:40 +0200 Subject: [PATCH 24/41] Modificato readme --- .gitignore | 1 + README.md | 84 ++++++++++++++++-------------------------------------- 2 files changed, 25 insertions(+), 60 deletions(-) diff --git a/.gitignore b/.gitignore index a395359..4836ba0 100644 --- a/.gitignore +++ b/.gitignore @@ -14,5 +14,6 @@ Homestead.json Homestead.yaml npm-debug.log yarn-error.log +*.sql /.idea /.vscode diff --git a/README.md b/README.md index 8878ec1..f30c742 100644 --- a/README.md +++ b/README.md @@ -1,66 +1,30 @@ -

+# Gestionale di Famiglia +Piccolo sistema di gestione famigliare. +Al momento sono presenti: -

-Build Status -Total Downloads -Latest Stable Version -License -

+ - Gestione delle Entrate e uscite con possibilità di inserimento delle foto degli scontrini ed eventuali documenti in PDF. + - Possibilità di importare gli estratti conto da un file excel o csv. + - Un sistema di gestione delle letture dei contatori per il GAS e per l'Energia elettrica + - Un sistema di gestione delle autovetture e relative operazioni effettuate su di esse. + - Una rubrica telefonica e degli indirizzi + - Una gestione dei progetti (ancora in sviluppo) + - Una gestione degli utenti e dei gruppi e relativi permessi. -## About Laravel +*Sviluppato in php, mysql, jquery su framework Laravel*. -Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel takes the pain out of development by easing common tasks used in many web projects, such as: +## Installazione + - clonare il repository + - copiare il file .env.example + - inserire le informazioni del database (username,password,dbname) + - lanciare >composer install + - lanciare php artisan migrate + - lanciare i seeds (categorie e utenti di default) + -- [Simple, fast routing engine](https://laravel.com/docs/routing). -- [Powerful dependency injection container](https://laravel.com/docs/container). -- Multiple back-ends for [session](https://laravel.com/docs/session) and [cache](https://laravel.com/docs/cache) storage. -- Expressive, intuitive [database ORM](https://laravel.com/docs/eloquent). -- Database agnostic [schema migrations](https://laravel.com/docs/migrations). -- [Robust background job processing](https://laravel.com/docs/queues). -- [Real-time event broadcasting](https://laravel.com/docs/broadcasting). +## Sviluppatori +Flavio Barachino -Laravel is accessible, powerful, and provides tools required for large, robust applications. +### Vuoi partecipare? +Scrivimi con le tue proposte, le tue critiche, i tuoi suggerimenti. -## Learning Laravel - -Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework. - -If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 1500 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library. - -## Laravel Sponsors - -We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell). - -### Premium Partners - -- **[Vehikl](https://vehikl.com/)** -- **[Tighten Co.](https://tighten.co)** -- **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)** -- **[64 Robots](https://64robots.com)** -- **[Cubet Techno Labs](https://cubettech.com)** -- **[Cyber-Duck](https://cyber-duck.co.uk)** -- **[Many](https://www.many.co.uk)** -- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)** -- **[DevSquad](https://devsquad.com)** -- **[Curotec](https://www.curotec.com/services/technologies/laravel/)** -- **[OP.GG](https://op.gg)** -- **[CMS Max](https://www.cmsmax.com/)** -- **[WebReinvent](https://webreinvent.com/?utm_source=laravel&utm_medium=github&utm_campaign=patreon-sponsors)** -- **[Lendio](https://lendio.com)** -- **[Romega Software](https://romegasoftware.com)** - -## Contributing - -Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions). - -## Code of Conduct - -In order to ensure that the Laravel community is welcoming to all, please review and abide by the [Code of Conduct](https://laravel.com/docs/contributions#code-of-conduct). - -## Security Vulnerabilities - -If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [taylor@laravel.com](mailto:taylor@laravel.com). All security vulnerabilities will be promptly addressed. - -## License - -The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT). +> Written with [StackEdit](https://stackedit.io/). \ No newline at end of file From af59c82a03be64e6da8bb9ffbf2279a7fd8e5a44 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Mon, 15 May 2023 18:32:45 +0200 Subject: [PATCH 25/41] Delete bubofamily_db.sql rimosso sql di esempio --- bubofamily_db.sql | 382 ---------------------------------------------- 1 file changed, 382 deletions(-) delete mode 100644 bubofamily_db.sql diff --git a/bubofamily_db.sql b/bubofamily_db.sql deleted file mode 100644 index f9a133d..0000000 --- a/bubofamily_db.sql +++ /dev/null @@ -1,382 +0,0 @@ --- MySQL dump 10.13 Distrib 8.0.28, for Linux (x86_64) --- --- Host: localhost Database: bubofamily_db --- ------------------------------------------------------ --- Server version 8.0.28-0ubuntu0.21.10.3 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!50503 SET NAMES utf8mb4 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Current Database: `bubofamily_db` --- - -CREATE DATABASE /*!32312 IF NOT EXISTS*/ `bubofamily_db` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci */ /*!80016 DEFAULT ENCRYPTION='N' */; - -USE `bubofamily_db`; - --- --- Table structure for table `anagraficas` --- - -DROP TABLE IF EXISTS `anagraficas`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `anagraficas` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT, - `created_at` timestamp NULL DEFAULT NULL, - `updated_at` timestamp NULL DEFAULT NULL, - `ang_cognome` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `ang_nome` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `ang_ragioneSociale` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `ang_codiceFiscale` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `ang_partitaIva` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `ang_note` longtext COLLATE utf8mb4_unicode_ci, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `anagraficas` --- - -LOCK TABLES `anagraficas` WRITE; -/*!40000 ALTER TABLE `anagraficas` DISABLE KEYS */; -/*!40000 ALTER TABLE `anagraficas` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `categories` --- - -DROP TABLE IF EXISTS `categories`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `categories` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT, - `created_at` timestamp NULL DEFAULT NULL, - `updated_at` timestamp NULL DEFAULT NULL, - `cat_name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `categories` --- - -LOCK TABLES `categories` WRITE; -/*!40000 ALTER TABLE `categories` DISABLE KEYS */; -INSERT INTO `categories` VALUES (1,NULL,NULL,'Alimentari'),(2,NULL,NULL,'Abbigliamento'),(3,NULL,NULL,'Salute'),(4,NULL,NULL,'Casalinghi'),(5,NULL,NULL,'Vizi'),(6,NULL,NULL,'Hobbie'),(7,NULL,NULL,'Vacanze'),(8,NULL,NULL,'Benessere e Bellezza'),(9,NULL,NULL,'Macchinetta Caffè'),(10,NULL,NULL,'Stipendio'),(11,NULL,NULL,'Rimborsi'),(12,NULL,NULL,'Affitto'),(13,NULL,NULL,'Anticipi Affitto'),(14,NULL,NULL,'Spese bancarie'),(15,NULL,NULL,'Dolomiti Energia'),(16,NULL,NULL,'Acqua'),(17,NULL,NULL,'Internet'),(18,NULL,NULL,'Beneficenza Offerte'),(19,NULL,NULL,'Telefoni Cellulari'),(20,NULL,NULL,'Sport ed attività'),(21,NULL,NULL,'Automobile'); -/*!40000 ALTER TABLE `categories` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `contatore_en_els` --- - -DROP TABLE IF EXISTS `contatore_en_els`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `contatore_en_els` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT, - `created_at` timestamp NULL DEFAULT NULL, - `updated_at` timestamp NULL DEFAULT NULL, - `enel_date` date NOT NULL, - `enel_A` int NOT NULL, - `enel_R` int NOT NULL, - `enel_F1` int NOT NULL, - `enel_F2` int NOT NULL, - `enel_F3` int NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `contatore_en_els` --- - -LOCK TABLES `contatore_en_els` WRITE; -/*!40000 ALTER TABLE `contatore_en_els` DISABLE KEYS */; -/*!40000 ALTER TABLE `contatore_en_els` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `contatore_gases` --- - -DROP TABLE IF EXISTS `contatore_gases`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `contatore_gases` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT, - `created_at` timestamp NULL DEFAULT NULL, - `updated_at` timestamp NULL DEFAULT NULL, - `gas_date` date NOT NULL, - `gas_lettura` decimal(10,3) NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `contatore_gases` --- - -LOCK TABLES `contatore_gases` WRITE; -/*!40000 ALTER TABLE `contatore_gases` DISABLE KEYS */; -INSERT INTO `contatore_gases` VALUES (1,NULL,NULL,'2021-11-13',304.526),(2,NULL,NULL,'2021-11-14',307.251),(3,NULL,NULL,'2021-11-27',339.481),(4,NULL,NULL,'2021-12-18',450.030),(5,NULL,NULL,'2021-12-19',456.843),(6,NULL,NULL,'2021-12-27',503.762),(7,NULL,NULL,'2022-01-08',568.309),(8,NULL,NULL,'2022-02-11',760.517); -/*!40000 ALTER TABLE `contatore_gases` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `contattos` --- - -DROP TABLE IF EXISTS `contattos`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `contattos` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT, - `created_at` timestamp NULL DEFAULT NULL, - `updated_at` timestamp NULL DEFAULT NULL, - `cnt_fk_anagraficaId` bigint unsigned NOT NULL, - `cnt_tipo` int NOT NULL, - `cnt_valore` longtext COLLATE utf8mb4_unicode_ci NOT NULL, - `cnt_note` longtext COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`id`), - KEY `contattos_cnt_fk_anagraficaid_foreign` (`cnt_fk_anagraficaId`), - CONSTRAINT `contattos_cnt_fk_anagraficaid_foreign` FOREIGN KEY (`cnt_fk_anagraficaId`) REFERENCES `anagraficas` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `contattos` --- - -LOCK TABLES `contattos` WRITE; -/*!40000 ALTER TABLE `contattos` DISABLE KEYS */; -/*!40000 ALTER TABLE `contattos` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `failed_jobs` --- - -DROP TABLE IF EXISTS `failed_jobs`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `failed_jobs` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT, - `uuid` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `connection` text COLLATE utf8mb4_unicode_ci NOT NULL, - `queue` text COLLATE utf8mb4_unicode_ci NOT NULL, - `payload` longtext COLLATE utf8mb4_unicode_ci NOT NULL, - `exception` longtext COLLATE utf8mb4_unicode_ci NOT NULL, - `failed_at` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (`id`), - UNIQUE KEY `failed_jobs_uuid_unique` (`uuid`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `failed_jobs` --- - -LOCK TABLES `failed_jobs` WRITE; -/*!40000 ALTER TABLE `failed_jobs` DISABLE KEYS */; -/*!40000 ALTER TABLE `failed_jobs` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `migrations` --- - -DROP TABLE IF EXISTS `migrations`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `migrations` ( - `id` int unsigned NOT NULL AUTO_INCREMENT, - `migration` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `batch` int NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `migrations` --- - -LOCK TABLES `migrations` WRITE; -/*!40000 ALTER TABLE `migrations` DISABLE KEYS */; -INSERT INTO `migrations` VALUES (1,'2014_10_12_000000_create_users_table',1),(2,'2014_10_12_100000_create_password_resets_table',1),(3,'2019_08_19_000000_create_failed_jobs_table',1),(4,'2019_12_14_000001_create_personal_access_tokens_table',1),(5,'2022_02_04_100210_create_tags_table',1),(6,'2022_02_04_134225_create_categories_table',1),(7,'2022_02_04_134245_create_movimentis_table',1),(8,'2022_02_08_093657_create_anagraficas_table',1),(9,'2022_02_08_122700_create_contattos_table',1),(10,'2022_02_12_153430_create_contatore_gases_table',1),(11,'2022_02_12_153454_create_contatore_en_els_table',1); -/*!40000 ALTER TABLE `migrations` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `movimentis` --- - -DROP TABLE IF EXISTS `movimentis`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `movimentis` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT, - `created_at` timestamp NULL DEFAULT NULL, - `updated_at` timestamp NULL DEFAULT NULL, - `mov_data` date NOT NULL, - `mov_fk_categoria` bigint unsigned NOT NULL, - `mov_descrizione` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `mov_importo` decimal(8,2) NOT NULL, - `mov_inserito_da` bigint unsigned NOT NULL, - `mov_fk_tags` bigint unsigned NOT NULL, - PRIMARY KEY (`id`), - KEY `movimentis_mov_fk_categoria_foreign` (`mov_fk_categoria`), - KEY `movimentis_mov_inserito_da_foreign` (`mov_inserito_da`), - KEY `movimentis_mov_fk_tags_foreign` (`mov_fk_tags`), - CONSTRAINT `movimentis_mov_fk_categoria_foreign` FOREIGN KEY (`mov_fk_categoria`) REFERENCES `categories` (`id`), - CONSTRAINT `movimentis_mov_fk_tags_foreign` FOREIGN KEY (`mov_fk_tags`) REFERENCES `tags` (`id`), - CONSTRAINT `movimentis_mov_inserito_da_foreign` FOREIGN KEY (`mov_inserito_da`) REFERENCES `users` (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `movimentis` --- - -LOCK TABLES `movimentis` WRITE; -/*!40000 ALTER TABLE `movimentis` DISABLE KEYS */; -INSERT INTO `movimentis` VALUES (3,NULL,NULL,'2022-02-14',1,'Spesa all\'Aldi',-8.60,1,1),(7,NULL,NULL,'2022-02-15',18,'Prelievo automatico Telethon',-10.00,1,1),(8,NULL,NULL,'2022-02-14',19,'Prelievo automatico Iliad Cellulare',-5.99,1,3),(9,NULL,NULL,'2022-02-16',19,'Prelievo automatico Iliad Cellulare',-5.99,1,2),(10,NULL,NULL,'2022-02-11',20,'Piscina Giulio',-20.00,1,4),(11,NULL,NULL,'2022-02-11',1,'Spesa alimentari Aldi',-13.98,1,1),(12,NULL,NULL,'2022-02-11',1,'Spesa Poli',-22.40,1,1),(13,NULL,NULL,'2022-02-11',5,'Stecca sigarette Flavio',-48.00,1,2),(14,NULL,NULL,'2022-02-10',3,'Visita campo Visivo Paola',-19.00,1,3),(15,NULL,NULL,'2022-02-10',1,'Spesa alimentari Aldi',-50.09,1,1),(16,NULL,NULL,'2022-02-09',3,'Ticket Pronto soccorso Flavio',-50.00,1,2),(17,NULL,NULL,'2022-02-09',17,'Addebito Fibra Aruba.it mese Gennaio',-33.67,1,1),(18,NULL,NULL,'2022-02-08',9,'Macchinetta caffè e integrazione pranzi',-10.00,1,3),(19,NULL,NULL,'2022-02-06',1,'Formaggio caseificio Coredo',-50.00,1,1),(20,NULL,NULL,'2022-02-05',3,'Acquisto cerotti Diclofenac Farmacia Castelnuovo per Flavio',-15.90,1,2),(21,NULL,NULL,'2022-02-05',1,'Spesa alimentari ortoval (Silvia)',-28.00,1,1),(22,NULL,NULL,'2022-02-04',4,'Acquisto casalinghi e divertimenti Giulio',-12.62,1,1),(23,NULL,NULL,'2022-02-04',1,'Acquisto pesce Dallagiacoma',-45.86,1,1),(24,NULL,NULL,'2022-02-03',3,'Acquisto Lasonil e aspirina Farmacia comunale Castelnuovo',-15.45,1,1),(25,NULL,NULL,'2022-02-02',5,'Sigarette Flavio',-48.00,1,2),(26,NULL,NULL,'2022-02-02',1,'Spesa alimentari Daniele',-32.40,1,1),(27,NULL,NULL,'2022-02-01',19,'Addebito Iliad SIM Paola',-5.99,1,3),(28,NULL,NULL,'2022-02-16',6,'Abbonamento ad Audible',-9.99,1,1),(29,NULL,NULL,'2022-02-14',1,'Spesa all\'Aldi',-8.68,1,1),(31,NULL,NULL,'2022-02-01',12,'Affitto Cadine mese di Febbraio',600.00,1,1),(32,NULL,NULL,'2022-02-01',12,'Anticipo spese condominio',60.00,1,1),(33,NULL,NULL,'2022-02-17',21,'Pieno (serbatoio a metà) gasolio TIPO',-47.55,1,2); -/*!40000 ALTER TABLE `movimentis` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `password_resets` --- - -DROP TABLE IF EXISTS `password_resets`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `password_resets` ( - `email` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `token` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `created_at` timestamp NULL DEFAULT NULL, - KEY `password_resets_email_index` (`email`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `password_resets` --- - -LOCK TABLES `password_resets` WRITE; -/*!40000 ALTER TABLE `password_resets` DISABLE KEYS */; -/*!40000 ALTER TABLE `password_resets` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `personal_access_tokens` --- - -DROP TABLE IF EXISTS `personal_access_tokens`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `personal_access_tokens` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT, - `tokenable_type` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `tokenable_id` bigint unsigned NOT NULL, - `name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `token` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL, - `abilities` text COLLATE utf8mb4_unicode_ci, - `last_used_at` timestamp NULL DEFAULT NULL, - `created_at` timestamp NULL DEFAULT NULL, - `updated_at` timestamp NULL DEFAULT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `personal_access_tokens_token_unique` (`token`), - KEY `personal_access_tokens_tokenable_type_tokenable_id_index` (`tokenable_type`,`tokenable_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `personal_access_tokens` --- - -LOCK TABLES `personal_access_tokens` WRITE; -/*!40000 ALTER TABLE `personal_access_tokens` DISABLE KEYS */; -/*!40000 ALTER TABLE `personal_access_tokens` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `tags` --- - -DROP TABLE IF EXISTS `tags`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `tags` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT, - `created_at` timestamp NULL DEFAULT NULL, - `updated_at` timestamp NULL DEFAULT NULL, - `tag_name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `tags` --- - -LOCK TABLES `tags` WRITE; -/*!40000 ALTER TABLE `tags` DISABLE KEYS */; -INSERT INTO `tags` VALUES (1,NULL,NULL,'Casa'),(2,NULL,NULL,'Flavio'),(3,NULL,NULL,'Paola'),(4,NULL,NULL,'Giulio'); -/*!40000 ALTER TABLE `tags` ENABLE KEYS */; -UNLOCK TABLES; - --- --- Table structure for table `users` --- - -DROP TABLE IF EXISTS `users`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `users` ( - `id` bigint unsigned NOT NULL AUTO_INCREMENT, - `name` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `email` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `email_verified_at` timestamp NULL DEFAULT NULL, - `password` varchar(255) COLLATE utf8mb4_unicode_ci NOT NULL, - `remember_token` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL, - `created_at` timestamp NULL DEFAULT NULL, - `updated_at` timestamp NULL DEFAULT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `users_email_unique` (`email`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Dumping data for table `users` --- - -LOCK TABLES `users` WRITE; -/*!40000 ALTER TABLE `users` DISABLE KEYS */; -INSERT INTO `users` VALUES (1,'Flavio Barachino','flavio.barachino@gmail.com',NULL,'$2y$10$cR7SkowifYAkxY0YXDvmj.rHF.t.n3cshgUbfCgaSLEFkW/Jyz.wa',NULL,'2022-02-14 06:08:16','2022-02-14 06:08:16'); -/*!40000 ALTER TABLE `users` ENABLE KEYS */; -UNLOCK TABLES; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2022-02-20 10:21:13 From 840d98da3aa8ffdca43785e8b216081058d72919 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Mon, 15 May 2023 18:40:28 +0200 Subject: [PATCH 26/41] #1 - sistemazione del model Movimenti.php --- app/Models/Movimenti.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Models/Movimenti.php b/app/Models/Movimenti.php index 5e7c3c0..8631dac 100644 --- a/app/Models/Movimenti.php +++ b/app/Models/Movimenti.php @@ -155,8 +155,8 @@ class Movimenti extends Model $collection = (new FastExcel)->import($filename, function ($line){ if($line['Data valuta']) { - Movimenti::insEntrata([ - 'mov_data'=>Movimenti::dateFormat(0,$line['Data valuta']), + self::insEntrata([ + 'mov_data'=>self::dateFormat(0,$line['Data valuta']), 'mov_fk_categoria'=>1, 'mov_descrizione'=>$line['Descrizione operazione'], 'mov_importo'=>trim(str_replace(',','.',(str_replace('.','',str_replace('€', '', $line['Importo']))))), @@ -179,7 +179,7 @@ class Movimenti extends Model if($line['DARE']<>'') { $dati=[ - 'mov_data'=>Movimenti::dateFormat(0,$line['VALUTA']), + 'mov_data'=>self::dateFormat(0,$line['VALUTA']), 'mov_fk_categoria'=>1, 'mov_descrizione'=>$line['DESCRIZIONE OPERAZIONE'], 'mov_importo'=>'-'.trim(str_replace(',','.',(str_replace('.','',$line['DARE'])))), @@ -190,7 +190,7 @@ class Movimenti extends Model if($line['AVERE']<>'') { $dati=[ - 'mov_data'=>Movimenti::dateFormat(0,$line['VALUTA']), + 'mov_data'=>self::dateFormat(0,$line['VALUTA']), 'mov_fk_categoria'=>1, 'mov_descrizione'=>$line['DESCRIZIONE OPERAZIONE'], 'mov_importo'=>trim(str_replace(',','.',(str_replace('.','',$line['AVERE'])))), @@ -198,7 +198,7 @@ class Movimenti extends Model 'userid'=>1, ]; } - Movimenti::insEntrata($dati); + self::insEntrata($dati); } }); } From b9325820e4dfac5bfc75f5dd65e924159bcb1467 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Tue, 16 May 2023 13:40:03 +0200 Subject: [PATCH 27/41] Aggiunto riga totali alla lista dei dettagli di progetto e rimanenza da budget su riepilogo dettaglio progetto --- app/Http/Controllers/ProgettiController.php | 3 +- app/Models/RigaProgetto.php | 5 ++ resources/views/layouts/dashboard.blade.php | 51 +------------------- resources/views/progetti/dettaglio.blade.php | 21 ++++++-- 4 files changed, 26 insertions(+), 54 deletions(-) diff --git a/app/Http/Controllers/ProgettiController.php b/app/Http/Controllers/ProgettiController.php index 176ad13..d5ef284 100644 --- a/app/Http/Controllers/ProgettiController.php +++ b/app/Http/Controllers/ProgettiController.php @@ -46,7 +46,8 @@ class ProgettiController extends Controller $progetto_id=$id['id']; $progetto = Progetti::getProgettoById($progetto_id); $righe = RigaProgetto::getRigheProgetto($progetto_id); - return view('progetti.dettaglio',['dettaglio'=>$progetto, 'righe'=>$righe,]); + $costo_tot=RigaProgetto::getCostoRighe($progetto_id); + return view('progetti.dettaglio',['dettaglio'=>$progetto, 'righe'=>$righe, 'tot'=>$costo_tot]); //dd($righe); } diff --git a/app/Models/RigaProgetto.php b/app/Models/RigaProgetto.php index 7b2f4a2..d076c6b 100644 --- a/app/Models/RigaProgetto.php +++ b/app/Models/RigaProgetto.php @@ -30,4 +30,9 @@ class RigaProgetto extends Model { DB::table('riga_progettos')->delete($id); } + + public static function getCostoRighe($id) + { + return DB::table('riga_progettos')->select(DB::raw('SUM(prezzo) as costo'))->where('fk_id_progetto','=',$id)->get(); + } } diff --git a/resources/views/layouts/dashboard.blade.php b/resources/views/layouts/dashboard.blade.php index 77585cb..84a24cd 100644 --- a/resources/views/layouts/dashboard.blade.php +++ b/resources/views/layouts/dashboard.blade.php @@ -51,56 +51,7 @@
-
- - - - - - - +
@endsection diff --git a/resources/views/progetti/dettaglio.blade.php b/resources/views/progetti/dettaglio.blade.php index c037c3e..828804c 100644 --- a/resources/views/progetti/dettaglio.blade.php +++ b/resources/views/progetti/dettaglio.blade.php @@ -18,6 +18,8 @@
Dettaglio Progetto
+ @foreach($tot as $totale) + @endforeach @foreach($dettaglio ?? '' as $progetto)
Nome:
@@ -53,9 +55,17 @@
-
Budget
-
- € {{ $progetto->budget }} +
Budget
+
+ {{ $progetto->budget }} +
+
Costi
+
+ {{ $totale->costo}} +
+
Rimanenza
+
+ {{ $progetto->budget - $totale->costo}}
Coordinatore
@@ -160,6 +170,11 @@ @endif @endforeach + + Totale + + {{ $totale->costo}} € +
From 8c1245bfafd35a6a6f8cd48219193d6196715dab Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Tue, 16 May 2023 16:15:45 +0200 Subject: [PATCH 28/41] Lavorazioni di adattamento e modifica su parte progetti --- app/Models/RigaProgetto.php | 2 +- resources/views/auto/detail.blade.php | 6 +++++- resources/views/progetti/dettaglio.blade.php | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/Models/RigaProgetto.php b/app/Models/RigaProgetto.php index d076c6b..ad9a1f5 100644 --- a/app/Models/RigaProgetto.php +++ b/app/Models/RigaProgetto.php @@ -12,7 +12,7 @@ class RigaProgetto extends Model public static function getRigheProgetto($progetto_id) { - return DB::table('riga_progettos')->where('fk_id_progetto','=',$progetto_id)->get(); + return DB::table('riga_progettos')->where('fk_id_progetto','=',$progetto_id)->orderBy('data','asc')->get(); } public static function saveRiga($args) diff --git a/resources/views/auto/detail.blade.php b/resources/views/auto/detail.blade.php index 832f91f..a79a8b2 100644 --- a/resources/views/auto/detail.blade.php +++ b/resources/views/auto/detail.blade.php @@ -90,7 +90,11 @@ {{ $operazioni->data; }} {{ $operazioni->km; }} - {{ $revisione[$operazioni->id][0]->superata; }} + @if($revisione[$operazioni->id][0]->superata >0) + Superata + @else + Non superata + @endif {{ $revisione[$operazioni->id][0]->centrorevisione; }} {{ $revisione[$operazioni->id][0]->descrizione; }} {{ $revisione[$operazioni->id][0]->dataproxrevisione; }} diff --git a/resources/views/progetti/dettaglio.blade.php b/resources/views/progetti/dettaglio.blade.php index 828804c..e4f24af 100644 --- a/resources/views/progetti/dettaglio.blade.php +++ b/resources/views/progetti/dettaglio.blade.php @@ -171,9 +171,9 @@ @endif @endforeach - Totale + Totale - {{ $totale->costo}} € + {{ $totale->costo}} € From e232f571a3e08a9596de05711768666f97b197c2 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Wed, 17 May 2023 18:23:51 +0200 Subject: [PATCH 29/41] =?UTF-8?q?=20Agginto=20funzionalit=C3=A0=20di=20pop?= =?UTF-8?q?up=20mosale=20per=20modifica=20riga=20progetto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TODO: Post del form ancora non funzionante. --- .../Controllers/RigaProgettoController.php | 8 ++ app/Models/RigaProgetto.php | 5 ++ resources/views/progetti/demomodal.blade.php | 66 ++++++++++++++++ resources/views/progetti/dettaglio.blade.php | 79 +++++++++++++++++-- resources/views/progetti/editriga.blade.php | 45 +++++++++++ routes/admin.php | 1 + 6 files changed, 198 insertions(+), 6 deletions(-) create mode 100644 resources/views/progetti/demomodal.blade.php create mode 100644 resources/views/progetti/editriga.blade.php diff --git a/app/Http/Controllers/RigaProgettoController.php b/app/Http/Controllers/RigaProgettoController.php index e491569..ab2e0b6 100644 --- a/app/Http/Controllers/RigaProgettoController.php +++ b/app/Http/Controllers/RigaProgettoController.php @@ -17,4 +17,12 @@ class RigaProgettoController extends Controller // Ritorna alla pagina dei dettagli del progetto return redirect('/admin/progetti/detail/?id='.$id_progetto); } + + public function editRiga($id) + { + // modifica della riga inserita + //return redirect('/admin/progetti/editDetail'); + $data=RigaProgetto::getRigaById($id); + return $data; + } } diff --git a/app/Models/RigaProgetto.php b/app/Models/RigaProgetto.php index ad9a1f5..2e07f7d 100644 --- a/app/Models/RigaProgetto.php +++ b/app/Models/RigaProgetto.php @@ -35,4 +35,9 @@ class RigaProgetto extends Model { return DB::table('riga_progettos')->select(DB::raw('SUM(prezzo) as costo'))->where('fk_id_progetto','=',$id)->get(); } + + public static function getRigaById($id) + { + return DB::table('riga_progettos')->where('id','=',$id)->get(); + } } diff --git a/resources/views/progetti/demomodal.blade.php b/resources/views/progetti/demomodal.blade.php new file mode 100644 index 0000000..04ccd0c --- /dev/null +++ b/resources/views/progetti/demomodal.blade.php @@ -0,0 +1,66 @@ + + + + Bootstrap Modal Example in Laravel - Websolutionstuff + + + + + +
+

Bootstrap Modal Example in Laravel - Websolutionstuff

+
+

+ + + + + + + + + + + + + + + + + + + + + + + + +
No.Name Example
1Admin
2Test
+
+
+ + + + + + \ No newline at end of file diff --git a/resources/views/progetti/dettaglio.blade.php b/resources/views/progetti/dettaglio.blade.php index e4f24af..3fe9677 100644 --- a/resources/views/progetti/dettaglio.blade.php +++ b/resources/views/progetti/dettaglio.blade.php @@ -159,7 +159,8 @@ {{ $riga->descrizione }} {{ $riga->ore }} {{ $riga->prezzo }} - X + X + @else @@ -170,18 +171,69 @@ @endif @endforeach - - Totale - - {{ $totale->costo}} € - + + + + + + + +
Totale{{ $totale->costo}} €
+ @endsection @section('script') @@ -198,6 +250,21 @@ $("#dettaglio").click(function(){ $('[hidable]').toggle(); }); + + $(document).on('click','.open_modal',function(){ + var url = "detail/edit"; + var riga_id= $(this).val(); + $.get(url + '/' + riga_id, function (data) { + //success data + console.log(data); + console.log(data[0].descrizione); + $('#data_u').val(data[0].data); + $('#desc_u').val(data[0].descrizione); + $('#ore_u').val(data[0].ore); + $('#prezzo_u').val(data[0].prezzo); + $('#myModal').modal('show'); + }) + }); }); @endsection \ No newline at end of file diff --git a/resources/views/progetti/editriga.blade.php b/resources/views/progetti/editriga.blade.php new file mode 100644 index 0000000..56c2c53 --- /dev/null +++ b/resources/views/progetti/editriga.blade.php @@ -0,0 +1,45 @@ +@extends('progetti.dettaglio') + \ No newline at end of file diff --git a/routes/admin.php b/routes/admin.php index 7bacf8f..cb46812 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -114,6 +114,7 @@ Route::get('/', [MovimentiController::class,'dashboard']); Route::get('progetti/delete_row/{id_row}/return/{id_prog}',[RigaProgettoController::class, 'deleterow']); Route::get('progetti/detail', [ProgettiController::class, 'dettaglioProgetto'])->name('detail'); Route::post('progetti/detail', [ProgettiController::class, 'inserisciTask']); + Route::get('progetti/detail/edit/{id}', [RigaProgettoController::class, 'editRiga'])->name('detailedit'); /// TEST routes Route::get('fullcalendar', [FullCalenderController::class, 'index']); From 20c184ef7b4fc7a3892aaaca18985879b465e79b Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Wed, 17 May 2023 21:20:58 +0200 Subject: [PATCH 30/41] Sistemazione POST dell'update della riga del progetto --- app/Http/Controllers/RigaProgettoController.php | 7 +++++++ app/Models/RigaProgetto.php | 12 +++++++++++- resources/views/progetti/dettaglio.blade.php | 7 +++++-- routes/admin.php | 3 ++- 4 files changed, 25 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/RigaProgettoController.php b/app/Http/Controllers/RigaProgettoController.php index ab2e0b6..0830f64 100644 --- a/app/Http/Controllers/RigaProgettoController.php +++ b/app/Http/Controllers/RigaProgettoController.php @@ -25,4 +25,11 @@ class RigaProgettoController extends Controller $data=RigaProgetto::getRigaById($id); return $data; } + + public function updateRiga(Request $data) + { + RigaProgetto::updateRiga($data); + $id_progetto=$data['fk_id_progetto']; + return redirect('/admin/progetti/detail/?id='.$id_progetto); + } } diff --git a/app/Models/RigaProgetto.php b/app/Models/RigaProgetto.php index 2e07f7d..87e65e0 100644 --- a/app/Models/RigaProgetto.php +++ b/app/Models/RigaProgetto.php @@ -12,7 +12,7 @@ class RigaProgetto extends Model public static function getRigheProgetto($progetto_id) { - return DB::table('riga_progettos')->where('fk_id_progetto','=',$progetto_id)->orderBy('data','asc')->get(); + return DB::table('riga_progettos')->where('fk_id_progetto','=',$progetto_id)->orderBy('data')->get(); } public static function saveRiga($args) @@ -40,4 +40,14 @@ class RigaProgetto extends Model { return DB::table('riga_progettos')->where('id','=',$id)->get(); } + + public static function updateRiga($data) + { + DB::table('riga_progettos')->where('id','=',$data['idriga'])->update([ + 'data'=>$data['data'], + 'descrizione'=>$data['descrizione'], + 'prezzo'=>$data['prezzo'], + 'ore'=>$data['ore'], + ]); + } } diff --git a/resources/views/progetti/dettaglio.blade.php b/resources/views/progetti/dettaglio.blade.php index 3fe9677..2ec4127 100644 --- a/resources/views/progetti/dettaglio.blade.php +++ b/resources/views/progetti/dettaglio.blade.php @@ -192,7 +192,7 @@
Modifica Riga
-
+
@csrf @@ -222,7 +222,8 @@
- + +
@@ -262,6 +263,8 @@ $('#desc_u').val(data[0].descrizione); $('#ore_u').val(data[0].ore); $('#prezzo_u').val(data[0].prezzo); + $('#id_progetto_u').val(data[0].fk_id_progetto); + $('#idriga').val(data[0].id); $('#myModal').modal('show'); }) }); diff --git a/routes/admin.php b/routes/admin.php index cb46812..da40bbf 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -114,7 +114,8 @@ Route::get('/', [MovimentiController::class,'dashboard']); Route::get('progetti/delete_row/{id_row}/return/{id_prog}',[RigaProgettoController::class, 'deleterow']); Route::get('progetti/detail', [ProgettiController::class, 'dettaglioProgetto'])->name('detail'); Route::post('progetti/detail', [ProgettiController::class, 'inserisciTask']); - Route::get('progetti/detail/edit/{id}', [RigaProgettoController::class, 'editRiga'])->name('detailedit'); + Route::get('progetti/detail/edit/{id}', [RigaProgettoController::class, 'editRiga']); + Route::post('progetti/rigaupdate', [RigaProgettoController::class, 'updateRiga']); /// TEST routes Route::get('fullcalendar', [FullCalenderController::class, 'index']); From ec46a6c79636b29e3ebb7cac8554598c1d169527 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Thu, 18 May 2023 09:23:22 +0200 Subject: [PATCH 31/41] alcune piccole modifiche estetiche al codice della modifica delle righe di progetto --- resources/views/progetti/dettaglio.blade.php | 44 ++++++++++++-------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/resources/views/progetti/dettaglio.blade.php b/resources/views/progetti/dettaglio.blade.php index 2ec4127..4d75b6f 100644 --- a/resources/views/progetti/dettaglio.blade.php +++ b/resources/views/progetti/dettaglio.blade.php @@ -159,7 +159,10 @@ {{ $riga->descrizione }} {{ $riga->ore }} {{ $riga->prezzo }} - X + X +   + + @else @@ -186,55 +189,60 @@
-
+ @endsection @@ -63,6 +95,19 @@ $('#categorie').DataTable({ responsive: true }); + + $(document).on('click','.open_modal',function(){ + var url = "catmodify"; + var riga_id= $(this).val(); + $.get(url + '/' + riga_id, function (data) { + //success data + console.log(data); + console.log(data[0].descrizione); + $('#categoria').val(data[0].cat_name); + $('#id').val(data[0].id); + $('#myModal').modal('show'); + }); + }); }); @endsection From 377b41c629c5a1d1d73548ca6bddb357d3949eeb Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Fri, 19 May 2023 09:55:37 +0200 Subject: [PATCH 34/41] Popup Modifica categorie aggiornato e funzionante --- app/Http/Controllers/CategorieController.php | 16 +++++++++---- .../views/conti/categorie/list.blade.php | 23 ++++++++++--------- routes/admin.php | 2 +- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/app/Http/Controllers/CategorieController.php b/app/Http/Controllers/CategorieController.php index 982007d..3ac1a0d 100644 --- a/app/Http/Controllers/CategorieController.php +++ b/app/Http/Controllers/CategorieController.php @@ -28,17 +28,17 @@ class CategorieController extends Controller Categorie::deleteById($request['id']); return redirect(route('categorie')); } - public function updateCategorie(Request $request) + /*public function updateCategorie(Request $request) { $id=$request['id']; $categorie = Categorie::getById($id); - /* return view('conti.categorie.update', + return view('conti.categorie.update', [ 'categorie'=> $categorie, - ]);*/ - return json_encode($categorie); - } + ]); + + }*/ public function updatePostCategorie(Request $request) { @@ -52,4 +52,10 @@ class CategorieController extends Controller $categorie=Categorie::list(); return response()->json($categorie); } + + public function updateCategorie($id) + { + $categorie = Categorie::getById($id); + return json_encode($categorie); + } } diff --git a/resources/views/conti/categorie/list.blade.php b/resources/views/conti/categorie/list.blade.php index 23ac2bd..37e4874 100644 --- a/resources/views/conti/categorie/list.blade.php +++ b/resources/views/conti/categorie/list.blade.php @@ -66,17 +66,18 @@
Modifica categorie
- @foreach($categorie as $categoria) @csrf + + @csrf
- +
- + - @endforeach +
@@ -99,12 +100,12 @@ $(document).on('click','.open_modal',function(){ var url = "catmodify"; var riga_id= $(this).val(); - $.get(url + '/' + riga_id, function (data) { + $.getJSON(url + '/' + riga_id, function (data) { //success data - console.log(data); - console.log(data[0].descrizione); - $('#categoria').val(data[0].cat_name); - $('#id').val(data[0].id); + console.log(data[0]); + console.log(data[0].cat_name); + $('#H_cat_cat_name').val(data[0].cat_name); + $('#H_cat_id').val(data[0].id); $('#myModal').modal('show'); }); }); diff --git a/routes/admin.php b/routes/admin.php index 5fd8dc5..316e5e4 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -49,7 +49,7 @@ Route::get('/', [MovimentiController::class,'dashboard']); Route::get('categorie', [CategorieController::class,'listCategorie'])->name('categorie'); Route::post('categorie', [CategorieController::class,'insCategorie']); Route::get('catdelete', [CategorieController::class,'deleteCategorie']); - Route::get('catmodify', [CategorieController::class,'updateCategorie']); + Route::get('catmodify/{id}', [CategorieController::class,'updateCategorie']); Route::post('catmodify', [CategorieController::class,'updatePostCategorie']); // TAGS Route::get('tags', [TagController::class,'listTags'])->name('tags'); From b8fd41357fcd428160b8a96a722b3fef34799b3a Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Fri, 19 May 2023 10:17:51 +0200 Subject: [PATCH 35/41] Popup Modifica Tags aggiornato e funzionante --- app/Http/Controllers/TagController.php | 8 +- resources/views/conti/tags/list.blade.php | 113 +++++++++++++++------- routes/admin.php | 2 +- 3 files changed, 79 insertions(+), 44 deletions(-) diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index db5684e..7c159f8 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -25,14 +25,10 @@ class TagController extends Controller return view('components.calendar'); } - public function updateTag(Request $request) + public function updateTag($id) { - $id=$request['id']; $tags=tag::getById($id); - return view('conti.tags.update', - [ - 'tags'=> $tags, - ]); + return json_encode($tags); } public function updatePostTag(Request $request) diff --git a/resources/views/conti/tags/list.blade.php b/resources/views/conti/tags/list.blade.php index b922bf8..7fc5496 100644 --- a/resources/views/conti/tags/list.blade.php +++ b/resources/views/conti/tags/list.blade.php @@ -1,54 +1,93 @@ -@extends('admin') -@section('content') +@extends('admin') @section('content')
-
-

Lista dei tag

-
-
+
+

Lista dei tag

+
+
- @csrf -
- - -
+ @csrf +
+ +
-
- - - - - - - - - @foreach($tags as $tag) - - - - - @endforeach - - -
TagAzione
{{ $tag->tag_name; }} -   -   -
-
+
+ + + + + + + + + @foreach($tags as $tag) + + + + + @endforeach + + +
TagAzione
{{ + $tag->tag_name; }}   
+
+
+ + - - -@endsection -@section('script') +@endsection @section('script') @endsection diff --git a/routes/admin.php b/routes/admin.php index 316e5e4..b83b245 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -54,7 +54,7 @@ Route::get('/', [MovimentiController::class,'dashboard']); // TAGS Route::get('tags', [TagController::class,'listTags'])->name('tags'); Route::post('tags', [TagController::class,'insTags']); - Route::get('tagmodify', [TagController::class,'updateTag']); + Route::get('tagmodify/{id}', [TagController::class,'updateTag']); Route::post('tagmodify', [TagController::class,'updatePostTag']); // CONSUMI Route::get('letturegas', [ContatoreGasController::class,'listLettureGas'])->name('gas'); From af01e3fab4d496e9536cc9c3937bfd777a526a1b Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Fri, 19 May 2023 11:39:25 +0200 Subject: [PATCH 36/41] Alcune note (TODO) su realizzazione inserimento nuovo movimento --- app/Http/Controllers/MovimentiController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/MovimentiController.php b/app/Http/Controllers/MovimentiController.php index 8fc49bf..b83a886 100644 --- a/app/Http/Controllers/MovimentiController.php +++ b/app/Http/Controllers/MovimentiController.php @@ -13,8 +13,8 @@ class MovimentiController extends Controller { // Gestione dei movimenti public static function newMovimenti() { - $categorie=Categorie::list(); - $tags=tag::getList(); + $categorie=Categorie::list(); // TODO: da risolvere con jquery nella pagina blade conti.movimenti.list + $tags=tag::getList(); // TODO: da risolvere con jquery nella pagina blade conti.movimenti.list (spiegazione su https://library.webschool.com/lezione/guida-jquery-recuperare-dati-da-php-con-json-2564.html ) return view('conti.movimenti.new',[ 'categorie'=>$categorie, 'tags'=>$tags, From 447dcac84c211e01aa46f1372349fa8f0d680c47 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Fri, 19 May 2023 13:39:58 +0200 Subject: [PATCH 37/41] Popup modale Nuova Spesa e Nuova Entrata da lista movimenti aggiornato e funzionante --- app/Http/Controllers/CategorieController.php | 14 +-- .../views/conti/movimenti/list.blade.php | 97 ++++++++++++++++++- routes/admin.php | 5 + 3 files changed, 103 insertions(+), 13 deletions(-) diff --git a/app/Http/Controllers/CategorieController.php b/app/Http/Controllers/CategorieController.php index 3ac1a0d..7fbe00e 100644 --- a/app/Http/Controllers/CategorieController.php +++ b/app/Http/Controllers/CategorieController.php @@ -28,17 +28,7 @@ class CategorieController extends Controller Categorie::deleteById($request['id']); return redirect(route('categorie')); } - /*public function updateCategorie(Request $request) - { - $id=$request['id']; - - $categorie = Categorie::getById($id); - return view('conti.categorie.update', - [ - 'categorie'=> $categorie, - ]); - - }*/ + public function updatePostCategorie(Request $request) { @@ -50,7 +40,7 @@ class CategorieController extends Controller public function apiList() { $categorie=Categorie::list(); - return response()->json($categorie); + return json_encode($categorie); } public function updateCategorie($id) diff --git a/resources/views/conti/movimenti/list.blade.php b/resources/views/conti/movimenti/list.blade.php index 6df35a2..0f9f8c2 100644 --- a/resources/views/conti/movimenti/list.blade.php +++ b/resources/views/conti/movimenti/list.blade.php @@ -12,7 +12,10 @@ Lista movimenti
-
Nuova Spesa Nuova Entrata
+
+   +
@@ -49,6 +52,72 @@ + @endsection @section('script') @@ -58,7 +127,33 @@ "responsive": true, "order": [[0,"desc"]] }); + $(document).on('click','.open_modal_spesa',function(){ + $('#myModal').modal('show'); + $('.panel-heading').append(' spesa'); + $('#form').attr('action','movimentis'); + }); + $(document).on('click','.open_modal_entrata',function(){ + $('#myModal').modal('show'); + $('.panel-heading').append(' entrata'); + $('#form').attr('action','movimentie'); + }); + $.getJSON("service/catlist",{},function(data){ + $.each(data,function(i,item){ + $("select[name='mov_fk_categoria']").append( + new Option(item.cat_name,item.id) + )} + ); + }); + + $.getJSON("service/taglist",{},function(data){ + $.each(data,function(i,item){ + $("select[name='mov_fk_tags']").append( + new Option(item.tag_name,item.id) + )} + ); + }); }); + @endsection diff --git a/routes/admin.php b/routes/admin.php index b83b245..b634545 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -51,6 +51,11 @@ Route::get('/', [MovimentiController::class,'dashboard']); 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 Route::get('tags', [TagController::class,'listTags'])->name('tags'); Route::post('tags', [TagController::class,'insTags']); From 7d068838eacfe5773a5da02e600657a91d545914 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Fri, 19 May 2023 15:44:12 +0200 Subject: [PATCH 38/41] Popup modale per modifica movimento da lista movimenti aggiornato e funzionante --- app/Http/Controllers/MovimentiController.php | 11 +++++--- .../views/conti/movimenti/list.blade.php | 27 +++++++++++++++++-- routes/admin.php | 2 +- 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/MovimentiController.php b/app/Http/Controllers/MovimentiController.php index b83a886..7ccd73d 100644 --- a/app/Http/Controllers/MovimentiController.php +++ b/app/Http/Controllers/MovimentiController.php @@ -119,7 +119,7 @@ class MovimentiController extends Controller ]); } - public function updateMovimenti(Request $request) + /*public function updateMovimenti(Request $request) { $id=$request['id']; $mov=Movimenti::getMovimentoById($id); @@ -131,7 +131,7 @@ class MovimentiController extends Controller 'movimenti'=> $mov, 'tags'=>$tags, ]); - } + }*/ public function updatePostMovimenti(Request $request) { @@ -320,5 +320,10 @@ class MovimentiController extends Controller { return redirect('/admin/reportbudget/'.$request['anno']); } - + + public function updateMovimenti($id) + { + $mov=Movimenti::getMovimentoById($id); + return json_encode($mov); + } } diff --git a/resources/views/conti/movimenti/list.blade.php b/resources/views/conti/movimenti/list.blade.php index 0f9f8c2..b1900c9 100644 --- a/resources/views/conti/movimenti/list.blade.php +++ b/resources/views/conti/movimenti/list.blade.php @@ -36,7 +36,7 @@
{{ $movimento->mov_descrizione; }} € {{ $movimento->mov_importo; }} -   +       @@ -136,7 +136,30 @@ $('#myModal').modal('show'); $('.panel-heading').append(' entrata'); $('#form').attr('action','movimentie'); - }); + }); + $(document).on('click','.open_modal_modifica',function(){ + var url = "movmodify"; + var riga_id= $(this).val(); + $.getJSON(url + '/' + riga_id, function (data) { + // success data + console.log(data[0]); + $('#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/movmodify'); + $('#form').append(''); + }); + }); $.getJSON("service/catlist",{},function(data){ $.each(data,function(i,item){ $("select[name='mov_fk_categoria']").append( diff --git a/routes/admin.php b/routes/admin.php index b634545..b4d22de 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -38,7 +38,7 @@ Route::get('/', [MovimentiController::class,'dashboard']); 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('movmodify',[MovimentiController::class,'updateMovimenti']); + Route::get('movmodify/{id}',[MovimentiController::class,'updateMovimenti']); Route::post('movmodify',[MovimentiController::class,'updatePostMovimenti']); Route::get('movdelete',[MovimentiController::class,'deleteMovimenti']); Route::get('reportbudget/{anno?}',[MovimentiController::class,'reportCategorieAnno'])->name('budget'); From d120e5eadc9acdd3b74665a0cfd442a941f32540 Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Fri, 19 May 2023 16:18:18 +0200 Subject: [PATCH 39/41] Popup modale per inserimento nuova categoria --- .../views/conti/categorie/list.blade.php | 52 ++++++++++++------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/resources/views/conti/categorie/list.blade.php b/resources/views/conti/categorie/list.blade.php index 37e4874..cd13f08 100644 --- a/resources/views/conti/categorie/list.blade.php +++ b/resources/views/conti/categorie/list.blade.php @@ -7,17 +7,7 @@
-
- @csrf -
- - - -
- - -
- +
@@ -86,18 +76,36 @@
+ @endsection @section('script') @endsection From 9bd14a38309cdc0081d7c5a61d626c4dd5ab082a Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Fri, 19 May 2023 16:30:56 +0200 Subject: [PATCH 40/41] Popup modale per inserimento nuovo Tag --- resources/views/conti/tags/list.blade.php | 42 ++++++++++++++++------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/resources/views/conti/tags/list.blade.php b/resources/views/conti/tags/list.blade.php index 7fc5496..ad4ed9b 100644 --- a/resources/views/conti/tags/list.blade.php +++ b/resources/views/conti/tags/list.blade.php @@ -6,14 +6,7 @@
-
- @csrf -
- -
- -
+
@@ -67,11 +60,30 @@ + + + - - -@endsection @section('script') - -@endsection + @endsection \ No newline at end of file From 62bf66f50e51cbcce5ef461449070fcd64a2facf Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Fri, 19 May 2023 16:47:00 +0200 Subject: [PATCH 41/41] =?UTF-8?q?rinominato=20views=20che=20non=20dovrebbe?= =?UTF-8?q?ro=20pi=C3=B9=20servire?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/conti/categorie/{update.blade.php => _update.blade.php} | 0 .../views/conti/movimenti/{update.blade.php => _update.blade.php} | 0 .../views/conti/tags/{update.blade.php => _update.blade.php} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename resources/views/conti/categorie/{update.blade.php => _update.blade.php} (100%) rename resources/views/conti/movimenti/{update.blade.php => _update.blade.php} (100%) rename resources/views/conti/tags/{update.blade.php => _update.blade.php} (100%) diff --git a/resources/views/conti/categorie/update.blade.php b/resources/views/conti/categorie/_update.blade.php similarity index 100% rename from resources/views/conti/categorie/update.blade.php rename to resources/views/conti/categorie/_update.blade.php diff --git a/resources/views/conti/movimenti/update.blade.php b/resources/views/conti/movimenti/_update.blade.php similarity index 100% rename from resources/views/conti/movimenti/update.blade.php rename to resources/views/conti/movimenti/_update.blade.php diff --git a/resources/views/conti/tags/update.blade.php b/resources/views/conti/tags/_update.blade.php similarity index 100% rename from resources/views/conti/tags/update.blade.php rename to resources/views/conti/tags/_update.blade.php