Merge pull request #2 from vsventy/develop

Develop

locale/uk/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-01-04 13:53+0200\n"
+"POT-Creation-Date: 2023-06-04 22:47+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -126,14 +126,18 @@ msgid "Senior nurse initials"
 msgstr "Ст. медсестра (ПІБ)"
 
 #: planfood/common/models.py:82
+msgid "Storekeeper post"
+msgstr "Комірник (посада)"
+
+#: planfood/common/models.py:85
 msgid "Storekeeper initials"
 msgstr "Комірник (ПІБ)"
 
-#: planfood/common/models.py:85
+#: planfood/common/models.py:88
 msgid "Cook initials"
 msgstr "Кухар (ПІБ)"
 
-#: planfood/common/models.py:89 planfood/common/models.py:90
+#: planfood/common/models.py:92 planfood/common/models.py:93
 msgid "Default Settings"
 msgstr "Базові налаштування"
 
@@ -305,11 +309,11 @@ msgstr "Набір страв"
 msgid "Dish item"
 msgstr "Позиція страви"
 
-#: planfood/menu/views.py:81
+#: planfood/menu/views.py:83
 msgid "No menu day selected."
 msgstr ""
 
-#: planfood/menu/views.py:89
+#: planfood/menu/views.py:91
 msgid "No default settings. Please set them in the admin panel and try again."
 msgstr ""
 

planfood/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.14.0"
+__version__ = "1.15.0"
 __version_info__ = tuple(
     [
         int(num) if num.isdigit() else num

planfood/common/migrations/0009_defaultsettings_storekeeper_post.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.5 on 2023-06-04 19:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('common', '0008_defaultsettings_cook_initials'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='defaultsettings',
+            name='storekeeper_post',
+            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Storekeeper post'),
+        ),
+    ]

planfood/common/models.py

@@ -78,6 +78,9 @@ class DefaultSettings(TimeStampedModel):
     senior_nurse_initials = models.CharField(
         verbose_name=_('Senior nurse initials'), max_length=255
     )
+    storekeeper_post = models.CharField(
+        verbose_name=_('Storekeeper post'), max_length=255, blank=True, null=True
+    )
     storekeeper_initials = models.CharField(
         verbose_name=_('Storekeeper initials'), max_length=255
     )

planfood/menu/views.py

@@ -62,6 +62,7 @@ def init_menu_dict():
             'nurse_initials',
             'senior_nurse_post',
             'senior_nurse_initials',
+            'storekeeper_post',
             'storekeeper_initials',
             'cook_initials',
         ],
@@ -149,6 +150,7 @@ def fill_workbook(workbook, settings, menu_day, menu_cells, demand_cells):
     d['nurse_initials'] = settings.nurse_initials
     d['senior_nurse_post'] = settings.senior_nurse_post
     d['senior_nurse_initials'] = settings.senior_nurse_initials
+    d['storekeeper_post'] = settings.storekeeper_post
     d['storekeeper_initials'] = settings.storekeeper_initials
     d['cook_initials'] = settings.cook_initials