X-Git-Url: http://git.plutz.net/?p=invoices;a=blobdiff_plain;f=odtgen.sh;h=9ed1e22bbc7c57e3ecf9f9793da49f9cc88120c9;hp=177065a9c9a0fd10f92cba31058aceacc51f1b98;hb=HEAD;hpb=026cd2e0fc6081c19d681a40720f7a70b449f3d8
diff --git a/odtgen.sh b/odtgen.sh
index 177065a..abed2db 100755
--- a/odtgen.sh
+++ b/odtgen.sh
@@ -178,8 +178,8 @@ odt_content(){
$(sed 1d "invoices/$id" |while read -r time work hours; do
- time="$(UNSTRING "${time#time=}" |sed 's;\r;;g')"
- work="$(UNSTRING "${work#work=}" |sed 's;\r;;g')"
+ time="$(UNSTRING "${time#time=}" |sed -r 's;(
\;)?
\;|(?[Dd]\;)??[aA]\;|\r?$;;g')"
+ work="$(UNSTRING "${work#work=}" |sed -r 's;(
\;)?
\;|(?[Dd]\;)??[aA]\;|\r?$;;g')"
hours="$(UNSTRING "${hours#hours=}")"
cat <<-TROW
@@ -190,10 +190,16 @@ odt_content(){
${work}
- ${hours}
+ $( awk "BEGIN {
+ if ( int(${hours}) == ${hours} )
+ printf \"%i\", ${hours};
+ else
+ printf \"%i:%i\", int(${hours}), int((${hours} - int(${hours})) * 60);
+ }"
+ )
- $((${hourly} * ${hours})) â¬
+ $(awk "BEGIN { printf \"%.2f\", ${hourly} * ${hours}; }" ) â¬
TROW