Merge branch 'feat/openYes'

1 files changed, 19 insertions, 14 deletions

diff --git a/templates/inventoryListing.hamlet b/templates/inventoryListing.hamlet
index f0ff1e4..802905d 100644
--- a/templates/inventoryListing.hamlet
+++ b/templates/inventoryListing.hamlet
@@ -30,22 +30,27 @@
         <div .kind>#{itemKind}
         <div .type>#{itemType}
         <div .td .day>
-          $maybe bought <- itemBought
-            #{dayFormat bought}
-          $nothing
-            <hr>
+          $case itemBought
+            $of DateUnknown
+              <hr>
+            $of DateKnown d
+              #{dayFormat d}
         <div .td .day>
-          $maybe expires <- itemExpires
-            #{dayFormat expires}
-          $nothing
-            <hr>
+          $case itemExpires
+            $of DateNever
+              <hr>
+            $of DateKnown d
+              <span :d < today:.expired>#{dayFormat d}
         <div .td .day>
-          $maybe opened <- itemOpened
-            #{dayFormat opened}
-          $nothing
-            <form method=post action=@{OpenItemR itemId}>
-              <button type=submit>
-                Open
+          $case itemOpened
+            $of DateKnown d
+              #{dayFormat d}
+            $of DateUnknown
+              Yes
+            $of DateNever
+              <form method=post action=@{OpenItemR itemId}>
+                <button type=submit>
+                  Open
         <div .td>
           <form method=get action=@{UpdateItemR itemId}##{toPathPiece itemId}>
             <button type=submit>