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

diff --git a/ticket-db/schema.sql b/ticket-db/schema.sql
index 0bcdc3d861d75d6f830a080a726b8902a3fabc82..b10878413c750dbb0104e2788b7996e6004683ac 100644 (file)
--- a/ticket-db/schema.sql
+++ b/ticket-db/schema.sql
@@ -307,7 +307,7 @@ select
 from
        view_relationships vr
 where
 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');
 
        and
        vr.name_relation_type in ('abhängig von');
 


@@ -359,7 +359,7 @@ where
                from
                        dt_status
                where
                from
                        dt_status
                where

-                       name_status = 'abgeschlossen'
+                       name_status in ('abgeschlossen', 'verworfen')

        )
 order by
        di.deadline asc,
        )
 order by
        di.deadline asc,


@@ -374,7 +374,7 @@ select
        dd.name_domain as domain,
        di.titel as issue,
        di.deadline as bis_wann,
        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,
        di.urgency as dringlichkeit,
        di.importance * di.urgency as bewertung,
        di.effort as aufwand,


@@ -395,7 +395,7 @@ where
                from
                        dt_status
                where
                from
                        dt_status
                where

-                       name_status = 'abgeschlossen'
+                       name_status in ('abgeschlossen', 'verworfen')

        )
 order by
        di.deadline asc,
        )
 order by
        di.deadline asc,

diff --git a/ticket-web/src/ticket_glob_vars.php b/ticket-web/src/ticket_glob_vars.php
index 3dc679aa1a7575ea737cd74926250caf21e1d470..7f0ce1b0a56dd7fe52075b6cd32c48e41689891b 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 ("HOST", "localhost");

-//define ("SCHEMA", "ticket");
+define ("SCHEMA", "ticket");

 define ("DB", "tickets");
 //define ("USER", "postgres");
 define ("USER", "oleb");
 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 71f8963e38e52777abfaabc4328f37db3da7df20..5ca9549714aaf2a87620e76c875451e6207cf0ba 100644 (file)
--- 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);
 \r
 ?>\r
 \r
 \r
 ?>\r
 \r

