353 
+    create_url_name = 'legacy:lsrl-create'
354 
+    update_url_name = 'legacy:lsrl-update'
355 
+    delete_url_name = 'legacy:lsrl-delete'
356 
+    # excludes = ["splitdata"]
357 
+    config_field_orders = ["id", "lot_no", "code"]  # Display these fields first
358 
+
359 
+class LotSummaryWbCRUDView(ConfigurableCRUDView):
360 
+    model = LotSummaryWb
361 
+    list_template_name = 'legacy/datacrud_list.html'
362 
+    detail_template_name = 'legacy/datacrud_detail.html'
363 
+    form_template_name = 'legacy/datacrud_form.html'
364 
+    confirm_delete_template_name = 'legacy/datacrud_confirm_delete.html'
365 
+    filterset_class = LotSummaryWbFilter
366 
+
367 
+    page_title = "Lot Summary WB"
368 
+
369 
+    # URL name mappings
370 
+    list_url_name = 'legacy:lswb-list'
371 
+    create_url_name = 'legacy:lswb-create'
372 
+    update_url_name = 'legacy:lswb-update'
373 
+    delete_url_name = 'legacy:lswb-delete'
374 
+    # excludes = ["splitdata"]
375 
+    config_field_orders = ["id", "lot_no", "code"]  # Display these fields first

二進制
app/report/coi_templates.xlsx
查看文件


+ 20 - 0
app/report/templates/report/coi.html
查看文件 

@@ -32,6 +32,26 @@
32 32 
         </label>
33 33 
         {% endfor %}
34 34 
         </div>
35 
+        <div class="grid grid-cols-2 gap-4">
36 
+          <div class="my-4">
37 
+            <label for="qa1" class="block mb-2 text-sm font-medium text-gray-900">Select QA.1</label>
38 
+            <select id="qa1" name="qa1" class="block w-full px-3 py-2 bg-white border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500">
39 
+              <option value="" disabled selected>Choose a user</option>
40 
+              {% for user in users %}
41 
+              <option value="{{ user.id }}">{{ user.profile }}</option>
42 
+              {% endfor %}
43 
+            </select>
44 
+          </div>
45 
+          <div class="my-4">
46 
+            <label for="qa2" class="block mb-2 text-sm font-medium text-gray-900">Select QA.2</label>
47 
+            <select id="qa2" name="qa2" class="block w-full px-3 py-2 bg-white border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-indigo-500 focus:border-indigo-500">
48 
+              <option value="" disabled selected>Choose a user</option>
49 
+              {% for user in users %}
50 
+              <option value="{{ user.id }}">{{ user.profile }}</option>
51 
+              {% endfor %}
52 
+            </select>
53 
+          </div>
54 
+        </div>
35 55 
         <div class="flex justify-end my-3 space-x-4">
36 56 
           <div>
37 57 
             <button  type='button' class="bg-blue-500 text-white px-4 py-2 rounded hover:bg-blue-600"

+ 5 - 1
app/report/views.py
查看文件 

@@ -15,6 +15,8 @@ from django.views.decorators.csrf import csrf_exempt
15 15 
 from django.http import JsonResponse, HttpResponseBadRequest
16 16 
 import json
17 17 
 from django.contrib.auth.decorators import login_required
18 
+from django.contrib.auth.models import User
19 
+
18 20
19 21 
 def index(request):
20 22 
     reports = Report.objects.all()
 
@@ -127,6 +129,8 @@ SHEET_NAMES = {
127 129 
 }
128 130 
 def coi_view(request):
129 131 
     pprint(f"xxxx method = xxx {request.method}")
132 
+    users = User.objects.all()
133 
+
130 134 
     if request.method == "POST":
131 135 
         pprint(request.POST)
132 136 
         exports = request.POST.getlist("exports")  # Retrieve the list of selected values
 
@@ -187,7 +191,7 @@ def coi_view(request):
187 191
188 192 
         messages.success(request, "Request Sent")
189 193 
         return redirect(request.path_info)
