From 51c98fc266a9997bb9a550127cd8eaf853e8b6e8 Mon Sep 17 00:00:00 2001 From: Michael Liebler Date: Mon, 5 Dec 2022 09:37:34 +0100 Subject: [PATCH 1/5] Mysql verlangt Defaultwerte - refs #8 --- admin/com_stations/sql/install.mysql.utf8.sql | 24 +++++++++---------- .../com_stations/sql/updates/mysql/3.3.3.sql | 19 +++++++++++++++ admin/com_stations/stations.xml | 2 +- media/com_stations/css/stations.css | 2 +- stations.xml | 2 +- 5 files changed, 34 insertions(+), 15 deletions(-) create mode 100644 admin/com_stations/sql/updates/mysql/3.3.3.sql diff --git a/admin/com_stations/sql/install.mysql.utf8.sql b/admin/com_stations/sql/install.mysql.utf8.sql index 365d054..7b8f6e1 100644 --- a/admin/com_stations/sql/install.mysql.utf8.sql +++ b/admin/com_stations/sql/install.mysql.utf8.sql @@ -8,22 +8,22 @@ CREATE TABLE IF NOT EXISTS `#__stations_destinations` ( `www` varchar(100) NOT NULL DEFAULT '', `livestream` varchar(100) NOT NULL DEFAULT '', `catid` int(11) NOT NULL DEFAULT 0, - `frn_id` int(5) NOT NULL, + `frn_id` int(5) NULL DEFAULT NULL, `reception` text NOT NULL DEFAULT '', - `lat` varchar(200) NOT NULL, - `long` varchar(200) NOT NULL, + `lat` varchar(200) NOT NULL DEFAULT '', + `long` varchar(200) NOT NULL DEFAULT '', `published` tinyint(1) NOT NULL DEFAULT 0, - `checked_out` int(11) DEFAULT NULL, - `checked_out_time` datetime NOT NULL, - `txt` text NOT NULL, + `checked_out` int(11) DEFAULT NULL DEFAULT 0, + `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `txt` text NOT NULL DEFAULT '', `picture` varchar(255) NOT NULL DEFAULT '', `assign_routeplanning` tinyint(1) NOT NULL DEFAULT 1, `ordering` int(11) NOT NULL DEFAULT 0, `created_by` int(11) NOT NULL DEFAULT 0, - `country` int(11) NOT NULL, - `access` int(11) NOT NULL, - `language` varchar(7) NOT NULL, - `created` datetime NOT NULL, - `modified` datetime NOT NULL, - `modified_by` int(11) NOT NULL + `country` int(11) NOT NULL DEFAULT 33, + `access` int(11) NOT NULL DEFAULT 0, + `language` varchar(7) NOT NULL DEFAULT '', + `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `modified` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `modified_by` INT(11) NOT NULL DEFAULT 0 ) \ No newline at end of file diff --git a/admin/com_stations/sql/updates/mysql/3.3.3.sql b/admin/com_stations/sql/updates/mysql/3.3.3.sql new file mode 100644 index 0000000..d9cc275 --- /dev/null +++ b/admin/com_stations/sql/updates/mysql/3.3.3.sql @@ -0,0 +1,19 @@ +ALTER TABLE `#__stations_destinations` CHANGE `frn_id` `frn_id` INT(5) NULL DEFAULT NULL, +CHANGE `checked_out_time` `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', +CHANGE `checked_out` `checked_out` DEFAULT NULL DEFAULT 0, +CHANGE `name` `name` VARCHAR(100) NOT NULL DEFAULT '', +CHANGE `alias` `alias` VARCHAR(180) NOT NULL DEFAULT '', +CHANGE `address` `address` VARCHAR(200) NOT NULL DEFAULT '', +CHANGE `zipcode` `zipcode` VARCHAR(50) NOT NULL DEFAULT '', +CHANGE `town` `town` VARCHAR(250) NOT NULL DEFAULT '', +CHANGE `www` `www` VARCHAR(100) NOT NULL DEFAULT '', +CHANGE `livestream` `livestream` VARCHAR(100) NOT NULL DEFAULT '', +CHANGE `lat` `lat` VARCHAR(200) NOT NULL DEFAULT '', +CHANGE `long` `long` VARCHAR(200) NOT NULL DEFAULT '', +CHANGE `txt` `txt` TEXT NOT NULL DEFAULT '', +CHANGE `country` `country` INT(11) NOT NULL DEFAULT '33', +CHANGE `access` `access` INT(11) NOT NULL DEFAULT 0; +CHANGE `language` `language` VARCHAR(7) NOT NULL DEFAULT '', +CHANGE `created` `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', +CHANGE `modified` `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', +CHANGE `modified_by` `modified_by` INT(11) NOT NULL DEFAULT 0; diff --git a/admin/com_stations/stations.xml b/admin/com_stations/stations.xml index 8eb8e2a..cc4b254 100644 --- a/admin/com_stations/stations.xml +++ b/admin/com_stations/stations.xml @@ -7,7 +7,7 @@ GNU michael-liebler@janguo.de https://freie-radios.de - 3.3.2 + 3.3.3 COM_STATIONS_XML_DESCRIPTION Joomla\Component\Stations diff --git a/media/com_stations/css/stations.css b/media/com_stations/css/stations.css index 83e0a53..a7186d9 100644 --- a/media/com_stations/css/stations.css +++ b/media/com_stations/css/stations.css @@ -36,7 +36,7 @@ body { padding: 20px; box-shadow: 1px 1px 1px 0 #22222247; cursor: pointer; - transition: all 0.3s ease; + transition: all 0.3s ease;SDD } .stations-destinations .stations-destinations-item:hover { diff --git a/stations.xml b/stations.xml index 8eb8e2a..cc4b254 100644 --- a/stations.xml +++ b/stations.xml @@ -7,7 +7,7 @@ GNU michael-liebler@janguo.de https://freie-radios.de - 3.3.2 + 3.3.3 COM_STATIONS_XML_DESCRIPTION Joomla\Component\Stations From d27a77c4e0079edafa6bf5ec65931b59a893a420 Mon Sep 17 00:00:00 2001 From: Michael Liebler Date: Mon, 5 Dec 2022 09:41:57 +0100 Subject: [PATCH 2/5] Mysql verlangt Defaultwerte - refs #8 --- admin/com_stations/sql/install.mysql.utf8.sql | 2 +- admin/com_stations/sql/updates/mysql/3.3.3.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/com_stations/sql/install.mysql.utf8.sql b/admin/com_stations/sql/install.mysql.utf8.sql index 7b8f6e1..485736f 100644 --- a/admin/com_stations/sql/install.mysql.utf8.sql +++ b/admin/com_stations/sql/install.mysql.utf8.sql @@ -13,7 +13,7 @@ CREATE TABLE IF NOT EXISTS `#__stations_destinations` ( `lat` varchar(200) NOT NULL DEFAULT '', `long` varchar(200) NOT NULL DEFAULT '', `published` tinyint(1) NOT NULL DEFAULT 0, - `checked_out` int(11) DEFAULT NULL DEFAULT 0, + `checked_out` int(11) NOT NULL DEFAULT 0, `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `txt` text NOT NULL DEFAULT '', `picture` varchar(255) NOT NULL DEFAULT '', diff --git a/admin/com_stations/sql/updates/mysql/3.3.3.sql b/admin/com_stations/sql/updates/mysql/3.3.3.sql index d9cc275..657e2ac 100644 --- a/admin/com_stations/sql/updates/mysql/3.3.3.sql +++ b/admin/com_stations/sql/updates/mysql/3.3.3.sql @@ -1,6 +1,6 @@ ALTER TABLE `#__stations_destinations` CHANGE `frn_id` `frn_id` INT(5) NULL DEFAULT NULL, CHANGE `checked_out_time` `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', -CHANGE `checked_out` `checked_out` DEFAULT NULL DEFAULT 0, +CHANGE `checked_out` `checked_out` NOT NULL DEFAULT 0, CHANGE `name` `name` VARCHAR(100) NOT NULL DEFAULT '', CHANGE `alias` `alias` VARCHAR(180) NOT NULL DEFAULT '', CHANGE `address` `address` VARCHAR(200) NOT NULL DEFAULT '', From df1e320d054bf30dd1f50b68a36423d56c382694 Mon Sep 17 00:00:00 2001 From: Michael Liebler Date: Mon, 5 Dec 2022 09:50:29 +0100 Subject: [PATCH 3/5] Mysql verlangt Defaultwerte - refs #8 --- .../com_stations/sql/updates/mysql/3.3.3.sql | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/admin/com_stations/sql/updates/mysql/3.3.3.sql b/admin/com_stations/sql/updates/mysql/3.3.3.sql index 657e2ac..21b0e73 100644 --- a/admin/com_stations/sql/updates/mysql/3.3.3.sql +++ b/admin/com_stations/sql/updates/mysql/3.3.3.sql @@ -1,19 +1,19 @@ -ALTER TABLE `#__stations_destinations` CHANGE `frn_id` `frn_id` INT(5) NULL DEFAULT NULL, -CHANGE `checked_out_time` `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', -CHANGE `checked_out` `checked_out` NOT NULL DEFAULT 0, -CHANGE `name` `name` VARCHAR(100) NOT NULL DEFAULT '', -CHANGE `alias` `alias` VARCHAR(180) NOT NULL DEFAULT '', -CHANGE `address` `address` VARCHAR(200) NOT NULL DEFAULT '', -CHANGE `zipcode` `zipcode` VARCHAR(50) NOT NULL DEFAULT '', -CHANGE `town` `town` VARCHAR(250) NOT NULL DEFAULT '', -CHANGE `www` `www` VARCHAR(100) NOT NULL DEFAULT '', -CHANGE `livestream` `livestream` VARCHAR(100) NOT NULL DEFAULT '', -CHANGE `lat` `lat` VARCHAR(200) NOT NULL DEFAULT '', -CHANGE `long` `long` VARCHAR(200) NOT NULL DEFAULT '', -CHANGE `txt` `txt` TEXT NOT NULL DEFAULT '', -CHANGE `country` `country` INT(11) NOT NULL DEFAULT '33', -CHANGE `access` `access` INT(11) NOT NULL DEFAULT 0; -CHANGE `language` `language` VARCHAR(7) NOT NULL DEFAULT '', -CHANGE `created` `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', -CHANGE `modified` `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', -CHANGE `modified_by` `modified_by` INT(11) NOT NULL DEFAULT 0; +ALTER TABLE `#__stations_destinations` CHANGE `frn_id` `frn_id` INT(5) NULL DEFAULT NULL; +ALTER TABLE `#__stations_destinations` CHANGE `checked_out_time` `checked_out_time` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'; +ALTER TABLE `#__stations_destinations` CHANGE `checked_out` `checked_out` INT(11) NULL DEFAULT '0'; +ALTER TABLE `#__stations_destinations` CHANGE `name` `name` VARCHAR(100) NOT NULL DEFAULT ''; +ALTER TABLE `#__stations_destinations` CHANGE `alias` `alias` VARCHAR(180) NOT NULL DEFAULT ''; +ALTER TABLE `#__stations_destinations` CHANGE `address` `address` VARCHAR(200) NOT NULL DEFAULT ''; +ALTER TABLE `#__stations_destinations` CHANGE `zipcode` `zipcode` VARCHAR(50) NOT NULL DEFAULT ''; +ALTER TABLE `#__stations_destinations` CHANGE `town` `town` VARCHAR(250) NOT NULL DEFAULT ''; +ALTER TABLE `#__stations_destinations` CHANGE `www` `www` VARCHAR(100) NOT NULL DEFAULT ''; +ALTER TABLE `#__stations_destinations` CHANGE `livestream` `livestream` VARCHAR(100) NOT NULL DEFAULT ''; +ALTER TABLE `#__stations_destinations` CHANGE `lat` `lat` VARCHAR(200) NOT NULL DEFAULT ''; +ALTER TABLE `#__stations_destinations` CHANGE `long` `long` VARCHAR(200) NOT NULL DEFAULT ''; +ALTER TABLE `#__stations_destinations` CHANGE `txt` `txt` TEXT NOT NULL DEFAULT ''; +ALTER TABLE `#__stations_destinations` CHANGE `country` `country` INT(11) NOT NULL DEFAULT '33'; +ALTER TABLE `#__stations_destinations` CHANGE `access` `access` INT(11) NOT NULL DEFAULT 0; +ALTER TABLE `#__stations_destinations` CHANGE `language` `language` VARCHAR(7) NOT NULL DEFAULT ''; +ALTER TABLE `#__stations_destinations` CHANGE `created` `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'; +ALTER TABLE `#__stations_destinations` CHANGE `modified` `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'; +ALTER TABLE `#__stations_destinations` CHANGE `modified_by` `modified_by` INT(11) NOT NULL DEFAULT 0; From 973766876e52f768786b9f66c4b1076bfe102bd4 Mon Sep 17 00:00:00 2001 From: Michael Liebler Date: Mon, 5 Dec 2022 10:13:26 +0100 Subject: [PATCH 4/5] SQL korrigiert - refs #10 --- admin/com_stations/sql/updates/mysql/3.3.3.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/com_stations/sql/updates/mysql/3.3.3.sql b/admin/com_stations/sql/updates/mysql/3.3.3.sql index 21b0e73..7814034 100644 --- a/admin/com_stations/sql/updates/mysql/3.3.3.sql +++ b/admin/com_stations/sql/updates/mysql/3.3.3.sql @@ -12,8 +12,8 @@ ALTER TABLE `#__stations_destinations` CHANGE `lat` `lat` VARCHAR(200) NOT NULL ALTER TABLE `#__stations_destinations` CHANGE `long` `long` VARCHAR(200) NOT NULL DEFAULT ''; ALTER TABLE `#__stations_destinations` CHANGE `txt` `txt` TEXT NOT NULL DEFAULT ''; ALTER TABLE `#__stations_destinations` CHANGE `country` `country` INT(11) NOT NULL DEFAULT '33'; -ALTER TABLE `#__stations_destinations` CHANGE `access` `access` INT(11) NOT NULL DEFAULT 0; +ALTER TABLE `#__stations_destinations` CHANGE `access` `access` INT(11) NOT NULL DEFAULT '0'; ALTER TABLE `#__stations_destinations` CHANGE `language` `language` VARCHAR(7) NOT NULL DEFAULT ''; ALTER TABLE `#__stations_destinations` CHANGE `created` `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'; ALTER TABLE `#__stations_destinations` CHANGE `modified` `modified` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'; -ALTER TABLE `#__stations_destinations` CHANGE `modified_by` `modified_by` INT(11) NOT NULL DEFAULT 0; +ALTER TABLE `#__stations_destinations` CHANGE `modified_by` `modified_by` INT(11) NOT NULL DEFAULT '0'; From 599616ac8871a17e04a3b2b4890a9e5ba1f31fb4 Mon Sep 17 00:00:00 2001 From: Michael Liebler Date: Mon, 5 Dec 2022 10:16:39 +0100 Subject: [PATCH 5/5] SQL korrigiert - refs #10 --- admin/com_stations/sql/install.mysql.utf8.sql | 2 +- admin/com_stations/sql/updates/mysql/3.3.3.sql | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/admin/com_stations/sql/install.mysql.utf8.sql b/admin/com_stations/sql/install.mysql.utf8.sql index 485736f..c904ee8 100644 --- a/admin/com_stations/sql/install.mysql.utf8.sql +++ b/admin/com_stations/sql/install.mysql.utf8.sql @@ -15,7 +15,7 @@ CREATE TABLE IF NOT EXISTS `#__stations_destinations` ( `published` tinyint(1) NOT NULL DEFAULT 0, `checked_out` int(11) NOT NULL DEFAULT 0, `checked_out_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', - `txt` text NOT NULL DEFAULT '', + `txt` text NOT NULL, `picture` varchar(255) NOT NULL DEFAULT '', `assign_routeplanning` tinyint(1) NOT NULL DEFAULT 1, `ordering` int(11) NOT NULL DEFAULT 0, diff --git a/admin/com_stations/sql/updates/mysql/3.3.3.sql b/admin/com_stations/sql/updates/mysql/3.3.3.sql index 7814034..9e6b887 100644 --- a/admin/com_stations/sql/updates/mysql/3.3.3.sql +++ b/admin/com_stations/sql/updates/mysql/3.3.3.sql @@ -10,7 +10,6 @@ ALTER TABLE `#__stations_destinations` CHANGE `www` `www` VARCHAR(100) NOT NULL ALTER TABLE `#__stations_destinations` CHANGE `livestream` `livestream` VARCHAR(100) NOT NULL DEFAULT ''; ALTER TABLE `#__stations_destinations` CHANGE `lat` `lat` VARCHAR(200) NOT NULL DEFAULT ''; ALTER TABLE `#__stations_destinations` CHANGE `long` `long` VARCHAR(200) NOT NULL DEFAULT ''; -ALTER TABLE `#__stations_destinations` CHANGE `txt` `txt` TEXT NOT NULL DEFAULT ''; ALTER TABLE `#__stations_destinations` CHANGE `country` `country` INT(11) NOT NULL DEFAULT '33'; ALTER TABLE `#__stations_destinations` CHANGE `access` `access` INT(11) NOT NULL DEFAULT '0'; ALTER TABLE `#__stations_destinations` CHANGE `language` `language` VARCHAR(7) NOT NULL DEFAULT '';