Merge pull request #1 from vsventy/develop

Develop

locale/uk/LC_MESSAGES/django.po

@@ -8,16 +8,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-14 22:41+0300\n"
+"POT-Creation-Date: 2023-01-04 13:53+0200\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"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: config/settings/base.py:34
 msgid "Ukrainian"
@@ -28,7 +28,7 @@ msgid "English"
 msgstr "Англійська"
 
 #: config/urls.py:16 config/urls.py:17 planfood/templates/base.html:8
-#: planfood/templates/base.html:51
+#: planfood/templates/base.html:52
 msgid "Plan Food"
 msgstr "Облік харчування"
 
@@ -107,29 +107,33 @@ msgstr "Категорія продукту"
 
 #: planfood/common/models.py:71
 msgid "Director initials"
-msgstr "Директор (П. І. П.)"
+msgstr "Директор (ПІБ)"
 
 #: planfood/common/models.py:73
 msgid "Nurse post"
 msgstr "Дієтсестра (посада)"
 
 #: planfood/common/models.py:74
 msgid "Nurse initials"
-msgstr "Дієтсестра (П. І. П.)"
+msgstr "Дієтсестра (ПІБ)"
 
 #: planfood/common/models.py:76
 msgid "Senior nurse post"
 msgstr "Ст. медсестра (посада)"
 
 #: planfood/common/models.py:79
 msgid "Senior nurse initials"
-msgstr "Ст. медсестра (П. І. П.)"
+msgstr "Ст. медсестра (ПІБ)"
 
 #: planfood/common/models.py:82
 msgid "Storekeeper initials"
-msgstr "Комірник (П. І. П.)"
+msgstr "Комірник (ПІБ)"
 
-#: planfood/common/models.py:86 planfood/common/models.py:87
+#: planfood/common/models.py:85
+msgid "Cook initials"
+msgstr "Кухар (ПІБ)"
+
+#: planfood/common/models.py:89 planfood/common/models.py:90
 msgid "Default Settings"
 msgstr "Базові налаштування"
 
@@ -154,7 +158,7 @@ msgstr "Картотека страв"
 msgid "Products"
 msgstr "Продукти"
 
-#: planfood/dishes/models.py:30 planfood/menu/models.py:95
+#: planfood/dishes/models.py:30 planfood/menu/models.py:96
 msgid "Dishes"
 msgstr "Страви"
 
@@ -249,7 +253,7 @@ msgid "Menu days"
 msgstr "Меню-дні"
 
 #: planfood/menu/models.py:24 planfood/menu/models.py:53
-#: planfood/menu/models.py:88
+#: planfood/menu/models.py:89
 msgid "Menu day"
 msgstr "Меню-день"
 
@@ -277,31 +281,27 @@ msgstr "Кількість осіб"
 msgid "Breakfast"
 msgstr "Сніданок"
 
-#: planfood/menu/models.py:81
+#: planfood/menu/models.py:82
 msgid "Lunch"
 msgstr "Обід"
 
-#: planfood/menu/models.py:82
-msgid "Afternoon Snack"
-msgstr "Полуденок"
-
-#: planfood/menu/models.py:83
+#: planfood/menu/models.py:84
 msgid "Dinner"
 msgstr "Вечеря"
 
-#: planfood/menu/models.py:84
+#: planfood/menu/models.py:85
 msgid "Tea"
 msgstr "Підвечірок"
 
-#: planfood/menu/models.py:98
+#: planfood/menu/models.py:99
 msgid "Period"
 msgstr "Період"
 
-#: planfood/menu/models.py:101
+#: planfood/menu/models.py:102
 msgid "Set of dishes"
 msgstr "Набір страв"
 
-#: planfood/menu/models.py:102
+#: planfood/menu/models.py:103
 msgid "Dish item"
 msgstr "Позиція страви"
 
@@ -431,13 +431,13 @@ msgstr ""
 #: planfood/templates/account/email_confirm.html:27
 #, python-format
 msgid ""
-"This e-mail confirmation link expired or is invalid. Please <a href="
-"\"%(email_url)s\">issue a new e-mail confirmation request</a>."
+"This e-mail confirmation link expired or is invalid. Please <a "
+"href=\"%(email_url)s\">issue a new e-mail confirmation request</a>."
 msgstr ""
 
 #: planfood/templates/account/login.html:7
 #: planfood/templates/account/login.html:11
-#: planfood/templates/account/login.html:44 planfood/templates/base.html:73
+#: planfood/templates/account/login.html:44 planfood/templates/base.html:74
 msgid "Sign In"
 msgstr ""
 
@@ -467,7 +467,7 @@ msgstr ""
 
 #: planfood/templates/account/logout.html:5
 #: planfood/templates/account/logout.html:8
-#: planfood/templates/account/logout.html:17 planfood/templates/base.html:68
+#: planfood/templates/account/logout.html:17 planfood/templates/base.html:69
 msgid "Sign Out"
 msgstr ""
 
