抽奖页面完成

Author: lzy98276

.gitignore

@@ -181,3 +181,4 @@ cython_debug/
 
 # VSCode
 .vscode/settings.json
+/.trae

app/Language/modules/custom_settings.py

@@ -79,6 +79,21 @@
             "description": "控制是否显示抽奖名单切换框",
             "switchbutton_name": {"enable": "显示", "disable": "隐藏"},
         },
+        "lottery_roll_call_list": {
+            "name": "抽奖中的学生名单切换下拉框",
+            "description": "控制是否显示抽奖中的学生名单切换框",
+            "switchbutton_name": {"enable": "显示", "disable": "隐藏"},
+        },
+        "lottery_roll_call_range": {
+            "name": "抽奖中的学生点名范围下拉框",
+            "description": "控制是否显示抽奖中的学生点名范围选择框",
+            "switchbutton_name": {"enable": "显示", "disable": "隐藏"},
+        },
+        "lottery_roll_call_gender": {
+            "name": "抽奖中的学生点名性别范围下拉框",
+            "description": "控制是否显示抽奖中的学生点名性别范围选择框",
+            "switchbutton_name": {"enable": "显示", "disable": "隐藏"},
+        },
         "lottery_quantity_label": {
             "name": "数量标签",
             "description": "控制是否显示中奖数量标签",

app/Language/modules/extraction_settings.py

@@ -298,7 +298,7 @@
             "name": "颜色主题设置",
             "description": "设置抽奖结果颜色主题",
         },
-        "student_image_settings": {
+        "lottery_image_settings": {
             "name": "奖品图片设置",
             "description": "设置抽奖结果中奖品图片显示",
         },

app/Language/modules/lottery_main.py

@@ -17,6 +17,11 @@
             "description": "停止抽奖",
             "pushbutton_name": "停止",
         },
+        "list_combobox": {
+            "name": "班级",
+            "description": "选择班级",
+            "combo_items": ["不抽取学生"],
+        },
         "range_combobox": {
             "name": "范围",
             "description": "选择抽取范围",

app/page_building/another_window.py

@@ -409,6 +409,10 @@ def setup_page():
                     group_index,
                     gender_index,
                 )
+            try:
+                window.windowClosed.connect(lambda: getattr(page, "stop_loader", lambda: None)())
+            except Exception:
+                pass
 
     # 使用延迟调用确保内容控件已创建
     QTimer.singleShot(APP_INIT_DELAY, setup_page)

app/tools/config.py

