fix mtierltd#48

Author: puthre

js/timer.js

@@ -260,7 +260,7 @@
                             ((child.running == 1)?'':tsToHour(child.start+child.duration))+
                                     "</div>"+
                             "<div class='wi-child-duration'>"+((child.running == 1)?'running...':secondsToTimer(child.duration))+"</div>"+
-                            "<div class='wi-play-space'><span class='fas clickable fa-play wi-play' id="+child.id+" data-work-name='"+child.name+"'></span><div>"+"</div></li></div>");
+                            "<div class='wi-play-space'><span class='fas clickable fa-play wi-play' id="+child.id+" data-work-name='"+child.name+"' data-projectid="+child.projectId+" data-tagids='"+child.tags.map(function(tag) {return tag.id}).join(',')+"' ></span><div>"+"</div></li></div>");
                         });
 
 
@@ -324,7 +324,7 @@
                 $('.wi-play').click(function(e) {
                     e.preventDefault();
                     $('#work-input').val($(this).data('work-name'));
-                    startTimer();
+                    startTimer($(this).data('projectid'), $(this).data('tagids'));
                     return false;
                 })
                 $('.wi-trash').click(function(e) {
@@ -497,7 +497,7 @@
               });
         }
 
-        function startTimer(){
+        function startTimer(projectId = null, tags = ""){
             if(localStorage.getItem('isTimerStarted') === 'true'){
                 stopTimer();
             }
@@ -506,7 +506,7 @@
             if (workName == ''){
                 workName = 'no description';
             }
-            var jqxhr = $.post( "ajax/start-timer/"+workName, function() {
+            var jqxhr = $.post( "ajax/start-timer/"+workName, { projectId: projectId, tags: tags}, function() {
                 localStorage.setItem('isTimerStarted', true);
                 $('#start-tracking > span').addClass("stop-button").removeClass("play-button");
                 getWorkItems();

lib/Controller/AjaxController.php

@@ -146,6 +146,16 @@ public function index() {
 
 	public function startTimer($name) {
 		//$this->endTimer();
+		$projectId = null;
+		if (isset($this->request->projectId) && (!empty($this->request->projectId))){
+			$projectId = $this->request->projectId;
+		}
+
+		$tags = null;
+		if (isset($this->request->tags) && (!empty($this->request->tags))){
+			$tags = $this->request->tags;
+		}
+
 		if (strlen($name) > 255){
 			return new JSONResponse(["Error" => "Name too long"]);
 		}
@@ -154,15 +164,22 @@ public function startTimer($name) {
 		$winterval->setRunning(1);
 		$winterval->setName($name);
 		$winterval->setUserUid($this->userId);
+		
+		// first get tags and project ids from the last work item with the same name
 		$lwinterval = $this->workIntervalMapper->findLatestByName($this->userId, $name);
-		if ($lwinterval != null){
+		if ($projectId == null && $lwinterval != null){
 
 			$winterval->setProjectId($lwinterval->projectId);
 		}
+
+		if($projectId != null){
+			$winterval->setProjectId($projectId);
+		}
+
 		$this->workIntervalMapper->insert($winterval);
-		if ($lwinterval != null){
-			$tags = $this->workIntervalToTagMapper->findAllForWorkInterval($lwinterval->id);
-			foreach($tags as $t){
+		if ($tags == null && $lwinterval != null){
+			$lastTags = $this->workIntervalToTagMapper->findAllForWorkInterval($lwinterval->id);
+			foreach($lastTags as $t){
 				$wtot = new WorkIntervalToTag();
 				$wtot->setWorkIntervalId($winterval->id);
 				$wtot->setTagId($t->tagId);
@@ -172,6 +189,20 @@ public function startTimer($name) {
 
 		}
 
+		if ($tags != null){
+			$tagsArray  = explode(",", $tags);
+			foreach($tagsArray as $t){
+				$wtot = new WorkIntervalToTag();
+				$wtot->setWorkIntervalId($winterval->id);
+				$wtot->setTagId($t);
+				$wtot->setCreatedAt(time());
+				$this->workIntervalToTagMapper->insert($wtot);
+			}
+
+		}
+
+		
+		
 
 		//echo json_encode((array)$winterval);
 		return new JSONResponse(["WorkIntervals" => $winterval, "running" => 1]);