[Welcome] Add final checks to carry out the needed migration

application/controllers/Welcome.php

@@ -31,12 +31,18 @@ class Welcome extends CI_Controller {
             $this->load->model('note');
             $data['NumberOfNotes'] = $this->note->CountAllNotes();
     
-            // load views
+            if(!$data['CountAllStationLocations'] && !$data['NumberOfStationLogbooks'] && !$data['NumberOfAPIKeys'] && !$data['NumberOfNotes']) {
-            $this->load->view('interface_assets/mini_header', $data);
+                // load views
-            $this->load->view('welcome/index');
+                $this->load->view('interface_assets/mini_header', $data);
-            $this->load->view('interface_assets/footer');
+                $this->load->view('welcome/index');
+                $this->load->view('interface_assets/footer');
+            } else {
+                $data['NoMigrationRequired'] = false;
+                $this->optionslib->update('version2_trigger', "true");
+                redirect('dashboard');
+            }
         } else {
-            redirect('login');
+            redirect('dashboard');
         }
     }
 

application/libraries/OptionsLib.php

@@ -37,6 +37,13 @@ class OptionsLib {
                 } else {
                     $CI->config->set_item('option_'.$item->option_name, $item->option_value);
                 }
+
+                // if version 2 mirgation has not been run then run it
+                if($item->option_name == "version2_trigger") {
+                    if($item->option_value == "false") {
+                        redirect('welcome');
+                    }
+                }
             }
         }
     }

application/views/welcome/index.php

@@ -1,6 +1,3 @@
-<?php
-echo $this->config->item('option_version2_trigger');
-?>
 <div class="container">
 
     <br>