Update 1.4.0

Interstitial Journaling is added! Minor bug fixes
kookma · Nov 18, 2021 · de431a0 · de431a0
1 parent 40e67a3
commit de431a0
Show file tree

Hide file tree

Showing 19 changed files with 239 additions and 113 deletions.
diff --git a/README.md b/README.md
@@ -5,6 +5,8 @@ Todolist is a small [Tiddlywiki](https://tiddlywiki.com/) plugin, contain all of
 
 You can also make to-dos for major tasks like a project, a work assignment or an overall goal. Therefore, the overall purpose of creating a to-do is to remember tasks and prioritize them.
 
+# Interstitial journaling
+*Interstitial journaling* is a productivity technique created by Tony Stubblebine. It’s the simplest way to combine note-taking, tasks, and time tracking in one unique workflow (See [NessLabs](https://nesslabs.com/interstitial-journaling) ). Todolist plugin has feature for powerful interstitial journaling.
 
 # Tutorial
 * Open https://kookma.github.io/TW-Todolist/

diff --git a/docs/index.html b/docs/index.html
diff --git a/packaged/todolist.tid b/packaged/todolist.tid
diff --git a/source/todolist/listOfConfigPrefixes.tid b/source/todolist/listOfConfigPrefixes.tid
@@ -1,6 +1,6 @@
 created: 20211107103624334
 list: archive done priority state status tasks
-modified: 20211107142743879
+modified: 20211118133805361
 tags: 
 title: $:/plugins/kookma/todolist/listOfConfigPrefixes
 type: text/vnd.tiddlywiki
diff --git a/source/todolist/macros/explore-internalTids.tid b/source/todolist/macros/explore-internalTids.tid
@@ -1,10 +1,10 @@
 created: 20190719143452217
-modified: 20211107180017426
+modified: 20211118090106860
 title: $:/plugins/kookma/todolist/macros/explore-internalTids
 type: text/vnd.tiddlywiki
 
 \define todolist-explore-data-tiddlers()
-\import $:/plugins/kookma/todolist/macros/confirm-delete
+\import [all[tiddlers+shadows]tag[$:/tags/Todolist/Macro]!has[draft.of]]
 ><b>Number of internal tiddlers found: <$count filter="[all[tiddlers+shadows]prefix<td-basePath>]" /></b><br>
 ><$macrocall $name="todolist-delete-all-tids" filter=<<dataTids>> />
 

diff --git a/source/todolist/macros/interstitial-ui.tid b/source/todolist/macros/interstitial-ui.tid
@@ -0,0 +1,35 @@
+created: 20211118051854913
+modified: 20211118135830141
+tags: $:/tags/Macro
+title: $:/plugins/kookma/todolist/macros/interstitial-ui
+type: text/vnd.tiddlywiki
+
+\define interstitial-ui(caption:"Interstitial Journals", width:"100%" base:"base")
+\import [[$:/plugins/kookma/todolist/macros/toggle-edit-button]]
+\import [[$:/plugins/kookma/todolist/macros/task/show]]
+\import [[$:/plugins/kookma/todolist/macros/interstitial-utility]]
+
+<$vars 
+ stateTiddler=   """$(td-basePath)$/state/$base$"""
+ taskTiddler=    """$(td-basePath)$/tasks/$base$"""
+ >
+
+<div class="kk-todolist-ui" style="max-width:$width$;">
+
+$caption$
+
+<div class="kk-todolist-header-ui">
+<div class="kk-todolist-header-textbox"><<todolist-input-journal>></div>
+<div><<todolist-add-journal>></div>
+<div><<todolist-toggle-edit-button>></div>
+</div>
+
+<!-- display items -->
+<$list filter="[<stateTiddler>getindex[editview]match[edit]]" variable=ignore 
+   emptyMessage="""<<disp-journals-in-view-mode>>""">
+     <<disp-journals-in-edit-mode>>
+</$list>
+
+</div>
+
+\end
diff --git a/source/todolist/macros/interstitial-utility.tid b/source/todolist/macros/interstitial-utility.tid
@@ -0,0 +1,73 @@
+created: 20211118122926552
+modified: 20211118134051335
+tags: 
+title: $:/plugins/kookma/todolist/macros/interstitial-utility
+type: text/vnd.tiddlywiki
+
+\define todolist-input-journal()
+<$keyboard key="escape" actions=<<todolist-cancel-journal-action>>   >
+<$keyboard key="enter"  actions=<<todolist-add-journal-action>> >
+<$edit-text 
+ tiddler=<<stateTiddler>> 
+ index="itemtext" 
+ tag="input"
+ class="kk-todolist-input-textbox"
+ placeholder="add new item"
+ default="" minHeight="1em" focus="yes"
+ />
+</$keyboard> 
+</$keyboard> 
+\end
+
+\define todolist-add-journal()
+<$button class="tc-btn-invisible" tooltip="Add new item">
+	{{$:/core/images/new-button}}
+	<<todolist-add-journal-action>>
+</$button>
+\end
+
+\define todolist-add-journal-action()
+  <$list filter="[<stateTiddler>getindex[itemtext]!is[blank]]" variable=ignor>
+	<$set name=item value=<<now "[UTC]YYYY0MM0DD0hh0mm0ssXXX">> >
+	<$action-setfield 
+	 $tiddler=<<taskTiddler>>
+	 $index=<<item>>
+	 $value={{{ [<stateTiddler>getindex[itemtext]] }}}
+	/>
+	</$set>
+	<$action-setfield $tiddler=<<stateTiddler>> $index="itemtext" $value=""/>
+	</$list>
+\end
+
+\define todolist-cancel-journal-action()
+ <$action-setfield $tiddler=<<stateTiddler>> $index="itemtext" $value=""/>
+\end
+
+
+\define todolist-delete-journal(dataTiddler)
+<$button class="tc-btn-invisible">
+{{$:/plugins/kookma/todolist/images/times.svg}}
+<$action-setfield $tiddler=<<__dataTiddler__>> $index=<<item>> />
+</$button>
+\end
+
+\define disp-journals-in-view-mode()
+\whitespace trim
+<$list filter="[<taskTiddler>indexes[]]" variable="item">
+<div class="kk-todolist-row">
+  <div class="kk-todolist-done" style="width:2.6em"><b><$view tiddler=<<item>> field=title format=date template="0hh:0mm"/></b></div>
+  <div class="kk-todolist-desc"><<todolist-show-task>></div>
+</div>
+</$list>
+\end
+
+\define disp-journals-in-edit-mode()
+<!-- this macro is the same as disp-list-in-edit-mode -->
+<$list filter="[<taskTiddler>indexes[]]" variable="item">
+<div class="kk-todolist-row">
+  <div class="kk-todolist-done" style="width:2.6em"><b><$view tiddler=<<item>> field=title format=date template="0hh:0mm"/></b></div>
+  <div class="kk-todolist-desc"><<todolist-show-task>></div>
+  <div class="kk-todolist-delete"><$macrocall $name="todolist-delete-journal" dataTiddler=<<taskTiddler>>/></div>
+</div>
+</$list>
+\end
diff --git a/source/todolist/macros/add-task.tid → source/todolist/macros/task/add.tid b/source/todolist/macros/add-task.tid → source/todolist/macros/task/add.tid
@@ -1,7 +1,7 @@
 created: 20190715170540482
-modified: 20211107165519251
+modified: 20211118073630581
 tags: $:/tags/Todolist/Macro
-title: $:/plugins/kookma/todolist/macros/add-task
+title: $:/plugins/kookma/todolist/macros/task/add
 type: text/vnd.tiddlywiki
 
 \define todolist-input-task()

diff --git a/source/todolist/macros/delete-task.tid → source/todolist/macros/task/delete.tid b/source/todolist/macros/delete-task.tid → source/todolist/macros/task/delete.tid
@@ -1,7 +1,7 @@
 created: 20190715170610146
-modified: 20210422161832810
+modified: 20211118073622901
 tags: $:/tags/Todolist/Macro
-title: $:/plugins/kookma/todolist/macros/delete-task
+title: $:/plugins/kookma/todolist/macros/task/delete
 type: text/vnd.tiddlywiki
 
 \define todolist-delete-task(dataTiddler)

diff --git a/source/todolist/macros/done-task.tid → source/todolist/macros/task/done.tid b/source/todolist/macros/done-task.tid → source/todolist/macros/task/done.tid
@@ -1,7 +1,7 @@
 created: 20190715170633034
-modified: 20210422161832824
+modified: 20211118073642529
 tags: $:/tags/Todolist/Macro
-title: $:/plugins/kookma/todolist/macros/done-task
+title: $:/plugins/kookma/todolist/macros/task/done
 type: text/vnd.tiddlywiki
 
 \define todolist-done-task()

diff --git a/source/todolist/macros/show-task.tid → source/todolist/macros/task/show.tid b/source/todolist/macros/show-task.tid → source/todolist/macros/task/show.tid
@@ -1,7 +1,7 @@
 created: 20190715170652239
-modified: 20210422161832868
+modified: 20211118073557389
 tags: $:/tags/Todolist/Macro
-title: $:/plugins/kookma/todolist/macros/show-task
+title: $:/plugins/kookma/todolist/macros/task/show
 type: text/vnd.tiddlywiki
 
 \define todolist-show-task()

diff --git a/source/todolist/macros/undone-task.tid → source/todolist/macros/task/undone.tid b/source/todolist/macros/undone-task.tid → source/todolist/macros/task/undone.tid
@@ -1,7 +1,7 @@
 created: 20190715190405259
-modified: 20210422161832892
+modified: 20211118073613669
 tags: $:/tags/Todolist/Macro
-title: $:/plugins/kookma/todolist/macros/undone-task
+title: $:/plugins/kookma/todolist/macros/task/undone
 type: text/vnd.tiddlywiki
 
 \define todolist-undone-task()

diff --git a/source/todolist/macros/ui.tid → source/todolist/macros/todolist-ui.tid b/source/todolist/macros/ui.tid → source/todolist/macros/todolist-ui.tid
@@ -1,10 +1,10 @@
 created: 20190715170739310
-modified: 20211107174919813
+modified: 20211118131626863
 tags: $:/tags/Macro
-title: $:/plugins/kookma/todolist/macros/ui
+title: $:/plugins/kookma/todolist/macros/todolist-ui
 type: text/vnd.tiddlywiki
 
-\define td-basePath() $:/todolist/data
+\define td-basePath()    $:/todolist/data
 
 \define todolist-ui(caption:"A plain todolist", width:"100%" base:"base")
 \import [all[tiddlers+shadows]tag[$:/tags/Todolist/Macro]!has[draft.of]]

diff --git a/source/todolist/plugin.info b/source/todolist/plugin.info
@@ -3,7 +3,7 @@
     "name": "Todolist",
     "description": "Organize, prioritize, and plan your work",
     "author": "Mohammad Rahmani",
-    "version": "1.3.0",
+    "version": "1.4.0",
     "core-version": ">=5.1.23",
     "source": "https://github.com/kookma/TW-Todolist",
     "list": "readme license history",

diff --git a/source/todolist/plugin.info.meta b/source/todolist/plugin.info.meta
diff --git a/source/todolist/readme.tid b/source/todolist/readme.tid
@@ -1,14 +1,16 @@
 created: 20210422161257931
-modified: 20210422170749229
+modified: 20211118142121771
 tags: 
 title: $:/plugins/kookma/todolist/readme
 type: text/vnd.tiddlywiki
 
 ; Todolist
-Todolist is a small pure wikitext plugin, contain all of the tasks that you need to complete on a given day. Todolist gives you the confidence that everything’s organized and accounted for, so you can make progress on the things that are important to you.
+Todolist is a small pure wikitext plugin, for creating todo lists and interstitial journaling. Todolist gives you the confidence that everything’s organized and accounted for, so you can make progress on the things that are important to you.
 
 You can also make to-dos for major tasks like a project, a work assignment or an overall goal. Therefore, the overall purpose of creating a to-do is to remember tasks and prioritize them.
 
+//Interstitial journaling// is a productivity technique created by Tony Stubblebine. It’s the simplest way to combine note-taking, tasks, and time tracking in one unique workflow (See [[NessLabs|https://nesslabs.com/interstitial-journaling]]).
+
 ;Code and demo
 For learning plugin features, syntax, tutorial and examples see the plugin demo and code pages
 

diff --git a/source/todolist/styles/dynamic.css.tid b/source/todolist/styles/dynamic.css.tid
@@ -0,0 +1,30 @@
+created: 20211118083707275
+modified: 20211118112101100
+tags: $:/tags/Stylesheet
+title: $:/plugins/kookma/todolist/styles/dynamic.css
+type: text/vnd.tiddlywiki
+
+/* Todolist main ui dynamic props which follow palette colors*/
+
+.kk-todolist-ui svg{
+	fill:#aaaaaa;
+}
+
+.kk-todolist-ui button:hover svg {
+	fill: #888888; 
+}
+
+
+.kk-todolist-row:hover {
+	/* background-color: #f6f6f6;*/
+	background-color: <<colour table-header-background>>;
+}
+
+
+.kk-todolist-row .kk-todolist-delete {
+	opacity: 0.3;
+}
+
+.kk-todolist-row:hover .kk-todolist-delete {
+	opacity: 1;
+}
diff --git a/source/todolist/styles/main.css b/source/todolist/styles/main.css
@@ -3,15 +3,6 @@
 	min-width:320px; /* controls the minimum width of whole ui */
 }
 
-.kk-todolist-ui svg{
-	fill:#aaaaaa;
-}
-
-
-.kk-todolist-ui button:hover svg {
-	fill: #888888; 
-}
-
 
 /* Todolist header ui */
 
@@ -31,7 +22,7 @@
 .kk-todolist-row{
 	display: flex;	
 	width: 100%; /* for larg screen width> 960px*/
-	flex-wrap: wrap;
+	flex-wrap: nowrap;
 }
 
 .kk-todolist-row .kk-todolist-done,
@@ -46,16 +37,7 @@
 	padding-left: 10px;
 	padding-right: 10px;
 }
-.kk-todolist-row .kk-todolist-delete {
-	opacity: 0.3;
-}
 
 .kk-todolist-row .kk-todolist-priority{
 	margin-right:5px;
-}
-.kk-todolist-row:hover {
-	background-color: #f6f6f6;
-}
-.kk-todolist-row:hover .kk-todolist-delete {
-	opacity: 1;
 }
diff --git a/source/todolist/styles/main.css.meta b/source/todolist/styles/main.css.meta
@@ -1,5 +1,5 @@
 created: 20190716040116074
-modified: 20210422161832918
+modified: 20211118084047012
 tags: $:/tags/Stylesheet
 title: $:/plugins/kookma/todolist/styles/main.css
 type: text/css