diff --git a/includes/action_caller.php b/includes/action_caller.php
index 8d52e97..e50a837 100644
--- a/includes/action_caller.php
+++ b/includes/action_caller.php
@@ -26,17 +26,6 @@ function add_custom_admin_bar_item() {
// Überprüfen, ob der Benutzer die erforderliche Berechtigung hat
if ( current_user_can( 'show_groups' ) ) {
// Das Array mit den Eigenschaften des benutzerdefinierten Elements
- $args = [
- 'id' => 'kompass_gruppen',
- 'title' => '' .
- '' .__('Groups', BDP_LV_PLUGIN_SLUG) . '',
- 'href' => get_admin_url() . 'admin.php?page=kompass-groups',
-
- ];
-
- // Das benutzerdefinierte Element zur Admin-Leiste hinzufügen
- $wp_admin_bar->add_node( $args );
-
$args = [
'id' => 'kompass_events',
'title' => '' .
diff --git a/includes/class-modelcommon.php b/includes/class-modelcommon.php
index 5292354..c13f377 100644
--- a/includes/class-modelcommon.php
+++ b/includes/class-modelcommon.php
@@ -1,9 +1,6 @@
y;
}
-
- public function get_group() : CommonModel {
- return EventGroup::load_by_id(MainController::KOMPASS_EVENTS_GROUPS, $this->gruppe_id);
- }
}
\ No newline at end of file
diff --git a/lib/database/kompass_stammesgruppen_gruppen.sql b/lib/database/kompass_stammesgruppen_gruppen.sql
deleted file mode 100644
index 8897b61..0000000
--- a/lib/database/kompass_stammesgruppen_gruppen.sql
+++ /dev/null
@@ -1,21 +0,0 @@
-SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
-START TRANSACTION;
-
-CREATE TABLE `%tablename%` (
- `id` int NOT NULL AUTO_INCREMENT,
- `gruppen_name` varchar(256) COLLATE utf8mb4_unicode_520_ci NOT NULL,
- `gruppe_grufue` bigint UNSIGNED DEFAULT NULL,
- PRIMARY KEY (id)
-
-) %charset%;
-
-
-ALTER TABLE `%tablename%`
- ADD PRIMARY KEY (`id`);
-
-
-ALTER TABLE `%tablename%`
- MODIFY `id` int NOT NULL AUTO_INCREMENT;
-
-ALTER TABLE `%tablename%` ADD CONSTRAINT `gruppe_grufue` FOREIGN KEY (`gruppe_grufue`) REFERENCES `%prefix%users`(`ID`) ON DELETE CASCADE ON UPDATE CASCADE;
-COMMIT;
diff --git a/lib/database/kompass_stammesgruppen_teilis.sql b/lib/database/kompass_stammesgruppen_teilis.sql
deleted file mode 100644
index c1353e1..0000000
--- a/lib/database/kompass_stammesgruppen_teilis.sql
+++ /dev/null
@@ -1,49 +0,0 @@
-SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
-START TRANSACTION;
-SET time_zone = "+00:00";
-
-CREATE TABLE `%tablename%` (
- `id` int NOT NULL AUTO_INCREMENT,
- `gruppe_id` int NOT NULL,
- `vorname` varchar(128) NOT NULL,
- `nachname` varchar(128) NOT NULL,
- `geburtsdatum` date DEFAULT NULL,
- `ansprechpartner` varchar(256) DEFAULT NULL,
- `strasse` varchar(128) DEFAULT NULL,
- `hausnummer` varchar(8) DEFAULT NULL,
- `plz` varchar(5) DEFAULT NULL,
- `ort` varchar(128) DEFAULT NULL,
- `email_1` varchar(512) NOT NULL,
- `email_2` varchar(512) DEFAULT NULL,
- `telefon_1` varchar(16) NOT NULL,
- `telefon_2` varchar(16) DEFAULT NULL,
- `badeerlaubnis` enum('complete','partial','none','') NOT NULL DEFAULT 'none',
- `allergien` varchar(2048) NOT NULL,
- `abholung` enum('alone','parents','other','') NOT NULL DEFAULT 'parents',
- `abholung_text` varchar(1024) NOT NULL DEFAULT '0',
- `foto_socialmedia` tinyint NOT NULL DEFAULT '0',
- `foto_print` tinyint NOT NULL DEFAULT '0',
- `foto_webseite` tinyint NOT NULL DEFAULT '0',
- `foto_partner` tinyint NOT NULL DEFAULT '0',
- `halstuch` enum('none','woe','pfadi','rr') NOT NULL DEFAULT 'none',
- `anmerkungen` varchar(2048) NOT NULL,
- `aufnahmeantrag_da` tinyint NOT NULL DEFAULT '0',
- `fotoerlaubnis_da` tinyint NOT NULL DEFAULT '0',
- `elterninfo_da` tinyint NOT NULL DEFAULT '0',
- `badeerlaubnis_da` tinyint NOT NULL DEFAULT '0',
- PRIMARY KEY (id)
-) %charset%;
-
-
-ALTER TABLE `%tablename%`
- ADD PRIMARY KEY (`id`),
- ADD KEY `teili_gruppe` (`gruppe_id`);
-
-
-ALTER TABLE `%tablename%`
- MODIFY `id` int NOT NULL AUTO_INCREMENT;
-
-
-ALTER TABLE `%tablename%`
- ADD CONSTRAINT `teili_gruppe` FOREIGN KEY (`gruppe_id`) REFERENCES `%prefix%kompass_stammesgruppen_gruppen` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;
-COMMIT;
diff --git a/lib/database/kompass_veranstaltungen_gruppen.sql b/lib/database/kompass_veranstaltungen_gruppen.sql
deleted file mode 100644
index 7d6d3de..0000000
--- a/lib/database/kompass_veranstaltungen_gruppen.sql
+++ /dev/null
@@ -1,28 +0,0 @@
-SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
-START TRANSACTION;
-
-CREATE TABLE `%tablename%` (
- `id` int NOT NULL AUTO_INCREMENT,
- `eventId` int NOT NULL,
- `group_name` varchar(1024) NOT NULL,
- `max_participants` int NOT NULL,
- `amount_reduced` decimal(8,2) DEFAULT NULL,
- `amount_default` decimal(8,2) DEFAULT NULL,
- `amount_social` decimal(8,2) DEFAULT NULL,
- PRIMARY KEY (id)
-
-) %charset%;
-
-
-ALTER TABLE `%tablename%`
- ADD PRIMARY KEY (`id`),
- ADD KEY `event_group` (`eventId`);
-
-
-ALTER TABLE `%tablename%`
- MODIFY `id` int NOT NULL AUTO_INCREMENT;
-
-ALTER TABLE `%tablename%`
- ADD CONSTRAINT `event_group` FOREIGN KEY (`eventId`) REFERENCES `%prefix%kompass_veranstaltungen_index` (`id`) ON DELETE RESTRICT ON UPDATE RESTRICT;
-
-COMMIT;
diff --git a/lib/database/kompass_veranstaltungen_index.sql b/lib/database/kompass_veranstaltungen_index.sql
index 4472be5..34d4071 100644
--- a/lib/database/kompass_veranstaltungen_index.sql
+++ b/lib/database/kompass_veranstaltungen_index.sql
@@ -14,7 +14,7 @@ CREATE TABLE `%tablename%` (
`amount_social` decimal(8,2) NOT NULL,
`max_participants` INT NOT NULL,
`max_volunteers` INT NOT NULL,
- `contributing_tribes` TEXT NOT NULL AFTER
+ `contributing_tribes` TEXT NOT NULL,
PRIMARY KEY (id)
) %charset%;
diff --git a/lib/database/kompass_veranstaltungen_teilis.sql b/lib/database/kompass_veranstaltungen_teilis.sql
index 17cf92b..b2bd0a5 100644
--- a/lib/database/kompass_veranstaltungen_teilis.sql
+++ b/lib/database/kompass_veranstaltungen_teilis.sql
@@ -4,7 +4,7 @@ SET time_zone = "+00:00";
CREATE TABLE `%tablename%` (
`id` int NOT NULL AUTO_INCREMENT,
- `gruppe_id` int NOT NULL,
+ `EVENTiD` int NOT NULL,
`teilnahme` ENUM('participant','volunteer','other','') NOT NULL,
`vorname` varchar(128) NOT NULL,
`nachname` varchar(128) NOT NULL,
@@ -49,7 +49,4 @@ ALTER TABLE `%tablename%`
ALTER TABLE `%tablename%`
MODIFY `id` int NOT NULL AUTO_INCREMENT;
-
-ALTER TABLE `%tablename%`
- ADD CONSTRAINT `event_gruppe` FOREIGN KEY (`gruppe_id`) REFERENCES `%prefix%kompass_veranstaltungen_gruppen` (`id`) ON DELETE CASCADE ON UPDATE CASCADE;
COMMIT;
diff --git a/lib/dompdf.zip b/lib/dompdf.zip
deleted file mode 100644
index 01f27ff..0000000
Binary files a/lib/dompdf.zip and /dev/null differ
diff --git a/modules/event-participants/Controllers/class-archiveevent.php b/modules/event-participants/Controllers/class-archiveevent.php
index 743c1ae..3cf5a02 100644
--- a/modules/event-participants/Controllers/class-archiveevent.php
+++ b/modules/event-participants/Controllers/class-archiveevent.php
@@ -1,9 +1,6 @@
get_charset_collate();
$fileReader = new FileAccess();
- foreach ([self::KOMPASS_EVENTS_EVENTS, self::KOMPASS_EVENTS_GROUPS, self::KOMPASS_EVENTS_PARTICIPANTS] as $table) {
+ foreach ([self::KOMPASS_EVENTS_EVENTS, self::KOMPASS_EVENTS_PARTICIPANTS] as $table) {
$sqlTable = $wpdb->prefix . $table;
$sql = "SHOW TABLES LIKE '$sqlTable'";
@@ -35,8 +34,6 @@ class MainController
$sqlSetup = str_replace('%charset%', $charset, $sqlSetup);
$sqlSetup = str_replace('%prefix%', $wpdb->prefix, $sqlSetup);
-
-
dbDelta( $sqlSetup );
}
diff --git a/modules/event-participants/Controllers/class-memberdetails.php b/modules/event-participants/Controllers/class-memberdetails.php
index a427a02..dba5101 100644
--- a/modules/event-participants/Controllers/class-memberdetails.php
+++ b/modules/event-participants/Controllers/class-memberdetails.php
@@ -1,7 +1,6 @@
readFromDb('kompass_veranstaltungen_gruppen', ['id' => $group_id]);
- $class = new EventGroup();
-
- foreach (get_object_vars($data[0]) as $key => $value) {
- $class->$key = $value;
- }
-
- foreach (EventParticipant::list_for_group($group_id) as $participant_id) {
- $class->participants[] = EventParticipant::loadById($participant_id);
- }
-
- return $class;
- }
-
- public static function list_simple_for_event(int $event_id) : array {
- global $dbHandler;
-
- $data = $dbHandler->readFromDb('kompass_veranstaltungen_gruppen', ['eventId' => $event_id]);
- $return = [];
- foreach ($data as $group) {
- $group_class = new EventGroup();
- foreach (get_object_vars($group) as $key => $value) {
- $group_class->$key = $value;
- }
-
- $return[] = $group_class;
- }
-
- return $return;
- }
-
- public static function list_for_event(int $event_id) : array {
- global $dbHandler;
-
- $data = $dbHandler->readFromDb('kompass_veranstaltungen_teilis', ['eventId' => $event_id]);
- $return = [];
- foreach ($data as $group) {
- $return[] = $group->id;
- }
-
- return $return;
- }
-
- public function __construct() {
- $this->_tablename = 'kompass_veranstaltungen_gruppen';
- $this->participants = [];
- }
-}
diff --git a/modules/event-participants/Models/class-eventparticipant.php b/modules/event-participants/Models/class-eventparticipant.php
index 1437cfb..b1c8045 100644
--- a/modules/event-participants/Models/class-eventparticipant.php
+++ b/modules/event-participants/Models/class-eventparticipant.php
@@ -22,10 +22,6 @@ class EventParticipant extends CommonModel {
return $return;
}
- public function get_group() : CommonModel {
- return EventGroup::load_by_id(MainController::KOMPASS_EVENTS_GROUPS, $this->gruppe_id);
- }
-
public function __construct() {
$this->_tablename = 'kompass_veranstaltungen_teilis';
}
diff --git a/modules/event-participants/Requests/class-anwesenheitrequest.php b/modules/event-participants/Requests/class-anwesenheitrequest.php
index a5eb748..74d6366 100644
--- a/modules/event-participants/Requests/class-anwesenheitrequest.php
+++ b/modules/event-participants/Requests/class-anwesenheitrequest.php
@@ -3,7 +3,6 @@ namespace Bdp\Modules\EventParticipants\Reqeust;
use Bdp\Libs\CommonModel;
-use Bdp\Modules\EventParticipants\Models\Event;
use Carbon\Carbon;
class AnwesenheitRequest {
diff --git a/modules/event-participants/Requests/class-bathrequest.php b/modules/event-participants/Requests/class-bathrequest.php
index 0e22586..4b5a000 100644
--- a/modules/event-participants/Requests/class-bathrequest.php
+++ b/modules/event-participants/Requests/class-bathrequest.php
@@ -1,7 +1,6 @@