schmave · schmave · Nov 24, 2025 · May 23, 2024 · May 26, 2024 · May 26, 2024
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,4 +1,5 @@
 {
+    "root": true,
     "env": {
       "browser": true,
       "commonjs": true,

diff --git a/.gitignore b/.gitignore
@@ -35,4 +35,4 @@ metals.sbt
 .classpath
 .project
 
-custodia/stats.html
+react/stats.html
diff --git a/app/views/main.scala.html b/app/views/main.scala.html
@@ -177,6 +177,9 @@ <h3>Thanks for your feedback!</h3>
             <a @if(selectedBtn.equals("attendance_rules")) { class="active" }
                 href="@routes.Attendance.rules()">Rules
             </a>
+            <a @if(selectedBtn.equals("sign_in_sheet")) { class="active" }
+                href="/attendance/signInSheet">Sign In Sheet
+            </a>
             @if(Utils.getOrgConfig(request).org.getAttendanceEnableOffCampus()) {
                 <a @if(selectedBtn.equals("off_campus_time")) { class="active" }
                     href="@routes.Attendance.offCampusTime()">Off campus time

diff --git a/build_and_copy_to_server.sh b/build_and_copy_to_server.sh
@@ -11,14 +11,14 @@ npm install
 rsync -v -h --progress target/universal/demschooltools-1.1.zip evan@demschooltools.com:/home/evan/
 
 
-## Custodia & Django stuff
-(cd custodia && npm install && npm run compile)
+## React & Django stuff
+(cd react && npm install && npm run build)
 
 # -r is necessary here because ls-tree includes some symbolic link directories
 # and we want to include the files that are contained in them.
 git ls-tree -r --name-only head django | xargs zip -r django
 
-# These files are generated by Custodia's build process and not in git
+# These files are generated by vite's build process and not in git
 zip -r django django/static-vite/
 
 rsync -v -h --progress django.zip evan@demschooltools.com:/home/evan/

diff --git a/conf/base.conf b/conf/base.conf
@@ -30,8 +30,10 @@ play.i18n.langs = [ "en", "en-TRVS" ]
 # ~~~~~
 db.default.pool = "hikaricp"
 db.default.hikaricp.maximumPoolSize = 4
-db.default.driver=org.postgresql.Driver
-db.default.url="jdbc:postgresql://localhost:5432/school_crm?user=postgres&password=123"
+db.default.driver = org.postgresql.Driver
+db.default.url = "jdbc:postgresql://127.0.0.1:5432/school_crm"
+db.default.username = "postgres"
+db.default.password = "123"
 
 # Ebean configuration
 # ~~~~~

diff --git a/conf/routes b/conf/routes
@@ -127,6 +127,9 @@ GET     /attendance/jsonPeople               controllers.Attendance.jsonPeople(t
 GET     /attendance/viewWeek	  controllers.Attendance.viewWeek(date : String ?= "", request: Request)
 GET     /attendance/editWeek      controllers.Attendance.editWeek(date : String ?= "", request: Request)
 
+GET     /attendance/signInSheet              controllers.Proxy.proxy0(request: Request)
+GET     /attendance/signInSheet/*extra      controllers.Proxy.proxy(request: Request, extra: String)
+
 GET  	/attendance/checkin				controllers.Public.checkin()
 GET     /attendance/checkin/data 		controllers.Checkin.checkinData(time: String, request: Request)
 POST    /attendance/checkin/message 	controllers.Checkin.checkinMessage(time_string: String, personId: Integer, is_arriving: Boolean, request: Request)

diff --git a/django/.gitignore b/django/.gitignore
@@ -1,2 +1,2 @@
 static-vite/
-dev-static-root/
+dev-static-root/
diff --git a/django/Procfile b/django/Procfile
@@ -1,2 +1,2 @@
 django: uv run manage.py migrate && uv run manage.py runserver
-custodia: cd ../custodia && npm install && npm run watch
+react: cd ../react && npm install && npm run watch
diff --git a/django/custodia/templates/index.html b/django/custodia/templates/index.html
@@ -24,7 +24,7 @@
 
     {% vite_hmr_client %}
     {% vite_react_refresh %}
-    {% vite_asset 'src/js/app.jsx' %}
+    {% vite_asset 'custodia/js/app.jsx' %}
   </head>
   <body>
     {% csrf_token %}

diff --git a/django/custodia/templates/login.html b/django/custodia/templates/login.html
@@ -23,7 +23,7 @@
 
     {% vite_hmr_client %}
     {% vite_react_refresh %}
-    {% vite_asset 'src/js/cssonly.js' %}
+    {% vite_asset 'custodia/js/cssonly.js' %}
   </head>
   <body>
     <nav class="navbar" role="navigation">

diff --git a/django/demschooltools/templates/main.html b/django/demschooltools/templates/main.html
@@ -171,6 +171,9 @@ <h3>Thanks for your feedback!</h3>
                                     <a {% if selectedBtn == "attendance_rules" %}class="active"{% endif %}
                                        href="/attendance/rules">Rules
                                     </a>
+                                    <a {% if selectedBtn == "sign_in_sheet" %}class="active"{% endif %}
+                                       href="/attendance/signInSheet">Sign In Sheet
+                                    </a>
                                     {% if org_config.org.attendance_enable_off_campus %}
                                         <a {% if selectedBtn == "off_campus_time" %}class="active"{% endif %}
                                            href="/attendance/offCampusTime">Off campus time

diff --git a/django/demschooltools/urls.py b/django/demschooltools/urls.py
@@ -34,6 +34,7 @@
     StudentsTodayView,
     SwipeView,
 )
+from dst.attendance_views import SignInSheetView
 from dst.manual_views import (
     CreateUpdateChapter,
     CreateUpdateEntry,
@@ -86,6 +87,7 @@ def to_url(self, value):
             "custodia-api",
         ),
     ),
+    path("attendance/signInSheet", SignInSheetView.as_view()),
     path("viewManual", view_manual),
     path("viewManualChanges", view_manual_changes),
     path("searchManual", search_manual),

diff --git a/django/dst/attendance_views.py b/django/dst/attendance_views.py
@@ -0,0 +1,79 @@
+import json
+
+from django.contrib.auth.mixins import LoginRequiredMixin
+from django.template.loader import render_to_string
+from django.views import View
+
+from dst.models import Person, Tag, UserRole
+from dst.utils import DstHttpRequest, render_main_template
+
+
+class SignInSheetView(LoginRequiredMixin, View):
+    def get(self, request: DstHttpRequest):
+        if not request.user.hasRole(UserRole.ATTENDANCE):
+            raise PermissionError("You don't have privileges to access this item")
+
+        org = request.org
+
+        # Get people with attendance tags (with their tags)
+        people_with_tags = []
+        for person in (
+            Person.objects.filter(
+                tags__show_in_attendance=True,
+                tags__organization=org,
+            )
+            .distinct()
+            .prefetch_related("tags")
+            .order_by("display_name", "first_name")
+        ):
+            people_with_tags.append(
+                {
+                    "id": person.id,
+                    "label": person.get_name() + " " + person.last_name,
+                    "tags": [tag.id for tag in person.tags.all()],
+                }
+            )
+
+        # Get attendance tags
+        tags = []
+        for tag in Tag.objects.filter(
+            organization=org, show_in_attendance=True
+        ).order_by("title"):
+            tags.append(
+                {
+                    "id": tag.id,
+                    "label": tag.title,
+                }
+            )
+
+        # Get all people (for guest selection)
+        all_people = []
+        for person in (
+            Person.objects.filter(organization=org, is_family=False)
+            .exclude(first_name="", last_name="", display_name="")
+            .only("display_name", "first_name", "last_name")
+            .distinct()
+        ):
+            all_people.append(
+                {
+                    "id": person.id,
+                    "label": person.get_name() + " " + person.last_name,
+                }
+            )
+        all_people.sort(key=lambda x: x["label"])
+
+        return render_main_template(
+            request,
+            "attendance",
+            render_to_string(
+                "sign_in_sheet.html",
+                {
+                    "people_json": json.dumps(people_with_tags),
+                    "tags_json": json.dumps(tags),
+                    "all_people_json": json.dumps(all_people),
+                    "request": request,
+                },
+            ),
+            "Sign in sheet",
+            "sign_in_sheet",
+        )
diff --git a/django/dst/manual_views.py b/django/dst/manual_views.py
@@ -9,7 +9,7 @@
 from django.db.models.functions import Concat
 from django.db.transaction import atomic
 from django.forms import Form, ModelForm, TextInput, ValidationError
-from django.http import HttpRequest, HttpResponseNotFound
+from django.http import HttpResponseNotFound
 from django.http.response import HttpResponse as HttpResponse
 from django.shortcuts import redirect, render
 from django.template.loader import render_to_string
@@ -33,16 +33,13 @@
     create_pdf_response,
     render_html_to_pdf,
 )
+from dst.utils import DstHttpRequest
 
 
 def login_required():
     return django_login_required(login_url="/login")
 
 
-class DstHttpRequest(HttpRequest):
-    org: Organization
-
-
 def render_main_template(
     request: DstHttpRequest,
     content: str,

diff --git a/django/dst/templates/sign_in_sheet.html b/django/dst/templates/sign_in_sheet.html
@@ -0,0 +1,14 @@
+{% load django_vite %}
+
+<div id="react-root"></div>
+
+<script type="text/javascript">
+  window.initialData = window.initialData || {};
+  window.initialData.people = {{ people_json|safe }};
+  window.initialData.tags = {{ tags_json|safe }};
+  window.initialData.allPeople = {{ all_people_json|safe }};
+</script>
+
+{% vite_hmr_client %}
+{% vite_react_refresh %}
+{% vite_asset 'index.jsx' %}
diff --git a/custodia/.prettierrc.js → react/.prettierrc.js b/custodia/.prettierrc.js → react/.prettierrc.js
diff --git a/react/App.jsx b/react/App.jsx
@@ -0,0 +1,73 @@
+import React, { useState } from 'react';
+import { createBrowserRouter, RouterProvider } from 'react-router-dom';
+import { ThemeProvider } from '@mui/material/styles';
+import { Snackbar, Alert } from '@mui/material';
+import { SnackbarContext, DefaultSnackbar } from './contexts';
+import { lightTheme } from './theme/theme';
+
+import '@fontsource/roboto/300.css';
+import '@fontsource/roboto/400.css';
+import '@fontsource/roboto/500.css';
+import '@fontsource/roboto/700.css';
+
+import SignInSheetPage from './pages/SignInSheetPage/SignInSheetPage';
+
+// We're not controlling routing with React, but this lets us use one React App
+// and map the Play/Scala paths to React Pages
+const router = createBrowserRouter([
+    { path: '/attendance/signInSheet', element: <SignInSheetPage /> },
+]);
+
+function App() {
+    const [showSnackbar, setShowSnackbar] = useState(false);
+    const [snackbarDetails, setSnackbarDetails] = useState(DefaultSnackbar);
+
+    // Pieces for the Snackbar Context
+    const setSnackbar = (props) => {
+        const {
+            message,
+            action,
+            severity = 'success',
+            duration = 5000,
+        } = props;
+        setSnackbarDetails({
+            message,
+            duration,
+            action,
+            severity,
+        });
+        setShowSnackbar(true);
+    };
+
+    const onDismissSnackBar = () => {
+        setShowSnackbar(false);
+        setSnackbarDetails(DefaultSnackbar);
+    };
+
+    return (
+        <ThemeProvider theme={lightTheme}>
+            <SnackbarContext.Provider
+                value={{ snackbar: snackbarDetails, setSnackbar }}
+            >
+                <RouterProvider router={router} />
+                <Snackbar
+                    open={showSnackbar}
+                    onClose={onDismissSnackBar}
+                    message={snackbarDetails.message}
+                    action={snackbarDetails.action}
+                    autoHideDuration={snackbarDetails.duration}
+                >
+                    <Alert
+                        onClose={onDismissSnackBar}
+                        severity={snackbarDetails.severity}
+                        sx={{ width: '100%' }}
+                    >
+                        {snackbarDetails.message}
+                    </Alert>
+                </Snackbar>
+            </SnackbarContext.Provider>
+        </ThemeProvider>
+    );
+}
+
+export default App;
diff --git a/custodia/LICENSE → react/LICENSE b/custodia/LICENSE → react/LICENSE
diff --git a/custodia/README.md → react/README.md b/custodia/README.md → react/README.md