diff --git a/app/Http/Controllers/FullCalenderController.php b/app/Http/Controllers/FullCalenderController.php index 65643bb..a6c1fcd 100644 --- a/app/Http/Controllers/FullCalenderController.php +++ b/app/Http/Controllers/FullCalenderController.php @@ -48,6 +48,7 @@ class FullCalenderController extends Controller case 'add': $event = Event::create([ 'title' => $request->title, + 'description' => $request->description, 'start' => $request->start, 'end' => $request->end, ]); @@ -57,6 +58,7 @@ class FullCalenderController extends Controller case 'update': $event = Event::find($request->id)->update([ 'title' => $request->title, + 'description' => $request->description, 'start' => $request->start, 'end' => $request->end, ]); diff --git a/app/Models/Categorie.php b/app/Models/Categorie.php index d7b7bb4..b18073a 100644 --- a/app/Models/Categorie.php +++ b/app/Models/Categorie.php @@ -21,7 +21,8 @@ class Categorie extends Model } public static function listCategorieAPI() { - return self::select('cat_name')->pluck('cat_name'); + // return self::select('cat_name')->pluck('cat_name'); + return self::all()->sortBy('cat_name'); } public static function listSpesa() { diff --git a/app/Models/Event.php b/app/Models/Event.php index 580ace3..3825047 100644 --- a/app/Models/Event.php +++ b/app/Models/Event.php @@ -21,7 +21,7 @@ class Event extends Model protected $fillable = [ - 'title', 'start', 'end' + 'title','description', 'start', 'end' ]; } diff --git a/app/Models/Movimenti.php b/app/Models/Movimenti.php index fdf2105..363596b 100644 --- a/app/Models/Movimenti.php +++ b/app/Models/Movimenti.php @@ -188,15 +188,15 @@ JOIN categories as c ON a.mov_fk_categoria=c.id'; rename($inputPath,$outputPath); $collection = (new FastExcel)->import($outputPath, function ($line){ - if($line['Data valuta']) + if($line['DATA VALUTA']) { - list($giorno,$mese,$anno) = explode('/',$line['Data valuta']); + list($giorno,$mese,$anno) = explode('/',$line['DATA VALUTA']); $data="$anno-$mese-$giorno"; self::insEntrata([ - 'mov_data'=>self::dateFormat(0,$line['Data valuta']), + 'mov_data'=>self::dateFormat(0,$line['DATA VALUTA']), 'mov_fk_categoria'=>1, - 'mov_descrizione'=>$line['Descrizione operazione'], - 'mov_importo'=>trim(str_replace(',','.',(str_replace('.','',str_replace('€', '', $line['Importo']))))), + 'mov_descrizione'=>$line['DESCRIZIONE OPERAZIONE'], + 'mov_importo'=>trim(str_replace(',','.',(str_replace('.','',str_replace('€', '', $line['IMPORTO IN EURO']))))), 'mov_fk_tags'=>1, 'userid'=>1, ]); diff --git a/app/Models/tag.php b/app/Models/tag.php index aa2e93e..76e4d72 100644 --- a/app/Models/tag.php +++ b/app/Models/tag.php @@ -16,7 +16,8 @@ class tag extends Model public static function getApiList() { - return self::select('tag_name')->pluck('tag_name'); + //return self::select('tag_name')->pluck('tag_name'); + return self::all()->sortBy('tag_name'); } public static function inserisci($param) { diff --git a/resources/views/calendario/fullcalendar.blade.php b/resources/views/calendario/fullcalendar.blade.php index 9b80b4e..b218a7a 100644 --- a/resources/views/calendario/fullcalendar.blade.php +++ b/resources/views/calendario/fullcalendar.blade.php @@ -27,7 +27,7 @@ Titolo: Descrizione: - +