Bugfixes für PHP Web-UI ....

diff --git a/ticket-web/src/ticket_glob_vars.php b/ticket-web/src/ticket_glob_vars.php
index 7f0ce1b0a56dd7fe52075b6cd32c48e41689891b..3dc679aa1a7575ea737cd74926250caf21e1d470 100755 (executable)
--- a/ticket-web/src/ticket_glob_vars.php
+++ b/ticket-web/src/ticket_glob_vars.php
@@ -4,7 +4,7 @@ define ("DB_TYPE", "pgsql");
 
 
 define ("HOST", "localhost");
-define ("SCHEMA", "ticket");
+//define ("SCHEMA", "ticket");
 define ("DB", "tickets");
 //define ("USER", "postgres");
 define ("USER", "oleb");

diff --git a/ticket-web/src/webui/domain.php b/ticket-web/src/webui/domain.php
index c8182ed64a5952b92ae91ddf2ed9df20e299c9a5..cef7b48f2e6e7ca74df7b90baac1a9c833746c1b 100644 (file)
--- a/ticket-web/src/webui/domain.php
+++ b/ticket-web/src/webui/domain.php
@@ -11,7 +11,7 @@ require_once 'lib/header.php';
 \r
 if (isset($_POST) && count(array_keys($_POST)) > 0) {\r
     \r
-    $issue = handleQuickUpdate($_POST, $connect_dbms_handle);\r
+    $issue = handleQuickUpdate($_POST, $connect_dbms_handle, $current_user);\r
     //echo $issue;\r
     $domain = getDomainIdOfIssue($connect_dbms_handle, $issue);\r
     //echo $domain;\r

diff --git a/ticket-web/src/webui/index.php b/ticket-web/src/webui/index.php
index 0c5b518d93f1bac0d2ecc4316e6d23cc643f0cbf..065d02035349cfae2da076cc2ed9564f5e03eaf4 100755 (executable)
--- a/ticket-web/src/webui/index.php
+++ b/ticket-web/src/webui/index.php
@@ -13,7 +13,7 @@ require_once 'lib/header.php';
 \r
 if (isset($_POST) && count(array_keys($_POST)) > 0) {\r
     \r
-    handleQuickUpdate($_POST, $connect_dbms_handle);\r
+    handleQuickUpdate($_POST, $connect_dbms_handle, $current_user);\r
 \r
 }\r
 \r

diff --git a/ticket-web/src/webui/issue.php b/ticket-web/src/webui/issue.php
index 0e409af6aeac62ddcbc8357387143d9d30268bc7..528780653e576f59fc23bfdec37a8e3b85ea3dea 100644 (file)
--- a/ticket-web/src/webui/issue.php
+++ b/ticket-web/src/webui/issue.php
@@ -16,10 +16,10 @@ if (isset($_GET)) {
         //var_dump($_GET);\r
         $issue = $_GET['issuedetail'];\r
         \r
-        $issue_arr = getData($connect_dbms_handle, generateSelect(array("*"), "ticket.view_issue", array("id=".$issue), null));\r
+        $issue_arr = getData($connect_dbms_handle, generateSelectWhereOrder(array("*"), "ticket.view_issue", array("id=".$issue), null));\r
         //var_dump($issue_arr);\r
         \r
-        $comments_arr = getData($connect_dbms_handle, generateSelect(array("*"), "ticket.view_comments_users", array("fk_issue_of_comment=".$issue), array("erstellt asc")));\r
+        $comments_arr = getData($connect_dbms_handle, generateSelectWhereOrder(array("*"), "ticket.view_comments_users", array("fk_issue_of_comment=".$issue), array("erstellt asc")));\r
         //var_dump($comments_arr);\r
     }\r
 }\r
