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

Modifiche effettuate per gestione documentale

Browse Source
This commit is contained in:
Amministratore 2023-09-30 09:20:40 +02:00
parent 40eb51f836
commit e22868bef5
6 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/GenDocController.php
View File

@ -3,8 +3,17 @@
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Models\GenDoc;
class GenDocController extends Controller
{
//
public function fileForm(Request $request){
$documenti = GenDoc::listDocument($request->input('entity'),$request->input('id'));
return view('conti.documenti.insert', [
'id'=>$request->input('id'),
'entity'=>$request->input('entity'),
'documenti'=>$documenti,
]);
}
}

8
app/Models/GenDoc.php
View File

@ -12,14 +12,14 @@ class GenDoc extends Model
// DocumentiGenerali
public static function saveDocument($entity,$entity_id,$data){
public static function saveDocument($data){
$filename=$data->file('filename')->store('Documenti');
DB::table('gen_docs')
->insert([
'entity'=>$entity,
'entity_id'=>$data->input('id'),
'descrizione'=>$data->input('descrizione'),
'entity'=>$data['entity'],
'entity_id'=>$data['entity_id'],
'descrizione'=>$data['descrizione'],
'filename'=>$filename,
]);
}

5
app/Models/Movimenti.php
View File

@ -17,8 +17,11 @@ class Movimenti extends Model
return DB::table('movimentis')
->join('categories','movimentis.mov_fk_categoria','=','categories.id')
->join('tags','movimentis.mov_fk_tags','=','tags.id')
->leftJoin('documentis', 'movimenti_id','=','movimentis.id')
//->leftJoin('gen_docs', 'entity_id','=','movimentis.id')
->leftJoin('documentis', 'movimenti_id','=','movimentis.id') // #issue 5
// ->where('gen_docs.entity','=',1)
->select('movimentis.id','mov_data','mov_descrizione','mov_importo','cat_name','tag_name', DB::raw('Count(movimenti_id) as quanti'))
//->select('movimentis.id','mov_data','mov_descrizione','mov_importo','cat_name','tag_name', DB::raw('Count(entity_id) as quanti'))
->groupBy('movimentis.id','mov_data','mov_descrizione','mov_importo','cat_name','tag_name')
->get();
}

8
resources/views/conti/documenti/insert.blade.php
View File

@ -21,10 +21,10 @@
</div>
<div class="mb-3">
<input type="hidden" name="movimenti_id" value="{{ $id }}">
<!-- {issue #5}
<input type="hidden" name="entita" value="Movimenti">
<input type="hidden" name="entita_id" value="{{$id}}">
-->
<!-- {issue #5} -->
<input type="hidden" name="entity" value="{{$entity}}">
<input type="hidden" name="entity_id" value="{{$id}}">
<!-- {issue #5} END -->
<button type="submit" class="btn btn-primary">Submit</button>
</div>
</form>

2
resources/views/conti/movimenti/list.blade.php
View File

@ -39,7 +39,7 @@
<td>
<button class="btn btn-warning btn-detail open_modal_modifica" value="{{ $movimento->id; }}"><i class="fa fa-pencil-square-o fw"></i></button>&nbsp;
<a class="btn btn-danger" href="/admin/movimenti/delete?id={{ $movimento->id; }}"><i class="fa fa-trash-o fa-fw"></i></a>&nbsp;
<a class="btn btn-warning" href="/admin/movimenti/docs?id={{ $movimento->id; }}"><i class="fa fa-files-o fa-fw"></i></a>&nbsp;
<a class="btn btn-warning" href="/admin/movimenti/docs?entity=1&entity_id={{ $movimento->id; }}"><i class="fa fa-files-o fa-fw"></i></a>&nbsp;
<!-- Definisce quanti documenti sono presenti per il record -->
( {{ $movimento->quanti ?? ''; }} )
</td>

7
routes/admin.php
View File

@ -51,10 +51,13 @@ Route::group(['middleware'=>['permission:conti']], function(){
Route::get('movimenti/filter/tags',[MovimentiController::class,'filterByTag']);
Route::get('movimenti/report/movimenti_categoria', [MovimentiController::class,'listMovPerCateg']);
Route::get('movimenti/report/movimentibycat', [MovimentiController::class,'listMovbyCat']);
Route::get('movimenti/docs', [DocumentiController::class,'fileForm'])->name('documenti');
// Route::get('movimenti/docs', [DocumentiController::class,'fileForm'])->name('documenti');
// Route::post('movimenti/docs', [DocumentiController::class,'storeFile']);
Route::get('movimenti/docs', [App\Http\Controllers\GenDocController::class,'fileForm'])->name('documenti');
Route::post('movimenti/docs', [App\Http\Controllers\GenDocController::class,'storeFile']);
// {issue #5}
// Route::get('movimenti/docs', [DocumentiController::class,'fileMovimentiForm'])->name('documenti');
Route::post('movimenti/docs', [DocumentiController::class,'storeFile']);
Route::get('movimenti/import', [MovimentiController::class,'importFile'])->name('importING');
Route::post('movimenti/import', [MovimentiController::class,'importEC_ING']);
Route::get('movimenti/importcr', [MovimentiController::class,'importFileCR'])->name('importCR');