diff --git a/Handler/Modify.hs b/Handler/Modify.hs index 52bb97c..14643ed 100644 --- a/Handler/Modify.hs +++ b/Handler/Modify.hs @@ -28,6 +28,7 @@ postModifyR bId = do , BeveragePrice =. beveragePrice nBev , BeverageAmount =. beverageAmount nBev , BeverageAlertAmount =. beverageAlertAmount nBev + , BeverageCorrectedAmount +=. ((beverageAmount nBev) - (beverageAmount bev)) , BeverageMl =. beverageMl nBev , BeverageAvatar =. beverageAvatar nBev ] @@ -46,6 +47,7 @@ modifyForm bev = renderDivs $ Beverage <*> areq currencyField (fieldSettingsLabel MsgPrice) (Just $ beveragePrice bev) <*> areq amountField (fieldSettingsLabel MsgCurrentStock) (Just $ beverageAmount bev) <*> areq amountField (fieldSettingsLabel MsgAnnouncedStock) (Just $ beverageAlertAmount bev) + <*> pure (beverageCorrectedAmount bev) <*> areq volumeField (fieldSettingsLabel MsgVolume) (Just $ beverageMl bev) <*> aopt (selectField avatars) (fieldSettingsLabel MsgSelectAvatar) (Just $ beverageAvatar bev) where diff --git a/Handler/Restock.hs b/Handler/Restock.hs index 6bd3b55..d30df09 100644 --- a/Handler/Restock.hs +++ b/Handler/Restock.hs @@ -72,6 +72,7 @@ newArticleForm = renderDivs $ Beverage <*> areq currencyField (fieldSettingsLabel MsgPrice) (Just 100) <*> areq amountField (fieldSettingsLabel MsgAmount) (Just 0) <*> areq amountField (fieldSettingsLabel MsgAmountWarning) (Just 0) + <*> pure 0 <*> areq volumeField (fieldSettingsLabel MsgVolume) (Just 500) <*> aopt (selectField avatars) (fieldSettingsLabel MsgSelectAvatar) Nothing where diff --git a/Handler/Summary.hs b/Handler/Summary.hs index 0cec54b..0199563 100644 --- a/Handler/Summary.hs +++ b/Handler/Summary.hs @@ -115,5 +115,6 @@ insOrUpd bev = do (bevStorePrice bev) (bevStoreAmount bev) (bevStoreAlertAmount bev) + 0 (bevStoreMl bev) Nothing diff --git a/config/models b/config/models index bc996ba..b892e9e 100644 --- a/config/models +++ b/config/models @@ -11,6 +11,7 @@ Beverage price Int amount Int alertAmount Int + correctedAmount Int default=0 ml Int default=500 avatar AvatarId Maybe UniqueBeverage ident diff --git a/messages/cz.msg b/messages/cz.msg index 237a40e..a7fcc51 100644 --- a/messages/cz.msg +++ b/messages/cz.msg @@ -100,3 +100,4 @@ DeleteAvatar: Smazat avatar AvatarDeleted: Avatar úspěšně smazán AvatarInUseError: Avatar nelze smazat dokud je v užitku Volume: Objem v l +CorrectedAmount: Stráta diff --git a/messages/de.msg b/messages/de.msg index 74841d9..ed027d4 100644 --- a/messages/de.msg +++ b/messages/de.msg @@ -100,3 +100,4 @@ DeleteAvatar: Diesen Avatar löschen AvatarDeleted: Avatar gelöscht AvatarInUseError: Avatare können nicht gelöscht werden, solange sie in Benutzung sind. Volume: Volumen in l +CorrectedAmount: Schwund diff --git a/templates/summary.hamlet b/templates/summary.hamlet index 9edc25b..60fc341 100644 --- a/templates/summary.hamlet +++ b/templates/summary.hamlet @@ -9,6 +9,7 @@ $if not $ L.null bevs _{MsgName} _{MsgVolume} _{MsgCurrentAmount} + _{MsgCorrectedAmount} _{MsgAnnouncedStock} _{MsgValueIn $ appCurrency $ appSettings master} @@ -17,6 +18,7 @@ $if not $ L.null bevs #{beverageIdent bev} #{formatIntVolume (beverageMl bev)} #{beverageAmount bev} + #{beverageCorrectedAmount bev} #{beverageAlertAmount bev} #{formatIntCurrency (beveragePrice bev)} #{appCurrency $ appSettings master} bearbeiten