This commit is contained in:
salam committed 2026-08-24 18:22:27 +02:00
1 parent 8f7021e4f8
commit 70c31c9694
2 files changed
+15 -13

No files matched your search

+4 -1
View File
@@ -72,7 +72,10 @@ class ChartEvent extends ChartWidget
return [context.dataset.label+' '+context.dataset.data[0]]; return [context.dataset.label+' '+context.dataset.data[0]];
} }
else { else {
return [' '+context.parsed.y, ' '+context.dataset.playing_date[context.dataIndex], ' '+context.dataset.events[context.dataIndex], ' '+context.dataset.results_per_event[context.dataIndex]]; if(context.dataset.playing_date[context.dataIndex])
return [' '+context.parsed.y, ' '+context.dataset.playing_date[context.dataIndex], ' '+context.dataset.events[context.dataIndex], ' '+context.dataset.results_per_event[context.dataIndex]];
else
return [' '+context.parsed.y]
} }
}, },
} }
+11 -12
View File
@@ -265,38 +265,37 @@ class LoadEvents
// dd($value); // dd($value);
$events[] = $value['home'] . ' vs ' . $value['away']; // $events[] = $value['home'] . ' vs ' . $value['away'];
$playing_date[] = $value['starttime']->format('Y-m-d H:i'); // $playing_date[] = $value['starttime']->format('Y-m-d H:i');
$results_per_event[] = $value['val_home'] . ' : ' . $value['val_away']; // $results_per_event[] = $value['val_home'] . ' : ' . $value['val_away'];
$labels[] = round($value['starttime']->diffInDays(Carbon::now())); $labels[] = round($value['starttime']->diffInDays(Carbon::now()));
// Home playing HOME done and commited // Home playing HOME done and commited
if ($match->home_id == $value['home_id']) { if ($match->home_id == $value['home_id']) {
$dataset_home[] = (int) $value['val_home']; $dataset_home[] = (int) $value['val_home'];
$dataset_away[] = (int) $value['val_away']; $dataset_away[] = (int) $value['val_away'];
// $dataset_home2[] = end($dataset_home2);
// $dataset_away2[] = end($dataset_away2);
} else if ($match->home_id == $value['away_id']) { } else if ($match->home_id == $value['away_id']) {
$dataset_home[] = (int) $value['val_away']; $dataset_home[] = (int) $value['val_away'];
$dataset_away[] = (int) $value['val_home']; $dataset_away[] = (int) $value['val_home'];
// $dataset_home2[] = end($dataset_home2);
// $dataset_away2[] = end($dataset_away2);
} }
// Home playing AWAY done and commited // Home playing AWAY done and commited
else if ($match->away_id == $value['home_id']) { else if ($match->away_id == $value['home_id']) {
// $dataset_home[] = end($dataset_home);
// $dataset_away[] = end($dataset_away);
$dataset_home2[] = (int) $value['val_home']; $dataset_home2[] = (int) $value['val_home'];
$dataset_away2[] = (int) $value['val_away']; $dataset_away2[] = (int) $value['val_away'];
} else if ($match->away_id == $value['away_id']) { } else if ($match->away_id == $value['away_id']) {
// $dataset_home[] = end($dataset_home);
// $dataset_away[] = end($dataset_away);
$dataset_home2[] = (int) $value['val_away']; $dataset_home2[] = (int) $value['val_away'];
$dataset_away2[] = (int) $value['val_home']; $dataset_away2[] = (int) $value['val_home'];
} }
} }
$n = max(count($dataset_home), count($dataset_home2));
$f = array_first($labels);
$step = round($f / $n);
$labels = [];
for ($i = $f; $i >= 0; $i -= $step) {
$labels[] = $i;
}
} }
// dd($events, $dataset_home, $dataset_home2); // dd($events, count($dataset_home), count($dataset_away), count($dataset_home2), count($dataset_away2));
self::shortenEnding($labels, $dataset_home, $dataset_away); self::shortenEnding($labels, $dataset_home, $dataset_away);