7 files changed, 64 insertions, 10 deletions

diff --git a/Handler/Common.hs b/Handler/Common.hs
index 990732d..65e6ce1 100644
--- a/Handler/Common.hs
+++ b/Handler/Common.hs
@@ -11,13 +11,15 @@ module Handler.Common
   , FormState(..)
   , HasFormState(..)
   , stockSort, referenceSort
+  , humanId
   ) where
 
-import Import
+import Import hiding ((\\))
 
 import Data.Unique
 
 import qualified Data.Text as Text
+import qualified Data.ByteString.Char8 as CBS
 
 import Data.Set (Set)
 import qualified Data.Set as Set
@@ -28,10 +30,19 @@ import Handler.Common.Types
 
 import Text.Julius (RawJS(..))
 
+import Database.Persist.Sql (fromSqlKey)
+import qualified Web.Hashids as HID
+import Data.List ((\\))
+
 import Data.List.NonEmpty (NonEmpty)
 import Data.Semigroup hiding (First(..))
 import Data.Monoid (First(..))
 
+humanId :: ItemId -> Text
+humanId = Text.pack . CBS.unpack . HID.encode ctx . fromIntegral . fromSqlKey
+  where
+    ctx = HID.createHashidsContext "ItemId" 3 $ (['0'..'9'] ++ ['a'..'z']) \\ ['0', 'l', 'v', '2']
+
 dayFormat :: Day -> String
 dayFormat = formatTime defaultTimeLocale "%e. %b %y"
 
diff --git a/Handler/InventoryListing.hs b/Handler/InventoryListing.hs
index c2ec5d1..d87512a 100644
--- a/Handler/InventoryListing.hs
+++ b/Handler/InventoryListing.hs
@@ -11,8 +11,21 @@ postInventoryListingR = do
   case insertResult of 
     FormSuccess (Item{..} `WithType` t) -> runDB $ do
       upsertBy (UniqueKind itemNormKind) (Kind itemNormKind t) [ KindType =. t ]
-      insert Item{..}
-      return ()
+      newItem <- insert Item{..}
+      otherItems <- selectKeysList [ ItemNormKind ==. itemNormKind, ItemId !=. newItem ] []
+      when (not $ null otherItems) . addMessage "insertAmbiguous" $
+        [shamlet|
+                $newline never
+                There are other items of the same kind.
+                <ul>
+                  $forall other <- otherItems
+                    <li .itemId>#{humanId other}
+                |]
+      addMessage "insertSuccess" [shamlet|
+                                         $newline never
+                                         Inserted new item as #
+                                         <span .itemId>#{humanId newItem}
+                                         |]
     FormFailure errors -> mapM_ (addMessage "formError" . toHtml) errors
     _ -> return ()
 
diff --git a/Handler/List.hs b/Handler/List.hs
index 4209651..7ab4ebe 100644
--- a/Handler/List.hs
+++ b/Handler/List.hs
@@ -64,7 +64,7 @@ postListR = do
   case printResult of
     FormSuccess pId -> do
       (JobId jId) <- jobCreate (Just pId) $ mkPrintout list
