Add GUI for setting percent completed

2 files changed, 23 insertions, 6 deletions

diff --git a/lib/controller/taskscontroller.php b/lib/controller/taskscontroller.php
index 6d77aed6..a3d9cdd8 100644
--- a/lib/controller/taskscontroller.php
+++ b/lib/controller/taskscontroller.php
@@ -51,6 +51,7 @@ class TasksController extends Controller {
 				try {
 					$task_data = Helper::arrayForJSON($task['id'], $vtodo, $user_timezone);
 					$task_data['calendarid'] = $calendar['id'];
+					$task_data['calendarcolor'] = $calendar['calendarcolor'];
 					$tasks[] = $task_data;
 				} catch(\Exception $e) {
 					\OCP\Util::writeLog('tasks_enhanced', $e->getMessage(), \OCP\Util::ERROR);
@@ -112,9 +113,8 @@ class TasksController extends Controller {
 		}
 	}
 
-	private function setCompleted($isCompleted){
+	private function setPercentComplete($percent_complete){
 		$taskId = (int) $this->params('taskID');
-		$percent_complete = $isCompleted ? '100' : '0';
 		$isCompleted = null;
 		try {
 			$vcalendar = \OC_Calendar_App::getVCalendar($taskId);
@@ -146,13 +146,29 @@ class TasksController extends Controller {
 		}
 	}
 
+        /**
+         * @NoAdminRequired
+         */
+	public function percentComplete( $percentCompete ){
+		$response = new JSONResponse();
+		try{
+                        $percent_complete = $this->params('complete');
+			$this->setPercentComplete( $percent_complete );
+			return $response;
+		}catch(\Exception $e) {
+                        return $response;
+                        // return $this->renderJSON(array(), $e->getMessage());
+                }
+        }
+
+
 	/**
 	 * @NoAdminRequired
 	 */
 	public function completeTask(){
 		$response = new JSONResponse();
 		try {
-			$this->setCompleted(true);
+			$this->setPercentComplete(100);
 			return $response;
 		} catch(\Exception $e) {
 			return $response;
@@ -166,7 +182,7 @@ class TasksController extends Controller {
 	public function uncompleteTask(){
 		$response = new JSONResponse();
 		try {
-			$this->setCompleted(false);
+			$this->setPercentComplete(0);
 			return $response;
 		} catch(\Exception $e) {
 			return $response;
@@ -465,4 +481,4 @@ class TasksController extends Controller {
 	}
 
 
-}
\ No newline at end of file
+}
diff --git a/lib/helper.php b/lib/helper.php
index 23f96246..aabecbf7 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -168,7 +168,7 @@ Class helper {
 		} else {
 			$task['completed'] = false;
 		}
-		$task['complete'] = $vtodo->getAsString('PERCENT-COMPLETE');
+		$task['complete'] = $vtodo->getAsString('PERCENT-COMPLETE')==''?'0':$vtodo->getAsString('PERCENT-COMPLETE');
 		return $task;
 	}
 
@@ -198,6 +198,7 @@ Class helper {
 		$vtodo->setString('DESCRIPTION', $request['description']);
 		$vtodo->setString('CATEGORIES', $request["categories"]);
 		$vtodo->setString('PRIORITY', $request['priority']);
+		$vtodo->setString('PERCENT-COMPLETE', $request['complete']);
 
 		$due = $request['due'];
 		if ($due) {