vrubel/scheduleSon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update timezone from Europe/London to Europe/Moscow across configuration, backend, and frontend files for consistent time handling.

Browse source
This commit is contained in:
vrubel 2025-12-30 14:26:14 +03:00
parent 457dc74485
commit 60409362c7
8 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -16,7 +16,7 @@ COPY backend/ ./backend/
COPY frontend/ ./frontend/ COPY frontend/ ./frontend/
# Переменные окружения # Переменные окружения
ENV TZ=Europe/London ENV TZ=Europe/Moscow
ENV PYTHONPATH=/app ENV PYTHONPATH=/app
# Запуск приложения # Запуск приложения

2
README.md
View file

@ -103,7 +103,7 @@ docker compose exec backend python -c "import shutil; shutil.copy2('/app/data/sc
## Особенности ## Особенности
- Таймзона: Europe/London - Таймзона: Europe/Moscow
- Неделя начинается с понедельника - Неделя начинается с понедельника
- Дискретность времени: 15 минут (00, 15, 30, 45) - Дискретность времени: 15 минут (00, 15, 30, 45)
- Диапазон времени: 08:00-20:00 - Диапазон времени: 08:00-20:00

2
backend/api.py
View file

@ -17,7 +17,7 @@ from backend.utils import (
router = APIRouter() router = APIRouter()
TZ = pytz.timezone("Europe/London") TZ = pytz.timezone("Europe/Moscow")
@router.get("/schedule", response_model=ScheduleResponse) @router.get("/schedule", response_model=ScheduleResponse)

2
backend/telegram_bot.py
View file

@ -18,7 +18,7 @@ from backend.models import TaskCreate, EventCreate
logging.basicConfig(level=logging.INFO) logging.basicConfig(level=logging.INFO)
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
TZ = pytz.timezone("Europe/London") TZ = pytz.timezone("Europe/Moscow")
BOT_TOKEN = os.getenv("TELEGRAM_BOT_TOKEN", "") BOT_TOKEN = os.getenv("TELEGRAM_BOT_TOKEN", "")
# Состояния для ConversationHandler # Состояния для ConversationHandler

2
backend/utils.py
View file

@ -6,7 +6,7 @@ import pytz
from backend.database import Task, Event, WeeklyTaskException from backend.database import Task, Event, WeeklyTaskException
from backend.models import ScheduleItem from backend.models import ScheduleItem
TZ = pytz.timezone("Europe/London") TZ = pytz.timezone("Europe/Moscow")
def get_weekday_from_date(date_str: str) -> int: def get_weekday_from_date(date_str: str) -> int:

2
docker-compose.yml
View file

@ -10,7 +10,7 @@ services:
env_file: env_file:
- .env - .env
environment: environment:
- TZ=Europe/London - TZ=Europe/Moscow
- DATABASE_PATH=/app/data/schedule.db - DATABASE_PATH=/app/data/schedule.db
restart: unless-stopped restart: unless-stopped
depends_on: depends_on:

2
frontend/admin/static/script.js
View file

@ -7,7 +7,7 @@ function getTodayInLondon() {
// Получаем текущую дату в таймзоне London // Получаем текущую дату в таймзоне London
const now = new Date(); const now = new Date();
const formatter = new Intl.DateTimeFormat('en-CA', { const formatter = new Intl.DateTimeFormat('en-CA', {
timeZone: 'Europe/London', timeZone: 'Europe/Moscow',
year: 'numeric', year: 'numeric',
month: '2-digit', month: '2-digit',
day: '2-digit' day: '2-digit'

12
frontend/public/static/script.js
View file

@ -1,4 +1,4 @@
const TZ = 'Europe/London'; const TZ = 'Europe/Moscow';
function formatDate(dateStr) { function formatDate(dateStr) {
const date = new Date(dateStr + 'T00:00:00'); const date = new Date(dateStr + 'T00:00:00');
@ -17,11 +17,11 @@ function formatDate(dateStr) {
return `${weekday}, ${day} ${month}`; return `${weekday}, ${day} ${month}`;
} }
function getTodayInLondon() { function getTodayInMoscow() {
// Получаем текущую дату в таймзоне London // Получаем текущую дату в таймзоне Moscow
const now = new Date(); const now = new Date();
const formatter = new Intl.DateTimeFormat('en-CA', { const formatter = new Intl.DateTimeFormat('en-CA', {
timeZone: 'Europe/London', timeZone: 'Europe/Moscow',
year: 'numeric', year: 'numeric',
month: '2-digit', month: '2-digit',
day: '2-digit' day: '2-digit'
@ -30,7 +30,7 @@ function getTodayInLondon() {
} }
function getTomorrowInLondon() { function getTomorrowInLondon() {
const today = getTodayInLondon(); const today = getTodayInMoscow();
const date = new Date(today); const date = new Date(today);
date.setDate(date.getDate() + 1); date.setDate(date.getDate() + 1);
return date.toISOString().split('T')[0]; return date.toISOString().split('T')[0];
@ -80,7 +80,7 @@ function calculateEndTime(startTime, durationMin) {
} }
async function loadSchedule() { async function loadSchedule() {
const today = getTodayInLondon(); const today = getTodayInMoscow();
const tomorrow = getTomorrowInLondon(); const tomorrow = getTomorrowInLondon();
console.log('Loading schedule from', today, 'to', tomorrow); console.log('Loading schedule from', today, 'to', tomorrow);