diff --git a/application/models/Helvetia_model.php b/application/models/Helvetia_model.php index eccc0a85e..af5c51722 100644 --- a/application/models/Helvetia_model.php +++ b/application/models/Helvetia_model.php @@ -38,14 +38,14 @@ class helvetia_model extends CI_Model { if ($postdata['worked'] != NULL) { $helvetiaBand = $this->gethelvetiaWorked($location_list, $band, $postdata); foreach ($helvetiaBand as $line) { - $bandhelvetia[$line->col_state][$band] = '
'; + $bandhelvetia[$line->col_state][$band] = ''; $states[$line->col_state]['count']++; } } if ($postdata['confirmed'] != NULL) { $helvetiaBand = $this->gethelvetiaConfirmed($location_list, $band, $postdata); foreach ($helvetiaBand as $line) { - $bandhelvetia[$line->col_state][$band] = ''; + $bandhelvetia[$line->col_state][$band] = ''; $states[$line->col_state]['count']++; } } diff --git a/application/models/Iota.php b/application/models/Iota.php index 93982df5b..a70e5e530 100644 --- a/application/models/Iota.php +++ b/application/models/Iota.php @@ -29,7 +29,7 @@ class IOTA extends CI_Model { if ($postdata['worked'] != NULL) { $workedIota = $this->getIotaBandWorked($location_list, $band, $postdata); foreach ($workedIota as $wiota) { - $iotaMatrix[$wiota->tag][$band] = ''; + $iotaMatrix[$wiota->tag][$band] = ''; } } @@ -37,7 +37,7 @@ class IOTA extends CI_Model { if ($postdata['confirmed'] != NULL) { $confirmedIota = $this->getIotaBandConfirmed($location_list, $band, $postdata); foreach ($confirmedIota as $ciota) { - $iotaMatrix[$ciota->tag][$band] = ''; + $iotaMatrix[$ciota->tag][$band] = ''; } } } diff --git a/application/models/Jcc_model.php b/application/models/Jcc_model.php index 82c3b5164..f972eee40 100644 --- a/application/models/Jcc_model.php +++ b/application/models/Jcc_model.php @@ -855,14 +855,14 @@ class Jcc_model extends CI_Model { if ($postdata['worked'] != NULL) { $jccBand = $this->getJccWorked($location_list, $band, $postdata); foreach ($jccBand as $line) { - $bandJcc[$line->col_cnty][$band] = ''; + $bandJcc[$line->col_cnty][$band] = ''; $cities[$line->col_cnty]['count']++; } } if ($postdata['confirmed'] != NULL) { $jccBand = $this->getJccConfirmed($location_list, $band, $postdata); foreach ($jccBand as $line) { - $bandJcc[$line->col_cnty][$band] = ''; + $bandJcc[$line->col_cnty][$band] = ''; $cities[$line->col_cnty]['count']++; } } diff --git a/application/models/Rac.php b/application/models/Rac.php index f662e451f..1422cd113 100644 --- a/application/models/Rac.php +++ b/application/models/Rac.php @@ -38,14 +38,14 @@ class rac extends CI_Model { if ($postdata['worked'] != NULL) { $racBand = $this->getracWorked($location_list, $band, $postdata); foreach ($racBand as $line) { - $bandrac[$line->col_state][$band] = ''; + $bandrac[$line->col_state][$band] = ''; $states[$line->col_state]['count']++; } } if ($postdata['confirmed'] != NULL) { $racBand = $this->getracConfirmed($location_list, $band, $postdata); foreach ($racBand as $line) { - $bandrac[$line->col_state][$band] = ''; + $bandrac[$line->col_state][$band] = ''; $states[$line->col_state]['count']++; } } diff --git a/application/models/Waja.php b/application/models/Waja.php index d5792e1bb..6c48fbd3a 100644 --- a/application/models/Waja.php +++ b/application/models/Waja.php @@ -86,14 +86,14 @@ class WAJA extends CI_Model { if ($postdata['worked'] != NULL) { $wajaBand = $this->getWajaWorked($location_list, $band, $postdata); foreach ($wajaBand as $line) { - $bandWaja[$line->col_state][$band] = ''; + $bandWaja[$line->col_state][$band] = ''; $prefectures[$line->col_state]['count']++; } } if ($postdata['confirmed'] != NULL) { $wajaBand = $this->getWajaConfirmed($location_list, $band, $postdata); foreach ($wajaBand as $line) { - $bandWaja[$line->col_state][$band] = ''; + $bandWaja[$line->col_state][$band] = ''; $prefectures[$line->col_state]['count']++; } } diff --git a/application/models/Was.php b/application/models/Was.php index 720897212..1f012805c 100644 --- a/application/models/Was.php +++ b/application/models/Was.php @@ -36,14 +36,14 @@ class was extends CI_Model { if ($postdata['worked'] != NULL) { $wasBand = $this->getWasWorked($location_list, $band, $postdata); foreach ($wasBand as $line) { - $bandWas[$line->col_state][$band] = ''; + $bandWas[$line->col_state][$band] = ''; $states[$line->col_state]['count']++; } } if ($postdata['confirmed'] != NULL) { $wasBand = $this->getWasConfirmed($location_list, $band, $postdata); foreach ($wasBand as $line) { - $bandWas[$line->col_state][$band] = ''; + $bandWas[$line->col_state][$band] = ''; $states[$line->col_state]['count']++; } } diff --git a/assets/js/sections/helvetiamap.js b/assets/js/sections/helvetiamap.js index 8b615e5ff..37b6378a7 100644 --- a/assets/js/sections/helvetiamap.js +++ b/assets/js/sections/helvetiamap.js @@ -193,7 +193,7 @@ function style(feature) { function onClick(e) { var marker = e.target; - displayContactsOnMap($("#helvetiamap"),marker.feature.properties.kan_code[0], $('#band2').val(), $('#mode').val(), 'helvetia'); + displayContactsOnMap($("#helvetiamap"),marker.feature.properties.kan_code[0], $('#band2').val(), 'All', 'All', $('#mode').val(), 'helvetia'); } function onClick2(e) { diff --git a/assets/js/sections/iotamap.js b/assets/js/sections/iotamap.js index 3d1687730..683d71d03 100644 --- a/assets/js/sections/iotamap.js +++ b/assets/js/sections/iotamap.js @@ -169,5 +169,5 @@ function addMarker(L, D, mapColor, map) { function onClick(e) { var marker = e.target; - displayContactsOnMap($("#iotamap"), marker.options.iota,$('#band2').val(), $('#mode').val(), 'IOTA'); + displayContactsOnMap($("#iotamap"), marker.options.iota,$('#band2').val(), 'All', 'All', $('#mode').val(), 'IOTA'); } diff --git a/assets/js/sections/racmap.js b/assets/js/sections/racmap.js index 387c4c803..a19c7a28f 100644 --- a/assets/js/sections/racmap.js +++ b/assets/js/sections/racmap.js @@ -221,7 +221,7 @@ function style(feature) { function onClick(e) { zoomToFeature(e); var marker = e.target; - displayContactsOnMap($("#racmap"),marker.feature.id, $('#band2').val(), $('#mode').val(), 'RAC'); + displayContactsOnMap($("#racmap"),marker.feature.id, $('#band2').val(), 'All', 'All', $('#mode').val(), 'RAC'); } function onClick2(e) { diff --git a/assets/js/sections/wajamap.js b/assets/js/sections/wajamap.js index 45147faca..a3a97f8f5 100644 --- a/assets/js/sections/wajamap.js +++ b/assets/js/sections/wajamap.js @@ -307,7 +307,7 @@ function onClick(e) { zoomToFeature(e); var marker = e.target; var res = marker.feature.id.replace(/\D/g,''); - displayContactsOnMap($("#wajamap"),res, $('#band2').val(), $('#mode').val(), 'WAJA'); + displayContactsOnMap($("#wajamap"),res, $('#band2').val(), 'All', 'All', $('#mode').val(), 'WAJA'); } function onClick2(e) { diff --git a/assets/js/sections/wasmap.js b/assets/js/sections/wasmap.js index 3d2b4390f..77050adec 100644 --- a/assets/js/sections/wasmap.js +++ b/assets/js/sections/wasmap.js @@ -335,7 +335,7 @@ function onClick(e) { zoomToFeature(e); var marker = e.target; var res = marker.feature.id.substring(3, 5); - displayContactsOnMap($("#wasmap"), res, $('#band2').val(), $('#mode').val(), 'WAS'); + displayContactsOnMap($("#wasmap"), res, $('#band2').val(), 'All', 'All', $('#mode').val(), 'WAS'); } function onClick2(e) {