Compare commits

...

3 Commits

Author SHA1 Message Date
4f66edbb21 fix index route
All checks were successful
Test Build / test-build (push) Successful in 3s
2025-07-30 19:22:10 +03:00
38f35d1915 fix old config format
All checks were successful
Test Build / test-build (push) Successful in 2s
2025-07-30 19:17:16 +03:00
ca8e70781c fix empty base on 1st start
All checks were successful
Test Build / test-build (push) Successful in 1s
2025-07-30 18:55:23 +03:00
2 changed files with 50 additions and 23 deletions

5
app.py
View File

@@ -1,5 +1,6 @@
import os
from flask import Flask, session, request
from sqlalchemy import inspect
from dotenv import load_dotenv
# 1. Загрузка переменных окружения - в самом верху
@@ -62,12 +63,14 @@ def create_app():
login_manager.login_message_category = "info"
with app.app_context():
if inspect(db.engine).has_table('user_config'):
from models import User, UserConfig
all_configs = UserConfig.query.all()
for config in all_configs:
user_id = config.user_id
mappings = config.mappings
for sheer_title, params in mappings.items():
if isinstance(params, dict):
cron_schedule = params.get('schedule_cron')
if cron_schedule:
job_id = f"user_{user_id}_sheet_{sheer_title}"
@@ -82,6 +85,8 @@ def create_app():
app.logger.info(f"Job {job_id} loaded on startup.")
except Exception as e:
app.logger.error(f"Failed to load job {job_id}: {e}")
else:
app.logger.warning("Database tables not found. Skipping job loading on startup. Run 'flask init-db' to create the tables.")
scheduler.start()
# --- Регистрация команд CLI ---

View File

@@ -131,13 +131,24 @@ def logout():
@login_required
def index():
config = g.user_config
clean_mappings = {}
if config.mappings:
for key, value in config.mappings.items():
if isinstance(value, dict):
clean_mappings[key] = value
else:
clean_mappings[key] = {
'report_id': value,
'schedule_cron': None,
'schedule_period': None
}
return render_template(
'index.html',
rms_config=config.get_rms_dict(),
google_config=config.get_google_dict(),
presets=config.presets,
sheets=config.sheets,
mappings=config.mappings,
mappings=clean_mappings,
client_email=config.google_client_email
)
@@ -291,10 +302,18 @@ def mapping_set():
if selected_report_id:
# Получаем существующие данные расписания для этого листа
existing_schedule = current_mappings.get(sheet['title'], {})
schedule_cron = None
schedule_period = None
if isinstance(existing_mapping_value, dict):
schedule_cron = existing_mapping_value.get('schedule_cron')
schedule_period = existing_mapping_value.get('schedule_period')
# Сохраняем новые настройки расписания в новом словаре
new_mappings[sheet['title']] = {
'report_id': selected_report_id,
'schedule_cron': existing_schedule.get('schedule_cron'),
'schedule_period': existing_schedule.get('schedule_period')
'schedule_cron': schedule_cron,
'schedule_period': schedule_period
}
config.mappings = new_mappings
@@ -462,6 +481,9 @@ def save_schedule():
updated_mappings = config.mappings or {}
for sheet_title, params in updated_mappings.items():
if not isinstance(params, dict):
continue
cron_value = request.form.get(f"cron-{sheet_title}", "").strip()
period_value = request.form.get(f"period-{sheet_title}", "").strip()