nek0/yammat
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #94 from vv01f/feature-mdorder

Browse source 
Feature mdorder
This commit is contained in:
rys ostrovid 2017-01-21 21:51:38 +01:00 committed by GitHub
commit 99f6fb6f0c
2 changed files with 56 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
Handler/SupplierActions.hs
View file

@ -40,29 +40,74 @@ getSupplierDigestR sId = do
<p> <p>
<b> <b>
_{MsgCustomerId}: #{supplierCustomerId sup} _{MsgCustomerId}: #{supplierCustomerId sup}
<p>&nbsp;
<table> <table>
<thead> <thead>
<tr> <tr>
<th>_{MsgArtNr} <th>
<th>_{MsgName} <span .transp>|
<th>_{MsgVolume} _{MsgArtNr}
<th>_{MsgCrateCount} <span .transp>|
<th>_{MsgPricePerCrate} <th>
<th>_{MsgTotalValue} _{MsgName}
<span .transp>|
<th>
_{MsgVolume}
<span .transp>|
<th>
_{MsgCrateCount}
<span .transp>|
<th>
_{MsgPricePerCrate}
<span .transp>|
<th>
_{MsgTotalValue}
<span .transp>|
<tr>
<span .transp>---:
<th>
<span .transp>---:
<th>
<span .transp>---:
<th>
<span .transp>---:
<th>
<span .transp>---:
<th>
<span .transp>---:
$forall dig <- digests $forall dig <- digests
$if bdCrates dig /= 0 $if bdCrates dig /= 0
<tr> <tr>
<td>#{fromMaybe "" $ beverageArtNr $ bdBev dig} <td>
<span .transp>|
#{fromMaybe "" $ beverageArtNr $ bdBev dig}
<span .transp>|
<td>#{beverageIdent $ bdBev dig} <td>#{beverageIdent $ bdBev dig}
<span .transp>|
<td>#{formatIntVolume $ beverageMl $ bdBev dig} <td>#{formatIntVolume $ beverageMl $ bdBev dig}
<span .transp>|
<td>#{T.pack $ show $ bdCrates dig} <td>#{T.pack $ show $ bdCrates dig}
<span .transp>|
<td style="text-align: right;">#{formatIntCurrency $ fromMaybe 0 $ beveragePricePerCrate $ bdBev dig} #{appCurrency $ appSettings master} <td style="text-align: right;">#{formatIntCurrency $ fromMaybe 0 $ beveragePricePerCrate $ bdBev dig} #{appCurrency $ appSettings master}
<span .transp>|
<td style="text-align: right;">#{formatIntCurrency $ bdTotal dig} #{appCurrency $ appSettings master} <td style="text-align: right;">#{formatIntCurrency $ bdTotal dig} #{appCurrency $ appSettings master}
<span .transp>|
<tr> <tr>
<td colspan="3">_{MsgTotalCrates} <td colspan="3">
<span .transp>
|&nbsp;
|_
{MsgTotalCrates}
<span .transp>
|&nbsp;
<span .transp>|
<td>#{T.pack $ show $ sum $ map bdCrates digests} <td>#{T.pack $ show $ sum $ map bdCrates digests}
<span .transp>|
<td>_{MsgBuyValue} <td>_{MsgBuyValue}
<span .transp>|
<td style="text-align: right;">#{formatIntCurrency $ sum $ map bdTotal digests} #{appCurrency $ appSettings master} <td style="text-align: right;">#{formatIntCurrency $ sum $ map bdTotal digests} #{appCurrency $ appSettings master}
<span .transp>|
|] |]
tableLayout w tableLayout w
Nothing -> do Nothing -> do

4
static/css/main.css
View file

@ -11,7 +11,9 @@
text-align: center; text-align: center;
border-radius: 6px; border-radius: 6px;
} }
.transp {
color: transparent !important;
}
.text { .text {
text-align: left; text-align: left;
} }