README.txt

[gitlive] / Tasks.js

diff --git a/Tasks.js b/Tasks.js
index f14bc63..c972779 100644 (file)
--- a/Tasks.js
+++ b/Tasks.js
@@ -133,16 +133,7 @@ Tasks = {
         // using curTask + lastCommit decide what to do.
         this.inQuery = 0;
         //tests:::
-        this.verifyTaskTime();
-        this.verifyTaskProject();
-          
-        
-        
-        
-    },
-    
-    verifyTaskTime : function()
-    {
+       
         // check to see if current task is being planned for too long..
         // you should only enter task, and allow it to span over an hour.
         // if you do the whole day on a task, then it will need to verify with you every so often that you
@@ -160,24 +151,57 @@ Tasks = {
                 
           
          */
-        var now = new Date();
-        if ( this.curTask) {
-            print(JSON.stringify(this.curTask));
-            
-            var endoftask = this.curTask.action_datetime.add(Date.HOUR, this.curTask.qtyvalue);
-            print("END OF TASK: " + endoftask);
-            
-            var max_stretch = now.add(Date.HOUR, 1);
-             print("Max stretch: " + max_stretch);
-            if (endoftask > max_stretch) {
-                this.fixEndCurrTask(); //
-                 
-            }
+        
+        if (!this.currTask) {
+             this.promptForTask();
+            return;
+        }
+        
+         if (!this.currTask.project_id) {
+            this.promptForTask();
+            return;
+        }
+        
+        // are we working on the same project!!!!
+        if (this.currTask.project_id != this.commitRepo.project_id) {
+            this.promptForTask();
+            return;
+        }
+  
+        // has the ticket been closed...
+        
+        var is_project=  this.curTask.project_id_code[0] != '*' ;
+        // is there a ticket?
+        if (is_project && !this.currTask.ticket_id) {
+            this.promptForTask();
+            return;
+        }
+        if (is_project && this.currTask.ticket_status) {
+            //TODO - if status is closed.. then we need to prompt..
             
             
         }
         
         
+        // we now working on same project..
+        
+        
+        var now = new Date();
+        
+        print(JSON.stringify(this.curTask));
+        
+        var endoftask = this.curTask.action_datetime.add(Date.HOUR, this.curTask.qtyvalue);
+        print("END OF TASK: " + endoftask);
+        
+        var max_stretch = now.add(Date.HOUR, 1);
+         print("Max stretch: " + max_stretch);
+        if (endoftask > max_stretch) {
+            this.fixEndCurrTask(); //
+            
+        }
+        // still needs to be verified..
+       
+        
         
         
 
@@ -197,11 +221,17 @@ Tasks = {
             
         }
         
+        // ok verified basic time...
+        //let's check to see if project matches..'
+        
         
         
         
     },
     
+    
+    
+    
     //---------- end verifying - now prompting..
     
     
@@ -214,12 +244,16 @@ Tasks = {
         var min = Math.round((eot.format('i')*1) / 15) * 15;
         var reot = Date.parseDate(eot.format('Y-m-d H:') + (min ? min : '00') + ':00', 'Y-m-d H:i:s');
         
+        print("REAL END TIME" + reot.format('Y-m-d H:i:s'))
+        print("Current start time" + this.curTask.action_datetime.format('Y-m-d H:i:s'))
+        
         // how long between start and reot...
         var hours = (reot - this.curTask.action_datetime) / (60*60 * 1000 );
         var rounded =  Math.round(hours * 4) / 4.0;
         print("Rounded : "  + rounded);
+        //return;
         this.updateTask({ qtyvalue : rounded });
-        
+        this.curTask.qtyvalue = rounded;
         
     },
     
@@ -238,7 +272,7 @@ Tasks = {
         args.id = _this.curTask.id;
         
         
-        print(JSON.stringify(args));
+        //print(JSON.stringify(args));
         //return;
     
     
@@ -257,7 +291,7 @@ Tasks = {
                 
                 print(JSON.stringify(res,null,4))
                 //print([ res.success , res.data.length ]);
-                  }
+            }
             
         });
         var netrc  = Netrc.forHost('git.roojs.com');