Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

fix issue with default date and default order on advanced search

Browse Source
This commit is contained in:
RaidMax 2023-01-23 21:23:02 -06:00
parent 8f20a2e2cd
commit 6edf3f1ae9
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
WebfrontCore/Views/Shared/Partials/_SearchResourceFilter.cshtml
View File

@ -2,6 +2,7 @@
@using SharedLibraryCore.Dtos @using SharedLibraryCore.Dtos
@using WebfrontCore.QueryHelpers.Models @using WebfrontCore.QueryHelpers.Models
@using Data.Models @using Data.Models
@using System.Globalization
@model string @model string
@{ @{
var existingClientFilter = ViewBag.ClientResourceRequest as ClientResourceRequest; var existingClientFilter = ViewBag.ClientResourceRequest as ClientResourceRequest;
@ -97,14 +98,14 @@
<div class="form-group"> <div class="form-group">
<label for="clientConnected@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_CONNECTED_SINCE"]</label> <label for="clientConnected@(Model)">@ViewBag.Localization["WEBFRONT_ADVANCED_SEARCH_LABEL_CONNECTED_SINCE"]</label>
<div class="d-flex"> <div class="d-flex">
@{ var oneYearAgo = DateTime.UtcNow.AddYears(-1).ToShortDateString(); } @{ var presetDate = (existingClientFilter?.ClientConnected ?? DateTime.UtcNow.AddYears(-1)).ToString("s", CultureInfo.InvariantCulture); }
<input type="text" class="form-control date-picker-input w-half" name="clientConnected" <input type="text" class="form-control date-picker-input w-half" name="clientConnected"
id="clientConnected@(Model)" data-date="@oneYearAgo" id="clientConnected@(Model)" data-date="@presetDate"
value="@(existingClientFilter?.ClientConnected?.ToShortDateString() ?? oneYearAgo)"/> value="@presetDate"/>
<div class="custom-control ml-10 align-self-center"> <div class="custom-control ml-10 align-self-center">
<div class="custom-switch"> <div class="custom-switch">
@if (existingClientFilter?.Direction is SortDirection.Descending) @if ((existingClientFilter?.Direction ?? SortDirection.Descending) is SortDirection.Descending)
{ {
<input type="checkbox" id="resultOrder@(Model)" name="direction" <input type="checkbox" id="resultOrder@(Model)" name="direction"
value="@((int)SortDirection.Ascending)"> value="@((int)SortDirection.Ascending)">