invite add time_invited filter

This commit is contained in:
xiaomlove
2023-03-28 01:31:27 +08:00
parent db492d28b1
commit caaf140beb
5 changed files with 50 additions and 18 deletions
+43 -17
View File
@@ -48,7 +48,7 @@ class InviteResource extends Resource
{ {
return $table return $table
->columns([ ->columns([
Tables\Columns\TextColumn::make('id'), Tables\Columns\TextColumn::make('id')->sortable(),
Tables\Columns\TextColumn::make('inviter') Tables\Columns\TextColumn::make('inviter')
->label(__('invite.fields.inviter')) ->label(__('invite.fields.inviter'))
->formatStateUsing(fn ($state) => username_for_admin($state)) ->formatStateUsing(fn ($state) => username_for_admin($state))
@@ -87,22 +87,8 @@ class InviteResource extends Resource
->formatStateUsing(fn ($state) => format_datetime($state)) ->formatStateUsing(fn ($state) => format_datetime($state))
, ,
]) ])
->filters([ ->defaultSort('id', 'desc')
Tables\Filters\Filter::make('inviter') ->filters(self::getFilters())
->form([
Forms\Components\TextInput::make('inviter')
->label(__('invite.fields.inviter'))
->placeholder('UID')
,
])->query(function (Builder $query, array $data) {
return $query->when($data['inviter'], fn (Builder $query, $value) => $query->where("inviter", $value));
})
,
Tables\Filters\SelectFilter::make('valid')
->options(self::getYesNoOptions())
->label(__('invite.fields.valid'))
,
])
->actions([ ->actions([
// Tables\Actions\EditAction::make(), // Tables\Actions\EditAction::make(),
]) ])
@@ -126,4 +112,44 @@ class InviteResource extends Resource
'edit' => Pages\EditInvite::route('/{record}/edit'), 'edit' => Pages\EditInvite::route('/{record}/edit'),
]; ];
} }
private static function getFilters()
{
$filters = [];
$filters[] = Tables\Filters\Filter::make('inviter')
->form([
Forms\Components\TextInput::make('inviter')
->label(__('invite.fields.inviter'))
->placeholder('UID')
,
])->query(function (Builder $query, array $data) {
return $query->when($data['inviter'], fn (Builder $query, $value) => $query->where("inviter", $value));
})
;
$filters[] = Tables\Filters\SelectFilter::make('valid')
->options(self::getYesNoOptions())
->label(__('invite.fields.valid'))
;
$filters[] = Tables\Filters\Filter::make('time_invited_begin')
->form([
Forms\Components\DatePicker::make('time_invited_begin')
->maxDate(now())
->label(__('invite.fields.time_invited_begin'))
,
])->query(function (Builder $query, array $data) {
return $query->when($data['time_invited_begin'], fn (Builder $query, $value) => $query->where("time_invited", '>=', $value));
})
;
$filters[] = Tables\Filters\Filter::make('time_invited_end')
->form([
Forms\Components\DatePicker::make('time_invited_end')
->maxDate(now())
->label(__('invite.fields.time_invited_end'))
,
])->query(function (Builder $query, array $data) {
return $query->when($data['time_invited_end'], fn (Builder $query, $value) => $query->where("time_invited", '<=', $value));
})
;
return $filters;
}
} }
+1 -1
View File
@@ -1,6 +1,6 @@
<?php <?php
defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.8.0'); defined('VERSION_NUMBER') || define('VERSION_NUMBER', '1.8.0');
defined('RELEASE_DATE') || define('RELEASE_DATE', '2023-03-26'); defined('RELEASE_DATE') || define('RELEASE_DATE', '2023-03-28');
defined('IN_TRACKER') || define('IN_TRACKER', false); defined('IN_TRACKER') || define('IN_TRACKER', false);
defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP"); defined('PROJECTNAME') || define("PROJECTNAME","NexusPHP");
defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org"); defined('NEXUSPHPURL') || define("NEXUSPHPURL","https://nexusphp.org");
+2
View File
@@ -11,6 +11,8 @@ return [
'invitee_register_email' => 'Registered email', 'invitee_register_email' => 'Registered email',
'invitee_register_username' => 'Registered username', 'invitee_register_username' => 'Registered username',
'expired_at' => 'hash expired at', 'expired_at' => 'hash expired at',
'time_invited_begin' => 'Send time gte',
'time_invited_end' => 'Send time lte',
], ],
'send_deny_reasons' => [ 'send_deny_reasons' => [
'invite_system_closed' => 'Invite system is closed', 'invite_system_closed' => 'Invite system is closed',
+2
View File
@@ -11,6 +11,8 @@ return [
'invitee_register_email' => '注册用户邮箱', 'invitee_register_email' => '注册用户邮箱',
'invitee_register_username' => '注册用户名', 'invitee_register_username' => '注册用户名',
'expired_at' => 'hash 过期时间', 'expired_at' => 'hash 过期时间',
'time_invited_begin' => '发邀时间大于',
'time_invited_end' => '发邀时间小于',
], ],
'send_deny_reasons' => [ 'send_deny_reasons' => [
'invite_system_closed' => '邀请系统已关闭', 'invite_system_closed' => '邀请系统已关闭',
+2
View File
@@ -11,6 +11,8 @@ return [
'invitee_register_email' => '註冊用戶郵箱', 'invitee_register_email' => '註冊用戶郵箱',
'invitee_register_username' => '註冊用戶名', 'invitee_register_username' => '註冊用戶名',
'expired_at' => 'hash 過期時間', 'expired_at' => 'hash 過期時間',
'time_invited_begin' => '發邀時間大於',
'time_invited_end' => '發邀時間小於',
], ],
'send_deny_reasons' => [ 'send_deny_reasons' => [
'invite_system_closed' => '邀請系統已關閉', 'invite_system_closed' => '邀請系統已關閉',