aboutsummaryrefslogtreecommitdiff
path: root/server/src
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2016-02-11 22:05:12 +0000
committerGregor Kleen <gkleen@yggdrasil.li>2016-02-11 22:05:12 +0000
commit7de330ea4fa17a0e1ba2eb33e4440545dc6be93a (patch)
treea70bd209ab69883964f8ba1b3c1667b13580758c /server/src
parenta86e55bbcc6d5b23ab11312d3ca94a745bea5ed9 (diff)
downloadthermoprint-7de330ea4fa17a0e1ba2eb33e4440545dc6be93a.tar
thermoprint-7de330ea4fa17a0e1ba2eb33e4440545dc6be93a.tar.gz
thermoprint-7de330ea4fa17a0e1ba2eb33e4440545dc6be93a.tar.bz2
thermoprint-7de330ea4fa17a0e1ba2eb33e4440545dc6be93a.tar.xz
thermoprint-7de330ea4fa17a0e1ba2eb33e4440545dc6be93a.zip
Test for zipper morphisms
Diffstat (limited to 'server/src')
-rw-r--r--server/src/Thermoprint/Server/Queue.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/server/src/Thermoprint/Server/Queue.hs b/server/src/Thermoprint/Server/Queue.hs
index d5ab42b..52e973d 100644
--- a/server/src/Thermoprint/Server/Queue.hs
+++ b/server/src/Thermoprint/Server/Queue.hs
@@ -52,7 +52,7 @@ data Queue = Queue
52 , current :: Maybe QueueEntry 52 , current :: Maybe QueueEntry
53 , history :: Seq (QueueEntry, Maybe PrintingError) -- ^ Completed jobs, closest first 53 , history :: Seq (QueueEntry, Maybe PrintingError) -- ^ Completed jobs, closest first
54 } 54 }
55 deriving (Typeable, Generic, NFData) 55 deriving (Typeable, Generic, NFData, Show)
56 56
57class HasQueue a where 57class HasQueue a where
58 extractQueue :: a -> TVar Queue 58 extractQueue :: a -> TVar Queue
@@ -71,7 +71,7 @@ data QueueEntry = QueueEntry
71 { jobId :: JobId 71 { jobId :: JobId
72 , created :: UTCTime 72 , created :: UTCTime
73 } 73 }
74 deriving (Typeable, Generic, NFData, Eq, Ord) 74 deriving (Typeable, Generic, NFData, Eq, Ord, Show)
75 75
76data QueueItem = Pending Int QueueEntry | Current QueueEntry | History Int QueueEntry (Maybe PrintingError) 76data QueueItem = Pending Int QueueEntry | Current QueueEntry | History Int QueueEntry (Maybe PrintingError)
77 77