[Awards] WAJA Map W.I.P.

application/controllers/Awards.php

@@ -238,7 +238,7 @@ class Awards extends CI_Controller {
 		$data['page_title'] = "Awards - WAJA";
 		$this->load->view('interface_assets/header', $data);
 		$this->load->view('awards/waja/index');
-		$this->load->view('interface_assets/footer');
+		$this->load->view('interface_assets/footer', $footerData);
 	}
 
     public function vucc()	{
@@ -1018,6 +1018,8 @@ class Awards extends CI_Controller {
             $cq_array = null;
         }
 
+		$zones = array();
+
         foreach ($cq_array as $cq => $value) {
             foreach ($value  as $key) {
                 if($key != "") {
@@ -1041,6 +1043,52 @@ class Awards extends CI_Controller {
         echo json_encode($zones);
     }
 
+	/*
+        function waja_map
+    */
+    public function waja_map() {
+        $this->load->model('waja');
+        $this->load->model('bands');
+
+        $bands[] = $this->security->xss_clean($this->input->post('band'));
+
+        $postdata['qsl'] = $this->input->post('qsl') == 0 ? NULL: 1;
+        $postdata['lotw'] = $this->input->post('lotw') == 0 ? NULL: 1;
+        $postdata['eqsl'] = $this->input->post('eqsl') == 0 ? NULL: 1;
+        $postdata['worked'] = $this->input->post('worked') == 0 ? NULL: 1;
+        $postdata['confirmed'] = $this->input->post('confirmed')  == 0 ? NULL: 1;
+        $postdata['notworked'] = $this->input->post('notworked')  == 0 ? NULL: 1;
+        $postdata['band'] = $this->security->xss_clean($this->input->post('band'));
+        $postdata['mode'] = $this->security->xss_clean($this->input->post('mode'));
+
+
+		$waja_array = $this->waja->get_waja_array($bands, $postdata);
+
+		$prefectures = array();
+
+        foreach ($waja_array as $waja => $value) {
+            foreach ($value  as $key) {
+                if($key != "") {
+                    if (strpos($key, '>W<') !== false) {
+                        $prefectures[] = 'W';
+                        break;
+                    }
+                    if (strpos($key, '>C<') !== false) {
+                        $prefectures[] = 'C';
+                        break;
+                    }
+                    if (strpos($key, '-') !== false) {
+                        $prefectures[] = '-';
+                        break;
+                    }
+                }
+            }
+        }
+
+        header('Content-Type: application/json');
+        echo json_encode($prefectures);
+    }
+
     /*
         function dxcc_map
         This displays the DXCC map

application/views/awards/waja/index.php

@@ -1,6 +1,9 @@
+<script>
+	var tileUrl="<?php echo $this->optionslib->get_option('option_map_tile_server');?>"
+</script>
 
 <style>
-    #dxccmap {
+    #wajamap {
 	height: calc(100vh - 500px) !important;
 	max-height: 900px !important;
 }
@@ -32,10 +35,12 @@
 }
 </style>
 <div class="container">
-	        <!-- Award Info Box -->
-			<br>
+        <!-- Award Info Box -->
+        <br>
         <div id="awardInfoButton">
+
             <h2><?php echo $page_title; ?></h2>
+
         </div>
         <!-- End of Award Info Box -->
 
@@ -119,6 +124,9 @@
                 <div class="col-md-10">
                     <button id="button2id" type="reset" name="button2id" class="btn btn-sm btn-warning">Reset</button>
                     <button id="button1id" type="submit" name="button1id" class="btn btn-sm btn-primary">Show</button>
+                    <?php if ($waja_array) {
+                        ?><button type="button" onclick="load_waja_map();" class="btn btn-info btn-sm"><i class="fas fa-globe-americas"></i> Show WAJA Map</button>
+                    <?php }?>
                 </div>
             </div>
 
@@ -129,14 +137,17 @@
         <li class="nav-item">
             <a class="nav-link active" id="table-tab" data-bs-toggle="tab" href="#table" role="tab" aria-controls="table" aria-selected="true">Table</a>
         </li>
+        <li class="nav-item">
+            <a class="nav-link" id="map-tab" onclick="load_waja_map();" data-bs-toggle="tab" href="#wajamaptab" role="tab" aria-controls="home" aria-selected="false">Map</a>
+        </li>
     </ul>
     <br />
 
     <div class="tab-content" id="myTabContent">
-        <div class="tab-pane fade" id="dxccmaptab" role="tabpanel" aria-labelledby="home-tab">
+        <div class="tab-pane fade" id="wajamaptab" role="tabpanel" aria-labelledby="home-tab">
     <br />
 
-    <div id="dxccmap"></div>
+    <div id="wajamap"></div>
 
     </div>
 
@@ -158,7 +169,7 @@
         echo '</tr>
                     </thead>
                     <tbody>';
-        foreach ($waja_array as $dxcc => $value) {      // Fills the table with the data
+        foreach ($waja_array as $waja => $value) {      // Fills the table with the data
             echo '<tr>';
             foreach ($value as $name => $key) {
 				echo '<td style="text-align: center">' . $key . '</td>';
@@ -182,14 +193,14 @@
 
         <tr><td>Total worked</td>';
 
-        foreach ($waja_summary['worked'] as $dxcc) {      // Fills the table with the data
-            echo '<td style="text-align: center">' . $dxcc . '</td>';
+        foreach ($waja_summary['worked'] as $waja) {      // Fills the table with the data
+            echo '<td style="text-align: center">' . $waja . '</td>';
         }
 
         echo '</tr><tr>
         <td>Total confirmed</td>';
-        foreach ($waja_summary['confirmed'] as $dxcc) {      // Fills the table with the data
-            echo '<td style="text-align: center">' . $dxcc . '</td>';
+        foreach ($waja_summary['confirmed'] as $waja) {      // Fills the table with the data
+            echo '<td style="text-align: center">' . $waja . '</td>';
         }
 
         echo '</tr>