diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php
index d1419b0b..e6df2b75 100644
--- a/application/controllers/Dashboard.php
+++ b/application/controllers/Dashboard.php
@@ -127,30 +127,6 @@ class Dashboard extends CI_Controller
$data['total_countries_needed'] = count($dxcc->result()) - $current;
- $this->load->model('Workabledxcc_model');
-
- $this->load->driver('cache', array('adapter' => 'file', 'backup' => 'file'));
-
- // Get the user ID from the session data
- $userID = $this->session->userdata('user_id');
-
- // Use the user ID to create a unique cache name
- $cacheName = 'thisWeekRecords_' . $userID;
-
- if (!$thisWeekRecords = $this->cache->get($cacheName)) {
- // If the cache does not exist, get the data and save it to the cache.
- $thisWeekRecords = $this->Workabledxcc_model->GetThisWeek();
- $this->cache->save($cacheName, $thisWeekRecords, 3600); // Cache for 1 hour (3600 seconds)
- }
-
- $data['thisWeekRecords'] = $thisWeekRecords;
-
- usort($data['thisWeekRecords'], function ($a, $b) {
- $dateA = new DateTime($a['1']);
- $dateB = new DateTime($b['1']);
- return $dateA <=> $dateB;
- });
-
$this->load->view('interface_assets/header', $data);
$this->load->view('dashboard/index');
$this->load->view('interface_assets/footer');
@@ -164,4 +140,29 @@ class Dashboard extends CI_Controller
$data['radio_status'] = $this->cat->recent_status();
$this->load->view('components/radio_display_table', $data);
}
+
+ function upcoming_dxcc_component()
+ {
+
+ $this->load->model('Workabledxcc_model');
+
+ $this->load->driver('cache', array('adapter' => 'file', 'backup' => 'file'));
+
+ // Get the user ID from the session data
+ $userID = $this->session->userdata('user_id');
+
+
+ $thisWeekRecords = $this->Workabledxcc_model->GetThisWeek();
+
+
+ $data['thisWeekRecords'] = $thisWeekRecords;
+
+ usort($data['thisWeekRecords'], function ($a, $b) {
+ $dateA = new DateTime($a['1']);
+ $dateB = new DateTime($b['1']);
+ return $dateA <=> $dateB;
+ });
+
+ $this->load->view('components/upcoming_dxccs', $data);
+ }
}
diff --git a/application/views/components/upcoming_dxccs.php b/application/views/components/upcoming_dxccs.php
new file mode 100644
index 00000000..78e83025
--- /dev/null
+++ b/application/views/components/upcoming_dxccs.php
@@ -0,0 +1,16 @@
+
+
+ | DXPeditions (This Week) |
+
+
+ ';
+ echo '' . $record['daysLeft'] . ' | '; // Date
+ echo '' . $record['callsign'] . ' | '; // Callsign
+ echo '' . $record['2'] . ' | '; // Country
+ echo '';
+ }
+ ?>
+
\ No newline at end of file
diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php
index 9ca564a6..63b0822a 100644
--- a/application/views/dashboard/index.php
+++ b/application/views/dashboard/index.php
@@ -295,26 +295,10 @@ function echoQrbCalcLink($mygrid, $grid, $vucc)
-
-
-
- | DXPeditions (This Week) |
-
-
- ';
- echo '' . $record['daysLeft'] . ' | '; // Date
- echo '' . $record['callsign'] . ' | '; // Callsign
- echo '' . $record['2'] . ' | '; // Country
- echo '';
- }
- ?>
-
-
-
-
+
+
+
Loading Upcoming DXPeditions.
+