2.63.1 More preparations for CLE Panner mode

public/css/style.css

@@ -1,10 +1,10 @@
 /*
  * Project:    RXX - NDB Logging Database
  * Homepage:   https://rxx.classaxe.com
- * Version:    2.58.0
- * Date:       2023-08-26
+ * Version:    2.63.1
+ * Date:       2024-03-04
  * Licence:    LGPL
- * Copyright:  2023 Martin Francis
+ * Copyright:  2024 Martin Francis
  */
 /* [ System Colours ] */
 body.reu {
@@ -2051,6 +2051,7 @@ table.logsessions tbody tr.selected td {
 }
 .signal_list #form_khz_1,
 .signal_list #form_khz_2 {
+  text-align: right;
   width: 50px;
 }
 .signal_list #form_channels {
@@ -2185,6 +2186,7 @@ table.logsessions tbody tr.selected td {
 }
 .signal_list #form_range_min,
 .signal_list #form_range_max {
+  text-align: right;
   width: 50px;
 }
 .signal_list label[for="form_range_min"] {
@@ -3047,6 +3049,80 @@ div.scroll div table.parse.results tbody tr {
   margin: 0 0 0.25em 0;
   vertical-align: middle;
 }
+/* [ Form Dimensions ] */
+.cle_planner {
+  width: 550px;
+}
+.cle_planner fieldset.section {
+  display: inline-block;
+  width: 540px;
+  float: left;
+}
+.cle_planner input[type='text'],
+.cle_planner select {
+  width: 405px;
+}
+.cle_planner #form_offsets {
+  width: 85px;
+}
+.cle_planner #form_khz_1,
+.cle_planner #form_khz_2 {
+  text-align: right;
+  width: 50px;
+}
+.cle_planner #form_channels {
+  width: 115px;
+}
+.cle_planner #form_date_1,
+.cle_planner #form_date_2 {
+  width: 95px;
+  padding: 0 1.75em 0 0.25em !important;
+  background: #ffffff url("../../../image/calendar.png") no-repeat;
+  background-size: auto 100%;
+  background-position: right;
+}
+.cle_planner label[for="form_date_1"] {
+  width: auto !important;
+  margin: 0 0.25em 0 1em;
+}
+.cle_planner span {
+  display: inline-block;
+  margin: 0 0.25em;
+  float: left;
+}
+fieldset#form_type legend,
+fieldset#form_status legend,
+fieldset#form_offsets legend {
+  line-height: 1.8em;
+  display: block;
+  font-size: 90%;
+  float: left;
+  font-weight: bold;
+  padding: 0 0.5em 0 0;
+  color: #000000;
+}
+fieldset#form_type legend,
+fieldset#form_status legend {
+  text-align: left;
+  width: 130px;
+}
+fieldset#form_status div {
+  margin: 0;
+}
+fieldset#form_status div label {
+  min-width: 5em;
+  margin: 0 0.25em;
+}
+fieldset#form_offsets legend {
+  text-align: right;
+  width: 50px;
+}
+fieldset#form_offsets div {
+  margin: 0;
+}
+fieldset#form_offsets div label {
+  margin: 0 0.25em;
+}
 .donor_view #form div label,
 .donation_view #form div label {
   width: 25%;

public/js/functions.js

@@ -1,10 +1,10 @@
 /*
  * Project:    RXX - NDB Logging Database
  * Homepage:   https://rxx.classaxe.com
- * Version:    2.62.0
- * Date:       2023-12-20
+ * Version:    2.63.1
+ * Date:       2024-03-04
  * Licence:    LGPL
- * Copyright:  2023 Martin Francis
+ * Copyright:  2024 Martin Francis
  */
 var gridColor = "#808080";
 var gridOpacity = 0.5;
@@ -188,6 +188,25 @@ var awards = {
     }
 };
 
