fnschool 20251021.80058.842__py3-none-any.whl → 20251027.82134.859__py3-none-any.whl

fnschoo1/__init__.py

@@ -6,4 +6,4 @@ import random
 import sys
 from pathlib import Path
 
-__version__ = "20251021.80058.842"
+__version__ = "20251027.82134.859"

fnschoo1/canteen/forms.py

@@ -20,7 +20,7 @@ class IngredientForm(forms.ModelForm):
         fields = [
             f.name
             for f in Ingredient._meta.fields
-            if f.name not in ["id", "user", "updated_at"]
+            if f.name not in ["id", "user", "updated_at", "created_at"]
         ]
 
         current_year = date.today().year
@@ -55,7 +55,7 @@ class ConsumptionForm(forms.ModelForm):
         widgets = {
             "amount_used": forms.NumberInput(
                 attrs={
-                    "style": "width: 109px; text-align: center; font-family: Mono;"
+                    "style": "width: 95px; text-align: center; font-family: Mono;"
                 }
             ),
             "date_of_using": forms.HiddenInput(),

fnschoo1/canteen/migrations/0019_category_updated_at_ingredient_created_at_and_more.py

@@ -0,0 +1,48 @@
+# Generated by Django 4.2.25 on 2025-10-24 01:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("canteen", "0018_alter_ingredient_updated_at"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="category",
+            name="updated_at",
+            field=models.DateTimeField(
+                auto_now=True, null=True, verbose_name="更新时间"
+            ),
+        ),
+        migrations.AddField(
+            model_name="ingredient",
+            name="created_at",
+            field=models.DateTimeField(
+                auto_now_add=True, null=True, verbose_name="Time of creating"
+            ),
+        ),
+        migrations.AddField(
+            model_name="mealtype",
+            name="updated_at",
+            field=models.DateTimeField(
+                auto_now=True, null=True, verbose_name="更新时间"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="category",
+            name="created_at",
+            field=models.DateTimeField(
+                auto_now_add=True, null=True, verbose_name="创建日期"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="mealtype",
+            name="created_at",
+            field=models.DateTimeField(
+                auto_now_add=True, null=True, verbose_name="创建日期"
+            ),
+        ),
+    ]

fnschoo1/canteen/migrations/0020_alter_ingredient_created_at.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.25 on 2025-10-24 15:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("canteen", "0019_category_updated_at_ingredient_created_at_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="ingredient",
+            name="created_at",
+            field=models.DateTimeField(
+                auto_now_add=True, null=True, verbose_name="创建时间"
+            ),
+        ),
+    ]

fnschoo1/canteen/models.py

@@ -22,8 +22,15 @@ class MealType(models.Model):
         null=True, blank=True, max_length=100, verbose_name=_("Abbreviation")
     )
     created_at = models.DateTimeField(
-        null=True, verbose_name=_("Creating Date")
+        null=True,
+        blank=True,
+        auto_now_add=True,
+        verbose_name=_("Creating Date"),
+    )
+    updated_at = models.DateTimeField(
+        null=True, blank=True, auto_now=True, verbose_name=_("Time of updating")
     )
+
     is_disabled = models.BooleanField(
         default=False, verbose_name=_("Is Disabled")
     )
@@ -44,8 +51,12 @@ class Category(models.Model):
         null=True, blank=True, max_length=100, verbose_name=_("abbreviation")
     )
     created_at = models.DateTimeField(
-        null=True, verbose_name=_("Creating Date")
+        null=True, auto_now_add=True, verbose_name=_("Creating Date")
+    )
+    updated_at = models.DateTimeField(
+        null=True, blank=True, auto_now=True, verbose_name=_("Time of updating")
     )
+
     is_disabled = models.BooleanField(
         default=False, verbose_name=_("Is Disabled")
     )
@@ -78,9 +89,18 @@ class Ingredient(models.Model):
         verbose_name=_("User"),
     )
     storage_date = models.DateField(verbose_name=_("Storage Date"))
+
+    created_at = models.DateTimeField(
+        null=True,
+        blank=True,
+        auto_now_add=True,
+        verbose_name=_("Time of creating"),
+    )
+
     updated_at = models.DateTimeField(
-        null=True, auto_now=True, verbose_name=_("Time of updating")
+        null=True, blank=True, auto_now=True, verbose_name=_("Time of updating")
     )
