diff --git a/aleksis/apps/kort/api.py b/aleksis/apps/kort/api.py index ded44c57cbca79fb58fb616bb2da5ace5ab400ab..1ddeae48ec5b47f7d5af6121b72ded0cab0a3ca5 100644 --- a/aleksis/apps/kort/api.py +++ b/aleksis/apps/kort/api.py @@ -49,6 +49,7 @@ class CardPrinterSerializer(serializers.ModelSerializer): "last_seen_at", "cups_printer", "generate_number_on_server", + "card_detector", ) diff --git a/aleksis/apps/kort/forms.py b/aleksis/apps/kort/forms.py index e0ba41c4dabb569afa02705db99eac79dccd0eb5..6b947e78e04f8173a1b7d372746b9cfac73a4d63 100644 --- a/aleksis/apps/kort/forms.py +++ b/aleksis/apps/kort/forms.py @@ -26,12 +26,21 @@ class CardForm(forms.ModelForm): class CardPrinterForm(forms.ModelForm): layout = Layout( Fieldset(_("Generic attributes"), "name", "location", "description"), - Fieldset(_("Printer settings"), "cups_printer", "generate_number_on_server"), + Fieldset( + _("Printer settings"), "cups_printer", "generate_number_on_server", "card_detector" + ), ) class Meta: model = CardPrinter - fields = ["name", "location", "description", "cups_printer", "generate_number_on_server"] + fields = [ + "name", + "location", + "description", + "cups_printer", + "generate_number_on_server", + "card_detector", + ] class PrinterSelectForm(forms.Form): diff --git a/aleksis/apps/kort/migrations/0011_cardprinter_card_detector.py b/aleksis/apps/kort/migrations/0011_cardprinter_card_detector.py new file mode 100644 index 0000000000000000000000000000000000000000..4a62022f08deff9b7d61b4d88d70c529486607b6 --- /dev/null +++ b/aleksis/apps/kort/migrations/0011_cardprinter_card_detector.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.13 on 2022-04-11 14:36 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('kort', '0010_auto_20220326_2123'), + ] + + operations = [ + migrations.AddField( + model_name='cardprinter', + name='card_detector', + field=models.CharField(blank=True, max_length=255, verbose_name='Card detector'), + ), + ] diff --git a/aleksis/apps/kort/models.py b/aleksis/apps/kort/models.py index a6281f32d078173c2ce4cd8d5c624bf43caccf36..7889cb33a6def26a994653b546965377a832244c 100644 --- a/aleksis/apps/kort/models.py +++ b/aleksis/apps/kort/models.py @@ -85,6 +85,7 @@ class CardPrinter(ExtensibleModel): generate_number_on_server = models.BooleanField( default=True, verbose_name=_("Generate card number on server") ) + card_detector = models.CharField(max_length=255, verbose_name=_("Card detector"), blank=True) def save(self, *args, **kwargs): if not self.oauth2_application: