Merge pull request #1222 from AndreasK79/contest_serial_logic_fix

[Contesting] Pushed fix so that serial is not set when serial is not …

assets/js/sections/contesting.js

@@ -1,9 +1,6 @@
 // Callsign always has focus on load
 $("#callsign").focus();
 
-// Init serial sent as 1 when loading page
-$("#exch_serial_s").val(1);
-
 $(document).ready(function () {
 	restoreContestSession();
 	setRst($("#mode").val());
@@ -26,6 +23,7 @@ function reset_contest_session() {
 	$("#callsign").focus();
 	setRst($("#mode").val());
 	$("#exchangetype").val("None");
+	setExchangetype("None");
 	$("#contestname").val("Other").change();
 	$(".contest_qso_table_contents").empty();
 
@@ -204,8 +202,7 @@ function highlight(term, base) {
 }
 
 // Only set the frequency when not set by userdata/PHP.
-if ($('#frequency').val() == "")
+if ($('#frequency').val() == "") {
-{
 	$.get('qso/band_to_freq/' + $('#band').val() + '/' + $('.mode').val(), function (result) {
 		$('#frequency').val(result);
 		$('#frequency_rx').val("");
@@ -237,6 +234,7 @@ $('#exchangetype').change(function(){
 
 function setExchangetype(exchangetype) {
 	if (exchangetype == 'None') {
+		$("#exch_serial_s").val("");
 		$(".exchanger").hide();
 		$(".exchanges").hide();
 		$(".serials").hide();
@@ -245,6 +243,7 @@ function setExchangetype(exchangetype) {
 		$(".gridsquares").hide();
 	}
 	else if (exchangetype == 'Exchange') {
+		$("#exch_serial_s").val("");
 		$(".exchanger").show();
 		$(".exchanges").show();
 		$(".serials").hide();
@@ -253,6 +252,12 @@ function setExchangetype(exchangetype) {
 		$(".gridsquares").hide();
 	}
 	else if (exchangetype == 'Serial') {
+		var serialsent = localStorage.getItem("serialsent");
+		if (serialsent != null) {
+			$("#exch_serial_s").val(serialsent);
+		} else {
+			$("#exch_serial_s").val(1);
+		}
 		$(".exchanger").hide();
 		$(".exchanges").hide();
 		$(".serials").show();
@@ -261,6 +266,12 @@ function setExchangetype(exchangetype) {
 		$(".gridsquares").hide();
 	}
 	else if (exchangetype == 'Serialexchange') {
+		var serialsent = localStorage.getItem("serialsent");
+		if (serialsent != null) {
+			$("#exch_serial_s").val(serialsent);
+		} else {
+			$("#exch_serial_s").val(1);
+		}
 		$(".exchanger").show();
 		$(".exchanges").show();
 		$(".serials").show();
@@ -269,6 +280,12 @@ function setExchangetype(exchangetype) {
 		$(".gridsquares").hide();
 	}
 	else if (exchangetype == 'Serialgridsquare') {
+		var serialsent = localStorage.getItem("serialsent");
+		if (serialsent != null) {
+			$("#exch_serial_s").val(serialsent);
+		} else {
+			$("#exch_serial_s").val(1);
+		}
 		$(".exchanger").hide();
 		$(".exchanges").hide();
 		$(".serials").show();
@@ -277,6 +294,7 @@ function setExchangetype(exchangetype) {
 		$(".gridsquares").show();
 	}
 	else if (exchangetype == 'Gridsquare') {
+		$("#exch_serial_s").val("");
 		$(".exchanger").hide();
 		$(".exchanges").hide();
 		$(".serials").hide();