diff options
| -rw-r--r-- | App/ajax/gettasks.php | 1 | ||||
| -rw-r--r-- | App/ajax/lasttask.php | 49 | ||||
| -rw-r--r-- | App/database/Select.php | 10 | ||||
| -rw-r--r-- | js/master.js | 15 |
4 files changed, 72 insertions, 3 deletions
diff --git a/App/ajax/gettasks.php b/App/ajax/gettasks.php index 9acd762..354c64c 100644 --- a/App/ajax/gettasks.php +++ b/App/ajax/gettasks.php @@ -9,7 +9,6 @@ chdir("../.."); include_once 'Helper.php'; - //$statuses = $_POST['statuses']; $a = array(); if(isset($_POST['done']) && $_POST['done'] == true){ diff --git a/App/ajax/lasttask.php b/App/ajax/lasttask.php new file mode 100644 index 0000000..55701ac --- /dev/null +++ b/App/ajax/lasttask.php @@ -0,0 +1,49 @@ +<?php +/** +* Created by PhpStorm. +* User: brolaugh +* Date: 3/1/16 +* Time: 9:03 PM +*/ + + +chdir("../.."); +include_once 'Helper.php'; + +$s = new \App\database\Select(); +$task = $s->getLastTask(); +$status_level = $s->getAllStatusLevels(); +?> +<div class="well well-xs"> + <h3> + <span ><?php echo $task->title; ?></span> + <div class="btn-group"> + <div class="btn-toolbar"> + <div class="btn-group"> + <a href="bootstrap-elements.html" data-target="#" class="btn btn-raised btn-<?php echo $task->style_class;?> dropdown-toggle" + data-toggle="dropdown"> + <?php echo $task->level ;?> + <span class="caret"></span> + </a> + <ul class="dropdown-menu"> + <?php + foreach ($status_level as $tl) { + if ($task->level != $tl->plain_text) { + ?> + <li data-toggle="modal" data-target="#statusmodal" onclick="javascript:modalFix(<?php echo $task->id . "," . $tl->id . ",'" . $task->title."'";?>)"> + <span class="text-<?php echo $tl->style_class; ?>"><?php echo $tl->plain_text; ?></span> + </li> + <?php + } + } + + ?> + </ul> + </div> + </div> + </div> + </h3> + <p class="text-primary"> + <?php echo $task->description; ?> + </p> +</div> diff --git a/App/database/Select.php b/App/database/Select.php index fed1362..cfa3173 100644 --- a/App/database/Select.php +++ b/App/database/Select.php @@ -20,7 +20,15 @@ class Select extends dbSetup $stmt->bind_param('i', $taskID); $stmt->execute(); $res = $stmt->get_result(); - $a = array(); + $retval = $res->fetch_object(); + $stmt->close(); + return $retval; + } + public function getLastTask(){ + + $stmt = $this->getDb()->prepare("SELECT * FROM last_task_with_status"); + $stmt->execute(); + $res = $stmt->get_result(); $retval = $res->fetch_object(); $stmt->close(); return $retval; diff --git a/js/master.js b/js/master.js index b177bdd..eafa05c 100644 --- a/js/master.js +++ b/js/master.js @@ -14,18 +14,31 @@ function addTask(){ var tasktitle = document.getElementById("tasktitle").value; var taskbody = document.getElementById("taskbody").value; var taskperson = document.getElementById("taskperson").value; - console.log("Häre är jag!"); xmlhttp.onreadystatechange = function() { if (xmlhttp.readyState == 4 && xmlhttp.status == 200) { document.getElementById("tasktitle").value = ""; document.getElementById("taskbody").value = ""; document.getElementById("taskperson").value = ""; + getLastTask(); } }; xmlhttp.open("POST", "App/formhandler/add_listitem.php", true); xmlhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); xmlhttp.send("tasktitle="+tasktitle+"&taskbody="+taskperson+"&taskperson"+taskperson); } +function getLastTask(){ + var xmlhttp = new XMLHttpRequest(); + console.log("Häre är jag!"); + xmlhttp.onreadystatechange = function() { + if (xmlhttp.readyState == 4 && xmlhttp.status == 200) { + console.log("Häre är jag!"); + $("#feed").append(xmlhttp.responseText); + } + }; + xmlhttp.open("POST", "App/ajax/lasttask.php", true); + xmlhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); + xmlhttp.send(); +} function changeStatus(){ var xmlhttp = new XMLHttpRequest(); var user = document.getElementById("modalname").value; |