fnschool 20251027.81653.841__py3-none-any.whl → 20251101.82236.812__py3-none-any.whl

fnschoo1/__init__.py

@@ -6,4 +6,4 @@ import random
 import sys
 from pathlib import Path
 
-__version__ = "20251027.81653.841"
+__version__ = "20251101.82236.812"

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

@@ -36,7 +36,7 @@
   </div>
   <hr />
   <div class="container">
-    <div class="table-responsive-lg  table-container">
+    <div class="table-responsive table-responsive-lg  table-container">
       <table class="table table-bordered table-ingredient table-striped table-hover table-condensed">
         <thead>
           <tr>
@@ -65,15 +65,17 @@
                 <div class="form-check"
                      title="{% trans 'It helps you check the ingredients.' %}">
                   <input type="checkbox"
+                         style="cursor: pointer"
                          class="form-check-input"
                          id="ingredient_free_nark_{{ ingredient.id }}" />
                   <label class="form-check-label"
+                         style="cursor: pointer"
                          for="ingredient_free_nark_{{ ingredient.id }}">
                     {{ forloop.counter }}
                   </label>
                 </div>
               </th>
-              <td>{{ ingredient.storage_date }}</td>
+              <td>{{ ingredient.storage_date|date:"Y.m.d" }}</td>
               <td>{{ ingredient.name }}</td>
               <td>{{ ingredient.meal_type }}</td>
               <td>{{ ingredient.category }}</td>
@@ -169,6 +171,7 @@
   <style>
     .table-container {
       overflow: auto;
+
     }
 
     .table-container thead th {

fnschoo1/fnhome/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

fnschoo1/fnhome/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class FnhomeConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "fnhome"

fnschoo1/fnhome/models.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

fnschoo1/fnhome/templates/fnhome/home.html

@@ -0,0 +1,7 @@
+{% extends "base/document.html" %}
+{% load tz %}
+{% load crispy_forms_tags %}
+{% block title %}
+  {% trans "FNSCHOOL Home" %}
+{% endblock %}
+{% block content %}{% endblock %}

fnschoo1/fnhome/urls.py

@@ -0,0 +1,13 @@
+from django.contrib import admin
+from django.urls import include, path
+
+from . import views
+
+app_name = "fnhome"
+
+urlpatterns = [
+    path("#", views.home, name="home"),
+    path("", views.home, name="home"),
+]
+
+# The end.

fnschoo1/fnhome/views.py

@@ -0,0 +1,50 @@
+import io
+import re
+from datetime import date, datetime
+from decimal import (
+    ROUND_DOWN,
+    ROUND_FLOOR,
+    ROUND_HALF_UP,
+    Decimal,
+    getcontext,
+    localcontext,
+)
+from pathlib import Path
+
+import numpy as np
+import pandas as pd
+from dateutil import parser as date_parser
+from dateutil.relativedelta import relativedelta
+from django.conf import settings
+from django.contrib.auth.decorators import login_required
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.contrib.staticfiles.storage import staticfiles_storage
+from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
+from django.db.models import (
+    DecimalField,
+    ExpressionWrapper,
+    F,
+    IntegerField,
+    Q,
+    Sum,
+    Value,
+)
+from django.db.models.functions import Coalesce
+from django.http import HttpResponse
+from django.shortcuts import get_object_or_404, redirect, render
+from django.urls import reverse_lazy
+from django.utils.encoding import escape_uri_path
+from django.views.decorators.http import require_POST
+from django.views.generic import (
+    CreateView,
+    DeleteView,
+    DetailView,
+    ListView,
+    UpdateView,
+)
+
+# Create your views here.
+
+
+def home(request):
+    return render(request, "fnhome/home.html")

fnschoo1/fnprofile/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.25 on 2025-10-26 14:18
+# Generated by Django 4.2.25 on 2025-10-27 13:10
 
 import django.contrib.auth.models
 import django.contrib.auth.validators

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",
+            ),
+        ),
+    ]

fnschoo1/fnprofile/views.py

@@ -22,7 +22,7 @@ def fnprofile_new(request):
             user.username = form.cleaned_data["username"]
             user.save()
             login(request, user)
-            return redirect("home")
+            return redirect("fnhome:home")
     else:
         form = FnuserForm()
 
@@ -38,7 +38,9 @@ def fnprofile_log_in(request):
             user = authenticate(request, username=username, password=password)
             if user is not None:
                 login(request, user)
-                next_url = request.POST.get("next") or reverse_lazy("home")
+                next_url = request.POST.get("next") or reverse_lazy(
+                    "fnhome:home"
+                )
                 return redirect(next_url)
     else:
         form = FnuserLoginForm()
@@ -47,7 +49,7 @@ def fnprofile_log_in(request):
 
 def fnprofile_log_out(request):
     logout(request)
-    return redirect("home")
+    return redirect("fnhome:home")
 
 
 @login_required
@@ -58,9 +60,9 @@ def fnprofile_edit(request):
         if form.is_valid():
             form.save()
             messages.success(
-                request, _("Fnuser has been updated successfully!")
+                request, _("Your information has been updated successfully!")
             )
-            return redirect("home")
+            return redirect("fnhome:home")
     else:
         form = FnuserForm(instance=request.user)
     return render(request, "fnprofile/edit.html", {"form": form})

