From 38ee93570406f7001331141e6dc4f918d6353515 Mon Sep 17 00:00:00 2001 From: "Ole B. Rosentreter" Date: Fri, 14 Feb 2025 18:40:00 +0100 Subject: [PATCH] =?utf8?q?Bugfixes=20f=C3=BCr=20PHP=20Web-UI=20....?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- ticket-web/src/ticket_glob_vars.php | 2 +- ticket-web/src/webui/domain.php | 2 +- ticket-web/src/webui/index.php | 2 +- ticket-web/src/webui/issue.php | 27 ++++++++++++------- .../src/webui/lib/database_functions.php | 18 ++++++------- .../lib/db/database_functions_select.php | 4 +-- ticket-web/src/webui/lib/gui_functions.php | 1 + ticket-web/src/webui/lib/header.php | 1 + .../src/webui/lib/util/util_functions.php | 4 +-- 9 files changed, 35 insertions(+), 26 deletions(-) diff --git a/ticket-web/src/ticket_glob_vars.php b/ticket-web/src/ticket_glob_vars.php index 7f0ce1b..3dc679a 100755 --- 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 c8182ed..cef7b48 100644 --- a/ticket-web/src/webui/domain.php +++ b/ticket-web/src/webui/domain.php @@ -11,7 +11,7 @@ require_once 'lib/header.php'; if (isset($_POST) && count(array_keys($_POST)) > 0) { - $issue = handleQuickUpdate($_POST, $connect_dbms_handle); + $issue = handleQuickUpdate($_POST, $connect_dbms_handle, $current_user); //echo $issue; $domain = getDomainIdOfIssue($connect_dbms_handle, $issue); //echo $domain; diff --git a/ticket-web/src/webui/index.php b/ticket-web/src/webui/index.php index 0c5b518..065d020 100755 --- a/ticket-web/src/webui/index.php +++ b/ticket-web/src/webui/index.php @@ -13,7 +13,7 @@ require_once 'lib/header.php'; if (isset($_POST) && count(array_keys($_POST)) > 0) { - handleQuickUpdate($_POST, $connect_dbms_handle); + handleQuickUpdate($_POST, $connect_dbms_handle, $current_user); } diff --git a/ticket-web/src/webui/issue.php b/ticket-web/src/webui/issue.php index 0e409af..5287806 100644 --- a/ticket-web/src/webui/issue.php +++ b/ticket-web/src/webui/issue.php @@ -16,10 +16,10 @@ if (isset($_GET)) { //var_dump($_GET); $issue = $_GET['issuedetail']; - $issue_arr = getData($connect_dbms_handle, generateSelect(array("*"), "ticket.view_issue", array("id=".$issue), null)); + $issue_arr = getData($connect_dbms_handle, generateSelectWhereOrder(array("*"), "ticket.view_issue", array("id=".$issue), null)); //var_dump($issue_arr); - $comments_arr = getData($connect_dbms_handle, generateSelect(array("*"), "ticket.view_comments_users", array("fk_issue_of_comment=".$issue), array("erstellt asc"))); + $comments_arr = getData($connect_dbms_handle, generateSelectWhereOrder(array("*"), "ticket.view_comments_users", array("fk_issue_of_comment=".$issue), array("erstellt asc"))); //var_dump($comments_arr); } } @@ -31,6 +31,7 @@ if (isset($_POST)) { $issue = $change[1]; //echo $issue; + //var_dump($_POST); $update_arr = array(); $issue_deadline = $_POST['issue_deadline']; @@ -41,18 +42,24 @@ if (isset($_POST)) { $issue_executiondate_date = $_POST['issue_executiondate']; $issue_executiondate_time = $_POST['issue_executiondate_time']; $issue_executiondate = $issue_executiondate_date." "; - $issue_executiondate .= ($issue_executiondate_time == "" ? " 00:00" : $issue_executiondate_time).":00'"; + $issue_executiondate .= ($issue_executiondate_time == "" ? " 00:00" : $issue_executiondate_time)."'"; array_push($update_arr, array("executiondate", "'".$issue_executiondate)); $issue_domain = $_POST['issue_domain']; array_push($update_arr, array("fk_domain", $issue_domain)); $issue_project = $_POST['issue_project']; - array_push($update_arr, array("fk_project", $issue_project)); + if ($issue_project != 0) { + array_push($update_arr, array("fk_project", $issue_project)); + } $issue_aufwand_h = $_POST['issue_aufwand_h']; + $leading_zero = ""; + if ($issue_aufwand_h < 10) { + $leading_zero = "0"; + } $issue_aufwand_min = $_POST['issue_aufwand_min']; - array_push($update_arr, array("effort", "'".$issue_aufwand_h.":".(15*$issue_aufwand_min).":00'")); + array_push($update_arr, array("effort", "'".$leading_zero.$issue_aufwand_h.":".(15*$issue_aufwand_min).":00'")); $issue_assignee = $_POST['issue_assignee']; array_push($update_arr, array("fk_assignee", $issue_assignee)); @@ -71,16 +78,16 @@ if (isset($_POST)) { $sqlupdate = generateUpdateSchema("ticket", "dt_issue", $update_arr, array("id=".$issue)); //echo $sqlupdate; $sqlupdate_result = getBooleanData($connect_dbms_handle, $sqlupdate); - //echo $sqlinsert_result; + //echo $sqlupdate_result; $sqllog = generateInsertSchema("ticket", "dt_sqllog", array("DEFAULT", "now()", "'".addslashes(str_replace("'", "\"", $sqlupdate))."'", $current_user, "'".uniqid()."'", "'".$page."'")); $sqllog_result = getBooleanData($connect_dbms_handle, $sqllog); //echo $sqllog_result; - $issue_arr = getData($connect_dbms_handle, generateSelect(array("*"), "ticket.view_issue", array("id=".$issue), null)); + $issue_arr = getData($connect_dbms_handle, generateSelectWhereOrder(array("*"), "ticket.view_issue", array("id=".$issue), null)); //var_dump($issue_arr); - $comments_arr = getData($connect_dbms_handle, generateSelect(array("*"), "ticket.view_comments_users", array("fk_issue_of_comment=".$issue), array("erstellt asc"))); + $comments_arr = getData($connect_dbms_handle, generateSelectWhereOrder(array("*"), "ticket.view_comments_users", array("fk_issue_of_comment=".$issue), array("erstellt asc"))); //var_dump($comments_arr); } else if (isset($_POST['comment'])) { var_dump($_POST); @@ -98,10 +105,10 @@ if (isset($_POST)) { $sqllog_result = getBooleanData($connect_dbms_handle, $sqllog); //echo $sqllog_result; - $issue_arr = getData($connect_dbms_handle, generateSelect(array("*"), "ticket.view_issue", array("id=".$issue), null)); + $issue_arr = getData($connect_dbms_handle, generateSelectWhereOrder(array("*"), "ticket.view_issue", array("id=".$issue), null)); //var_dump($issue_arr); - $comments_arr = getData($connect_dbms_handle, generateSelect(array("*"), "ticket.view_comments_users", array("fk_issue_of_comment=".$issue), array("erstellt asc"))); + $comments_arr = getData($connect_dbms_handle, generateSelectWhereOrder(array("*"), "ticket.view_comments_users", array("fk_issue_of_comment=".$issue), array("erstellt asc"))); //var_dump($comments_arr); } } else { diff --git a/ticket-web/src/webui/lib/database_functions.php b/ticket-web/src/webui/lib/database_functions.php index d5c0b99..d82bccc 100644 --- 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 2f65c46..fa8e18a 100644 --- 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 a8c9468..908aa9c 100644 --- 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 4fbdfbc..6723dc4 100644 --- a/ticket-web/src/webui/lib/header.php +++ b/ticket-web/src/webui/lib/header.php @@ -3,6 +3,7 @@ $connect_dbms_handle = getDBConnection(); $current_user=1; + ?> diff --git a/ticket-web/src/webui/lib/util/util_functions.php b/ticket-web/src/webui/lib/util/util_functions.php index 6c3bbb0..790402e 100644 --- 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; -- 2.39.5