diff --git a/app/Admin/Controllers/ActivityController.php b/app/Admin/Controllers/ActivityController.php index 099d738..9194cf3 100644 --- a/app/Admin/Controllers/ActivityController.php +++ b/app/Admin/Controllers/ActivityController.php @@ -149,7 +149,7 @@ class ActivityController extends AdminController ) ]) ->title('') - ->api(admin_url('activity_games?_action=getData&activity_id=${id}')) + ->api(admin_url('activity_games?_action=getData&activity=${id}')) ->columns([ amis()->TableColumn('name', __('admin.activity_games.name')), amis()->TableColumn('state', __('admin.activity_games.state'))->type('mapping')->map([ @@ -246,7 +246,7 @@ class ActivityController extends AdminController ) ]) ->title('') - ->api(admin_url('activity_gifts?_action=getData&activity_id=${id}')) + ->api(admin_url('activity_gifts?_action=getData&activity=${id}')) ->columns([ amis()->TableColumn('name', __('admin.activity_gifts.name')), amis()->TableColumn('logo', __('admin.activity_gifts.logo'))->type('image')->height('30px')->width('30px'), diff --git a/app/Http/Resources/Api/ActivityGameResource.php b/app/Http/Resources/Api/ActivityGameResource.php index 96b482b..c11ad3a 100644 --- a/app/Http/Resources/Api/ActivityGameResource.php +++ b/app/Http/Resources/Api/ActivityGameResource.php @@ -24,6 +24,9 @@ class ActivityGameResource extends JsonResource 'away' => $this->away ??'', 'away_logo' => $this->away_logo ??'', 'game_at' => $this->game_at->format('Y-m-d H:i'), + 'little_game_at' => $this->game_at->format('H:i'), + 'game_day' => $this->game_at->format('Y-m-d'), + 'game_at_comparison_now' => now()->gte($this->game_at), 'has_guess' => !$this->logs->isEmpty() ? ($this->logs[0]->score):false, 'state' => $this->state, ]; diff --git a/app/Models/Filters/ActivityGameFilter.php b/app/Models/Filters/ActivityGameFilter.php index f8a1615..edd7d53 100644 --- a/app/Models/Filters/ActivityGameFilter.php +++ b/app/Models/Filters/ActivityGameFilter.php @@ -14,4 +14,8 @@ class ActivityGameFilter extends ModelFilter { return $this->where('id', $id); } + + public function activity($activity){ + return $this->where('activity_id', $activity); + } } diff --git a/app/Models/Filters/ActivityGiftFilter.php b/app/Models/Filters/ActivityGiftFilter.php index 7f250c7..c6ece8c 100644 --- a/app/Models/Filters/ActivityGiftFilter.php +++ b/app/Models/Filters/ActivityGiftFilter.php @@ -14,4 +14,8 @@ class ActivityGiftFilter extends ModelFilter { return $this->where('id', $id); } + + public function activity($activity){ + return $this->where('activity_id', $activity); + } }