code dump

Signed-off-by: Hannes "Brolaugh" Kindstrommer <me@brolaugh.com>

5 files changed, 91 insertions, 29 deletions

diff --git a/App/ajax/gettasks.php b/App/ajax/gettasks.php
index e8daa60..8a121a6 100644
--- a/App/ajax/gettasks.php
+++ b/App/ajax/gettasks.php
@@ -25,7 +25,11 @@ if(isset($_POST['prio1']) && $_POST['prio1'] == true){
   $a[] = 4;
 }
 $s = new \App\database\Select();
-$tasks = $s->getTasksWithFollowingStatus($a);
+if(count($a) > 0)
+  $tasks = $s->getTasksWithFollowingStatus($a);
+else
+  $tasks = $s->getTasksWithFollowingStatus();
+
 $status_level = $s->getAllStatusLevels();
 foreach ($tasks as $task) {
   ?>
diff --git a/App/database/Select.php b/App/database/Select.php
index a7c1f8d..ea2f289 100644
--- a/App/database/Select.php
+++ b/App/database/Select.php
@@ -91,17 +91,21 @@ class Select extends dbSetup
    */
   public function getTasksWithFollowingStatus($taskID=array(1))
   {
-    $query = "SELECT task_with_status.id as id, title, description, user, level, stamp, task_with_status.style_class as style_class, status_level.id as level_id FROM `task_with_status` LEFT JOIN status_level ON task_with_status.level=status_level.plain_text";
+    $query = "SELECT task_with_status.id as id, title, description, user, level, stamp, task_with_status.style_class as style_class, status_level.id as level_id FROM `task_with_status` LEFT JOIN status_level ON task_with_status.level=status_level.plain_text ORDER BY stamp DESC";
     $param = "";
     $secondParam = $taskID;
     if (count($taskID) > 0) {
       $query .= " WHERE status_level.id IN(";
       for ($i = 0; $i < count($taskID); $i++) {
-        if ($i != count($taskID) - 1)
+        if ($i != (count($taskID) - 1)){
           $query .= "?,";
-        else
+          $param .= "i";
+        }
+        else{
           $query .= "?";
-        $param .= "i";
+          $param .= "i";
+        }
+
       }
 
       $query .= ")";
diff --git a/App/pages/dashboard.php b/App/pages/dashboard.php
index deeeca8..0fff65e 100644
--- a/App/pages/dashboard.php
+++ b/App/pages/dashboard.php
@@ -1,16 +1,16 @@
 <?php
 /**
- * Created by PhpStorm.
- * User: brolaugh
- * Date: 2/25/16
- * Time: 9:54 PM
- */
+* Created by PhpStorm.
+* User: brolaugh
+* Date: 2/25/16
+* Time: 9:54 PM
+*/
 ?>
 <div class="row">
   <div class="col-md-3">
     <div class="well">
       <h3>Alternativ</h3>
-      <form class="form-horizontal" action="App/ajax/gettasks.php" method="post">
+      <form class="form-horizontal" action="javascript:getFeedArguments();" method="post">
         <div class="form-group">
           <div class="togglebutton">
             <label>
@@ -67,7 +67,7 @@
             <label for="taskbody" class="control-label col-md-2">Detalj</label>
             <div class="col-md-10">
               <textarea name="taskbody" rows="3" class="col-md-10 col-sm-10 col-xs-12"
-                        placeholder="Detaljer"></textarea>
+              placeholder="Detaljer"></textarea>
             </div>
           </div>
           <div class="form-group">
@@ -99,7 +99,7 @@
             <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">
+                  data-toggle="dropdown">
                   <?php echo $task->level ;?>
                   <span class="caret"></span>
                 </a>
@@ -108,9 +108,9 @@
                   foreach ($status_level as $tl) {
                     if ($task->level != $tl->plain_text) {
                       ?>
-                      <li><a
-                          href="<?php echo ROOT . "/App/formhandler/changestatus.php?task=" . $task->id . "&status=" . $tl->id; ?>"><span
-                            class="text-<?php echo $tl->style_class; ?>"><?php echo $tl->plain_text; ?></span></a></li>
+                      <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
                     }
                   }
@@ -122,11 +122,45 @@
           </div>
         </h3>
         <p class="text-primary">
-            <?php echo $task->description; ?>
+          <?php echo $task->description; ?>
         </p>
+
       </div>
       <?php
     }
     ?>
+    <!-- Modal -->
+    <div id="statusmodal" class="modal fade" role="dialog">
+      <div class="modal-dialog">
+
+        <!-- Modal content-->
+        <div class="modal-content">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal">&times;</button>
+            <h4 class="modal-title" id="modal-title">Ändra status</h4>
+          </div>
+          <div class="modal-body">
+            <form class="form-horizontal" action="javascript:changeStatus()" method="post">
+              <fieldset>
+                <input type="hidden" name="task" value="" id="modaltask">
+                <input type="hidden" name="status" value="" id="modalstatus">
+                <div class="form-group">
+                  <label for="modalname" class="col-md-2 text-primary">Namn</label>
+                  <div class="col-md-10">
+                    <input type="text" name="name" value="" id="modalname" class="form-control" placeholder="Namn">
+                  </div>
+                </div>
+              </fieldset>
+              </form>
+          </div>
+          <div class="modal-footer">
+            <button type="button" class="btn btn-primary" onclick="changeStatus();">Ändra status</button>
+            <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+          </div>
+        </div>
+
+      </div>
+    </div>
+
   </div>
 </div>
diff --git a/index.php b/index.php
index 6435217..8c14435 100644
--- a/index.php
+++ b/index.php
@@ -17,7 +17,6 @@ include_once("Helper.php");
   <link rel="stylesheet" href="css/ripples.min.css" charset="utf-8">
   <meta charset="utf-8">
   <title>TaskList</title>
-  <script src="js/master.js" charset="utf-8"></script>
 </head>
 <body>
 
@@ -43,6 +42,7 @@ include_once("Helper.php");
   <script src="js/bootstrap.min.js" charset="utf-8"></script>
   <script src="js/material.min.js" charset="utf-8"></script>
   <script src="js/ripples.min.js" charset="utf-8"></script>
+  <script src="js/master.js" charset="utf-8"></script>
 </footer>
 </body>
 </html>
diff --git a/js/master.js b/js/master.js
index e63d08d..c6ed507 100644
--- a/js/master.js
+++ b/js/master.js
@@ -1,23 +1,43 @@
+var title, status, task;
 function addTask(){
 
 }
-function changeStatus(){
+function modalFix(task_s, status_s, title_s){
+  document.getElementById("modal-title").value = title_s;
+  title = title_s;
+  document.getElementById("modalstatus").value = status_s;
+  status = status_s;
+  document.getElementById("modaltask").value = task_s;
+  task = task_s;
+    console.log("modalFix");
 
 }
+function changeStatus(){
+    var xmlhttp = new XMLHttpRequest();
+    xmlhttp.onreadystatechange = function() {
+      if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
+        $('#statusmodal').modal('hide');
+        //document.getElementById("feed").innerHTML = xmlhttp.responseText;
+      }
+    };
+    xmlhttp.open("POST", "App/formhandlar/changestatus.php", true);
+    xmlhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+    xmlhttp.send("task="+task+"&status="+status+"&user"=user);
+}
 function updateFeed(a){
   var xmlhttp = new XMLHttpRequest();
-        xmlhttp.onreadystatechange = function() {
-            if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
-                document.getElementById("feed").innerHTML = xmlhttp.responseText;
-            }
-        };
-        xmlhttp.open("POST", "App/ajax/gettasks.php", true);
-        xmlhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
-        xmlhttp.send("done="+a[0] + "&undone="+a[1] + "&indev="+a[2] + "&prio1="+a[3]);
-        console.debug(xmlhttp);
+  xmlhttp.onreadystatechange = function() {
+    if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
+      document.getElementById("feed").innerHTML = xmlhttp.responseText;
+    }
+  };
+  xmlhttp.open("POST", "App/ajax/gettasks.php", true);
+  xmlhttp.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
+  xmlhttp.send("done="+a[0] + "&undone="+a[1] + "&indev="+a[2] + "&prio1="+a[3]);
+  //console.debug(xmlhttp);
 }
 function getFeedArguments(){
-  var arguments = [];
+  var arguments = new Array();
   arguments.push(document.getElementById("done").checked);
   arguments.push(document.getElementById("undone").checked);
   arguments.push(document.getElementById("indev").checked);