fix #80

Author: puthre

lib/Controller/AjaxController.php

@@ -98,7 +98,9 @@ public function workIntervals() {
 			$tags = [];
 			$wiToTags = $this->workIntervalToTagMapper->findAllForWorkInterval($wi->id);
 			foreach($wiToTags as $wiToTag){
-				$tags[] = $this->tagMapper->find($wiToTag->tagId);
+				$t = $this->tagMapper->find($wiToTag->tagId);
+				if ($t != null)
+					$tags[] = $t;
 			}
 
 			$wa = ['duration' => $wi->duration,
@@ -317,6 +319,14 @@ public function updateWorkInterval($id) {
 			foreach($tags as $tag){
 				if (empty($tag))
 					continue;
+				if(!is_numeric($tag)){
+					$c = new Tag();
+					$c->setName($tag);
+					$c->setUserUid($this->userId);
+					$c->setCreatedAt(time());
+					$this->tagMapper->insert($c);
+					$tag = $c->id;
+				}
 				$newWiToTag = new WorkIntervalToTag();
 				$newWiToTag->setWorkIntervalId($id);
 				$newWiToTag->setTagId($tag);

lib/Db/TagMapper.php

@@ -33,7 +33,12 @@ public function findByNameUser($name, $userUid) {
     public function find($id) {
         $sql = 'SELECT * FROM `*PREFIX*timetracker_tag` ' .
             'WHERE `id` = ?';
-        return $this->findEntity($sql, [$id]);
+        try {
+            $e = $this->findEntity($sql, [$id]);
+            return $e;
+        } catch (\OCP\AppFramework\Db\DoesNotExistException $e){
+            return null;
+        }
     }