-      addMessage "printSuccess" . toHtml $ "List is printing as job #" <> tshow jId
+      addMessage "printSuccess" [shamlet|List is printing as job ##{jId}|]
     FormFailure errors -> mapM_ (addMessage "formError" . toHtml) errors
     _ -> return ()
   
diff --git a/bar.cabal b/bar.cabal
index 5605d97..4022f7f 100644
--- a/bar.cabal
+++ b/bar.cabal
@@ -1,5 +1,5 @@
 name:              bar
-version:           0.1.0
+version:           0.2.0
 cabal-version:     >= 1.8
 build-type:        Simple
 
@@ -106,6 +106,7 @@ library
                  , mtl
                  , lens
                  , thermoprint-client
+                 , hashids
 
 executable         bar
     if flag(library-only)
diff --git a/bar.nix b/bar.nix
index 714ee94..f31cce4 100644
--- a/bar.nix
+++ b/bar.nix
@@ -1,7 +1,7 @@
 { mkDerivation, aeson, base, bytestring, case-insensitive
 , classy-prelude, classy-prelude-conduit, classy-prelude-yesod
 , conduit, containers, data-default, directory, fast-logger
-, file-embed, hjsmin, http-conduit, lens, monad-control
+, file-embed, hashids, hjsmin, http-conduit, lens, monad-control
 , monad-logger, mtl, persistent, persistent-postgresql
 , persistent-template, safe, shakespeare, stdenv, template-haskell
 , text, thermoprint-client, time, unordered-containers, vector, wai
@@ -10,15 +10,15 @@
 }:
 mkDerivation {
   pname = "bar";
-  version = "0.1.0";
+  version = "0.2.0";
   src = ./.;
   isLibrary = true;
   isExecutable = true;
   libraryHaskellDepends = [
     aeson base bytestring case-insensitive classy-prelude
     classy-prelude-conduit classy-prelude-yesod conduit containers
-    data-default directory fast-logger file-embed hjsmin http-conduit
-    lens monad-control monad-logger mtl persistent
+    data-default directory fast-logger file-embed hashids hjsmin
+    http-conduit lens monad-control monad-logger mtl persistent
     persistent-postgresql persistent-template safe shakespeare
     template-haskell text thermoprint-client time unordered-containers
     vector wai wai-extra wai-logger warp yaml yesod yesod-auth
diff --git a/templates/default-layout.cassius b/templates/default-layout.cassius
index 50aab3f..bc64e8e 100644
--- a/templates/default-layout.cassius
+++ b/templates/default-layout.cassius
@@ -31,6 +31,13 @@
   text-align: center
   padding: 0.25em
   color: #aaa
+.itemId
+  font-family: monospace
+div.itemId
+  display: table-cell
+  text-align: left
+  padding: 0.25em
+  color: #aaa
 .table .table .td, .table .table .tc, .table .table .th, .table .table .kind
   padding: 0
 table table td, table table th, .table table td, .table table th
@@ -41,10 +48,26 @@ table table td, table table th, .table table td, .table table th
   padding: 0
   text-align: center
   font-weight: bold
+  li
+    margin: 0 0 0.5em 0
+  li:last-child
+    margin: 0
   .formError
     color: #800
-  .printSuccess
+  .printSuccess, .insertSuccess
     color: #080
+  .insertAmbiguous
+    color: inherit
+    ul
+      list-style-type: none
+      li
+        display: inline
+        margin: 0 0 0 0
+        padding: 0 0 0 0
+      li::before
+        content: ", "
+      li:first-child::before
+        content: ""
 button
   width: 6em
   display: inline-block
@@ -94,3 +117,5 @@ label.checkbox
     vertical-align: middle
   span
     vertical-align: middle
+.itemH
+  display: table-cell
\ No newline at end of file
diff --git a/templates/inventoryListing.hamlet b/templates/inventoryListing.hamlet
index 39758bb..802905d 100644
--- a/templates/inventoryListing.hamlet
+++ b/templates/inventoryListing.hamlet
@@ -1,5 +1,6 @@
 <div .table>
   <div .tr .sepBelow>
+    <div .itemH>
     <div .th>Item
     <div .th>Type
     <div .th>Bought
@@ -9,6 +10,7 @@
   $if isJust (preview insertForm =<< formState)
     $with Just InsertForm{..} <- formState
       <form .tr .sepBelow action=@{InventoryListingR} method=post enctype=#{fsInsertEncoding}>
+        <div .td>
         ^{fsInsertForm}
         <div .td>
           <button type=submit>
@@ -17,12 +19,14 @@
     $if Just itemId == (preview updateId =<< formState)
       $with Just UpdateForm{..} <- formState
          <form .tr .color action=@{UpdateItemR fsUpdateId}##{toPathPiece fsUpdateId} method=post enctype=#{fsUpdateEncoding} ##{toPathPiece fsUpdateId}>
+           <div .itemId>#{humanId itemId}
            ^{fsUpdateForm}
            <div .td>
              <button type=submit>
                Save Changes
     $else
       <div .tr .color ##{toPathPiece itemId}>
+        <div .itemId>#{humanId itemId}
         <div .kind>#{itemKind}
         <div .type>#{itemType}
         <div .td .day>