Upload 67 files

app/models.py

@@ -72,6 +72,7 @@ class Activity(TimestampMixin, Base):
     description: Mapped[str] = mapped_column(Text, default="")
     start_at: Mapped[datetime] = mapped_column(DateTime)
     deadline_at: Mapped[datetime] = mapped_column(DateTime)
+    is_visible: Mapped[bool] = mapped_column(Boolean, default=True)
     leaderboard_visible: Mapped[bool] = mapped_column(Boolean, default=True)
     clue_interval_minutes: Mapped[Optional[int]] = mapped_column(Integer, nullable=True)
     created_by_id: Mapped[int] = mapped_column(ForeignKey("admins.id"))
@@ -150,3 +151,4 @@ class Submission(TimestampMixin, Base):
         back_populates="assigned_submissions",
         foreign_keys=[assigned_admin_id],
     )
+

app/routes/admin.py

@@ -91,6 +91,7 @@ def parse_activity_fields(form) -> dict:
     start_raw = str(form.get("start_at", "")).strip()
     deadline_raw = str(form.get("deadline_at", "")).strip()
     clue_interval_raw = str(form.get("clue_interval_minutes", "")).strip()
+    is_visible = form.get("is_visible") == "on"
     leaderboard_visible = form.get("leaderboard_visible") == "on"
 
     if not title or not start_raw or not deadline_raw:
@@ -116,6 +117,7 @@ def parse_activity_fields(form) -> dict:
         "start_at": start_at,
         "deadline_at": deadline_at,
         "clue_interval_minutes": clue_interval_minutes,
+        "is_visible": is_visible,
         "leaderboard_visible": leaderboard_visible,
     }
 
@@ -191,6 +193,14 @@ def cleanup_task_files(task: Task) -> None:
     delete_file_if_exists(task.clue_image_path, settings.task_media_root)
 
 
+def cleanup_activity_files(activity: Activity) -> None:
+    all_submissions: list[Submission] = []
+    for task in activity.tasks:
+        all_submissions.extend(task.submissions)
+        cleanup_task_files(task)
+    cleanup_submission_files(all_submissions)
+
+
 def normalize_path_key(file_path: str | Path) -> str:
     return str(Path(file_path).resolve())
 
