Add system announcement feature.

This commit is contained in:
2025-07-04 08:05:11 +02:00
parent 667040d7f8
commit e31401a939
8 changed files with 1105 additions and 4 deletions

View File

@@ -58,6 +58,7 @@
{% if g.user.role == Role.SYSTEM_ADMIN %}
<li class="nav-divider">System Admin</li>
<li><a href="{{ url_for('system_admin_dashboard') }}" data-tooltip="System Dashboard"><i class="nav-icon">🌐</i><span class="nav-text">System Dashboard</span></a></li>
<li><a href="{{ url_for('system_admin_announcements') }}" data-tooltip="Announcements"><i class="nav-icon">📢</i><span class="nav-text">Announcements</span></a></li>
{% endif %}
{% elif g.user.role in [Role.TEAM_LEADER, Role.SUPERVISOR] %}
<li class="nav-divider">{{ g.user.username }}</li>
@@ -88,6 +89,30 @@
<div class="mobile-overlay" id="mobile-overlay"></div>
<main class="main-content">
<!-- System Announcements -->
{% if active_announcements %}
<div class="announcements">
{% for announcement in active_announcements %}
<div class="alert alert-{{ announcement.announcement_type }}{% if announcement.is_urgent %} alert-urgent{% endif %}">
<div class="announcement-header">
<strong>{{ announcement.title }}</strong>
{% if announcement.is_urgent %}
<span class="urgent-badge">URGENT</span>
{% endif %}
</div>
<div class="announcement-content">
{{ announcement.content|safe }}
</div>
{% if announcement.created_at %}
<small class="announcement-date">
Posted: {{ announcement.created_at.strftime('%Y-%m-%d %H:%M') }}
</small>
{% endif %}
</div>
{% endfor %}
</div>
{% endif %}
{% with messages = get_flashed_messages(with_categories=true) %}
{% if messages %}
<div class="flash-messages">
@@ -107,5 +132,10 @@
<script src="{{ url_for('static', filename='js/script.js') }}"></script>
<script src="{{ url_for('static', filename='js/sidebar.js') }}"></script>
<!-- Custom Tracking Script -->
{% if tracking_script_enabled and tracking_script_code %}
{{ tracking_script_code|safe }}
{% endif %}
</body>
</html>

View File