190 
-    return render(request, 'report/coi.html', {'SHEET_NAMES': SHEET_NAMES})
194 
+    return render(request, 'report/coi.html', {'SHEET_NAMES': SHEET_NAMES, 'users': users})
191 195
192 196
193 197 
 @csrf_exempt  # Disable CSRF for API requests (ensure this is secure in production)

二進制
app/report/~$coi_templates.xlsx
查看文件


+ 12 - 0
app/sysadmin/filters.py
查看文件 

@@ -0,0 +1,12 @@
1 
+
2 
+import django_filters
3 
+from django.contrib.auth.models import User
4 
+
5 
+class UserFilter(django_filters.FilterSet):
6 
+    username = django_filters.CharFilter(field_name='username', lookup_expr='icontains')
7 
+    first_name = django_filters.CharFilter(field_name='first_name', lookup_expr='icontains')
8 
+    last_name = django_filters.CharFilter(field_name='last_name', lookup_expr='icontains')
9 
+
10 
+    class Meta:
11 
+        model = User
12 
+        fields = ['username', 'first_name', 'last_name']  # Add fields you want to filter

+ 55 - 4
app/sysadmin/forms.py
查看文件 

@@ -2,6 +2,11 @@
2 2 
 from django import forms
3 3 
 from django.contrib.auth.forms import AuthenticationForm
4 4
5 
+from django.contrib.auth.forms import UserCreationForm
6 
+from django.contrib.auth.models import User
7 
+
8 
+from .models import UserProfile
9 
+
5 10 
 class CustomLoginForm(AuthenticationForm):
6 11 
     username = forms.CharField(widget=forms.TextInput(attrs={
7 12 
         'placeholder': 'Username'
 
@@ -11,10 +16,6 @@ class CustomLoginForm(AuthenticationForm):
11 16 
     }))
12 17
13 18 
 # forms.py
14 
-from django.contrib.auth.forms import UserCreationForm
15 
-from django.contrib.auth.models import User
16 
-
17 
-from .models import UserProfile
18 19
19 20 
 class CustomUserCreationForm(UserCreationForm):
20 21 
     class Meta:
 
@@ -41,3 +42,53 @@ class UserProfileForm(forms.ModelForm):
41 42 
     class Meta:
42 43 
         model = UserProfile
43 44 
         fields = ['profile_picture', 'position', 'signed_picture']  # Include the fields you want to manage
45 
+
46 
+class UserCustomForm(forms.ModelForm):
47 
+    # Profile fields
48 
+    profile_picture = forms.ImageField(required=False, label="Profile Picture")
49 
+    signed_picture = forms.ImageField(required=False, label="Signed Picture")
50 
+    position = forms.ChoiceField(
51 
+        choices=UserProfile.POSITION_CHOICES,
52 
+        required=False,
53 
+        label="Position"
54 
+    )
55 
+
56 
+    class Meta:
57 
+        model = User
58 
+        fields = [
59 
+            "first_name",
60 
+            "last_name",
61 
+            "is_staff",
62 
+            "is_superuser",
63 
+            "is_active",
64 
+        ]
65 
+
66 
+    def __init__(self, *args, **kwargs):
67 
+        # Allow passing `instance` to access both User and UserProfile objects
68 
+        user_instance = kwargs.pop('instance', None)
69 
+        profile_instance = getattr(user_instance, 'profile', None)
70 
+        super().__init__(instance=user_instance, *args, **kwargs)
71 
+
72 
+        # Populate initial data for profile fields if `profile` exists
73 
+        if profile_instance:
74 
+            self.fields['profile_picture'].initial = profile_instance.profile_picture
75 
+            self.fields['signed_picture'].initial = profile_instance.signed_picture
76 
+            self.fields['position'].initial = profile_instance.position
77 
+
78 
+    def save(self, commit=True):
79 
+        # Save the User instance first
80 
+        user = super().save(commit=commit)
81 
+        profile_data = {
82 
+            'profile_picture': self.cleaned_data.get('profile_picture'),
83 
+            'signed_picture': self.cleaned_data.get('signed_picture'),
84 
+            'position': self.cleaned_data.get('position'),
85 
+        }
86 
+
87 
+        # Ensure profile exists for the user
88 
+        profile, created = UserProfile.objects.get_or_create(user=user)
89 
+        for key, value in profile_data.items():
90 
+            setattr(profile, key, value)
91 
+        if commit:
92 
+            profile.save()
93 
+
94 
+        return user