-<a href="newissue.php">neues Ticket</a> | <a href="index.php">alle Tickets</a>\r

 <div class="container">\r
 <?php\r
 foreach ($issues as $issue) {\r
 <div class="container">\r
 <?php\r
 foreach ($issues as $issue) {\r

diff --git a/ticket-web/src/webui/index.php b/ticket-web/src/webui/index.php
index ab1130d9ce2f05a86304794e199a93f851a0b7e3..e5fe1ab40d3da7c15467232353d3f330bc9bea6a 100755 (executable)
--- 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);\r
 \r
 ?>\r
 $stati_arr = getData($connect_dbms_handle, $selectFromDtStatus);\r
 \r
 ?>\r

-<a href="newissue.php">neues Ticket</a> | <a href="index.php">alle Tickets</a>\r

 <div class="container">\r
 <?php\r
 foreach ($issues as $issue) {\r
 <div class="container">\r
 <?php\r
 foreach ($issues as $issue) {\r

diff --git a/ticket-web/src/webui/issue.php b/ticket-web/src/webui/issue.php
index ea127061e2b1dab1c7fe36af5d6f995d5ca064b2..fc1b931bece4933e4df4272057236a50ea8dff71 100644 (file)
--- 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;\r
 ?>\r
 \r
 $issue_btn = $issue;\r
 ?>\r
 \r

-<a href="newissue.php">neues Ticket</a> | <a href="index.php">alle Tickets</a>\r

 <form action="issue.php" method="post" name="editissue">\r
 <div class="singleissue">\r
 <?php\r
 <form action="issue.php" method="post" name="editissue">\r
 <div class="singleissue">\r
 <?php\r

diff --git a/ticket-web/src/webui/lib/database_functions.php b/ticket-web/src/webui/lib/database_functions.php
index d82bccc83188208fb718c7658a1b15ca9b890806..499e049d1f5088c9aace4992589d506538717cca 100644 (file)
--- 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;";
 
 
 $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;";
 
 
 $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
 
 /**
  * @param connect_dbms_handle


@@ -124,4 +124,13 @@ function getAssigneeIdOfIssue($connect_dbms_handle, $id) {
     return $fk_project[0][0];
 }
 
     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
 ?>
\ 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 6723dc48db5dfd17b508874478ff5db087fa7621..06b62140904b15b078632cccb7c21c62e8a7b468 100644 (file)
--- 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\" />\r
 </head>\r
 \r
 <link rel="stylesheet" href="stylesheet/ticket_main.css" type="text/css" media="screen, projection\" />\r
 </head>\r
 \r

-<body>
\ No newline at end of file
+<body>\r
+<a href="index.php">alle Tickets</a> | <a href="newissue.php">neues Ticket</a> | <a href="new.php">Domain, Projekt, Status neu ...</a>\r
+\r
+\r
+\r

diff --git a/ticket-web/src/webui/new.php b/ticket-web/src/webui/new.php
new file mode 100644 (file)
index 0000000..f93aa01
--- /dev/null
+++ b/ticket-web/src/webui/new.php
@@ -0,0 +1,171 @@
+<?php require_once '../ticket_glob_vars.php'; ?>\r
+<?php require_once 'lib/database_functions.php'; ?>\r
+<?php require_once 'lib/gui_functions.php'; ?>\r
+<?php require_once 'lib/util_functions.php'; ?>\r
+<?php\r
+$page = 'new.php';\r
+\r
+require_once 'lib/header.php';\r
+\r
+if (isset($_POST)) {\r
+    if (isset($_POST['newdomain_save'])) {\r
+        //var_dump($_POST);\r
+        \r
+        $newdomain_titel = $_POST['newdomain_titel'];\r
+        \r
+        if ( strlen($newdomain_titel) > 1 ) {\r
+            \r
+            $insertArray = array("DEFAULT",\r
+                "'".htmlentities($newdomain_titel)."'"\r
+            );\r
+            \r
+            doTheDatabaseJob($connect_dbms_handle, "dt_domain", $insertArray);\r
+            \r
+        } else {\r
+            echo "unzulässige Eingaben!";\r
+        }\r
+    } elseif (isset($_POST['newproject_save'])) {\r
+        //var_dump($_POST);\r
+        \r
+        $newproject_titel = $_POST['newproject_titel'];\r
+        $newproject_domain = $_POST['newproject_domain'];\r
+        \r
+        if ( strlen($newproject_titel) > 3 ) {\r
+            \r
+            $insertArray = array("DEFAULT",\r
+                "'".htmlentities($newproject_titel)."'",\r
+                htmlentities($newproject_domain)\r
+            );\r
+            \r
+            doTheDatabaseJob($connect_dbms_handle, "dt_project", $insertArray);\r
+            \r
+        } else {\r
+            echo "unzulässige Eingaben!";\r
+        }\r
+    } elseif (isset($_POST['newstatus_save'])) {\r
+        //var_dump($_POST);\r
+        \r
+        $newstatus_titel = $_POST['newstatus_titel'];\r
+        \r
+        if ( strlen($newstatus_titel) > 2 ) {\r
+            \r
+            $insertArray = array("DEFAULT",\r
+                "'".htmlentities($newstatus_titel)."'"\r
+            );\r
+            \r
+            doTheDatabaseJob($connect_dbms_handle, "dt_status", $insertArray);\r
+            \r
+        } else {\r
+            echo "unzulässige Eingaben!";\r
+        }\r
+    }\r
+}\r
+\r
+$project_arr = getData($connect_dbms_handle, $selectFromDtProject);\r
+\r
+$domain_arr = getData($connect_dbms_handle, $selectFromDtDomain);\r
+\r
+$stati_arr = getData($connect_dbms_handle, $selectFromDtStatus);\r
+\r
+?>\r
+<!-- DOMAIN -->\r
+<form action="new.php" method="post" name="newdomain">\r
+<div class="singleissue">\r
+<div class="boxelem headline col2">\r
+\r
+<?php\r
+// titel\r
+makeInput("newdomain_titel", null, null, "inputbtn", null, "text", 100, 250, null, true, "Domain", false, true, 0);\r
+?>\r
+</div>\r
+\r
+<div class="boxelem center col2">\r
+<div class="boxelem">\r
+aktive Domains:\r
+<ul class="infolist">\r
+<?php\r
+foreach ($domain_arr as $domain) {\r
+    echo "<li>".$domain[1]."</li>\n";\r
+}\r
+?>\r
+</ul>\r
+</div>\r
+</div>\r
+</div>\r
+<?php\r
+makeButton("newdomain_save", "newdomain_save", "jetzt speichern!", null, "btn", null, "submit", null, null, false, false, 0);\r
+makeButton("newdomain_reset", "newdomain_reset", "abbrechen", null, "btn", null, "reset", null, null, false, false, 0);\r
+?>\r
+</form>\r
+\r
+<!-- PROJECT -->\r
+<form action="new.php" method="post" name="newproject">\r
+<div class="singleissue">\r
+<div class="boxelem headline col2">\r
+\r
+<?php\r
+// titel\r
+makeInput("newproject_titel", null, null, "inputbtn", null, "text", 100, 250, null, true, "Projekt", false, true, 0);\r
+?>\r
+</div>\r
+\r
+<div class="boxelem center col2">\r
+<div class="boxelem">\r
+<?php\r
+//fk_project\r
+makeSelect("newproject_domain", $domain_arr, null, "selectbtn", null, 0, 0, null, false, 1, null, true, "Domain: ", false, false, 0);\r
+?>\r
+</div>\r
+<div class="boxelem">\r
+aktive Projekte:\r
+<ul class="infolist">\r
+<?php\r
+foreach ($project_arr as $project) {\r
+    echo "<li>".$project[1]."</li>\n";\r
+}\r
+?>\r
+</ul>\r
+</div>\r
+</div>\r
+</div>\r
+<?php\r
+makeButton("newproject_save", "newproject_save", "jetzt speichern!", null, "btn", null, "submit", null, null, false, false, 0);\r
+makeButton("newproject_reset", "newproject_reset", "abbrechen", null, "btn", null, "reset", null, null, false, false, 0);\r
+?>\r
+</form>\r
+\r
+<!-- STATUS -->\r
+<form action="new.php" method="post" name="newstatus">\r
+<div class="singleissue">\r
+<div class="boxelem headline col2">\r
+\r
+<?php\r
+// titel\r
+makeInput("newstatus_titel", null, null, "inputbtn", null, "text", 100, 250, null, true, "Status", false, true, 0);\r
+?>\r
+</div>\r
+\r
+<div class="boxelem center col2">\r
+<div class="boxelem">\r
+aktive Stati:\r
+<ul class="infolist">\r
+<?php\r
+foreach ($stati_arr as $status) {\r
+    echo "<li>".$status[1]."</li>\n";\r
+}\r
+?>\r
+</ul>\r
+</div>\r
+</div>\r
+</div>\r
+<?php\r
+makeButton("newstatus_save", "newstatus_save", "jetzt speichern!", null, "btn", null, "submit", null, null, false, false, 0);\r
+makeButton("newstatus_reset", "newstatus_reset", "abbrechen", null, "btn", null, "reset", null, null, false, false, 0);\r
+?>\r
+</form>\r
+</body>\r
+</html>\r
+<?php\r
+closeDBConnection ( $connect_dbms_handle );\r
+\r
+?>
\ No newline at end of file

diff --git a/ticket-web/src/webui/newissue.php b/ticket-web/src/webui/newissue.php
index 90e830dec25df39b11665ea6ed44cf77389baa42..e0a9cb7b4c2b7e9b317823d7da3ef5402d160108 100644 (file)
--- a/ticket-web/src/webui/newissue.php
+++ b/ticket-web/src/webui/newissue.php
@@ -109,7 +109,6 @@ if (isset($_POST)) {
     }\r
 }\r
 ?>\r
     }\r
 }\r
 ?>\r

-<a href="index.php">alle Tickets</a>\r

 <form action="newissue.php" method="post" name="newissue">\r
 <div class="singleissue">\r
 \r
 <form action="newissue.php" method="post" name="newissue">\r
 <div class="singleissue">\r
 \r


@@ -222,10 +221,13 @@ makeTextarea("newissue_comment", null, null, "inputbtn", null, null, null, 100,
 </div>\r
 \r
 </div>\r
 </div>\r
 \r
 </div>\r

+</div>\r
+\r

 <?php\r
 makeButton("newissue_save", "newissue_save", "jetzt speichern!", null, "btn", null, "submit", null, null, false, false, 0);\r
 makeButton("newissue_reset", "newissue_reset", "abbrechen", null, "btn", null, "reset", null, null, false, false, 0);\r
 ?>\r
 <?php\r
 makeButton("newissue_save", "newissue_save", "jetzt speichern!", null, "btn", null, "submit", null, null, false, false, 0);\r
 makeButton("newissue_reset", "newissue_reset", "abbrechen", null, "btn", null, "reset", null, null, false, false, 0);\r
 ?>\r

+\r

 </form>\r
 </body>\r
 </html>\r
 </form>\r
 </body>\r
 </html>\r

diff --git a/ticket-web/src/webui/project.php b/ticket-web/src/webui/project.php
index 451d635e7e1d2a01734b5eedca941fc0ced16a0d..3b1f154185110d34a1bb2811be4b56309a4b91e4 100644 (file)
--- 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);
 \r
 ?>\r
 \r
 \r
 ?>\r
 \r

-<a href="newissue.php">neues Ticket</a> | <a href="index.php">alle Tickets</a>\r

 <div class="container">\r
 <?php\r
 foreach ($issues as $issue) {\r
 <div class="container">\r
 <?php\r
 foreach ($issues as $issue) {\r

diff --git a/ticket-web/src/webui/stylesheet/ticket_main.css b/ticket-web/src/webui/stylesheet/ticket_main.css
index 73b0503878604764ba358eaf5238c21e6961201c..3edeb32ce8234c91869e293c4d4bb61cfa05305c 100644 (file)
--- 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;
 }
 
        text-align: right;
 }
 

+.infolist {
+       list-style-type: none;
+}
+
+.infolist LI {
+       list-style-type: none;
+}
+

 .inputbtn {
   border: 1px solid #000000;
   background-color: #eeeeee;
 .inputbtn {
   border: 1px solid #000000;
   background-color: #eeeeee;