'] if invoice else ['
")
+ html = "\n".join(html_parts)
+
return html, css
@@ -572,9 +594,11 @@ def get_upload_folder():
@admin_or_permission_required("access_admin")
def admin_dashboard():
"""Admin dashboard"""
- from app.config import Config
from datetime import datetime, timedelta
- from sqlalchemy import func, case
+
+ from sqlalchemy import case, func
+
+ from app.config import Config
# Get system statistics
total_users = User.query.count()
@@ -610,6 +634,7 @@ def admin_dashboard():
# Chart data for last 30 days (cached 10 min to reduce DB load)
from app.utils.cache import get_cache
+
_cache = get_cache()
chart_data = _cache.get("admin:dashboard:chart")
if chart_data is None:
@@ -649,16 +674,11 @@ def _norm_date(v):
)
user_activity_by_date = {_norm_date(d.day): d.cnt for d in user_activity_rows}
user_activity_data = [
- {"date": d.strftime("%Y-%m-%d"), "count": user_activity_by_date.get(d, 0)}
- for d in all_dates
+ {"date": d.strftime("%Y-%m-%d"), "count": user_activity_by_date.get(d, 0)} for d in all_dates
]
project_status_data = {}
- status_counts = (
- db.session.query(Project.status, func.count(Project.id))
- .group_by(Project.status)
- .all()
- )
+ status_counts = db.session.query(Project.status, func.count(Project.id)).group_by(Project.status).all()
for status, count in status_counts:
project_status_data[status or "none"] = count
@@ -681,8 +701,7 @@ def _norm_date(v):
if day is not None:
time_hours_by_date[day] = round((row.total_seconds or 0) / 3600, 2)
time_entries_daily = [
- {"date": d.strftime("%Y-%m-%d"), "hours": time_hours_by_date.get(d, 0)}
- for d in all_dates
+ {"date": d.strftime("%Y-%m-%d"), "hours": time_hours_by_date.get(d, 0)} for d in all_dates
]
chart_data = {
"user_activity": user_activity_data,
@@ -839,18 +858,36 @@ def edit_user(user_id):
if not username:
flash(_("Username is required"), "error")
- return render_template("admin/user_form.html", user=user, clients=clients, all_roles=all_roles, assigned_client_ids=assigned_client_ids)
+ return render_template(
+ "admin/user_form.html",
+ user=user,
+ clients=clients,
+ all_roles=all_roles,
+ assigned_client_ids=assigned_client_ids,
+ )
# Check if username is already taken by another user
existing_user = User.query.filter_by(username=username).first()
if existing_user and existing_user.id != user.id:
flash(_("Username already exists"), "error")
- return render_template("admin/user_form.html", user=user, clients=clients, all_roles=all_roles, assigned_client_ids=assigned_client_ids)
+ return render_template(
+ "admin/user_form.html",
+ user=user,
+ clients=clients,
+ all_roles=all_roles,
+ assigned_client_ids=assigned_client_ids,
+ )
# Validate client portal settings
if client_portal_enabled and not client_id:
flash(_("Please select a client when enabling client portal access."), "error")
- return render_template("admin/user_form.html", user=user, clients=clients, all_roles=all_roles, assigned_client_ids=assigned_client_ids)
+ return render_template(
+ "admin/user_form.html",
+ user=user,
+ clients=clients,
+ all_roles=all_roles,
+ assigned_client_ids=assigned_client_ids,
+ )
# Get the Role object from the database
role_obj = Role.query.filter_by(name=role_name).first()
@@ -859,7 +896,13 @@ def edit_user(user_id):
role_obj = Role.query.filter_by(name="user").first()
if not role_obj:
flash(_("Default 'user' role not found. Please run 'flask seed_permissions_cmd' first."), "error")
- return render_template("admin/user_form.html", user=user, clients=clients, all_roles=all_roles, assigned_client_ids=assigned_client_ids)
+ return render_template(
+ "admin/user_form.html",
+ user=user,
+ clients=clients,
+ all_roles=all_roles,
+ assigned_client_ids=assigned_client_ids,
+ )
# Handle password reset if provided
new_password = request.form.get("new_password", "").strip()
@@ -870,11 +913,23 @@ def edit_user(user_id):
# Validate password
if len(new_password) < 8:
flash(_("Password must be at least 8 characters long."), "error")
- return render_template("admin/user_form.html", user=user, clients=clients, all_roles=all_roles, assigned_client_ids=assigned_client_ids)
+ return render_template(
+ "admin/user_form.html",
+ user=user,
+ clients=clients,
+ all_roles=all_roles,
+ assigned_client_ids=assigned_client_ids,
+ )
if new_password != password_confirm:
flash(_("Passwords do not match."), "error")
- return render_template("admin/user_form.html", user=user, clients=clients, all_roles=all_roles, assigned_client_ids=assigned_client_ids)
+ return render_template(
+ "admin/user_form.html",
+ user=user,
+ clients=clients,
+ all_roles=all_roles,
+ assigned_client_ids=assigned_client_ids,
+ )
# Set the new password
user.set_password(new_password)
@@ -888,7 +943,7 @@ def edit_user(user_id):
user.username = username
# Update legacy role field for backward compatibility
user.role = role_name
-
+
# Update roles in the new system
# If user doesn't have the selected role, assign it as the primary role
# Keep other roles if they exist (multi-role support)
@@ -905,7 +960,7 @@ def edit_user(user_id):
if user.roles[0] != role_obj:
user.roles.remove(role_obj)
user.roles.insert(0, role_obj)
-
+
user.is_active = is_active
user.client_portal_enabled = client_portal_enabled
user.client_id = int(client_id) if client_id else None
@@ -921,7 +976,13 @@ def edit_user(user_id):
if not safe_commit("admin_edit_user", {"user_id": user.id}):
flash(_("Could not update user due to a database error. Please check server logs."), "error")
- return render_template("admin/user_form.html", user=user, clients=clients, all_roles=all_roles, assigned_client_ids=assigned_client_ids)
+ return render_template(
+ "admin/user_form.html",
+ user=user,
+ clients=clients,
+ all_roles=all_roles,
+ assigned_client_ids=assigned_client_ids,
+ )
if new_password:
flash(_('Password reset successfully for user "%(username)s"', username=username), "success")
@@ -929,7 +990,9 @@ def edit_user(user_id):
flash(_('User "%(username)s" updated successfully', username=username), "success")
return redirect(url_for("admin.list_users"))
- return render_template("admin/user_form.html", user=user, clients=clients, all_roles=all_roles, assigned_client_ids=assigned_client_ids)
+ return render_template(
+ "admin/user_form.html", user=user, clients=clients, all_roles=all_roles, assigned_client_ids=assigned_client_ids
+ )
@admin_bp.route("/admin/users/']
-
+
elements = template_json.get("elements", [])
for idx, element in enumerate(elements):
elem_type = element.get("type", "")
@@ -269,36 +284,36 @@ def replace_var(match):
style = element.get("style", {})
opacity = style.get("opacity", 1.0)
rotation = element.get("rotation", 0)
-
+
# Convert points to pixels at 96 DPI for browser
x_px = int(x * 96 / 72)
y_px = int(y * 96 / 72)
-
+
# Base style string
base_style_parts = [
f"left: {x_px}px",
f"top: {y_px}px",
f"opacity: {opacity}",
]
-
+
if rotation:
base_style_parts.append(f"transform: rotate({rotation}deg)")
base_style_parts.append("transform-origin: top left")
-
+
style_str_base = "; ".join(base_style_parts)
-
+
if elem_type == "text":
text = element.get("text", "")
width = element.get("width", 400)
height = element.get("height", None)
width_px_elem = int(width * 96 / 72)
-
+
font_name = style.get("font", "Helvetica")
font_size = style.get("size", 10)
color = format_color(style.get("color", "#000000"))
align = style.get("align", "left")
valign = style.get("valign", "top")
-
+
# Build complete style string
style_parts = [style_str_base]
style_parts.append(f"width: {width_px_elem}px")
@@ -311,20 +326,20 @@ def replace_var(match):
style_parts.append(f"color: {color}")
style_parts.append(f"text-align: {align}")
style_parts.append(f"vertical-align: {valign}")
-
+
style_str = "; ".join(style_parts) + ";"
-
+
# Render text with actual data if available
data_obj = invoice if invoice else quote
rendered_text = render_text_template(text, data_obj, settings) if (data_obj or settings) else text
-
+
# Escape HTML but preserve any remaining template syntax
text_escaped = html_escape.escape(rendered_text)
# Restore template syntax if any remains (shouldn't after rendering, but just in case)
text_escaped = text_escaped.replace("<{{", "{{").replace("}}>", "}}")
-
+
html_parts.append(f'
')
+ html_parts.append(
+ f''
+ )
else:
# Show placeholder for decorative images without source
- html_parts.append(f'
'
+ table_html += (
+ f'{html_escape.escape(placeholder)} '
+ )
+ table_html += ""
+
+ table_html += ""
html_parts.append(table_html)
-
- html_parts.append('
')
- html = '\n'.join(html_parts)
-
+
+ html_parts.append("{text_escaped}
')
-
+
elif elem_type == "image":
width = element.get("width", 100)
height = element.get("height", 100)
@@ -332,7 +347,7 @@ def replace_var(match):
height_px_elem = int(height * 96 / 72)
source = element.get("source", "")
is_decorative = element.get("decorative", False)
-
+
# Handle base64 data URLs or file paths
img_src = ""
if source.startswith("data:"):
@@ -341,6 +356,7 @@ def replace_var(match):
# Template image - convert to base64 for PDF generation
try:
from app.utils.template_filters import get_image_base64
+
# Extract filename from URL
filename = source.split("/uploads/template_images/")[-1]
# Build file path relative to app root (as get_image_base64 expects)
@@ -360,18 +376,22 @@ def replace_var(match):
else:
# Placeholder for decorative images without source
img_src = "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='100' height='100'%3E%3Crect fill='%23ddd' width='100' height='100'/%3E%3Ctext x='50%25' y='50%25' text-anchor='middle' dy='.3em' fill='%23999'%3EImage%3C/text%3E%3C/svg%3E"
-
+
style_parts = [style_str_base]
style_parts.append(f"width: {width_px_elem}px")
style_parts.append(f"height: {height_px_elem}px")
style_str = "; ".join(style_parts) + ";"
-
+
if img_src and not img_src.startswith("data:image/svg+xml"):
- html_parts.append(f'Decorative Image
')
-
+ html_parts.append(
+ f'Decorative Image
'
+ )
+
elif elem_type == "rectangle":
width = element.get("width", 100)
height = element.get("height", 100)
@@ -380,7 +400,7 @@ def replace_var(match):
fill = format_color(style.get("fill", "#ffffff"))
stroke = format_color(style.get("stroke", "#000000"))
stroke_width = style.get("strokeWidth", 1)
-
+
style_parts = [style_str_base]
style_parts.append(f"width: {width_px_elem}px")
style_parts.append(f"height: {height_px_elem}px")
@@ -388,16 +408,16 @@ def replace_var(match):
if stroke_width > 0:
style_parts.append(f"border: {stroke_width}px solid {stroke}")
style_str = "; ".join(style_parts) + ";"
-
+
html_parts.append(f'')
-
+
elif elem_type == "circle":
radius = element.get("radius", 50)
radius_px = int(radius * 96 / 72)
fill = format_color(style.get("fill", "#ffffff"))
stroke = format_color(style.get("stroke", "#000000"))
stroke_width = style.get("strokeWidth", 1)
-
+
style_parts = [style_str_base]
style_parts.append(f"width: {radius_px * 2}px")
style_parts.append(f"height: {radius_px * 2}px")
@@ -405,9 +425,9 @@ def replace_var(match):
if stroke_width > 0:
style_parts.append(f"border: {stroke_width}px solid {stroke}")
style_str = "; ".join(style_parts) + ";"
-
+
html_parts.append(f'')
-
+
elif elem_type == "line":
width = element.get("width", 100)
height = element.get("height", 0)
@@ -416,33 +436,33 @@ def replace_var(match):
stroke_width = height if height > 0 else style.get("strokeWidth", 1)
stroke_width_px = max(1, int(stroke_width * 96 / 72))
stroke = format_color(style.get("stroke", "#000000"))
-
+
style_parts = [style_str_base]
style_parts.append(f"width: {width_px_elem}px")
style_parts.append(f"height: {stroke_width_px}px")
style_parts.append(f"background-color: {stroke}")
style_str = "; ".join(style_parts) + ";"
-
+
html_parts.append(f'')
-
+
elif elem_type == "table":
width = element.get("width", 500)
width_px_elem = int(width * 96 / 72)
columns = element.get("columns", [])
row_template = element.get("row_template", {})
-
+
# Get table style properties
table_style = element.get("style", {})
border_color = format_color(table_style.get("borderColor", "#000000"))
header_bg = format_color(table_style.get("headerBackground", "#f8f9fa"))
-
+
style_parts = [style_str_base]
style_parts.append(f"width: {width_px_elem}px")
style_parts.append(f"border: 1px solid {border_color}")
style_str = "; ".join(style_parts) + ";"
-
+
table_html = f'| {html_escape.escape(header)} | ' - table_html += '
|---|
| {value_escaped} | ' - table_html += '
| {html_escape.escape(placeholder)} | ' - table_html += '
Error: No template found. Please save a template first.