diff --git a/src/export-sheet.scm b/src/export-sheet.scm index a88dd33..5bc94cb 100644 --- a/src/export-sheet.scm +++ b/src/export-sheet.scm @@ -74,8 +74,8 @@ (print "\\vskip1em") (newline) (define colnames - '((id) Nick "Jméno" "Příjmení" (Fee) (Balance) B (Active) A OK? Signature)) - (print "\\renewcommand\\arraystretch{2.0}") + '((id) Nick "Jméno" "Příjmení" (Fee) (Bilance) ("\\begin{minipage}{15mm}\\begin{center}Aktivní\\\\Měsíce\\end{center}\\end{minipage}") OK? Podpis)) + (print "\\renewcommand\\arraystretch{2.1}") (print (format "\\begin{longtable}{|~A|}" @@ -97,7 +97,9 @@ (symbol->string x) (if (string? x) x - (symbol->string (car x)))))) + (if (string? (car x)) + (car x) + (symbol->string (car x))))))) colnames) "&") "\\\\") @@ -168,24 +170,36 @@ " & " current-fee " & " + "\\begin{minipage}{15mm}\\begin{flushright}" (format-amount-tex (member-total-balance mr)) - " & " + "\\\\" (if balance-ok? - "Y" - "--") - " & " - numactive + "Bez~dluhu" + "---~~~~~~") + "\\end{flushright}\\end{minipage}" " & " + ;(if balance-ok? + ; "Y" + ; "--") + ;" & " + "\\begin{minipage}{12mm}\\begin{center}" + numactive "/" 12 + "\\\\" (if active-ok? - "Y" - "--") + "Splněno" + "\\phantom{Sp}---\\phantom{Sp}") + "\\end{center}\\end{minipage}" " & " + ;(if active-ok? + ; "Y" + ; "--") + ;" & " (if vote-ok? "Y" "--") " & " - "~ ~ ~ ~ ~" + "~\\hskip24mm~" " \\\\") (print "\\hline") (loop (cdr mrs)))))