diff --git a/coursebuilder/__main__.py b/coursebuilder/__main__.py index 9b69f07..261672c 100644 --- a/coursebuilder/__main__.py +++ b/coursebuilder/__main__.py @@ -94,8 +94,9 @@ class CourseBuilder: # generate a compound column --query-compound column:sum if args.query_compound: - print(args.query_compound) - df_q.loc[:,'form-of-instruction.sum'] = df_q['form-of-instruction'].apply(lambda x: sum(list(x.values()))) + # print('{}.sum'.format(args.query_compound)) + df_q.loc[:,'{}.sum'.format(args.query_compound)] = df_q[args.query_compound].apply(lambda x: sum(list(x.values()))) + print(df_q) # --query-sort is parameterized as min:credits - hence direction:column if args.query_sort: @@ -120,9 +121,9 @@ class CourseBuilder: # print(mm.format(v=mm)) # lets get crazy to create a summary table! - df_summary = pd.DataFrame([{ - 'sum.credits': df_q['credits'].sum() - }]) + # df_summary = pd.DataFrame([{ + # 'sum.credits': df_q['credits'].sum() + # }]) # set labels directly! if args.query_labels: @@ -132,7 +133,7 @@ class CourseBuilder: print(q_as_md) - print(df_summary.to_markdown(tablefmt='grid',index=False)) + # print(df_summary.to_markdown(tablefmt='grid',index=False)) @staticmethod diff --git a/test/Makefile b/test/Makefile index 6aa2e73..8382633 100644 --- a/test/Makefile +++ b/test/Makefile @@ -38,4 +38,7 @@ debug-query: debug-query-book: python ${coursebuilder} -s schema.yaml -b book.yaml -q "kind=='compulsory'" -qs min:credits -qc form-of-instruction -qf name credits form-of-instruction -ql Modulname Kürzel Kreditpunkte +debug-query-full: + python ${coursebuilder} -s ~/Documents/MaACS/MHB/schema.yaml -b ~/Documents/MaACS/MHB/book.yaml -q "kind=='compulsory_elective'" -qc form-of-instruction -qf name form-of-instruction.sum credits term -ql Modulname SWS Kreditpunkte Semester + .PHONY: clean