@@ -0,0 +1,369 @@
{% extends "layout.html" %}
{% block content %}
<div class="container">
<div class="header-section">
<h1>{{ "Edit" if announcement else "Create" }} Announcement</h1>
<p class="subtitle">{{ "Update" if announcement else "Create new" }} system announcement for users</p>
<a href="{{ url_for('system_admin_announcements') }}" class="btn btn-secondary">
← Back to Announcements
</a>
</div>
<div class="form-section">
<form method="POST" class="announcement-form">
<div class="form-group">
<label for="title">Title</label>
<input type="text"
id="title"
name="title"
value="{{ announcement.title if announcement else '' }}"
required
maxlength="200"
class="form-control">
</div>
<div class="form-group">
<label for="content">Content</label>
<textarea id="content"
name="content"
required
rows="6"
class="form-control">{{ announcement.content if announcement else '' }}</textarea>
<small class="form-text">You can use HTML formatting in the content.</small>
</div>
<div class="form-row">
<div class="form-group">
<label for="announcement_type">Type</label>
<select id="announcement_type" name="announcement_type" class="form-control">
<option value="info" {{ 'selected' if announcement and announcement.announcement_type == 'info' else '' }}>Info</option>
<option value="warning" {{ 'selected' if announcement and announcement.announcement_type == 'warning' else '' }}>Warning</option>
<option value="success" {{ 'selected' if announcement and announcement.announcement_type == 'success' else '' }}>Success</option>
<option value="danger" {{ 'selected' if announcement and announcement.announcement_type == 'danger' else '' }}>Danger</option>
</select>
</div>
<div class="form-group">
<label class="checkbox-container">
<input type="checkbox"
name="is_urgent"
{{ 'checked' if announcement and announcement.is_urgent else '' }}>
<span class="checkmark"></span>
Mark as Urgent
</label>
</div>
<div class="form-group">
<label class="checkbox-container">
<input type="checkbox"
name="is_active"
{{ 'checked' if not announcement or announcement.is_active else '' }}>
<span class="checkmark"></span>
Active
</label>
</div>
</div>
<div class="form-section">
<h3>Scheduling</h3>
<div class="form-row">
<div class="form-group">
<label for="start_date">Start Date/Time (Optional)</label>
<input type="datetime-local"
id="start_date"
name="start_date"
value="{{ announcement.start_date.strftime('%Y-%m-%dT%H:%M') if announcement and announcement.start_date else '' }}"
class="form-control">
<small class="form-text">Leave empty to show immediately</small>
</div>
<div class="form-group">
<label for="end_date">End Date/Time (Optional)</label>
<input type="datetime-local"
id="end_date"
name="end_date"
value="{{ announcement.end_date.strftime('%Y-%m-%dT%H:%M') if announcement and announcement.end_date else '' }}"
class="form-control">
<small class="form-text">Leave empty for no expiry</small>
</div>
</div>
</div>
<div class="form-section">
<h3>Targeting</h3>
<div class="form-row">
<div class="form-group">
<label class="checkbox-container">
<input type="checkbox"
name="target_all_users"
id="target_all_users"
{{ 'checked' if not announcement or announcement.target_all_users else '' }}
onchange="toggleTargeting()">
<span class="checkmark"></span>
Target All Users
</label>
</div>
</div>
<div id="targeting_options" style="display: {{ 'none' if not announcement or announcement.target_all_users else 'block' }};">
<div class="form-row">
<div class="form-group">
<label>Target Roles</label>
<div class="checkbox-list">
{% set selected_roles = [] %}
{% if announcement and announcement.target_roles %}
{% set selected_roles = announcement.target_roles|from_json %}
{% endif %}
{% for role in roles %}
<label class="checkbox-container">
<input type="checkbox"
name="target_roles"
value="{{ role }}"
{{ 'checked' if role in selected_roles else '' }}>
<span class="checkmark"></span>
{{ role }}
</label>
{% endfor %}
</div>
</div>
<div class="form-group">
<label>Target Companies</label>
<div class="checkbox-list">
{% set selected_companies = [] %}
{% if announcement and announcement.target_companies %}
{% set selected_companies = announcement.target_companies|from_json %}
{% endif %}
{% for company in companies %}
<label class="checkbox-container">
<input type="checkbox"
name="target_companies"
value="{{ company.id }}"
{{ 'checked' if company.id in selected_companies else '' }}>
<span class="checkmark"></span>
{{ company.name }}
</label>
{% endfor %}
</div>
</div>
</div>
</div>
</div>
<div class="form-actions">
<button type="submit" class="btn btn-primary">
{{ "Update" if announcement else "Create" }} Announcement
</button>
<a href="{{ url_for('system_admin_announcements') }}" class="btn btn-secondary">Cancel</a>
</div>
</form>
</div>
</div>
<script>
function toggleTargeting() {
const targetAllUsers = document.getElementById('target_all_users');
const targetingOptions = document.getElementById('targeting_options');
if (targetAllUsers.checked) {
targetingOptions.style.display = 'none';
} else {
targetingOptions.style.display = 'block';
}
}
// Initialize on page load
document.addEventListener('DOMContentLoaded', function() {
toggleTargeting();
});
</script>
<style>
.header-section {
margin-bottom: 2rem;
}
.subtitle {
color: #6c757d;
margin-bottom: 1rem;
}
.form-section {
background: white;
border: 1px solid #dee2e6;
border-radius: 8px;
padding: 2rem;
margin-bottom: 2rem;
}
.announcement-form {
display: flex;
flex-direction: column;
gap: 1.5rem;
}
.form-section h3 {
margin-top: 0;
margin-bottom: 1rem;
color: #495057;
font-size: 1.2rem;
border-bottom: 1px solid #e9ecef;
padding-bottom: 0.5rem;
}
.form-group {
margin-bottom: 1rem;
}
.form-group label {
display: block;
margin-bottom: 0.5rem;
font-weight: 500;
color: #495057;
}
.form-control {
width: 100%;
padding: 0.5rem;
border: 1px solid #ced4da;
border-radius: 4px;
font-size: 1rem;
box-sizing: border-box;
}
.form-control:focus {
outline: none;
border-color: #007bff;
box-shadow: 0 0 0 3px rgba(0, 123, 255, 0.1);
}
.form-text {
display: block;
margin-top: 0.25rem;
color: #6c757d;
font-size: 0.875rem;
}
.form-row {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
gap: 1rem;
}
.checkbox-container {
display: block;
position: relative;
padding-left: 35px;
margin-bottom: 12px;
cursor: pointer;
font-size: 16px;
user-select: none;
}
.checkbox-container input {
position: absolute;
opacity: 0;
cursor: pointer;
height: 0;
width: 0;
}
.checkmark {
position: absolute;
top: 0;
left: 0;
height: 25px;
width: 25px;
background-color: #eee;
border-radius: 4px;
}
.checkbox-container:hover input ~ .checkmark {
background-color: #ccc;
}
.checkbox-container input:checked ~ .checkmark {
background-color: #2196F3;
}
.checkmark:after {
content: "";
position: absolute;
display: none;
}
.checkbox-container input:checked ~ .checkmark:after {
display: block;
}
.checkbox-container .checkmark:after {
left: 9px;
top: 5px;
width: 5px;
height: 10px;
border: solid white;
border-width: 0 3px 3px 0;
transform: rotate(45deg);
}
.checkbox-list {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
gap: 0.5rem;
max-height: 200px;
overflow-y: auto;
border: 1px solid #ced4da;
border-radius: 0.25rem;
padding: 0.75rem;
background: #f8f9fa;
}
.form-actions {
display: flex;
gap: 1rem;
padding-top: 1rem;
border-top: 1px solid #e9ecef;
}
.btn {
display: inline-block;
padding: 0.75rem 1.5rem;
border: none;
border-radius: 4px;
text-decoration: none;
font-weight: 500;
cursor: pointer;
transition: background-color 0.2s;
text-align: center;
}
.btn-primary {
background: #007bff;
color: white;
}
.btn-primary:hover {
background: #0056b3;
}
.btn-secondary {
background: #6c757d;
color: white;
}
.btn-secondary:hover {
background: #545b62;
}
@media (max-width: 768px) {
.form-row {
grid-template-columns: 1fr;
}
.checkbox-list {
grid-template-columns: 1fr;
}
}
</style>
{% endblock %}

