From f228e970664e666acd88bc60243f460147b14d46 Mon Sep 17 00:00:00 2001
From: David Siegfried <david.siegfried@uni-vechta.de>
Date: Tue, 4 Apr 2023 08:44:05 +0000
Subject: remove description fields from semester_data and termine, closes
 #2483

Closes #2483

Merge request studip/studip!1675
---
 app/controllers/admin/semester.php                |  1 -
 app/routes/Semester.php                           |  1 -
 app/views/admin/semester/edit.php                 |  8 ------
 app/views/admin/semester/index.php                |  2 +-
 db/migrations/5.4.2_remove_description_fields.php | 34 +++++++++++++++++++++++
 lib/classes/JsonApi/Schemas/Semester.php          |  1 -
 lib/models/CourseDate.class.php                   |  1 -
 lib/models/CourseExDate.class.php                 |  1 -
 lib/models/Semester.class.php                     |  2 --
 9 files changed, 35 insertions(+), 16 deletions(-)
 create mode 100644 db/migrations/5.4.2_remove_description_fields.php

diff --git a/app/controllers/admin/semester.php b/app/controllers/admin/semester.php
index 2130390..0dc8a5d 100644
--- a/app/controllers/admin/semester.php
+++ b/app/controllers/admin/semester.php
@@ -75,7 +75,6 @@ class Admin_SemesterController extends AuthenticatedController
 
             // Extract values
             $this->semester->name           = Request::i18n('name');
-            $this->semester->description    = Request::i18n('description');
             $this->semester->semester_token = Request::i18n('token');
             $this->semester->beginn         = $this->getTimeStamp('beginn');
             $this->semester->ende           = $this->getTimeStamp('ende', '23:59:59');
diff --git a/app/routes/Semester.php b/app/routes/Semester.php
index 8092282..bdb1ee7 100644
--- a/app/routes/Semester.php
+++ b/app/routes/Semester.php
@@ -105,7 +105,6 @@ class Semester extends \RESTAPI\RouteMap
             'id'             => $semester['semester_id'],
             'title'          => (string) $semester['name'],
             'token'          => (string) $semester['semester_token'],
-            'description'    => (string) $semester['description'],
             'begin'          => (int) $semester['beginn'],
             'end'            => (int) $semester['ende'],
             'seminars_begin' => (int) $semester['vorles_beginn'],
diff --git a/app/views/admin/semester/edit.php b/app/views/admin/semester/edit.php
index 1a40d23..9ef8b6f 100644
--- a/app/views/admin/semester/edit.php
+++ b/app/views/admin/semester/edit.php
@@ -30,14 +30,6 @@
         </label>
 
         <label>
-            <?= _('Beschreibung') ?>
-
-            <?= I18N::textarea('description', $semester->description, [
-                'id' => 'description',
-            ]) ?>
-        </label>
-
-        <label>
             <?= _('Externe ID') ?>
 
             <input type="text" name="external_id" value="<?= htmlReady($semester->external_id) ?>" maxlength="50">
diff --git a/app/views/admin/semester/index.php b/app/views/admin/semester/index.php
index 1fc87a7..511dbfb 100644
--- a/app/views/admin/semester/index.php
+++ b/app/views/admin/semester/index.php
@@ -60,7 +60,7 @@
                     <? endif; ?>
                 >
             </td>
-            <td title="<?= htmlReady($semester->description) ?>">
+            <td>
                 <?= htmlReady($semester->name) ?>
                 <? if (!$semester->visible): ?>
                 <?= '(' . _('gesperrt') . ')'; ?>
diff --git a/db/migrations/5.4.2_remove_description_fields.php b/db/migrations/5.4.2_remove_description_fields.php
new file mode 100644
index 0000000..1723778
--- /dev/null
+++ b/db/migrations/5.4.2_remove_description_fields.php
@@ -0,0 +1,34 @@
+<?php
+final class RemoveDescriptionFields extends Migration
+{
+    public function description()
+    {
+        return 'Removes the unused database columns `termine`.`description`, `ex_termine`.`description` and `semester_data`.`description`';
+    }
+
+    protected function up()
+    {
+        $query = "ALTER TABLE `termine`
+                  DROP COLUMN `description`";
+        DBManager::get()->exec($query);
+        $query = "ALTER TABLE `ex_termine`
+                  DROP COLUMN `description`";
+        DBManager::get()->exec($query);
+        $query = "ALTER TABLE `semester_data`
+                  DROP COLUMN `description`";
+        DBManager::get()->exec($query);
+    }
+
+    protected function down()
+    {
+        $query = "ALTER TABLE `termine`
+                  ADD COLUMN `description` TEXT AFTER `content`";
+        DBManager::get()->exec($query);
+        $query = "ALTER TABLE `ex_termine`
+                  ADD COLUMN `description` TEXT AFTER `content`";
+        DBManager::get()->exec($query);
+        $query = "ALTER TABLE `semester_data`
+                  ADD COLUMN `description` TEXT NOT NULL AFTER `name`";
+        DBManager::get()->exec($query);
+    }
+}
diff --git a/lib/classes/JsonApi/Schemas/Semester.php b/lib/classes/JsonApi/Schemas/Semester.php
index f1bca9c..75aef03 100644
--- a/lib/classes/JsonApi/Schemas/Semester.php
+++ b/lib/classes/JsonApi/Schemas/Semester.php
@@ -17,7 +17,6 @@ class Semester extends SchemaProvider
     {
         return [
             'title' => (string) $semester->name,
-            'description' => (string) $semester->description,
             'token' => (string) $semester->token,
             'start' => date('c', $semester->beginn),
             'end' => date('c', $semester->ende),
diff --git a/lib/models/CourseDate.class.php b/lib/models/CourseDate.class.php
index 1465fa1..9ae0268 100644
--- a/lib/models/CourseDate.class.php
+++ b/lib/models/CourseDate.class.php
@@ -15,7 +15,6 @@
  * @property string range_id database column
  * @property string autor_id database column
  * @property string content database column
- * @property string description database column
  * @property string date database column
  * @property string end_time database column
  * @property string mkdate database column
diff --git a/lib/models/CourseExDate.class.php b/lib/models/CourseExDate.class.php
index 625653e..f2c75b5 100644
--- a/lib/models/CourseExDate.class.php
+++ b/lib/models/CourseExDate.class.php
@@ -15,7 +15,6 @@
  * @property string range_id database column
  * @property string autor_id database column
  * @property string content database column
- * @property string description database column
  * @property string date database column
  * @property string end_time database column
  * @property string mkdate database column
diff --git a/lib/models/Semester.class.php b/lib/models/Semester.class.php
index 21481f2..1a490a6 100644
--- a/lib/models/Semester.class.php
+++ b/lib/models/Semester.class.php
@@ -16,7 +16,6 @@
  * @property string semester_id database column
  * @property string id alias column for semester_id
  * @property string name database column
- * @property string description database column
  * @property string semester_token database column
  * @property string beginn database column
  * @property string ende database column
@@ -64,7 +63,6 @@ class Semester extends SimpleORMap
         $config['registered_callbacks']['after_delete'][] = 'refreshCache';
 
         $config['i18n_fields']['name'] = true;
-        $config['i18n_fields']['description'] = true;
         $config['i18n_fields']['semester_token'] = true;
 
         parent::configure($config);
-- 
cgit v1.0