added lost orders. fixes #7
This commit is contained in:
parent
445bd85ce4
commit
05a8bf438e
@ -40,6 +40,7 @@ import Handler.ProfitItems
|
|||||||
import Handler.Orders
|
import Handler.Orders
|
||||||
import Handler.Item
|
import Handler.Item
|
||||||
import Handler.Problematic
|
import Handler.Problematic
|
||||||
|
import Handler.LostOrders
|
||||||
|
|
||||||
-- This line actually creates our YesodDispatch instance. It is the second half
|
-- This line actually creates our YesodDispatch instance. It is the second half
|
||||||
-- of the call to mkYesodData which occurs in Foundation.hs. Please see the
|
-- of the call to mkYesodData which occurs in Foundation.hs. Please see the
|
||||||
|
74
Handler/LostOrders.hs
Normal file
74
Handler/LostOrders.hs
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
{-# LANGUAGE ScopedTypeVariables #-}
|
||||||
|
|
||||||
|
module Handler.LostOrders where
|
||||||
|
|
||||||
|
import Import
|
||||||
|
import Database.Persist.Sql (rawSql,RawSql(..))
|
||||||
|
|
||||||
|
data Lost = Lost
|
||||||
|
{ maxtime :: UTCTime
|
||||||
|
, realprofit :: Int64
|
||||||
|
, typeId :: Int64
|
||||||
|
, priceCents :: Int64
|
||||||
|
, typeName :: Text
|
||||||
|
, stationId :: Int64
|
||||||
|
, stationName :: Text
|
||||||
|
}
|
||||||
|
|
||||||
|
instance RawSql Lost where
|
||||||
|
rawSqlCols _ _ = (7,[])
|
||||||
|
rawSqlColCountReason _ = "maxtime, realprofit, typeid, pricecents, typename, stationid, stationname"
|
||||||
|
rawSqlProcessRow [PersistUTCTime t, PersistRational p, PersistInt64 tid, PersistRational pc,
|
||||||
|
PersistText tn, PersistInt64 sid, PersistText sn] = Right $ Lost t (c p) tid (c pc) tn sid sn
|
||||||
|
where c = floor
|
||||||
|
rawSqlProcessRow [PersistUTCTime t, PersistNull, PersistInt64 tid, PersistRational pc,
|
||||||
|
PersistText tn, PersistInt64 sid, PersistText sn] = Right $ Lost t 0 tid (c pc) tn sid sn
|
||||||
|
where c = floor
|
||||||
|
rawSqlProcessRow a = Left ("Wrong kind of Arguments:" <> (pack $ show a))
|
||||||
|
|
||||||
|
lostOrderIntervals :: [Int]
|
||||||
|
lostOrderIntervals = [1,2,7,14,31]
|
||||||
|
|
||||||
|
getLostOrdersR :: Handler Html
|
||||||
|
getLostOrdersR = getLostOrdersDaysR 1
|
||||||
|
|
||||||
|
getLostOrdersDaysR :: Int -> Handler Html
|
||||||
|
getLostOrdersDaysR days = loginOrDo (\(uid,user) -> do
|
||||||
|
let rawStmt = "SELECT \
|
||||||
|
max(date_time) as maxtime, COALESCE(sum(profit-tax-fee),0) as realprofit, type_id, \
|
||||||
|
avg(price_cents), type_name, station_id, station_name \
|
||||||
|
FROM \
|
||||||
|
transaction \
|
||||||
|
where \
|
||||||
|
\"user\"=? and date_time > CURRENT_TIMESTAMP - INTERVAL '? day' \
|
||||||
|
and type_id not in (SELECT distinct type_id FROM \"order\" where \"user\"=? and order_state=0) \
|
||||||
|
and type_id not in (select distinct type_id FROM transaction where \"user\"=? and date_time > CURRENT_TIMESTAMP - INTERVAL '? day' and in_stock > 0) \
|
||||||
|
group by \
|
||||||
|
type_id, type_name, station_id, station_name \
|
||||||
|
order by realprofit desc"
|
||||||
|
lorders :: [Lost] <- runDB $ rawSql rawStmt [toPersistValue uid,toPersistValue days,toPersistValue uid,toPersistValue uid,toPersistValue days]
|
||||||
|
loginLayout user $ [whamlet|
|
||||||
|
<div .panel .panel-default>
|
||||||
|
<div .panel-heading>Lost Orders in the last #{days} days:
|
||||||
|
<div .btn-group .btn-group-justified role="group">
|
||||||
|
$forall days' <- lostOrderIntervals
|
||||||
|
$if days == days'
|
||||||
|
<a href="@{LostOrdersDaysR days'}" .btn .active role="button">#{days'} days
|
||||||
|
$else
|
||||||
|
<a href="@{LostOrdersDaysR days'}" .btn role="button">#{days'} days
|
||||||
|
<table .table .table-condensed .small>
|
||||||
|
<tr>
|
||||||
|
<th .text-center>Item
|
||||||
|
<th .text-center>ISK Profit
|
||||||
|
<th .text-center>Avg Price
|
||||||
|
<th .text-center>Last Traded
|
||||||
|
<th .text-center>On Station
|
||||||
|
$forall (Lost t rp tid pc tn sid sn) <- lorders
|
||||||
|
<tr>
|
||||||
|
<td><a href="@{ItemR tid}">#{tn}</a>
|
||||||
|
<td .numeric>#{prettyISK rp}
|
||||||
|
<td .numeric>#{prettyISK pc}
|
||||||
|
<td>#{showDateTime t}
|
||||||
|
<td>#{sn}
|
||||||
|
|]
|
||||||
|
)
|
@ -14,6 +14,8 @@
|
|||||||
/analysis/items ProfitItemsR GET
|
/analysis/items ProfitItemsR GET
|
||||||
/analysis/items/#Int64 ProfitItemsDetailsR GET
|
/analysis/items/#Int64 ProfitItemsDetailsR GET
|
||||||
/orders OrdersR GET
|
/orders OrdersR GET
|
||||||
|
/orders/lost LostOrdersR GET
|
||||||
|
/orders/lost/#Int LostOrdersDaysR GET
|
||||||
/history/#Int64 ItemR GET
|
/history/#Int64 ItemR GET
|
||||||
/history/#Int64/#Int ItemPagedR GET
|
/history/#Int64/#Int ItemPagedR GET
|
||||||
/transactions/problematic ProblematicR GET
|
/transactions/problematic ProblematicR GET
|
||||||
|
@ -30,6 +30,7 @@ library
|
|||||||
Handler.Orders
|
Handler.Orders
|
||||||
Handler.Item
|
Handler.Item
|
||||||
Handler.Problematic
|
Handler.Problematic
|
||||||
|
Handler.LostOrders
|
||||||
|
|
||||||
if flag(dev) || flag(library-only)
|
if flag(dev) || flag(library-only)
|
||||||
cpp-options: -DDEVELOPMENT
|
cpp-options: -DDEVELOPMENT
|
||||||
|
@ -41,6 +41,11 @@ $newline never
|
|||||||
<ul class="nav navbar-nav">
|
<ul class="nav navbar-nav">
|
||||||
<li><a href="@{HomeR}">Home</a>
|
<li><a href="@{HomeR}">Home</a>
|
||||||
<li><a href="@{WalletR}">Transactions</a>
|
<li><a href="@{WalletR}">Transactions</a>
|
||||||
|
<li class="dropdown">
|
||||||
|
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Misc <span class="caret"></span>
|
||||||
|
<ul class="dropdown-menu">
|
||||||
|
<li><a href="@{LostOrdersR}">Lost Orders</a>
|
||||||
|
<li><a href="@{ProblematicR}">Problematic Transactions</a>
|
||||||
<li><a href="@{StockR}">Stock</a>
|
<li><a href="@{StockR}">Stock</a>
|
||||||
<li class="dropdown">
|
<li class="dropdown">
|
||||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Analysis <span class="caret"></span>
|
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Analysis <span class="caret"></span>
|
||||||
|
10
test/Handler/LostOrdersSpec.hs
Normal file
10
test/Handler/LostOrdersSpec.hs
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
module Handler.LostOrdersSpec (spec) where
|
||||||
|
|
||||||
|
import TestImport
|
||||||
|
|
||||||
|
spec :: Spec
|
||||||
|
spec = withApp $ do
|
||||||
|
|
||||||
|
describe "getLostOrdersR" $ do
|
||||||
|
error "Spec not implemented: getLostOrdersR"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user