fnschoo1/fnschool/settings.py

@@ -19,7 +19,6 @@ from django.utils.translation import gettext_lazy as _
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
-
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/
 
@@ -49,8 +48,9 @@ INSTALLED_APPS = [
     # fnschool apps.
     "fnschool",
     "fnprofile",
-    "profiles",
+    # "profiles",
     "canteen",
+    "fnhome",
 ]
 
 CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5"
@@ -108,7 +108,7 @@ DATABASES = {
 # Password validation
 # https://docs.djangoproject.com/en/4.2/ref/settings/#auth-password-validators
 AUTH_USER_MODEL = "fnprofile.Fnuser"
-## AUTH_USER_MODEL = "profiles.Profile"
+## AUTH_USER_MODEL = "auth.User"
 AUTH_PASSWORD_VALIDATORS = [
     {
         "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",

fnschoo1/fnschool/urls.py

@@ -25,7 +25,8 @@ from django.views.static import serve
 from . import views
 
 urlpatterns = [
-    path("", views.home_view, name="home"),
+    path("", include("fnhome.urls", namespace="fnhome")),
+    path("home/", include("fnhome.urls", namespace="fnhome0")),
     path("admin/", admin.site.urls),
     path("i18n/", include("django.conf.urls.i18n")),
     path("fnprofile/", include("fnprofile.urls")),

fnschoo1/fnschool/views.py

@@ -1,9 +1,9 @@
 from django.http import HttpResponse
-from django.shortcuts import render
+from django.shortcuts import get_object_or_404, redirect, render
 
 
 def home_view(request):
-    return render(request, "home.html")
+    return redirect("fnhome:home")
 
 
 # The end.

fnschoo1/manage.py

@@ -38,6 +38,16 @@ def main():
     os.chdir(FNSCHOOL_PATH)
     sys.argv[0] = "manage.py"
 
+    if "202511012053_copy_profiles_to_fnprofile" in sys.argv:
+        patche_path = (
+            FNSCHOOL_PATH
+            / "patches"
+            / "202511012053_copy_profiles_to_fnprofile.py"
+        )
+        patche_path = patche_path.as_posix()
+        os.system(f"python3 {patche_path} run")
+        return
+
     if len(sys.argv) < 2:
         local_port = "8230"
         local_url = "http://127.0.0.1:" + local_port

fnschoo1/patches/202511012053_copy_profiles_to_fnprofile.py

@@ -0,0 +1,67 @@
+import os
+import shutil
+import sqlite3
+import sys
+from pathlib import Path
+
+file_path = Path(__file__)
+data_path = Path(file_path.with_suffix("").as_posix() + "_data")
+data_name = data_path.stem
+
+settings_temp_path = data_path / "settings.py"
+profiles_path = data_path / "profiles"
+
+patches_path = file_path.parent
+fnscho1_path = patches_path.parent
+src_path = fnscho1_path.parent
+db_path = fnscho1_path / "db.sqlite3"
+
+patch_name = file_path.stem
+settings_temp_name = f"patches.{data_name}.settings"
+
+conn = sqlite3.connect(db_path.as_posix())
+cursor = conn.cursor()
+cursor.execute(
+    "SELECT name FROM sqlite_master WHERE type='table' AND name=?",
+    ("fnprofile_fnuser",),
+)
+fnprofile_fnuser_exists = cursor.fetchone() is not None
+
+
+def run():
+    if fnprofile_fnuser_exists:
+        print((f"Patch {0} had been applied successfully!").format(patch_name))
+        return
+
+    os.system(
+        ("python manage.py migrate --settings {0}").format(settings_temp_name)
+    )
+    os.system(
+        ("python manage.py makemigrations --settings {0}").format(
+            settings_temp_name
+        )
+    )
+    print((f"Patch {0} applied successfully!").format(patch_name))
+
+
+def rollback():
+    print((f"Patch {0} rolled back!").format(patch_name))
+
+
+def main():
+    if len(sys.argv) < 2:
+        print("Usage: python script.py <function_name>")
+        sys.exit(1)
+
+    func_name = sys.argv[1]
+
+    function_dict = {"run": run, "rollback": rollback}
+
+    if func_name in function_dict:
+        function_dict[func_name]()
+    else:
+        print(f"Error: Function '{func_name}' not found.")
+
+
+if __name__ == "__main__":
+    main()

fnschoo1/{profiles → patches/202511012053_copy_profiles_to_fnprofile_data/profiles}/apps.py

@@ -3,10 +3,8 @@ from django.apps import AppConfig
 
 class ProfilesConfig(AppConfig):
     default_auto_field = "django.db.models.BigAutoField"
-    name = "profiles"
-
-    def ready(self):
-        import profiles.signals
+    # name = "profiles"
+    name = "patches.202511012053_copy_profiles_to_fnprofile_data.profiles"
 
 
 # The end.

fnschoo1/{profiles → patches/202511012053_copy_profiles_to_fnprofile_data/profiles}/migrations/0007_alter_profile_created_at.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.25 on 2025-10-26 14:16
+# Generated by Django 4.2.25 on 2025-11-01 14:26
 
 from django.db import migrations, models
 

fnschoo1/{profiles → patches/202511012053_copy_profiles_to_fnprofile_data/profiles}/models.py

@@ -21,22 +21,6 @@ class Gender(models.TextChoices):
 
 
 class Profile(AbstractUser, PermissionsMixin):
-    groups = models.ManyToManyField(
-        "auth.Group",
-        verbose_name="groups",
-        blank=True,
-        help_text=_("The groups this user belongs to."),
-        related_name="profile_groups",
-        related_query_name="profile",
-    )
-    user_permissions = models.ManyToManyField(
-        "auth.Permission",
-        verbose_name="user permissions",
-        blank=True,
-        help_text=_("Specific permissions for this user."),
-        related_name="profile_permissions",
-        related_query_name="profile",
-    )
     phone = models.CharField(
         max_length=15, blank=True, null=True, verbose_name=_("Phone Number")
     )

fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

fnschoo1/{fnschool/settings_fn_profile_migration_0001.py → patches/202511012053_copy_profiles_to_fnprofile_data/settings.py}

@@ -17,8 +17,8 @@ from django.urls import reverse_lazy
 from django.utils.translation import gettext_lazy as _
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
-BASE_DIR = Path(__file__).resolve().parent.parent
-
+BASE_DIR = Path(__file__).resolve().parent.parent.parent
+print(BASE_DIR)
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/
@@ -49,8 +49,9 @@ INSTALLED_APPS = [
     # fnschool apps.
     "fnschool",
     "fnprofile",
-    "profiles",
+    "patches.202511012053_copy_profiles_to_fnprofile_data.profiles",
     "canteen",
+    "fnhome",
 ]
 
 CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5"
@@ -107,7 +108,7 @@ DATABASES = {
 
 # Password validation
 # https://docs.djangoproject.com/en/4.2/ref/settings/#auth-password-validators
-## AUTH_USER_MODEL = "fn_profile.FnUser"
+## AUTH_USER_MODEL = "fnprofile.Fnuser"
 AUTH_USER_MODEL = "profiles.Profile"
 AUTH_PASSWORD_VALIDATORS = [
     {
@@ -166,7 +167,7 @@ DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 MEDIA_URL = "/media/"
 MEDIA_ROOT = os.path.join(BASE_DIR, "media")
 
-LOGIN_URL = reverse_lazy("profile:log_in")
+LOGIN_URL = reverse_lazy("fnprofile:log_in")
 
 _settings_path = Path(__file__).parent / "_settings.py"
 if _settings_path.exists():

fnschoo1/patches/__init__.py

@@ -0,0 +1,4 @@
+import os
+import sqlite3
+import sys
+from pathlib import Path

fnschoo1/static/js/fnschool.js

@@ -3,7 +3,7 @@ $(document).ready(function () {
   if (messages.length) {
     messages.css({
       position: 'absolute',
-      top: $('.navbar').height(),
+      top: $('.navbar').height() * 1.45,
       width: '100%',
     })
     setTimeout(function () {
@@ -95,8 +95,17 @@ function open_small_window(url) {
   const width = Math.round(screen.width * size_times)
   const height = Math.round(screen.height * size_times)
   const left = Math.round((screen.width - width) / 2)
-  const top = Math.round((screen.height - height) / 2)
-  const windowFeatures = `width=${width},height=${height},left=${left},top=${top},resizable=yes,scrollbars=yes`
+  const _top = Math.round((screen.height - height) / 2)
+
+  const left0 = Math.round((screen.width - height) / 2)
+  const _top0 = Math.round((screen.height - width) / 2)
+
+  var _width_ = width
+  var _height_ = height
+  var _left_ = left
+  var _top_ = _top
+
+  const windowFeatures = `width=${_width_},height=${_height_},left=${_left_},top=${_top_},resizable=yes,scrollbars=yes`
   window.open(url, '_blank', windowFeatures)
 }
 

fnschoo1/templates/includes/_header.html

@@ -2,7 +2,7 @@
 {% load i18n %}
 <nav class="navbar navbar-expand-lg navbar-dark bg-dark text-white fixed-top">
   <div class="container">
-    <a class="navbar-brand" href="{% url 'home' %}">
+    <a class="navbar-brand" href="{% url 'fnhome:home' %}">
       <img src="{% static '/images/favicon.ico' %}"
            alt="Logo"
            width="30"
@@ -21,7 +21,9 @@
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
       <ul class="navbar-nav me-auto mb-2 mb-lg-0">
         <li class="nav-item">
-          <a class="nav-link active" aria-current="page" href="{% url 'home' %}">{% trans "Home" %}</a>
+          <a class="nav-link active"
+             aria-current="page"
+             href="{% url 'fnhome:home' %}">{% trans "Home" %}</a>
         </li>
         <li class="nav-item">
           <a class="nav-link" href="{% url 'canteen:list_ingredients' %}">{% trans "Canteen" %}</a>
@@ -92,7 +94,7 @@
 {% if messages %}
   <div class="messages">
     {% for message in messages %}
-      <div class="alert alert-{{ message.tags }}">
+      <div class="alert alert-{{ message.tags }} p-2 m-0">
         {{ message }}
         <span class="btn-close mx-2" title="{% trans "Hide messages." %}"></span>
       </div>

{fnschool-20251027.81653.841.dist-info → fnschool-20251101.82236.812.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fnschool
-Version: 20251027.81653.841
+Version: 20251101.82236.812
 Summary: Just some school related scripts, without any ambition.
 Author-email: larryw3i <larryw3i@163.com>, Larry Wei <larryw3i@126.com>, Larry W3i <larryw3i@yeah.net>
 Maintainer-email: larryw3i <larryw3i@163.com>, Larry Wei <larryw3i@126.com>

{fnschool-20251027.81653.841.dist-info → fnschool-20251101.82236.812.dist-info}/RECORD

@@ -1,5 +1,5 @@
-fnschoo1/__init__.py,sha256=okBXJVxN7zEzkLb9Nrc-s1XXTG5nj62Bhpl_QJL_usQ,197
-fnschoo1/manage.py,sha256=VZIol9q_Dhg81_KJ9Jfq-L5O8ubQelShkA-cZVJ1S6E,1539
+fnschoo1/__init__.py,sha256=QXiZ_JOJ0Aj0ambnFOhIZsMzXG3SfbguoKhBDn9GNx0,197
+fnschoo1/manage.py,sha256=0zVlx8Y8tfc0tLAz9oeWDXHG-L0sy5AkI3cX6wYBPcY,1853
 fnschoo1/canteen/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fnschoo1/canteen/admin.py,sha256=suMo4x8I3JBxAFBVIdE-5qnqZ6JAZV0FESABHOSc-vg,63
 fnschoo1/canteen/apps.py,sha256=zUjM0ZJwHW4i72vOm87QewRlvFQORQo5yb053u4YIGs,146
@@ -40,7 +40,7 @@ fnschoo1/canteen/templates/canteen/ingredient/close.html,sha256=pLYeJmGaOEJKMUJd
 fnschoo1/canteen/templates/canteen/ingredient/create.html,sha256=i4ajPDpXBTUp08lIiwn0wZoNEohyXlX3G64zG1lmIcs,839
 fnschoo1/canteen/templates/canteen/ingredient/create_one.html,sha256=y9EAKXmyIrlp5-DxHd86l1rMtB16KuOjPMbPiLAN_ag,615
 fnschoo1/canteen/templates/canteen/ingredient/delete.html,sha256=npUtDGV7KK2jvc2AkiNlK6F2wUsKwLB5DQuBULm1pW8,1227
-fnschoo1/canteen/templates/canteen/ingredient/list.html,sha256=7hUO0vK7-1Y_JmXsFW_RC-3vRFwdB7Ak_Pz7xe393WI,6057
+fnschoo1/canteen/templates/canteen/ingredient/list.html,sha256=VqZv_VflBMTlGiZgyxN04sFMy8eqKsW0F_OsRkxh08o,6186
 fnschoo1/canteen/templates/canteen/ingredient/update.html,sha256=JwW8dVQ1fzvxjA32RvRSSqrYzPPaajObvy7D45gz5pc,835
 fnschoo1/canteen/templates/canteen/meal_type/create.html,sha256=OIxOcAa3Pp3OPT-Z0PRLINfZ08CO61ulNDU-YJA6EKI,612
 fnschoo1/canteen/templates/canteen/meal_type/delete.html,sha256=i9PBX3ShXU4Az62MEawAuDWM5jwOmKByywizhdvuSTI,1567
@@ -48,6 +48,15 @@ fnschoo1/canteen/templates/canteen/meal_type/list.html,sha256=RQ2HgB1BLL1Zc_l_ie
 fnschoo1/canteen/templates/canteen/meal_type/update.html,sha256=vqqyuC1m2CnPd3KrcjA8t4hbJslT001s4XvcYpkQmO0,834
 fnschoo1/canteen/workbook/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 fnschoo1/canteen/workbook/generate.py,sha256=wmqt5eFxmZRZdasMTsuc1AbntwOpUN4uVOtjfpM2j1k,109350
+fnschoo1/fnhome/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fnschoo1/fnhome/admin.py,sha256=suMo4x8I3JBxAFBVIdE-5qnqZ6JAZV0FESABHOSc-vg,63
+fnschoo1/fnhome/apps.py,sha256=5O2BYupjNlGLDUQQ7Bj8_7FmUttyq9u4LvMuVXH_C0Y,144
+fnschoo1/fnhome/models.py,sha256=Vjc0p2XbAPgE6HyTF6vll98A4eDhA5AvaQqsc4kQ9AQ,57
+fnschoo1/fnhome/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
+fnschoo1/fnhome/urls.py,sha256=Ba6QvsfD1R6X_Bl2nyvFjBitMwSVqyoKQstINBCH2JI,223
+fnschoo1/fnhome/views.py,sha256=c3BTHRNIX3sZWr3zzcmAMPtZmLjthEoQabN9QsJbTUw,1252
+fnschoo1/fnhome/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fnschoo1/fnhome/templates/fnhome/home.html,sha256=qB1wliqu0QlBWFmXEOkCNTXn3QeCyWpbaspdrFs7hzo,175
 fnschoo1/fnprofile/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fnschoo1/fnprofile/admin.py,sha256=DdBM3Haggw2GwO2rxcQ16KT-QnTun8tQ8W0iELhQv2w,519
 fnschoo1/fnprofile/apps.py,sha256=cHx1hkuyEWo3ENyeWn8bdSNcvsir-dp__hl_ZjuNU0I,218
@@ -56,10 +65,10 @@ fnschoo1/fnprofile/models.py,sha256=IQO32PqmLle3XNSs4efA0pzhSBcY7yBvVFWol9C7nm8,
 fnschoo1/fnprofile/signals.py,sha256=n6PR2VdFNHUidD_k6S2xG2RHQjiguIAeK1foLRMhtbM,492
 fnschoo1/fnprofile/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
 fnschoo1/fnprofile/urls.py,sha256=1vDGl43a5A1EGtpuUaqMbdAW8oa0fvx8RRVBw9Akxog,437
-fnschoo1/fnprofile/views.py,sha256=3XOa5jwSqaTh_H8IEbg8GAxC3vp-0PY10tgFJX7DvU4,2206
-fnschoo1/fnprofile/migrations/0001_initial.py,sha256=guAfLpQG4pGXXQHTqaEI8EMUiuCjsuheiHn-dV8iDtY,7484
+fnschoo1/fnprofile/views.py,sha256=pBj4TtWGK-Wr_WNIAoZt9sjwLS5ohSrQCmcUiprgc9s,2282
+fnschoo1/fnprofile/migrations/0001_initial.py,sha256=J7HU2Yajy9gO7w5Ox4t_e0-8tShUooMsiyjg65rjSno,7484
 fnschoo1/fnprofile/migrations/0002_auto_20251026_2235.py,sha256=kv0fO28-5NQx8nFSp39pTOm2zd5kKy8gIXisOzTrGwo,1239
-fnschoo1/fnprofile/migrations/0003_alter_fnuser_options.py,sha256=TpzLYSCGMnWl1iU4LqiP0xrSHhc6epy-DfBWad1T1-I,452
+fnschoo1/fnprofile/migrations/0003_alter_fnuser_options_alter_fnuser_groups_and_more.py,sha256=KiV7B3XDXwPcxT10e83DTW40xaJlA2rOMuYGPzqwAPo,1362
 fnschoo1/fnprofile/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fnschoo1/fnprofile/templates/fnprofile/create.html,sha256=CO2zKX5Jqh2GXAyfF7AR0rzytYdczkbF6oO2ZoZG1Lo,546
 fnschoo1/fnprofile/templates/fnprofile/detail.html,sha256=F0_Tv0X890kIdlgUZNT4pB3NiR9vyd_mhERxTjCUelc,595
@@ -69,44 +78,46 @@ fnschoo1/fnprofile/templates/fnprofile/log_out.html,sha256=siA56sam_0XEanX40H7Oa
 fnschoo1/fnschool/__init__.py,sha256=TmHhzykpKNMoMf6eD-EKvbvmnlzs1XGHtvD55ae1sXs,287
 fnschoo1/fnschool/_settings.py,sha256=ajz1GSNU9xYVrFEDSz6Xwg7amWQ_yvW75tQa1ZvRIWc,3
 fnschoo1/fnschool/asgi.py,sha256=kzkqosS10uBlyBX53EXcsATcvEZmac6nsPzyOHCuucE,393
-fnschoo1/fnschool/settings.py,sha256=2eHR5jTq8QjK7mjfPnfESm7WXb-3vpHuwSjYeNhX-u8,4709
-fnschoo1/fnschool/settings_fn_profile_migration_0001.py,sha256=zQKGekBTRn2fDL7OBAC3mdLUrkXxybRcjJE2t1FmxCI,4708
-fnschoo1/fnschool/urls.py,sha256=5eqHzKZLzhVt3SXpSD7aNSZ4HT-B_9nLaT83-X_aJNo,1261
-fnschoo1/fnschool/views.py,sha256=MfujMhFkRLxT-saID1xTU16v0khzIl6ceDl7_JgrgFs,152
+fnschoo1/fnschool/settings.py,sha256=a9QnpTktXgoC70i6QvApSHEUxtYK--66xxLZEAj8-yc,4717
+fnschoo1/fnschool/urls.py,sha256=lSFq0ZQSkaVWFCnsVDjZeebnIRkpBgKdjLa6hQAZzwE,1339
+fnschoo1/fnschool/views.py,sha256=yMtB28KadYBXHxl7rtDMX7LlAV94WMt_PqmPRWpy2S4,176
 fnschoo1/fnschool/wsgi.py,sha256=dQq4S0vZWCz8w5R9KooJeLYTVFXvEgJRYe7NFZwVxU8,393
 fnschoo1/fnschool/templatetags/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 fnschoo1/fnschool/templatetags/fnschool_tags.py,sha256=l5Zov4VlQKpz-69SFftP4kXyMymz-a0D5F_ss_eiFc4,568
 fnschoo1/locale/en/LC_MESSAGES/django.mo,sha256=M8AB6fmjwlEd761iFlasNWdiEYfE-2nIwBoioGtEVUo,404
-fnschoo1/locale/zh_Hans/LC_MESSAGES/django.mo,sha256=avjNs-L9jVhH8JiFsgsPmyHvjIvnyc6wtb_BfXasQBs,23277
-fnschoo1/profiles/__init__.py,sha256=RvsEo5qK27vkdZjPQFM5LFsIo9IH7PzkbNU6DQjrYpw,178
-fnschoo1/profiles/admin.py,sha256=93UCvdODI63KzCDfFFnKmfvCMGCp6FCG9WErE91i79Y,522
-fnschoo1/profiles/apps.py,sha256=WDu6eceFnDkBFMqquAolMZMo7XPb0ah6l2q2AruTrl4,215
-fnschoo1/profiles/forms.py,sha256=ilTUlBySQgszWpUA9ioFQUr09uXZIuKTde_e_K57Ll8,2063
-fnschoo1/profiles/models.py,sha256=dSl0DA8ZlTJM3kiJcxpg-vKXWGXFjRAlK6aYPIj9l8M,2466
-fnschoo1/profiles/signals.py,sha256=u5cv6xoZ7PUrKoD6ZOVWLLKg_93w_FCgWIiC4DxJADA,486
-fnschoo1/profiles/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
-fnschoo1/profiles/urls.py,sha256=IOQ6GaPdOB4E0J-plfqIFHkabXZwOJKyFCKS7m9uKMY,426
-fnschoo1/profiles/views.py,sha256=9SUJx_CL7XIQcHMiRap6XkqaFOFlDc6Pk4tZ5_FRDNw,2204
-fnschoo1/profiles/migrations/0001_initial.py,sha256=zZ7l2DxJHf7YpLBBX3ztUfCmdoRNz1O5oSrdbBOdPjI,6776
-fnschoo1/profiles/migrations/0002_alter_profile_bio.py,sha256=LD7FdqcJ747XuKfIrZpq7avfx7_uZXr_t-Obc7yntSU,444
-fnschoo1/profiles/migrations/0003_alter_profile_options_alter_profile_address_and_more.py,sha256=R8rIXtXgGgOQKaucoDz93tcrHlzq1B1_Fq5DlWHPDSw,2057
-fnschoo1/profiles/migrations/0004_profile_gender.py,sha256=n5eQwBDRcEORGM7HZOcjoY_m1pckuKbjrwk--J7-LjA,625
-fnschoo1/profiles/migrations/0005_alter_profile_gender.py,sha256=dPAoUEcwjYt6AxgBfRZTCJCnEsJgCAfx_jae32TVLD4,550
-fnschoo1/profiles/migrations/0006_profile_created_at_profile_updated_at.py,sha256=7cKGa_3H7bVtoO3AJ-5yWdhwBxNZqghSRO9dhOrsuXE,705
-fnschoo1/profiles/migrations/0007_alter_profile_created_at.py,sha256=9lDwP5DAnj_ucCGn2hCLGf8i7Zbf26gOErwvJJlNvkY,490
-fnschoo1/profiles/migrations/0008_alter_profile_groups_alter_profile_user_permissions.py,sha256=JIEvPtvbeF3j-5knJDv1BtAb8nOIB56uKZJv3vb1QCA,1158
-fnschoo1/profiles/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fnschoo1/profiles/templates/profiles/create.html,sha256=a5nh6eg0D32ufnbIXZiKn4pQWXl1x1TUZUYhlBiIhOc,544
-fnschoo1/profiles/templates/profiles/detail.html,sha256=IiBEs3gnPiA2MUWlt5I9BmeFbavVSBgtzyP3jCBB7eU,577
-fnschoo1/profiles/templates/profiles/edit.html,sha256=7kP4LlgwLFUnzNUJUTHs4yZfLEKK5TbBcumne2yFiCg,466
-fnschoo1/profiles/templates/profiles/log_in.html,sha256=r5ah5EuuNCiQ0ou-YJClD5irQPxqxul4LLIPq-8yA1A,723
-fnschoo1/profiles/templates/profiles/log_out.html,sha256=7cgmXbXR1CFnVdXn3U6BAemX_m8Vfy-8Mdn6Lsu-Zfg,307
+fnschoo1/locale/zh_Hans/LC_MESSAGES/django.mo,sha256=CWhKOcM21iNxOHF8WgjAKPio1L5gVnNF4iOCmNPQZoI,23707
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile.py,sha256=2Vyg1brUu5XX4N9FZ89jyRoq3t6YCBfzBzZ4PeAeeG4,1632
+fnschoo1/patches/__init__.py,sha256=Zq9F_mCPtMKCrJ4r8hP3f7ZYULw6I1G8cKvEHLlxteA,61
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/settings.py,sha256=vCyfOPPUnYrYseULRB4fRUn-8NAFBmvglha483JqCDs,4798
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/admin.py,sha256=93UCvdODI63KzCDfFFnKmfvCMGCp6FCG9WErE91i79Y,522
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/apps.py,sha256=SJERY1f2q1xZljZZrPw1boFc3Zbv_lsSWoWUKel4-04,238
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/forms.py,sha256=ilTUlBySQgszWpUA9ioFQUr09uXZIuKTde_e_K57Ll8,2063
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/models.py,sha256=kwAzYWcg-uQ-_BaBsra32Oh4z4JXe8au9ki7qTflOm0,1933
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/signals.py,sha256=u5cv6xoZ7PUrKoD6ZOVWLLKg_93w_FCgWIiC4DxJADA,486
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/tests.py,sha256=mrbGGRNg5jwbTJtWWa7zSKdDyeB4vmgZCRc2nk6VY-g,60
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/urls.py,sha256=IOQ6GaPdOB4E0J-plfqIFHkabXZwOJKyFCKS7m9uKMY,426
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/views.py,sha256=9SUJx_CL7XIQcHMiRap6XkqaFOFlDc6Pk4tZ5_FRDNw,2204
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/migrations/0001_initial.py,sha256=zZ7l2DxJHf7YpLBBX3ztUfCmdoRNz1O5oSrdbBOdPjI,6776
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/migrations/0002_alter_profile_bio.py,sha256=LD7FdqcJ747XuKfIrZpq7avfx7_uZXr_t-Obc7yntSU,444
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/migrations/0003_alter_profile_options_alter_profile_address_and_more.py,sha256=R8rIXtXgGgOQKaucoDz93tcrHlzq1B1_Fq5DlWHPDSw,2057
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/migrations/0004_profile_gender.py,sha256=n5eQwBDRcEORGM7HZOcjoY_m1pckuKbjrwk--J7-LjA,625
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/migrations/0005_alter_profile_gender.py,sha256=dPAoUEcwjYt6AxgBfRZTCJCnEsJgCAfx_jae32TVLD4,550
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/migrations/0006_profile_created_at_profile_updated_at.py,sha256=7cKGa_3H7bVtoO3AJ-5yWdhwBxNZqghSRO9dhOrsuXE,705
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/migrations/0007_alter_profile_created_at.py,sha256=YHtCi5In5bP6vjQshbZU8EWt4AZidmdX1LhxDMoO2rA,490
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/templates/profiles/create.html,sha256=a5nh6eg0D32ufnbIXZiKn4pQWXl1x1TUZUYhlBiIhOc,544
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/templates/profiles/detail.html,sha256=IiBEs3gnPiA2MUWlt5I9BmeFbavVSBgtzyP3jCBB7eU,577
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/templates/profiles/edit.html,sha256=7kP4LlgwLFUnzNUJUTHs4yZfLEKK5TbBcumne2yFiCg,466
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/templates/profiles/log_in.html,sha256=r5ah5EuuNCiQ0ou-YJClD5irQPxqxul4LLIPq-8yA1A,723
+fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/templates/profiles/log_out.html,sha256=7cgmXbXR1CFnVdXn3U6BAemX_m8Vfy-8Mdn6Lsu-Zfg,307
 fnschoo1/static/css/bootstrap.min.css,sha256=eGY1FwN6FhXUvbmXraT1t_q2vcNlQa8g5xQDwg8mG6w,280591
 fnschoo1/static/css/fnschool.css,sha256=NmePHTMyKovvucCws_hC1w9b-7r4NMta-G13PiVUeDw,649
 fnschoo1/static/images/favicon.ico,sha256=S8Tf0NsUdHnoYO0SEn-sig6YjB0atIpEtSlm7p1HxjY,5014
 fnschoo1/static/js/bootstrap.bundle.min.js,sha256=6kw84LCFc4QJzifgkle0FsvQrpt2NVRNPNjSSc9caiM,125881
 fnschoo1/static/js/bootstrap.min.js,sha256=0SHpZTHghUOz_BNedMzuH00z5lgwOSRKP_KI9G5Ogbk,88597
-fnschoo1/static/js/fnschool.js,sha256=XqcvQS0GGtQmZya4E7rZESdloDm_0QIfmAoSstSR2fc,4445
+fnschoo1/static/js/fnschool.js,sha256=IxP0-7T5G4LcOJ-00n_8M_Bx10qXF20SedxrWudEezg,4661
 fnschoo1/static/js/jquery.min.js,sha256=np_WnfpAmUmEO_iheFAJKf6mbm0_laW3Ns4x7kjSlt4,162505
 fnschoo1/static/js/jquery.slim.min.js,sha256=p5YkbOjgHxX3hTadKlGuDW58NvJ1ldjjokDuDQ_5yXs,129962
 fnschoo1/static/js/popper.min.js,sha256=O2xdmtEow7gq3I7-0lKjshvxHkBe0hTWrMkbX2fy0XQ,36887
@@ -118,19 +129,19 @@ fnschoo1/templates/base/_js.html,sha256=E2mgj6LQjd37r660iG2cAIOfofwuwMC6SZ59fj6w
 fnschoo1/templates/base/content.html,sha256=wbbZVWuZwL7EX0K6x5Ex1sYx0N2YteA0XMAdGsW_ScU,974
 fnschoo1/templates/base/document.html,sha256=8HyXN5B0u2bUtAXvnTkFsUhRHNA_Y3V87KuosQoPPJ4,1134
 fnschoo1/templates/includes/_footer.html,sha256=giWQqakjUWPe2Z9au-EVnKmu2dvxuLezQZXmWFEtngU,1562
-fnschoo1/templates/includes/_header.html,sha256=pjyq_WusbfNRTtTLXVPaOMxVGk8m9RfG5zXo4iZR8B0,3595
+fnschoo1/templates/includes/_header.html,sha256=Mzke2KhZyJD3l3Bw8QXghvjELPZsNothhPxeISpqmxg,3643
 fnschoo1/templates/includes/_navigation.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fnschoo1/templates/includes/_paginator.html,sha256=Q-FRCODFNlETjn2yX18IfhctRWfqEgEnIc5LcdHzKSo,1262
 fnschoo1/templates/registration/logged_out.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fnschoo1/templates/registration/login.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fnschool-20251027.81653.841.dist-info/licenses/LICENSE,sha256=2n6rt7r999OuXp8iOqW9we7ORaxWncIbOwN1ILRGR2g,7651
-fnschool-20251027.81653.841.dist-info/METADATA,sha256=yLl7ZpplO_pG30_hmA9EWaVhVeDHyi8YQxGi8bOZDNQ,4752
-fnschool-20251027.81653.841.dist-info/SOURCES.txt.py,sha256=2LY2mshgNtxI3ICB-oBjyMYgJk2bQqeGFM5J5ay5TQs,4954
-fnschool-20251027.81653.841.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-fnschool-20251027.81653.841.dist-info/dependency_links.txt.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-fnschool-20251027.81653.841.dist-info/entry_points.txt,sha256=Ow5nChVFJY3O4TJAIE1ZydMev1MUtgRsT1b8eFP6728,54
-fnschool-20251027.81653.841.dist-info/entry_points.txt.py,sha256=7iOwIx_m9Y6xJt___BZHWJh27LV5hqWnUjmj77MoRys,47
-fnschool-20251027.81653.841.dist-info/requires.txt.py,sha256=PqRcHIQSMPUb271hacYrlSDHwB1WDZmlWUkh6RnBz_g,113
-fnschool-20251027.81653.841.dist-info/top_level.txt,sha256=s6ZKnNm94Q0-247a50eI7jDK98uPF6P2kC9Ovd3LUlM,9
-fnschool-20251027.81653.841.dist-info/top_level.txt.py,sha256=_7CbrSihm0dzBn_tTy2ass_Y2VlkVNT2eylE8mcfwHY,9
-fnschool-20251027.81653.841.dist-info/RECORD,,
+fnschool-20251101.82236.812.dist-info/licenses/LICENSE,sha256=2n6rt7r999OuXp8iOqW9we7ORaxWncIbOwN1ILRGR2g,7651
+fnschool-20251101.82236.812.dist-info/METADATA,sha256=j8tl5FAu8EnKxaFptiQ2LzQBCvdcoqlCk_vOFsB9SZI,4752
+fnschool-20251101.82236.812.dist-info/SOURCES.txt.py,sha256=2LY2mshgNtxI3ICB-oBjyMYgJk2bQqeGFM5J5ay5TQs,4954
+fnschool-20251101.82236.812.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+fnschool-20251101.82236.812.dist-info/dependency_links.txt.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+fnschool-20251101.82236.812.dist-info/entry_points.txt,sha256=Ow5nChVFJY3O4TJAIE1ZydMev1MUtgRsT1b8eFP6728,54
+fnschool-20251101.82236.812.dist-info/entry_points.txt.py,sha256=7iOwIx_m9Y6xJt___BZHWJh27LV5hqWnUjmj77MoRys,47
+fnschool-20251101.82236.812.dist-info/requires.txt.py,sha256=PqRcHIQSMPUb271hacYrlSDHwB1WDZmlWUkh6RnBz_g,113
+fnschool-20251101.82236.812.dist-info/top_level.txt,sha256=s6ZKnNm94Q0-247a50eI7jDK98uPF6P2kC9Ovd3LUlM,9
+fnschool-20251101.82236.812.dist-info/top_level.txt.py,sha256=_7CbrSihm0dzBn_tTy2ass_Y2VlkVNT2eylE8mcfwHY,9
+fnschool-20251101.82236.812.dist-info/RECORD,,

fnschool-20251101.82236.812.dist-info/dependency_links.txt.py

@@ -0,0 +1 @@
+

fnschoo1/fnprofile/migrations/0003_alter_fnuser_options.py

@@ -1,20 +0,0 @@
-# Generated by Django 4.2.25 on 2025-10-26 15:42
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("fnprofile", "0002_auto_20251026_2235"),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name="fnuser",
-            options={
-                "verbose_name": "User Information",
-                "verbose_name_plural": "User Information",
-            },
-        ),
-    ]

fnschoo1/profiles/__init__.py

@@ -1,7 +0,0 @@
-import warnings
-
-warnings.warn(
-    "The 'profiles' app is deprecated and will be removed in the future. Use 'profile' app instead.",
-    DeprecationWarning,
-    stacklevel=2,
-)

fnschoo1/profiles/migrations/0008_alter_profile_groups_alter_profile_user_permissions.py

@@ -1,38 +0,0 @@
-# Generated by Django 4.2.25 on 2025-10-26 14:35
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("auth", "0012_alter_user_first_name_max_length"),
-        ("profiles", "0007_alter_profile_created_at"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="profile",
-            name="groups",
-            field=models.ManyToManyField(
-                blank=True,
-                help_text="The groups this user belongs to.",
-                related_name="profile_groups",
-                related_query_name="profile",
-                to="auth.group",
-                verbose_name="groups",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="profile",
-            name="user_permissions",
-            field=models.ManyToManyField(
-                blank=True,
-                help_text="这个用户的特定权限。",
-                related_name="profile_permissions",
-                related_query_name="profile",
-                to="auth.permission",
-                verbose_name="user permissions",
-            ),
-        ),
-    ]