0.7.4: Got column sorting that ignores blanks working properly now.

classaxe · Jun 27, 2018 · 46e0b36 · 46e0b36
1 parent 4083367
commit 46e0b36
Show file tree

Hide file tree

Showing 8 changed files with 76 additions and 45 deletions.
diff --git a/src/Entity/Listener.php b/src/Entity/Listener.php
@@ -822,7 +822,7 @@ public function getFormattedNdbWeblogLink(): ?string
         $popup_url =    "https://www.classaxe.com/dx/ndb/rna/export_ndbweblog_index/{$this->id}";
         $popup_name =   "nwl_{$this->id}";
         $popup_args =   "width=640,height=480,status=1,scrollbars=1,resizable=1";
-        return "<a href=\"$popup_url\"  rel=\"popup|{$popup_name}|{$popup_args}\">NWL</a>";
+        return "<a href=\"$popup_url\" rel=\"popup|{$popup_name}|{$popup_args}\">NWL</a>";
     }
 
     /**

diff --git a/src/Repository/ListenerRepository.php b/src/Repository/ListenerRepository.php
@@ -17,7 +17,7 @@ class ListenerRepository extends ServiceEntityRepository
             'label'     =>  'Name',
             'order'     =>  'a',
             'sort'      =>  'l.name',
-            'td_class'  =>  '{% if listener.PrimaryQth %}primaryQth{% else %}secondaryQth{% endif %}',
+            'td_class'  =>  '(handled by twig)',
             'th_class'  =>  '',
             'tooltip'   =>  '',
         ],
@@ -208,6 +208,29 @@ class ListenerRepository extends ServiceEntityRepository
             'th_class'  =>  'txt_vertical',
             'tooltip'   =>  'Total number of signals of all types',
         ],
+        'website' => [
+            'admin'     =>  false,
+            'arg'       =>  '',
+            'field'     =>  'formattedWebsiteLink',
+            'label'     =>  'WWW',
+            'sortBy'    =>  [['l.wn','DESC'],['l.website', 'DIR']],
+            'order'     =>  'a',
+            'sort'      =>  'l.website',
+            'td_class'  =>  '',
+            'th_class'  =>  '',
+            'tooltip'   =>  '',
+        ],
+        'nwl' => [
+            'admin'     =>  false,
+            'arg'       =>  '',
+            'field'     =>  'formattedNdbWeblogLink',
+            'label'     =>  'NWL',
+            'order'     =>  '',
+            'sort'      =>  '',
+            'td_class'  =>  '',
+            'th_class'  =>  '',
+            'tooltip'   =>  'NDB Weblog for Listener',
+        ],
         'mapPos' => [
             'admin'     =>  true,
             'arg'       =>  '',
@@ -245,6 +268,12 @@ public function getColumns()
     public function getFilteredListeners($system, $args)
     {
         $qb = $this->createQueryBuilder('l');
+        if ($this->columns[$args['sort']]['sort']) {
+            $qb
+                ->addSelect(
+                    "(CASE WHEN (".$this->columns[$args['sort']]['sort'].")='' THEN 1 ELSE 0 END) AS _blank"
+                );
+        }
         switch($system) {
             case "reu":
                 $qb
@@ -277,15 +306,25 @@ public function getFilteredListeners($system, $args)
                 ->setParameter('region', $args['region'])
             ;
         }
-        $qb
-            ->orderBy(
-                ($this->columns[$args['sort']]['sort']),
-                ($args['order'] == 'd' ? 'DESC' : 'ASC')
-            );
-        return
+        if ($this->columns[$args['sort']]['sort']) {
             $qb
-                ->getQuery()
-                ->execute();
+                ->orderBy(
+                    '_blank',
+                    'ASC'
+                )
+                ->addOrderBy(
+                    ($this->columns[$args['sort']]['sort']),
+                    ($args['order'] == 'd' ? 'DESC' : 'ASC')
+                );
+
+        }
+        $result = $qb->getQuery()->execute();
+        // Necessary to resolve extra nesting in results caused by extra select to ignore empty fields in sort order
+        $out = [];
+        foreach ($result as $key => $value) {
+            $out[] = $value[0];
+        }
+        return $out;
     }
 
     public function getTotalListeners($system)

diff --git a/templates/base.html.twig b/templates/base.html.twig
@@ -9,6 +9,7 @@
     <script src="{{ asset('js/jquery-3.3.1.min.js') }}"></script>
     <script src="{{ asset('js/functions.js') }}"></script>
 </head>
+
 <body class="{{ system|lower }}">
 {% block body_head %}{% endblock %}
 {% block body %}{% endblock %}

diff --git a/templates/footer/footer.html.twig b/templates/footer/footer.html.twig
@@ -3,21 +3,21 @@
         <strong>Your {{ system|upper }} Editors are:</strong>
     </p>
 {% set credits = ['editors', 'awards', 'authors'] %}
-    {% for credit in credits %}
+{% for credit in credits %}
+
     <p>
-    {% for person in systems[system][credit] %}
+{% for person in systems[system][credit] %}
         <strong>
-    {% if person.email %}
-            <script>
-                document.write(
-                    ">'metsyS02%{{ system|upper|reverse }}=tcejbus?{{ person.email|reverse }}:otliam'=ferh a<".split('').reverse().join('')
-                );
-            </script>{{ person.name }}</a>
-    {% else %}
-            {{ person.name }}
-    {% endif %}
-        </strong> {{ person.role }}{% if not loop.last  %}<br />{% endif %}
-    {% endfor %}
+{% if person.email %}
+        <script>document.write(">'metsyS02%{{ system|upper|reverse }}=tcejbus?{{ person.email|reverse }}:otliam'=ferh a<".split('').reverse().join(''));</script>{{ person.name }}</a>
+{% else %}
+        {{ person.name }}
+{% endif %}
+        </strong> {{ person.role }}{% if not loop.last  %}<br />
+
+{% endif %}
+{% endfor %}
+
     </p>
 {% endfor %}
     <p class="copyright"><strong>&copy;{{ "now"|date("Y") }} Martin Francis</strong></p>

diff --git a/templates/forms/form.html.twig b/templates/forms/form.html.twig
@@ -1,6 +1,5 @@
 {# Include our twig widget customisations #}
 {% form_theme form 'forms/custom_form_div_layout.html.twig' %}
-
 <div class="controlPanel {{ form_class }}">
     <div class="header">{{ form_title }}</div>
     <div class="controls clearfix">
@@ -9,6 +8,3 @@
     {{ form_end(form) }}
     </div>
 </div>
-
-
-
diff --git a/templates/grids/listeners.html.twig b/templates/grids/listeners.html.twig
@@ -17,12 +17,7 @@
         <tr>
 {% for key, column in columns %}
 {% if ((not column.admin or isAdmin) and (not column.arg or (column.arg and column.arg in args.types))) %}
-{% if key == 'name' %}
-            <td class="{% if listener.PrimaryQth %}primaryQth{% else %}secondaryQth{% endif %}">
-{% else %}
-            <td{% if column.td_class %} class="{{ column.td_class }}"{% endif %}>
-{% endif %}
-{{ attribute(listener, column.field)|raw }}</td>
+            <td{% if key == 'name' and listener.PrimaryQth is defined %} class="{% if listener.PrimaryQth %}primaryQth{% else %}secondaryQth{% endif %}">{% else %}{% if column.td_class %} class="{{ column.td_class }}"{% endif %}>{% endif %}{{ attribute(listener, column.field)|raw }}</td>
 {% endif %}
 {% endfor %}
         </tr>

diff --git a/templates/listeners/index.html.twig b/templates/listeners/index.html.twig
@@ -4,10 +4,11 @@
 <div class="main">
     <h1>{{ mode }}</h1>
     {{ text|raw }}
-    {% set form_title='Customise ' ~ system|upper ~ ' Listener Report' %}
-    {% set form_class='listener_list' %}
-    {% include 'forms/form.html.twig' %}
+{% set form_title='Customise ' ~ system|upper ~ ' Listener Report' %}
+{% set form_class='listener_list' %}
+{% include 'forms/form.html.twig' %}
 </div>
+
 {% include 'grids/listeners.html.twig' %}
 
 <script>

diff --git a/templates/menu/menu.html.twig b/templates/menu/menu.html.twig
@@ -1,4 +1,3 @@
-
 <div class="menu-centered">
     <ul class="menu header">
         <li><h2>{{ systems[system]['title'] }}</h2></li>
@@ -21,13 +20,13 @@
     </ul>
 {% if isAdmin %}
     <ul class="menu mode">
-        {% for key, modeRepo in modes[1] %}
-            {% if ((isAdmin and modeRepo.admin) or (not isAdmin and modeRepo.guest))%}
-                <li{% if (app.request.get('_route') == key) %} class="is-active"{% endif %}>
-                    <a href="{{ url(key, { 'system' : system }) }}">{{ modeRepo['menu'] }}</a>
-                </li>
-            {% endif %}
-        {% endfor %}
+{% for key, modeRepo in modes[1] %}
+{% if ((isAdmin and modeRepo.admin) or (not isAdmin and modeRepo.guest))%}
+        <li{% if (app.request.get('_route') == key) %} class="is-active"{% endif %}>
+            <a href="{{ url(key, { 'system' : system }) }}">{{ modeRepo['menu'] }}</a>
+        </li>
+{% endif %}
+{% endfor %}
     </ul>
 {% endif %}
-</div>
+</div>