-
+
+
@L["TimezoneHelpText"].Value
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/TimeZoneSettingGroup/Default.js b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/TimeZoneSettingGroup/Default.js
index d6e720dbe3..10dfc1a0d6 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/TimeZoneSettingGroup/Default.js
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/TimeZoneSettingGroup/Default.js
@@ -3,13 +3,28 @@
var l = abp.localization.getResource('AbpSettingManagement');
+ var select2 = null;
+ volo.abp.settingManagement.timeZoneSettings.getTimezones().then(function (result) {
+ var data = $.map(result, function (obj) {
+ obj.id = obj.value;
+ obj.text = obj.name;
+ return obj;
+ });
+
+ select2 = $("#timezone-select").select2({
+ data: data
+ });
+
+ volo.abp.settingManagement.timeZoneSettings.get().then(function (result) {
+ select2.val(result).trigger("change");
+ });
+ });
+
$("#TimeZoneSettingsForm").on('submit', function (event) {
event.preventDefault();
-
- volo.abp.settingManagement.timeZoneSettings.update($("#Timezone").val()).then(function (result) {
+ volo.abp.settingManagement.timeZoneSettings.update(select2.find(':selected')[0].value).then(function (result) {
$(document).trigger("AbpSettingSaved");
});
-
});
});
})(jQuery);
diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/TimeZoneSettingGroup/TimeZoneSettingGroupViewComponent.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/TimeZoneSettingGroup/TimeZoneSettingGroupViewComponent.cs
index eaf24ab2f2..9c22152a6f 100644
--- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/TimeZoneSettingGroup/TimeZoneSettingGroupViewComponent.cs
+++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/TimeZoneSettingGroup/TimeZoneSettingGroupViewComponent.cs
@@ -1,42 +1,18 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.Rendering;
using Volo.Abp.AspNetCore.Mvc;
-using Volo.Abp.Auditing;
-using Volo.Abp.Timing.Localization.Resources.AbpTiming;
namespace Volo.Abp.SettingManagement.Web.Pages.SettingManagement.Components.TimeZoneSettingGroup;
public class TimeZoneSettingGroupViewComponent : AbpViewComponent
{
- protected ITimeZoneSettingsAppService TimeZoneSettingsAppService { get; }
-
public TimeZoneSettingGroupViewComponent(ITimeZoneSettingsAppService timeZoneSettingsAppService)
{
ObjectMapperContext = typeof(AbpSettingManagementWebModule);
- TimeZoneSettingsAppService = timeZoneSettingsAppService;
}
public virtual async Task InvokeAsync()
{
- var timezone = await TimeZoneSettingsAppService.GetAsync();
- var timezones = await TimeZoneSettingsAppService.GetTimezonesAsync();
- var model = new UpdateTimezoneSettingsViewModel()
- {
- Timezone = timezone,
- TimeZoneItems = new List()
- };
- model.TimeZoneItems.AddRange(timezones.Select(x => new SelectListItem(x.Name, x.Value)).ToList());
- return View("~/Pages/SettingManagement/Components/TimeZoneSettingGroup/Default.cshtml", model);
- }
-
- public class UpdateTimezoneSettingsViewModel
- {
- public string Timezone { get; set; }
-
- public List TimeZoneItems { get; set; }
+ return View("~/Pages/SettingManagement/Components/TimeZoneSettingGroup/Default.cshtml");
}
}
diff --git a/npm/packs/core/src/abp.js b/npm/packs/core/src/abp.js
index 05c9f3bbe5..9972039e2b 100644
--- a/npm/packs/core/src/abp.js
+++ b/npm/packs/core/src/abp.js
@@ -748,9 +748,9 @@ var abp = abp || {};
abp.clock.kind = 'Unspecified';
- abp.clock.supportsMultipleTimezone = function () {
- return abp.clock.kind === 'Utc';
- };
+ abp.clock.supportsMultipleTimezone = abp.clock.kind === 'Utc';
+
+ abp.clock.timeZone = abp.setting.get('Abp.Timing.TimeZone');
// Normalize Date object or date string to standard string format that will be sent to server
abp.clock.normalizeToString = function (date) {
@@ -763,7 +763,7 @@ var abp = abp || {};
return date;
}
- if (abp.clock.kind === 'Utc') {
+ if (abp.clock.supportsMultipleTimezone) {
return dateObj.toISOString();
}
@@ -787,8 +787,11 @@ var abp = abp || {};
padMilliseconds(dateObj.getMilliseconds());
};
+ // Default options for toLocaleString
+ abp.clock.toLocaleStringOptions = abp.clock.toLocaleStringOptions || {};
+
// Normalize date string to locale date string that will be displayed to user
- abp.clock.normalizeToLocaleString = function (dateString) {
+ abp.clock.normalizeToLocaleString = function (dateString, options) {
if (!dateString) {
return dateString;
}
@@ -797,8 +800,14 @@ var abp = abp || {};
if (isNaN(date)) {
return dateString;
}
-
- //TODO: Get timezone setting and pass it to toLocaleString
+
+ if (abp.clock.supportsMultipleTimezone) {
+ var timezone = abp.clock.timeZone;
+ if (timezone) {
+ options = options || {};
+ return date.toLocaleString(abp.localization.currentCulture.cultureName, Object.assign({}, abp.clock.toLocaleStringOptions, options, { timeZone: timezone }));
+ }
+ }
return date.toLocaleString();
}