Add system announcement feature.
This commit is contained in:
240
app.py
240
app.py
@@ -1,5 +1,5 @@
|
||||
from flask import Flask, render_template, request, redirect, url_for, jsonify, flash, session, g, Response, send_file
|
||||
from models import db, TimeEntry, WorkConfig, User, SystemSettings, Team, Role, Project, Company, CompanyWorkConfig, UserPreferences, WorkRegion, AccountType, ProjectCategory, Task, SubTask, TaskStatus, TaskPriority
|
||||
from models import db, TimeEntry, WorkConfig, User, SystemSettings, Team, Role, Project, Company, CompanyWorkConfig, UserPreferences, WorkRegion, AccountType, ProjectCategory, Task, SubTask, TaskStatus, TaskPriority, Announcement
|
||||
from data_formatting import (
|
||||
format_duration, prepare_export_data, prepare_team_hours_export_data,
|
||||
format_table_data, format_graph_data, format_team_data
|
||||
@@ -167,13 +167,46 @@ def initialize_app():
|
||||
@app.context_processor
|
||||
def inject_globals():
|
||||
"""Make certain variables available to all templates."""
|
||||
# Get active announcements for current user
|
||||
active_announcements = []
|
||||
if g.user:
|
||||
active_announcements = Announcement.get_active_announcements_for_user(g.user)
|
||||
|
||||
# Get tracking script settings
|
||||
tracking_script_enabled = False
|
||||
tracking_script_code = ''
|
||||
|
||||
try:
|
||||
tracking_enabled_setting = SystemSettings.query.filter_by(key='tracking_script_enabled').first()
|
||||
if tracking_enabled_setting:
|
||||
tracking_script_enabled = tracking_enabled_setting.value == 'true'
|
||||
|
||||
tracking_code_setting = SystemSettings.query.filter_by(key='tracking_script_code').first()
|
||||
if tracking_code_setting:
|
||||
tracking_script_code = tracking_code_setting.value
|
||||
except Exception:
|
||||
pass # In case database isn't available yet
|
||||
return {
|
||||
'Role': Role,
|
||||
'AccountType': AccountType,
|
||||
'current_year': datetime.now().year
|
||||
'current_year': datetime.now().year,
|
||||
'active_announcements': active_announcements,
|
||||
'tracking_script_enabled': tracking_script_enabled,
|
||||
'tracking_script_code': tracking_script_code
|
||||
}
|
||||
|
||||
# Template filters for date/time formatting
|
||||
@app.template_filter('from_json')
|
||||
def from_json_filter(json_str):
|
||||
"""Parse JSON string to Python object."""
|
||||
if not json_str:
|
||||
return []
|
||||
try:
|
||||
import json
|
||||
return json.loads(json_str)
|
||||
except (json.JSONDecodeError, TypeError):
|
||||
return []
|
||||
|
||||
@app.template_filter('format_date')
|
||||
def format_date_filter(dt):
|
||||
"""Format date according to user preferences."""
|
||||
@@ -1937,6 +1970,8 @@ def system_admin_settings():
|
||||
# Update system settings
|
||||
registration_enabled = request.form.get('registration_enabled') == 'on'
|
||||
email_verification = request.form.get('email_verification_required') == 'on'
|
||||
tracking_script_enabled = request.form.get('tracking_script_enabled') == 'on'
|
||||
tracking_script_code = request.form.get('tracking_script_code', '')
|
||||
|
||||
# Update or create settings
|
||||
reg_setting = SystemSettings.query.filter_by(key='registration_enabled').first()
|
||||
@@ -1961,6 +1996,28 @@ def system_admin_settings():
|
||||
)
|
||||
db.session.add(email_setting)
|
||||
|
||||
tracking_enabled_setting = SystemSettings.query.filter_by(key='tracking_script_enabled').first()
|
||||
if tracking_enabled_setting:
|
||||
tracking_enabled_setting.value = 'true' if tracking_script_enabled else 'false'
|
||||
else:
|
||||
tracking_enabled_setting = SystemSettings(
|
||||
key='tracking_script_enabled',
|
||||
value='true' if tracking_script_enabled else 'false',
|
||||
description='Controls whether custom tracking script is enabled'
|
||||
)
|
||||
db.session.add(tracking_enabled_setting)
|
||||
|
||||
tracking_code_setting = SystemSettings.query.filter_by(key='tracking_script_code').first()
|
||||
if tracking_code_setting:
|
||||
tracking_code_setting.value = tracking_script_code
|
||||
else:
|
||||
tracking_code_setting = SystemSettings(
|
||||
key='tracking_script_code',
|
||||
value=tracking_script_code,
|
||||
description='Custom tracking script code (HTML/JavaScript)'
|
||||
)
|
||||
db.session.add(tracking_code_setting)
|
||||
|
||||
db.session.commit()
|
||||
flash('System settings updated successfully.', 'success')
|
||||
return redirect(url_for('system_admin_settings'))
|
||||
@@ -1973,6 +2030,10 @@ def system_admin_settings():
|
||||
settings['registration_enabled'] = setting.value == 'true'
|
||||
elif setting.key == 'email_verification_required':
|
||||
settings['email_verification_required'] = setting.value == 'true'
|
||||
elif setting.key == 'tracking_script_enabled':
|
||||
settings['tracking_script_enabled'] = setting.value == 'true'
|
||||
elif setting.key == 'tracking_script_code':
|
||||
settings['tracking_script_code'] = setting.value
|
||||
|
||||
# System statistics
|
||||
total_companies = Company.query.count()
|
||||
@@ -1986,6 +2047,181 @@ def system_admin_settings():
|
||||
total_users=total_users,
|
||||
total_system_admins=total_system_admins)
|
||||
|
||||
@app.route('/system-admin/announcements')
|
||||
@system_admin_required
|
||||
def system_admin_announcements():
|
||||
"""System Admin: Manage announcements"""
|
||||
page = request.args.get('page', 1, type=int)
|
||||
per_page = 20
|
||||
|
||||
announcements = Announcement.query.order_by(Announcement.created_at.desc()).paginate(
|
||||
page=page, per_page=per_page, error_out=False)
|
||||
|
||||
return render_template('system_admin_announcements.html',
|
||||
title='System Admin - Announcements',
|
||||
announcements=announcements)
|
||||
|
||||
@app.route('/system-admin/announcements/new', methods=['GET', 'POST'])
|
||||
@system_admin_required
|
||||
def system_admin_announcement_new():
|
||||
"""System Admin: Create new announcement"""
|
||||
if request.method == 'POST':
|
||||
title = request.form.get('title')
|
||||
content = request.form.get('content')
|
||||
announcement_type = request.form.get('announcement_type', 'info')
|
||||
is_urgent = request.form.get('is_urgent') == 'on'
|
||||
is_active = request.form.get('is_active') == 'on'
|
||||
|
||||
# Handle date fields
|
||||
start_date = request.form.get('start_date')
|
||||
end_date = request.form.get('end_date')
|
||||
|
||||
start_datetime = None
|
||||
end_datetime = None
|
||||
|
||||
if start_date:
|
||||
try:
|
||||
start_datetime = datetime.strptime(start_date, '%Y-%m-%dT%H:%M')
|
||||
except ValueError:
|
||||
pass
|
||||
|
||||
if end_date:
|
||||
try:
|
||||
end_datetime = datetime.strptime(end_date, '%Y-%m-%dT%H:%M')
|
||||
except ValueError:
|
||||
pass
|
||||
|
||||
# Handle targeting
|
||||
target_all_users = request.form.get('target_all_users') == 'on'
|
||||
target_roles = None
|
||||
target_companies = None
|
||||
|
||||
if not target_all_users:
|
||||
selected_roles = request.form.getlist('target_roles')
|
||||
selected_companies = request.form.getlist('target_companies')
|
||||
|
||||
if selected_roles:
|
||||
import json
|
||||
target_roles = json.dumps(selected_roles)
|
||||
|
||||
if selected_companies:
|
||||
import json
|
||||
target_companies = json.dumps([int(c) for c in selected_companies])
|
||||
|
||||
announcement = Announcement(
|
||||
title=title,
|
||||
content=content,
|
||||
announcement_type=announcement_type,
|
||||
is_urgent=is_urgent,
|
||||
is_active=is_active,
|
||||
start_date=start_datetime,
|
||||
end_date=end_datetime,
|
||||
target_all_users=target_all_users,
|
||||
target_roles=target_roles,
|
||||
target_companies=target_companies,
|
||||
created_by_id=g.user.id
|
||||
)
|
||||
|
||||
db.session.add(announcement)
|
||||
db.session.commit()
|
||||
|
||||
flash('Announcement created successfully.', 'success')
|
||||
return redirect(url_for('system_admin_announcements'))
|
||||
|
||||
# Get roles and companies for targeting options
|
||||
roles = [role.value for role in Role]
|
||||
companies = Company.query.order_by(Company.name).all()
|
||||
|
||||
return render_template('system_admin_announcement_form.html',
|
||||
title='Create Announcement',
|
||||
announcement=None,
|
||||
roles=roles,
|
||||
companies=companies)
|
||||
|
||||
@app.route('/system-admin/announcements/<int:id>/edit', methods=['GET', 'POST'])
|
||||
@system_admin_required
|
||||
def system_admin_announcement_edit(id):
|
||||
"""System Admin: Edit announcement"""
|
||||
announcement = Announcement.query.get_or_404(id)
|
||||
|
||||
if request.method == 'POST':
|
||||
announcement.title = request.form.get('title')
|
||||
announcement.content = request.form.get('content')
|
||||
announcement.announcement_type = request.form.get('announcement_type', 'info')
|
||||
announcement.is_urgent = request.form.get('is_urgent') == 'on'
|
||||
announcement.is_active = request.form.get('is_active') == 'on'
|
||||
|
||||
# Handle date fields
|
||||
start_date = request.form.get('start_date')
|
||||
end_date = request.form.get('end_date')
|
||||
|
||||
if start_date:
|
||||
try:
|
||||
announcement.start_date = datetime.strptime(start_date, '%Y-%m-%dT%H:%M')
|
||||
except ValueError:
|
||||
announcement.start_date = None
|
||||
else:
|
||||
announcement.start_date = None
|
||||
|
||||
if end_date:
|
||||
try:
|
||||
announcement.end_date = datetime.strptime(end_date, '%Y-%m-%dT%H:%M')
|
||||
except ValueError:
|
||||
announcement.end_date = None
|
||||
else:
|
||||
announcement.end_date = None
|
||||
|
||||
# Handle targeting
|
||||
announcement.target_all_users = request.form.get('target_all_users') == 'on'
|
||||
|
||||
if not announcement.target_all_users:
|
||||
selected_roles = request.form.getlist('target_roles')
|
||||
selected_companies = request.form.getlist('target_companies')
|
||||
|
||||
if selected_roles:
|
||||
import json
|
||||
announcement.target_roles = json.dumps(selected_roles)
|
||||
else:
|
||||
announcement.target_roles = None
|
||||
|
||||
if selected_companies:
|
||||
import json
|
||||
announcement.target_companies = json.dumps([int(c) for c in selected_companies])
|
||||
else:
|
||||
announcement.target_companies = None
|
||||
else:
|
||||
announcement.target_roles = None
|
||||
announcement.target_companies = None
|
||||
|
||||
announcement.updated_at = datetime.now()
|
||||
|
||||
db.session.commit()
|
||||
|
||||
flash('Announcement updated successfully.', 'success')
|
||||
return redirect(url_for('system_admin_announcements'))
|
||||
|
||||
# Get roles and companies for targeting options
|
||||
roles = [role.value for role in Role]
|
||||
companies = Company.query.order_by(Company.name).all()
|
||||
|
||||
return render_template('system_admin_announcement_form.html',
|
||||
title='Edit Announcement',
|
||||
announcement=announcement,
|
||||
roles=roles,
|
||||
companies=companies)
|
||||
|
||||
@app.route('/system-admin/announcements/<int:id>/delete', methods=['POST'])
|
||||
@system_admin_required
|
||||
def system_admin_announcement_delete(id):
|
||||
"""System Admin: Delete announcement"""
|
||||
announcement = Announcement.query.get_or_404(id)
|
||||
|
||||
db.session.delete(announcement)
|
||||
db.session.commit()
|
||||
|
||||
flash('Announcement deleted successfully.', 'success')
|
||||
return redirect(url_for('system_admin_announcements'))
|
||||
|
||||
@app.route('/admin/work-policies', methods=['GET', 'POST'])
|
||||
@admin_required
|
||||
@company_required
|
||||
|
||||
Reference in New Issue
Block a user