From a827342a304bb4d30f37fda08a63eab04f8f8e21 Mon Sep 17 00:00:00 2001 From: FlavioBarachino Date: Thu, 27 Jul 2023 10:54:55 +0200 Subject: [PATCH 1/9] =?UTF-8?q?aggiunta=20funzionalit=C3=A0=20draggable=20?= =?UTF-8?q?su=20div=20in=20dashboard,=20creato=20nuovo=20MVC=20per=20"gest?= =?UTF-8?q?ione=20contratti"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/ContrattiController.php | 10 +++++ app/Http/Controllers/DocumentiController.php | 5 +++ app/Models/Contratti.php | 11 +++++ ...3_07_27_083822_create_contrattis_table.php | 41 +++++++++++++++++++ public/js/app/dashboard.js | 14 ++----- resources/views/admin.blade.php | 9 ++-- resources/views/documenti/lista.blade.php | 26 ++++++++++++ resources/views/layouts/dashboard.blade.php | 16 ++++---- 8 files changed, 109 insertions(+), 23 deletions(-) create mode 100644 app/Http/Controllers/ContrattiController.php create mode 100644 app/Models/Contratti.php create mode 100644 database/migrations/2023_07_27_083822_create_contrattis_table.php create mode 100644 resources/views/documenti/lista.blade.php diff --git a/app/Http/Controllers/ContrattiController.php b/app/Http/Controllers/ContrattiController.php new file mode 100644 index 0000000..d0bff62 --- /dev/null +++ b/app/Http/Controllers/ContrattiController.php @@ -0,0 +1,10 @@ +$documenti ]); } + + public function listaDocumenti() + { + return view('documenti.lista',['data'=>Documenti::all()]); + } } diff --git a/app/Models/Contratti.php b/app/Models/Contratti.php new file mode 100644 index 0000000..070af1b --- /dev/null +++ b/app/Models/Contratti.php @@ -0,0 +1,11 @@ +id(); + $table->timestamps(); + $table->string('numero', 100)->nullable()->default('N/D'); + $table->string('nome', 100)->nullable(); + $table->date('datainizio')->nullable()->default(new DateTime()); + $table->date('datatermine')->nullable()->default(new DateTime()); + $table->string('fornitore', 100)->default('text'); + $table->string('tipo', 100)->default('utenze'); + $table->decimal('importo', 5, 2)->nullable()->default(123.45); + $table->date('scadenzapagamento')->nullable()->default(new DateTime()); + $table->string('stato', 100)->default('attivo'); + $table->longText('note')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('contrattis'); + } +} diff --git a/public/js/app/dashboard.js b/public/js/app/dashboard.js index a016277..f979658 100644 --- a/public/js/app/dashboard.js +++ b/public/js/app/dashboard.js @@ -1,16 +1,8 @@ $(document).ready(function() { - $('#categorie').DataTable({ - responsive: true - }); - // Reload del div - /* - $.ajaxSetup({ cache: false }); - setInterval(function() { - $('#mieitask').load('/admin'); - }, 8000); - */ -}); +}); +// Rende spostabili le varie finestre +$(".draggable").draggable(); diff --git a/resources/views/admin.blade.php b/resources/views/admin.blade.php index c962c1d..85f6d1a 100644 --- a/resources/views/admin.blade.php +++ b/resources/views/admin.blade.php @@ -95,20 +95,21 @@ - - + + - + + - + @section('script') diff --git a/resources/views/documenti/lista.blade.php b/resources/views/documenti/lista.blade.php new file mode 100644 index 0000000..fd597af --- /dev/null +++ b/resources/views/documenti/lista.blade.php @@ -0,0 +1,26 @@ +@extends('admin') +@section('content') +
+
+

Lista dei Documenti

+
+
+
+
+
+
+ Lista documenti +
+
+ +
+
+ +
+
+
+
+@endsection +@section('script') + +@endsection \ No newline at end of file diff --git a/resources/views/layouts/dashboard.blade.php b/resources/views/layouts/dashboard.blade.php index b965aef..bb380b7 100644 --- a/resources/views/layouts/dashboard.blade.php +++ b/resources/views/layouts/dashboard.blade.php @@ -8,7 +8,7 @@
@hasanyrole('user|admin') -
+
@@ -31,7 +31,7 @@
-
+
@@ -55,7 +55,7 @@
-
+
@@ -77,7 +77,7 @@
-
+
@@ -106,7 +106,7 @@ @can('tasks')
-
+
Attività da svolgere @@ -139,8 +139,8 @@
-
-
+
+
Avvisi e informazioni
@@ -177,5 +177,5 @@ @endsection @section('script') - + @endsection From d3629f1e7541e2f604a4b769716f2e807650c1c6 Mon Sep 17 00:00:00 2001 From: FlavioBarachino Date: Thu, 27 Jul 2023 11:07:04 +0200 Subject: [PATCH 2/9] rivista migrazione per tabella contratti --- .../2023_07_27_083822_create_contrattis_table.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/database/migrations/2023_07_27_083822_create_contrattis_table.php b/database/migrations/2023_07_27_083822_create_contrattis_table.php index 9528948..1cbc77f 100644 --- a/database/migrations/2023_07_27_083822_create_contrattis_table.php +++ b/database/migrations/2023_07_27_083822_create_contrattis_table.php @@ -16,14 +16,14 @@ class CreateContrattisTable extends Migration Schema::create('contrattis', function (Blueprint $table) { $table->id(); $table->timestamps(); - $table->string('numero', 100)->nullable()->default('N/D'); - $table->string('nome', 100)->nullable(); - $table->date('datainizio')->nullable()->default(new DateTime()); - $table->date('datatermine')->nullable()->default(new DateTime()); + $table->string('numero', 100)->nullable(); + $table->string('nome', 100); + $table->date('datainizio'); + $table->date('datatermine'); $table->string('fornitore', 100)->default('text'); $table->string('tipo', 100)->default('utenze'); - $table->decimal('importo', 5, 2)->nullable()->default(123.45); - $table->date('scadenzapagamento')->nullable()->default(new DateTime()); + $table->decimal('importo', 5, 2); + $table->date('scadenzapagamento'); $table->string('stato', 100)->default('attivo'); $table->longText('note')->nullable(); }); From bd6d7046db45a1d068a4381ae13985fe93b8c17b Mon Sep 17 00:00:00 2001 From: FlavioBarachino Date: Thu, 27 Jul 2023 11:39:28 +0200 Subject: [PATCH 3/9] aggiunto campo per filename in contratti --- .../migrations/2023_07_27_083822_create_contrattis_table.php | 1 + 1 file changed, 1 insertion(+) diff --git a/database/migrations/2023_07_27_083822_create_contrattis_table.php b/database/migrations/2023_07_27_083822_create_contrattis_table.php index 1cbc77f..c4901c7 100644 --- a/database/migrations/2023_07_27_083822_create_contrattis_table.php +++ b/database/migrations/2023_07_27_083822_create_contrattis_table.php @@ -26,6 +26,7 @@ class CreateContrattisTable extends Migration $table->date('scadenzapagamento'); $table->string('stato', 100)->default('attivo'); $table->longText('note')->nullable(); + $table->string('filename',255)->nullable(); }); } From 0668026eb7fa02af36fabff34898cef066abe976 Mon Sep 17 00:00:00 2001 From: FlavioBarachino Date: Thu, 27 Jul 2023 11:49:30 +0200 Subject: [PATCH 4/9] reso draggabile la parte modale di inserimento/modifica movimento --- public/js/app/movimenti.js | 2 ++ resources/views/conti/movimenti/list.blade.php | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/public/js/app/movimenti.js b/public/js/app/movimenti.js index 3364fc8..b5e5461 100644 --- a/public/js/app/movimenti.js +++ b/public/js/app/movimenti.js @@ -11,6 +11,8 @@ $(document).ready(function() { }); }); +$(".draggable").draggable(); + var d = new Date(); var month = d.getMonth()+1; diff --git a/resources/views/conti/movimenti/list.blade.php b/resources/views/conti/movimenti/list.blade.php index e4dc930..dc7f7d9 100644 --- a/resources/views/conti/movimenti/list.blade.php +++ b/resources/views/conti/movimenti/list.blade.php @@ -59,9 +59,9 @@
-