Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev test PR #3150

Closed
wants to merge 28 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
6a6221b
Forgot to add Alaska to USA
magicbug May 29, 2024
7d5ff63
Readme updated
magicbug May 30, 2024
b3db31a
Old comment
magicbug May 30, 2024
7741c38
Add better comments
magicbug May 30, 2024
afb567c
[Dashboard] Update the QSO Today every few seconds
magicbug May 30, 2024
d1360ed
[Station Locations] Added venezuela states
magicbug Jun 5, 2024
83ce056
[Station Locations] Added australia states
magicbug Jun 5, 2024
51886c7
[Station Location] Added Papua New Guinea States
magicbug Jun 5, 2024
d76896e
[Station Locations] Added New Zealand States
magicbug Jun 5, 2024
f40b244
[Station Location] Added Belgium States
magicbug Jun 5, 2024
f1f1817
Added Flag to Maps Popups
Jun 11, 2024
02281ae
Added Flags to Maps Popups
magicbug Jun 11, 2024
7940ffc
Added Italian States
Jun 11, 2024
93d4cee
Merge pull request #3138 from emics/ita_states
magicbug Jun 11, 2024
f2f872f
small translation error
Jun 11, 2024
2310014
Merge pull request #3139 from emics/translations
magicbug Jun 11, 2024
54dea65
Start of the new Setup Welcome code
magicbug Jun 11, 2024
f5ba31d
Update Information.php
magicbug Jun 11, 2024
d99fc35
Font correction Map Popup in Advanced Logbook
Jun 11, 2024
a685b23
Distances worked analytics: bugfix and average distance
DanielBausset Jun 16, 2024
6c76a47
Corrected labels for awards_wab_description_ln1 and awards_wab_descri…
pa8s Jun 16, 2024
14482df
Merge pull request #3147 from emics/map-popup
magicbug Jun 17, 2024
612e5cb
Merge pull request #3145 from pa8s/awards_wab_description_incomplete
magicbug Jun 17, 2024
c050a42
[Dashboard] Fixes JS errors when loading map when theres no qsos
magicbug Jun 19, 2024
7f7a01d
Merge branch 'dev' of https://github.com/magicbug/Cloudlog into dev
magicbug Jun 19, 2024
de907b4
Merge pull request #3143 from DanielBausset/dev
magicbug Jun 19, 2024
4ca9268
Update cypress-tests.yml
magicbug Jun 19, 2024
df6538a
[Station Locations] Fixed JS error extra "
magicbug Jun 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[Station Location] Added Papua New Guinea States
  • Loading branch information
magicbug committed Jun 5, 2024
commit 51886c73188f476247f4c54b5f05535b23b3cc53
28 changes: 28 additions & 0 deletions application/views/station_profile/edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,34 @@
<small id="StateHelp" class="form-text text-muted"><?php echo lang("station_location_state_hint"); ?></small>
</div>

<div class="mb-3" id="png_state">
<label for="stateInput"><?php echo lang("station_location_state"); ?></label>
<select class="form-select" name="station_state" id="StateHelp" aria-describedby="stationCntyInputHelp">
<option value=""></option>
<option value="NCD" <?php if($my_station_profile->state == "NCD") { echo "selected"; } ?>>National Capital District (Port Moresby)</option>
<option value="CPM" <?php if($my_station_profile->state == "CPM") { echo "selected"; } ?>>Central</option>
<option value="CPK" <?php if($my_station_profile->state == "CPK") { echo "selected"; } ?>>Chimbu</option>
<option value="EHG" <?php if($my_station_profile->state == "EHG") { echo "selected"; } ?>>Eastern Highlands</option>
<option value="EBR" <?php if($my_station_profile->state == "EBR") { echo "selected"; } ?>>East New Britain</option>
<option value="ESW" <?php if($my_station_profile->state == "ESW") { echo "selected"; } ?>>East Sepik</option>
<option value="EPW" <?php if($my_station_profile->state == "EPW") { echo "selected"; } ?>>Enga</option>
<option value="GPK" <?php if($my_station_profile->state == "GPK") { echo "selected"; } ?>>Gulf</option>
<option value="MPM" <?php if($my_station_profile->state == "MPM") { echo "selected"; } ?>>Madang</option>
<option value="MRL" <?php if($my_station_profile->state == "MRL") { echo "selected"; } ?>>Manus</option>
<option value="MBA" <?php if($my_station_profile->state == "MBA") { echo "selected"; } ?>>Milne Bay</option>
<option value="MPL" <?php if($my_station_profile->state == "MPL") { echo "selected"; } ?>>Morobe</option>
<option value="NIK" <?php if($my_station_profile->state == "NIK") { echo "selected"; } ?>>New Ireland</option>
<option value="NPP" <?php if($my_station_profile->state == "NPP") { echo "selected"; } ?>>Northern</option>
<option value="NSA" <?php if($my_station_profile->state == "NSA") { echo "selected"; } ?>>North Solomons</option>
<option value="SAN" <?php if($my_station_profile->state == "SAN") { echo "selected"; } ?>>Santaun</option>
<option value="SHM" <?php if($my_station_profile->state == "SHM") { echo "selected"; } ?>>Southern Highlands</option>
<option value="WPD" <?php if($my_station_profile->state == "WPD") { echo "selected"; } ?>>Western</option>
<option value="WHM" <?php if($my_station_profile->state == "WHM") { echo "selected"; } ?>>Western Highlands</option>
<option value="WBR" <?php if($my_station_profile->state == "WBR") { echo "selected"; } ?>>West New Britain</option>
</select>
<small id="StateHelp" class="form-text text-muted"><?php echo lang("station_location_state_hint"); ?></small>
</div>


<!-- US County -->
<div class="mb-3">
Expand Down
5 changes: 3 additions & 2 deletions assets/js/sections/station_locations.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,12 @@ $(document).ready( function () {
'291': 'us_state',
'148': 'venezuela_state',
'150': 'australia_state',
'163': 'png_state',
'6': 'us_state' // Alaska
};

// Hide all states initially
$("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state").hide();
$("#canada_state, #aland_state, #asiatic_russia_state, #belarus_state, #mexico_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #us_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state").hide();

/**
* Gets the selected DXCC ID and shows the corresponding state.
Expand All @@ -65,7 +66,7 @@ $(document).ready( function () {
var stateToShow = stateMap[selectedValue] || stateMap['default'];

// Hide all states
$("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state").hide();
$("#mexico_state, #belarus_state, #asiatic_russia_state, #aland_state, #canada_state, #us_state, #eu_russia_state, #argentina_state, #brazil_state, #chile_state, #paraguay_state, #korea_state, #uruguay_state, #venezuela_state, #australia_state, #png_state").hide();

// Show the selected state
$("#" + stateToShow).show();
Expand Down