From ca4e8fa5879b6fffb2fd89dcae39466146993068 Mon Sep 17 00:00:00 2001 From: Salih Date: Fri, 2 Sep 2022 17:03:25 +0300 Subject: [PATCH] Inputs with date type in the cmskit have been changed to single daterangepicker --- .../Pages/CmsKit/Comments/Details.cshtml | 16 +++--- .../Pages/CmsKit/Comments/Index.cshtml | 6 +-- .../Pages/CmsKit/Comments/details.js | 51 +++++++++---------- .../Pages/CmsKit/Comments/index.js | 51 +++++++++---------- 4 files changed, 62 insertions(+), 62 deletions(-) diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Details.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Details.cshtml index 44047bb8ba..05e042e340 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Details.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Details.cshtml @@ -80,13 +80,15 @@ - - - - - - - + + + + + + + + + diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml index 958621ea9c..9180b62649 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Index.cshtml @@ -39,12 +39,12 @@
- + - + - + diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js index 7cbff6cb4f..13c70a0993 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js @@ -5,38 +5,37 @@ $(function (){ var detailsModal = new abp.ModalManager(abp.appPath + "CmsKit/Comments/DetailsModal"); - $(".input-daterange") - .datepicker({ - todayBtn: "linked", - autoclose: true, - language: abp.localization.currentCulture.cultureName, - }) - .on("hide", function (e) { - e.stopPropagation(); - }); + + var getFormattedDate = function ($datePicker) { + return $datePicker.data('date'); + }; + + + $('.singleDatePicker').daterangepicker({ + "singleDatePicker": true, + "showDropdowns": true, + "autoUpdateInput": false, + "autoApply": true, + "opens": "center", + "drops": "auto", + "minYear": 1901, + "maxYear": 2199, + }); + + $('.singleDatePicker').attr('autocomplete', 'off'); + + $('.singleDatePicker').on('apply.daterangepicker', function (ev, picker) { + $(this).val(picker.startDate.format('l')); + $(this).data('date', picker.startDate.locale('en').format('YYYY-MM-DD')); + }); var filterForm = $('#CmsKitCommentsFilterForm'); var getFilter = function () { var filterObj = filterForm.serializeFormToObject(); - var startDate = luxon.DateTime.fromFormat( - filterObj.creationStartDate, - abp.localization.currentCulture.dateTimeFormat.shortDatePattern, - { locale: abp.localization.currentCulture.cultureName } - ); - if (!startDate.invalid) { - filterObj.creationStartDate = startDate.toFormat("yyyy-MM-dd"); - } - - var endDate = luxon.DateTime.fromFormat( - filterObj.creationEndDate, - abp.localization.currentCulture.dateTimeFormat.shortDatePattern, - { locale: abp.localization.currentCulture.cultureName } - ); - if (!endDate.invalid) { - filterObj.creationEndDate = endDate.toFormat("yyyy-MM-dd"); - } + filterObj.creationStartDate = getFormattedDate($('#creationStartDate')); + filterObj.creationEndDate = getFormattedDate($('#creationEndDate')); return filterObj; }; diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js index 45fe329593..755f83b2a2 100644 --- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js +++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js @@ -5,41 +5,40 @@ $(function (){ var detailsModal = new abp.ModalManager(abp.appPath + "CmsKit/Comments/DetailsModal"); - $(".input-daterange") - .datepicker({ - todayBtn: "linked", - autoclose: true, - language: abp.localization.currentCulture.cultureName, - }) - .on("hide", function (e) { - e.stopPropagation(); - }); + var getFormattedDate = function ($datePicker) { + return $datePicker.data('date'); + }; + + + $('.singleDatePicker').daterangepicker({ + "singleDatePicker": true, + "showDropdowns": true, + "autoUpdateInput": false, + "autoApply": true, + "opens": "center", + "drops": "auto", + "minYear": 1901, + "maxYear": 2199, + }); + + $('.singleDatePicker').attr('autocomplete', 'off'); + + $('.singleDatePicker').on('apply.daterangepicker', function (ev, picker) { + $(this).val(picker.startDate.format('l')); + $(this).data('date', picker.startDate.locale('en').format('YYYY-MM-DD')); + }); var filterForm = $('#CmsKitCommentsFilterForm'); var getFilter = function () { var filterObj = filterForm.serializeFormToObject(); - var startDate = luxon.DateTime.fromFormat( - filterObj.creationStartDate, - abp.localization.currentCulture.dateTimeFormat.shortDatePattern, - { locale: abp.localization.currentCulture.cultureName } - ); - if (!startDate.invalid) { - filterObj.creationStartDate = startDate.toFormat("yyyy-MM-dd"); - } - - var endDate = luxon.DateTime.fromFormat( - filterObj.creationEndDate, - abp.localization.currentCulture.dateTimeFormat.shortDatePattern, - { locale: abp.localization.currentCulture.cultureName } - ); - if (!endDate.invalid) { - filterObj.creationEndDate = endDate.toFormat("yyyy-MM-dd"); - } + filterObj.creationStartDate = getFormattedDate($('#creationStartDate')); + filterObj.creationEndDate = getFormattedDate($('#creationEndDate')); return filterObj; }; + var _dataTable = $('#CommentsTable').DataTable(abp.libs.datatables.normalizeConfiguration({ processing: true,