+function initClePlannerForm(pagingMsg, resultsCount) {
+    $(document).ready( function() {
+        var c = COMMON_FORM;
+        c.setPagingControls();
+
+        setColumnSortActions();
+        setColumnSortedClass();
+        setExternalLinks();
+
+        c.setTypesStyles();
+        c.setTypesDefault();
+        c.setTypesAllAction();
+        c.setDatePickerActions();
+
+
+        c.setPagingStatus(pagingMsg, resultsCount);
+    });
+}
+
 var cle = {
     init: function() {
         $('#toggle_editor')

src/Controller/Web/Listeners/Collection.php

@@ -16,27 +16,6 @@ class Collection extends Base
     private $filename;
     private $system;
 
-    /**
-     * @Route(
-     *     "/{system}/listeners",
-     *     requirements={
-     *        "system": "reu|rna|rww"
-     *     },
-     *     name="_listeners"
-     * )
-     */
-    public function _listenerListController(
-        $system
-    ) {
-        $parameters =[
-            '_locale' =>    $this->get('session')->get('_locale'),
-            'system' =>     $system
-        ];
-
-        return $this->redirectToRoute('listeners', $parameters, 301);
-    }
-
-
     /**
      * @Route(
      *     "/{_locale}/{system}/listeners",

src/Controller/Web/Listeners/Redirect.php

@@ -26,7 +26,7 @@ public function redirect_1(GeoService $GeoService)
             'system' => $GeoService->getDefaultSystem()
         ];
 
-        return $this->redirectToRoute('listeners', $parameters);
+        return $this->redirectToRoute('listeners', $parameters, 301);
     }
 
     /**
@@ -47,7 +47,7 @@ public function redirect_2($_locale, GeoService $GeoService)
             'system' => $GeoService->getDefaultSystem()
         ];
 
-        return $this->redirectToRoute('listeners', $parameters);
+        return $this->redirectToRoute('listeners', $parameters, 301);
     }
 
     /**
@@ -67,6 +67,6 @@ public function redirect_3($system)
             'system' =>     $system
         ];
 
-        return $this->redirectToRoute('listeners', $parameters);
+        return $this->redirectToRoute('listeners', $parameters, 301);
     }
 }

src/Form/Users/Users.php

@@ -2,12 +2,26 @@
 namespace App\Form\Users;
 
 use App\Form\Base;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\Form\FormInterface;
 
 /**
  * Class ListenerLogs
  * @package App\Form\Users
  */
 class Users extends Base
 {
+    /**
+     * @param FormBuilderInterface $formBuilder
+     * @param array $options
+     * @return FormInterface|void
+     */
+    public function buildForm(FormBuilderInterface $formBuilder, array $options)
+    {
+        $this->addPaging($formBuilder, $options);
+        $this->addPagingBottom($formBuilder, $options);
+        $this->addSorting($formBuilder, $options);
 
+        return $formBuilder->getForm();
+    }
 }

src/css/include/cle_planner/form.less

@@ -0,0 +1,84 @@
+/* [ Form Dimensions ] */
+.cle_planner {
+    width: @width[clePlannerForm];
+    fieldset.section {
+        display:inline-block;
+        width: @width[clePlannerForm] - 10;
+        float: left;
+    }
+    input[type='text'],
+    select {
+        width: @width[clePlannerForm] - @width[label] - 15;
+    }
+    #form_offsets {
+        width: 85px;
+    }
+    #form_khz_1,
+    #form_khz_2 {
+        text-align: right;
+        width: 50px;
+    }
+    #form_channels {
+        width: 115px;
+    }
+    #form_date_1,
+    #form_date_2 {
+        width: 95px;
+        padding: 0 1.75em 0 0.25em !important;
+        background: #ffffff url("../../../image/calendar.png") no-repeat;
+        background-size: auto 100%;
+        background-position: right;
+    }
+    label[for="form_date_1"] {
+        width: auto !important;
+        margin: 0 0.25em 0 1em;
+    }
+    span {
+        display: inline-block;
+        margin: 0 0.25em;
+        float: left;
+    }
+}
+fieldset#form_type,
+fieldset#form_status,
+fieldset#form_offsets {
+    legend {
+        line-height: 1.8em;
+        display: block;
+        font-size: 90%;
+        float: left;
+        font-weight: bold;
+        padding: 0 0.5em 0 0;
+        color: #000000;
+    }
+}
+fieldset#form_type,
+fieldset#form_status {
+    legend {
+        text-align: left;
+        width: @width[label];
+    }
+}
+fieldset#form_status {
+    div {
+        margin: 0;
+        label {
+            min-width: 5em;
+            margin: 0 0.25em;
+        }
+    }
+}
+
+fieldset#form_offsets {
+    legend {
+        text-align: right;
+        width: 50px;
+    }
+    div {
+        margin: 0;
+        label {
+            margin: 0 0.25em;
+        }
+    }
+}
+

src/css/include/signal/form.less

@@ -51,6 +51,7 @@
     }
     #form_khz_1,
     #form_khz_2 {
+        text-align: right;
         width: 50px;
     }
     #form_channels {
@@ -186,6 +187,7 @@
     }
     #form_range_min,
     #form_range_max {
+        text-align: right;
         width: 50px;
     }
     label[for="form_range_min"] {

src/css/style.less

@@ -2,6 +2,7 @@
 @width: {
     menuSysBtn:     190px;
     menuLangBtn:    80px;
+    clePlannerForm: 550px;
     listenersForm:  580px;
     signalsForm:    580px;
     logonForm:      300px;
@@ -526,6 +527,7 @@ button.tiny {
 @import (less) 'include/listener/logupload.less';
 @import (less) 'include/log/view.less';
 @import (less) 'include/cle/edit.less';
+@import (less) 'include/cle_planner/form.less';
 @import (less) 'include/donation/edit.less';
 
 a.add,

src/js/cle_planner.js

@@ -0,0 +1,18 @@
+function initClePlannerForm(pagingMsg, resultsCount) {
+    $(document).ready( function() {
+        var c = COMMON_FORM;
+        c.setPagingControls();
+
+        setColumnSortActions();
+        setColumnSortedClass();
+        setExternalLinks();
+
+        c.setTypesStyles();
+        c.setTypesDefault();
+        c.setTypesAllAction();
+        c.setDatePickerActions();
+
+
+        c.setPagingStatus(pagingMsg, resultsCount);
+    });
+}

templates/users/index.html.twig

@@ -3,6 +3,7 @@
 {% block body %}
     <div class="main">
         {% include 'users/list.html.twig' %}
+        {% include 'forms/pagingbottom.html.twig' %}
     </div>
     <script>
         initUsersForm(msg.paging_u, {{ results.total }});

templates/users/list.html.twig

@@ -4,7 +4,7 @@
     {% include 'status.html.twig' %}
     {{ form_start(form) }}
         {% include 'forms/paging.html.twig' %}
-    {{ form_end(form) }}
+    {{ form_end(form, {'render_rest': false}) }}
 
 {% if records|length > 0 %}
     <table id="wide" class="user results short">