c3d2/yammat
c3d2
/
yammat
38
0
Fork 1
Code Issues Pull Requests Releases Activity

fixed bug with duplicate bodies in tableLayout

This commit is contained in:
nek0 2015-10-12 16:46:31 +02:00
parent 0b2cd56712
commit f42b79d1c8
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
Handler/SupplierActions.hs
View File

@ -30,36 +30,35 @@ getSupplierDigestR sId = do
bevs <- runDB $ selectList [BeverageSupplier ==. (Just sId)] [Asc BeverageIdent] bevs <- runDB $ selectList [BeverageSupplier ==. (Just sId)] [Asc BeverageIdent]
digests <- return $ map genBevDigest bevs digests <- return $ map genBevDigest bevs
w <- return $ [whamlet|$newline always w <- return $ [whamlet|$newline always
<body> #{supplierIdent sup}<br>
#{supplierIdent sup}<br> #{unTextarea $ supplierAddress sup}<br>
#{unTextarea $ supplierAddress sup}<br> #{supplierTel sup}<br>
#{supplierTel sup}<br> #{supplierEmail sup}<br>
#{supplierEmail sup}<br> <hr>
<hr> <b>
<b> _{MsgCustomerId}: #{supplierCustomerId sup}
_{MsgCustomerId}: #{supplierCustomerId sup} <table>
<table> <thead>
<thead> <tr>
<th>_{MsgArtNr}
<th>_{MsgName}
<th>_{MsgVolume}
<th>_{MsgCrateCount}
<th>_{MsgPricePerCrate}
<th>_{MsgTotalValue}
$forall dig <- digests
$if bdCrates dig /= 0
<tr> <tr>
<th>_{MsgArtNr} <td>#{fromMaybe "" $ beverageArtNr $ bdBev dig}
<th>_{MsgName} <td>#{beverageIdent $ bdBev dig}
<th>_{MsgVolume} <td>#{formatIntVolume $ beverageMl $ bdBev dig}
<th>_{MsgCrateCount} <td>#{T.pack $ show $ bdCrates dig}
<th>_{MsgPricePerCrate} <td>#{formatIntCurrency $ fromMaybe 0 $ beveragePricePerCrate $ bdBev dig} #{appCurrency $ appSettings master}
<th>_{MsgTotalValue} <td>#{formatIntCurrency $ bdTotal dig} #{appCurrency $ appSettings master}
$forall dig <- digests <td colspan="3">_{MsgTotalCrates}
$if bdCrates dig /= 0 <td>#{T.pack $ show $ sum $ map bdCrates digests}
<tr> <td>_{MsgBuyValue}
<td>#{fromMaybe "" $ beverageArtNr $ bdBev dig} <td>#{formatIntCurrency $ sum $ map bdTotal digests} #{appCurrency $ appSettings master}
<td>#{beverageIdent $ bdBev dig}
<td>#{formatIntVolume $ beverageMl $ bdBev dig}
<td>#{T.pack $ show $ bdCrates dig}
<td>#{formatIntCurrency $ fromMaybe 0 $ beveragePricePerCrate $ bdBev dig} #{appCurrency $ appSettings master}
<td>#{formatIntCurrency $ bdTotal dig} #{appCurrency $ appSettings master}
<td colspan="3">_{MsgTotalCrates}
<td>#{T.pack $ show $ sum $ map bdCrates digests}
<td>_{MsgBuyValue}
<td>#{formatIntCurrency $ sum $ map bdTotal digests} #{appCurrency $ appSettings master}
|] |]
tableLayout w tableLayout w
Nothing -> do Nothing -> do