From: Ole B. Rosentreter <ole@laktatnebel.de>
Date: Thu, 14 Aug 2025 10:49:38 +0000 (+0200)
Subject: https://ticket.laktatnebel.de/issue.php?issuedetail=160
X-Git-Url: https://git.laktatnebel.de/?a=commitdiff_plain;ds=sidebyside;p=ticket.git

https://ticket.laktatnebel.de/issue.php?issuedetail=160
---

diff --git a/ticket-db/schema.sql b/ticket-db/schema.sql
index 0bcdc3d..b108784 100644
--- a/ticket-db/schema.sql
+++ b/ticket-db/schema.sql
@@ -307,7 +307,7 @@ select
 from
 	view_relationships vr
 where
-	vr.relation_target_status not in ('abgeschlossen')
+	vr.relation_target_status not in ('abgeschlossen', 'verworfen')
 	and
 	vr.name_relation_type in ('abhängig von');
 
@@ -359,7 +359,7 @@ where
 		from
 			dt_status
 		where
-			name_status = 'abgeschlossen'
+			name_status in ('abgeschlossen', 'verworfen')
 	)
 order by
 	di.deadline asc,
@@ -374,7 +374,7 @@ select
 	dd.name_domain as domain,
 	di.titel as issue,
 	di.deadline as bis_wann,
-	di.importance as wichtigkeit,
+	di.importance as wichtigkeit,s
 	di.urgency as dringlichkeit,
 	di.importance * di.urgency as bewertung,
 	di.effort as aufwand,
@@ -395,7 +395,7 @@ where
 		from
 			dt_status
 		where
-			name_status = 'abgeschlossen'
+			name_status in ('abgeschlossen', 'verworfen')
 	)
 order by
 	di.deadline asc,
diff --git a/ticket-web/src/ticket_glob_vars.php b/ticket-web/src/ticket_glob_vars.php
index 3dc679a..7f0ce1b 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 71f8963..5ca9549 100644
--- a/ticket-web/src/webui/domain.php
+++ b/ticket-web/src/webui/domain.php
@@ -32,7 +32,6 @@ $stati_arr = getData($connect_dbms_handle, $selectFromDtStatus);
 
 ?>
 
