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

Refactor date handling in comments section to utilize handleDatepicker function and remove redundant date formatting logic

pull/22236/head
maliming 1 year ago
parent
099fb8ad64
commit
1327b1148e
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
4 changed files with 21 additions and 63 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. 22
      modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Approve/index.js
  2. 16
      modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js
  3. 20
      modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js
  4. 26
      modules/docs/src/Volo.Docs.Admin.Web/Pages/Docs/Admin/Documents/index.js

22
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/Approve/index.js
View File

@ -3,17 +3,6 @@
var commentsService = volo.cmsKit.admin.comments.commentAdmin;
moment()._locale.preparse = (string) => string;
moment()._locale.postformat = (string) => string;
var getFormattedDate = function ($datePicker) {
if (!$datePicker.val()) {
return null;
}
var momentDate = moment($datePicker.val(), $datePicker.data('daterangepicker').locale.format);
return momentDate.isValid() ? momentDate.toISOString() : null;
};
var singleDatePicker = $('#CmsKitCommentsApproveWrapper .singledatepicker');
singleDatePicker.daterangepicker({
"singleDatePicker": true,
@ -33,13 +22,10 @@
var filterForm = $('#CmsKitCommentsFilterForm');
var getFilter = function () {
var filterObj = filterForm.serializeFormToObject();
filterObj.creationStartDate = getFormattedDate($('#CreationStartDate'));
filterObj.creationEndDate = getFormattedDate($('#CreationEndDate'));
filterObj.commentApproveState = "Waiting";
return filterObj;
filterForm.handleDatepicker('.singledatepicker');
var formObject = filterForm.serializeFormToObject();
formObject.commentApproveState = "Waiting";
return formObject;
};
var _dataTable = $('#CommentsTable').DataTable(abp.libs.datatables.normalizeConfiguration({

16
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js
View File

@ -8,13 +8,6 @@ $(function (){
if (commentRequireApprovement) {
$('#IsApprovedSelectInput').show();
}
var getFormattedDate = function ($datePicker) {
return $datePicker.data('date');
};
moment.localeData().preparse = (s)=>s;
moment.localeData().postformat = (s)=>s;
var singleDatePicker = $('#CmsKitCommentsDetailsWrapper .singledatepicker');
singleDatePicker.daterangepicker({
@ -38,12 +31,9 @@ $(function (){
var filterForm = $('#CmsKitCommentsFilterForm');
var getFilter = function () {
var filterObj = filterForm.serializeFormToObject();
filterObj.creationStartDate = getFormattedDate($('#creationStartDate'));
filterObj.creationEndDate = getFormattedDate($('#creationEndDate'));
return filterObj;
filterForm.handleDatepicker('.singledatepicker');
var formObject = filterForm.serializeFormToObject();
return formObject;
};
var _dataTable = $('#CommentsTable').DataTable(abp.libs.datatables.normalizeConfiguration({

20
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js
View File

@ -3,9 +3,6 @@ $(function () {
var commentsService = volo.cmsKit.admin.comments.commentAdmin;
moment()._locale.preparse = (string) => string;
moment()._locale.postformat = (string) => string;
var commentRequireApprovement = abp.setting.getBoolean("CmsKit.Comments.RequireApprovement");
if (commentRequireApprovement) {
@ -13,14 +10,6 @@ $(function () {
$('#IsApprovedSelectInput').show();
}
var getFormattedDate = function ($datePicker) {
if (!$datePicker.val()) {
return null;
}
var momentDate = moment($datePicker.val(), $datePicker.data('daterangepicker').locale.format);
return momentDate.isValid() ? momentDate.toISOString() : null;
};
var singleDatePicker = $('#CmsKitCommentsWrapper .singledatepicker');
singleDatePicker.daterangepicker({
"singleDatePicker": true,
@ -40,12 +29,9 @@ $(function () {
var filterForm = $('#CmsKitCommentsFilterForm');
var getFilter = function () {
var filterObj = filterForm.serializeFormToObject();
filterObj.creationStartDate = getFormattedDate($('#CreationStartDate'));
filterObj.creationEndDate = getFormattedDate($('#CreationEndDate'));
return filterObj;
filterForm.handleDatepicker('.singledatepicker');
var formObject = filterForm.serializeFormToObject();
return formObject;
};
var _dataTable = $('#CommentsTable').DataTable(abp.libs.datatables.normalizeConfiguration({

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

@ -2,13 +2,6 @@ $(function () {
var l = abp.localization.getResource('Docs');
var service = window.volo.docs.admin.documentsAdmin;
var getFormattedDate = function ($datePicker) {
return $datePicker.data('date');
};
moment.localeData().preparse = (s)=>s;
moment.localeData().postformat = (s)=>s;
var singleDatePicker = $('#DocumentsContainer .singledatepicker');
singleDatePicker.daterangepicker({
"singleDatePicker": true,
@ -131,23 +124,26 @@ $(function () {
var getFilter = function () {
$('#DocumentsContainer').handleDatepicker('.singledatepicker');
return {
projectId: $('#ProjectId').val(),
name: $('#Name').val(),
version: $('#Version').val(),
languageCode: $('#LanguageCode').val(),
format: $('#Format').val(),
creationTimeMin: getFormattedDate($('#CreationTimeMin')),
creationTimeMax: getFormattedDate($('#CreationTimeMax')),
lastUpdatedTimeMin: getFormattedDate($('#LastUpdatedTimeMin')),
lastUpdatedTimeMax: getFormattedDate($('#LastUpdatedTimeMax')),
lastSignificantUpdateTimeMin: getFormattedDate($('#LastSignificantUpdateTimeMin')),
lastSignificantUpdateTimeMax: getFormattedDate($('#LastSignificantUpdateTimeMax')),
lastCachedTimeMin: getFormattedDate($('#LastCachedTimeMin')),
lastCachedTimeMax: getFormattedDate($('#LastCachedTimeMax')),
creationTimeMin: $('#DocumentsContainer').find('input[name="CreationTimeMin"'),
creationTimeMax: $('#DocumentsContainer').find('input[name="CreationTimeMax"'),
lastUpdatedTimeMin: $('#DocumentsContainer').find('input[name="LastUpdatedTimeMin"'),
lastUpdatedTimeMax: $('#DocumentsContainer').find('input[name="LastUpdatedTimeMax"'),
lastSignificantUpdateTimeMin: $('#DocumentsContainer').find('input[name="LastSignificantUpdateTimeMin"'),
lastSignificantUpdateTimeMax: $('#DocumentsContainer').find('input[name="LastSignificantUpdateTimeMax"'),
lastCachedTimeMin: $('#DocumentsContainer').find('input[name="LastCachedTimeMin"'),
lastCachedTimeMax: $('#DocumentsContainer').find('input[name="LastCachedTimeMax"'),
};
};
var parseDateToLocaleDateString = function (date) {
var parsedDate = Date.parse(date);
return new Date(parsedDate).toLocaleDateString(

Write Preview
Loading…
Cancel
Save