ff-qtah: Hide QTreeWidgetItem on "Done"

Author: cblp

ff-qtah/FF/Qt/MainWindow.hs

@@ -78,7 +78,7 @@ new progName storage = do
     taskWidget <-
         TaskWidget.new
             storage
-            (TaskListWidget.upsertTask agendaTasks) -- on task updated
+            (TaskListWidget.syncTask agendaTasks) -- on task updated
     QWidget.hide taskWidget.parent
     QSplitter.addWidget agendaSplitter taskWidget.parent
 
@@ -115,7 +115,7 @@ new progName storage = do
 
 -- | Only task notes are supported. TODO support wiki notes too
 upsertNote :: MainWindow -> EntityView Note -> IO ()
-upsertNote MainWindow{agendaTasks} = TaskListWidget.upsertTask agendaTasks True
+upsertNote MainWindow{agendaTasks} = TaskListWidget.syncTask agendaTasks True
 
 -- https://wiki.qt.io/Saving_Window_Size_State
 saveGeometryAndState :: (QMainWindowPtr window) => window -> IO Bool

ff-qtah/FF/Qt/TaskListWidget.hs

@@ -12,7 +12,7 @@ module FF.Qt.TaskListWidget (
     getTitle,
     new,
     setDebugInfoVisible,
-    upsertTask,
+    syncTask,
 ) where
 
 import Control.Monad (when)
@@ -37,19 +37,23 @@ import Text.Printf (printf)
 
 import FF (fromRgaM)
 import FF.Types (
-    Entity (..),
+    Entity (Entity),
     EntityView,
-    Note (..),
+    Note,
+    NoteId,
+    NoteStatus (TaskStatus),
+    Status (Active, Archived),
     TaskMode (..),
     View (NoteView, note),
     taskMode,
  )
+import FF.Types qualified
 import FF.UI (sampleLabel)
 
 data TaskListWidget = TaskListWidget
     { parent :: QTreeWidget
     , modeItems :: IORef (Map TaskMode QTreeWidgetItem)
-    , taskItems :: IORef (Map String (TaskMode, QTreeWidgetItem))
+    , taskItems :: IORef (Map NoteId (TaskMode, QTreeWidgetItem))
     }
 
 {- | Value order in this enumeration defines the field order in the tree widget.
@@ -115,6 +119,15 @@ setDebugInfoVisible this v = do
     QTreeView.setColumnHidden this.parent (fromEnum SortKeyField) $ not v
     QTreeView.setHeaderHidden this.parent $ not v
 
+syncTask :: TaskListWidget -> Bool -> EntityView Note -> IO ()
+syncTask this keepTaskOpen entity = do
+    case note.note_status of
+        Just (TaskStatus Active) -> upsertTask this keepTaskOpen entity
+        Just (TaskStatus Archived) -> deleteTaskFromUi this noteId
+        _ -> undefined
+  where
+    Entity noteId NoteView{note} = entity
+
 upsertTask :: TaskListWidget -> Bool -> EntityView Note -> IO ()
 upsertTask this keepTaskOpen entity = do
     today <- utctDay <$> getCurrentTime -- TODO get local day
@@ -142,7 +155,17 @@ upsertTask this keepTaskOpen entity = do
                     this.parent
                     (nullptr :: QTreeWidgetItem)
   where
-    Entity{entityId = DocId noteId, entityVal = NoteView{note}} = entity
+    Entity noteId NoteView{note} = entity
+
+deleteTaskFromUi :: TaskListWidget -> NoteId -> IO ()
+deleteTaskFromUi this noteId = do
+    mExisting <- Map.lookup noteId <$> readIORef this.taskItems
+    for_ mExisting \(oldMode, item) -> do
+        oldModeItem <- (! oldMode) <$> readIORef this.modeItems
+        idx <- QTreeWidgetItem.indexOfChild oldModeItem item
+        _ <- QTreeWidgetItem.takeChild oldModeItem idx
+        modifyIORef this.taskItems $ Map.delete noteId
+    QTreeWidget.setCurrentItem this.parent (nullptr :: QTreeWidgetItem)
 
 getOrCreateModeItem :: TaskListWidget -> TaskMode -> IO QTreeWidgetItem
 getOrCreateModeItem this mode = do
@@ -195,7 +218,7 @@ taskItemField entity = \case
     SortKeyField -> sortKey
     TitleField -> title
   where
-    Entity{entityId = DocId noteId, entityVal = NoteView{note}} = entity
+    Entity (DocId noteId) NoteView{note} = entity
     title = concat $ take 1 $ lines $ fromRgaM note.note_text
     sortKey = printf "End=%04d%02d%02d,Start=%04d%02d%02d" ey em ed sy sm sd
     (ey, em, ed) = maybe (9999, 99, 99) toGregorian note.note_end

ff-qtah/FF/Qt/TaskWidget.hs

@@ -10,6 +10,7 @@ module FF.Qt.TaskWidget (
     reload,
 ) where
 
+import Data.Foldable (for_)
 import Data.IORef (IORef, atomicWriteIORef, newIORef, readIORef)
 import Graphics.UI.Qtah.Core.Types qualified as Qt
 import Graphics.UI.Qtah.Signal (connect_)
@@ -22,7 +23,7 @@ import Named (defaults, (!))
 import RON.Storage.FS (runStorage)
 import RON.Storage.FS qualified as Storage
 
-import FF (cmdPostpone, fromRgaM, viewNote)
+import FF (cmdDone, cmdPostpone, fromRgaM, viewNote)
 import FF.Types (
     Entity (..),
     EntityDoc,
@@ -76,30 +77,37 @@ new storage onTaskUpdated = do
             ! #wordWrap True
             ! defaults
     postpone <- QPushButton.newWithText "Postpone"
+    done <- QPushButton.newWithText "Done"
     parent <-
         qFrame . QFormLayout $
             [ RowWidget $ qScrollArea textContent
             , StringLayout "Start:" start.parent
             , StringLayout "Deadline:" end.parent
-            , RowLayout $ qHBoxLayout [Widget $< postpone, Stretch]
+            , RowLayout . qHBoxLayout $
+                [Widget $< postpone, Widget $< done, Stretch]
             ]
     -- end setup UI
 
     noteId <- newIORef Nothing
     let this = TaskWidget{..}
-    connect_ postpone QAbstractButton.clickedSignal $ postponeSlot this
+    connect_ postpone QAbstractButton.clickedSignal $ onPostponeClicked this
+    connect_ done QAbstractButton.clickedSignal $ onDoneClicked this
     pure this
 
-($<) :: Applicative f => (f a -> b) -> a -> b
+($<) :: (Applicative f) => (f a -> b) -> a -> b
 f $< x = f $ pure x
 
-postponeSlot :: TaskWidget -> Bool -> IO ()
-postponeSlot this _checked = do
+onPostponeClicked :: TaskWidget -> Bool -> IO ()
+onPostponeClicked this _checked = do
     mNoteId <- readIORef this.noteId
-    case mNoteId of
-        Just noteId ->
-            runStorage this.storage (cmdPostpone noteId) >>= update False this
-        Nothing -> pure ()
+    for_ mNoteId \noteId ->
+        runStorage this.storage (cmdPostpone noteId) >>= update False this
+
+onDoneClicked :: TaskWidget -> Bool -> IO ()
+onDoneClicked this _checked = do
+    mNoteId <- readIORef this.noteId
+    for_ mNoteId \noteId ->
+        runStorage this.storage (cmdDone noteId) >>= update False this
 
 reload :: TaskWidget -> NoteId -> IO ()
 reload this noteId = do