-<a href="newissue.php">neues Ticket</a> | <a href="index.php">alle Tickets</a>
 <div class="container">
 <?php
 foreach ($issues as $issue) {
diff --git a/ticket-web/src/webui/index.php b/ticket-web/src/webui/index.php
index ab1130d..e5fe1ab 100755
--- a/ticket-web/src/webui/index.php
+++ b/ticket-web/src/webui/index.php
@@ -22,7 +22,6 @@ $issues = getData($connect_dbms_handle, $selectFromViewTodoShortOverview);
 $stati_arr = getData($connect_dbms_handle, $selectFromDtStatus);
 
 ?>
-<a href="newissue.php">neues Ticket</a> | <a href="index.php">alle Tickets</a>
 <div class="container">
 <?php
 foreach ($issues as $issue) {
diff --git a/ticket-web/src/webui/issue.php b/ticket-web/src/webui/issue.php
index ea12706..fc1b931 100644
--- a/ticket-web/src/webui/issue.php
+++ b/ticket-web/src/webui/issue.php
@@ -129,7 +129,6 @@ $stati_arr = getData($connect_dbms_handle, $selectFromDtStatus);
 $issue_btn = $issue;
 ?>
 
-<a href="newissue.php">neues Ticket</a> | <a href="index.php">alle Tickets</a>
 <form action="issue.php" method="post" name="editissue">
 <div class="singleissue">
 <?php
diff --git a/ticket-web/src/webui/lib/database_functions.php b/ticket-web/src/webui/lib/database_functions.php
index d82bccc..499e049 100644
--- a/ticket-web/src/webui/lib/database_functions.php
+++ b/ticket-web/src/webui/lib/database_functions.php
@@ -13,15 +13,15 @@ require ("db/database_functions_delete.php");
 
 $selectFromViewTodoShortOverview = "SELECT * FROM ticket.view_todo_short_overview;";
 
-$selectFromDtStatus = "SELECT * FROM ticket.dt_status;";
+$selectFromDtStatus = "SELECT * FROM ticket.dt_status ORDER BY id desc;";
 
 $selectFromDtUser = "SELECT * FROM ticket.dt_user;";
 
 $selectFromDtUserWithNames = "SELECT id, name_user FROM ticket.dt_user;";
 
-$selectFromDtProject = "SELECT * FROM ticket.dt_project;";
+$selectFromDtProject = "SELECT * FROM ticket.dt_project ORDER BY name_project;";
 
-$selectFromDtDomain = "SELECT * FROM ticket.dt_domain;";
+$selectFromDtDomain = "SELECT * FROM ticket.dt_domain ORDER BY name_domain;";
 
 /**
  * @param connect_dbms_handle
@@ -124,4 +124,13 @@ function getAssigneeIdOfIssue($connect_dbms_handle, $id) {
     return $fk_project[0][0];
 }
 
+function doTheDatabaseJob($connect_dbms_handle, $ref_table, $insertArray) {
+    $sqlinsert = generateInsertSchema(SCHEMA, $ref_table, $insertArray);
+    $sqlinsert_result = getBooleanData($connect_dbms_handle, $sqlinsert);
+    
+    $sqllog = generateInsertSchema(SCHEMA, "dt_sqllog", array("DEFAULT", "now()", "'".addslashes(str_replace("'", "\"", $sqlinsert))."'", $current_user, "'".uniqid()."'", "'".$page."'"));
+    $sqllog_result = getBooleanData($connect_dbms_handle, $sqllog);
+}
+
+
 ?>
\ No newline at end of file
diff --git a/ticket-web/src/webui/lib/header.php b/ticket-web/src/webui/lib/header.php
index 6723dc4..06b6214 100644
--- a/ticket-web/src/webui/lib/header.php
+++ b/ticket-web/src/webui/lib/header.php
@@ -17,4 +17,8 @@ $current_user=1;
 <link rel="stylesheet" href="stylesheet/ticket_main.css" type="text/css" media="screen, projection\" />
 </head>
 
-<body>
\ No newline at end of file
+<body>
+<a href="index.php">alle Tickets</a> | <a href="newissue.php">neues Ticket</a> | <a href="new.php">Domain, Projekt, Status neu ...</a>
+
+
+
diff --git a/ticket-web/src/webui/new.php b/ticket-web/src/webui/new.php
new file mode 100644
index 0000000..f93aa01
--- /dev/null
+++ b/ticket-web/src/webui/new.php
@@ -0,0 +1,171 @@
+<?php require_once '../ticket_glob_vars.php'; ?>
+<?php require_once 'lib/database_functions.php'; ?>
+<?php require_once 'lib/gui_functions.php'; ?>
+<?php require_once 'lib/util_functions.php'; ?>
+<?php
+$page = 'new.php';
+
+require_once 'lib/header.php';
+
+if (isset($_POST)) {
+    if (isset($_POST['newdomain_save'])) {
+        //var_dump($_POST);
+        
+        $newdomain_titel = $_POST['newdomain_titel'];
+        
+        if ( strlen($newdomain_titel) > 1 ) {
+            
+            $insertArray = array("DEFAULT",
+                "'".htmlentities($newdomain_titel)."'"
+            );
+            
+            doTheDatabaseJob($connect_dbms_handle, "dt_domain", $insertArray);
+            
+        } else {
+            echo "unzulässige Eingaben!";
+        }
+    } elseif (isset($_POST['newproject_save'])) {
+        //var_dump($_POST);
+        
+        $newproject_titel = $_POST['newproject_titel'];
+        $newproject_domain = $_POST['newproject_domain'];
+        
+        if ( strlen($newproject_titel) > 3 ) {
+            
+            $insertArray = array("DEFAULT",
+                "'".htmlentities($newproject_titel)."'",
+                htmlentities($newproject_domain)
+            );
+            
+            doTheDatabaseJob($connect_dbms_handle, "dt_project", $insertArray);
+            
+        } else {
+            echo "unzulässige Eingaben!";
+        }
+    } elseif (isset($_POST['newstatus_save'])) {
+        //var_dump($_POST);
+        
+        $newstatus_titel = $_POST['newstatus_titel'];
+        
+        if ( strlen($newstatus_titel) > 2 ) {
+            
+            $insertArray = array("DEFAULT",
+                "'".htmlentities($newstatus_titel)."'"
+            );
+            
+            doTheDatabaseJob($connect_dbms_handle, "dt_status", $insertArray);
+            
+        } else {
+            echo "unzulässige Eingaben!";
+        }
+    }
+}
+
+$project_arr = getData($connect_dbms_handle, $selectFromDtProject);
+
+$domain_arr = getData($connect_dbms_handle, $selectFromDtDomain);
+
+$stati_arr = getData($connect_dbms_handle, $selectFromDtStatus);
+
+?>
+<!-- DOMAIN -->
+<form action="new.php" method="post" name="newdomain">
+<div class="singleissue">
+<div class="boxelem headline col2">
+
+<?php
+// titel
+makeInput("newdomain_titel", null, null, "inputbtn", null, "text", 100, 250, null, true, "Domain", false, true, 0);
+?>
+</div>
+
+<div class="boxelem center col2">
+<div class="boxelem">
+aktive Domains:
+<ul class="infolist">
+<?php
+foreach ($domain_arr as $domain) {
+    echo "<li>".$domain[1]."</li>\n";
+}
+?>
+</ul>
+</div>
+</div>
+</div>
+<?php
+makeButton("newdomain_save", "newdomain_save", "jetzt speichern!", null, "btn", null, "submit", null, null, false, false, 0);
+makeButton("newdomain_reset", "newdomain_reset", "abbrechen", null, "btn", null, "reset", null, null, false, false, 0);
+?>
+</form>
+
+<!-- PROJECT -->
+<form action="new.php" method="post" name="newproject">
+<div class="singleissue">
+<div class="boxelem headline col2">
+
+<?php
+// titel
+makeInput("newproject_titel", null, null, "inputbtn", null, "text", 100, 250, null, true, "Projekt", false, true, 0);
+?>
+</div>
+
+<div class="boxelem center col2">
+<div class="boxelem">
+<?php
+//fk_project
+makeSelect("newproject_domain", $domain_arr, null, "selectbtn", null, 0, 0, null, false, 1, null, true, "Domain: ", false, false, 0);
+?>
+</div>
+<div class="boxelem">
+aktive Projekte:
+<ul class="infolist">
+<?php
+foreach ($project_arr as $project) {
+    echo "<li>".$project[1]."</li>\n";
+}
+?>
+</ul>
+</div>
+</div>
+</div>
+<?php
+makeButton("newproject_save", "newproject_save", "jetzt speichern!", null, "btn", null, "submit", null, null, false, false, 0);
+makeButton("newproject_reset", "newproject_reset", "abbrechen", null, "btn", null, "reset", null, null, false, false, 0);
+?>
+</form>
+
+<!-- STATUS -->
+<form action="new.php" method="post" name="newstatus">
+<div class="singleissue">
+<div class="boxelem headline col2">
+
+<?php
+// titel
+makeInput("newstatus_titel", null, null, "inputbtn", null, "text", 100, 250, null, true, "Status", false, true, 0);
+?>
+</div>
+
+<div class="boxelem center col2">
+<div class="boxelem">
+aktive Stati:
+<ul class="infolist">
+<?php
+foreach ($stati_arr as $status) {
+    echo "<li>".$status[1]."</li>\n";
+}
+?>
+</ul>
+</div>
+</div>
+</div>
+<?php
+makeButton("newstatus_save", "newstatus_save", "jetzt speichern!", null, "btn", null, "submit", null, null, false, false, 0);
+makeButton("newstatus_reset", "newstatus_reset", "abbrechen", null, "btn", null, "reset", null, null, false, false, 0);
+?>
+</form>
+</body>
+</html>
+<?php
+closeDBConnection ( $connect_dbms_handle );
+
+?>
\ No newline at end of file
diff --git a/ticket-web/src/webui/newissue.php b/ticket-web/src/webui/newissue.php
index 90e830d..e0a9cb7 100644
--- a/ticket-web/src/webui/newissue.php
+++ b/ticket-web/src/webui/newissue.php
@@ -109,7 +109,6 @@ if (isset($_POST)) {
     }
 }
 ?>
-<a href="index.php">alle Tickets</a>
 <form action="newissue.php" method="post" name="newissue">
 <div class="singleissue">
 
@@ -222,10 +221,13 @@ makeTextarea("newissue_comment", null, null, "inputbtn", null, null, null, 100,
 </div>
 
 </div>
+</div>
+
 <?php
 makeButton("newissue_save", "newissue_save", "jetzt speichern!", null, "btn", null, "submit", null, null, false, false, 0);
 makeButton("newissue_reset", "newissue_reset", "abbrechen", null, "btn", null, "reset", null, null, false, false, 0);
 ?>
+
 </form>
 </body>
 </html>
diff --git a/ticket-web/src/webui/project.php b/ticket-web/src/webui/project.php
index 451d635..3b1f154 100644
--- a/ticket-web/src/webui/project.php
+++ b/ticket-web/src/webui/project.php
@@ -32,7 +32,6 @@ $stati_arr = getData($connect_dbms_handle, $selectFromDtStatus);
 
 ?>
 
-<a href="newissue.php">neues Ticket</a> | <a href="index.php">alle Tickets</a>
 <div class="container">
 <?php
 foreach ($issues as $issue) {
diff --git a/ticket-web/src/webui/stylesheet/ticket_main.css b/ticket-web/src/webui/stylesheet/ticket_main.css
index 73b0503..3edeb32 100644
--- a/ticket-web/src/webui/stylesheet/ticket_main.css
+++ b/ticket-web/src/webui/stylesheet/ticket_main.css
@@ -86,6 +86,14 @@ body {
 	text-align: right;
 }
 
+.infolist {
+	list-style-type: none;
+}
+
+.infolist LI {
+	list-style-type: none;
+}
+
 .inputbtn {
   border: 1px solid #000000;
   background-color: #eeeeee;