generated from liutk/owl-admin-base
main
parent
fbaec26cb2
commit
e37190b849
|
|
@ -149,7 +149,7 @@ class ActivityController extends AdminController
|
||||||
)
|
)
|
||||||
])
|
])
|
||||||
->title('')
|
->title('')
|
||||||
->api(admin_url('activity_games?_action=getData&activity_id=${id}'))
|
->api(admin_url('activity_games?_action=getData&activity=${id}'))
|
||||||
->columns([
|
->columns([
|
||||||
amis()->TableColumn('name', __('admin.activity_games.name')),
|
amis()->TableColumn('name', __('admin.activity_games.name')),
|
||||||
amis()->TableColumn('state', __('admin.activity_games.state'))->type('mapping')->map([
|
amis()->TableColumn('state', __('admin.activity_games.state'))->type('mapping')->map([
|
||||||
|
|
@ -246,7 +246,7 @@ class ActivityController extends AdminController
|
||||||
)
|
)
|
||||||
])
|
])
|
||||||
->title('')
|
->title('')
|
||||||
->api(admin_url('activity_gifts?_action=getData&activity_id=${id}'))
|
->api(admin_url('activity_gifts?_action=getData&activity=${id}'))
|
||||||
->columns([
|
->columns([
|
||||||
amis()->TableColumn('name', __('admin.activity_gifts.name')),
|
amis()->TableColumn('name', __('admin.activity_gifts.name')),
|
||||||
amis()->TableColumn('logo', __('admin.activity_gifts.logo'))->type('image')->height('30px')->width('30px'),
|
amis()->TableColumn('logo', __('admin.activity_gifts.logo'))->type('image')->height('30px')->width('30px'),
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,9 @@ class ActivityGameResource extends JsonResource
|
||||||
'away' => $this->away ??'',
|
'away' => $this->away ??'',
|
||||||
'away_logo' => $this->away_logo ??'',
|
'away_logo' => $this->away_logo ??'',
|
||||||
'game_at' => $this->game_at->format('Y-m-d H:i'),
|
'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,
|
'has_guess' => !$this->logs->isEmpty() ? ($this->logs[0]->score):false,
|
||||||
'state' => $this->state,
|
'state' => $this->state,
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -14,4 +14,8 @@ class ActivityGameFilter extends ModelFilter
|
||||||
{
|
{
|
||||||
return $this->where('id', $id);
|
return $this->where('id', $id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function activity($activity){
|
||||||
|
return $this->where('activity_id', $activity);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,4 +14,8 @@ class ActivityGiftFilter extends ModelFilter
|
||||||
{
|
{
|
||||||
return $this->where('id', $id);
|
return $this->where('id', $id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function activity($activity){
|
||||||
|
return $this->where('activity_id', $activity);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue