Skip to content

Commit 16148d2

Browse files
phl0phl0
committed
Temporary fix for all other awards
1 parent 086d793 commit 16148d2

File tree

11 files changed

+17
-17
lines changed

11 files changed

+17
-17
lines changed

‎application/models/Helvetia_model.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ function get_helvetia_array($bands, $postdata) {
3838
if ($postdata['worked'] != NULL) {
3939
$helvetiaBand = $this->gethelvetiaWorked($location_list, $band, $postdata);
4040
foreach ($helvetiaBand as $line) {
41-
$bandhelvetia[$line->col_state][$band] = '<div class="bg-danger awardsBgDanger"><a href=\'javascript:displayContacts("' . $line->col_state . '","' . $band . '","'. $postdata['mode'] . '","helvetia", "")\'>W</a></div>';
41+
$bandhelvetia[$line->col_state][$band] = '<div class="bg-danger awardsBgDanger"><a href=\'javascript:displayContacts("' . $line->col_state . '","' . $band . '","All","All","'. $postdata['mode'] . '","helvetia", "")\'>W</a></div>';
4242
$states[$line->col_state]['count']++;
4343
}
4444
}
4545
if ($postdata['confirmed'] != NULL) {
4646
$helvetiaBand = $this->gethelvetiaConfirmed($location_list, $band, $postdata);
4747
foreach ($helvetiaBand as $line) {
48-
$bandhelvetia[$line->col_state][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("' . $line->col_state . '","' . $band . '","'. $postdata['mode'] . '","helvetia", "'.$qsl.'")\'>C</a></div>';
48+
$bandhelvetia[$line->col_state][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("' . $line->col_state . '","' . $band . '","All","All","'. $postdata['mode'] . '","helvetia", "'.$qsl.'")\'>C</a></div>';
4949
$states[$line->col_state]['count']++;
5050
}
5151
}

‎application/models/Iota.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ function get_iota_array($iotaArray, $bands, $postdata) {
2929
if ($postdata['worked'] != NULL) {
3030
$workedIota = $this->getIotaBandWorked($location_list, $band, $postdata);
3131
foreach ($workedIota as $wiota) {
32-
$iotaMatrix[$wiota->tag][$band] = '<div class="bg-danger awardsBgDanger"><a href=\'javascript:displayContacts("'.$wiota->tag.'","'. $band . '","'. $postdata['mode'] . '","IOTA")\'>W</a></div>';
32+
$iotaMatrix[$wiota->tag][$band] = '<div class="bg-danger awardsBgDanger"><a href=\'javascript:displayContacts("'.$wiota->tag.'","'. $band . '","All","All","'. $postdata['mode'] . '","IOTA")\'>W</a></div>';
3333
}
3434
}
3535

3636
// If confirmed is checked, we add confirmed iotas to the array
3737
if ($postdata['confirmed'] != NULL) {
3838
$confirmedIota = $this->getIotaBandConfirmed($location_list, $band, $postdata);
3939
foreach ($confirmedIota as $ciota) {
40-
$iotaMatrix[$ciota->tag][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("'.$ciota->tag.'","'. $band . '","'. $postdata['mode'] . '","IOTA")\'>C</a></div>';
40+
$iotaMatrix[$ciota->tag][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("'.$ciota->tag.'","'. $band . '","All","All","'. $postdata['mode'] . '","IOTA")\'>C</a></div>';
4141
}
4242
}
4343
}

‎application/models/Jcc_model.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -855,14 +855,14 @@ function get_jcc_array($bands, $postdata) {
855855
if ($postdata['worked'] != NULL) {
856856
$jccBand = $this->getJccWorked($location_list, $band, $postdata);
857857
foreach ($jccBand as $line) {
858-
$bandJcc[$line->col_cnty][$band] = '<div class="bg-danger awardsBgDanger"><a href=\'javascript:displayContacts("' . $line->col_cnty . '","' . $band . '","'. $postdata['mode'] . '","JCC", "")\'>W</a></div>';
858+
$bandJcc[$line->col_cnty][$band] = '<div class="bg-danger awardsBgDanger"><a href=\'javascript:displayContacts("' . $line->col_cnty . '","' . $band . '","All","All","'. $postdata['mode'] . '","JCC", "")\'>W</a></div>';
859859
$cities[$line->col_cnty]['count']++;
860860
}
861861
}
862862
if ($postdata['confirmed'] != NULL) {
863863
$jccBand = $this->getJccConfirmed($location_list, $band, $postdata);
864864
foreach ($jccBand as $line) {
865-
$bandJcc[$line->col_cnty][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("' . $line->col_cnty . '","' . $band . '","'. $postdata['mode'] . '","JCC", "'.$qsl.'")\'>C</a></div>';
865+
$bandJcc[$line->col_cnty][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("' . $line->col_cnty . '","' . $band . '","All","All","'. $postdata['mode'] . '","JCC", "'.$qsl.'")\'>C</a></div>';
866866
$cities[$line->col_cnty]['count']++;
867867
}
868868
}

‎application/models/Rac.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ function get_rac_array($bands, $postdata) {
3838
if ($postdata['worked'] != NULL) {
3939
$racBand = $this->getracWorked($location_list, $band, $postdata);
4040
foreach ($racBand as $line) {
41-
$bandrac[$line->col_state][$band] = '<div class="bg-danger awardsBgDanger"><a href=\'javascript:displayContacts("' . $line->col_state . '","' . $band . '","'. $postdata['mode'] . '","RAC", "")\'>W</a></div>';
41+
$bandrac[$line->col_state][$band] = '<div class="bg-danger awardsBgDanger"><a href=\'javascript:displayContacts("' . $line->col_state . '","' . $band . '","All","All","'. $postdata['mode'] . '","RAC", "")\'>W</a></div>';
4242
$states[$line->col_state]['count']++;
4343
}
4444
}
4545
if ($postdata['confirmed'] != NULL) {
4646
$racBand = $this->getracConfirmed($location_list, $band, $postdata);
4747
foreach ($racBand as $line) {
48-
$bandrac[$line->col_state][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("' . $line->col_state . '","' . $band . '","'. $postdata['mode'] . '","RAC", "'.$qsl.'")\'>C</a></div>';
48+
$bandrac[$line->col_state][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("' . $line->col_state . '","' . $band . '","All","All","'. $postdata['mode'] . '","RAC", "'.$qsl.'")\'>C</a></div>';
4949
$states[$line->col_state]['count']++;
5050
}
5151
}

‎application/models/Waja.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,14 @@ function get_waja_array($bands, $postdata) {
8686
if ($postdata['worked'] != NULL) {
8787
$wajaBand = $this->getWajaWorked($location_list, $band, $postdata);
8888
foreach ($wajaBand as $line) {
89-
$bandWaja[$line->col_state][$band] = '<div class="bg-danger awardsBgDanger"><a href=\'javascript:displayContacts("' . $line->col_state . '","' . $band . '","'. $postdata['mode'] . '","WAJA", "")\'>W</a></div>';
89+
$bandWaja[$line->col_state][$band] = '<div class="bg-danger awardsBgDanger"><a href=\'javascript:displayContacts("' . $line->col_state . '","' . $band . '","All","All","'. $postdata['mode'] . '","WAJA", "")\'>W</a></div>';
9090
$prefectures[$line->col_state]['count']++;
9191
}
9292
}
9393
if ($postdata['confirmed'] != NULL) {
9494
$wajaBand = $this->getWajaConfirmed($location_list, $band, $postdata);
9595
foreach ($wajaBand as $line) {
96-
$bandWaja[$line->col_state][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("' . $line->col_state . '","' . $band . '","'. $postdata['mode'] . '","WAJA", "'.$qsl.'")\'>C</a></div>';
96+
$bandWaja[$line->col_state][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("' . $line->col_state . '","' . $band . '","All","All","'. $postdata['mode'] . '","WAJA", "'.$qsl.'")\'>C</a></div>';
9797
$prefectures[$line->col_state]['count']++;
9898
}
9999
}

‎application/models/Was.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ function get_was_array($bands, $postdata) {
3636
if ($postdata['worked'] != NULL) {
3737
$wasBand = $this->getWasWorked($location_list, $band, $postdata);
3838
foreach ($wasBand as $line) {
39-
$bandWas[$line->col_state][$band] = '<div class="bg-danger awardsBgDanger"><a href=\'javascript:displayContacts("' . $line->col_state . '","' . $band . '","'. $postdata['mode'] . '","WAS", "")\'>W</a></div>';
39+
$bandWas[$line->col_state][$band] = '<div class="bg-danger awardsBgDanger"><a href=\'javascript:displayContacts("' . $line->col_state . '","' . $band . '","All","All","'. $postdata['mode'] . '","WAS", "")\'>W</a></div>';
4040
$states[$line->col_state]['count']++;
4141
}
4242
}
4343
if ($postdata['confirmed'] != NULL) {
4444
$wasBand = $this->getWasConfirmed($location_list, $band, $postdata);
4545
foreach ($wasBand as $line) {
46-
$bandWas[$line->col_state][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("' . $line->col_state . '","' . $band . '","'. $postdata['mode'] . '","WAS", "'.$qsl.'")\'>C</a></div>';
46+
$bandWas[$line->col_state][$band] = '<div class="bg-success awardsBgSuccess"><a href=\'javascript:displayContacts("' . $line->col_state . '","' . $band . '","All","All","'. $postdata['mode'] . '","WAS", "'.$qsl.'")\'>C</a></div>';
4747
$states[$line->col_state]['count']++;
4848
}
4949
}

‎assets/js/sections/helvetiamap.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ function style(feature) {
193193

194194
function onClick(e) {
195195
var marker = e.target;
196-
displayContactsOnMap($("#helvetiamap"),marker.feature.properties.kan_code[0], $('#band2').val(), $('#mode').val(), 'helvetia');
196+
displayContactsOnMap($("#helvetiamap"),marker.feature.properties.kan_code[0], $('#band2').val(), 'All', 'All', $('#mode').val(), 'helvetia');
197197
}
198198

199199
function onClick2(e) {

‎assets/js/sections/iotamap.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,5 +169,5 @@ function addMarker(L, D, mapColor, map) {
169169

170170
function onClick(e) {
171171
var marker = e.target;
172-
displayContactsOnMap($("#iotamap"), marker.options.iota,$('#band2').val(), $('#mode').val(), 'IOTA');
172+
displayContactsOnMap($("#iotamap"), marker.options.iota,$('#band2').val(), 'All', 'All', $('#mode').val(), 'IOTA');
173173
}

‎assets/js/sections/racmap.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ function style(feature) {
221221
function onClick(e) {
222222
zoomToFeature(e);
223223
var marker = e.target;
224-
displayContactsOnMap($("#racmap"),marker.feature.id, $('#band2').val(), $('#mode').val(), 'RAC');
224+
displayContactsOnMap($("#racmap"),marker.feature.id, $('#band2').val(), 'All', 'All', $('#mode').val(), 'RAC');
225225
}
226226

227227
function onClick2(e) {

‎assets/js/sections/wajamap.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)