diff --git a/工具v2/database_tools.py b/工具v2/database_tools.py index baed3e09..87c4893f 100644 --- a/工具v2/database_tools.py +++ b/工具v2/database_tools.py @@ -878,31 +878,37 @@ def GenerateLessonPreparation(notetitle, outputdir, adict, prodict, objdict, les for lid in adict: - output += "\\section{%s \ %s}\n\n"%(lid,lessonsdict[lid]["name"]) - output += "\\subsection{课时目标}\n\n" - output += "\\begin{enumerate}\n\n" - for objid in objdict: - if objid.startswith(lid): - output += "\\item %s \\ %s \n\n"%(objid,objdict[objid]["content"]) - output += "\\end{enumerate}\n\n" + if lid in lessonsdict: + output += "\\section{%s \ %s}\n\n"%(lid,lessonsdict[lid]["name"]) + output += "\\subsection{课时目标}\n\n" + output += "\\begin{enumerate}\n\n" + for objid in objdict: + if objid.startswith(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: - 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] - output += "\\subsection{知识体验}\n\n" - output += "\\subsubsection{必讲例题}\n\n" - output += GenerateStudentBodyString([problems_list[0]],[],prodict,consecutivenumbering=False,answered=False) - output += "\\subsubsection{选讲例题}\n\n" - output += GenerateStudentBodyString([problems_list[1]],[],prodict,consecutivenumbering=False,answered=False) - output += "\\subsection{巩固新知}\n\n" - output += GenerateStudentBodyString([problems_list[2]],[],prodict,consecutivenumbering=False,answered=False) - output += "\\subsection{课后作业}\n\n" - output += GenerateStudentBodyString([problems_list[3]],[],prodict,consecutivenumbering=False,answered=False) - output += "\\newpage\n\n" + output += "\\subsection{双基梳理}\n\n" + basic_body = "" + for bnid in basicknowledgedict: + if basicknowledgedict[bnid]["lesson"] == 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] + output += "\\subsection{知识体验}\n\n" + output += "\\subsubsection{必讲例题}\n\n" + output += GenerateStudentBodyString([problems_list[0]],[],prodict,consecutivenumbering=False,answered=False) + output += "\\subsubsection{选讲例题}\n\n" + output += GenerateStudentBodyString([problems_list[1]],[],prodict,consecutivenumbering=False,answered=False) + output += "\\subsection{巩固新知}\n\n" + output += GenerateStudentBodyString([problems_list[2]],[],prodict,consecutivenumbering=False,answered=False) + output += "\\subsection{课后作业}\n\n" + output += GenerateStudentBodyString([problems_list[3]],[],prodict,consecutivenumbering=False,answered=False) + output += "\\newpage\n\n" + elif "复习" in lid: + output += "\\section{%s}\n\n"%lid + problems_list = adict[lid] + output += GenerateStudentBodyString([".".join(problems_list)],[],prodict,consecutivenumbering=False,answered = False) + output += "\\newpage\n\n" latex_raw = ReadTextFile("模板文件/讲义模板.txt")