diff --git a/application/controllers/Simplefle.php b/application/controllers/Simplefle.php index 5dc0eda3..f99ea3c1 100644 --- a/application/controllers/Simplefle.php +++ b/application/controllers/Simplefle.php @@ -6,6 +6,11 @@ class SimpleFLE extends CI_Controller { $this->load->model('user_model'); if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); } + + $this->load->model('stations'); + + $data['station_profile'] = $this->stations->all_of_user(); // Used in the view for station location select + $data['page_title'] = "Simple Fast Log Entry"; $footerData = []; diff --git a/application/views/simplefle/index.php b/application/views/simplefle/index.php index 65e8f758..e4a8b883 100644 --- a/application/views/simplefle/index.php +++ b/application/views/simplefle/index.php @@ -61,16 +61,22 @@
- - + + +
- +
diff --git a/assets/js/sections/simplefle.js b/assets/js/sections/simplefle.js index 22d645cc..03201936 100644 --- a/assets/js/sections/simplefle.js +++ b/assets/js/sections/simplefle.js @@ -118,7 +118,7 @@ function handleInput() { var operator = $("#operator").val(); operator = operator.toUpperCase(); - var ownCallsign = $("#my-call").val().toUpperCase(); + var ownCallsign = $("#station-call").val().toUpperCase(); ownCallsign = ownCallsign.toUpperCase(); var extraQsoDate = qsodate; @@ -251,7 +251,7 @@ function handleInput() { $("#qsoTable > tbody:last-child").append(tableRow); localStorage.setItem("tabledata", $("#qsoTable").html()); - localStorage.setItem("my-call", $("#my-call").val()); + localStorage.setItem("my-call", $("#station-call").val()); localStorage.setItem("operator", $("#operator").val()); localStorage.setItem("my-sota-wwff", $("#my-sota-wwff").val()); localStorage.setItem("qso-area", $(".qso-area").val()); @@ -282,8 +282,8 @@ function handleInput() { } function checkMainFieldsErrors() { - if ($("#my-call").val() === "") { - addErrorMessage("'My call' field is empty!"); + if ($("#station-call").val() === '-') { + addErrorMessage("'Station Call' is not selected!"); } if ($("#operator").val() === "") { @@ -331,7 +331,7 @@ $(".js-empty-qso").click(function () { $("#qsodate").val(""); $("#qsoTable tbody").empty(); $("#my-sota-wwff").val(""); - $("#my-call").val(""); + $("#station-call").val(""); $("#operator").val(""); $(".qso-area").val(""); $("#my-grid").val(""); @@ -444,7 +444,7 @@ $(".js-band-settings").html(htmlSettings); $(".js-download-adif").click(function () { var operator = $("#operator").val(); operator = operator.toUpperCase(); - var ownCallsign = $("#my-call").val().toUpperCase(); + var ownCallsign = $("#station-call").val().toUpperCase(); ownCallsign = ownCallsign.toUpperCase(); var mySotaWwff = $("#my-sota-wwff").val().toUpperCase(); @@ -620,7 +620,7 @@ $(document).ready(function () { var myGrid = localStorage.getItem("my-grid"); if (mycall != null) { - $("#my-call").val(mycall); + $("#station-call").val(mycall); } if (operator != null) {