From 434f9f8c1ce9759d2c6dd47be11ae169ee964adb Mon Sep 17 00:00:00 2001 From: "Ole B. Rosentreter" Date: Thu, 8 May 2025 19:10:00 +0200 Subject: [PATCH] Grundfunktionen fertig --- src/sql/airline.sql | 6 +- src/webui/flughafen.php | 181 +++++++++++++ src/webui/index.php | 86 +++--- src/webui/index2.php | 88 +++--- src/webui/index3.php | 78 ++++++ src/webui/lib/database_functions.php | 18 ++ src/webui/lib/db/database_functions_pgsql.php | 2 +- src/webui/lib/gui/gui_functions_checkbox.php | 26 +- src/webui/lib/gui_functions.php | 9 + src/webui/lib/util/util_functions.php | 181 ++++++++++++- src/webui/modelle.php | 250 ++++++++++++++++++ src/webui/strecken.php | 224 ++++++++++++++++ src/webui/stylesheet/airline_main.css | 181 +------------ 13 files changed, 1043 insertions(+), 287 deletions(-) create mode 100755 src/webui/flughafen.php create mode 100755 src/webui/index3.php create mode 100755 src/webui/modelle.php create mode 100755 src/webui/strecken.php diff --git a/src/sql/airline.sql b/src/sql/airline.sql index 92a4a6e..9e14361 100644 --- a/src/sql/airline.sql +++ b/src/sql/airline.sql @@ -12,15 +12,15 @@ select * from airline.modell_order_aktiv moa join airline.strecke s on (moa.von = s.start_iata and moa.von = s.ziel_iata) where s.komplett = false; -select * from strecke s where s.aktiv = true; -select * from strecke s where s.komplett = false and s.aktiv = true order by start_iata , ziel_iata; - +select * from airline.strecke s where s.aktiv = true; +select * from airline.strecke s where s.komplett = false and s.aktiv = true order by start_iata , ziel_iata; select count(*) as anz, ziel_iata from airline.strecke s group by ziel_iata order by anz desc, ziel_iata asc; select count(*) as anz, ziel_iata from airline.strecke s where s.aktiv=true group by ziel_iata order by anz desc, ziel_iata asc; select count(*) as anz, ziel_iata from airline.strecke s where s.aktiv=true and s.komplett=true group by ziel_iata order by anz desc, ziel_iata asc; select count(*) as anz, land_name from airline.flughafen_land fl group by land_name order by anz desc, land_name asc; + select ziel_iata from airline.strecke s where start_iata != 'DXB' group by ziel_iata; DROP VIEW airline.modell_order_aktiv_uncomplete; diff --git a/src/webui/flughafen.php b/src/webui/flughafen.php new file mode 100755 index 0000000..f13dc81 --- /dev/null +++ b/src/webui/flughafen.php @@ -0,0 +1,181 @@ + + + + + + + + + + + + + +Airline + + + + + +All Orders | Uncomplete Orders | Routes | Models | Airports | misc +
+"; + +/* +var_dump ($_GET) ; +echo "
"; +*/ + +if (isset($_POST) && count(array_keys($_POST)) > 0) { + if (count(array_keys($_POST)) > 4) { + handleInsertFlughafen($_POST, $connect_dbms_handle, $current_user, $page); + } +} + +$orderClause = array(); + +if (isset($_GET) && count(array_keys($_GET)) > 0) { + if (isset($_GET['sense']) && $_GET['sense'] != null) { + array_push($orderClause, $_GET['field']." ".$_GET['sense']); + } + +} + +//var_dump ($orderClause) ; + +if ($orderClause != null || count($orderClause) > 0) { + $search = str_replace (";", "", $search); + $search .= " ORDER BY "; + + //print_r($orderClause); + $anzOrders = count($orderClause); + for ($i = 0 ; $i < $anzOrders; $i++) { + $search .= $orderClause[$i]; + if ($i < $anzOrders-1) { + $search .= ", "; + } + } +} +echo "
"; + +echo $search; + +$orders = getData($connect_dbms_handle, $search); +$dataLaender = getData($connect_dbms_handle, $searchLand); + +//$stati_arr = getData($connect_dbms_handle, $selectFromDtStatus); + +?> +
+ + + + + + + + + + + + + + + + + + + + + + +\n"; + + for ($i = 0; $i < count($order); $i++) { + echo "\t\n"; + } +// var_dump($order); + echo "\n"; + +} + +?> + + + +
+ + + + +
+ + + + +
+
"; + //echo "{".$order[$i]."}
"; + + switch ($i) { + case 3: + echo $order[$i] == "t" ? "✓" : "-"; + break; + + default: + echo $order[$i]; + + break; + } + + echo "
+
+ + + + diff --git a/src/webui/index.php b/src/webui/index.php index a62d12c..61700b3 100755 --- a/src/webui/index.php +++ b/src/webui/index.php @@ -30,7 +30,7 @@ $current_user=1; -All Orders | Uncomplete Orders +All Orders | Uncomplete Orders | Routes | Models | Airports | misc
"; */ if (isset($_POST) && count(array_keys($_POST)) > 0) { - handleQuickUpdate($_POST, $connect_dbms_handle, $current_user, $page); + handleQuickUpdateStrecke($_POST, $connect_dbms_handle, $current_user, $page); } $orderClause = array(); @@ -81,66 +81,49 @@ $orders = getData($connect_dbms_handle, $search);
- - + + - + - - @@ -155,20 +138,21 @@ foreach ($orders as $order) { echo "\n"; for ($i = 0; $i < count($order); $i++) { - echo "\t
-
-↑ -- -↓ + +		 + +
-↑ -- -↓ +getTableHead("modell_name", "Modell", $page); +?> 		Strecke Modell
-↑ -- -↓ +getTableHead("hersteller_name", "Hersteller", $page); +?> 		Hersteller
-↑ -- -↓ +getTableHead("anzahl", "Anzahl", $page); +?> +		 AnzahlInvest Economy Business 1st Class
-↑ -- -↓ +getTableHead("aktiv", "aktiv", $page); +?> 		in Arbeit
-↑ -- -↓ +getTableHead("in_arbeit", "in Arbeit", $page); +?>
-↑ -- -↓ +getTableHead("komplett", "komplett", $page); +?>
";//{".$order[$i]."}"; + echo "\t"; + //echo "{".$order[$i]."}
"; switch ($i) { case 6: echo number_format($order[$i], 0, ',', '.'); break; case 10: - make_check($key."#aktiv", true, $key."_aktiv", null, null, $order[$i] == "t" ? true : false , null, null, "document.forms['airline_".$key."'].submit();", null, null, false, false, 0); + makeCheckbox($key."#aktiv", true, $key."_aktiv", null, null, $order[$i] == "t" ? true : false , null, null, "document.forms['airline_".$key."'].submit();", null, null, false, false, 0); break; case 11: - make_check($key."#in_arbeit", true, $key."_in_arbeit", null, null, $order[$i] == "t" ? true : false , null, null, "document.forms['airline_".$key."'].submit();", null, null, false, false, 0); + makeCheckbox($key."#in_arbeit", true, $key."_in_arbeit", null, null, $order[$i] == "t" ? true : false , null, null, "document.forms['airline_".$key."'].submit();", null, null, false, false, 0); break; case 12: - make_check($key."#komplett", true, $key."_komplett", null, null, $order[$i] == "t" ? true : false , null, null, "document.forms['airline_".$key."'].submit();", null, null, false, false, 0); + makeCheckbox($key."#komplett", true, $key."_komplett", null, null, $order[$i] == "t" ? true : false , null, null, "document.forms['airline_".$key."'].submit();", null, null, false, false, 0); break; default: diff --git a/src/webui/index2.php b/src/webui/index2.php index cc132ad..d172d69 100755 --- a/src/webui/index2.php +++ b/src/webui/index2.php @@ -30,7 +30,7 @@ $current_user=1; -All Orders | Uncomplete Orders +All Orders | Uncomplete Orders | Routes | Models | Airports | misc
"; */ if (isset($_POST) && count(array_keys($_POST)) > 0) { - handleQuickUpdate($_POST, $connect_dbms_handle, $current_user, $page); + handleQuickUpdateStrecke($_POST, $connect_dbms_handle, $current_user, $page); } $orderClause = array(); @@ -81,66 +81,49 @@ $orders = getData($connect_dbms_handle, $search);
- - + + + - - - @@ -155,20 +138,21 @@ foreach ($orders as $order) { echo "\n"; for ($i = 0; $i < count($order); $i++) { - echo "\t
-
-↑ -- -↓ + +		 + + +
-↑ -- -↓ +getTableHead("hersteller_name", "Hersteller", $page); +?> 		Strecke Modell
-↑ -- -↓ +getTableHead("anzahl", "Anzahl", $page); +?> 		Hersteller
-↑ -- -↓ +getTableHead("investition", "Investition", $page); +?> 		AnzahlInvest Economy Business 1st Class
-↑ -- -↓ +getTableHead("aktiv", "aktiv", $page); +?> 		in Arbeit
-↑ -- -↓ +getTableHead("in_arbeit", "in Arbeit", $page); +?>
-↑ -- -↓ +getTableHead("komplett", "komplett", $page); +?>
";//{".$order[$i]."}"; - + echo "\t"; + //echo "{".$order[$i]."}
"; + switch ($i) { case 6: echo number_format($order[$i], 0, ',', '.'); break; case 10: - make_check($key."#aktiv", true, $key."_aktiv", null, null, $order[$i] == "t" ? true : false , null, null, "document.forms['airline_".$key."'].submit();", null, null, false, false, 0); + makeCheckbox($key."#aktiv", true, $key."_aktiv", null, null, $order[$i] == "t" ? true : false , null, null, "document.forms['airline_".$key."'].submit();", null, null, false, false, 0); break; case 11: - make_check($key."#in_arbeit", true, $key."_in_arbeit", null, null, $order[$i] == "t" ? true : false , null, null, "document.forms['airline_".$key."'].submit();", null, null, false, false, 0); + makeCheckbox($key."#in_arbeit", true, $key."_in_arbeit", null, null, $order[$i] == "t" ? true : false , null, null, "document.forms['airline_".$key."'].submit();", null, null, false, false, 0); break; case 12: - make_check($key."#komplett", true, $key."_komplett", null, null, $order[$i] == "t" ? true : false , null, null, "document.forms['airline_".$key."'].submit();", null, null, false, false, 0); + makeCheckbox($key."#komplett", true, $key."_komplett", null, null, $order[$i] == "t" ? true : false , null, null, "document.forms['airline_".$key."'].submit();", null, null, false, false, 0); break; default: diff --git a/src/webui/index3.php b/src/webui/index3.php new file mode 100755 index 0000000..e9491d7 --- /dev/null +++ b/src/webui/index3.php @@ -0,0 +1,78 @@ + + + + + + + + + + + + + +Airline + + + + + +All Orders | Uncomplete Orders | Routes | Models | Airports | misc +
+
+In DB")); +array_push($searches, array($selectFromStreckenZieleAktiv, "Anzahl Strecken zu
aktiv")); +array_push($searches, array($selectFromStreckenZieleKomplett, "Anzahl Strecken zu
aktiv & komplett")); + +foreach ($searches as $search) { +?> +
+ +

+ + + + + +\n"; + + for ($i = 0; $i < count($order); $i++) { + echo "\t\n"; + } + // var_dump($order); + echo "\n"; + } + ?> +
AnzahlZiel
"; + echo $order[$i]; + + echo "
+ + +
+ + + diff --git a/src/webui/lib/database_functions.php b/src/webui/lib/database_functions.php index 9deb4f2..ef44548 100644 --- a/src/webui/lib/database_functions.php +++ b/src/webui/lib/database_functions.php @@ -15,5 +15,23 @@ $selectFromViewModellOrderAktivUncomplete = "SELECT * FROM ".SCHEMA.".modell_ord $selectFromViewModellOrderAll = "SELECT * FROM ".SCHEMA.".modell_order_all;"; +$selectFromModelle = "SELECT * FROM ".SCHEMA.".modell_hersteller;"; +$selectFromHersteller = "SELECT * FROM ".SCHEMA.".hersteller;"; + +$selectFromFlughafen = "SELECT * FROM ".SCHEMA.".flughafen_land;"; +$selectFromFlughafenHubs = "SELECT * FROM ".SCHEMA.".flughafen WHERE is_hub = true ORDER BY iata;"; +$selectFromFlughafenNoHubs = "SELECT * FROM ".SCHEMA.".flughafen ORDER BY iata;"; +$selectFromLand = "SELECT * FROM ".SCHEMA.".land;"; + +$selectFromStrecken = "SELECT * FROM ".SCHEMA.".strecke;"; + +$selectFromStreckenAktiv = "SELECT * FROM ".SCHEMA.".strecke s where s.aktiv = true;"; +$selectFromStreckenAktivKomplett = "SELECT * FROM ".SCHEMA.".strecke s where s.komplett = false and s.aktiv = true order by start_iata , ziel_iata;"; + +$selectFromStreckenZiele = "SELECT count(*) as anz, ziel_iata FROM ".SCHEMA.".strecke s group by ziel_iata order by anz desc, ziel_iata asc;"; +$selectFromStreckenZieleAktiv = "SELECT count(*) as anz, ziel_iata FROM ".SCHEMA.".strecke s where s.aktiv=true group by ziel_iata order by anz desc, ziel_iata asc;"; +$selectFromStreckenZieleKomplett = "SELECT count(*) as anz, ziel_iata FROM ".SCHEMA.".strecke s where s.aktiv=true and s.komplett=true group by ziel_iata order by anz desc, ziel_iata asc;"; +$selectFromStreckenFlughafenLand = "SELECT count(*) as anz, land_name FROM ".SCHEMA.".flughafen_land fl group by land_name order by anz desc, land_name asc;"; + ?> \ No newline at end of file diff --git a/src/webui/lib/db/database_functions_pgsql.php b/src/webui/lib/db/database_functions_pgsql.php index f1646cf..7d3ca8e 100644 --- a/src/webui/lib/db/database_functions_pgsql.php +++ b/src/webui/lib/db/database_functions_pgsql.php @@ -23,7 +23,7 @@ function getDBConnection() { * PostgresSQL-Verbindung schliessen */ function closeDBConnection($ref_connection) { @pg_close($ref_connection) or die('Verbindungsclose fehlgeschlagen: '); - echo pg_last_error($ref_connection); + //echo pg_last_error($ref_connection); } diff --git a/src/webui/lib/gui/gui_functions_checkbox.php b/src/webui/lib/gui/gui_functions_checkbox.php index 924dd6c..2093a34 100644 --- a/src/webui/lib/gui/gui_functions_checkbox.php +++ b/src/webui/lib/gui/gui_functions_checkbox.php @@ -1,8 +1,24 @@ + * $ref_value Daten; null möglich + * $ref_id Id des + * $ref_class Class des ; null möglich + * $ref_tabindex Tabindex in der + + * $ref_checked true, dann wird checked gesetzt + * $ref_classerrorextension Class im Fehlerfall + * $ref_error_label Label im Fehlerfall + * $ref_javascript Javascript; null möglich + + * $ref_mandantory Pflichtfeldmarkierung; null möglich + * $ref_labeltitle