From fad71038d305ef15f97b0856fcd7129ffe7c0c45 Mon Sep 17 00:00:00 2001 From: Wolf Date: Sat, 21 Jan 2017 17:09:44 +0100 Subject: [PATCH 1/3] transparent text class --- static/css/main.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/static/css/main.css b/static/css/main.css index b94e928..b81167f 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -11,7 +11,9 @@ text-align: center; border-radius: 6px; } - +.transp { + color: transparent !important; +} .text { text-align: left; } From 5c435d8f242f7307f2d7e5a24e16bd6f6e65e8b4 Mon Sep 17 00:00:00 2001 From: Wolf Date: Sat, 21 Jan 2017 17:15:50 +0100 Subject: [PATCH 2/3] tagged separators to indicate a table i markdown --- Handler/SupplierActions.hs | 56 ++++++++++++++++++++++++++++++++------ 1 file changed, 48 insertions(+), 8 deletions(-) diff --git a/Handler/SupplierActions.hs b/Handler/SupplierActions.hs index de78dcd..a6c91d2 100644 --- a/Handler/SupplierActions.hs +++ b/Handler/SupplierActions.hs @@ -43,26 +43,66 @@ getSupplierDigestR sId = do - + ---: + - -
_{MsgArtNr} - _{MsgName} - _{MsgVolume} - _{MsgCrateCount} - _{MsgPricePerCrate} - _{MsgTotalValue} + + | + _{MsgArtNr} + | + + _{MsgName} + | + + _{MsgVolume} + | + + _{MsgCrateCount} + | + + _{MsgPricePerCrate} + | + + _{MsgTotalValue} + | +
+ ---: + + ---: + + ---: + + ---: + + ---: + $forall dig <- digests $if bdCrates dig /= 0
#{fromMaybe "" $ beverageArtNr $ bdBev dig} + + | + #{fromMaybe "" $ beverageArtNr $ bdBev dig} + | #{beverageIdent $ bdBev dig} + | #{formatIntVolume $ beverageMl $ bdBev dig} + | #{T.pack $ show $ bdCrates dig} + | #{formatIntCurrency $ fromMaybe 0 $ beveragePricePerCrate $ bdBev dig} #{appCurrency $ appSettings master} + | #{formatIntCurrency $ bdTotal dig} #{appCurrency $ appSettings master} + |
_{MsgTotalCrates} + + | + _{MsgTotalCrates} + | #{T.pack $ show $ sum $ map bdCrates digests} + | _{MsgBuyValue} + | #{formatIntCurrency $ sum $ map bdTotal digests} #{appCurrency $ appSettings master} + | |] tableLayout w Nothing -> do From 90ed6caa1f91e8a67a5a64b1762cf4d21b209259 Mon Sep 17 00:00:00 2001 From: Wolf Date: Sat, 21 Jan 2017 17:20:15 +0100 Subject: [PATCH 3/3] hidden columns for aggregation row --- Handler/SupplierActions.hs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Handler/SupplierActions.hs b/Handler/SupplierActions.hs index a6c91d2..49f3e7a 100644 --- a/Handler/SupplierActions.hs +++ b/Handler/SupplierActions.hs @@ -40,6 +40,7 @@ getSupplierDigestR sId = do

_{MsgCustomerId}: #{supplierCustomerId sup} +

  @@ -94,8 +95,12 @@ getSupplierDigestR sId = do |
- | - _{MsgTotalCrates} + + |  + |_ + {MsgTotalCrates} + + |  | #{T.pack $ show $ sum $ map bdCrates digests} |