fix: Fix application status tag cases. (#174)

* fix: Fix application status tag cases. * fix: Fix application status tag cases. fix: Fix application status tag cases. fix: Stop rendering empty nav menu on sign-in page.
dvsa · Aug 2, 2024 · 1b751bf · 1b751bf
1 parent 88fd65c
commit 1b751bf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/module/Application/src/View/Model/ApplicationOverviewSection.php b/module/Application/src/View/Model/ApplicationOverviewSection.php
@@ -25,17 +25,17 @@ public function __construct($ref, $data, $sectionDetails)
         switch ($status) {
             case 1:
                 $mode = 'edit';
-                $statusText = 'INCOMPLETE';
+                $statusText = 'Incomplete';
                 $statusColour = 'orange';
                 break;
             case 2:
                 $mode = 'edit';
-                $statusText = 'COMPLETE';
+                $statusText = 'Complete';
                 $statusColour = 'green';
                 break;
             default:
                 $mode = 'add';
-                $statusText = 'NOT STARTED';
+                $statusText = 'Not started';
                 $statusColour = 'grey';
                 break;
         }

diff --git a/module/Application/test/View/Model/ApplicationOverviewSectionTest.php b/module/Application/test/View/Model/ApplicationOverviewSectionTest.php
@@ -27,7 +27,7 @@ public function testViewWithRequiresAttention(): void
         $this->assertInstanceOf(ViewModel::class, $viewModel);
         $this->assertEquals('section.name.type_of_licence', $viewModel->getVariable('name'));
         $this->assertEquals('orange', $viewModel->getVariable('statusColour'));
-        $this->assertEquals('INCOMPLETE', $viewModel->getVariable('status'));
+        $this->assertEquals('Incomplete', $viewModel->getVariable('status'));
         $this->assertTrue($viewModel->getVariable('enabled'));
         $this->assertEquals(1, $viewModel->getVariable('sectionNumber'));
     }
@@ -50,7 +50,7 @@ public function testViewWithUpdated(): void
         $this->assertInstanceOf(ViewModel::class, $viewModel);
         $this->assertEquals('section.name.type_of_licence', $viewModel->getVariable('name'));
         $this->assertEquals('green', $viewModel->getVariable('statusColour'));
-        $this->assertEquals('COMPLETE', $viewModel->getVariable('status'));
+        $this->assertEquals('Complete', $viewModel->getVariable('status'));
         $this->assertTrue($viewModel->getVariable('enabled'));
         $this->assertEquals(1, $viewModel->getVariable('sectionNumber'));
     }
@@ -73,7 +73,7 @@ public function testViewWithUnchanged(): void
         $this->assertInstanceOf(ViewModel::class, $viewModel);
         $this->assertEquals('section.name.type_of_licence', $viewModel->getVariable('name'));
         $this->assertEquals('grey', $viewModel->getVariable('statusColour'));
-        $this->assertEquals('NOT STARTED', $viewModel->getVariable('status'));
+        $this->assertEquals('Not Started', $viewModel->getVariable('status'));
         $this->assertFalse($viewModel->getVariable('enabled'));
         $this->assertEquals(1, $viewModel->getVariable('sectionNumber'));
     }

diff --git a/module/Olcs/view/layouts/base.phtml b/module/Olcs/view/layouts/base.phtml
@@ -193,12 +193,12 @@ $isLoggedIn = $currentUser->isLoggedIn();
                   : $this->translate('header-vehicle-operator-licensing');
           ?>
         </a>
+        <?php  if ($isLoggedIn): ?>
         <nav aria-label="Menu" class="govuk-header__navigation">
         <button type="button" class="govuk-header__menu-button govuk-js-header-toggle" aria-controls="navigation" aria-label="<?php echo $this->escapeHtml($this->translate('show.or.hide.top.level.navigation')); ?>">
             <?php echo $this->escapeHtml($this->translate('menu')); ?>
         </button>
           <?php
-          if ($isLoggedIn) {
               // get Home navigation
               $navigation = $this->navigation('navigation')->getContainer()->findBy('id', 'home');
 
@@ -219,9 +219,9 @@ $isLoggedIn = $currentUser->isLoggedIn();
 
               // This seems irrelevant, but it's very important as the partial is set elsewhere
               $menu->setPartial(null);
-          }
           ?>
          </nav>
+        <?php endif; ?>
       </div>
     </div>
   </header>