@@ -1087,8 +1097,31 @@ async def delete_task(task_id: int, request: Request, db: Session = Depends(get_
     add_flash(request, "success", "任务已删除，剩余任务顺序和线索发布时间已自动更新。")
     return redirect(f"/admin/activities/{activity_id}/edit")
 
+@router.post("/admin/activities/{activity_id}/delete")
+async def delete_activity(activity_id: int, request: Request, db: Session = Depends(get_db)):
+    admin = require_admin(request, db)
+    if not admin:
+        return redirect("/admin")
+
+    activity = (
+        db.query(Activity)
+        .options(joinedload(Activity.tasks).joinedload(Task.submissions))
+        .filter(Activity.id == activity_id)
+        .first()
+    )
+    if not activity:
+        raise HTTPException(status_code=404, detail="活动不存在")
+
+    activity_title = activity.title
+    cleanup_activity_files(activity)
+    db.delete(activity)
+    db.commit()
+    add_flash(request, "success", f"活动 {activity_title} 已删除，相关任务与本地提交图片也已清理。")
+    return redirect("/admin/activities")
+
+
 @router.post("/admin/activities/{activity_id}/visibility")
-async def update_leaderboard_visibility(activity_id: int, request: Request, db: Session = Depends(get_db)):
+async def update_activity_visibility(activity_id: int, request: Request, db: Session = Depends(get_db)):
     admin = require_admin(request, db)
     if not admin:
         return redirect("/admin")
@@ -1098,10 +1131,11 @@ async def update_leaderboard_visibility(activity_id: int, request: Request, db:
         raise HTTPException(status_code=404, detail="活动不存在")
 
     form = await request.form()
+    activity.is_visible = form.get("is_visible") == "on"
     activity.leaderboard_visible = form.get("leaderboard_visible") == "on"
     db.add(activity)
     db.commit()
-    add_flash(request, "success", f"已更新 {activity.title} 的排行榜可见性。")
+    add_flash(request, "success", f"已更新 {activity.title} 的活动可见性和排行榜设置。")
     return redirect("/admin/activities")
 
 @router.get("/admin/reviews")
@@ -1339,3 +1373,7 @@ async def delete_managed_image(request: Request, db: Session = Depends(get_db)):
 
 
 
+
+
+
+

app/routes/user.py

@@ -45,6 +45,7 @@ def dashboard(request: Request, db: Session = Depends(get_db)):
     activities = (
         db.query(Activity)
         .options(joinedload(Activity.tasks).joinedload(Task.submissions))
+        .filter(Activity.is_visible.is_(True))
         .order_by(Activity.start_at.asc())
         .all()
     )
@@ -85,6 +86,9 @@ def activity_detail(activity_id: int, request: Request, db: Session = Depends(ge
     activity = get_activity_with_group_context(db, activity_id)
     if not activity:
         raise HTTPException(status_code=404, detail="活动不存在")
+    if not activity.is_visible:
+        add_flash(request, "error", "该活动当前暂未对用户开放。")
+        return redirect("/dashboard")
 
     now = local_now()
     group_submission_by_task = build_group_submission_map(activity, user.group_id)
@@ -128,8 +132,12 @@ async def submit_task(
         return redirect(f"/activities/{activity_id}")
 
     activity = db.query(Activity).filter(Activity.id == activity_id).first()
+    if not activity or not activity.is_visible:
+        add_flash(request, "error", "该活动当前暂未对用户开放。")
+        return redirect("/dashboard")
+
     task = db.query(Task).filter(Task.id == task_id, Task.activity_id == activity_id).first()
-    if not activity or not task:
+    if not task:
         raise HTTPException(status_code=404, detail="任务不存在")
 
     now = local_now()
@@ -203,7 +211,7 @@ def activity_clues(activity_id: int, request: Request, db: Session = Depends(get
         return JSONResponse({"error": "unauthorized"}, status_code=401)
 
     activity = db.query(Activity).options(joinedload(Activity.tasks)).filter(Activity.id == activity_id).first()
-    if not activity:
+    if not activity or not activity.is_visible:
         return JSONResponse({"error": "not_found"}, status_code=404)
 
     now = local_now()
@@ -226,7 +234,7 @@ def activity_status(activity_id: int, request: Request, db: Session = Depends(ge
         return JSONResponse({"error": "unauthorized"}, status_code=401)
 
     activity = get_activity_with_group_context(db, activity_id)
-    if not activity:
+    if not activity or not activity.is_visible:
         return JSONResponse({"error": "not_found"}, status_code=404)
 
     submission_map = build_group_submission_map(activity, user.group_id)
@@ -275,3 +283,8 @@ def activity_status(activity_id: int, request: Request, db: Session = Depends(ge
 
 
 
+
+
+
+
+

app/services/bootstrap.py

@@ -148,6 +148,7 @@ def migrate_task_media_to_files() -> None:
 def upgrade_schema() -> None:
     ensure_column("admins", "last_seen_at", "last_seen_at DATETIME NULL")
     ensure_column("users", "last_seen_at", "last_seen_at DATETIME NULL")
+    ensure_column("activities", "is_visible", "is_visible TINYINT(1) NOT NULL DEFAULT 1")
     ensure_column("activities", "leaderboard_visible", "leaderboard_visible TINYINT(1) NOT NULL DEFAULT 1")
     ensure_column("activities", "clue_interval_minutes", "clue_interval_minutes INT NULL")
     ensure_column("tasks", "display_order", "display_order INT NOT NULL DEFAULT 1")
@@ -231,3 +232,4 @@ def seed_super_admin(db: Session) -> None:
 
 
 
+

app/templates/admin_activities.html

@@ -32,6 +32,10 @@
           <span>活动说明</span>
           <textarea name="description" rows="3" placeholder="介绍活动安排、打卡要求和注意事项"></textarea>
         </label>
+        <label class="checkbox-row">
+          <input type="checkbox" name="is_visible" checked />
+          <span>允许用户查看该活动</span>
+        </label>
         <label class="checkbox-row">
           <input type="checkbox" name="leaderboard_visible" checked />
           <span>允许用户查看实时排行榜</span>
@@ -91,16 +95,27 @@
               <p class="muted">{{ activity.start_at|datetime_local }} 至 {{ activity.deadline_at|datetime_local }}</p>
               <p class="muted">{{ activity.tasks|length }} 个任务 · 创建人 {{ activity.created_by.display_name }}</p>
               <p class="muted">线索间隔：{{ activity.clue_interval_minutes if activity.clue_interval_minutes is not none else '与活动开始同步' }}</p>
+              <div class="chip-row">
+                <span class="chip">{{ '用户端可见' if activity.is_visible else '用户端隐藏' }}</span>
+                <span class="chip">{{ '排行榜可见' if activity.leaderboard_visible else '排行榜隐藏' }}</span>
+              </div>
             </div>
             <div class="activity-actions">
               <a class="btn btn-primary small-btn" href="/admin/activities/{{ activity.id }}/edit">编辑活动</a>
               <form method="post" action="/admin/activities/{{ activity.id }}/visibility" class="inline-form visibility-form">
+                <label class="checkbox-row compact-checkbox">
+                  <input type="checkbox" name="is_visible" {% if activity.is_visible %}checked{% endif %} />
+                  <span>用户可见活动</span>
+                </label>
                 <label class="checkbox-row compact-checkbox">
                   <input type="checkbox" name="leaderboard_visible" {% if activity.leaderboard_visible %}checked{% endif %} />
                   <span>用户可见排行榜</span>
                 </label>
                 <button class="btn btn-secondary small-btn" type="submit">保存</button>
               </form>
+              <form method="post" action="/admin/activities/{{ activity.id }}/delete" class="inline-form">
+                <button class="btn btn-danger small-btn" type="submit" onclick="return confirm('确定删除这个活动吗？相关任务、审核记录和本地提交图片都会一并删除。');">删除活动</button>
+              </form>
             </div>
           </article>
         {% else %}
@@ -139,7 +154,11 @@
         const template = builder.querySelector('[data-task-template]');
         const clone = template.cloneNode(true);
         clone.querySelectorAll('input, textarea').forEach((field) => {
-          field.value = '';
+          if (field.type === 'checkbox') {
+            field.checked = false;
+          } else {
+            field.value = '';
+          }
         });
         attachRemove(clone);
         builder.appendChild(clone);
@@ -148,4 +167,3 @@
     })();
   </script>
 {% endblock %}
-

app/templates/admin_activity_edit.html

@@ -12,6 +12,10 @@
       <span class="pill">创建人 {{ activity.created_by.display_name }}</span>
       <span class="pill">{{ activity.tasks|length }} 个任务</span>
       <span class="pill">开始 {{ activity.start_at|datetime_local }}</span>
+      <span class="pill">{{ '用户端可见' if activity.is_visible else '用户端隐藏' }}</span>
+    </div>
+    <div class="card-footer">
+      <button class="btn btn-danger" type="submit" form="delete-activity-form" onclick="return confirm('确定删除这个活动吗？相关任务、审核记录和本地提交图片都会一并删除。');">删除整个活动</button>
     </div>
   </section>
 
@@ -45,6 +49,10 @@
         <span>活动说明</span>
         <textarea name="description" rows="3">{{ activity.description or '' }}</textarea>
       </label>
+      <label class="checkbox-row">
+        <input type="checkbox" name="is_visible" {% if activity.is_visible %}checked{% endif %} />
+        <span>允许用户查看该活动</span>
+      </label>
       <label class="checkbox-row">
         <input type="checkbox" name="leaderboard_visible" {% if activity.leaderboard_visible %}checked{% endif %} />
         <span>允许用户查看实时排行榜</span>
@@ -59,7 +67,8 @@
           <p class="mini-note">管理员始终可见，用于现场统筹和审核判断；用户是否可见由上方开关控制。</p>
         </div>
         <div class="chip-row">
-          <span class="chip">用户端{{ '可见' if activity.leaderboard_visible else '隐藏' }}</span>
+          <span class="chip">活动{{ '可见' if activity.is_visible else '隐藏' }}</span>
+          <span class="chip">排行榜{{ '可见' if activity.leaderboard_visible else '隐藏' }}</span>
           <span class="chip">按完成点位数优先，再按总耗时排序</span>
         </div>
       </div>
@@ -206,6 +215,8 @@
     </section>
   </form>
 
+  <form id="delete-activity-form" method="post" action="/admin/activities/{{ activity.id }}/delete"></form>
+
   {% for task in activity.tasks %}
     <form id="delete-task-{{ task.id }}" method="post" action="/admin/tasks/{{ task.id }}/delete"></form>
   {% endfor %}
@@ -254,3 +265,7 @@
   </script>
 {% endblock %}
 
+
+
+
+

app/templates/admin_dashboard.html

@@ -62,8 +62,9 @@
             <div>
               <strong>{{ activity.title }}</strong>
               <p class="muted">{{ activity.tasks|length }} 个任务 · {{ activity.start_at|datetime_local }}</p>
+              <p class="muted">{{ '用户端可见' if activity.is_visible else '用户端隐藏' }} · {{ '排行榜可见' if activity.leaderboard_visible else '排行榜隐藏' }}</p>
             </div>
-            <span class="status-badge">{{ '排行榜可见' if activity.leaderboard_visible else '排行榜隐藏' }}</span>
+            <span class="status-badge {% if activity.is_visible %}status-approved{% else %}status-rejected{% endif %}">{{ '活动可见' if activity.is_visible else '活动隐藏' }}</span>
           </div>
         {% else %}
           <p class="muted">还没有发布活动。</p>
@@ -116,3 +117,4 @@
     </section>
   {% endif %}
 {% endblock %}
+