+ 4 - 2
app/sysadmin/models.py
查看文件 

@@ -7,7 +7,9 @@ from django.contrib.auth.models import User
7 7 
 class UserProfile(models.Model):
8 8 
     POSITION_CHOICES = [
9 9 
         ('QA_STAFF', 'QA Staff'),
10 
-        ('QA_MANAGER', 'QA Manager'),
10 
+        ('QA_MANAGER', 'QA. MG.'),
11 
+        ('QA_AST_MANAGER', 'QA. Asst. MG.'),
12 
+        ('QA_ENGINEER', 'QA. Engineer'),
11 13 
     ]
12 14 
     user = models.OneToOneField(User, on_delete=models.CASCADE, related_name='profile')
13 15 
     bio = models.TextField(blank=True, null=True)
 
@@ -17,4 +19,4 @@ class UserProfile(models.Model):
17 19 
     position = models.CharField(max_length=20, choices=POSITION_CHOICES, blank=True, null=True)  # New position field
18 20
19 21 
     def __str__(self):
20 
-        return self.user.username
22 
+        return f"{self.user.username} / {self.user.first_name} {self.user.last_name} #{self.position}"

+ 71 - 0
app/sysadmin/templates/sysadmin/user_form.html
查看文件 

@@ -0,0 +1,71 @@
1 
+{% extends "base.html" %}
2 
+
3 
+{% load legacy_filters %}
4 
+{% load tailwind_filters %}
5 
+{% load crispy_forms_filters %}
6 
+
7 
+{% block title %}
8 
+    {% if view.title %}
9 
+        {{ view.title }}
10 
+    {% else %}
11 
+        {{ view|class_name }}
12 
+    {% endif %}
13 
+{% endblock %}
14 
+
15 
+{% block content %}
16 
+<div class="container mx-auto px-4 py-6">
17 
+    <h1 class="text-2xl font-bold mb-6">
18 
+        {% if view.title %}
19 
+            {{ view.title }}
20 
+        {% elif view|class_name == "CreateViewClass" %}
21 
+            Create {{ model_verbose_name }}
22 
+        {% else %}
23 
+            Update {{ model_verbose_name }}
24 
+        {% endif %}
25 
+    </h1>
26 
+
27 
+    <!-- Render the Form -->
28 
+    <form method="post" enctype="multipart/form-data">
29 
+        {% csrf_token %}
30 
+        <div class="flex flex-wrap items-center space-x-4">
31 
+            <!-- Show profile_picture -->
32 
+            <div class=" mb-4">
33 
+                {% if form.instance.profile and form.instance.profile.profile_picture %}
34 
+                    <div class="mb-2">
35 
+                        <img src="{{ form.instance.profile.profile_picture.url }}" alt="Profile Picture" class="max-w-xs border rounded" width=100>
36 
+                    </div>
37 
+                {% endif %}
38 
+                {{ form.profile_picture|as_crispy_field }}
39 
+            </div>
40 
+
41 
+            <!-- Show signed_picture -->
42 
+            <div class=" mb-4">
43 
+                {% if form.instance.profile and form.instance.profile.signed_picture %}
44 
+                    <div class="mb-2">
45 
+                        <img src="{{ form.instance.profile.signed_picture.url }}" alt="Signed Picture" class="max-w-xs border rounded" width=100>
46 
+                    </div>
47 
+                {% endif %}
48 
+                {{ form.signed_picture|as_crispy_field }}
49 
+            </div>
50 
+
51 
+            <!-- Render other form fields -->
52 
+            {% for field in form %}
53 
+                {% if field.name not in "profile_picture signed_picture" %}
54 
+                    <div class=" mb-4">
55 
+                        {{ field|as_crispy_field }}
56 
+                    </div>
57 
+                {% endif %}
58 
+            {% endfor %}
59 
+        </div>
60 
+
61 
+        <div class="mt-4">
62 
+            <button type="submit" class="bg-blue-500 text-white px-4 py-2 rounded hover:bg-blue-600">
63 
+                Save
64 
+            </button>
65 
+            <a href="{% url list_url_name %}" class="bg-gray-300 text-gray-800 px-4 py-2 rounded hover:bg-gray-400">
66 
+                Cancel
67 
+            </a>
68 
+        </div>
69 
+    </form>
70 
+</div>
71 
+{% endblock %}

