user form

app/core/utils.py

@@ -35,8 +35,7 @@ class ConfigurableCRUDView:
 
     config_edit_fields = "__all__"  # "all" or a list of field names to display
     ordering = None
-
-
+    form_class = None
 
     def get_fields(self):
         """
@@ -139,6 +138,7 @@ class ConfigurableCRUDView:
             model = self.model
             template_name = self.form_template_name
             fields = self.config_edit_fields
+            form_class = self.form_class
 
             def form_valid(inner_self, form):
                 response = super().form_valid(form)
@@ -165,7 +165,8 @@ class ConfigurableCRUDView:
             model = self.model
             template_name = self.form_template_name
             fields = self.config_edit_fields
-
+            form_class = self.form_class
+            
             def form_valid(inner_self, form):
                 response = super().form_valid(form)
                 messages.success(inner_self.request, f"{self.model._meta.verbose_name} updated successfully!")

app/legacy/filters.py

@@ -1,5 +1,6 @@
 import django_filters
-from .models import Data, DataMs, TbFgPressinfoLotlist, LotSummary
+from .models import Data, DataMs, TbFgPressinfoLotlist, LotSummary, DataRl, DataWb, \
+        LotSummaryRl, LotSummaryWb
 
 class DataFilter(django_filters.FilterSet):
     lot_no = django_filters.CharFilter(field_name='lot_no', lookup_expr='icontains')
@@ -34,3 +35,38 @@ class LotSummaryFilter(django_filters.FilterSet):
     class Meta:
         model = LotSummary
         fields = ['lot_no', 'code']  # Add fields you want to filter
+
+
+class DataRlFilter(django_filters.FilterSet):
+    lot_no = django_filters.CharFilter(field_name='lot_no', lookup_expr='icontains')
+    code = django_filters.CharFilter(field_name='code', lookup_expr='icontains')
+
+    class Meta:
+        model = DataRl
+        fields = ['lot_no', 'code']  # Add fields you want to filter
+
+class DataWbFilter(django_filters.FilterSet):
+    lot_no = django_filters.CharFilter(field_name='lot_no', lookup_expr='icontains')
+    code = django_filters.CharFilter(field_name='code', lookup_expr='icontains')
+
+    class Meta:
+        model = DataWb
+        fields = ['lot_no', 'code']  # Add fields you want to filter
+
+class LotSummaryRlFilter(django_filters.FilterSet):
+    lot_no = django_filters.CharFilter(field_name='lot_no', lookup_expr='icontains')
+    code = django_filters.CharFilter(field_name='code', lookup_expr='icontains')
+
+    class Meta:
+        model = LotSummaryRl
+        fields = ['lot_no', 'code']  # Add fields you want to filter
+
+
+class LotSummaryWbFilter(django_filters.FilterSet):
+    lot_no = django_filters.CharFilter(field_name='lot_no', lookup_expr='icontains')
+    code = django_filters.CharFilter(field_name='code', lookup_expr='icontains')
+
+    class Meta:
+        model = LotSummaryWb
+        fields = ['lot_no', 'code']  # Add fields you want to filter
+

app/legacy/templates/legacy/datacrud_list.html

@@ -47,7 +47,7 @@
                     {% elif field.name == 'file' and obj.file %}
                     <a href="{{ obj.file.url }}" target="_blank">View</a>
                     {% else %}
-                        {{ obj|attr:field.name }}
+                        {{ obj|attr:field.name | safe_floatformat:2 }}
                     {% endif %}
                 </td>
                 {% endfor %}

app/legacy/templatetags/legacy_filters.py

@@ -1,5 +1,6 @@
 from django import template
 from django.template import Context
+from django.template.defaultfilters import floatformat
 
 
 register = template.Library()
@@ -27,3 +28,12 @@ def render_breadcrumbs(context, breadcrumbs):
     Context({
         'breadcrumbs': breadcrumbs
     }))
+
+@register.filter
+def safe_floatformat(value, decimal_places):
+    try:
+        # Attempt to convert the value to a float and format it
+        return floatformat(float(value), decimal_places)
+    except (ValueError, TypeError):
+        # If the value is not a number, return it as is
+        return value

app/legacy/urls.py

@@ -1,6 +1,7 @@
 from django.urls import path
 from .views import DataListView, DataDetailView, DataCreateView, DataUpdateView, DataDeleteView,\
-DataMsCRUDView, TbFgPressInfoLotListCRUDView, LotSummaryCRUDView, VMasterViewCRUDView, MgMasterViewCRUDView, BelMasterViewCRUDView, EMasterViewCRUDView
+DataMsCRUDView, TbFgPressInfoLotListCRUDView, LotSummaryCRUDView, VMasterViewCRUDView, MgMasterViewCRUDView,\
+BelMasterViewCRUDView, EMasterViewCRUDView, DataRLCRUDView, DataWbCRUDView, LotSummaryRlCRUDView, LotSummaryWbCRUDView
 
 app_name = 'legacy'  # Namespace for this app
 
@@ -11,7 +12,10 @@ vm_crud = VMasterViewCRUDView()
 mg_crud = MgMasterViewCRUDView()
 bel_crud = BelMasterViewCRUDView()
 em_crud = EMasterViewCRUDView()
-
+datarl_crud = DataRLCRUDView()
+datawb_crud = DataWbCRUDView()
+lsrl_crud = LotSummaryRlCRUDView()
+lswb_crud = LotSummaryWbCRUDView()
 
 urlpatterns = [
     path('data/', DataListView.as_view(), name='data-list'),            # data/
@@ -24,6 +28,16 @@ urlpatterns = [
     path('datams/create/', datams_crud.get_create_view().as_view(), name='datams-create'),
     path('datams/<int:pk>/update/', datams_crud.get_update_view().as_view(), name='datams-update'),
     path('datams/<int:pk>/delete/', datams_crud.get_delete_view().as_view(), name='datams-delete'),
+
+    path('datarl/', datarl_crud.get_list_view().as_view(), name='datarl-list'),
+    path('datarl/create/', datarl_crud.get_create_view().as_view(), name='datarl-create'),
+    path('datarl/<int:pk>/update/', datarl_crud.get_update_view().as_view(), name='datarl-update'),
+    path('datarl/<int:pk>/delete/', datarl_crud.get_delete_view().as_view(), name='datarl-delete'),
+
+    path('datawb/', datawb_crud.get_list_view().as_view(), name='datawb-list'),
+    path('datawb/create/', datawb_crud.get_create_view().as_view(), name='datawb-create'),
+    path('datawb/<int:pk>/update/', datawb_crud.get_update_view().as_view(), name='datawb-update'),
+    path('datawb/<int:pk>/delete/', datawb_crud.get_delete_view().as_view(), name='datawb-delete'),
     
     path('fg/', fg_crud.get_list_view().as_view(), name='fg-list'),
     path('fg/create/', fg_crud.get_create_view().as_view(), name='fg-create'),
@@ -34,6 +48,7 @@ urlpatterns = [
     path('ls/create/', ls_crud.get_create_view().as_view(), name='ls-create'),
     path('ls/<int:pk>/update/', ls_crud.get_update_view().as_view(), name='ls-update'),
     path('ls/<int:pk>/delete/', ls_crud.get_delete_view().as_view(), name='ls-delete'),
+
     path('vm/', vm_crud.get_list_view().as_view(), name='vm-list'),
     path('vm/create/', vm_crud.get_create_view().as_view(), name='vm-create'),
     path('vm/<str:pk>/update/', vm_crud.get_update_view().as_view(), name='vm-update'),
@@ -55,4 +70,13 @@ urlpatterns = [
     path('em/<str:pk>/delete/', em_crud.get_delete_view().as_view(), name='em-delete'),
 
 
+    path('lsrl/', lsrl_crud.get_list_view().as_view(), name='lsrl-list'),
+    path('lsrl/create/', lsrl_crud.get_create_view().as_view(), name='lsrl-create'),
+    path('lsrl/<int:pk>/update/', lsrl_crud.get_update_view().as_view(), name='lsrl-update'),
+    path('lsrl/<int:pk>/delete/', lsrl_crud.get_delete_view().as_view(), name='lsrl-delete'),
+
+    path('lswb/', lswb_crud.get_list_view().as_view(), name='lswb-list'),
+    path('lswb/create/', lswb_crud.get_create_view().as_view(), name='lswb-create'),
+    path('lswb/<int:pk>/update/', lswb_crud.get_update_view().as_view(), name='lswb-update'),
+    path('lswb/<int:pk>/delete/', lswb_crud.get_delete_view().as_view(), name='lswb-delete'),
 ]

app/legacy/views.py

@@ -11,8 +11,9 @@ from django.views.generic import (
     DeleteView,
 )
 from django.core.paginator import Paginator
-from .models import Data, DataMs, TbFgPressinfoLotlist, LotSummary
-from .filters import DataFilter, DataMsFilter, TbFgPressFilter, LotSummaryFilter
+from .models import Data, DataMs, TbFgPressinfoLotlist, LotSummary, DataRl, DataWb, LotSummaryRl, LotSummaryWb
+from .filters import DataFilter, DataMsFilter, TbFgPressFilter, LotSummaryFilter, \
+        DataRlFilter, DataWbFilter, LotSummaryRlFilter, LotSummaryWbFilter
 from django.urls import reverse
 from django.contrib import messages
 from pprint import pprint
@@ -158,7 +159,7 @@ class LotSummaryCRUDView(ConfigurableCRUDView):
     detail_template_name = 'legacy/datacrud_detail.html'
     form_template_name = 'legacy/datacrud_form.html'
     confirm_delete_template_name = 'legacy/datacrud_confirm_delete.html'
-    filterset_class = DataMsFilter
+    filterset_class = LotSummaryFilter
 
     page_title = "Lot Summary"
 
@@ -301,3 +302,74 @@ class EMasterViewCRUDView(ConfigurableCRUDView):
     # Default ordering
     # ordering = ["-id", "PRO2"]
     
+class DataRLCRUDView(ConfigurableCRUDView):
+    model = DataRl
+    list_template_name = 'legacy/datacrud_list.html'
+    detail_template_name = 'legacy/datacrud_detail.html'
+    form_template_name = 'legacy/datacrud_form.html'
+    confirm_delete_template_name = 'legacy/datacrud_confirm_delete.html'
+    filterset_class = DataRlFilter
+
+    page_title = "Data RL"
+
+    # URL name mappings
+    list_url_name = 'legacy:datarl-list'
+    create_url_name = 'legacy:datarl-create'
+    update_url_name = 'legacy:datarl-update'
+    delete_url_name = 'legacy:datarl-delete'
+    # excludes = ["splitdata"]
+    config_field_orders = ["id", "lot_no", "code"]  # Display these fields first
+
+class DataWbCRUDView(ConfigurableCRUDView):
+    model = DataWb
+    list_template_name = 'legacy/datacrud_list.html'
+    detail_template_name = 'legacy/datacrud_detail.html'
+    form_template_name = 'legacy/datacrud_form.html'
+    confirm_delete_template_name = 'legacy/datacrud_confirm_delete.html'
+    filterset_class = DataWbFilter
+
+    page_title = "Data WB"
+
+    # URL name mappings
+    list_url_name = 'legacy:datawb-list'
+    create_url_name = 'legacy:datawb-create'
+    update_url_name = 'legacy:datawb-update'
+    delete_url_name = 'legacy:datawb-delete'
+    # excludes = ["splitdata"]
+    config_field_orders = ["id", "lot_no", "code"]  # Display these fields first
+
+class LotSummaryRlCRUDView(ConfigurableCRUDView):
+    model = LotSummaryRl
+    list_template_name = 'legacy/datacrud_list.html'
+    detail_template_name = 'legacy/datacrud_detail.html'
+    form_template_name = 'legacy/datacrud_form.html'
+    confirm_delete_template_name = 'legacy/datacrud_confirm_delete.html'
+    filterset_class = LotSummaryRlFilter
+
+    page_title = "Lot Summary RL"
+
+    # URL name mappings
+    list_url_name = 'legacy:lsrl-list'
+    create_url_name = 'legacy:lsrl-create'
+    update_url_name = 'legacy:lsrl-update'
+    delete_url_name = 'legacy:lsrl-delete'
+    # excludes = ["splitdata"]
+    config_field_orders = ["id", "lot_no", "code"]  # Display these fields first
+
+class LotSummaryWbCRUDView(ConfigurableCRUDView):
+    model = LotSummaryWb
+    list_template_name = 'legacy/datacrud_list.html'
+    detail_template_name = 'legacy/datacrud_detail.html'
+    form_template_name = 'legacy/datacrud_form.html'
+    confirm_delete_template_name = 'legacy/datacrud_confirm_delete.html'
+    filterset_class = LotSummaryWbFilter
+
+    page_title = "Lot Summary WB"
+
+    # URL name mappings
+    list_url_name = 'legacy:lswb-list'
+    create_url_name = 'legacy:lswb-create'
+    update_url_name = 'legacy:lswb-update'
+    delete_url_name = 'legacy:lswb-delete'
+    # excludes = ["splitdata"]
+    config_field_orders = ["id", "lot_no", "code"]  # Display these fields first

app/report/templates/report/coi.html

@@ -32,6 +32,26 @@
         </label>
         {% endfor %}
         </div>
+        <div class="grid grid-cols-2 gap-4">
+          <div class="my-4">
+            <label for="qa1" class="block mb-2 text-sm font-medium text-gray-900">Select QA.1</label>
+            <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">
+              <option value="" disabled selected>Choose a user</option>
+              {% for user in users %}
+              <option value="{{ user.id }}">{{ user.profile }}</option>
+              {% endfor %}
+            </select>
+          </div>
+          <div class="my-4">
+            <label for="qa2" class="block mb-2 text-sm font-medium text-gray-900">Select QA.2</label>
+            <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">
+              <option value="" disabled selected>Choose a user</option>
+              {% for user in users %}
+              <option value="{{ user.id }}">{{ user.profile }}</option>
+              {% endfor %}
+            </select>
+          </div>
+        </div>
         <div class="flex justify-end my-3 space-x-4">
           <div>
             <button  type='button' class="bg-blue-500 text-white px-4 py-2 rounded hover:bg-blue-600" 

app/report/views.py

@@ -15,6 +15,8 @@ from django.views.decorators.csrf import csrf_exempt
 from django.http import JsonResponse, HttpResponseBadRequest
 import json
 from django.contrib.auth.decorators import login_required
+from django.contrib.auth.models import User
+
 
 def index(request):
     reports = Report.objects.all()
@@ -127,6 +129,8 @@ SHEET_NAMES = {
 }
 def coi_view(request):
     pprint(f"xxxx method = xxx {request.method}")
+    users = User.objects.all()
+
     if request.method == "POST":
         pprint(request.POST)
         exports = request.POST.getlist("exports")  # Retrieve the list of selected values
@@ -187,7 +191,7 @@ def coi_view(request):
 
         messages.success(request, "Request Sent")
         return redirect(request.path_info)
-    return render(request, 'report/coi.html', {'SHEET_NAMES': SHEET_NAMES})
+    return render(request, 'report/coi.html', {'SHEET_NAMES': SHEET_NAMES, 'users': users})
 
 
 @csrf_exempt  # Disable CSRF for API requests (ensure this is secure in production)

app/sysadmin/filters.py

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

app/sysadmin/forms.py

@@ -2,6 +2,11 @@
 from django import forms
 from django.contrib.auth.forms import AuthenticationForm
 
+from django.contrib.auth.forms import UserCreationForm
+from django.contrib.auth.models import User
+
+from .models import UserProfile
+
 class CustomLoginForm(AuthenticationForm):
     username = forms.CharField(widget=forms.TextInput(attrs={
         'placeholder': 'Username'
@@ -11,10 +16,6 @@ class CustomLoginForm(AuthenticationForm):
     }))
 
 # forms.py
-from django.contrib.auth.forms import UserCreationForm
-from django.contrib.auth.models import User
-
-from .models import UserProfile
 
 class CustomUserCreationForm(UserCreationForm):
     class Meta:
@@ -41,3 +42,53 @@ class UserProfileForm(forms.ModelForm):
     class Meta:
         model = UserProfile
         fields = ['profile_picture', 'position', 'signed_picture']  # Include the fields you want to manage
+
+class UserCustomForm(forms.ModelForm):
+    # Profile fields
+    profile_picture = forms.ImageField(required=False, label="Profile Picture")
+    signed_picture = forms.ImageField(required=False, label="Signed Picture")
+    position = forms.ChoiceField(
+        choices=UserProfile.POSITION_CHOICES, 
+        required=False, 
+        label="Position"
+    )
+
+    class Meta:
+        model = User
+        fields = [
+            "first_name",
+            "last_name",
+            "is_staff",
+            "is_superuser",
+            "is_active",
+        ]
+
+    def __init__(self, *args, **kwargs):
+        # Allow passing `instance` to access both User and UserProfile objects
+        user_instance = kwargs.pop('instance', None)
+        profile_instance = getattr(user_instance, 'profile', None)
+        super().__init__(instance=user_instance, *args, **kwargs)
+
+        # Populate initial data for profile fields if `profile` exists
+        if profile_instance:
+            self.fields['profile_picture'].initial = profile_instance.profile_picture
+            self.fields['signed_picture'].initial = profile_instance.signed_picture
+            self.fields['position'].initial = profile_instance.position
+
+    def save(self, commit=True):
+        # Save the User instance first
+        user = super().save(commit=commit)
+        profile_data = {
+            'profile_picture': self.cleaned_data.get('profile_picture'),
+            'signed_picture': self.cleaned_data.get('signed_picture'),
+            'position': self.cleaned_data.get('position'),
+        }
+
+        # Ensure profile exists for the user
+        profile, created = UserProfile.objects.get_or_create(user=user)
+        for key, value in profile_data.items():
+            setattr(profile, key, value)
+        if commit:
+            profile.save()
+
+        return user

app/sysadmin/models.py

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

app/sysadmin/templates/sysadmin/user_form.html

@@ -0,0 +1,71 @@
+{% extends "base.html" %}
+
+{% load legacy_filters %}
+{% load tailwind_filters %}
+{% load crispy_forms_filters %}
+
+{% block title %}
+    {% if view.title %}
+        {{ view.title }}
+    {% else %}
+        {{ view|class_name }}
+    {% endif %}
+{% endblock %}
+
+{% block content %}
+<div class="container mx-auto px-4 py-6">
+    <h1 class="text-2xl font-bold mb-6">
+        {% if view.title %}
+            {{ view.title }}
+        {% elif view|class_name == "CreateViewClass" %}
+            Create {{ model_verbose_name }}
+        {% else %}
+            Update {{ model_verbose_name }}
+        {% endif %}
+    </h1>
+
+    <!-- Render the Form -->
+    <form method="post" enctype="multipart/form-data">
+        {% csrf_token %}
+        <div class="flex flex-wrap items-center space-x-4">
+            <!-- Show profile_picture -->
+            <div class=" mb-4">
+                {% if form.instance.profile and form.instance.profile.profile_picture %}
+                    <div class="mb-2">
+                        <img src="{{ form.instance.profile.profile_picture.url }}" alt="Profile Picture" class="max-w-xs border rounded" width=100>
+                    </div>
+                {% endif %}
+                {{ form.profile_picture|as_crispy_field }}
+            </div>
+
+            <!-- Show signed_picture -->
+            <div class=" mb-4">
+                {% if form.instance.profile and form.instance.profile.signed_picture %}
+                    <div class="mb-2">
+                        <img src="{{ form.instance.profile.signed_picture.url }}" alt="Signed Picture" class="max-w-xs border rounded" width=100>
+                    </div>
+                {% endif %}
+                {{ form.signed_picture|as_crispy_field }}
+            </div>
+
+            <!-- Render other form fields -->
+            {% for field in form %}
+                {% if field.name not in "profile_picture signed_picture" %}
+                    <div class=" mb-4">
+                        {{ field|as_crispy_field }}
+                    </div>
+                {% endif %}
+            {% endfor %}
+        </div>
+
+        <div class="mt-4">
+            <button type="submit" class="bg-blue-500 text-white px-4 py-2 rounded hover:bg-blue-600">
+                Save
+            </button>
+            <a href="{% url list_url_name %}" class="bg-gray-300 text-gray-800 px-4 py-2 rounded hover:bg-gray-400">
+                Cancel
+            </a>
+        </div>
+    </form>
+</div>
+{% endblock %}

app/sysadmin/urls.py

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

app/sysadmin/views.py

@@ -1,10 +1,13 @@
 # views.py
 from django.contrib.auth import authenticate, login, logout
 from django.shortcuts import render, redirect
-from .forms import CustomLoginForm, CustomUserCreationForm, UserProfileForm
+from .forms import CustomLoginForm, CustomUserCreationForm, UserProfileForm, UserCustomForm
 from .models import UserProfile
+from .filters import UserFilter
 from django.contrib.auth.decorators import login_required
 from django.contrib import messages
+from core.utils import ConfigurableCRUDView
+from django.contrib.auth.models import User
 
 def login_view(request):
     if request.method == "POST":
@@ -61,3 +64,25 @@ def profile_view(request):
         form = UserProfileForm(instance=profile)
 
     return render(request, 'sysadmin/profile.html', {'form': form})
+
+
+class UserCRUDView(ConfigurableCRUDView):
+    model = User
+    list_template_name = 'legacy/datacrud_list.html'
+    detail_template_name = 'legacy/datacrud_detail.html'
+    form_template_name = 'sysadmin/user_form.html'
+    confirm_delete_template_name = 'legacy/datacrud_confirm_delete.html'
+    filterset_class = UserFilter
+
+    page_title = "Users"
+
+    # URL name mappings
+    list_url_name = 'sysadmin:users-list'
+    create_url_name = 'sysadmin:users-create'
+    update_url_name = 'sysadmin:users-update'
+    delete_url_name = 'sysadmin:users-delete'
+    # excludes = ["splitdata"]
+    config_fields = ("id", "username", "is_active", "is_staff", "is_superuser", "last_login")
+    config_field_orders = ["id",]  # Display these fields first
+    form_class = UserCustomForm
+    config_edit_fields = None

app/templates/base.html

@@ -82,6 +82,15 @@
                             <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>
                           </li>
                           <li>
+                            <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>
+                          </li>
+                          <li>
+                            <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>
+                          </li>
+                          <li>
+                            <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>
+                          </li>
+                          <li>
                             <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>
                           </li>
                           <li>
@@ -91,6 +100,12 @@
                             <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>
                           </li>
                           <li>
+                            <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>
+                          </li>
+                          <li>
+                            <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>
+                          </li>
+                          <li>
                             <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>
                           </li>
                           <li>
@@ -102,12 +117,26 @@
                           <li>
                             <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>
                           </li>
-                          <li>
-                             <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>
-                          </li>
                     </ul>
                  </li>
-                <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>
+                 <li>
+
+                   <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">
+                     <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">
+                       <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"/>
+                     </svg>
+
+                     <span class="flex-1 ms-3 text-left rtl:text-right whitespace-nowrap">Settings</span>
+                     <svg class="w-3 h-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 10 6">
+                       <path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 4 4 4-4"/>
+                     </svg>
+                   </button>
+                   <ul id="setting-sub" class="hidden py-2 space-y-2">
+                     <li>
+                       <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>
+                     </li>
+                   </ul>
+                 </li>
             </ul>
         </div>
     </aside>