From 70629673cf947ec14a2aac4846bc5664325735cb Mon Sep 17 00:00:00 2001
From: Sebastian Lohff <seba@someserver.de>
Date: Thu, 26 Jan 2017 21:24:23 +0100
Subject: [PATCH] Allow No-R to be empty in QSO log

---
 contest/forms.py                              |  4 +++
 contest/migrations/0015_auto_20170126_2016.py | 25 +++++++++++++++++++
 contest/models.py                             |  2 +-
 templates/contest/log.html                    |  6 ++---
 4 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 contest/migrations/0015_auto_20170126_2016.py

diff --git a/contest/forms.py b/contest/forms.py
index c01838b..b531101 100644
--- a/contest/forms.py
+++ b/contest/forms.py
@@ -109,6 +109,10 @@ class QSOForm(forms.ModelForm):
 	def clean_otherNo(self):
 		data = self.cleaned_data["otherNo"]
 
+		if not data:
+			# empty value
+			return None
+
 		if data < 1 or data > 100000:
 			raise forms.ValidationError("Number has to be in range of [1, 1000000]")
 
diff --git a/contest/migrations/0015_auto_20170126_2016.py b/contest/migrations/0015_auto_20170126_2016.py
new file mode 100644
index 0000000..4c82667
--- /dev/null
+++ b/contest/migrations/0015_auto_20170126_2016.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-01-26 20:16
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contest', '0014_contest_deadline'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='qso',
+            name='otherNo',
+            field=models.IntegerField(blank=True, null=True, verbose_name='No-R'),
+        ),
+        migrations.AlterField(
+            model_name='qso',
+            name='ownNo',
+            field=models.IntegerField(verbose_name='No-S'),
+        ),
+    ]
diff --git a/contest/models.py b/contest/models.py
index a4f5ec9..badcb8c 100644
--- a/contest/models.py
+++ b/contest/models.py
@@ -93,7 +93,7 @@ class QSO(models.Model):
 	reportRX = models.CharField(max_length=7, default=59, verbose_name='RST-R', validators=[reportValidator])
 
 	ownNo = models.IntegerField(verbose_name='No-S')
-	otherNo = models.IntegerField(verbose_name='No-R')
+	otherNo = models.IntegerField(verbose_name='No-R', null=True, blank=True)
 
 	refStr = models.CharField(max_length=20, verbose_name="EXC")
 	ref = models.ForeignKey(Reference, models.SET_NULL, null=True, blank=True)
diff --git a/templates/contest/log.html b/templates/contest/log.html
index 39df524..521545d 100644
--- a/templates/contest/log.html
+++ b/templates/contest/log.html
@@ -55,13 +55,13 @@
 				<table class="table">
 					<thead>
 						<tr>
-							<th>Nr-S</th>
+							<th>NroS</th>
 							<th>Band</th>
 							<th>UTC</th>
 							<th>Call</th>
 							<th class="hidden-xs">RS-S</th>
 							<th class="hidden-xs">RS-R</th>
-							<th class="hidden-xs">Nr-R</th>
+							<th class="hidden-xs">No-R</th>
 							<th>EXC</th>
 							<th class="hidden-xs">Remarks</th>
 							<th></th>
@@ -76,7 +76,7 @@
 						<td>{{ qso.call }}</td>
 						<td class="hidden-xs">{{ qso.reportTX }}</td>
 						<td class="hidden-xs">{{ qso.reportRX }}</td>
-						<td class="hidden-xs">{{ qso.otherNo }}</td>
+						<td class="hidden-xs">{{ qso.otherNo|default:"&nbsp&nbsp;---" }}</td>
 						<td>{{ qso.refStr }}</td>
 						<td class="hidden-xs">{{ qso.remarks }}</td>
 						<td><a href="{% url "contest:logEdit" qso.id %}"><span class="glyphicon glyphicon-pencil"></span></a> <a href="{% url "contest:logDelete" qso.id %}"><span class="glyphicon glyphicon-trash"></span></a></td>