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

Modifiche all'importazione dei file di ING e visualizzazioni categorie

Browse Source
This commit is contained in:
Amministratore 2024-07-19 11:35:38 +00:00
parent 53c984c315
commit 337504b127
6 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/FullCalenderController.php
View File

@ -48,6 +48,7 @@ class FullCalenderController extends Controller
case 'add': case 'add':
$event = Event::create([ $event = Event::create([
'title' => $request->title, 'title' => $request->title,
'description' => $request->description,
'start' => $request->start, 'start' => $request->start,
'end' => $request->end, 'end' => $request->end,
]); ]);
@ -57,6 +58,7 @@ class FullCalenderController extends Controller
case 'update': case 'update':
$event = Event::find($request->id)->update([ $event = Event::find($request->id)->update([
'title' => $request->title, 'title' => $request->title,
'description' => $request->description,
'start' => $request->start, 'start' => $request->start,
'end' => $request->end, 'end' => $request->end,
]); ]);

3
app/Models/Categorie.php
View File

@ -21,7 +21,8 @@ class Categorie extends Model
} }
public static function listCategorieAPI() 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() public static function listSpesa()
{ {

2
app/Models/Event.php
View File

@ -21,7 +21,7 @@ class Event extends Model
protected $fillable = [ protected $fillable = [
'title', 'start', 'end' 'title','description', 'start', 'end'
]; ];
} }

10
app/Models/Movimenti.php
View File

@ -188,15 +188,15 @@ JOIN categories as c ON a.mov_fk_categoria=c.id';
rename($inputPath,$outputPath); rename($inputPath,$outputPath);
$collection = (new FastExcel)->import($outputPath, function ($line){ $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"; $data="$anno-$mese-$giorno";
self::insEntrata([ self::insEntrata([
'mov_data'=>self::dateFormat(0,$line['Data valuta']), 'mov_data'=>self::dateFormat(0,$line['DATA VALUTA']),
'mov_fk_categoria'=>1, 'mov_fk_categoria'=>1,
'mov_descrizione'=>$line['Descrizione operazione'], 'mov_descrizione'=>$line['DESCRIZIONE OPERAZIONE'],
'mov_importo'=>trim(str_replace(',','.',(str_replace('.','',str_replace('€', '', $line['Importo']))))), 'mov_importo'=>trim(str_replace(',','.',(str_replace('.','',str_replace('€', '', $line['IMPORTO IN EURO']))))),
'mov_fk_tags'=>1, 'mov_fk_tags'=>1,
'userid'=>1, 'userid'=>1,
]); ]);

3
app/Models/tag.php
View File

@ -16,7 +16,8 @@ class tag extends Model
public static function getApiList() 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) { public static function inserisci($param) {

2
resources/views/calendario/fullcalendar.blade.php
View File

@ -27,7 +27,7 @@
Titolo: Titolo:
<input type='text' class="form-control" name="title"/> <input type='text' class="form-control" name="title"/>
Descrizione: Descrizione:
<textarea class="form-control" name="descrizione"></textarea> <textarea class="form-control" name="description"></textarea>
<hr> <hr>
<input type="submit" name="Submit"> <input type="submit" name="Submit">
</form> </form>