tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Inputs with date type in the doc module have been changed to daterangepicker single

pull/14017/head
Salih 4 years ago
parent
bc4303e7a7
commit
7b37a0561c
2 changed files with 41 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
  2. 26
      modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js

32
modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/Index.cshtml
View File

@ -89,34 +89,34 @@
<div class="input-group mb-2">
<div class="input-group-text">@L["CreationTime"].Value</div>
<input type="date"
<input type="text"
id="CreationTimeMin"
name="CreationTimeMin"
class="form-control datepicker"
class="form-control daterangesinglepicker"
placeholder="@L["StartDate"].Value">
<input type="date"
<input type="text"
id="CreationTimeMax"
name="CreationTimeMax"
placeholder="@L["EndDate"].Value"
class="form-control datepicker">
class="form-control daterangesinglepicker">
</div>
</abp-column>
<abp-column size="_4">
<div class="input-group mb-2">
<div class="input-group-text">@L["LastUpdateTime"].Value</div>
<input type="date"
<input type="text"
id="LastUpdatedTimeMin"
name="LastUpdatedTimeMin"
class="form-control datepicker"
class="form-control daterangesinglepicker"
placeholder="@L["StartDate"].Value">
<span>-</span>
<input type="date"
<input type="text"
id="LastUpdatedTimeMax"
name="LastUpdatedTimeMax"
placeholder="@L["EndDate"].Value"
class="form-control datepicker">
class="form-control daterangesinglepicker">
</div>
</abp-column>
@ -124,17 +124,17 @@
<div class="input-group mb-2">
<div class="input-group-text">@L["LastCachedTime"].Value</div>
<input type="date"
<input type="text"
id="LastCachedTimeMin"
name="LastCachedTimeMin"
class="form-control datepicker"
class="form-control daterangesinglepicker"
placeholder="@L["StartDate"].Value">
<input type="date"
<input type="text"
id="LastCachedTimeMax"
name="LastCachedTimeMax"
placeholder="@L["EndDate"].Value"
class="form-control datepicker">
class="form-control daterangesinglepicker">
</div>
</abp-column>
@ -156,17 +156,17 @@
<div class="input-group mb-2">
<div class="input-group-text">@L["LastSignificantUpdateTime"].Value</div>
<input type="date"
<input type="text"
id="LastSignificantUpdateTimeMin"
name="LastSignificantUpdateTimeMin"
class="form-control datepicker"
class="form-control daterangesinglepicker"
placeholder="@L["StartDate"].Value">
<input type="date"
<input type="text"
id="LastSignificantUpdateTimeMax"
name="LastSignificantUpdateTimeMax"
placeholder="@L["EndDate"].Value"
class="form-control datepicker">
class="form-control daterangesinglepicker">
</div>
</abp-column>

26
modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js
View File

@ -3,9 +3,33 @@ $(function () {
var service = window.volo.docs.admin.documentsAdmin;
var getFormattedDate = function ($datePicker) {
return $datePicker.data().datepicker.getFormattedDate('yyyy-mm-dd');
var date = moment($datePicker.val());
if (!date.isValid()) {
return null;
}
return date.toISOString();
};
$('.daterangesinglepicker').daterangepicker({
"singleDatePicker": true,
"showDropdowns": true,
"autoUpdateInput": false,
"autoApply": true,
"opens": "center",
"drops": "auto"
});
$('.daterangesinglepicker').on('apply.daterangepicker', function (ev, picker) {
$(this).val(picker.startDate.format('l'));
});
$('.daterangesinglepicker').on('cancel.daterangepicker', function (ev, picker) {
$(this).val('');
});
$('.daterangesinglepicker').on('hide.daterangepicker', function (ev, picker) {
$(this).val('');
});
var getFilter = function () {
return {
projectId: $('#ProjectId').val(),

Write Preview
Loading…
Cancel
Save