Implement eQSL and QSL filter for CQ awards

application/controllers/Awards.php

@@ -359,8 +359,9 @@ class Awards extends CI_Controller {
         $data['bands'] = $bands; // Used for displaying selected band(s) in the table in the view
 
         if($this->input->method() === 'post') {
-            $postdata['lotw'] = $this->input->post('lotw');
             $postdata['qsl'] = $this->input->post('qsl');
+            $postdata['lotw'] = $this->input->post('lotw');
+            $postdata['eqsl'] = $this->input->post('eqsl');
             $postdata['worked'] = $this->input->post('worked');
             $postdata['confirmed'] = $this->input->post('confirmed');
             $postdata['notworked'] = $this->input->post('notworked');
@@ -368,8 +369,9 @@ class Awards extends CI_Controller {
 			$postdata['mode'] = $this->input->post('mode');
         }
         else { // Setting default values at first load of page
-            $postdata['lotw'] = 1;
             $postdata['qsl'] = 1;
+            $postdata['lotw'] = 1;
+            $postdata['eqsl'] = 0;
             $postdata['worked'] = 1;
             $postdata['confirmed'] = 1;
             $postdata['notworked'] = 1;
@@ -639,8 +641,9 @@ class Awards extends CI_Controller {
 
         $bands[] = $this->input->post('band');
 
-        $postdata['lotw'] = $this->input->post('lotw') == 0 ? NULL: 1;
         $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;

application/models/Cq.php

@@ -24,6 +24,19 @@ class CQ extends CI_Model{
             $cqZ[$i]['count'] = 0;                   // Inits each cq zone's count
         }
 
+        $qsl = "";
+        if ($postdata['confirmed'] != NULL) {
+            if ($postdata['qsl'] != NULL ) {
+                $qsl .= "Q";
+            }
+            if ($postdata['lotw'] != NULL ) {
+                $qsl .= "L";
+            }
+            if ($postdata['eqsl'] != NULL ) {
+                $qsl .= "E";
+            }
+        }
+
         foreach ($bands as $band) {
             for ($i = 1; $i <= 40; $i++) {
                 $bandCq[$i][$band] = '-';                  // Sets all to dash to indicate no result
@@ -32,14 +45,14 @@ class CQ extends CI_Model{
             if ($postdata['worked'] != NULL) {
                 $cqBand = $this->getCQWorked($location_list, $band, $postdata);
                 foreach ($cqBand as $line) {
-                    $bandCq[$line->col_cqz][$band] = '<div class="alert-danger"><a href=\'javascript:displayContacts("' . str_replace("&", "%26", $line->col_cqz) . '","' . $band . '","'. $postdata['mode'] . '","CQZone")\'>W</a></div>';
+                    $bandCq[$line->col_cqz][$band] = '<div class="alert-danger"><a href=\'javascript:displayContacts("' . str_replace("&", "%26", $line->col_cqz) . '","' . $band . '","'. $postdata['mode'] . '","CQZone","")\'>W</a></div>';
                     $cqZ[$line->col_cqz]['count']++;
                 }
             }
             if ($postdata['confirmed'] != NULL) {
                 $cqBand = $this->getCQConfirmed($location_list, $band, $postdata);
                 foreach ($cqBand as $line) {
-                    $bandCq[$line->col_cqz][$band] = '<div class="alert-success"><a href=\'javascript:displayContacts("' . str_replace("&", "%26", $line->col_cqz) . '","' . $band . '","'. $postdata['mode'] . '","CQZone")\'>C</a></div>';
+                    $bandCq[$line->col_cqz][$band] = '<div class="alert-success"><a href=\'javascript:displayContacts("' . str_replace("&", "%26", $line->col_cqz) . '","' . $band . '","'. $postdata['mode'] . '","CQZone","'.$qsl.'")\'>C</a></div>';
                     $cqZ[$line->col_cqz]['count']++;
                 }
             }
@@ -132,16 +145,20 @@ class CQ extends CI_Model{
 
     function addQslToQuery($postdata) {
         $sql = '';
-        if ($postdata['lotw'] != NULL and $postdata['qsl'] == NULL) {
+        $qsl = array();
-            $sql .= " and col_lotw_qsl_rcvd = 'Y'";
+        if ($postdata['lotw'] != NULL || $postdata['qsl'] != NULL || $postdata['eqsl'] != NULL) {
-        }
+            $sql .= ' and (';
-
+            if ($postdata['qsl'] != NULL) {
-        if ($postdata['qsl'] != NULL and $postdata['lotw'] == NULL) {
+                array_push($qsl, "col_qsl_rcvd = 'Y'");
-            $sql .= " and col_qsl_rcvd = 'Y'";
+            }
-        }
+            if ($postdata['lotw'] != NULL) {
-
+                array_push($qsl, "col_lotw_qsl_rcvd = 'Y'");
-        if ($postdata['qsl'] != NULL && $postdata['lotw'] != NULL) {
+            }
-            $sql .= " and (col_qsl_rcvd = 'Y' or col_lotw_qsl_rcvd = 'Y')";
+            if ($postdata['eqsl'] != NULL) {
+                array_push($qsl, "col_eqsl_qsl_rcvd = 'Y'");
+            }
+            $sql .= implode(' or ', $qsl);
+            $sql .= ')';
         }
         return $sql;
     }

application/views/awards/cq/index.php

@@ -57,7 +57,7 @@
             </div>
 
             <div class="form-group row">
-                <div class="col-md-2">QSL / LoTW</div>
+                <div class="col-md-2">QSL Type</div>
                 <div class="col-md-10">
                     <div class="form-check-inline">
                         <input class="form-check-input" type="checkbox" name="qsl" value="1" id="qsl" <?php if ($this->input->post('qsl') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
@@ -67,6 +67,10 @@
                         <input class="form-check-input" type="checkbox" name="lotw" value="1" id="lotw" <?php if ($this->input->post('lotw') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> >
                         <label class="form-check-label" for="lotw">LoTW</label>
                     </div>
+                   <div class="form-check-inline">
+                        <input class="form-check-input" type="checkbox" name="eqsl" value="1" id="eqsl" <?php if ($this->input->post('eqsl')) echo ' checked="checked"'; ?> >
+                        <label class="form-check-label" for="eqsl">eQSL</label>
+                    </div>
                 </div>
             </div>
 
@@ -201,4 +205,4 @@
 
             </div>
         </div>
-</div>
+</div>