diff --git a/module/achievement/__init__.py b/module/achievement/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/module/achievement_doc.py b/module/achievement/doc.py similarity index 99% rename from module/achievement_doc.py rename to module/achievement/doc.py index 85d59a3..a726261 100644 --- a/module/achievement_doc.py +++ b/module/achievement/doc.py @@ -13,7 +13,7 @@ from docx.shared import Pt, Cm from docx.text.run import Run from module import LOGLEVEL -from module.achievement_excel import ExcelReader +from module.achievement.excel import ExcelReader class DocxWriter: diff --git a/module/achievement_excel.py b/module/achievement/excel.py similarity index 100% rename from module/achievement_excel.py rename to module/achievement/excel.py diff --git a/module/defense/__init__.py b/module/defense/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/module/doc.py b/module/defense/doc.py similarity index 79% rename from module/doc.py rename to module/defense/doc.py index 8b7f03c..551d940 100644 --- a/module/doc.py +++ b/module/defense/doc.py @@ -4,7 +4,7 @@ from copy import deepcopy from docx import Document from docx.shared import Cm -from module.schema import Course, Student, Question +from module.schema import Course, Student class DocPaper: @@ -51,12 +51,4 @@ class DocPaper: if __name__ == '__main__': - course = Course.load_from_xls('../files/21工程管理-工程造价Ⅱ-点名册-系统0828.xlsx') - students = Student.load_from_xls('../files/21工程管理-工程造价Ⅱ-点名册-系统0828.xlsx') - questions = Question.load_from_csv() - - d = DocPaper() - for student in students: - student.pick_question(questions) - d.add_paper(course, student) - d.save() + ... \ No newline at end of file diff --git a/module/picker/__init__.py b/module/picker/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/module/worker.py b/module/worker.py index c2c9570..cf092fc 100644 --- a/module/worker.py +++ b/module/worker.py @@ -4,9 +4,9 @@ import traceback from PySide6.QtCore import QObject, Signal from win32com import client -from module.achievement_doc import DocxWriter -from module.achievement_excel import ExcelReader -from module.doc import DocPaper +from module.achievement.doc import DocxWriter +from module.achievement.excel import ExcelReader +from module.defense.doc import DocPaper from module.schema import Course, Student, Question from utils.function import resource_path