fbarachino/bubofamily
1
1
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

Sistemazione e pulizia Model-Controller per Categorie, Contatore Enel, ContatoreGas, Documenti e inserimento form per registrazione operazioni auto in movimenti

Browse Source
This commit is contained in:
Amministratore 2023-03-31 08:43:48 +02:00
parent afc4ac70e6
commit 8e67e4b6e5
13 changed files with 133 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/Http/Controllers/CategorieController.php
View File

@ -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);
}
}

14
app/Http/Controllers/ContatoreEnElController.php
View File

@ -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]);
}
}

13
app/Http/Controllers/ContatoreGasController.php
View File

@ -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]);
}
}

16
app/Http/Controllers/DocumentiController.php
View File

@ -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

30
app/Models/Categorie.php
View File

@ -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,
]);
}
}

19
app/Models/Documenti.php
View File

@ -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
{
@ -16,4 +17,22 @@ class Documenti extends Model
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();
}
}

8
app/Models/Operazione.php
View File

@ -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,
]);
}

16
app/Models/contatoreEnEl.php
View File

@ -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();
}
}

13
app/Models/contatoreGas.php
View File

@ -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'],
]);
}
}

6
resources/views/auto/accessori.blade.php
View File

@ -36,6 +36,12 @@
<input type="text" class="form-control" id="descrizione" name="descrizione">
</div>
</div>
<div class="row">
<div class="col-xs-6">
<label for="inMovimenti" class="form-label">Inserire nei movimenti?</label>
<input type="checkbox" id="inMovimenti" name="inMovimenti">
</div>
</div>
<div class="row">
<div class="col-xs-12">
<input type="hidden" name="type" value="accessori">

6
resources/views/auto/manutenzione.blade.php
View File

@ -36,6 +36,12 @@
<input type="text" class="form-control" id="descrizione" name="descrizione">
</div>
</div>
<div class="row">
<div class="col-xs-6">
<label for="inMovimenti" class="form-label">Inserire nei movimenti?</label>
<input type="checkbox" id="inMovimenti" name="inMovimenti">
</div>
</div>
<div class="row">
<div class="col-xs-12">
<input type="hidden" name="type" value="manutenzione">

8
resources/views/auto/revisione.blade.php
View File

@ -53,9 +53,15 @@
<input type="date" class="form-control" id="dataproxrevisione" name="dataproxrevisione">
</div>
</div>
<div class="row">
<div class="col-xs-6">
<label for="inMovimenti" class="form-label">Inserire nei movimenti?</label>
<input type="checkbox" id="inMovimenti" name="inMovimenti">
</div>
</div>
<div class="row">
<div class="col-xs-12">
<input type="hidden" name="type" value="accessori">
<input type="hidden" name="type" value="revisione">
<input type="hidden" name="auto" value="{{ $dettagli->id; }}">
<button type="submit" class="btn btn-primary">Submit</button>
</div>

6
resources/views/auto/rifornimento.blade.php
View File

@ -46,6 +46,12 @@
<input type="text" class="form-control" id="distributore" name="distributore">
</div>
</div>
<div class="row">
<div class="col-xs-6">
<label for="inMovimenti" class="form-label">Inserire nei movimenti?</label>
<input type="checkbox" id="inMovimenti" name="inMovimenti">
</div>
</div>
<div class="row">
<div class="col-xs-12">
<input type="hidden" name="type" value="rifornimento">