Compare commits
5 Commits
8b3223f865
...
0.26
| Author | SHA1 | Date | |
|---|---|---|---|
| 54762cd421 | |||
| b2aaca5df9 | |||
| 883bc4489e | |||
| 3ad4a21f5b | |||
| 3c1604c7af |
@@ -31,5 +31,9 @@ jobs:
|
|||||||
TAG=${{ inputs.tag }}
|
TAG=${{ inputs.tag }}
|
||||||
fi
|
fi
|
||||||
IMAGE=gitea.home.hrajfrisbee.cz/${{ github.repository }}:$TAG
|
IMAGE=gitea.home.hrajfrisbee.cz/${{ github.repository }}:$TAG
|
||||||
docker build -f build/Dockerfile -t $IMAGE .
|
docker build -f build/Dockerfile \
|
||||||
|
--build-arg GIT_TAG=$TAG \
|
||||||
|
--build-arg GIT_COMMIT=${{ github.sha }} \
|
||||||
|
--build-arg BUILD_DATE=$(date -u +%Y-%m-%dT%H:%M:%SZ) \
|
||||||
|
-t $IMAGE .
|
||||||
docker push $IMAGE
|
docker push $IMAGE
|
||||||
|
|||||||
6
Makefile
6
Makefile
@@ -45,7 +45,11 @@ web-debug: $(PYTHON)
|
|||||||
FLASK_DEBUG=1 $(PYTHON) app.py
|
FLASK_DEBUG=1 $(PYTHON) app.py
|
||||||
|
|
||||||
image:
|
image:
|
||||||
docker build -t fuj-management:latest -f build/Dockerfile .
|
docker build -t fuj-management:latest \
|
||||||
|
--build-arg GIT_TAG=$$(git describe --tags --always 2>/dev/null || echo "untagged") \
|
||||||
|
--build-arg GIT_COMMIT=$$(git rev-parse --short HEAD) \
|
||||||
|
--build-arg BUILD_DATE=$$(date -u +%Y-%m-%dT%H:%M:%SZ) \
|
||||||
|
-f build/Dockerfile .
|
||||||
|
|
||||||
run:
|
run:
|
||||||
docker run -it --rm -p 5001:5001 -v $(CURDIR)/.secret:/app/.secret:ro fuj-management:latest
|
docker run -it --rm -p 5001:5001 -v $(CURDIR)/.secret:/app/.secret:ro fuj-management:latest
|
||||||
|
|||||||
76
app.py
76
app.py
@@ -24,6 +24,8 @@ from config import (
|
|||||||
from attendance import get_members_with_fees, get_junior_members_with_fees, ADULT_MERGED_MONTHS, JUNIOR_MERGED_MONTHS
|
from attendance import get_members_with_fees, get_junior_members_with_fees, ADULT_MERGED_MONTHS, JUNIOR_MERGED_MONTHS
|
||||||
from match_payments import reconcile, fetch_sheet_data, fetch_exceptions, normalize
|
from match_payments import reconcile, fetch_sheet_data, fetch_exceptions, normalize
|
||||||
from cache_utils import get_sheet_modified_time, read_cache, write_cache, _LAST_CHECKED, flush_cache
|
from cache_utils import get_sheet_modified_time, read_cache, write_cache, _LAST_CHECKED, flush_cache
|
||||||
|
from sync_fio_to_sheets import sync_to_sheets
|
||||||
|
from infer_payments import infer_payments
|
||||||
|
|
||||||
def get_cached_data(cache_key, sheet_id, fetch_func, *args, serialize=None, deserialize=None, **kwargs):
|
def get_cached_data(cache_key, sheet_id, fetch_func, *args, serialize=None, deserialize=None, **kwargs):
|
||||||
mod_time = get_sheet_modified_time(cache_key)
|
mod_time = get_sheet_modified_time(cache_key)
|
||||||
@@ -72,6 +74,13 @@ def warmup_cache():
|
|||||||
logger.info("Cache warmup complete.")
|
logger.info("Cache warmup complete.")
|
||||||
|
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
|
|
||||||
|
import json as _json
|
||||||
|
_meta_path = Path(__file__).parent / "build_meta.json"
|
||||||
|
BUILD_META = _json.loads(_meta_path.read_text()) if _meta_path.exists() else {
|
||||||
|
"tag": "dev", "commit": "local", "build_date": ""
|
||||||
|
}
|
||||||
|
|
||||||
warmup_cache()
|
warmup_cache()
|
||||||
|
|
||||||
@app.before_request
|
@app.before_request
|
||||||
@@ -101,7 +110,7 @@ def inject_render_time():
|
|||||||
"total": f"{total:.3f}",
|
"total": f"{total:.3f}",
|
||||||
"breakdown": " | ".join(breakdown)
|
"breakdown": " | ".join(breakdown)
|
||||||
}
|
}
|
||||||
return dict(get_render_time=get_render_time)
|
return dict(get_render_time=get_render_time, build_meta=BUILD_META)
|
||||||
|
|
||||||
@app.route("/")
|
@app.route("/")
|
||||||
def index():
|
def index():
|
||||||
@@ -113,6 +122,39 @@ def flush_cache_endpoint():
|
|||||||
deleted = flush_cache()
|
deleted = flush_cache()
|
||||||
return jsonify({"status": "ok", "deleted_files": deleted})
|
return jsonify({"status": "ok", "deleted_files": deleted})
|
||||||
|
|
||||||
|
@app.route("/sync-bank")
|
||||||
|
def sync_bank():
|
||||||
|
import contextlib
|
||||||
|
output = io.StringIO()
|
||||||
|
success = True
|
||||||
|
try:
|
||||||
|
with contextlib.redirect_stdout(output), contextlib.redirect_stderr(output):
|
||||||
|
# sync_to_sheets: equivalent of make sync-2026
|
||||||
|
output.write("=== Syncing Fio transactions (2026) ===\n")
|
||||||
|
sync_to_sheets(
|
||||||
|
spreadsheet_id=PAYMENTS_SHEET_ID,
|
||||||
|
credentials_path=CREDENTIALS_PATH,
|
||||||
|
date_from_str="2026-01-01",
|
||||||
|
date_to_str="2026-12-31",
|
||||||
|
sort_by_date=True,
|
||||||
|
)
|
||||||
|
output.write("\n=== Inferring payment details ===\n")
|
||||||
|
infer_payments(PAYMENTS_SHEET_ID, CREDENTIALS_PATH)
|
||||||
|
output.write("\n=== Flushing cache ===\n")
|
||||||
|
deleted = flush_cache()
|
||||||
|
output.write(f"Deleted {deleted} cache files.\n")
|
||||||
|
output.write("\n=== Done ===\n")
|
||||||
|
except Exception as e:
|
||||||
|
import traceback
|
||||||
|
output.write(f"\n!!! Error: {e}\n")
|
||||||
|
output.write(traceback.format_exc())
|
||||||
|
success = False
|
||||||
|
return render_template("sync.html", output=output.getvalue(), success=success)
|
||||||
|
|
||||||
|
@app.route("/version")
|
||||||
|
def version():
|
||||||
|
return BUILD_META
|
||||||
|
|
||||||
@app.route("/fees")
|
@app.route("/fees")
|
||||||
def fees():
|
def fees():
|
||||||
attendance_url = f"https://docs.google.com/spreadsheets/d/{ATTENDANCE_SHEET_ID}/edit"
|
attendance_url = f"https://docs.google.com/spreadsheets/d/{ATTENDANCE_SHEET_ID}/edit"
|
||||||
@@ -289,8 +331,9 @@ def adults_view():
|
|||||||
formatted_results = []
|
formatted_results = []
|
||||||
for name in adult_names:
|
for name in adult_names:
|
||||||
data = result["members"][name]
|
data = result["members"][name]
|
||||||
row = {"name": name, "months": [], "balance": data["total_balance"], "unpaid_periods": ""}
|
row = {"name": name, "months": [], "balance": data["total_balance"], "unpaid_periods": "", "raw_unpaid_periods": ""}
|
||||||
unpaid_months = []
|
unpaid_months = []
|
||||||
|
raw_unpaid_months = []
|
||||||
for m in sorted_months:
|
for m in sorted_months:
|
||||||
mdata = data["months"].get(m, {"expected": 0, "original_expected": 0, "attendance_count": 0, "paid": 0, "exception": None})
|
mdata = data["months"].get(m, {"expected": 0, "original_expected": 0, "attendance_count": 0, "paid": 0, "exception": None})
|
||||||
expected = mdata.get("expected", 0)
|
expected = mdata.get("expected", 0)
|
||||||
@@ -324,10 +367,12 @@ def adults_view():
|
|||||||
status = "partial"
|
status = "partial"
|
||||||
cell_text = f"{paid}/{fee_display}"
|
cell_text = f"{paid}/{fee_display}"
|
||||||
unpaid_months.append(month_labels[m])
|
unpaid_months.append(month_labels[m])
|
||||||
|
raw_unpaid_months.append(datetime.strptime(m, "%Y-%m").strftime("%m/%Y"))
|
||||||
else:
|
else:
|
||||||
status = "unpaid"
|
status = "unpaid"
|
||||||
cell_text = f"0/{fee_display}"
|
cell_text = f"0/{fee_display}"
|
||||||
unpaid_months.append(month_labels[m])
|
unpaid_months.append(month_labels[m])
|
||||||
|
raw_unpaid_months.append(datetime.strptime(m, "%Y-%m").strftime("%m/%Y"))
|
||||||
elif paid > 0:
|
elif paid > 0:
|
||||||
status = "surplus"
|
status = "surplus"
|
||||||
cell_text = f"PAID {paid}"
|
cell_text = f"PAID {paid}"
|
||||||
@@ -346,10 +391,12 @@ def adults_view():
|
|||||||
"status": status,
|
"status": status,
|
||||||
"amount": amount_to_pay,
|
"amount": amount_to_pay,
|
||||||
"month": month_labels[m],
|
"month": month_labels[m],
|
||||||
|
"raw_month": m,
|
||||||
"tooltip": tooltip
|
"tooltip": tooltip
|
||||||
})
|
})
|
||||||
|
|
||||||
row["unpaid_periods"] = ", ".join(unpaid_months) if unpaid_months else ("Older debt" if data["total_balance"] < 0 else "")
|
row["unpaid_periods"] = ", ".join(unpaid_months) if unpaid_months else ("Older debt" if data["total_balance"] < 0 else "")
|
||||||
|
row["raw_unpaid_periods"] = "+".join(raw_unpaid_months)
|
||||||
row["balance"] = data["total_balance"]
|
row["balance"] = data["total_balance"]
|
||||||
formatted_results.append(row)
|
formatted_results.append(row)
|
||||||
|
|
||||||
@@ -428,8 +475,9 @@ def reconcile_view():
|
|||||||
formatted_results = []
|
formatted_results = []
|
||||||
for name in adult_names:
|
for name in adult_names:
|
||||||
data = result["members"][name]
|
data = result["members"][name]
|
||||||
row = {"name": name, "months": [], "balance": data["total_balance"], "unpaid_periods": ""}
|
row = {"name": name, "months": [], "balance": data["total_balance"], "unpaid_periods": "", "raw_unpaid_periods": ""}
|
||||||
unpaid_months = []
|
unpaid_months = []
|
||||||
|
raw_unpaid_months = []
|
||||||
for m in sorted_months:
|
for m in sorted_months:
|
||||||
mdata = data["months"].get(m, {"expected": 0, "original_expected": 0, "paid": 0})
|
mdata = data["months"].get(m, {"expected": 0, "original_expected": 0, "paid": 0})
|
||||||
expected = mdata["expected"]
|
expected = mdata["expected"]
|
||||||
@@ -448,11 +496,13 @@ def reconcile_view():
|
|||||||
cell_text = f"{paid}/{expected}"
|
cell_text = f"{paid}/{expected}"
|
||||||
amount_to_pay = expected - paid
|
amount_to_pay = expected - paid
|
||||||
unpaid_months.append(month_labels[m])
|
unpaid_months.append(month_labels[m])
|
||||||
|
raw_unpaid_months.append(datetime.strptime(m, "%Y-%m").strftime("%m/%Y"))
|
||||||
else:
|
else:
|
||||||
status = "unpaid"
|
status = "unpaid"
|
||||||
cell_text = f"UNPAID {expected}"
|
cell_text = f"UNPAID {expected}"
|
||||||
amount_to_pay = expected
|
amount_to_pay = expected
|
||||||
unpaid_months.append(month_labels[m])
|
unpaid_months.append(month_labels[m])
|
||||||
|
raw_unpaid_months.append(datetime.strptime(m, "%Y-%m").strftime("%m/%Y"))
|
||||||
elif paid > 0:
|
elif paid > 0:
|
||||||
status = "surplus"
|
status = "surplus"
|
||||||
cell_text = f"PAID {paid}"
|
cell_text = f"PAID {paid}"
|
||||||
@@ -461,10 +511,12 @@ def reconcile_view():
|
|||||||
"text": cell_text,
|
"text": cell_text,
|
||||||
"status": status,
|
"status": status,
|
||||||
"amount": amount_to_pay,
|
"amount": amount_to_pay,
|
||||||
"month": month_labels[m]
|
"month": month_labels[m],
|
||||||
|
"raw_month": m
|
||||||
})
|
})
|
||||||
|
|
||||||
row["unpaid_periods"] = ", ".join(unpaid_months) if unpaid_months else ("Older debt" if data["total_balance"] < 0 else "")
|
row["unpaid_periods"] = ", ".join(unpaid_months) if unpaid_months else ("Older debt" if data["total_balance"] < 0 else "")
|
||||||
|
row["raw_unpaid_periods"] = "+".join(raw_unpaid_months)
|
||||||
row["balance"] = data["total_balance"] # Updated to use total_balance
|
row["balance"] = data["total_balance"] # Updated to use total_balance
|
||||||
formatted_results.append(row)
|
formatted_results.append(row)
|
||||||
|
|
||||||
@@ -541,8 +593,9 @@ def juniors_view():
|
|||||||
formatted_results = []
|
formatted_results = []
|
||||||
for name in junior_names:
|
for name in junior_names:
|
||||||
data = result["members"][name]
|
data = result["members"][name]
|
||||||
row = {"name": name, "months": [], "balance": data["total_balance"], "unpaid_periods": ""}
|
row = {"name": name, "months": [], "balance": data["total_balance"], "unpaid_periods": "", "raw_unpaid_periods": ""}
|
||||||
unpaid_months = []
|
unpaid_months = []
|
||||||
|
raw_unpaid_months = []
|
||||||
for m in sorted_months:
|
for m in sorted_months:
|
||||||
mdata = data["months"].get(m, {"expected": 0, "original_expected": 0, "attendance_count": 0, "paid": 0, "exception": None})
|
mdata = data["months"].get(m, {"expected": 0, "original_expected": 0, "attendance_count": 0, "paid": 0, "exception": None})
|
||||||
expected = mdata.get("expected", 0)
|
expected = mdata.get("expected", 0)
|
||||||
@@ -596,11 +649,13 @@ def juniors_view():
|
|||||||
cell_text = f"{paid}/{fee_display}"
|
cell_text = f"{paid}/{fee_display}"
|
||||||
amount_to_pay = expected - paid
|
amount_to_pay = expected - paid
|
||||||
unpaid_months.append(month_labels[m])
|
unpaid_months.append(month_labels[m])
|
||||||
|
raw_unpaid_months.append(datetime.strptime(m, "%Y-%m").strftime("%m/%Y"))
|
||||||
else:
|
else:
|
||||||
status = "unpaid"
|
status = "unpaid"
|
||||||
cell_text = f"0/{fee_display}"
|
cell_text = f"0/{fee_display}"
|
||||||
amount_to_pay = expected
|
amount_to_pay = expected
|
||||||
unpaid_months.append(month_labels[m])
|
unpaid_months.append(month_labels[m])
|
||||||
|
raw_unpaid_months.append(datetime.strptime(m, "%Y-%m").strftime("%m/%Y"))
|
||||||
elif paid > 0:
|
elif paid > 0:
|
||||||
status = "surplus"
|
status = "surplus"
|
||||||
cell_text = f"PAID {paid}"
|
cell_text = f"PAID {paid}"
|
||||||
@@ -616,10 +671,12 @@ def juniors_view():
|
|||||||
"status": status,
|
"status": status,
|
||||||
"amount": amount_to_pay,
|
"amount": amount_to_pay,
|
||||||
"month": month_labels[m],
|
"month": month_labels[m],
|
||||||
|
"raw_month": m,
|
||||||
"tooltip": tooltip
|
"tooltip": tooltip
|
||||||
})
|
})
|
||||||
|
|
||||||
row["unpaid_periods"] = ", ".join(unpaid_months) if unpaid_months else ("Older debt" if data["total_balance"] < 0 else "")
|
row["unpaid_periods"] = ", ".join(unpaid_months) if unpaid_months else ("Older debt" if data["total_balance"] < 0 else "")
|
||||||
|
row["raw_unpaid_periods"] = "+".join(raw_unpaid_months)
|
||||||
row["balance"] = data["total_balance"]
|
row["balance"] = data["total_balance"]
|
||||||
formatted_results.append(row)
|
formatted_results.append(row)
|
||||||
|
|
||||||
@@ -715,8 +772,9 @@ def reconcile_juniors_view():
|
|||||||
formatted_results = []
|
formatted_results = []
|
||||||
for name in junior_names:
|
for name in junior_names:
|
||||||
data = result["members"][name]
|
data = result["members"][name]
|
||||||
row = {"name": name, "months": [], "balance": data["total_balance"], "unpaid_periods": ""}
|
row = {"name": name, "months": [], "balance": data["total_balance"], "unpaid_periods": "", "raw_unpaid_periods": ""}
|
||||||
unpaid_months = []
|
unpaid_months = []
|
||||||
|
raw_unpaid_months = []
|
||||||
for m in sorted_months:
|
for m in sorted_months:
|
||||||
mdata = data["months"].get(m, {"expected": 0, "original_expected": 0, "paid": 0})
|
mdata = data["months"].get(m, {"expected": 0, "original_expected": 0, "paid": 0})
|
||||||
expected = mdata["expected"]
|
expected = mdata["expected"]
|
||||||
@@ -755,11 +813,13 @@ def reconcile_juniors_view():
|
|||||||
cell_text = f"{paid}/{expected}"
|
cell_text = f"{paid}/{expected}"
|
||||||
amount_to_pay = expected - paid
|
amount_to_pay = expected - paid
|
||||||
unpaid_months.append(month_labels[m])
|
unpaid_months.append(month_labels[m])
|
||||||
|
raw_unpaid_months.append(datetime.strptime(m, "%Y-%m").strftime("%m/%Y"))
|
||||||
else:
|
else:
|
||||||
status = "unpaid"
|
status = "unpaid"
|
||||||
cell_text = f"UNPAID {expected}"
|
cell_text = f"UNPAID {expected}"
|
||||||
amount_to_pay = expected
|
amount_to_pay = expected
|
||||||
unpaid_months.append(month_labels[m])
|
unpaid_months.append(month_labels[m])
|
||||||
|
raw_unpaid_months.append(datetime.strptime(m, "%Y-%m").strftime("%m/%Y"))
|
||||||
elif paid > 0:
|
elif paid > 0:
|
||||||
status = "surplus"
|
status = "surplus"
|
||||||
cell_text = f"PAID {paid}"
|
cell_text = f"PAID {paid}"
|
||||||
@@ -768,10 +828,12 @@ def reconcile_juniors_view():
|
|||||||
"text": cell_text,
|
"text": cell_text,
|
||||||
"status": status,
|
"status": status,
|
||||||
"amount": amount_to_pay,
|
"amount": amount_to_pay,
|
||||||
"month": month_labels[m]
|
"month": month_labels[m],
|
||||||
|
"raw_month": m
|
||||||
})
|
})
|
||||||
|
|
||||||
row["unpaid_periods"] = ", ".join(unpaid_months) if unpaid_months else ("Older debt" if data["total_balance"] < 0 else "")
|
row["unpaid_periods"] = ", ".join(unpaid_months) if unpaid_months else ("Older debt" if data["total_balance"] < 0 else "")
|
||||||
|
row["raw_unpaid_periods"] = "+".join(raw_unpaid_months)
|
||||||
row["balance"] = data["total_balance"]
|
row["balance"] = data["total_balance"]
|
||||||
formatted_results.append(row)
|
formatted_results.append(row)
|
||||||
|
|
||||||
|
|||||||
@@ -24,6 +24,17 @@ COPY templates/ ./templates/
|
|||||||
COPY build/entrypoint.sh /entrypoint.sh
|
COPY build/entrypoint.sh /entrypoint.sh
|
||||||
RUN chmod +x /entrypoint.sh
|
RUN chmod +x /entrypoint.sh
|
||||||
|
|
||||||
|
ARG GIT_TAG=unknown
|
||||||
|
ARG GIT_COMMIT=unknown
|
||||||
|
ARG BUILD_DATE=unknown
|
||||||
|
|
||||||
|
LABEL org.opencontainers.image.version="${GIT_TAG}" \
|
||||||
|
org.opencontainers.image.revision="${GIT_COMMIT}" \
|
||||||
|
org.opencontainers.image.created="${BUILD_DATE}" \
|
||||||
|
org.opencontainers.image.title="fuj-management"
|
||||||
|
|
||||||
|
RUN echo "{\"tag\": \"${GIT_TAG}\", \"commit\": \"${GIT_COMMIT}\", \"build_date\": \"${BUILD_DATE}\"}" > /app/build_meta.json
|
||||||
|
|
||||||
EXPOSE 5001
|
EXPOSE 5001
|
||||||
|
|
||||||
HEALTHCHECK --interval=60s --timeout=5s --start-period=5s \
|
HEALTHCHECK --interval=60s --timeout=5s --start-period=5s \
|
||||||
|
|||||||
@@ -10,8 +10,11 @@ from config import ATTENDANCE_SHEET_ID as SHEET_ID, JUNIOR_SHEET_GID
|
|||||||
EXPORT_URL = f"https://docs.google.com/spreadsheets/d/{SHEET_ID}/export?format=csv&gid=0"
|
EXPORT_URL = f"https://docs.google.com/spreadsheets/d/{SHEET_ID}/export?format=csv&gid=0"
|
||||||
JUNIOR_EXPORT_URL = f"https://docs.google.com/spreadsheets/d/{SHEET_ID}/export?format=csv&gid={JUNIOR_SHEET_GID}"
|
JUNIOR_EXPORT_URL = f"https://docs.google.com/spreadsheets/d/{SHEET_ID}/export?format=csv&gid={JUNIOR_SHEET_GID}"
|
||||||
|
|
||||||
FEE_FULL = 750 # CZK, for 2+ practices in a month
|
ADULT_FEE_DEFAULT = 750 # CZK, for 2+ practices in a month
|
||||||
FEE_SINGLE = 200 # CZK, for exactly 1 practice in a month
|
ADULT_FEE_SINGLE = 200 # CZK, for exactly 1 practice in a month
|
||||||
|
ADULT_FEE_MONTHLY_RATE = {
|
||||||
|
"2026-03": 350
|
||||||
|
}
|
||||||
|
|
||||||
JUNIOR_FEE_DEFAULT = 500 # CZK for 2+ practices
|
JUNIOR_FEE_DEFAULT = 500 # CZK for 2+ practices
|
||||||
JUNIOR_MONTHLY_RATE = {
|
JUNIOR_MONTHLY_RATE = {
|
||||||
@@ -76,13 +79,13 @@ def group_by_month(dates: list[tuple[int, datetime]], merged_months: dict[str, s
|
|||||||
return months
|
return months
|
||||||
|
|
||||||
|
|
||||||
def calculate_fee(attendance_count: int) -> int:
|
def calculate_fee(attendance_count: int, month_key: str) -> int:
|
||||||
"""Apply fee rules: 0 → 0, 1 → 200, 2+ → 750."""
|
"""Apply fee rules: 0 → 0, 1 → 200, 2+ → configured rate (default 750)."""
|
||||||
if attendance_count == 0:
|
if attendance_count == 0:
|
||||||
return 0
|
return 0
|
||||||
if attendance_count == 1:
|
if attendance_count == 1:
|
||||||
return FEE_SINGLE
|
return ADULT_FEE_SINGLE
|
||||||
return FEE_FULL
|
return ADULT_FEE_MONTHLY_RATE.get(month_key, ADULT_FEE_DEFAULT)
|
||||||
|
|
||||||
|
|
||||||
def calculate_junior_fee(attendance_count: int, month_key: str) -> str | int:
|
def calculate_junior_fee(attendance_count: int, month_key: str) -> str | int:
|
||||||
@@ -186,7 +189,7 @@ def get_members_with_fees() -> tuple[list[tuple[str, str, dict[str, int]]], list
|
|||||||
for c in cols
|
for c in cols
|
||||||
if c < len(row) and row[c].strip().upper() == "TRUE"
|
if c < len(row) and row[c].strip().upper() == "TRUE"
|
||||||
)
|
)
|
||||||
fee = calculate_fee(count) if tier == "A" else 0
|
fee = calculate_fee(count, month_key) if tier == "A" else 0
|
||||||
month_fees[month_key] = (fee, count)
|
month_fees[month_key] = (fee, count)
|
||||||
members.append((name, tier, month_fees))
|
members.append((name, tier, month_fees))
|
||||||
|
|
||||||
|
|||||||
@@ -464,6 +464,10 @@
|
|||||||
<a href="/reconcile-juniors">[Junior Payment Reconciliation]</a>
|
<a href="/reconcile-juniors">[Junior Payment Reconciliation]</a>
|
||||||
<a href="/payments">[Payments Ledger]</a>
|
<a href="/payments">[Payments Ledger]</a>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="nav-archived">
|
||||||
|
<span style="color: #666; margin-right: 5px;">Tools:</span>
|
||||||
|
<a href="/sync-bank">[Sync Bank Data]</a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<h1>Adults Dashboard</h1>
|
<h1>Adults Dashboard</h1>
|
||||||
@@ -503,7 +507,7 @@
|
|||||||
{{ cell.text }}
|
{{ cell.text }}
|
||||||
{% if cell.status == 'unpaid' or cell.status == 'partial' %}
|
{% if cell.status == 'unpaid' or cell.status == 'partial' %}
|
||||||
<button class="pay-btn"
|
<button class="pay-btn"
|
||||||
onclick="showPayQR('{{ row.name|e }}', {{ cell.amount }}, '{{ cell.month|e }}')">Pay</button>
|
onclick="showPayQR('{{ row.name|e }}', {{ cell.amount }}, '{{ cell.month|e }}', '{{ cell.raw_month }}')">Pay</button>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@@ -511,7 +515,7 @@
|
|||||||
{{ "%+d"|format(row.balance) if row.balance != 0 else "0" }}
|
{{ "%+d"|format(row.balance) if row.balance != 0 else "0" }}
|
||||||
{% if row.balance < 0 %}
|
{% if row.balance < 0 %}
|
||||||
<button class="pay-btn"
|
<button class="pay-btn"
|
||||||
onclick="showPayQR('{{ row.name|e }}', {{ -row.balance }}, '{{ row.unpaid_periods|e }}')">Pay All</button>
|
onclick="showPayQR('{{ row.name|e }}', {{ -row.balance }}, '{{ row.unpaid_periods|e }}', '{{ row.raw_unpaid_periods|e }}')">Pay All</button>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -647,7 +651,7 @@
|
|||||||
{% set rt = get_render_time() %}
|
{% set rt = get_render_time() %}
|
||||||
<div class="footer"
|
<div class="footer"
|
||||||
onclick="document.getElementById('perf-details').style.display = (document.getElementById('perf-details').style.display === 'block' ? 'none' : 'block')">
|
onclick="document.getElementById('perf-details').style.display = (document.getElementById('perf-details').style.display === 'block' ? 'none' : 'block')">
|
||||||
render time: {{ rt.total }}s
|
{{ build_meta.tag }}@{{ build_meta.commit }} | render time: {{ rt.total }}s
|
||||||
<div id="perf-details" class="perf-breakdown">
|
<div id="perf-details" class="perf-breakdown">
|
||||||
{{ rt.breakdown }}
|
{{ rt.breakdown }}
|
||||||
</div>
|
</div>
|
||||||
@@ -857,9 +861,13 @@
|
|||||||
showMemberDetails(nextName);
|
showMemberDetails(nextName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function showPayQR(name, amount, month) {
|
function showPayQR(name, amount, month, rawMonth) {
|
||||||
const account = "{{ bank_account }}";
|
const account = "{{ bank_account }}";
|
||||||
const message = `${name} / ${month}`;
|
// Convert YYYY-MM to MM/YYYY for infer_payments.py compatibility
|
||||||
|
const numericMonth = rawMonth.includes('+')
|
||||||
|
? rawMonth.split('+').map(p => p.replace(/(\d{4})-(\d{2})/, '$2/$1')).join('+')
|
||||||
|
: rawMonth.replace(/(\d{4})-(\d{2})/, '$2/$1');
|
||||||
|
const message = `${name}: ${numericMonth}`;
|
||||||
const qrTitle = document.getElementById('qrTitle');
|
const qrTitle = document.getElementById('qrTitle');
|
||||||
const qrImg = document.getElementById('qrImg');
|
const qrImg = document.getElementById('qrImg');
|
||||||
const qrAccount = document.getElementById('qrAccount');
|
const qrAccount = document.getElementById('qrAccount');
|
||||||
|
|||||||
@@ -192,6 +192,10 @@
|
|||||||
<a href="/reconcile-juniors">[Junior Payment Reconciliation]</a>
|
<a href="/reconcile-juniors">[Junior Payment Reconciliation]</a>
|
||||||
<a href="/payments">[Payments Ledger]</a>
|
<a href="/payments">[Payments Ledger]</a>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="nav-archived">
|
||||||
|
<span style="color: #666; margin-right: 5px;">Tools:</span>
|
||||||
|
<a href="/sync-bank">[Sync Bank Data]</a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<h1>FUJ Junior Fees Dashboard</h1>
|
<h1>FUJ Junior Fees Dashboard</h1>
|
||||||
@@ -238,7 +242,7 @@
|
|||||||
{% set rt = get_render_time() %}
|
{% set rt = get_render_time() %}
|
||||||
<div class="footer"
|
<div class="footer"
|
||||||
onclick="document.getElementById('perf-details').style.display = (document.getElementById('perf-details').style.display === 'block' ? 'none' : 'block')">
|
onclick="document.getElementById('perf-details').style.display = (document.getElementById('perf-details').style.display === 'block' ? 'none' : 'block')">
|
||||||
render time: {{ rt.total }}s
|
{{ build_meta.tag }}@{{ build_meta.commit }} | render time: {{ rt.total }}s
|
||||||
<div id="perf-details" class="perf-breakdown">
|
<div id="perf-details" class="perf-breakdown">
|
||||||
{{ rt.breakdown }}
|
{{ rt.breakdown }}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -207,6 +207,10 @@
|
|||||||
<a href="/reconcile-juniors">[Junior Payment Reconciliation]</a>
|
<a href="/reconcile-juniors">[Junior Payment Reconciliation]</a>
|
||||||
<a href="/payments">[Payments Ledger]</a>
|
<a href="/payments">[Payments Ledger]</a>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="nav-archived">
|
||||||
|
<span style="color: #666; margin-right: 5px;">Tools:</span>
|
||||||
|
<a href="/sync-bank">[Sync Bank Data]</a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<h1>FUJ Fees Dashboard</h1>
|
<h1>FUJ Fees Dashboard</h1>
|
||||||
@@ -253,7 +257,7 @@
|
|||||||
{% set rt = get_render_time() %}
|
{% set rt = get_render_time() %}
|
||||||
<div class="footer"
|
<div class="footer"
|
||||||
onclick="document.getElementById('perf-details').style.display = (document.getElementById('perf-details').style.display === 'block' ? 'none' : 'block')">
|
onclick="document.getElementById('perf-details').style.display = (document.getElementById('perf-details').style.display === 'block' ? 'none' : 'block')">
|
||||||
render time: {{ rt.total }}s
|
{{ build_meta.tag }}@{{ build_meta.commit }} | render time: {{ rt.total }}s
|
||||||
<div id="perf-details" class="perf-breakdown">
|
<div id="perf-details" class="perf-breakdown">
|
||||||
{{ rt.breakdown }}
|
{{ rt.breakdown }}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -464,6 +464,10 @@
|
|||||||
<a href="/reconcile-juniors">[Junior Payment Reconciliation]</a>
|
<a href="/reconcile-juniors">[Junior Payment Reconciliation]</a>
|
||||||
<a href="/payments">[Payments Ledger]</a>
|
<a href="/payments">[Payments Ledger]</a>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="nav-archived">
|
||||||
|
<span style="color: #666; margin-right: 5px;">Tools:</span>
|
||||||
|
<a href="/sync-bank">[Sync Bank Data]</a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<h1>Juniors Dashboard</h1>
|
<h1>Juniors Dashboard</h1>
|
||||||
@@ -503,7 +507,7 @@
|
|||||||
{{ cell.text }}
|
{{ cell.text }}
|
||||||
{% if cell.status == 'unpaid' or cell.status == 'partial' %}
|
{% if cell.status == 'unpaid' or cell.status == 'partial' %}
|
||||||
<button class="pay-btn"
|
<button class="pay-btn"
|
||||||
onclick="showPayQR('{{ row.name|e }}', {{ cell.amount }}, '{{ cell.month|e }}')">Pay</button>
|
onclick="showPayQR('{{ row.name|e }}', {{ cell.amount }}, '{{ cell.month|e }}', '{{ cell.raw_month }}')">Pay</button>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@@ -511,7 +515,7 @@
|
|||||||
{{ "%+d"|format(row.balance) if row.balance != 0 else "0" }}
|
{{ "%+d"|format(row.balance) if row.balance != 0 else "0" }}
|
||||||
{% if row.balance < 0 %}
|
{% if row.balance < 0 %}
|
||||||
<button class="pay-btn"
|
<button class="pay-btn"
|
||||||
onclick="showPayQR('{{ row.name|e }}', {{ -row.balance }}, '{{ row.unpaid_periods|e }}')">Pay All</button>
|
onclick="showPayQR('{{ row.name|e }}', {{ -row.balance }}, '{{ row.unpaid_periods|e }}', '{{ row.raw_unpaid_periods|e }}')">Pay All</button>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -628,7 +632,7 @@
|
|||||||
{% set rt = get_render_time() %}
|
{% set rt = get_render_time() %}
|
||||||
<div class="footer"
|
<div class="footer"
|
||||||
onclick="document.getElementById('perf-details').style.display = (document.getElementById('perf-details').style.display === 'block' ? 'none' : 'block')">
|
onclick="document.getElementById('perf-details').style.display = (document.getElementById('perf-details').style.display === 'block' ? 'none' : 'block')">
|
||||||
render time: {{ rt.total }}s
|
{{ build_meta.tag }}@{{ build_meta.commit }} | render time: {{ rt.total }}s
|
||||||
<div id="perf-details" class="perf-breakdown">
|
<div id="perf-details" class="perf-breakdown">
|
||||||
{{ rt.breakdown }}
|
{{ rt.breakdown }}
|
||||||
</div>
|
</div>
|
||||||
@@ -838,9 +842,13 @@
|
|||||||
showMemberDetails(nextName);
|
showMemberDetails(nextName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function showPayQR(name, amount, month) {
|
function showPayQR(name, amount, month, rawMonth) {
|
||||||
const account = "{{ bank_account }}";
|
const account = "{{ bank_account }}";
|
||||||
const message = `${name} / ${month}`;
|
// Convert YYYY-MM to MM/YYYY for infer_payments.py compatibility
|
||||||
|
const numericMonth = rawMonth.includes('+')
|
||||||
|
? rawMonth.split('+').map(p => p.replace(/(\d{4})-(\d{2})/, '$2/$1')).join('+')
|
||||||
|
: rawMonth.replace(/(\d{4})-(\d{2})/, '$2/$1');
|
||||||
|
const message = `${name}: ${numericMonth}`;
|
||||||
const qrTitle = document.getElementById('qrTitle');
|
const qrTitle = document.getElementById('qrTitle');
|
||||||
const qrImg = document.getElementById('qrImg');
|
const qrImg = document.getElementById('qrImg');
|
||||||
const qrAccount = document.getElementById('qrAccount');
|
const qrAccount = document.getElementById('qrAccount');
|
||||||
|
|||||||
@@ -196,6 +196,10 @@
|
|||||||
<a href="/reconcile-juniors">[Junior Payment Reconciliation]</a>
|
<a href="/reconcile-juniors">[Junior Payment Reconciliation]</a>
|
||||||
<a href="/payments" class="active">[Payments Ledger]</a>
|
<a href="/payments" class="active">[Payments Ledger]</a>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="nav-archived">
|
||||||
|
<span style="color: #666; margin-right: 5px;">Tools:</span>
|
||||||
|
<a href="/sync-bank">[Sync Bank Data]</a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<h1>Payments Ledger</h1>
|
<h1>Payments Ledger</h1>
|
||||||
@@ -237,7 +241,7 @@
|
|||||||
{% set rt = get_render_time() %}
|
{% set rt = get_render_time() %}
|
||||||
<div class="footer"
|
<div class="footer"
|
||||||
onclick="document.getElementById('perf-details').style.display = (document.getElementById('perf-details').style.display === 'block' ? 'none' : 'block')">
|
onclick="document.getElementById('perf-details').style.display = (document.getElementById('perf-details').style.display === 'block' ? 'none' : 'block')">
|
||||||
render time: {{ rt.total }}s
|
{{ build_meta.tag }}@{{ build_meta.commit }} | render time: {{ rt.total }}s
|
||||||
<div id="perf-details" class="perf-breakdown">
|
<div id="perf-details" class="perf-breakdown">
|
||||||
{{ rt.breakdown }}
|
{{ rt.breakdown }}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -460,6 +460,10 @@
|
|||||||
<a href="/reconcile-juniors" class="active">[Junior Payment Reconciliation]</a>
|
<a href="/reconcile-juniors" class="active">[Junior Payment Reconciliation]</a>
|
||||||
<a href="/payments">[Payments Ledger]</a>
|
<a href="/payments">[Payments Ledger]</a>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="nav-archived">
|
||||||
|
<span style="color: #666; margin-right: 5px;">Tools:</span>
|
||||||
|
<a href="/sync-bank">[Sync Bank Data]</a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<h1>Junior Payment Reconciliation</h1>
|
<h1>Junior Payment Reconciliation</h1>
|
||||||
@@ -499,7 +503,7 @@
|
|||||||
{{ cell.text }}
|
{{ cell.text }}
|
||||||
{% if cell.status == 'unpaid' or cell.status == 'partial' %}
|
{% if cell.status == 'unpaid' or cell.status == 'partial' %}
|
||||||
<button class="pay-btn"
|
<button class="pay-btn"
|
||||||
onclick="showPayQR('{{ row.name|e }}', {{ cell.amount }}, '{{ cell.month|e }}')">Pay</button>
|
onclick="showPayQR('{{ row.name|e }}', {{ cell.amount }}, '{{ cell.month|e }}', '{{ cell.raw_month }}')">Pay</button>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@@ -507,7 +511,7 @@
|
|||||||
{{ "%+d"|format(row.balance) if row.balance != 0 else "0" }}
|
{{ "%+d"|format(row.balance) if row.balance != 0 else "0" }}
|
||||||
{% if row.balance < 0 %}
|
{% if row.balance < 0 %}
|
||||||
<button class="pay-btn"
|
<button class="pay-btn"
|
||||||
onclick="showPayQR('{{ row.name|e }}', {{ -row.balance }}, '{{ row.unpaid_periods|e }}')">Pay All</button>
|
onclick="showPayQR('{{ row.name|e }}', {{ -row.balance }}, '{{ row.unpaid_periods|e }}', '{{ row.raw_unpaid_periods|e }}')">Pay All</button>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -631,7 +635,7 @@
|
|||||||
{% set rt = get_render_time() %}
|
{% set rt = get_render_time() %}
|
||||||
<div class="footer"
|
<div class="footer"
|
||||||
onclick="document.getElementById('perf-details').style.display = (document.getElementById('perf-details').style.display === 'block' ? 'none' : 'block')">
|
onclick="document.getElementById('perf-details').style.display = (document.getElementById('perf-details').style.display === 'block' ? 'none' : 'block')">
|
||||||
render time: {{ rt.total }}s
|
{{ build_meta.tag }}@{{ build_meta.commit }} | render time: {{ rt.total }}s
|
||||||
<div id="perf-details" class="perf-breakdown">
|
<div id="perf-details" class="perf-breakdown">
|
||||||
{{ rt.breakdown }}
|
{{ rt.breakdown }}
|
||||||
</div>
|
</div>
|
||||||
@@ -841,9 +845,13 @@
|
|||||||
showMemberDetails(nextName);
|
showMemberDetails(nextName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function showPayQR(name, amount, month) {
|
function showPayQR(name, amount, month, rawMonth) {
|
||||||
const account = "{{ bank_account }}";
|
const account = "{{ bank_account }}";
|
||||||
const message = `${name} / ${month}`;
|
// Convert YYYY-MM to MM/YYYY for infer_payments.py compatibility
|
||||||
|
const numericMonth = rawMonth.includes('+')
|
||||||
|
? rawMonth.split('+').map(p => p.replace(/(\d{4})-(\d{2})/, '$2/$1')).join('+')
|
||||||
|
: rawMonth.replace(/(\d{4})-(\d{2})/, '$2/$1');
|
||||||
|
const message = `${name}: ${numericMonth}`;
|
||||||
const qrTitle = document.getElementById('qrTitle');
|
const qrTitle = document.getElementById('qrTitle');
|
||||||
const qrImg = document.getElementById('qrImg');
|
const qrImg = document.getElementById('qrImg');
|
||||||
const qrAccount = document.getElementById('qrAccount');
|
const qrAccount = document.getElementById('qrAccount');
|
||||||
|
|||||||
@@ -460,6 +460,10 @@
|
|||||||
<a href="/reconcile-juniors">[Junior Payment Reconciliation]</a>
|
<a href="/reconcile-juniors">[Junior Payment Reconciliation]</a>
|
||||||
<a href="/payments">[Payments Ledger]</a>
|
<a href="/payments">[Payments Ledger]</a>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="nav-archived">
|
||||||
|
<span style="color: #666; margin-right: 5px;">Tools:</span>
|
||||||
|
<a href="/sync-bank">[Sync Bank Data]</a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<h1>Payment Reconciliation</h1>
|
<h1>Payment Reconciliation</h1>
|
||||||
@@ -499,7 +503,7 @@
|
|||||||
{{ cell.text }}
|
{{ cell.text }}
|
||||||
{% if cell.status == 'unpaid' or cell.status == 'partial' %}
|
{% if cell.status == 'unpaid' or cell.status == 'partial' %}
|
||||||
<button class="pay-btn"
|
<button class="pay-btn"
|
||||||
onclick="showPayQR('{{ row.name|e }}', {{ cell.amount }}, '{{ cell.month|e }}')">Pay</button>
|
onclick="showPayQR('{{ row.name|e }}', {{ cell.amount }}, '{{ cell.month|e }}', '{{ cell.raw_month }}')">Pay</button>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
@@ -507,7 +511,7 @@
|
|||||||
{{ "%+d"|format(row.balance) if row.balance != 0 else "0" }}
|
{{ "%+d"|format(row.balance) if row.balance != 0 else "0" }}
|
||||||
{% if row.balance < 0 %}
|
{% if row.balance < 0 %}
|
||||||
<button class="pay-btn"
|
<button class="pay-btn"
|
||||||
onclick="showPayQR('{{ row.name|e }}', {{ -row.balance }}, '{{ row.unpaid_periods|e }}')">Pay All</button>
|
onclick="showPayQR('{{ row.name|e }}', {{ -row.balance }}, '{{ row.unpaid_periods|e }}', '{{ row.raw_unpaid_periods|e }}')">Pay All</button>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -631,7 +635,7 @@
|
|||||||
{% set rt = get_render_time() %}
|
{% set rt = get_render_time() %}
|
||||||
<div class="footer"
|
<div class="footer"
|
||||||
onclick="document.getElementById('perf-details').style.display = (document.getElementById('perf-details').style.display === 'block' ? 'none' : 'block')">
|
onclick="document.getElementById('perf-details').style.display = (document.getElementById('perf-details').style.display === 'block' ? 'none' : 'block')">
|
||||||
render time: {{ rt.total }}s
|
{{ build_meta.tag }}@{{ build_meta.commit }} | render time: {{ rt.total }}s
|
||||||
<div id="perf-details" class="perf-breakdown">
|
<div id="perf-details" class="perf-breakdown">
|
||||||
{{ rt.breakdown }}
|
{{ rt.breakdown }}
|
||||||
</div>
|
</div>
|
||||||
@@ -841,9 +845,13 @@
|
|||||||
showMemberDetails(nextName);
|
showMemberDetails(nextName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function showPayQR(name, amount, month) {
|
function showPayQR(name, amount, month, rawMonth) {
|
||||||
const account = "{{ bank_account }}";
|
const account = "{{ bank_account }}";
|
||||||
const message = `${name} / ${month}`;
|
// Convert YYYY-MM to MM/YYYY for infer_payments.py compatibility
|
||||||
|
const numericMonth = rawMonth.includes('+')
|
||||||
|
? rawMonth.split('+').map(p => p.replace(/(\d{4})-(\d{2})/, '$2/$1')).join('+')
|
||||||
|
: rawMonth.replace(/(\d{4})-(\d{2})/, '$2/$1');
|
||||||
|
const message = `${name}: ${numericMonth}`;
|
||||||
const qrTitle = document.getElementById('qrTitle');
|
const qrTitle = document.getElementById('qrTitle');
|
||||||
const qrImg = document.getElementById('qrImg');
|
const qrImg = document.getElementById('qrImg');
|
||||||
const qrAccount = document.getElementById('qrAccount');
|
const qrAccount = document.getElementById('qrAccount');
|
||||||
|
|||||||
156
templates/sync.html
Normal file
156
templates/sync.html
Normal file
@@ -0,0 +1,156 @@
|
|||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="en">
|
||||||
|
|
||||||
|
<head>
|
||||||
|
<meta charset="UTF-8">
|
||||||
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
|
<title>FUJ - Sync Bank Data</title>
|
||||||
|
<style>
|
||||||
|
body {
|
||||||
|
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
|
||||||
|
background-color: #0c0c0c;
|
||||||
|
color: #cccccc;
|
||||||
|
padding: 10px;
|
||||||
|
margin: 0;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
align-items: center;
|
||||||
|
font-size: 11px;
|
||||||
|
line-height: 1.2;
|
||||||
|
}
|
||||||
|
|
||||||
|
h1 {
|
||||||
|
color: #00ff00;
|
||||||
|
font-family: inherit;
|
||||||
|
margin-top: 10px;
|
||||||
|
margin-bottom: 20px;
|
||||||
|
text-transform: uppercase;
|
||||||
|
letter-spacing: 1px;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav {
|
||||||
|
margin-bottom: 20px;
|
||||||
|
font-size: 12px;
|
||||||
|
color: #555;
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 10px;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav > div {
|
||||||
|
display: flex;
|
||||||
|
gap: 15px;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav a {
|
||||||
|
color: #00ff00;
|
||||||
|
text-decoration: none;
|
||||||
|
padding: 2px 8px;
|
||||||
|
border: 1px solid #333;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav a.active {
|
||||||
|
color: #000;
|
||||||
|
background-color: #00ff00;
|
||||||
|
border-color: #00ff00;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav a:hover {
|
||||||
|
color: #fff;
|
||||||
|
border-color: #555;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-archived a {
|
||||||
|
font-size: 10px;
|
||||||
|
color: #666;
|
||||||
|
border-color: #222;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-archived a.active {
|
||||||
|
color: #ccc;
|
||||||
|
background-color: #333;
|
||||||
|
border-color: #555;
|
||||||
|
}
|
||||||
|
|
||||||
|
.nav-archived a:hover {
|
||||||
|
color: #999;
|
||||||
|
border-color: #444;
|
||||||
|
}
|
||||||
|
|
||||||
|
.output-container {
|
||||||
|
background-color: #111;
|
||||||
|
border: 1px solid #333;
|
||||||
|
padding: 15px;
|
||||||
|
width: 100%;
|
||||||
|
max-width: 1200px;
|
||||||
|
margin-bottom: 30px;
|
||||||
|
overflow-x: auto;
|
||||||
|
}
|
||||||
|
|
||||||
|
.output-container pre {
|
||||||
|
margin: 0;
|
||||||
|
white-space: pre-wrap;
|
||||||
|
word-wrap: break-word;
|
||||||
|
color: {% if success %}#cccccc{% else %}#ff6666{% endif %};
|
||||||
|
}
|
||||||
|
|
||||||
|
.status {
|
||||||
|
margin-bottom: 15px;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.status-ok { color: #00ff00; }
|
||||||
|
.status-error { color: #ff6666; }
|
||||||
|
|
||||||
|
.footer {
|
||||||
|
text-align: center;
|
||||||
|
color: #333;
|
||||||
|
margin-top: 20px;
|
||||||
|
font-size: 10px;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</head>
|
||||||
|
|
||||||
|
<body>
|
||||||
|
<div class="nav">
|
||||||
|
<div>
|
||||||
|
<a href="/adults">[Adults]</a>
|
||||||
|
<a href="/juniors">[Juniors]</a>
|
||||||
|
</div>
|
||||||
|
<div class="nav-archived">
|
||||||
|
<span style="color: #666; margin-right: 5px;">Archived:</span>
|
||||||
|
<a href="/fees">[Adult - Attendance/Fees]</a>
|
||||||
|
<a href="/fees-juniors">[Junior Attendance/Fees]</a>
|
||||||
|
<a href="/reconcile">[Adult Payment Reconciliation]</a>
|
||||||
|
<a href="/reconcile-juniors">[Junior Payment Reconciliation]</a>
|
||||||
|
<a href="/payments">[Payments Ledger]</a>
|
||||||
|
</div>
|
||||||
|
<div class="nav-archived">
|
||||||
|
<span style="color: #666; margin-right: 5px;">Tools:</span>
|
||||||
|
<a href="/sync-bank" class="active">[Sync Bank Data]</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<h1>Sync Bank Data</h1>
|
||||||
|
|
||||||
|
<div class="status">
|
||||||
|
{% if success %}
|
||||||
|
<span class="status-ok">Sync completed successfully.</span>
|
||||||
|
{% else %}
|
||||||
|
<span class="status-error">Sync failed - see output below.</span>
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="output-container">
|
||||||
|
<pre>{{ output }}</pre>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="footer">
|
||||||
|
{{ build_meta.tag }} | {{ build_meta.commit }} | {{ build_meta.build_date }}
|
||||||
|
</div>
|
||||||
|
</body>
|
||||||
|
|
||||||
|
</html>
|
||||||
Reference in New Issue
Block a user