fnschool 20251027.82134.859__tar.gz → 20251101.82236.812__tar.gz

{fnschool-20251027.82134.859 → fnschool-20251101.82236.812}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fnschool
-Version: 20251027.82134.859
+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.82134.859 → fnschool-20251101.82236.812}/src/fnschoo1/__init__.py

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

{fnschool-20251027.82134.859 → fnschool-20251101.82236.812}/src/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 {

fnschool-20251101.82236.812/src/fnschoo1/fnhome/admin.py

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

fnschool-20251101.82236.812/src/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"

fnschool-20251101.82236.812/src/fnschoo1/fnhome/models.py

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

fnschool-20251101.82236.812/src/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 %}

fnschool-20251101.82236.812/src/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.

fnschool-20251101.82236.812/src/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")

{fnschool-20251027.82134.859 → fnschool-20251101.82236.812}/src/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
@@ -60,7 +62,7 @@ def fnprofile_edit(request):
             messages.success(
                 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})

{fnschool-20251027.82134.859 → fnschool-20251101.82236.812}/src/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/
 
@@ -51,6 +50,7 @@ INSTALLED_APPS = [
     "fnprofile",
     # "profiles",
     "canteen",
+    "fnhome",
 ]
 
 CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5"

{fnschool-20251027.82134.859 → fnschool-20251101.82236.812}/src/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")),

fnschool-20251101.82236.812/src/fnschoo1/fnschool/views.py

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

{fnschool-20251027.82134.859 → fnschool-20251101.82236.812}/src/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

fnschool-20251101.82236.812/src/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()

{fnschool-20251027.82134.859/src/fnschoo1 → fnschool-20251101.82236.812/src/fnschoo1/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.

{fnschool-20251027.82134.859/src/fnschoo1 → fnschool-20251101.82236.812/src/fnschoo1/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
 

{fnschool-20251027.82134.859/src/fnschoo1 → fnschool-20251101.82236.812/src/fnschoo1/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")
     )

fnschool-20251101.82236.812/src/fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/profiles/tests.py

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

fnschool-20251101.82236.812/src/fnschoo1/patches/202511012053_copy_profiles_to_fnprofile_data/settings.py

@@ -0,0 +1,181 @@
+"""
+Django settings for fnschool project.
+
+Generated by 'django-admin startproject' using Django 4.2.24.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/4.2/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/4.2/ref/settings/
+"""
+
+import os
+from pathlib import Path
+
+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.parent
+print(BASE_DIR)
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/4.2/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = (
+    "django-insecure-vt(#owf#cbx)yo$9m^=%&-heu&txuc23&a5b=a=u@=274)2!9w"
+)
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = True
+
+ALLOWED_HOSTS = []
+
+
+# Application definition
+
+INSTALLED_APPS = [
+    "django.contrib.admin",
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.sessions",
+    "django.contrib.messages",
+    "django.contrib.staticfiles",
+    # site apps.
+    "crispy_forms",
+    "crispy_bootstrap5",  # For Bootstrap 5
+    # fnschool apps.
+    "fnschool",
+    "fnprofile",
+    "patches.202511012053_copy_profiles_to_fnprofile_data.profiles",
+    "canteen",
+    "fnhome",
+]
+
+CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5"
+CRISPY_TEMPLATE_PACK = "bootstrap5"
+
+MIDDLEWARE = [
+    "django.middleware.security.SecurityMiddleware",
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.locale.LocaleMiddleware",
+    "django.middleware.common.CommonMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
+    "django.middleware.clickjacking.XFrameOptionsMiddleware",
+]
+
+ROOT_URLCONF = "fnschool.urls"
+
+TEMPLATES = [
+    {
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "DIRS": [
+            os.path.join(BASE_DIR, "templates"),
+        ],
+        "APP_DIRS": True,
+        "OPTIONS": {
+            "context_processors": [
+                "django.template.context_processors.debug",
+                "django.template.context_processors.request",
+                "django.contrib.auth.context_processors.auth",
+                "django.contrib.messages.context_processors.messages",
+                "django.template.context_processors.i18n",
+            ],
+            "builtins": [
+                "django.templatetags.i18n",
+            ],
+        },
+    },
+]
+
+WSGI_APPLICATION = "fnschool.wsgi.application"
+
+
+# Database
+# https://docs.djangoproject.com/en/4.2/ref/settings/#databases
+
+DATABASES = {
+    "default": {
+        "ENGINE": "django.db.backends.sqlite3",
+        "NAME": BASE_DIR / "db.sqlite3",
+    }
+}
+
+
+# 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_PASSWORD_VALIDATORS = [
+    {
+        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
+    },
+    {
+        "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
+    },
+    {
+        "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
+    },
+    {
+        "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
+    },
+]
+
+
+# Internationalization
+# https://docs.djangoproject.com/en/4.2/topics/i18n/
+
+USE_TZ = True
+TIME_ZONE = "Asia/Shanghai"
+
+USE_I18N = True
+USE_L10N = True
+
+LANGUAGE_CODE = "zh-hans"
+
+LANGUAGES = [
+    ("en", _("English")),
+    ("es", _("Spanish")),
+    ("fr", _("French")),
+    ("zh-hans", _("Simplified Chinese")),
+]
+LOCALE_PATHS = [
+    os.path.join(BASE_DIR, "locale"),
+]
+
+USE_TZ = True
+
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/4.2/howto/static-files/
+
+STATIC_URL = "/static/"
+STATICFILES_DIRS = [
+    os.path.join(BASE_DIR, "static")
+]  # Optional: for additional static directories
+STATIC_ROOT = os.path.join(BASE_DIR, "static_collected")
+
+# Default primary key field type
+# https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field
+
+DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
+
+MEDIA_URL = "/media/"
+MEDIA_ROOT = os.path.join(BASE_DIR, "media")
+
+LOGIN_URL = reverse_lazy("fnprofile:log_in")
+
+_settings_path = Path(__file__).parent / "_settings.py"
+if _settings_path.exists():
+    print(
+        ('Custom configuration "{_settings_path}" has been used.').format(
+            _settings_path=_settings_path.as_posix()
+        )
+    )
+    from ._settings import *
+
+# The end.

fnschool-20251101.82236.812/src/fnschoo1/patches/__init__.py

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

{fnschool-20251027.82134.859 → fnschool-20251101.82236.812}/src/fnschoo1/static/js/fnschool.js

@@ -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)
 }
 

{fnschool-20251027.82134.859 → fnschool-20251101.82236.812}/src/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 }} p-2">
+      <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.82134.859 → fnschool-20251101.82236.812}/src/fnschool.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fnschool
-Version: 20251027.82134.859
+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>