@@ -1453,3 +1453,60 @@ def calculate_remaining_count(
     else:
         # 如果half_repeat为0，则不排除任何学生或小组
         return total_count
+
+
+# ======= 奖池抽取记录 =======
+def record_drawn_prize(pool_name: str, prize_names):
+    file_path = get_resources_path("TEMP", f"draw_until_prize_{pool_name}.json")
+    os.makedirs(os.path.dirname(file_path), exist_ok=True)
+    drawn_records = _load_drawn_records(file_path)
+    names = _extract_student_names(prize_names)
+    for name in names:
+        if name in drawn_records:
+            drawn_records[name] += 1
+        else:
+            drawn_records[name] = 1
+    _save_drawn_records(file_path, drawn_records)
+
+
+def read_drawn_record_simple(pool_name: str):
+    file_path = get_resources_path("TEMP", f"draw_until_prize_{pool_name}.json")
+    if os.path.exists(file_path):
+        try:
+            with open(file_path, "r", encoding="utf-8") as file:
+                data = json.load(file)
+            if isinstance(data, dict):
+                return [(name, count) for name, count in data.items()]
+            if isinstance(data, list):
+                res = []
+                for item in data:
+                    if isinstance(item, str):
+                        res.append((item, 1))
+                    elif isinstance(item, dict) and "name" in item:
+                        res.append((item["name"], int(item.get("count", 1))))
+                return res
+        except Exception as e:
+            logger.error(f"读取奖池已抽取记录失败: {e}")
+            return []
+    return []
+
+
+def reset_drawn_prize_record(self, pool_name: str):
+    try:
+        pattern = os.path.join("app", "resources", "TEMP", f"draw_*_prize_{pool_name}.json")
+        for fp in glob.glob(pattern):
+            try:
+                os.remove(fp)
+            except OSError as e:
+                logger.error(f"删除文件{fp}失败: {e}")
+        show_notification(
+            NotificationType.INFO,
+            NotificationConfig(
+                title="提示",
+                content=f"已重置{pool_name}奖池抽取记录",
+                icon=FluentIcon.INFO,
+            ),
+            parent=self,
+        )
+    except Exception as e:
+        logger.error(f"重置奖池抽取记录失败: {e}")

app/tools/history.py

@@ -92,7 +92,7 @@ def save_history_data(history_type: str, file_name: str, data: Dict[str, Any]) -
         return True
     except Exception as e:
         logger.error(f"保存历史记录数据失败: {e}")
-        return False
+    return False
 
 
 def get_all_history_names(history_type: str) -> List[str]:
@@ -200,6 +200,63 @@ def get_individual_statistics(
         return 0
     return len(student_history)
 
+# ==================================================
+# 保存抽奖历史函数
+# ==================================================
+def save_lottery_history(pool_name: str, selected_students: List[Dict[str, Any]], group_filter: str, gender_filter: str) -> bool:
+    """保存抽奖历史（基于奖池名称）
+
+    Args:
+        pool_name: 奖池名称
+        selected_students: 学生字典列表（包含 name、id、exist 等）
+        group_filter: 抽取时的小组过滤器
+        gender_filter: 抽取时的性别过滤器
+
+    Returns:
+        bool: 保存是否成功
+    """
+    try:
+        history_data = load_history_data("lottery", pool_name)
+        lotterys = history_data.get("lotterys", {})
+        group_stats = history_data.get("group_stats", {})
+        gender_stats = history_data.get("gender_stats", {})
+        total_stats = history_data.get("total_stats", 0)
+
+        now_str = datetime.now().isoformat(timespec="seconds")
+
+        for student in selected_students or []:
+            name = student.get("name", "")
+            if not name:
+                continue
+            entry = lotterys.get(name)
+            if not isinstance(entry, dict):
+                entry = {"total_count": 0, "rounds_missed": 0, "last_drawn_time": "", "history": []}
+            entry["total_count"] = int(entry.get("total_count", 0)) + 1
+            entry["last_drawn_time"] = now_str
+            hist = entry.get("history", [])
+            if not isinstance(hist, list):
+                hist = []
+            hist.append({"draw_time": now_str, "draw_group": group_filter, "draw_gender": gender_filter})
+            entry["history"] = hist
+            lotterys[name] = entry
+
+        # 更新统计
+        if group_filter:
+            group_stats[group_filter] = int(group_stats.get(group_filter, 0)) + len(selected_students or [])
+        if gender_filter:
+            gender_stats[gender_filter] = int(gender_stats.get(gender_filter, 0)) + len(selected_students or [])
+        total_stats = int(total_stats) + len(selected_students or [])
+
+        history_data["lotterys"] = lotterys
+        history_data["group_stats"] = group_stats
+        history_data["gender_stats"] = gender_stats
+        history_data["total_stats"] = total_stats
+
+        return save_history_data("lottery", pool_name, history_data)
+    except Exception as e:
+        logger.error(f"保存抽奖历史失败: {e}")
+        return False
+
 
 # ==================================================
 # 权重格式化函数

app/tools/lottery_utils.py

@@ -4,11 +4,12 @@
 import json
 from random import SystemRandom
 
-from app.tools.list import get_group_list, get_student_list, filter_students_data
-from app.tools.history import calculate_weight
+from app.tools.list import get_group_list, get_student_list, filter_students_data, get_pool_list
+from app.tools.history import calculate_weight, load_history_data
 from app.tools.config import (
     calculate_remaining_count,
     read_drawn_record,
+    read_drawn_record_simple,
     reset_drawn_record,
 )
 from app.tools.path_utils import get_resources_path, open_file
@@ -68,7 +69,7 @@ def update_many_count_label_text(
             tuple: (总人数, 剩余人数, 格式化文本)
         """
         # 根据范围计算实际人数
-        total_count = RollCallUtils.get_total_count(
+        total_count = LotteryUtils.get_total_count(
             list_combobox_text, range_combobox_index, range_combobox_text
         )
 
@@ -243,6 +244,121 @@ def draw_random_students(
             "gender_filter": gender_filter,
         }
 
+    @staticmethod
+    def get_prize_total_count(pool_name: str) -> int:
+        """获取奖池奖品总数"""
+        try:
+            from app.tools.list import get_pool_list
+            return len(get_pool_list(pool_name))
+        except Exception:
+            return 0
+
+    @staticmethod
+    def update_prize_many_count_label_text(pool_name: str):
+        """生成奖品总数/剩余显示文本"""
+        total_count = LotteryUtils.get_prize_total_count(pool_name)
+        remaining_count = LotteryUtils.calculate_prize_remaining_count(pool_name)
+        if remaining_count == 0:
+            remaining_count = total_count
+        text_template = get_any_position_value("lottery", "many_count_label", "text_0")
+        formatted_text = text_template.format(total_count=total_count, remaining_count=remaining_count)
+        return total_count, remaining_count, formatted_text
+
+    @staticmethod
+    def draw_random_prizes(pool_name: str, current_count: int):
+        """按权重抽取奖品"""
+        try:
+            from app.tools.config import read_drawn_record
+            items = get_pool_list(pool_name)
+            if not items:
+                return {"selected_prizes": [], "pool_name": pool_name, "selected_prizes_dict": []}
+            # 非重复/半重复处理：根据 TEMP 记录过滤已达阈值的奖品（与 roll_call 一致）
+            threshold = LotteryUtils._get_prize_draw_threshold()
+            if threshold is not None:
+                drawn_records = read_drawn_record_simple(pool_name)
+                drawn_counts = {name: cnt for name, cnt in drawn_records}
+                available = []
+                for i in items:
+                    name = i.get("name", "")
+                    cnt = int(drawn_counts.get(name, 0))
+                    if cnt < threshold:
+                        available.append(i)
+                items = available
+                if not items:
+                    return {"reset_required": True}
+            # 准备权重
+            weights = [float(i.get("weight", 1)) for i in items]
+            draw = min(current_count, len(items))
+            selected = []
+            selected_dict = []
+            for _ in range(draw):
+                if not items:
+                    break
+                total_weight = sum(weights)
+                if total_weight <= 0:
+                    idx = system_random.randint(0, len(items) - 1)
+                else:
+                    rv = system_random.uniform(0, total_weight)
+                    cum = 0
+                    idx = 0
+                    for i, w in enumerate(weights):
+                        cum += w
+                        if rv <= cum:
+                            idx = i
+                            break
+                chosen = items[idx]
+                selected.append((chosen.get("id"), chosen.get("name"), chosen.get("exist", True)))
+                selected_dict.append(chosen)
+                items.pop(idx)
+                weights.pop(idx)
+            return {
+                "selected_prizes": selected,
+                "pool_name": pool_name,
+                "selected_prizes_dict": selected_dict,
+            }
+        except Exception:
+            return {"selected_prizes": [], "pool_name": pool_name, "selected_prizes_dict": []}
+
+    @staticmethod
+    def _get_prize_draw_threshold():
+        """获取奖品抽取阈值：None 表示可重复；1 表示不重复；半重复返回次数阈值"""
+        try:
+            mode = readme_settings_async("lottery_settings", "draw_mode")
+            if mode == 1:
+                return 1
+            elif mode == 2:
+                hr = readme_settings_async("lottery_settings", "half_repeat")
+                try:
+                    return int(hr) if hr else 1
+                except Exception:
+                    return 1
+            else:
+                return None
+        except Exception:
+            return None
+
+    @staticmethod
+    def calculate_prize_remaining_count(pool_name: str) -> int:
+        """计算剩余可抽奖品数量，考虑不重复/半重复设置"""
+        try:
+            from app.tools.list import get_pool_list
+            from app.tools.config import read_drawn_record
+            threshold = LotteryUtils._get_prize_draw_threshold()
+            total = len(get_pool_list(pool_name))
+            if threshold is None:
+                return total
+            drawn_records = read_drawn_record_simple(pool_name)
+            drawn_counts = {name: cnt for name, cnt in drawn_records}
+            remain = 0
+            for i in get_pool_list(pool_name):
+                name = i.get("name", "")
+                cnt = int(drawn_counts.get(name, 0))
+                if cnt < threshold:
+                    remain += 1
+            return remain
+        except Exception:
+            return 0
+
     @staticmethod
     def draw_random_groups(students_dict_list, current_count, draw_type):
         """

app/tools/settings_default_storage.py

@@ -363,6 +363,9 @@
         "lottery_quantity_control": {"default_value": True},
         "lottery_start_button": {"default_value": True},
         "lottery_list": {"default_value": True},
+        "lottery_roll_call_list": {"default_value": True},
+        "lottery_roll_call_range": {"default_value": True},
+        "lottery_roll_call_gender": {"default_value": True},
         "lottery_remaining_button": {"default_value": True},
         "lottery_quantity_label": {"default_value": True},
         "custom_method": {"default_value": 1},