+ 6 - 0
app/sysadmin/urls.py
查看文件 

@@ -3,10 +3,16 @@ from . import views
3 3
4 4 
 app_name = "sysadmin"  # Use this namespace for reverse URL lookups
5 5
6 
+users_crud = views.UserCRUDView()
7 
+
6 8 
 urlpatterns = [
7 9 
     path('login/', views.login_view, name='login'),
8 10 
     path('register/', views.register_view, name='register'),
9 11 
     path('logout/', views.logout_view, name='logout'),
10 12 
     path('profile/', views.profile_view, name='profile'),  # Add profile view URL
11 13
14 
+    path('users/', users_crud.get_list_view().as_view(), name='users-list'),
15 
+    path('users/create/', users_crud.get_create_view().as_view(), name='users-create'),
16 
+    path('users/<int:pk>/update/', users_crud.get_update_view().as_view(), name='users-update'),
17 
+    path('users/<int:pk>/delete/', users_crud.get_delete_view().as_view(), name='users-delete'),
12 18 
 ]

+ 26 - 1
app/sysadmin/views.py
查看文件 

@@ -1,10 +1,13 @@
1 1 
 # views.py
2 2 
 from django.contrib.auth import authenticate, login, logout
3 3 
 from django.shortcuts import render, redirect
4 
-from .forms import CustomLoginForm, CustomUserCreationForm, UserProfileForm
4 
+from .forms import CustomLoginForm, CustomUserCreationForm, UserProfileForm, UserCustomForm
5 5 
 from .models import UserProfile
6 
+from .filters import UserFilter
6 7 
 from django.contrib.auth.decorators import login_required
7 8 
 from django.contrib import messages
9 
+from core.utils import ConfigurableCRUDView
10 
+from django.contrib.auth.models import User
8 11
9 12 
 def login_view(request):
10 13 
     if request.method == "POST":
 
@@ -61,3 +64,25 @@ def profile_view(request):
61 64 
         form = UserProfileForm(instance=profile)
62 65
63 66 
     return render(request, 'sysadmin/profile.html', {'form': form})
67 
+
68 
+
69 
+class UserCRUDView(ConfigurableCRUDView):
70 
+    model = User
71 
+    list_template_name = 'legacy/datacrud_list.html'
72 
+    detail_template_name = 'legacy/datacrud_detail.html'
73 
+    form_template_name = 'sysadmin/user_form.html'
74 
+    confirm_delete_template_name = 'legacy/datacrud_confirm_delete.html'
75 
+    filterset_class = UserFilter
76 
+
77 
+    page_title = "Users"
78 
+
79 
+    # URL name mappings
80 
+    list_url_name = 'sysadmin:users-list'
81 
+    create_url_name = 'sysadmin:users-create'
82 
+    update_url_name = 'sysadmin:users-update'
83 
+    delete_url_name = 'sysadmin:users-delete'
84 
+    # excludes = ["splitdata"]
85 
+    config_fields = ("id", "username", "is_active", "is_staff", "is_superuser", "last_login")
86 
+    config_field_orders = ["id",]  # Display these fields first
87 
+    form_class = UserCustomForm
88 
+    config_edit_fields = None

