diff --git a/app/Http/Controllers/ContrattiController.php b/app/Http/Controllers/ContrattiController.php index d0bff62..7e357bf 100644 --- a/app/Http/Controllers/ContrattiController.php +++ b/app/Http/Controllers/ContrattiController.php @@ -3,8 +3,13 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; +use App\Models\Contratti; class ContrattiController extends Controller { // + public function contratti() + { + return view('contratti.lista',['data'=>Contratti::all()]); + } } diff --git a/app/Models/Movimenti.php b/app/Models/Movimenti.php index a58637f..f1b3e62 100644 --- a/app/Models/Movimenti.php +++ b/app/Models/Movimenti.php @@ -158,7 +158,7 @@ class Movimenti extends Model if($line['Data valuta']) { self::insEntrata([ - 'mov_data'=>self::dateFormat(0,$line['Data valuta']), + 'mov_data'=>$line['Data valuta'], 'mov_fk_categoria'=>1, 'mov_descrizione'=>$line['Descrizione operazione'], 'mov_importo'=>trim(str_replace(',','.',(str_replace('.','',str_replace('€', '', $line['Importo']))))), @@ -217,7 +217,7 @@ class Movimenti extends Model private static function dateFormat($type,$string) { - + // $string=(string)$string; if($type) { // $string=$string->format('Y-m-d'); diff --git a/public/js/app/contratti.js b/public/js/app/contratti.js new file mode 100644 index 0000000..8c8feb8 --- /dev/null +++ b/public/js/app/contratti.js @@ -0,0 +1,10 @@ +$('#contratti').DataTable({ + responsive: true, + fields: [ + { + label:"Data", + type: "datetime" + } + ] +}); +$(".draggable").draggable(); \ No newline at end of file diff --git a/public/js/app/task.js b/public/js/app/task.js index 5219114..7efb0c7 100644 --- a/public/js/app/task.js +++ b/public/js/app/task.js @@ -10,7 +10,7 @@ $(document).ready(function() { "order": [[0, "desc"]] }); }); - +$(".draggable").draggable(); var d = new Date(); var month = d.getMonth()+1; diff --git a/resources/views/components/menu.blade.php b/resources/views/components/menu.blade.php index 1c6dccd..231dab8 100644 --- a/resources/views/components/menu.blade.php +++ b/resources/views/components/menu.blade.php @@ -21,7 +21,13 @@ -@endcan @can('consumi') +@endcan +@can('contratti') +
Numero contratto | +Data Contratto | +Data Termine | +Fornitore | +Tipo contratto | +Importo | +Stato | +Documento | + +
---|---|---|---|---|---|---|---|
{{$contratto->numero}} | +{{$contratto->datainizio}} | +{{$contratto->datatermine}} | +{{$contratto->fornitore}} | +{{$contratto->tipo}} | +{{$contratto->importo}} | +{{$contratto->stato}} | +{{$contratto->filename}} | + +