7x31/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-08-08 13:51:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

[WIP] Handle timezone offset for timeRange

Browse Source
This commit is contained in:
Louis Lam
2022-09-25 19:38:28 +08:00
parent f11dfc8f43
commit 3f63cb246b
7 changed files with 110 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
server/model/maintenance.js
View File

@@ -4,17 +4,19 @@ let timezone = require("dayjs/plugin/timezone");
dayjs.extend(utc);
dayjs.extend(timezone);
const { BeanModel } = require("redbean-node/dist/bean-model");
const { parseVueDatePickerTimeFormat, parseTimeFormatFromVueDatePicker } = require("../../src/util");
const { parseTimeObject, parseTimeFromTimeObject } = require("../../src/util");
const { isArray } = require("chart.js/helpers");
const { timeObjectToUTC, timeObjectToLocal } = require("../util-server");
class Maintenance extends BeanModel {
/**
* Return an object that ready to parse to JSON for public
* Only show necessary data to public
* @param {string} timezone If not specified, the timeRange will be in UTC
* @returns {Object}
*/
async toPublicJSON() {
async toPublicJSON(timezone = null) {
let dateTimeRange = [];
if (this.start_datetime) {
@@ -33,11 +35,21 @@ class Maintenance extends BeanModel {
}
let timeRange = [];
let startTime = parseVueDatePickerTimeFormat(this.start_time);
let startTime = parseTimeObject(this.start_time);
timeRange.push(startTime);
let endTime = parseVueDatePickerTimeFormat(this.end_time);
let endTime = parseTimeObject(this.end_time);
timeRange.push(endTime);
// Apply timezone offset
if (timezone) {
if (this.start_time) {
timeObjectToLocal(startTime, timezone);
}
if (this.end_time) {
timeObjectToLocal(endTime, timezone);
}
}
let obj = {
id: this.id,
title: this.title,
@@ -65,17 +77,28 @@ class Maintenance extends BeanModel {
/**
* Return an object that ready to parse to JSON
* @param {string} timezone If not specified, the timeRange will be in UTC
* @returns {Object}
*/
async toJSON() {
return this.toPublicJSON();
async toJSON(timezone = null) {
return this.toPublicJSON(timezone);
}
static jsonToBean(bean, obj) {
static jsonToBean(bean, obj, timezone) {
if (obj.id) {
bean.id = obj.id;
}
// Apply timezone offset to timeRange, as it cannot apply automatically.
if (timezone) {
if (obj.timeRange[0]) {
timeObjectToUTC(obj.timeRange[0], timezone);
if (obj.timeRange[1]) {
timeObjectToUTC(obj.timeRange[1], timezone);
}
}
}
bean.title = obj.title;
bean.description = obj.description;
bean.strategy = obj.strategy;
@@ -98,8 +121,8 @@ class Maintenance extends BeanModel {
}
}
bean.start_time = parseTimeFormatFromVueDatePicker(obj.timeRange[0]);
bean.end_time = parseTimeFormatFromVueDatePicker(obj.timeRange[1]);
bean.start_time = parseTimeFromTimeObject(obj.timeRange[0]);
bean.end_time = parseTimeFromTimeObject(obj.timeRange[1]);
bean.weekdays = JSON.stringify(obj.weekdays);
bean.days_of_month = JSON.stringify(obj.daysOfMonth);