support for fractional work hours

[invoices] / invoices.sh

diff --git a/invoices.sh b/invoices.sh
index a88bc7fc59fc663892f198b92946407566f2f2cb..a1ec2339be82ce4e994d215282a221b5fe01b663 100755 (executable)
--- a/invoices.sh
+++ b/invoices.sh
@@ -167,17 +167,19 @@ edit_invoice(){
            [tr [th Date] [th Work] [th Hours] [th Price] ]
 $({ sed 1d "invoices/$id"; printf 'time= work= hours=\n'; } \
   | while read -r time work hours x; do
-    hours="$(UNSTRING "${hours#hours=}" |grep -m1 -xE '[0-9]+' || printf 0)"
+    hours="$(UNSTRING "${hours#hours=}" \
+             |grep -m1 -xE '\.[0-9]+|[0-9]+\.?[0-9]*' || printf 0)"
     printf '[tr
             [td [textarea name=time
 %s] ]
             [td [textarea name=work
 %s] ]
-            [td [input type=number name=hours value="%s"] ]
+            [td [input type=number name=hours value="%.2g" step=any] ]
             [td %s]
    ]' "$(UNSTRING "${time#time=}" |HTML)" \
       "$(UNSTRING "${work#work=}" |HTML)" \
-      "$hours" "$((hours * hourly)) €"
+      "$hours" \
+      "$(awk "BEGIN { printf \"%.2f €\", ${hours} * ${hourly}; }")"
   done
 )
             [tr [td colspan=4 
@@ -221,10 +223,10 @@ invoice_total(){
 
     sed 1d "invoices/$id" \
     | { while read -r time work hours; do
-        [ "${hours#hours=}" -gt 0 ] 2>&- \
+        [ "${hours#hours=}" ] 2>&- \
         && hours="${hours#hours=}" \
         || hours=0
-        total=$((total + hours * hourly))
+        total=$(awk "BEGIN { printf \"%.2f\", ${total} + ${hours} * ${hourly}; }")
       done
       case $vat in
         vat=nett)