From 83540e068a016358f31f07f534b70f8a4287929e Mon Sep 17 00:00:00 2001 From: Paminger Date: Sat, 18 Jun 2016 11:32:29 +0200 Subject: [PATCH] VorlageExtension --- application/config/migration.php | 2 +- application/migrations/008_message.php | 20 +++---- application/migrations/010_vorlage.php | 58 +++++++++++++++++++ application/views/system/templatetextEdit.php | 30 ++++++++++ application/views/system/templatetextList.php | 45 ++++++++++++++ .../views/system/templatetextPreview.php | 3 + application/views/widgets/tinymce.php | 15 +++-- application/widgets/tinymce_widget.php | 6 ++ 8 files changed, 160 insertions(+), 19 deletions(-) create mode 100755 application/migrations/010_vorlage.php create mode 100644 application/views/system/templatetextEdit.php create mode 100644 application/views/system/templatetextList.php create mode 100644 application/views/system/templatetextPreview.php diff --git a/application/config/migration.php b/application/config/migration.php index 095644a91..65e90ad2e 100755 --- a/application/config/migration.php +++ b/application/config/migration.php @@ -23,7 +23,7 @@ $config['migration_enabled'] = TRUE; | be upgraded / downgraded to. | */ -$config['migration_version'] = 007; +$config['migration_version'] = 009; /* |-------------------------------------------------------------------------- diff --git a/application/migrations/008_message.php b/application/migrations/008_message.php index 5cc00c48f..27b6e4574 100644 --- a/application/migrations/008_message.php +++ b/application/migrations/008_message.php @@ -19,12 +19,12 @@ class Migration_Message extends CI_Migration { $query= " CREATE TABLE public.tbl_msg_message ( message_id serial, - person_id bigint NOT NULL, + person_id bigint NOT NULL references public.tbl_person(person_id), subject varchar(256) NOT NULL, body text NOT NULL, priority smallint NOT NULL DEFAULT 0, - relationmessage_id bigint, - oe_kurzbz varchar(32), + relationmessage_id bigint references public.tbl_msg_message(message_id), + oe_kurzbz varchar(32) references public.tbl_organisationseinheit(oe_kurzbz), insertamum timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, insertvon varchar(32), PRIMARY KEY (message_id) @@ -39,8 +39,8 @@ class Migration_Message extends CI_Migration { GRANT SELECT, UPDATE ON SEQUENCE public.tbl_msg_message_message_id_seq TO vilesci; CREATE TABLE public.tbl_msg_recipient ( - person_id bigint NOT NULL, - message_id bigint NOT NULL, + person_id bigint NOT NULL references public.tbl_person(person_id), + message_id bigint NOT NULL references public.tbl_msg_message(message_id), insertamum timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, insertvon varchar(32), PRIMARY KEY (person_id,message_id) @@ -50,15 +50,15 @@ class Migration_Message extends CI_Migration { GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE public.tbl_msg_recipient TO vilesci; CREATE TABLE public.tbl_msg_status ( - message_id bigint NOT NULL, - person_id bigint NOT NULL, + message_id bigint NOT NULL references public.tbl_msg_message(message_id), + person_id bigint NOT NULL references public.tbl_person(person_id), status smallint NOT NULL, statusinfo text, insertamum timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, insertvon varchar(32), updateamum timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, updatevon varchar(32), - PRIMARY KEY (message_id,person_id) + PRIMARY KEY (message_id,person_id, status) ); GRANT SELECT ON TABLE public.tbl_msg_status TO web; GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE public.tbl_msg_status TO admin; @@ -66,10 +66,10 @@ class Migration_Message extends CI_Migration { CREATE TABLE public.tbl_msg_attachment ( attachment_id serial, - message_id bigint NOT NULL, + message_id bigint NOT NULL references public.tbl_msg_message(message_id), name text, filename text, - PRIMARY KEY (message_id) + PRIMARY KEY (attachment_id) ); GRANT SELECT ON TABLE public.tbl_msg_attachment TO web; GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE public.tbl_msg_attachment TO admin; diff --git a/application/migrations/010_vorlage.php b/application/migrations/010_vorlage.php new file mode 100755 index 000000000..f6b7b7cd5 --- /dev/null +++ b/application/migrations/010_vorlage.php @@ -0,0 +1,58 @@ +db->simple_query('SELECT attribute FROM public.tbl_vorlage')) + { + $query= "ALTER TABLE public.tbl_vorlage + ADD COLUMN attribute json; + "; + if ($this->db->simple_query($query)) + echo 'Column public.tbl_vorlage.attribute added!'; + else + echo "Error adding public.tbl_vorlage.attribute!"; + } + + if (! @$this->db->simple_query('SELECT subject FROM public.tbl_vorlagestudiengang')) + { + $query= "ALTER TABLE public.tbl_vorlagestudiengang + ADD COLUMN subject text; + "; + if ($this->db->simple_query($query)) + echo 'Column public.tbl_vorlagestudiengang.subject added!'; + else + echo "Error adding public.tbl_vorlagestudiengang.subject!"; + } + + if (! @$this->db->simple_query('SELECT orgform_kurzbz FROM public.tbl_vorlagestudiengang')) + { + $query= "ALTER TABLE public.tbl_vorlagestudiengang + ADD COLUMN orgform_kurzbz varchar(3) references bis.tbl_orgform(orgform_kurzbz); + "; + if ($this->db->simple_query($query)) + echo 'Column public.tbl_vorlagestudiengang.orgform_kurzbz added!'; + else + echo "Error adding public.tbl_vorlagestudiengang.orgform_kurzbz!"; + } + } + + public function down() + { + try + { + $this->dbforge->drop_column('public.tbl_vorlage', 'attribute'); + $this->dbforge->drop_column('public.tbl_vorlagestudiengang', 'subject'); + $this->dbforge->drop_column('public.tbl_vorlagestudiengang', 'orgform_kurzbz'); + echo "Column public.tbl_vorlage.attribute, public.tbl_vorlagestudiengang.subject, public.tbl_vorlagestudiengang.orgform_kurzbz dropped!"; + } + catch(Exception $e) + { + echo 'Exception abgefangen: ', $e->getMessage(), "\n"; + echo $this->db->error(); + } + } +} diff --git a/application/views/system/templatetextEdit.php b/application/views/system/templatetextEdit.php new file mode 100644 index 000000000..de6be6dde --- /dev/null +++ b/application/views/system/templatetextEdit.php @@ -0,0 +1,30 @@ +load->view('templates/header', array('title' => 'TemplateEdit', 'tinymce' => true)); +?> + +
+
+

Vorlagetext:

+StudiengangKZ: +
+ Version: + Aktiv: + OE:templatelib->widget("organisationseinheit_widget", array('oe_kurzbz' => $oe_kurzbz)); ?> + + + templatelib->widget("tinymce_widget", array('name' => 'text', 'text' => $text)); + ?> + +
+ +
+ +
+
+
+ +