View File

@@ -0,0 +1,165 @@
{% extends "layout.html" %}
{% block content %}
<div class="content-header">
<div class="header-row">
<h1>System Announcements</h1>
<a href="{{ url_for('system_admin_announcement_new') }}" class="btn btn-primary">
<i class="icon"></i> New Announcement
</a>
</div>
</div>
<div class="content-body">
{% if announcements.items %}
<div class="table-container">
<table class="data-table">
<thead>
<tr>
<th>Title</th>
<th>Type</th>
<th>Status</th>
<th>Start Date</th>
<th>End Date</th>
<th>Target</th>
<th>Created</th>
<th>Actions</th>
</tr>
</thead>
<tbody>
{% for announcement in announcements.items %}
<tr class="{% if not announcement.is_active %}inactive{% endif %}">
<td>
<strong>{{ announcement.title }}</strong>
{% if announcement.is_urgent %}
<span class="badge badge-danger">URGENT</span>
{% endif %}
</td>
<td>
<span class="badge badge-{{ announcement.announcement_type }}">
{{ announcement.announcement_type.title() }}
</span>
</td>
<td>
{% if announcement.is_active %}
{% if announcement.is_visible_now() %}
<span class="badge badge-success">Active</span>
{% else %}
<span class="badge badge-warning">Scheduled</span>
{% endif %}
{% else %}
<span class="badge badge-secondary">Inactive</span>
{% endif %}
</td>
<td>
{% if announcement.start_date %}
{{ announcement.start_date.strftime('%Y-%m-%d %H:%M') }}
{% else %}
<em>Immediate</em>
{% endif %}
</td>
<td>
{% if announcement.end_date %}
{{ announcement.end_date.strftime('%Y-%m-%d %H:%M') }}
{% else %}
<em>No expiry</em>
{% endif %}
</td>
<td>
{% if announcement.target_all_users %}
All Users
{% else %}
<span class="text-muted">Targeted</span>
{% endif %}
</td>
<td>{{ announcement.created_at.strftime('%Y-%m-%d') }}</td>
<td>
<div class="action-buttons">
<a href="{{ url_for('system_admin_announcement_edit', id=announcement.id) }}"
class="btn btn-sm btn-outline-primary" title="Edit">
✏️
</a>
<form method="POST" action="{{ url_for('system_admin_announcement_delete', id=announcement.id) }}"
style="display: inline-block;"
onsubmit="return confirm('Are you sure you want to delete this announcement?')">
<button type="submit" class="btn btn-sm btn-outline-danger" title="Delete">
🗑️
</button>
</form>
</div>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
<!-- Pagination -->
{% if announcements.pages > 1 %}
<div class="pagination-container">
<div class="pagination">
{% if announcements.has_prev %}
<a href="{{ url_for('system_admin_announcements', page=announcements.prev_num) }}" class="page-link">« Previous</a>
{% endif %}
{% for page_num in announcements.iter_pages() %}
{% if page_num %}
{% if page_num != announcements.page %}
<a href="{{ url_for('system_admin_announcements', page=page_num) }}" class="page-link">{{ page_num }}</a>
{% else %}
<span class="page-link current">{{ page_num }}</span>
{% endif %}
{% else %}
<span class="page-link"></span>
{% endif %}
{% endfor %}
{% if announcements.has_next %}
<a href="{{ url_for('system_admin_announcements', page=announcements.next_num) }}" class="page-link">Next »</a>
{% endif %}
</div>
</div>
{% endif %}
{% else %}
<div class="empty-state">
<h3>No announcements found</h3>
<p>Create your first announcement to communicate with users.</p>
<a href="{{ url_for('system_admin_announcement_new') }}" class="btn btn-primary">
Create Announcement
</a>
</div>
{% endif %}
</div>
<style>
.inactive {
opacity: 0.6;
}
.badge {
padding: 2px 8px;
border-radius: 12px;
font-size: 0.75em;
font-weight: bold;
text-transform: uppercase;
}
.badge-info { background: #17a2b8; color: white; }
.badge-warning { background: #ffc107; color: #212529; }
.badge-success { background: #28a745; color: white; }
.badge-danger { background: #dc3545; color: white; }
.badge-secondary { background: #6c757d; color: white; }
.action-buttons {
display: flex;
gap: 5px;
}
.empty-state {
text-align: center;
padding: 3rem;
color: #6c757d;
}
</style>
{% endblock %}

View File

@@ -69,6 +69,43 @@
</div>
</div>
<div class="setting-group">
<div class="setting-header">
<h4>Tracking Script</h4>
<p>Enable custom tracking script (e.g., Google Analytics)</p>
</div>
<div class="setting-control">
<label class="toggle-label">
<input type="checkbox" name="tracking_script_enabled"
{% if settings.get('tracking_script_enabled', False) %}checked{% endif %}>
<span class="toggle-slider"></span>
<span class="toggle-text">Enable tracking script</span>
</label>
<small class="setting-description">
When enabled, the custom tracking script will be included on all pages.
Use this for analytics tracking, monitoring, or other custom JavaScript.
</small>
</div>
</div>
<div class="setting-group full-width">
<div class="setting-header">
<h4>Tracking Script Code</h4>
<p>Enter your tracking script code (HTML/JavaScript)</p>
</div>
<div class="setting-control">
<textarea name="tracking_script_code"
class="form-control code-textarea"
rows="8"
placeholder="<!-- Paste your tracking script here (e.g., Google Analytics, custom JavaScript) -->"
>{{ settings.get('tracking_script_code', '') }}</textarea>
<small class="setting-description">
This code will be inserted at the bottom of every page before the closing &lt;/body&gt; tag.
Common use cases: Google Analytics, Facebook Pixel, custom JavaScript, monitoring scripts.
</small>
</div>
</div>
<div class="form-actions">
<button type="submit" class="btn btn-primary">Save Settings</button>
<a href="{{ url_for('system_admin_dashboard') }}" class="btn btn-secondary">Cancel</a>
@@ -235,6 +272,27 @@
border-radius: 8px;
}
.setting-group.full-width {
grid-template-columns: 1fr;
}
.code-textarea {
font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
font-size: 0.875rem;
line-height: 1.4;
background: #f8f9fa;
border: 1px solid #ced4da;
border-radius: 4px;
padding: 0.75rem;
resize: vertical;
min-height: 120px;
}
.form-control {
width: 100%;
box-sizing: border-box;
}
.setting-header h4 {
margin: 0 0 0.5rem 0;
color: #495057;