@@ -31,6 +31,7 @@ if (isset($_POST)) {
         $issue = $change[1];\r
         //echo $issue;\r
 \r
+        //var_dump($_POST);\r
         $update_arr = array();\r
 \r
         $issue_deadline =       $_POST['issue_deadline'];\r
@@ -41,18 +42,24 @@ if (isset($_POST)) {
         $issue_executiondate_date = $_POST['issue_executiondate'];\r
         $issue_executiondate_time = $_POST['issue_executiondate_time'];\r
         $issue_executiondate = $issue_executiondate_date." ";\r
-        $issue_executiondate .= ($issue_executiondate_time == "" ? " 00:00" : $issue_executiondate_time).":00'";\r
+        $issue_executiondate .= ($issue_executiondate_time == "" ? " 00:00" : $issue_executiondate_time)."'";\r
         array_push($update_arr, array("executiondate", "'".$issue_executiondate));\r
         \r
         $issue_domain =         $_POST['issue_domain'];\r
         array_push($update_arr, array("fk_domain", $issue_domain));\r
         \r
         $issue_project =        $_POST['issue_project'];\r
-        array_push($update_arr, array("fk_project", $issue_project));\r
+        if ($issue_project != 0) {\r
+            array_push($update_arr, array("fk_project", $issue_project));\r
+        }\r
         \r
         $issue_aufwand_h =      $_POST['issue_aufwand_h'];\r
+        $leading_zero = "";\r
+        if ($issue_aufwand_h < 10) {\r
+            $leading_zero = "0";\r
+        }\r
         $issue_aufwand_min =    $_POST['issue_aufwand_min'];\r
-        array_push($update_arr, array("effort", "'".$issue_aufwand_h.":".(15*$issue_aufwand_min).":00'"));\r
+        array_push($update_arr, array("effort", "'".$leading_zero.$issue_aufwand_h.":".(15*$issue_aufwand_min).":00'"));\r
         \r
         $issue_assignee =       $_POST['issue_assignee'];\r
         array_push($update_arr, array("fk_assignee", $issue_assignee));\r
@@ -71,16 +78,16 @@ if (isset($_POST)) {
         $sqlupdate = generateUpdateSchema("ticket", "dt_issue", $update_arr, array("id=".$issue));\r
         //echo $sqlupdate;\r
         $sqlupdate_result = getBooleanData($connect_dbms_handle, $sqlupdate);\r
-        //echo $sqlinsert_result;\r
+        //echo $sqlupdate_result;\r
         \r
         $sqllog = generateInsertSchema("ticket", "dt_sqllog", array("DEFAULT", "now()", "'".addslashes(str_replace("'", "\"", $sqlupdate))."'", $current_user, "'".uniqid()."'", "'".$page."'"));\r
         $sqllog_result = getBooleanData($connect_dbms_handle, $sqllog);\r
         //echo $sqllog_result;\r
         \r
-        $issue_arr = getData($connect_dbms_handle, generateSelect(array("*"), "ticket.view_issue", array("id=".$issue), null));\r
+        $issue_arr = getData($connect_dbms_handle, generateSelectWhereOrder(array("*"), "ticket.view_issue", array("id=".$issue), null));\r
         //var_dump($issue_arr);\r
         \r
-        $comments_arr = getData($connect_dbms_handle, generateSelect(array("*"), "ticket.view_comments_users", array("fk_issue_of_comment=".$issue), array("erstellt asc")));\r
+        $comments_arr = getData($connect_dbms_handle, generateSelectWhereOrder(array("*"), "ticket.view_comments_users", array("fk_issue_of_comment=".$issue), array("erstellt asc")));\r
         //var_dump($comments_arr);\r
     } else if (isset($_POST['comment'])) {\r
         var_dump($_POST);\r
@@ -98,10 +105,10 @@ if (isset($_POST)) {
         $sqllog_result = getBooleanData($connect_dbms_handle, $sqllog);\r
         //echo $sqllog_result;\r
         \r
-        $issue_arr = getData($connect_dbms_handle, generateSelect(array("*"), "ticket.view_issue", array("id=".$issue), null));\r
+        $issue_arr = getData($connect_dbms_handle, generateSelectWhereOrder(array("*"), "ticket.view_issue", array("id=".$issue), null));\r
         //var_dump($issue_arr);\r
         \r
-        $comments_arr = getData($connect_dbms_handle, generateSelect(array("*"), "ticket.view_comments_users", array("fk_issue_of_comment=".$issue), array("erstellt asc")));\r
+        $comments_arr = getData($connect_dbms_handle, generateSelectWhereOrder(array("*"), "ticket.view_comments_users", array("fk_issue_of_comment=".$issue), array("erstellt asc")));\r
         //var_dump($comments_arr);\r
     }\r
 } else {\r

diff --git a/ticket-web/src/webui/lib/database_functions.php b/ticket-web/src/webui/lib/database_functions.php
index d5c0b99a181d00247063eb1b45c3e593703ae198..d82bccc83188208fb718c7658a1b15ca9b890806 100644 (file)
--- a/ticket-web/src/webui/lib/database_functions.php
+++ b/ticket-web/src/webui/lib/database_functions.php
@@ -31,9 +31,9 @@ function getProjectNameOfIssue($connect_dbms_handle, $id) {
     
     $project = "";
     
-    $fk_project = getData($connect_dbms_handle, generateSelect(array("fk_project"), "ticket.dt_issue", array("id=".$id), null));
+    $fk_project = getData($connect_dbms_handle, generateSelectWhereOrder(array("fk_project"), "ticket.dt_issue", array("id=".$id), null));
     if ($fk_project[0][0] != null ) {
-        $project_arr = getData($connect_dbms_handle, generateSelect(array("name_project"), "ticket.dt_project", array("id=".$fk_project[0][0]), null));
+        $project_arr = getData($connect_dbms_handle, generateSelectWhereOrder(array("name_project"), "ticket.dt_project", array("id=".$fk_project[0][0]), null));
         $project = $project_arr[0][0];
     }
     return $project;
@@ -45,7 +45,7 @@ function getProjectNameOfIssue($connect_dbms_handle, $id) {
  */
 function getDomainIdOfIssue($connect_dbms_handle, $id) {
     
-    $fk_domain = getData($connect_dbms_handle, generateSelect(array("fk_domain"), "ticket.dt_issue", array("id=".$id), null));
+    $fk_domain = getData($connect_dbms_handle, generateSelectWhereOrder(array("fk_domain"), "ticket.dt_issue", array("id=".$id), null));
     if ($fk_domain[0][0] == null ) {
         return 0;
     }
@@ -58,7 +58,7 @@ function getDomainIdOfIssue($connect_dbms_handle, $id) {
  */
 function getProjectIdOfIssue($connect_dbms_handle, $id) {
     
-    $fk_project = getData($connect_dbms_handle, generateSelect(array("fk_project"), "ticket.dt_issue", array("id=".$id), null));
+    $fk_project = getData($connect_dbms_handle, generateSelectWhereOrder(array("fk_project"), "ticket.dt_issue", array("id=".$id), null));
     if ($fk_project[0][0] == null ) {
         return 0;
     }
@@ -73,7 +73,7 @@ function getIssueOfProject($connect_dbms_handle, $project) {
     
     $where_clause = "";
     
-    $issue_ids = getData($connect_dbms_handle, generateSelect(array("id"), "ticket.dt_issue", array("fk_project=".$project), null));
+    $issue_ids = getData($connect_dbms_handle, generateSelectWhereOrder(array("id"), "ticket.dt_issue", array("fk_project=".$project), null));
     if ($issue_ids[0][0] == null ) {
         return 0;
     } else {
@@ -82,7 +82,7 @@ function getIssueOfProject($connect_dbms_handle, $project) {
             $where_clause .= $issue_id[0].", ";
         }
         $where_clause = "id in (".substr($where_clause, 0, strlen($where_clause)-2).")";
-        $issues = getData($connect_dbms_handle, generateSelect(array("*"), "ticket.view_todo_short_overview", array($where_clause), null));
+        $issues = getData($connect_dbms_handle, generateSelectWhereOrder(array("*"), "ticket.view_todo_short_overview", array($where_clause), null));
         
     }
     return $issues;
@@ -96,7 +96,7 @@ function getIssueOfDomain($connect_dbms_handle, $domain) {
     
     $where_clause = "";
     
-    $issue_ids = getData($connect_dbms_handle, generateSelect(array("id"), "ticket.dt_issue", array("fk_domain=".$domain), null));
+    $issue_ids = getData($connect_dbms_handle, generateSelectWhereOrder(array("id"), "ticket.dt_issue", array("fk_domain=".$domain), null));
     if ($issue_ids[0][0] == null ) {
         return 0;
     } else {
@@ -105,7 +105,7 @@ function getIssueOfDomain($connect_dbms_handle, $domain) {
             $where_clause .= $issue_id[0].", ";
         }
         $where_clause = "id in (".substr($where_clause, 0, strlen($where_clause)-2).")";
-        $issues = getData($connect_dbms_handle, generateSelect(array("*"), "ticket.view_todo_short_overview", array($where_clause), null));
+        $issues = getData($connect_dbms_handle, generateSelectWhereOrder(array("*"), "ticket.view_todo_short_overview", array($where_clause), null));
         
     }
     return $issues;
@@ -117,7 +117,7 @@ function getIssueOfDomain($connect_dbms_handle, $domain) {
  */
 function getAssigneeIdOfIssue($connect_dbms_handle, $id) {
     
-    $fk_project = getData($connect_dbms_handle, generateSelect(array("fk_assignee"), "ticket.dt_issue", array("id=".$id), null));
+    $fk_project = getData($connect_dbms_handle, generateSelectWhereOrder(array("fk_assignee"), "ticket.dt_issue", array("id=".$id), null));
     if ($fk_project[0][0] == null ) {
         return 0;
     }

diff --git a/ticket-web/src/webui/lib/db/database_functions_select.php b/ticket-web/src/webui/lib/db/database_functions_select.php
index 2f65c4607e7a6768a8d4cfd7803eed8eb0133225..fa8e18a4f600203414d97585acab72fbeb6dbaeb 100644 (file)
--- a/ticket-web/src/webui/lib/db/database_functions_select.php
+++ b/ticket-web/src/webui/lib/db/database_functions_select.php
@@ -15,7 +15,7 @@ function generateSelect ($selectedFields, $table) {
            $select_str .= "*";
        }
        
-       $select_str .= " FROM ".SCHEMA.".".$table;
+       $select_str .= " FROM ".$table;
        
        $select_str .= ";";
 
@@ -40,7 +40,7 @@ function generateSelectWhereOrder ($selectedFields, $table, $whereClause, $order
            $select_str .= "*";
        }
 
-       $select_str .= " FROM ".SCHEMA.".".$table;
+       $select_str .= " FROM ".$table;
 
        if ($whereClause != null) {
                $select_str .= " WHERE ";

diff --git a/ticket-web/src/webui/lib/gui_functions.php b/ticket-web/src/webui/lib/gui_functions.php
index a8c94681eefe1b294ce9ae9482d9eb053116d4ac..908aa9cdcad538afe898d515d8431c8605457c43 100644 (file)
--- a/ticket-web/src/webui/lib/gui_functions.php
+++ b/ticket-web/src/webui/lib/gui_functions.php
@@ -37,6 +37,7 @@ function getIssuebox ($ref_issue, $connect_dbms_handle, $ref_stati_arr, $ref_pag
     if (strtotime($datum_data) != strtotime("31.12.9999 00:00:00")) {
         if ((date("U", strtotime($datum_data))+date("Z")) % 86400 == 0) {
             $datum      = date("o-m-d", strtotime($datum_data));
+            $datum_zeit = null;
         } else {
             $datum      = date("o-m-d", strtotime($datum_data));
             $datum_zeit = date("H:i:s", strtotime($datum_data));

diff --git a/ticket-web/src/webui/lib/header.php b/ticket-web/src/webui/lib/header.php
index 4fbdfbc97a3c9382e94848423c8a59d6c7dcc1f6..6723dc48db5dfd17b508874478ff5db087fa7621 100644 (file)
--- a/ticket-web/src/webui/lib/header.php
+++ b/ticket-web/src/webui/lib/header.php
@@ -3,6 +3,7 @@
 $connect_dbms_handle = getDBConnection();\r
 \r
 $current_user=1;\r
+\r
 ?>\r
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\r
 <html xmlns="http://www.w3.org/1999/xhtml" lang="de">\r

diff --git a/ticket-web/src/webui/lib/util/util_functions.php b/ticket-web/src/webui/lib/util/util_functions.php
index 6c3bbb0c12e73c5282152463401c87d209a22e60..790402ed301959a8781912a71cc80ac60b5ee94b 100644 (file)
--- a/ticket-web/src/webui/lib/util/util_functions.php
+++ b/ticket-web/src/webui/lib/util/util_functions.php
@@ -68,7 +68,7 @@ function checkDeadlineAfterExecutionDate ($newissue_executiondate, $newissue_dea
     return true;
 }
 
-function handleQuickUpdate ($ref_POST, $connect_dbms_handle) {
+function handleQuickUpdate ($ref_POST, $connect_dbms_handle, $current_user) {
     $update_arr = array();
     $issue = 0;
     
@@ -94,7 +94,7 @@ function handleQuickUpdate ($ref_POST, $connect_dbms_handle) {
     if ($issue_executiondate_time == "00:00:00" || $issue_executiondate_time == "") {
         $issue_executiondate_time = "00:00:00";
     } else {
-        $issue_executiondate_time .= ":00";
+        //$issue_executiondate_time .= ":00";
     }
     $issue_executiondate = $issue_executiondate_date." ".$issue_executiondate_time;
     //echo $issue_executiondate;