+
     name = models.CharField(max_length=100, verbose_name=_("Ingredient Name"))
     meal_type = models.ForeignKey(
         MealType,

fnschoo1/canteen/templates/canteen/category/list.html

@@ -1,4 +1,4 @@
-{% extends "base/header_content_footer.html" %}
+{% extends "base/document.html" %}
 {% load crispy_forms_tags %}
 {% block title %}
   {% trans "Category list" %}

fnschoo1/canteen/templates/canteen/consumption/create.html

@@ -1,4 +1,4 @@
-{% extends "base/header_content_footer.html" %}
+{% extends "base/document.html" %}
 {% load crispy_forms_tags %}
 {% block title %}
   {% trans "Consume Ingredients" %}
@@ -22,6 +22,11 @@
          target="canteen_list_categories"
          href="{% url "canteen:list_categories" %}">{% trans "Ingredient Categories" %}</a>
 
+      <a class="btn btn-primary col-md-1 col-lg-1 col-2 "
+         target="canteen_list_meal_types"
+         href="{% url "canteen:list_meal_types" %}">{% trans "Ingredient Meal Types" %}</a>
+
+
       <div class="col col-3 col-md-2 col-lg-2">
         <input class="  form-control"
                onkeydown="if(event.keyCode==13){list_consumptions();}"

fnschoo1/canteen/templates/canteen/ingredient/list.html

@@ -1,4 +1,4 @@
-{% extends "base/header_content_footer.html" %}
+{% extends "base/document.html" %}
 {% load tz %}
 {% load crispy_forms_tags %}
 {% block title %}
@@ -112,7 +112,7 @@
   </div>
   {% include 'includes/_paginator.html' %}
   <script>
-    $(document).ready(function() {
+    function set_ingredient_table_height() {
       var ingredient_table = $('.table-ingredient')
       var pagination = $('.pagination')
       var footer = $("footer")
@@ -120,7 +120,16 @@
       ingredient_table.parent().height(
         height
       );
+    }
+
+    $(document).ready(function() {
+      set_ingredient_table_height();
     });
+
+    $(window).resize(function() {
+      set_ingredient_table_height();
+    });
+
     $(document).ready(
       function() {
         make_highlight(".tr-ingredient", "ingredient_updated_at")

fnschoo1/canteen/templates/canteen/meal_type/list.html

@@ -1,4 +1,4 @@
-{% extends "base/header_content_footer.html" %}
+{% extends "base/document.html" %}
 {% load crispy_forms_tags %}
 {% block title %}
   {% trans "Meal Type List" %}

fnschoo1/fnprofile/admin.py

@@ -0,0 +1,27 @@
+from django.contrib import admin
+
+from .models import Fnuser
+
+# Register your models here.
+
+
+@admin.register(Fnuser)
+class FnuserAdmin(admin.ModelAdmin):
+    list_display = [
+        "user",
+        "phone",
+        "affiliation",
+        "superior_department",
+        "date_of_birth",
+        "address",
+    ]
+    search_fields = ["user__username", "phone", "address"]
+    list_filter = ["date_of_birth"]
+
+    def user(self, obj):
+        if obj:
+            return obj.username
+        return "No User"
+
+
+# The end.

fnschoo1/fnprofile/apps.py

@@ -0,0 +1,12 @@
+from django.apps import AppConfig
+
+
+class FnprofileConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "fnprofile"
+
+    def ready(self):
+        import fnprofile.signals
+
+
+# The end.

fnschoo1/fnprofile/forms.py

@@ -0,0 +1,73 @@
+from datetime import date
+
+from django import forms
+from django.contrib.auth.forms import AuthenticationForm
+from django.forms import ModelForm
+from fnschool import _
+
+from .models import Fnuser
+
+
+class FnuserLoginForm(AuthenticationForm):
+    username = forms.CharField(
+        label=_("User Name"),
+        widget=forms.TextInput(attrs={"placeholder": _("User Name")}),
+    )
+    password = forms.CharField(
+        label=_("Password"),
+        widget=forms.PasswordInput(attrs={"placeholder": _("Password")}),
+    )
+
+
+class FnuserForm(ModelForm):
+    username = forms.CharField(
+        max_length=128,
+        label=_("User Name"),
+        widget=forms.TextInput(attrs={"placeholder": _("User Name")}),
+    )
+    password = forms.CharField(
+        label=_("Password"),
+        widget=forms.PasswordInput(attrs={"placeholder": _("Password")}),
+    )
+    password_confirm = forms.CharField(
+        label=_("Confirm Password"),
+        widget=forms.PasswordInput(
+            attrs={"placeholder": _("Confirm Password")}
+        ),
+    )
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields["avatar"].widget.attrs.update(
+            {"class": "form-control-file"}
+        )
+
+    class Meta:
+        current_year = date.today().year
+        year_range = list(range(current_year - 100, current_year + 1))
+        model = Fnuser
+        fields = [
+            "username",
+            "phone",
+            "affiliation",
+            "superior_department",
+            "date_of_birth",
+            "gender",
+            "address",
+            "avatar",
+            "bio",
+        ]
+        widgets = {
+            "date_of_birth": forms.SelectDateWidget(
+                years=year_range,
+                attrs={"style": "width: 33.33%; display: inline-block;"},
+            )
+        }
+
+    def clean(self):
+        cleaned_data = super().clean()
+        if cleaned_data.get("password") != cleaned_data.get("password_confirm"):
+            raise forms.ValidationError("Passwords do not match")
+
+
+# The end.

fnschoo1/fnprofile/migrations/0001_initial.py

@@ -0,0 +1,213 @@
+# Generated by Django 4.2.25 on 2025-10-27 13:10
+
+import django.contrib.auth.models
+import django.contrib.auth.validators
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ("auth", "0012_alter_user_first_name_max_length"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Fnuser",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "password",
+                    models.CharField(max_length=128, verbose_name="password"),
+                ),
+                (
+                    "last_login",
+                    models.DateTimeField(
+                        blank=True, null=True, verbose_name="last login"
+                    ),
+                ),
+                (
+                    "is_superuser",
+                    models.BooleanField(
+                        default=False,
+                        help_text="Designates that this user has all permissions without explicitly assigning them.",
+                        verbose_name="superuser status",
+                    ),
+                ),
+                (
+                    "username",
+                    models.CharField(
+                        error_messages={
+                            "unique": "A user with that username already exists."
+                        },
+                        help_text="Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.",
+                        max_length=150,
+                        unique=True,
+                        validators=[
+                            django.contrib.auth.validators.UnicodeUsernameValidator()
+                        ],
+                        verbose_name="username",
+                    ),
+                ),
+                (
+                    "first_name",
+                    models.CharField(
+                        blank=True, max_length=150, verbose_name="first name"
+                    ),
+                ),
+                (
+                    "last_name",
+                    models.CharField(
+                        blank=True, max_length=150, verbose_name="last name"
+                    ),
+                ),
+                (
+                    "email",
+                    models.EmailField(
+                        blank=True, max_length=254, verbose_name="email address"
+                    ),
+                ),
+                (
+                    "is_staff",
+                    models.BooleanField(
+                        default=False,
+                        help_text="Designates whether the user can log into this admin site.",
+                        verbose_name="staff status",
+                    ),
+                ),
+                (
+                    "is_active",
+                    models.BooleanField(
+                        default=True,
+                        help_text="Designates whether this user should be treated as active. Unselect this instead of deleting accounts.",
+                        verbose_name="active",
+                    ),
+                ),
+                (
+                    "date_joined",
+                    models.DateTimeField(
+                        default=django.utils.timezone.now,
+                        verbose_name="date joined",
+                    ),
+                ),
+                (
+                    "phone",
+                    models.CharField(
+                        blank=True,
+                        max_length=15,
+                        null=True,
+                        verbose_name="电话号码",
+                    ),
+                ),
+                (
+                    "affiliation",
+                    models.CharField(
+                        blank=True,
+                        max_length=255,
+                        null=True,
+                        verbose_name="机构",
+                    ),
+                ),
+                (
+                    "superior_department",
+                    models.CharField(
+                        blank=True,
+                        max_length=255,
+                        null=True,
+                        verbose_name="上级机构",
+                    ),
+                ),
+                (
+                    "date_of_birth",
+                    models.DateField(
+                        blank=True, null=True, verbose_name="生日"
+                    ),
+                ),
+                (
+                    "gender",
+                    models.CharField(
+                        choices=[("M", "男"), ("F", "女"), ("U", "--")],
+                        default="U",
+                        max_length=1,
+                        verbose_name="性别",
+                    ),
+                ),
+                (
+                    "address",
+                    models.CharField(
+                        blank=True,
+                        max_length=255,
+                        null=True,
+                        verbose_name="地址",
+                    ),
+                ),
+                (
+                    "avatar",
+                    models.ImageField(
+                        blank=True,
+                        null=True,
+                        upload_to="avatars/",
+                        verbose_name="头像",
+                    ),
+                ),
+                (
+                    "bio",
+                    models.TextField(
+                        blank=True, max_length=512, verbose_name="个人简介"
+                    ),
+                ),
+                (
+                    "created_at",
+                    models.DateTimeField(
+                        auto_now_add=True, null=True, verbose_name="创建时间"
+                    ),
+                ),
+                (
+                    "updated_at",
+                    models.DateTimeField(
+                        auto_now=True, null=True, verbose_name="更新时间"
+                    ),
+                ),
+                (
+                    "groups",
+                    models.ManyToManyField(
+                        blank=True,
+                        help_text="The groups this user belongs to.",
+                        related_name="fn_user_groups",
+                        related_query_name="fn_user",
+                        to="auth.group",
+                        verbose_name="groups",
+                    ),
+                ),
+                (
+                    "user_permissions",
+                    models.ManyToManyField(
+                        blank=True,
+                        help_text="这个用户的特定权限。",
+                        related_name="fn_user_permissions",
+                        related_query_name="fn_user",
+                        to="auth.permission",
+                        verbose_name="user permissions",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "User Information",
+                "verbose_name_plural": "User Information",
+            },
+            managers=[
+                ("objects", django.contrib.auth.models.UserManager()),
+            ],
+        ),
+    ]

fnschoo1/fnprofile/migrations/0002_auto_20251026_2235.py

@@ -0,0 +1,42 @@
+# Generated by Django 4.2.25 on 2025-10-26 14:35
+
+from django.db import migrations
+
+
+def migrate_data_forward(apps, schema_editor):
+    profiles_profile_model = apps.get_model("profiles", "Profile")
+    fnprofile_fnuser_model = apps.get_model("fnprofile", "Fnuser")
+
+    for profile in profiles_profile_model.objects.all():
+        fnprofile_fnuser_model.objects.create(
+            phone=profile.phone,
+            affiliation=profile.affiliation,
+            superior_department=profile.superior_department,
+            date_of_birth=profile.date_of_birth,
+            gender=profile.gender,
+            address=profile.address,
+            avatar=profile.avatar,
+            bio=profile.bio,
+            password=profile.password,
+            username=profile.username,
+            id=profile.id,
+        )
+
+
+def migrate_data_backward(apps, schema_editor):
+    fnprofile_fnuser_model = apps.get_model("fnprofile", "Fnuser")
+    fnprofile_fnuser_model.objects.all().delete()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("fnprofile", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=migrate_data_forward,
+            reverse_code=migrate_data_backward,
+        ),
+    ]

fnschoo1/fnprofile/migrations/0003_alter_fnuser_options_alter_fnuser_groups_and_more.py

@@ -0,0 +1,45 @@
+# Generated by Django 4.2.25 on 2025-10-27 13:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("auth", "0012_alter_user_first_name_max_length"),
+        ("fnprofile", "0002_auto_20251026_2235"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="fnuser",
+            options={
+                "verbose_name": "用户信息",
+                "verbose_name_plural": "用户信息",
+            },
+        ),
+        migrations.AlterField(
+            model_name="fnuser",
+            name="groups",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="这个用户所属的组。",
+                related_name="fn_user_groups",
+                related_query_name="fn_user",
+                to="auth.group",
+                verbose_name="groups",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="fnuser",
+            name="user_permissions",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="给这个用户指定权限。",
+                related_name="fn_user_permissions",
+                related_query_name="fn_user",
+                to="auth.permission",
+                verbose_name="user permissions",
+            ),
+        ),
+    ]