From 8e67e4b6e50d12eca4f1989729913cc0849a5dce Mon Sep 17 00:00:00 2001 From: Flavio Barachino Date: Fri, 31 Mar 2023 08:43:48 +0200 Subject: [PATCH] Sistemazione e pulizia Model-Controller per Categorie, Contatore Enel, ContatoreGas, Documenti e inserimento form per registrazione operazioni auto in movimenti --- app/Http/Controllers/CategorieController.php | 29 ++++++++---------- .../Controllers/ContatoreEnElController.php | 14 +++------ .../Controllers/ContatoreGasController.php | 13 ++++---- app/Http/Controllers/DocumentiController.php | 16 +++------- app/Models/Categorie.php | 30 +++++++++++++++++++ app/Models/Documenti.php | 19 ++++++++++++ app/Models/Operazione.php | 8 +++-- app/Models/contatoreEnEl.php | 16 ++++++++++ app/Models/contatoreGas.php | 13 ++++++++ resources/views/auto/accessori.blade.php | 6 ++++ resources/views/auto/manutenzione.blade.php | 6 ++++ resources/views/auto/revisione.blade.php | 8 ++++- resources/views/auto/rifornimento.blade.php | 6 ++++ 13 files changed, 133 insertions(+), 51 deletions(-) diff --git a/app/Http/Controllers/CategorieController.php b/app/Http/Controllers/CategorieController.php index 170cffc..ba08645 100644 --- a/app/Http/Controllers/CategorieController.php +++ b/app/Http/Controllers/CategorieController.php @@ -4,36 +4,35 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; +use App\Models\Categorie; class CategorieController extends Controller { // Gestione delle categorie di movimento + // TODO: sistemare la gestione dei dati nel Model Categorie public static function listCategorie(){ - $categorie=DB::table('categories')->orderBy('cat_name')->get(); - return view('conti.categorie.list',['categorie'=>$categorie]); + + return view('conti.categorie.list',['categorie'=>Categorie::list()]); } public static function insCategorie(Request $request) { - DB::table('categories')->insert(['cat_name'=> $request['cat_name']]); - $categorie=DB::table('categories')->orderBy('cat_name')->get(); - return view('conti.categorie.list',['categorie'=>$categorie]); + Categorie::inserisci($request['cat_name']); + return view('conti.categorie.list',['categorie'=>Categorie::list()]); } public function deleteCategorie(Request $request) { - DB::table('categories') - ->where('id','=', $request['id']) - ->delete(); + + Categorie::deleteById($request['id']); return redirect(route('categorie')); } public function updateCategorie(Request $request) { $id=$request['id']; - $categorie=DB::table('categories') - ->where('categories.id','=',$id) - ->get(); + + $categorie = Categorie::getById($id); return view('conti.categorie.update', [ 'categorie'=> $categorie, @@ -42,18 +41,14 @@ class CategorieController extends Controller public function updatePostCategorie(Request $request) { - DB::table('categories') - ->where('id','=', $request['id']) - ->update([ - 'cat_name' => $request['cat_name'], - ]); + Categorie::updateNameById($request['id'],$request['cat_name']); return redirect(route('categorie')); } public function apiList() { - $categorie=DB::table('categories')->orderBy('cat_name')->get(); + $categorie=Categorie::list(); return response()->json($categorie); } } diff --git a/app/Http/Controllers/ContatoreEnElController.php b/app/Http/Controllers/ContatoreEnElController.php index 38d2a75..25c8d29 100644 --- a/app/Http/Controllers/ContatoreEnElController.php +++ b/app/Http/Controllers/ContatoreEnElController.php @@ -4,25 +4,19 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; +use App\Models\contatoreEnEl; class ContatoreEnElController extends Controller { public static function listLettureEnel(){ - $letture=DB::table('contatore_en_els')->orderBy('enel_date','desc')->get(); + $letture=ContatoreEnel::getList(); return view('letture.enel.list',['lettureEnel'=>$letture]); } public static function insLettureEnel(Request $request) { - DB::table('contatore_en_els')->insert([ - 'enel_date'=> $request['enel_date'], - 'enel_A'=> $request['enel_A'], - 'enel_R'=> $request['enel_R'], - 'enel_F1'=> $request['enel_F1'], - 'enel_F2'=> $request['enel_F2'], - 'enel_F3'=> $request['enel_F3'], - ]); - $letture=DB::table('contatore_en_els')->orderBy('enel_date','desc')->get(); + ContatoreEnel::inserisci($request); + $letture=ContatoreEnel::getList(); return view('letture.enel.list',['lettureEnel'=>$letture]); } } diff --git a/app/Http/Controllers/ContatoreGasController.php b/app/Http/Controllers/ContatoreGasController.php index a9dc9b2..c18dfdb 100644 --- a/app/Http/Controllers/ContatoreGasController.php +++ b/app/Http/Controllers/ContatoreGasController.php @@ -4,23 +4,20 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; +use App\Models\contatoreGas; + class ContatoreGasController extends Controller { public static function listLettureGas(){ - $letture=DB::table('contatore_gases')->orderBy('gas_date','asc')->get(); + $letture=ContatoreGas::getList(); return view('components.chartGas',['lettureGas'=>$letture]); } public static function insLettureGas(Request $request) { - DB::table('contatore_gases')->insert([ - 'gas_date'=> $request['gas_date'], - 'gas_lettura'=> $request['gas_lettura'], - ]); - $letture=DB::table('contatore_gases') - ->orderBy('gas_date','asc') - ->get(); + ContatoreGas::inserisci($request); + $letture=ContatoreGas::getList(); return view('components.chartGas',['lettureGas'=>$letture]); } } diff --git a/app/Http/Controllers/DocumentiController.php b/app/Http/Controllers/DocumentiController.php index a84ada2..b1f47f0 100644 --- a/app/Http/Controllers/DocumentiController.php +++ b/app/Http/Controllers/DocumentiController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Models\Documenti; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; @@ -11,15 +12,8 @@ class DocumentiController extends Controller public function storeFile(Request $req){ if ($req->hasFile('filename')) { - $movimento_id=$req->input('id'); - $filename=$req->file('filename')->store('Documenti'); - DB::table('documentis') - ->insert([ - 'movimenti_id'=>$movimento_id, - 'descrizione'=>$req->input('descrizione'), - 'filename'=>$filename, - ]); - return redirect(route('documenti',['id'=>$movimento_id,])); + Documenti::store($req); + return redirect(route('documenti',['id'=>$req->input('id'),])); } else { @@ -28,9 +22,7 @@ class DocumentiController extends Controller } public function fileForm(Request $request){ - $documenti = DB::table('documentis') - ->where('movimenti_id','=',$request->input('id')) - ->get(); + $documenti = Documenti::getList($request->input('id')); return view('conti.documenti.insert', [ 'id'=>$request->input('id'), 'documenti'=>$documenti diff --git a/app/Models/Categorie.php b/app/Models/Categorie.php index bdb92ad..84fe57c 100644 --- a/app/Models/Categorie.php +++ b/app/Models/Categorie.php @@ -14,4 +14,34 @@ class Categorie extends Model { return DB::table('categories')->where('cat_name',$name)->get('id'); } + + public static function list() + { + return DB::table('categories')->orderBy('cat_name')->get(); + } + + public static function inserisci($name){ + return DB::table('categories')->insert(['cat_name'=> $name]); + } + + public static function deleteById($id){ + DB::table('categories') + ->where('id','=', $id) + ->delete(); + } + + public static function getById($id) { + return DB::table('categories') + ->where('categories.id','=',$id) + ->get(); + } + + public static function updateNameById($id,$name) { + DB::table('categories') + ->where('id','=', $id) + ->update([ + 'cat_name' => $name, + ]); + + } } diff --git a/app/Models/Documenti.php b/app/Models/Documenti.php index d0a9ffe..318d2c9 100644 --- a/app/Models/Documenti.php +++ b/app/Models/Documenti.php @@ -4,6 +4,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Facades\DB; class Documenti extends Model { @@ -15,5 +16,23 @@ class Documenti extends Model ->count(); return $quanti; } + + public static function store($req) { + $movimento_id=$req->input('id'); + $filename=$req->file('filename')->store('Documenti'); + DB::table('documentis') + ->insert([ + 'movimenti_id'=>$movimento_id, + 'descrizione'=>$req->input('descrizione'), + 'filename'=>$filename, + ]); + } + + public static function getList($id) + { + return DB::table('documentis') + ->where('movimenti_id','=',$id) + ->get(); + } } diff --git a/app/Models/Operazione.php b/app/Models/Operazione.php index 1217b08..b0b4590 100644 --- a/app/Models/Operazione.php +++ b/app/Models/Operazione.php @@ -30,7 +30,7 @@ class Operazione extends Model { $automobile=Auto::getAutoById($data['auto']); - $auto=' '.$automobile['marca'].' '.$automobile['modello'].' '.$automobile['targa']; + $auto=' '.$automobile->marca.' '.$automobile->modello.' '.$automobile->targa; $categoria=Categorie::getIdCategoriaByName('Automobili'); $causale="Automobili: ".strtoUpper($data['type']).' '; @@ -49,9 +49,11 @@ class Operazione extends Model DB::table('movimentis')->insert([ 'mov_data'=>$data['data'], - 'mov_descrizione'=>'Automobili: '.strtoUpper($data['type']).' '.$auto, + 'mov_descrizione'=>$causale, 'mov_importo'=>'-'.$data['importo'], - 'mov_fk_categoria'=> $categoria, + 'mov_fk_categoria'=> 1, + 'mov_inserito_da'=>1, + 'mov_fk_tags'=>1, ]); } diff --git a/app/Models/contatoreEnEl.php b/app/Models/contatoreEnEl.php index e92ef72..337aad1 100644 --- a/app/Models/contatoreEnEl.php +++ b/app/Models/contatoreEnEl.php @@ -4,8 +4,24 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Facades\DB; class contatoreEnEl extends Model { use HasFactory; + + public static function inserisci($data) { + DB::table('contatore_en_els')->insert([ + 'enel_date'=> $data['enel_date'], + 'enel_A'=> $data['enel_A'], + 'enel_R'=> $data['enel_R'], + 'enel_F1'=> $data['enel_F1'], + 'enel_F2'=> $data['enel_F2'], + 'enel_F3'=> $data['enel_F3'], + ]); + } + + public static function getList() { + return DB::table('contatore_en_els')->orderBy('enel_date','desc')->get(); + } } diff --git a/app/Models/contatoreGas.php b/app/Models/contatoreGas.php index 321971e..7334242 100644 --- a/app/Models/contatoreGas.php +++ b/app/Models/contatoreGas.php @@ -4,8 +4,21 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Facades\DB; class contatoreGas extends Model { use HasFactory; + + public static function getList() + { + return DB::table('contatore_gases')->orderBy('gas_date','asc')->get(); + } + + public static function inserisci($data) { + DB::table('contatore_gases')->insert([ + 'gas_date'=> $data['gas_date'], + 'gas_lettura'=> $data['gas_lettura'], + ]); + } } diff --git a/resources/views/auto/accessori.blade.php b/resources/views/auto/accessori.blade.php index 79589a2..57931a5 100644 --- a/resources/views/auto/accessori.blade.php +++ b/resources/views/auto/accessori.blade.php @@ -36,6 +36,12 @@ +
+
+ + +
+
diff --git a/resources/views/auto/manutenzione.blade.php b/resources/views/auto/manutenzione.blade.php index b240960..2078289 100644 --- a/resources/views/auto/manutenzione.blade.php +++ b/resources/views/auto/manutenzione.blade.php @@ -36,6 +36,12 @@
+
+
+ + +
+
diff --git a/resources/views/auto/revisione.blade.php b/resources/views/auto/revisione.blade.php index 5f1e4e1..fc54269 100644 --- a/resources/views/auto/revisione.blade.php +++ b/resources/views/auto/revisione.blade.php @@ -53,9 +53,15 @@
+
+
+ + +
+
- +
diff --git a/resources/views/auto/rifornimento.blade.php b/resources/views/auto/rifornimento.blade.php index c55a7f9..cac6f16 100644 --- a/resources/views/auto/rifornimento.blade.php +++ b/resources/views/auto/rifornimento.blade.php @@ -46,6 +46,12 @@
+
+
+ + +
+