Configurable blade code (allow letters)

docs/changelog.rst

@@ -9,6 +9,8 @@ CHANGELOG
 
 - When updating interventions, stake field is no more required
 - Fix duplicates in year filters in intervention module
+- Configurable blade code
+- Allow letters in blade number
 
 
 2.24.5 (2019-03-06)

geotrek/settings/base.py

@@ -621,5 +621,7 @@ def gettext_noop(s):
     'django.contrib.auth.hashers.UnsaltedMD5PasswordHasher',  # Used for extern authent
 ]
 
-FORMAT_LINE_CODE = "{signagecode}-{bladenumber}-{linenumber}"
+BLADE_CODE_TYPE = int
+BLADE_CODE_FORMAT = "{signagecode}-{bladenumber}"
+LINE_CODE_FORMAT = "{signagecode}-{bladenumber}-{linenumber}"
 SHOW_EXTREMITIES = False

geotrek/signage/forms.py

@@ -54,10 +54,19 @@ def __init__(self, *args, **kwargs):
             unicode(_("On %s") % _(self.signage.kind.lower())),
             u'<a href="%s">%s</a>' % (self.signage.get_detail_url(), unicode(self.signage))
         )
-        max_blade = self.signage.blade_set.existing().aggregate(max=Max('number'))
-        value_max = max_blade['max'] or 0
-
-        self.fields['number'].initial = value_max + 1
+        value_max = self.signage.blade_set.existing().aggregate(max=Max('number'))['max']
+        if settings.BLADE_CODE_TYPE == int:
+            if not value_max:
+                self.fields['number'].initial = "1"
+            elif value_max.isdigit():
+                self.fields['number'].initial = str(int(value_max) + 1)
+        elif settings.BLADE_CODE_TYPE in (str, unicode):
+            print('ici', value_max)
+            if not value_max:
+                self.fields['number'].initial = "A"
+            elif len(value_max) == 1 and "A" <= value_max[0] < "Z":
+                print('la')
+                self.fields['number'].initial = chr(ord(value_max[0]) + 1)
 
     def save(self, *args, **kwargs):
         self.instance.set_topology(self.signage)

geotrek/signage/migrations/0006_auto_20190306_1555.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.14 on 2019-03-06 14:55
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('signage', '0005_logentry_signage'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='blade',
+            name='number',
+            field=models.CharField(db_column=b'numero', max_length=250, verbose_name='Blade Number'),
+        ),
+    ]

geotrek/signage/models.py

@@ -173,7 +173,7 @@ def __unicode__(self):
 class Blade(NoDeleteMixin, MapEntityMixin, StructureRelated):
     signage = models.ForeignKey(Signage, db_column='signaletique', verbose_name=_("Signage"),
                                 on_delete=models.PROTECT)
-    number = models.IntegerField(verbose_name=_(u"Blade Number"), db_column='numero')
+    number = models.CharField(verbose_name=_(u"Blade Number"), max_length=250, db_column='numero')
     direction = models.ForeignKey(Direction, verbose_name=_(u"Direction"), db_column='direction',
                                   on_delete=models.PROTECT)
     type = models.ForeignKey(BladeType, db_column='type', verbose_name=_("Type"))
@@ -190,7 +190,7 @@ class Meta:
         verbose_name_plural = _(u"Blades")
 
     def __unicode__(self):
-        return "%s %s" % (self.signage, self.number)
+        return settings.BLADE_CODE_FORMAT.format(signagecode=self.signage.code, bladenumber=self.number)
 
     def set_topology(self, topology):
         self.topology = topology
@@ -221,8 +221,7 @@ def order_lines(self):
 
     @property
     def number_display(self):
-        s = '<a data-pk="%s" href="%s" title="%s" >%s #%s</a>' % (self.pk, self.get_detail_url(), self,
-                                                                  self.signage, self.number)
+        s = '<a data-pk="%s" href="%s" title="%s" >%s</a>' % (self.pk, self.get_detail_url(), self, self)
         return s
 
 
@@ -250,7 +249,7 @@ def geomfield(cls):
 
     @property
     def linecode_csv_display(self):
-        return settings.FORMAT_LINE_CODE.format(signagecode=self.blade.signage.code,
+        return settings.LINE_CODE_FORMAT.format(signagecode=self.blade.signage.code,
                                                 bladenumber=self.blade.number,
                                                 linenumber=self.number)
 

geotrek/signage/tests/test_forms.py

@@ -0,0 +1,37 @@
+from django.test import TestCase, override_settings
+
+from geotrek.authent.factories import UserFactory
+from geotrek.signage.factories import SignageFactory, BladeFactory
+from geotrek.signage.forms import BladeForm
+
+
+class BladeFormTest(TestCase):
+    def setUp(self):
+        self.user = UserFactory()
+        self.signage = SignageFactory()
+
+    def test_first_int(self):
+        form = BladeForm(user=self.user, initial={'signage': self.signage})
+        self.assertEqual(form.fields['number'].initial, "1")
+
+    def test_second_int(self):
+        BladeFactory(signage=self.signage, number="1")
+        form = BladeForm(user=self.user, initial={'signage': self.signage})
+        self.assertEqual(form.fields['number'].initial, "2")
+
+    @override_settings(BLADE_CODE_TYPE=str)
+    def test_first_str(self):
+        form = BladeForm(user=self.user, initial={'signage': self.signage})
+        self.assertEqual(form.fields['number'].initial, "A")
+
+    @override_settings(BLADE_CODE_TYPE=str)
+    def test_second_str(self):
+        BladeFactory(signage=self.signage, number="A")
+        form = BladeForm(user=self.user, initial={'signage': self.signage})
+        self.assertEqual(form.fields['number'].initial, "B")
+
+    @override_settings(BLADE_CODE_TYPE=str)
+    def test_last_str(self):
+        BladeFactory(signage=self.signage, number="Z")
+        form = BladeForm(user=self.user, initial={'signage': self.signage})
+        self.assertEqual(form.fields['number'].initial, None)