From 5fcfae8913e5aea95ede76e5c31e05ec4b1afaeb Mon Sep 17 00:00:00 2001
From: rkemmere <rkemmereit@gmx.de>
Date: Tue, 12 Nov 2024 10:10:44 +0100
Subject: [PATCH] Changes for 1.5.4

---
 CHANGELOG.md                                  | 13 +++++++++++
 package.yml                                   |  2 +-
 .../server/assets/js/tablesorter-custom.js    | 23 +++++++++++--------
 plugins/server/package.yml                    |  2 +-
 .../pages/project_manager.server.config.php   |  2 ++
 5 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f51783b..a7b5208 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## Version 1.5.4 // 12.11.2024
+
+# Plugin: Server 1.5.4
+* Weitere Redaxo Versionen aufgenommen
+* Spalten Anpassung Table Sorter
+
+
+## Version 1.5.2 // 11.11.2024
+
+# Plugin: Server 1.5.2
+* Weitere Redaxo Versionen aufgenommen
+
+
 ## Version 1.5.1 // 19.03.2024
 
 # Plugin: Server 1.5.1
diff --git a/package.yml b/package.yml
index 966e406..4f06dc8 100644
--- a/package.yml
+++ b/package.yml
@@ -1,5 +1,5 @@
 package: project_manager
-version: '1.5.3'
+version: '1.5.4'
 author: 'Friends Of REDAXO'
 supportpage: https://github.com/FriendsOfREDAXO/project_manager
 
diff --git a/plugins/server/assets/js/tablesorter-custom.js b/plugins/server/assets/js/tablesorter-custom.js
index 5b511e1..a846ff7 100644
--- a/plugins/server/assets/js/tablesorter-custom.js
+++ b/plugins/server/assets/js/tablesorter-custom.js
@@ -1,21 +1,26 @@
+
+
 $(document).on('rex:ready', function (event, container) {
-   $("#rex-page-project-manager-server-overview .project_manager-tablesorter").tablesorter({ 
+   
+  var projectManagerTablesorter = $("#rex-page-project-manager-server-overview .project_manager-tablesorter");
+ 
+  projectManagerTablesorter.tablesorter({ 
        theme : 'default', 
        widthFixed: true,
        widgets: ["saveSort"],
        widgetOptions: {
          saveSort: true
        },
-       dateFormat : "ddmmyyyy",
+       dateFormat: "dd-mm-yy",
        headers: {
          0: { sorter: false},
-         5: { sorter: "shortDate", dateFormat: "ddmmyyyy" },         
-         6: { sorter: 'text' },
+         6: { sorter: "shortDate", dateFormat: "dd-mm-yy" },
          7: { sorter: 'text' },
          8: { sorter: 'text' }
        }
        
-    });
+   });
+  
    $("#rex-page-project-manager-hosting-overview .project_manager-tablesorter").tablesorter({ 
      theme : 'default', 
      widthFixed: true,
@@ -23,10 +28,10 @@ $(document).on('rex:ready', function (event, container) {
      widgetOptions: {
        saveSort: true
      },
-     dateFormat : "ddmmyyyy",
+     dateFormat : "dd-mm-yy",
      headers: {
        0: { sorter: false},
-       7: { sorter: "shortDate", dateFormat: "ddmmyyyy" }
+       7: { sorter: "shortDate", dateFormat: "dd-mm-yy" }
      }     
   });
    $("#rex-page-project-manager-pagespeed-overview .project_manager-tablesorter").tablesorter({ 
@@ -36,10 +41,10 @@ $(document).on('rex:ready', function (event, container) {
      widgetOptions: {
        saveSort: true
      },
-     dateFormat : "ddmmyyyy",
+     dateFormat : "dd-mm-yy",
      headers: {
        0: { sorter: false},
-       4: { sorter: "shortDate", dateFormat: "ddmmyyyy" }
+       4: { sorter: "shortDate", dateFormat: "dd-mm-yy" }
      }     
   });
    
diff --git a/plugins/server/package.yml b/plugins/server/package.yml
index b314e39..d60f957 100644
--- a/plugins/server/package.yml
+++ b/plugins/server/package.yml
@@ -1,5 +1,5 @@
 package: project_manager/server
-version: '1.5.1'
+version: '1.5.4'
 author: 'Friends Of REDAXO'
 supportpage: https://github.com/FriendsOfREDAXO/project_manager
 
diff --git a/plugins/server/pages/project_manager.server.config.php b/plugins/server/pages/project_manager.server.config.php
index 305e9aa..6aac42a 100644
--- a/plugins/server/pages/project_manager.server.config.php
+++ b/plugins/server/pages/project_manager.server.config.php
@@ -95,6 +95,8 @@
 $select->addOption('5.16.1', '5.16.1');
 $select->addOption('5.17.0', '5.17.0');
 $select->addOption('5.17.1', '5.17.1');
+$select->addOption('5.18.0', '5.18.0');
+$select->addOption('5.18.1', '5.18.1');
 
 $select->setSelected($this->getConfig('cms_min'));
 $n['field'] = $select->get();