Changeset 6450

Timestamp:

08/21/08 14:15:36 (5 months ago)

Author:

simon

Message:

monkeygtd:

• Don't show every project in drop down lists. Limit to non-complete projects in the applicable realm (as suggested by several people on the mailling list)
  
• Configurable activation hour for ticklers. Defaults to 5am (instead of midnight which is what it used to be) as suggested by someone on the mailing list.
  
• A bug fixes for users of MTS provided by Daniel D.
  
• A bug fix for TiddlerEncryptionPlugin? with MTS provided by Patrick O.
  
• New context-sensitive help screens provided by mankoff
  
• New "Completed Projects" view sorted by date. It's a good one to show your boss at the end of the month.
  

Location:

Trunk/contributors/SimonBaird/mgtd3

Files:

• build.rb (modified) (1 diff)
• framework/MgtdDateUtils.js (modified) (1 diff)
• framework/MgtdIndexedTags.js (modified) (1 diff)
• framework/MgtdList.js (modified) (2 diffs)
• framework/MgtdTagControls.js (modified) (1 diff)
• globalviews/Completed Projects.tiddler (added)
• globalviews/Tickler Dashboard.tiddler (modified) (1 diff)
• globalviews/Ticklers Requiring Action.tiddler (modified) (1 diff)
• menus/ReviewMenu.tiddler (modified) (1 diff)
• supporting/dateChooserPlugin.js (modified) (2 diffs)
• tiddlers/MgtdSettings.tiddler (modified) (1 diff)
• views/MonkeyGTDHelp.tiddler (modified) (2 diffs)
• views/TagDashboards.tiddler (modified) (2 diffs)

Trunk/contributors/SimonBaird/mgtd3/build.rb

@@ -193 +193 @@
   get_tiddler('MgtdSettings').fields['ticklerdateformat'] = 'ddd, DD-mmm-YY'; # set default tickler date format. gotcha: use lowercase only for fields please.
   get_tiddler('MgtdSettings').fields['newjournaldateformat'] = 'ddd DD-mmm-YY, 0hh:0mm'; # set default tickler date format. gotcha: use lowercase only for fields please.
+  get_tiddler('MgtdSettings').fields['tickleractivatehour'] = '5'; # set default tickler date format. gotcha: use lowercase only for fields please.
   to_file          "upload/empty3.html" unless ARGV[0] == 'fast'
 

Trunk/contributors/SimonBaird/mgtd3/framework/MgtdDateUtils.js

@@ -7 +7 @@
 });
 
-// TODO. this doesn't really belong here
-merge(Tiddler.prototype,{
-        touch: function() {
-                this.changed();
-                this.modified = new Date();
-                store.setDirty(true);
-                store.notify(this.title,true);
-        }
-});
 

Trunk/contributors/SimonBaird/mgtd3/framework/MgtdIndexedTags.js

@@ -63 +63 @@
                 if (oldTags)
                         oldTags.each(function(tagName) {
+                                if (!config.indexedTags.tagLists[tagName])
+                                        config.indexedTags.tagLists[tagName] = []; // fixes TiddlerEncryption/MTS, thanks Patrick Ohly.
                                 config.indexedTags.tagLists[tagName].remove(title);
                         });

Trunk/contributors/SimonBaird/mgtd3/framework/MgtdList.js

@@ -1 +1 @@
 
