2.0.1 Fixed PHP Unit Tests and 'Latest Logs' for listeners without S/P

classaxe · Mar 21, 2020 · a27323b · a27323b
1 parent 5a16769
commit a27323b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 28 deletions.
diff --git a/src/Repository/ListenerRepository.php b/src/Repository/ListenerRepository.php
@@ -504,7 +504,7 @@ private function getLatestLogsListenersForDate($system, $date)
     {
         $qb = $this
             ->createQueryBuilder('l')
-            ->select('l.id, l.name, l.sp');
+            ->select('l.id, l.name, l.sp, l.itu');
         $this->addFilterSystem($qb, $system);
         $qb
             ->andWhere('(l.logLatest = :date)')
@@ -753,27 +753,4 @@ public function getSignalsForListener($listenerID, array $args = [])
         }
         return $result;
     }
-
-    public function getSignalTypesForListener($listenerID) {
-        $qb = $this
-            ->createQueryBuilder('li')
-            ->select('s.type')
-            ->innerJoin('\App\Entity\Log', 'l')
-            ->andWhere('l.listenerid = li.id')
-
-            ->innerJoin('\App\Entity\Signal', 's')
-            ->andWhere('l.signalid = s.id')
-
-            ->andWhere('li.id = :listenerID')
-            ->setParameter('listenerID', $listenerID)
-
-            ->groupBy('s.type');
-
-        $results = $qb->getQuery()->execute();
-        $out = [];
-        foreach ($results as $result) {
-            $out[$result['type']] = $result['type'];
-        }
-        return $out;
-    }
 }
diff --git a/templates/admin/logon/index.html.twig b/templates/admin/logon/index.html.twig
@@ -2,6 +2,14 @@
 {% set form_title = 'Administrator Log On'|trans %}
 
 {% block body %}
+{% include 'js_trans.html.twig' %}
+<script>
+var system = '{{ system }}';
+$(document).ready( function() {
+    setExternalLinks();
+});
+</script>
+
 <div class="main">
     <div>{% include 'status.html.twig' %}</div>
     <h1>{% trans %}Log On{% endtrans %}</h1>

diff --git a/templates/listeners/latestlogs.html.twig b/templates/listeners/latestlogs.html.twig
@@ -3,7 +3,7 @@
         <div class="small-12 medium-1"><strong>{{ "Latest Logs:" | trans }}</strong></div>
         <div class="small-12 medium-11">
             {% for l in latestLogs['listeners'] %}
-                <a href="{{ url('listener_logs', { 'system' : system, 'id': l.id }) }}" data-popup="1">{{ l.name|raw }}</a> <em>({{ l.sp ? l.sp : l.itu }})</em>{% if not loop.last %} &nbsp; | &nbsp; {% endif %}
+                <a href="{{ url('listener_logs', { 'system' : system, 'id': l.id }) }}" data-popup="1">{{ l.name|raw }}</a> ({{ l.sp ? l.sp : l.itu }}){% if not loop.last %} &nbsp; | &nbsp; {% endif %}
             {% endfor %} &nbsp; <strong>({{ latestLogs['date'] }})</strong>
         </div>
     </div>

diff --git a/tests/Controller/LogonLogoffTest.php b/tests/Controller/LogonLogoffTest.php
@@ -45,7 +45,7 @@ public function testAllSystems()
             $this->setYesRedirect();
 
             foreach ($this->getAdminUsers() as $user => $data) {
-                $this->myClient->request('GET', '/en/' . $system . '/admin/logoff');
+                $this->myClient->request('GET', "/en/{$system}/admin/logoff");
 
                 $form = $this
                     ->getMyCrawler()
@@ -63,10 +63,10 @@ public function testAllSystems()
                     $data['valid'] ?
                         'You are now logged on as an Administrator and may perform administrative functions.'
                      :
-                        'Error: Incorrect Username and / or Password.'
+                        'Error: Incorrect Username and / or Password. X'
                     );
 
-                $errMsg =   $this->getMyCrawler()->filter('div#lastError');
+                $errMsg =   $this->getMyCrawler()->filter('span#lastError');
                 $okMsg =    $this->getMyCrawler()->filter('p#success');
 
                 $actual =   (