More colourcoding

3 files changed, 11 insertions, 3 deletions

diff --git a/Handler/Common.hs b/Handler/Common.hs
index 65e6ce1..f40375a 100644
--- a/Handler/Common.hs
+++ b/Handler/Common.hs
@@ -38,6 +38,8 @@ import Data.List.NonEmpty (NonEmpty)
 import Data.Semigroup hiding (First(..))
 import Data.Monoid (First(..))
 
+import Data.Time.Calendar
+
 humanId :: ItemId -> Text
 humanId = Text.pack . CBS.unpack . HID.encode ctx . fromIntegral . fromSqlKey
   where
diff --git a/templates/inventoryListing.cassius b/templates/inventoryListing.cassius
index 2f49bc7..225de5d 100644
--- a/templates/inventoryListing.cassius
+++ b/templates/inventoryListing.cassius
@@ -1,6 +1,12 @@
-.expired
-  color: #800
+.expired, .expireWeek, .expireMonth
   font-weight: bold
+.expireMonth
+  color: #995e00
+.expireWeek
+  color: #994000
+.expired
+  color: #990000
+  text-decoration: line-through
 .itemId
   font-family: monospace
 div.itemId
diff --git a/templates/inventoryListing.hamlet b/templates/inventoryListing.hamlet
index 802905d..797bd81 100644
--- a/templates/inventoryListing.hamlet
+++ b/templates/inventoryListing.hamlet
@@ -40,7 +40,7 @@
             $of DateNever
               <hr>
             $of DateKnown d
-              <span :d < today:.expired>#{dayFormat d}
+              <span :d < today:.expired :d < addDays 7 today:.expireWeek :d < addGregorianMonthsRollOver 1 today:.expireMonth>#{dayFormat d}
         <div .td .day>
           $case itemOpened
             $of DateKnown d