+merge(Tiddler.prototype,{
+        // doesn't belong here..
+        ticklerIsActive: function() {
+                var defaultHourToActivate = 5; // fixme put elsewhere
+                var hourToActivate = config.mGTD.getOptTxt('tickleractivatehour') || defaultHourToActivate;
+                var nowTime = new Date();
+                nowTime.setHours(nowTime.getHours() - hourToActivate); // i'm confused because of UTC versus local. I think mgtd_date is UTC. But has hh:mm:ss is 00:00:00 in local time
+                return (this.fields.mgtd_date && nowTime.convertToYYYYMMDDHHMM() >= this.fields.mgtd_date );
+                
+        }
+
+});
 merge(config.macros,{
 
@@ -9 +21 @@
                         var theList = fastTagged('Tickler').
                                                 filterByTagExpr('!Actioned').
-                                                                filterByEval('tiddler.fields.mgtd_date <= (new Date()).convertToYYYYMMDDHHMM()'+realmFilter);
+                                                                filterByEval('tiddler.ticklerIsActive()'+realmFilter);
                         if (theList.length > 0) {
                                 var blinker = createTiddlyElement(place,'blink');

Trunk/contributors/SimonBaird/mgtd3/framework/MgtdTagControls.js

@@ -255 +255 @@
                         });
 
+
+                        // a few automagic filters should make life easier
+
+                        var thisRealm = tiddler.getParent('Realm')[0];
+                        var thisProject = tiddler.getParent('Project')[0];
+
+                        var filterRealm = "";
+                        var filterComplete = "";
+
+                        if (thisRealm && tag != "Realm") {
+                                // only want to see things in my realm
+                                filterRealm += "[("+thisRealm+")]";
+                        }
+
+                        if (tag == "Project") {
+                                // only want to see active projects
+                                filterComplete += "!Complete";
+                        }
+
+                        var filterTagExpr = "";
+
+                        if (filterRealm != "" && filterComplete != "") {
+                                filterTagExpr = filterRealm + " && " + filterComplete;
+                        }
+                        else if (filterRealm !=  "") {
+                                filterTagExpr = filterRealm;
+                        }
+                        else if (filterComplete !=  "") {
+                                filterTagExpr = filterComplete;
+                        }
+                        // ...yuck
+
+                        filterExpr = filterTagExpr.parseTagExpr();
+                        
+                        if (thisProject) {
+                                // prevent weirdness if the current value isn't in the list
+                                // eg an action in a completed project
+                                filterExpr = "(" + filterExpr + ") || tiddler.title == '" + thisProject + "'"; // i'm confused now...
+
+                        }
+                        if (tag == "Project" && tiddler.hasTag('Project')) {
+                                // don't let a project be a subproject of itself
+                                filterExpr = "(" + filterExpr + ") && tiddler.title != '" + tiddler.title + "'";
+                        }
+
+                        getValues = getValues.filterByEval(filterExpr);
+
+
                         getValues.each(function(t) {
                                 var useTitle = store.getTiddlerSlice(t.title,"button");

Trunk/contributors/SimonBaird/mgtd3/globalviews/Tickler Dashboard.tiddler

@@ -7 +7 @@
 
 <<mgtdList title:'Upcoming Ticklers' startTag:Tickler tags:'!Actioned' view:Tickler mode:global newButtonTags:'Tickler Once'
-        where:'!tiddler.fields.mgtd_date || ((new Date()).convertToYYYYMMDDHHMM() < tiddler.fields.mgtd_date )'
+        where:'!tiddler.fields.mgtd_date || !tiddler.ticklerIsActive()'
         sort:'tickleDate'
         >>

Trunk/contributors/SimonBaird/mgtd3/globalviews/Ticklers Requiring Action.tiddler

@@ -6 +6 @@
         mode:global
         newButtonTags:'Tickler Enabled Once'
-        where:'tiddler.fields.mgtd_date && ((new Date()).convertToYYYYMMDDHHMM() >= tiddler.fields.mgtd_date )'
+        where:'tiddler.ticklerIsActive()'
         sort:'tickleDate'
         dontShowEmpty:yes

Trunk/contributors/SimonBaird/mgtd3/menus/ReviewMenu.tiddler

@@ -3 +3 @@
 [[Action Dashboard by Project]]
 [[Active Projects With No Next Action]]
+[[Completed Projects]]
+[[Done Actions]]
 [[SomedayMaybe and Future]]
 [[Delegated Tasks Dashboard]]

Trunk/contributors/SimonBaird/mgtd3/supporting/dateChooserPlugin.js

@@ -31 +31 @@
                 var callback = function(el,objDate){
                     el.value = objDate.formatString(dateFormat);
-                    useTiddler.fields['mgtd_date'] = objDate.convertToYYYYMMDDHHMM();
-                                        useTiddler.touch();     // see MgtdDateUtils
+                                        store.setValue(useTiddler, 'mgtd_date',objDate.convertToYYYYMMDDHHMM());
                 }
                 DatePicker.create(dateBox,startDate,callback);
@@ -53 +52 @@
                                 curDate[macroName](1);
                                 createTiddlyButton(place,config.macros.addDay.label[macroName],"add a "+config.macros.addDay.tooltip[macroName],function() {
-                    useTiddler.fields['mgtd_date'] = curDate.convertToYYYYMMDDHHMM();
-                                        useTiddler.touch();     // see MgtdDateUtils
+                                        store.setValue(useTiddler, 'mgtd_date',objDate.convertToYYYYMMDDHHMM());
                                         return false;
                                 });

Trunk/contributors/SimonBaird/mgtd3/tiddlers/MgtdSettings.tiddler

@@ -21 +21 @@
 (see [[Date Formats|http://tiddlywiki.org/wiki/Date_Formats]]) 
 
+Hour that ticklers should become active on their tickler date. (0 = Midnight, 12 = Midday)
+Tickler activate hour:<<mgtdEditField tickleractivatehour MgtdSettings>>

Trunk/contributors/SimonBaird/mgtd3/views/MonkeyGTDHelp.tiddler

@@ -4 +4 @@
 
 !Project
-No help yet for Project
+A [[Project|Projects Dashboard]] is made up of sub-projects, [[Action|Next and Waiting Actions]] items, and [[Reference Items]]. A project should have a defined set of tasks or actions (that may change) and when these tasks are done the project is done. If a project has no defined finish, consider calling it an [[Area]], and then make terminable projects in the area.
 
 !Action
-No help yet for Action
+An [[Action|Next and Waiting Actions]] is a single task that can be completed at one point in time. If an action is more complex than this, considering making it a [[subproject|Subprojects]], or storing information in the action notes area. Using the [[CheckboxPlugin| http://www.tiddlytools.com/#CheckboxPlugin]] you can hid sub-actions inside an action.
 
 !Tickler
-No help yet for Tickler
+A [[tickler|Tickler Dashboard]] is an [[Action|Next and Waiting Actions]] with a date attached. For example, if you need to call someone as part of a [[Project|Projects Dashboard]], that should be an action. But if you need to call someone on a specific day, then make it a [[tickler|Tickler Dashboard]] and MonkeyGTD will remind you on the day that you need to call them.
+
+Example: The Health area contains a Dentist project with Actions Schedule Dentist, Go To Dentist and File Reimbursement. The latter two are Waiting while Schedule Dentist is Next. Once you call and schedule it, select the Go To Dentist Action, set it to Next, and then choose Make Tickler and set a date for the day of (or the day before) your appointment.
 
 !View
@@ -19 +21 @@
 
 !Area
-No help yet for Area
+An [[Area]] is similar to a project, but it has no possible completion. Areas contain projects.
+
+Example: The Health area might contain the project ''Run Marathon'', and the ''Household'' area might contain projects like ''Sell House'' and ''Buy House'' and ''Plant Garden'', each of which might have sub-projects.
 
 !Realm
-No help yet for Realm
+Realms are the top of the MonkeyGTD hierarchy. Realms contain Areas. Areas contain Projects. A Realm is a large-scale division of all the Areas, Projects, and Actions that might be placed into a GTD context.
 
 !Reference

Trunk/contributors/SimonBaird/mgtd3/views/TagDashboards.tiddler

@@ -189 +189 @@
         ignoreRealm:yes
         dontShowEmpty:yes
-        where:'tiddler.fields.mgtd_date && ((new Date()).convertToYYYYMMDDHHMM() >= tiddler.fields.mgtd_date ) '
+        where:'tiddler.ticklerIsActive()'
         sort:tickleDate
         "></div>
@@ -200 +200 @@
 <div macro="mgtdList title:'Upcoming Ticklers' tags:'Tickler && !Actioned' view:Tickler newButtonTags:'Tickler Once'
         ignoreRealm:yes
-        where:'!tiddler.fields.mgtd_date || ((new Date()).convertToYYYYMMDDHHMM() < tiddler.fields.mgtd_date ) '
+        where:'!tiddler.ticklerIsActive()'
         sort:tickleDate
         "></div>