From 6db63c8ae52fc5d5089079b94d90ee1f36baf039 Mon Sep 17 00:00:00 2001 From: "weiye.wang" Date: Tue, 11 Jul 2023 19:53:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0database=5Ftools=E4=B8=AD?= =?UTF-8?q?=E6=96=B0=E8=AF=BE=E5=A4=87=E8=AF=BE=E7=A8=BF=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=96=B9=E5=BC=8F,=20=E7=8E=B0=E5=9C=A8=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E4=BB=A5=E5=A4=9A=E8=8A=82=E8=AF=BE=E5=90=88=E5=B9=B6=E7=9A=84?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E7=94=9F=E6=88=90=E5=A4=87=E8=AF=BE=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 工具v2/database_tools.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/工具v2/database_tools.py b/工具v2/database_tools.py index 87c4893f..59684f09 100644 --- a/工具v2/database_tools.py +++ b/工具v2/database_tools.py @@ -878,19 +878,20 @@ def GenerateLessonPreparation(notetitle, outputdir, adict, prodict, objdict, les for lid in adict: - if lid in lessonsdict: - output += "\\section{%s \ %s}\n\n"%(lid,lessonsdict[lid]["name"]) + if all(elem in lessonsdict for elem in lid.split("&")): + lessons = lid.split("&") + lessonname = "\&".join([lessonsdict[lesson]["name"] for lesson in lessons]) + output += "\\section{%s \ %s}\n\n"%(lid.replace("&","\&"),lessonname) output += "\\subsection{课时目标}\n\n" output += "\\begin{enumerate}\n\n" for objid in objdict: - if objid.startswith(lid): + if objid[:5] in lid: output += "\\item %s \\ %s \n\n"%(objid,objdict[objid]["content"]) output += "\\end{enumerate}\n\n" - output += "\\subsection{双基梳理}\n\n" basic_body = "" for bnid in basicknowledgedict: - if basicknowledgedict[bnid]["lesson"] == lid: + if basicknowledgedict[bnid]["lesson"] in lid: basic_body += "\\item %s\n\n"%basicknowledgedict[bnid]["content"] output += "\\begin{enumerate}\n\n %s\n\n\\end{enumerate}\n\n"%(basic_body if basic_body != "" else "\\item 暂无") problems_list = adict[lid] @@ -904,7 +905,7 @@ def GenerateLessonPreparation(notetitle, outputdir, adict, prodict, objdict, les output += "\\subsection{课后作业}\n\n" output += GenerateStudentBodyString([problems_list[3]],[],prodict,consecutivenumbering=False,answered=False) output += "\\newpage\n\n" - elif "复习" in lid: + else: output += "\\section{%s}\n\n"%lid problems_list = adict[lid] output += GenerateStudentBodyString([".".join(problems_list)],[],prodict,consecutivenumbering=False,answered = False)