2.0.8 Signals List Performance improvements

classaxe · Mar 23, 2020 · 595002d · 595002d
1 parent 3f09d63
commit 595002d
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 37 deletions.
diff --git a/public/css/style.css b/public/css/style.css
@@ -1,7 +1,7 @@
 /*
  * Project:    RXX - NDB Logging Database
  * Homepage:   https://rxx.classaxe.com
- * Version:    2.0.7
+ * Version:    2.0.8
  * Date:       2020-03-23
  * Licence:    LGPL
  * Copyright:  2020 Martin Francis
@@ -1318,7 +1318,7 @@ fieldset#form_range_units div label {
   height: auto;
   border: 1px solid #cacaca;
   box-shadow: inset 0 1px 2px rgba(10, 10, 10, 0.1);
-  background: #fff;
+  background: #e6e6e6;
   padding: 0.25em;
   margin-bottom: 0.25em;
 }
@@ -1334,6 +1334,15 @@ fieldset#form_range_units div label {
   border: 1px solid #b0b000;
   border-radius: 2px;
 }
+.signal_view #form div#heardIn #heardInKey {
+  font-weight: bold;
+  white-space: nowrap;
+  float: right;
+  border: 1px solid #aaa;
+  border-radius: 3px;
+  padding: 0 0.25em;
+  background: #ccc;
+}
 .signal_view #form fieldset {
   margin-top: 0.75em;
 }

diff --git a/public/css/style.min.css b/public/css/style.min.css
diff --git a/src/css/style.less b/src/css/style.less
@@ -1248,7 +1248,7 @@ fieldset#form_range_units {
             height: auto;
             border: 1px solid #cacaca;
             box-shadow: inset 0 1px 2px rgba(10,10,10,.1);
-            background: #fff;
+            background: #e6e6e6;
             padding: 0.25em;
             margin-bottom: 0.25em;
             a {
@@ -1263,6 +1263,15 @@ fieldset#form_range_units {
                 border: 1px solid #b0b000;
                 border-radius: 2px;
             }
+            #heardInKey {
+                font-weight: bold;
+                white-space: nowrap;
+                float: right;
+                border: 1px solid #aaa;
+                border-radius: 3px;
+                padding: 0 0.25em;
+                background: #ccc;
+            }
         }
         fieldset {
             margin-top: 0.75em;

diff --git a/templates/signal/form.html.twig b/templates/signal/form.html.twig
@@ -77,7 +77,7 @@
                             <div id="heardIn">
                                 {{ heardInHtml|raw }}
                                 {% if '<b>' in heardInHtml %}
-                                    <div class="text-nowrap float-right">(<a><b>XX</b></a> = {% trans %}Daytime Log{% endtrans %})</div>
+                                    <div id="heardInKey">(<a><b>XX</b></a> = {% trans %}Daytime Log{% endtrans %})</div>
                                 {% endif %}
                             </div>
                         </div>

diff --git a/templates/signals/field.html.twig b/templates/signals/field.html.twig
diff --git a/templates/signals/list.html.twig b/templates/signals/list.html.twig
@@ -42,8 +42,36 @@
         >
 {% if args.personalise %}<th title="{% trans %}Logged by Personalised Listener{% endtrans %}">{{ signal.personalise ? '&#x2714;' : '' }}</th>{% endif %}
 {% for key, column in columns %}
-   {% include 'signals/field.html.twig' %}
-{% endfor %}
+    {% if ((not column.admin or isAdmin) and (not column.arg or (column.arg in args|keys and attribute(args, column.arg) != ''))) %}
+        {% set value = attribute(signal, column.field) %}
+        {% if (column.highlight and args[column.highlight] is not empty) %}
+            {% for repl in args[column.highlight] | split(' ') %}
+                {% set value = value | ireplace({ (repl) : '<em>' ~ repl|upper ~ '</em>' }) %}
+            {% endfor %}
+        {% endif %}
+        <td {% if column.td_class %} class="{{ column.td_class }}"{% endif %}>
+            {%
+                if (column.field == 'actions')
+            %}{% if isAdmin %}<a href="{{ url('signal_delete', { 'system' : system, 'id' : signal.id }) }}" class="delete" onclick="return confirm(msg.del_signal)">X</a>{% endif %}{%
+                elseif (column.field == 'call')
+            %}<a href="{{ url('signal', { 'system' : system, 'id' : signal.id }) }}" data-popup="1">{{ signal.call }}</a>{%
+                elseif (column.field == 'GSQ')
+            %}{% if signal.GSQ %}<a data-gsq="{{ signal.id }}">{{ value | raw }}</a>{% endif %}{%
+                elseif (column.field == 'ITU')
+            %}{% if signal.itu %}<a data-set="itu">{{ value | raw }}</a>{% endif %}{%
+                elseif (column.field == 'khz')
+            %}<a data-set="khz">{{ value | raw }}</a>{%
+                elseif (column.field == 'logs')
+            %}{% if signal.logs %}<a href="{{ url('signal_logs', { 'system' : system, 'id' : signal.id }) }}" data-popup="1">{{ signal.logs }}</a>{% endif %}{%
+                elseif (column.field == 'LSB' or column.field == 'USB')
+            %}{%  if value != 0 %}{% if (args.offsets == '1') %}{{ value | number_format(3) }}{% else %}{{ value }}{% endif %}{% endif %}{%
+                elseif (column.field == 'SP')
+            %}{% if signal.sp %}<a data-set="sp">{{ value | raw }}</a>{% endif %}{%
+                else
+            %}{{ value | raw }}{%
+                endif
+            %}</td>
+    {% endif %}{% endfor %}
         </tr>
 {% endfor %}
     </tbody>