+ 33 - 4
app/templates/base.html
查看文件 

@@ -82,6 +82,15 @@
82 82 
                             <a href="{% url "legacy:data-list" %}" class="flex items-center w-full p-2 text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700">Data</a>
83 83 
                           </li>
84 84 
                           <li>
85 
+                            <a href="{% url "legacy:datams-list" %}" class="flex items-center w-full p-2 text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700">Data MS</a>
86 
+                          </li>
87 
+                          <li>
88 
+                            <a href="{% url "legacy:datarl-list" %}" class="flex items-center w-full p-2 text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700">Data RL</a>
89 
+                          </li>
90 
+                          <li>
91 
+                            <a href="{% url "legacy:datawb-list" %}" class="flex items-center w-full p-2 text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700">Data WB</a>
92 
+                          </li>
93 
+                          <li>
85 94 
                             <a href="{% url "legacy:datams-list" %}" class="flex items-center w-full p-2 text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700">Measurement</a>
86 95 
                           </li>
87 96 
                           <li>
 
@@ -91,6 +100,12 @@
91 100 
                             <a href="{% url "legacy:ls-list" %}" class="flex items-center w-full p-2 text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700">Lot Summary</a>
92 101 
                           </li>
93 102 
                           <li>
103 
+                            <a href="{% url "legacy:lsrl-list" %}" class="flex items-center w-full p-2 text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700">Lot Summary RL</a>
104 
+                          </li>
105 
+                          <li>
106 
+                            <a href="{% url "legacy:lswb-list" %}" class="flex items-center w-full p-2 text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700">Lot Summary WB</a>
107 
+                          </li>
108 
+                          <li>
94 109 
                             <a href="{% url "legacy:vm-list" %}" class="flex items-center w-full p-2 text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700">VMaster</a>
95 110 
                           </li>
96 111 
                           <li>
 
@@ -102,12 +117,26 @@
102 117 
                           <li>
103 118 
                             <a href="{% url "legacy:em-list" %}" class="flex items-center w-full p-2 text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700">EMaster</a>
104 119 
                           </li>
105 
-                          <li>
106 
-                             <a href="#" class="flex items-center w-full p-2 text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700">Invoice</a>
107 
-                          </li>
108 120 
                     </ul>
109 121 
                  </li>
110 
-                <li><a href="/settings/" class="flex items-center p-2 text-gray-900 rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 dark:text-white"><span class="ml-3">Settings</span></a></li>
122 
+                 <li>
123 
+
124 
+                   <button type="button" class="flex items-center w-full p-2 text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700" aria-controls="setting-sub" data-collapse-toggle="setting-sub">
125 
+                     <svg class="w-6 h-6 text-gray-800 dark:text-white" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" viewBox="0 0 24 24">
126 
+                       <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 6c0 1.657-3.134 3-7 3S5 7.657 5 6m14 0c0-1.657-3.134-3-7-3S5 4.343 5 6m14 0v6M5 6v6m0 0c0 1.657 3.134 3 7 3s7-1.343 7-3M5 12v6c0 1.657 3.134 3 7 3s7-1.343 7-3v-6"/>
127 
+                     </svg>
128 
+
129 
+                     <span class="flex-1 ms-3 text-left rtl:text-right whitespace-nowrap">Settings</span>
130 
+                     <svg class="w-3 h-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
131 
+                       <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/>
132 
+                     </svg>
133 
+                   </button>
134 
+                   <ul id="setting-sub" class="hidden py-2 space-y-2">
135 
+                     <li>
136 
+                       <a href="{% url "sysadmin:users-list" %}" class="flex items-center w-full p-2 text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-white dark:hover:bg-gray-700">Users</a>
137 
+                     </li>
138 
+                   </ul>
139 
+                 </li>
111 140 
             </ul>
112 141 
         </div>
113 142 
     </aside>

Пријавите Се - Gogs: Simplico Git Service
Почетна Преглед Помоћ
Пријавите Се

Пријавите Се

Заборавили сте лозинку?