diff --git a/src/Makefile b/src/Makefile index 9380a2f..2f88ed3 100644 --- a/src/Makefile +++ b/src/Makefile @@ -473,7 +473,7 @@ util-list.import.scm: $(UTIL-LIST-SOURCES) EXPORT-WEB-STATIC-SOURCES=export-web-static.scm brmember.import.scm \ util-dir.import.scm mbase.import.scm \ members-payments.import.scm cal-day.import.scm \ - util-git.import.scm configuration.import.scm + util-git.import.scm configuration.import.scm texts.import.scm export-web-static.o: export-web-static.import.scm export-web-static.import.scm: $(EXPORT-WEB-STATIC-SOURCES) diff --git a/src/export-web-static.scm b/src/export-web-static.scm index 5dc66cd..a46b067 100644 --- a/src/export-web-static.scm +++ b/src/export-web-static.scm @@ -42,7 +42,8 @@ members-payments cal-day util-git - configuration) + configuration + texts) ;; HTML entities (define (sanitize-html str) @@ -52,66 +53,83 @@ ;; Prints the HTML summary for given member to current-output-port (define (print-html-member mr) - (print "") - (print "") - (print "Brmlab member " - (brmember-nick mr) - "") - (print "") - (print "") - (print "") - (print "

Brmlab member " (brmember-nick mr) "

") - (print "
") - (print "
") - (print "
Nick:
" (brmember-nick mr) "
") - (print "
Id:
" (brmember-id mr) "
") - (print "
") - (print "
") - (print "

Member file

") - (print "
")
-   (print (sanitize-html
-	   (string-intersperse (brmember-source mr) "\n")))
-   (print "
") - (print "
") - (print "

Payments history

") - (print "") - (print "") - (print "") - (for-each (lambda (hr) - (print "" - )) - (brmember-balance-history mr)) - (print "") - (print "
DateTypeCommentAmountCurrencyAmount [CZK]Balance
" - (cal-day->string (cadr hr)) - "" - (list-ref hr 6) - "" - (list-ref hr 4) - "" - (exact->inexact (list-ref hr 2)) - "" - (list-ref hr 3) - "" - (list-ref hr 5) - "" - (exact->inexact (car hr)) - "
") - (print "
") - (print "

Member File Git Log

") - (print "
")
-   (for-each (lambda (l)
-	       (print (sanitize-html l)))
-	     ((git (*members-directory*) #:output)
-	      'log '-p '-- 
-	      (brmember-file-name mr)))
-   (print "
") - (print "") - (print "")) + (let ((bhs (brmember-balance-history mr))) + (print "") + (print "") + (print "") + (print "") + (print "Brmlab member " + (brmember-nick mr) + "") + (print "") + (print "") + (print "") + (print "

Brmlab member " (brmember-nick mr) "

") + (print "
") + (print "
") + (print "
") + (print "
Nick:
" (brmember-nick mr) "
") + (print "
Id:
" (brmember-id mr) "
") + (print "
Balance:
" (caar (reverse bhs)) "
") + (print "
") + (print "
") + (print "

Payments history

") + (print "") + (print "") + (print "") + (for-each (lambda (hr) + (print "" + )) + bhs) + (print "") + (print "
DateTypeCommentAmountCurrencyAmount [CZK]Balance
" + (cal-day->string (cadr hr)) + "" + (list-ref hr 6) + "" + (list-ref hr 4) + "" + (exact->inexact (list-ref hr 2)) + "" + (list-ref hr 3) + "" + (list-ref hr 5) + "" + (exact->inexact (car hr)) + "
") + (print "
") + (print "
") + (print "
") + (print "

Member file

") + (print "
")
+     (print (sanitize-html
+	     (string-intersperse (brmember-source mr) "\n")))
+     (print "
") + (print "
") + (print "

Member File Git Log

") + (print "
")
+     (for-each (lambda (l)
+		 (print (sanitize-html l)))
+	       ((git (*members-directory*) #:output)
+		'log '-p '-- 
+		(brmember-file-name mr)))
+     (print "
") + (print "
") + (print "
") + (print "") + (print "") + (print ""))) ;; Generates a single member in given directory (define (gen-html-member mr dir)