@@ -598,37 +598,41 @@ msgid ""
 "mail address</a>."
 msgstr ""
 
-#: planfood/templates/base.html:57
+#: planfood/templates/admin/base_site.html:6
+msgid "Django site admin"
+msgstr ""
+
+#: planfood/templates/base.html:58
 msgid "Home"
 msgstr "Головна"
 
-#: planfood/templates/base.html:61
+#: planfood/templates/base.html:62
 #, fuzzy
 #| msgid "Site administration"
 msgid "Administration"
 msgstr "Адміністрування сайту"
 
-#: planfood/templates/base.html:64
+#: planfood/templates/base.html:65
 msgid "Norms Analysis"
 msgstr "Аналіз норм"
 
-#: planfood/templates/menu/home.html:11
+#: planfood/templates/menu/home.html:17
 msgid "Norms Analysis Report"
 msgstr "Аналіз виконання норм"
 
-#: planfood/templates/menu/home.html:17
+#: planfood/templates/menu/home.html:23
 msgid "Generate Report"
 msgstr "Сформувати Звіт"
 
-#: planfood/templates/menu/home.html:38
+#: planfood/templates/menu/home.html:44
 msgid "Check downloads for results"
 msgstr "Перейдіть в \"Завантаження\" для ознайомлення з результатом"
 
-#: planfood/templates/menu/home.html:49
+#: planfood/templates/menu/home.html:55
 msgid "An error occurred"
 msgstr "Виникла помилка"
 
-#: planfood/templates/menu/home.html:63
+#: planfood/templates/menu/home.html:69
 msgid "Generating report"
 msgstr "Генерація звіту"
 
@@ -648,6 +652,9 @@ msgstr "Ім'я користувача"
 msgid "Can show logged users"
 msgstr "Може переглядати залогінених користувачів"
 
+#~ msgid "Afternoon Snack"
+#~ msgstr "Полуденок"
+
 #~ msgid "Month"
 #~ msgstr "Місяць"
 

planfood/__init__.py

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

planfood/common/migrations/0008_defaultsettings_cook_initials.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.5 on 2023-01-04 09:21
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('common', '0007_auto_20190512_1235'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='defaultsettings',
+            name='cook_initials',
+            field=models.CharField(blank=True, max_length=255, null=True, verbose_name='Cook initials'),
+        ),
+    ]

planfood/common/models.py

@@ -81,6 +81,9 @@ class DefaultSettings(TimeStampedModel):
     storekeeper_initials = models.CharField(
         verbose_name=_('Storekeeper initials'), max_length=255
     )
+    cook_initials = models.CharField(
+        verbose_name=_('Cook initials'), max_length=255, blank=True, null=True
+    )
 
     class Meta:
         verbose_name_plural = _('Default Settings')

planfood/menu/migrations/0007_auto_20230104_1612.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.5 on 2023-01-04 14:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('menu', '0006_auto_20210128_1949'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='dishitem',
+            name='period',
+            field=models.IntegerField(choices=[(0, 'Breakfast'), (1, '10:00'), (2, 'Lunch'), (3, '15:00 / 15:45'), (4, 'Dinner'), (5, 'Tea')], verbose_name='Period'),
+        ),
+    ]

planfood/menu/models.py

@@ -78,7 +78,7 @@ def __str__(self):
 class DishItem(TimeStampedModel):
     PERIOD = Choices(
         (0, 'breakfast', _('Breakfast')),
-        (1, 'after_breakfast', '10:35 / 11:00'),
+        (1, 'after_breakfast', '10:00'),
         (2, 'lunch', _('Lunch')),  # old value: 1
         (3, 'after_lunch', '15:00 / 15:45'),  # old value: 2
         (4, 'dinner', _('Dinner')),  # old value: 3

planfood/menu/views.py

@@ -63,6 +63,7 @@ def init_menu_dict():
             'senior_nurse_post',
             'senior_nurse_initials',
             'storekeeper_initials',
+            'cook_initials',
         ],
         '',
     )
@@ -149,6 +150,7 @@ def fill_workbook(workbook, settings, menu_day, menu_cells, demand_cells):
     d['senior_nurse_post'] = settings.senior_nurse_post
     d['senior_nurse_initials'] = settings.senior_nurse_initials
     d['storekeeper_initials'] = settings.storekeeper_initials
+    d['cook_initials'] = settings.cook_initials
 
     # numbers of persons by age categories
     total_numbers = menu_day.numbers_of_persons.order_by(

requirements/local.txt

@@ -1,7 +1,7 @@
 -r ./base.txt
 
 Werkzeug==0.14.1  # https://github.com/pallets/werkzeug
-ipdb==0.12.2  # https://github.com/gotcha/ipdb
+ipdb==0.13.11  # https://github.com/gotcha/ipdb
 Sphinx==2.2.0  # https://github.com/sphinx-doc/sphinx
 psycopg2-binary==2.8.3  # https://github.com/psycopg/psycopg2
 

runtime.txt

@@ -1 +1 @@
-python-3.6.6
+python-3.10.8