micro-users 1.4.0__tar.gz → 1.5.0__tar.gz

{micro_users-1.4.0 → micro_users-1.5.0}/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.1
 Name: micro_users
-Version: 1.4.0
+Version: 1.5.0
 Summary: Arabic Django user management app with abstract user, permissions, and activity logging
 Home-page: https://github.com/debeski/micro-users
 Author: DeBeski
 Author-email: DeBeski <debeski1@gmail.com>
 License: MIT
+Project-URL: Homepage, https://github.com/debeski/micro-users
 Keywords: django,users,permissions,authentication
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 5
@@ -47,9 +48,11 @@ Requires-Dist: babel>=2.1
 
 ## Features
 - Custom AbstractUser model
-- User permissions system  
+- Department Management System
+- Custom Grouped User permissions system *NEW*
+- Custom Grouped User permissions system *NEW*
 - Activity logging (login/logout, CRUD tracking)
-- Specific User detail and log view *new*
+- Specific User detail and log view
 - Localization support
 - Admin interface integration
 - CRUD views and templates
@@ -244,6 +247,7 @@ All user management URLs are prefixed with `manage/` as configured. Below is the
 | `manage/profile/edit/` | `views.edit_profile` | Edit current profile |
 | `manage/logs/` | `views.UserActivityLogView.as_view()` | View activity logs |
 | `manage/reset_password/<int:pk>/` | `views.reset_password` | Reset user password |
+| `manage/departments/manage/` | `views.manage_departments` | Department Manager (Modal) |
 
 ## Structure
 ```
@@ -258,7 +262,7 @@ users/
 ├── apps.py         # Permissions Localization
 ├── admin.py        # Admin UI integration
 ├── __init__.py     # Python init
-├── templates/      # HTML templates
+├── templates/      # HTML templates (includes partials)
 ├── static/         # CSS classes
 └── migrations/     # Database migrations
 ```
@@ -282,3 +286,5 @@ users/
 | v1.3.1   | • Corrected a misplaced code that caused a crash when editing profile |
 | v1.3.2   | • Minor table modifications |
 | v1.4.0   | • Redesigned Permissions UI (Grouped by App/Action) <br> • Added Global Bulk Permission Selectors <br> • Improved Arabic Localization for Permissions <br> • Optimized printing (hidden forms/buttons) <br> • Fixed various bugs and crashes |
+| v1.4.1   | • Changed "Administrative User" translation to "Responsible User" (مستخدم مسؤول) <br> • Enforced custom sorting order for Permissions (View -> Add -> Change -> Other) |
+| v1.5.0   | • Department Management (Modal-based CRUD)<br> • Department field implementation<br> • Template refactoring (partials/, profile/, users/ for logs)<br> • Verbose names for models |

{micro_users-1.4.0 → micro_users-1.5.0}/README.md

@@ -16,9 +16,11 @@
 
 ## Features
 - Custom AbstractUser model
-- User permissions system  
+- Department Management System
+- Custom Grouped User permissions system *NEW*
+- Custom Grouped User permissions system *NEW*
 - Activity logging (login/logout, CRUD tracking)
-- Specific User detail and log view *new*
+- Specific User detail and log view
 - Localization support
 - Admin interface integration
 - CRUD views and templates
@@ -213,6 +215,7 @@ All user management URLs are prefixed with `manage/` as configured. Below is the
 | `manage/profile/edit/` | `views.edit_profile` | Edit current profile |
 | `manage/logs/` | `views.UserActivityLogView.as_view()` | View activity logs |
 | `manage/reset_password/<int:pk>/` | `views.reset_password` | Reset user password |
+| `manage/departments/manage/` | `views.manage_departments` | Department Manager (Modal) |
 
 ## Structure
 ```
@@ -227,7 +230,7 @@ users/
 ├── apps.py         # Permissions Localization
 ├── admin.py        # Admin UI integration
 ├── __init__.py     # Python init
-├── templates/      # HTML templates
+├── templates/      # HTML templates (includes partials)
 ├── static/         # CSS classes
 └── migrations/     # Database migrations
 ```
@@ -250,4 +253,6 @@ users/
 | v1.3.0   | • Patched a critical security permission issue<br> • Disabled ADMIN from being viewed/edited from all other members<br> • Fixed a crash when sorting with full_name<br> • Enabled Logging for all actions |
 | v1.3.1   | • Corrected a misplaced code that caused a crash when editing profile |
 | v1.3.2   | • Minor table modifications |
-| v1.4.0   | • Redesigned Permissions UI (Grouped by App/Action) <br> • Added Global Bulk Permission Selectors <br> • Improved Arabic Localization for Permissions <br> • Optimized printing (hidden forms/buttons) <br> • Fixed various bugs and crashes |
+| v1.4.0   | • Redesigned Permissions UI (Grouped by App/Action) <br> • Added Global Bulk Permission Selectors <br> • Improved Arabic Localization for Permissions <br> • Optimized printing (hidden forms/buttons) <br> • Fixed various bugs and crashes |
+| v1.4.1   | • Changed "Administrative User" translation to "Responsible User" (مستخدم مسؤول) <br> • Enforced custom sorting order for Permissions (View -> Add -> Change -> Other) |
+| v1.5.0   | • Department Management (Modal-based CRUD)<br> • Department field implementation<br> • Template refactoring (partials/, profile/, users/ for logs)<br> • Verbose names for models |

{micro_users-1.4.0 → micro_users-1.5.0}/micro_users.egg-info/PKG-INFO

@@ -1,11 +1,12 @@
 Metadata-Version: 2.1
 Name: micro-users
-Version: 1.4.0
+Version: 1.5.0
 Summary: Arabic Django user management app with abstract user, permissions, and activity logging
 Home-page: https://github.com/debeski/micro-users
 Author: DeBeski
 Author-email: DeBeski <debeski1@gmail.com>
 License: MIT
+Project-URL: Homepage, https://github.com/debeski/micro-users
 Keywords: django,users,permissions,authentication
 Classifier: Framework :: Django
 Classifier: Framework :: Django :: 5
@@ -47,9 +48,11 @@ Requires-Dist: babel>=2.1
 
 ## Features
 - Custom AbstractUser model
-- User permissions system  
+- Department Management System
+- Custom Grouped User permissions system *NEW*
+- Custom Grouped User permissions system *NEW*
 - Activity logging (login/logout, CRUD tracking)
-- Specific User detail and log view *new*
+- Specific User detail and log view
 - Localization support
 - Admin interface integration
 - CRUD views and templates
@@ -244,6 +247,7 @@ All user management URLs are prefixed with `manage/` as configured. Below is the
 | `manage/profile/edit/` | `views.edit_profile` | Edit current profile |
 | `manage/logs/` | `views.UserActivityLogView.as_view()` | View activity logs |
 | `manage/reset_password/<int:pk>/` | `views.reset_password` | Reset user password |
+| `manage/departments/manage/` | `views.manage_departments` | Department Manager (Modal) |
 
 ## Structure
 ```
@@ -258,7 +262,7 @@ users/
 ├── apps.py         # Permissions Localization
 ├── admin.py        # Admin UI integration
 ├── __init__.py     # Python init
-├── templates/      # HTML templates
+├── templates/      # HTML templates (includes partials)
 ├── static/         # CSS classes
 └── migrations/     # Database migrations
 ```
@@ -282,3 +286,5 @@ users/
 | v1.3.1   | • Corrected a misplaced code that caused a crash when editing profile |
 | v1.3.2   | • Minor table modifications |
 | v1.4.0   | • Redesigned Permissions UI (Grouped by App/Action) <br> • Added Global Bulk Permission Selectors <br> • Improved Arabic Localization for Permissions <br> • Optimized printing (hidden forms/buttons) <br> • Fixed various bugs and crashes |
+| v1.4.1   | • Changed "Administrative User" translation to "Responsible User" (مستخدم مسؤول) <br> • Enforced custom sorting order for Permissions (View -> Add -> Change -> Other) |
+| v1.5.0   | • Department Management (Modal-based CRUD)<br> • Department field implementation<br> • Template refactoring (partials/, profile/, users/ for logs)<br> • Verbose names for models |

{micro_users-1.4.0 → micro_users-1.5.0}/micro_users.egg-info/SOURCES.txt

@@ -20,15 +20,19 @@ users/urls.py
 users/views.py
 users/migrations/0001_initial.py
 users/migrations/0002_alter_useractivitylog_action.py
+users/migrations/0003_department_alter_useractivitylog_options_and_more.py
 users/migrations/__init__.py
 users/static/css/login.css
 users/static/img/default_profile.webp
-users/templates/user_activity_log.html
 users/templates/registration/login.html
 users/templates/users/manage_users.html
-users/templates/users/profile.html
-users/templates/users/profile_edit.html
-users/templates/users/user_actions.html
+users/templates/users/user_activity_log.html
 users/templates/users/user_detail.html
 users/templates/users/user_form.html
+users/templates/users/partials/department_actions.html
+users/templates/users/partials/department_form.html
+users/templates/users/partials/department_manager.html
+users/templates/users/partials/user_actions.html
+users/templates/users/profile/profile.html
+users/templates/users/profile/profile_edit.html
 users/templates/users/widgets/grouped_permissions.html

{micro_users-1.4.0 → micro_users-1.5.0}/pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "micro_users"
-version = "1.4.0"
+version = "1.5.0"
 description = "Arabic Django user management app with abstract user, permissions, and activity logging"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -51,3 +51,6 @@ include = ["users"]
 # Include static/templates files (equivalent to include_package_data=True)
 [tool.setuptools]
 include-package-data = true
+
+[project.urls]
+Homepage = "https://github.com/debeski/micro-users"

{micro_users-1.4.0 → micro_users-1.5.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="micro_users",
-    version="1.4.0",
+    version="1.5.0",
     author="DeBeski",
     author_email="debeski1@gmail.com",
     description="Arabic django user management app with abstract user, permissions, and activity logging",

{micro_users-1.4.0 → micro_users-1.5.0}/users/admin.py

@@ -9,7 +9,7 @@ User = get_user_model()
 
 class CustomUserAdmin(UserAdmin):
     model = User
-    list_display = ['username', 'email', 'is_staff', 'is_active', 'phone', 'occupation']
+    list_display = ['username', 'email', 'is_staff', 'is_active', 'phone']
     list_filter = ['is_staff', 'is_active']
     search_fields = ['username', 'email']
     ordering = ['username']

{micro_users-1.4.0 → micro_users-1.5.0}/users/filters.py

@@ -39,7 +39,7 @@ class UserFilter(django_filters.FilterSet):
             Q(username__icontains=value) |
             Q(email__icontains=value) |
             Q(phone__icontains=value) |
-            Q(occupation__icontains=value) |
+            Q(department__name__icontains=value) |
             Q(first_name__icontains=value) |
             Q(last_name__icontains=value)
         )
@@ -98,8 +98,7 @@ class UserActivityLogFilter(django_filters.FilterSet):
         return queryset.filter(
             Q(user__username__icontains=value) |
             Q(user__email__icontains=value) |
-            Q(user__profile__phone__icontains=value) |
-            Q(user__profile__occupation__icontains=value) |
+            Q(user__phone__icontains=value) |
             Q(action__icontains=value) |
             Q(model_name__icontains=value) |
             Q(number__icontains=value) |

{micro_users-1.4.0 → micro_users-1.5.0}/users/forms.py

@@ -14,6 +14,7 @@ from django.db.models import Q
 
 
 from django.forms.widgets import ChoiceWidget
+from .models import Department
 
 User = get_user_model()
 
@@ -60,8 +61,8 @@ class GroupedPermissionWidget(ChoiceWidget):
             action = 'other'
             codename = perm.codename
             if codename.startswith('view_'): action = 'view'
-            elif codename.startswith('change_'): action = 'change'
             elif codename.startswith('add_'): action = 'add'
+            elif codename.startswith('change_'): action = 'change'
             elif codename.startswith('delete_'): action = 'delete'
             
             # Build option dict
@@ -85,6 +86,14 @@ class GroupedPermissionWidget(ChoiceWidget):
                 }
             
             grouped_perms[app_label]['actions'].setdefault(action, []).append(option)
+        
+        # Sort actions within each app: View -> Add -> Change -> Delete -> Other
+        action_order = {'view': 1, 'add': 2, 'change': 3, 'delete': 4, 'other': 5}
+        for app_label, app_data in grouped_perms.items():
+            app_data['actions'] = dict(sorted(
+                app_data['actions'].items(),
+                key=lambda item: action_order.get(item[0], 99)
+            ))
             
         context['widget']['grouped_perms'] = grouped_perms
         return context
@@ -118,11 +127,16 @@ class CustomUserCreationForm(UserCreationForm):
 
     class Meta:
         model = User
-        fields = ["username", "email", "password1", "password2", "first_name", "last_name", "phone", "occupation", "is_staff", "permissions", "is_active"]
+        fields = ["username", "email", "password1", "password2", "first_name", "last_name", "phone", "department", "is_staff", "permissions", "is_active"]
 
     def __init__(self, *args, **kwargs):
+        self.user = kwargs.pop('user', None)
         super().__init__(*args, **kwargs)
         
+        if self.user and not self.user.is_superuser and self.user.department:
+            self.fields['department'].initial = self.user.department
+            self.fields['department'].disabled = True
+        
         self.fields["username"].label = "اسم المستخدم"
         self.fields["email"].label = "البريد الإلكتروني"
         self.fields["first_name"].label = "الاسم"
@@ -155,7 +169,7 @@ class CustomUserCreationForm(UserCreationForm):
             ),
             Div(
                 Div(Field("phone", css_class="col-md-6"), css_class="col-md-6"),
-                Div(Field("occupation", css_class="col-md-6"), css_class="col-md-6"),
+                Div(Field("department", css_class="col-md-6"), css_class="col-md-6"),
                 css_class="row"
             ),
             HTML("<hr>"),
@@ -185,8 +199,8 @@ class CustomUserCreationForm(UserCreationForm):
         user = super().save(commit=False)
         if commit:
             user.save()
-        # Manually set permissions
-        user.user_permissions.set(self.cleaned_data["permissions"])
+            # Manually set permissions
+            user.user_permissions.set(self.cleaned_data["permissions"])
         return user
 
 
@@ -211,11 +225,15 @@ class CustomUserChangeForm(UserChangeForm):
 
     class Meta:
         model = User
-        fields = ["username", "email", "first_name", "last_name", "phone", "occupation", "is_staff",  "permissions", "is_active"]
+        fields = ["username", "email", "first_name", "last_name", "phone", "department", "is_staff",  "permissions", "is_active"]
 
     def __init__(self, *args, **kwargs):
-        user = kwargs.get('instance')
+        self.user = kwargs.pop('user', None)
+        user_instance = kwargs.get('instance')
         super().__init__(*args, **kwargs)
+
+        if self.user and not self.user.is_superuser and self.user.department:
+            self.fields['department'].disabled = True
         
         # Labels
         self.fields["username"].label = "اسم المستخدم"
@@ -231,8 +249,8 @@ class CustomUserChangeForm(UserChangeForm):
         self.fields["is_staff"].help_text = "يحدد ما إذا كان بإمكان المستخدم الوصول إلى قسم ادارة المستخدمين."
         self.fields["is_active"].help_text = "يحدد ما إذا كان يجب اعتبار هذا الحساب نشطًا. قم بإلغاء تحديد هذا الخيار بدلاً من الحذف."
         
-        if user:
-            self.fields["permissions"].initial = user.user_permissions.all()
+        if user_instance:
+            self.fields["permissions"].initial = user_instance.user_permissions.all()
 
         # Use Crispy Forms Layout helper
         self.helper = FormHelper()
@@ -248,7 +266,7 @@ class CustomUserChangeForm(UserChangeForm):
             ),
             Div(
                 Div(Field("phone", css_class="col-md-6"), css_class="col-md-6"),
-                Div(Field("occupation", css_class="col-md-6"), css_class="col-md-6"),
+                Div(Field("department", css_class="col-md-6"), css_class="col-md-6"),
                 css_class="row"
             ),
             HTML("<hr>"),
@@ -286,8 +304,8 @@ class CustomUserChangeForm(UserChangeForm):
         user = super().save(commit=False)
         if commit:
             user.save()
-        # Manually set permissions
-        user.user_permissions.set(self.cleaned_data["permissions"])
+            # Manually set permissions
+            user.user_permissions.set(self.cleaned_data["permissions"])
         return user
 
 
@@ -321,7 +339,7 @@ class ResetPasswordForm(SetPasswordForm):
 class UserProfileEditForm(forms.ModelForm):
     class Meta:
         model = User
-        fields = ['username', 'email', 'first_name', 'last_name', 'phone', 'occupation', 'profile_picture']
+        fields = ['username', 'email', 'first_name', 'last_name', 'phone', 'profile_picture']
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -330,7 +348,6 @@ class UserProfileEditForm(forms.ModelForm):
         self.fields['first_name'].label = "الاسم الاول"
         self.fields['last_name'].label = "اللقب"
         self.fields['phone'].label = "رقم الهاتف"
-        self.fields['occupation'].label = "جهة العمل"
         self.fields['profile_picture'].label = "الصورة الشخصية"
 
     def clean_profile_picture(self):
@@ -361,4 +378,18 @@ class ArabicPasswordChangeForm(PasswordChangeForm):
     new_password2 = forms.CharField(
         label=_('تأكيد كلمة المرور الجديدة'),
         widget=forms.PasswordInput(attrs={'autocomplete': 'new-password', 'dir': 'rtl'}),
-    )
+    )
+
+class DepartmentForm(forms.ModelForm):
+    class Meta:
+        model = Department
+        fields = ['name']
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields['name'].label = "اسم القسم"
+        self.helper = FormHelper()
+        self.helper.form_tag = False
+        self.helper.layout = Layout(
+            Field('name', css_class='col-12'),
+        )

micro_users-1.5.0/users/migrations/0003_department_alter_useractivitylog_options_and_more.py

@@ -0,0 +1,38 @@
+# Generated by Django 5.2.8 on 2026-01-26 02:15
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0002_alter_useractivitylog_action'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Department',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100, verbose_name='القسم')),
+            ],
+            options={
+                'verbose_name': 'قسم',
+                'verbose_name_plural': 'الأقسام',
+            },
+        ),
+        migrations.AlterModelOptions(
+            name='useractivitylog',
+            options={'verbose_name': 'حركة سجل', 'verbose_name_plural': 'حركات السجل'},
+        ),
+        migrations.RemoveField(
+            model_name='customuser',
+            name='occupation',
+        ),
+        migrations.AddField(
+            model_name='customuser',
+            name='department',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.department', verbose_name='القسم'),
+        ),
+    ]

{micro_users-1.4.0 → micro_users-1.5.0}/users/models.py

@@ -5,9 +5,19 @@ from django.contrib.auth.models import AbstractUser
 from django.conf import settings  # Use this to reference the custom user model
 from django.contrib.postgres.fields import JSONField
 
+class Department(models.Model):
+    name = models.CharField(max_length=100, verbose_name="القسم")
+
+    def __str__(self):
+        return self.name
+
+    class Meta:
+        verbose_name = "قسم"
+        verbose_name_plural = "الأقسام"
+
 class CustomUser(AbstractUser):
     phone = models.CharField(max_length=15, blank=True, null=True, verbose_name="رقم الهاتف")
-    occupation = models.CharField(max_length=100, blank=True, null=True, verbose_name="جهة العمل")
+    department = models.ForeignKey('Department', on_delete=models.PROTECT, null=True, blank=True, verbose_name="القسم")
     profile_picture = models.ImageField(upload_to='profile_pictures/', null=True, blank=True)
 
     @property
@@ -39,3 +49,7 @@ class UserActivityLog(models.Model):
 
     def __str__(self):
         return f"{self.user} {self.action} {self.model_name or 'General'} at {self.timestamp}"
+
+    class Meta:
+        verbose_name = "حركة سجل"
+        verbose_name_plural = "حركات السجل"

{micro_users-1.4.0 → micro_users-1.5.0}/users/tables.py

@@ -1,12 +1,13 @@
 import django_tables2 as tables
 from django.contrib.auth import get_user_model
-from .models import UserActivityLog
+from .models import UserActivityLog, Department
 
 User = get_user_model()  # Use custom user model
 
 class UserTable(tables.Table):
     username = tables.Column(verbose_name="اسم المستخدم")
     email = tables.Column(verbose_name="البريد الالكتروني")
+    department = tables.Column(verbose_name="القسم", accessor='department.name', default='-')
     full_name = tables.Column(
         verbose_name="الاسم الكامل",
         accessor='user.full_name',
@@ -20,14 +21,14 @@ class UserTable(tables.Table):
     )
     # Action buttons for edit and delete (summoned column)
     actions = tables.TemplateColumn(
-        template_name='users/user_actions.html',
+        template_name='users/partials/user_actions.html',
         orderable=False,
         verbose_name=''
     )
     class Meta:
         model = User
         template_name = "django_tables2/bootstrap5.html"
-        fields = ("username", "email", "full_name", "phone", "occupation", "is_staff", "is_active","last_login", "actions")
+        fields = ("username", "email", "full_name", "phone", "department", "is_staff", "is_active","last_login", "actions")
         attrs = {'class': 'table table-hover align-middle'}
 
 class UserActivityLogTable(tables.Table):
@@ -40,14 +41,31 @@ class UserActivityLogTable(tables.Table):
         accessor='user.full_name',
         order_by='user__first_name'
     )
+    department = tables.Column(
+        verbose_name="القسم",
+        accessor='user.department.name',
+        default='عام'
+    )
     class Meta:
         model = UserActivityLog
         template_name = "django_tables2/bootstrap5.html"
-        fields = ("timestamp", "user", "full_name", "action", "model_name", "object_id", "number")
+        fields = ("timestamp", "user", "full_name", "department", "action", "model_name", "object_id", "number")
         attrs = {'class': 'table table-hover align-middle'}
 
 class UserActivityLogTableNoUser(UserActivityLogTable):
     class Meta(UserActivityLogTable.Meta):
-        # Remove the 'user' and 'user.full_name' columns
-        exclude = ("user", "user.full_name")
+        # Remove the 'user', 'user.full_name' and 'department' columns
+        exclude = ("user", "user.full_name", "department")
+
+class DepartmentTable(tables.Table):
+    actions = tables.TemplateColumn(
+        template_name='users/partials/department_actions.html',
+        orderable=False,
+        verbose_name=''
+    )
+    class Meta:
+        model = Department
+        template_name = "django_tables2/bootstrap5.html"
+        fields = ("name", "actions")
+        attrs = {'class': 'table table-hover align-middle'}
 

micro_users-1.5.0/users/templates/users/manage_users.html

@@ -0,0 +1,156 @@
+{% extends "base.html" %}
+{% load django_tables2 %}
+{% load crispy_forms_tags %}
+
+{% block title %}الاعدادت - إدارة المستخدمين{% endblock %}
+
+{% block content %}
+
+    <form method="get" class="py-3 g-2 no-print">
+        {% crispy filter.form %}
+    </form>
+
+    <div class="card border-light shadow">
+        <div class="card-body p-0 table-responsive-lg">
+            <!-- Render the table -->
+            {% render_table table %}
+        </div>
+    </div>
+
+    <div class="mt-3">
+        {% if not request.user.department %}
+        <button type="button" class="btn btn-info me-2 no-print" onclick="loadDepartmentManager()">
+            <i class="bi bi-list me-1"></i> إدارة الأقسام
+        </button>
+        {% endif %}
+        <a href="{% url 'create_user' %}" class="btn btn-secondary no-print" title="إضافة مستخدم جديد">
+            <i class="bi bi-person-plus-fill text-light me-1 h4"></i> إضافة مستخدم جديد
+        </a>
+    </div>
+
+    <!-- Delete Modal -->
+    {% if request.user.is_superuser %}
+    <form id="deleteForm" method="post">
+        {% csrf_token %}
+        <div class="modal fade" id="deleteModal" tabindex="-1" aria-labelledby="deleteModalLabel" aria-hidden="true">
+            <div class="modal-dialog">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <h5 class="modal-title" id="deleteModalLabel">تأكيد الحذف</h5>
+                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                    </div>
+                    <div class="modal-body">
+                        <p>هل انت متأكد انك تريد حذف العضو <strong><span id="userName"></span></strong>؟</p>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="submit" class="btn btn-danger">نعم، احذف</button>
+                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">إلغاء</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </form>
+{% endif %}
+
+    <!-- Department Management Modal -->
+    <div class="modal fade" id="departmentModal" tabindex="-1" aria-hidden="true">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body" id="departmentModalBody">
+                    <!-- Content loaded via AJAX -->
+                    <div class="text-center py-5">
+                        <div class="spinner-border text-primary" role="status">
+                            <span class="visually-hidden">Loading...</span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <!-- Script for Department Modal -->
+    <script>
+        // Defined globally so they can be called from injected HTML
+        function loadDepartmentManager() {
+            const modal = new bootstrap.Modal(document.getElementById('departmentModal'));
+            modal.show();
+            loadDepartmentForm("{% url 'manage_departments' %}");
+        }
+
+        function loadDepartmentForm(url) {
+            // Default to manage_departments if no URL (e.g. back button cases)
+            // But actually we want distinct behavior:
+            // 1. Initial Load (Table)
+            // 2. Load Form (Add/Edit)
+            
+            // If url is for the form, we fetch it. If it's for the manager (table), we fetch that.
+            // The partials allow us to just dump html into the body.
+            
+            fetch(url, {
+                headers: { 'X-Requested-With': 'XMLHttpRequest' }
+            })
+            .then(response => response.json())
+            .then(data => {
+                document.getElementById('departmentModalBody').innerHTML = data.html;
+            })
+            .catch(err => console.error('Error loading content:', err));
+        }
+
+        function submitDepartmentForm(e, url) {
+            e.preventDefault();
+            const form = e.target;
+            const formData = new FormData(form);
+
+            fetch(url, {
+                method: 'POST',
+                body: formData,
+                headers: {
+                    'X-Requested-With': 'XMLHttpRequest',
+                }
+            })
+            .then(response => response.json())
+            .then(data => {
+                // Whether success or error, we replace the body with the returned HTML
+                // (Updated table or Form with errors)
+                document.getElementById('departmentModalBody').innerHTML = data.html;
+            })
+            .catch(err => console.error('Error submitting form:', err));
+        }
+
+        function deleteDepartment(url) {
+            fetch(url, {
+                headers: { 'X-Requested-With': 'XMLHttpRequest' }
+            })
+            .then(response => response.json())
+            .then(data => {
+                if (data.success) {
+                    document.getElementById('departmentModalBody').innerHTML = data.html;
+                }
+            })
+            .catch(err => console.error('Error deleting department:', err));
+        }
+    </script>
+{% endblock %}
+
+{% block scripts %}
+
+    <script nonce="{{ request.csp_nonce }}">
+        document.addEventListener("DOMContentLoaded", function () {
+            const deleteModal = document.getElementById("deleteModal");
+            deleteModal.addEventListener("show.bs.modal", function (event) {
+                let button = event.relatedTarget; // Button that triggered the modal
+                let userId = button.getAttribute("data-user-id");
+                let userName = button.getAttribute("data-user-name");
+                let form = document.getElementById("deleteForm");
+
+                // Update the modal content
+                document.getElementById("userName").textContent = userName;
+                form.action = "{% url 'delete_user' 0 %}".replace("/0/", `/${userId}/`);
+            });
+        });
+    </script>
+
+{% endblock %}

micro_users-1.5.0/users/templates/users/partials/department_actions.html

@@ -0,0 +1,9 @@
+<div class="d-flex gap-2 justify-content-center">
+    <button class="btn btn-sm btn-primary" 
+            onclick="loadDepartmentForm('{% url 'get_department_form' record.id %}')"
+            title="تعديل">
+        <i class="bi bi-pencil-square"></i>
+    </button>
+    
+
+</div>

micro_users-1.5.0/users/templates/users/partials/department_form.html

@@ -0,0 +1,19 @@
+{% load crispy_forms_tags %}
+
+<div class="d-flex justify-content-between mb-3">
+    <h5 class="modal-title">{% if department_id %}تعديل قسم{% else %}إضافة قسم جديد{% endif %}</h5>
+    <button class="btn btn-secondary" onclick="loadDepartmentForm('{% url 'manage_departments' %}')">
+        <i class="bi bi-arrow-right me-1"></i> عودة للقائمة
+    </button>
+</div>
+
+<form id="departmentForm" onsubmit="submitDepartmentForm(event, '{% url 'save_department' %}{% if department_id %}/{{ department_id }}{% endif %}')">
+    {% csrf_token %}
+    {% crispy form %}
+    
+    <div class="mt-3 text-center">
+        <button type="submit" class="btn btn-primary w-100">
+            <i class="bi bi-save me-1"></i> حفظ
+        </button>
+    </div>
+</form>

micro_users-1.5.0/users/templates/users/partials/department_manager.html

@@ -0,0 +1,12 @@
+{% load django_tables2 %}
+<div class="d-flex justify-content-between mb-3">
+    <h5 class="modal-title">إدارة الأقسام</h5>
+    <button class="btn btn-success" 
+            onclick="loadDepartmentForm('{% url 'get_department_form' %}')">
+        <i class="bi bi-plus-lg me-1"></i> إضافة قسم
+    </button>
+</div>
+
+<div class="table-responsive">
+    {% render_table table %}
+</div>

{micro_users-1.4.0 → micro_users-1.5.0}/users/templates/users/user_detail.html

@@ -21,7 +21,7 @@
                     {% if object.is_superuser %}
                         مدير النظام
                     {% elif object.is_staff %}
-                        مستخدم اداري
+                        مستخدم مسؤول
                     {% else %}
                         مستخدم عادي
                     {% endif %}

{micro_users-1.4.0 → micro_users-1.5.0}/users/templates/users/widgets/grouped_permissions.html

@@ -8,22 +8,22 @@
                 <input class="form-check-input global-select" type="checkbox" id="{{ id }}_global_view" data-action-target="view">
                 <label class="form-check-label fw-bold" for="{{ id }}_global_view">عرض الكل</label>
             </div>
-            <div class="form-check form-check-inline">
-                <input class="form-check-input global-select" type="checkbox" id="{{ id }}_global_change" data-action-target="change">
-                <label class="form-check-label fw-bold" for="{{ id }}_global_change">تعديل الكل</label>
-            </div>
             <div class="form-check form-check-inline">
                 <input class="form-check-input global-select" type="checkbox" id="{{ id }}_global_add" data-action-target="add">
                 <label class="form-check-label fw-bold" for="{{ id }}_global_add">إضافة الكل</label>
             </div>
+            <div class="form-check form-check-inline">
+                <input class="form-check-input global-select" type="checkbox" id="{{ id }}_global_change" data-action-target="change">
+                <label class="form-check-label fw-bold" for="{{ id }}_global_change">تعديل الكل</label>
+            </div>
             <div class="form-check form-check-inline">
                 <input class="form-check-input global-select" type="checkbox" id="{{ id }}_global_other" data-action-target="other">
-                <label class="form-check-label fw-bold" for="{{ id }}_global_other">الأخرى</label>
+                <label class="form-check-label fw-bold" for="{{ id }}_global_other">الـأخرى</label>
             </div>
             
             <button type="button" class="btn btn-outline-primary ms-auto" data-bs-toggle="collapse" 
                     data-bs-target="#{{ id }}_detailed_list" aria-expanded="false" aria-controls="{{ id }}_detailed_list">
-                <i class="bi bi-list-check"></i> إظهار التفاصيل
+                <i class="bi bi-list-check"></i> إظهار كل الصلاحيات
             </button>
         </div>
     </div>
@@ -45,7 +45,7 @@
                                    data-group-target="{{ id }}_{{ app_label }}_{{ action_name }}_group">
                             <label class="form-check-label fw-bold" for="{{ id }}_{{ app_label }}_{{ action_name }}_all">
                             {% if action_name == 'view' %}
-                                مشاهدة الكل ({{ options|length }})
+                                عرض الكل ({{ options|length }})
                             {% elif action_name == 'change' %}
                                 تعديل الكل ({{ options|length }})
                             {% elif action_name == 'add' %}

{micro_users-1.4.0 → micro_users-1.5.0}/users/urls.py

@@ -16,4 +16,12 @@ urlpatterns = [
     path("logs/", views.UserActivityLogView.as_view(), name="user_activity_log"),
     path('reset_password/<int:pk>/', views.reset_password, name="reset_password"),
     path("users/<int:pk>/", views.UserDetailView.as_view(), name="user_detail"),
+    
+    # Department Management URLs
+    path("departments/manage/", views.manage_departments, name="manage_departments"),
+    path("departments/form/", views.get_department_form, name="get_department_form"),
+    path("departments/form/<int:pk>/", views.get_department_form, name="get_department_form"),
+    path("departments/save/", views.save_department, name="save_department"),
+    path("departments/save/<int:pk>/", views.save_department, name="save_department"),
+    path("departments/delete/<int:pk>/", views.delete_department, name="delete_department"),
 ]

{micro_users-1.4.0 → micro_users-1.5.0}/users/views.py

@@ -7,7 +7,7 @@ from django.contrib.auth.decorators import login_required, user_passes_test
 from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
 from django.http import JsonResponse
 from django.shortcuts import render, redirect, get_object_or_404
-from django_tables2 import RequestConfig, SingleTableView
+from django_tables2 import RequestConfig, SingleTableView, SingleTableMixin
 from django_filters.views import FilterView
 from django.views.generic.detail import DetailView
 from django.apps import apps
@@ -59,12 +59,17 @@ class UserListView(LoginRequiredMixin, UserPassesTestMixin, FilterView, SingleTa
     def test_func(self):
         return self.request.user.is_staff
 
+
+    
     def get_queryset(self):
         # Apply the filter and order by any logic you need
         qs = super().get_queryset().order_by('date_joined')
         # Hide superuser entries from non-superusers
         if not self.request.user.is_superuser:
             qs = qs.exclude(is_superuser=True)
+            # Restrict to same department
+            if self.request.user.department:
+                qs = qs.filter(department=self.request.user.department)
         return qs
 
     def get_context_data(self, **kwargs):
@@ -83,15 +88,20 @@ class UserListView(LoginRequiredMixin, UserPassesTestMixin, FilterView, SingleTa
 @user_passes_test(is_staff)
 def create_user(request):
     if request.method == "POST":
-        form = CustomUserCreationForm(request.POST or None)
+        form = CustomUserCreationForm(request.POST or None, user=request.user)
         if form.is_valid():
-            user = form.save()
+            user = form.save(commit=False)
+            # Auto-assign department for non-superusers
+            if not request.user.is_superuser and request.user.department:
+                user.department = request.user.department
+            user.save()
+            user.user_permissions.set(form.cleaned_data["permissions"])
             log_user_action(request, user, "CREATE", "مستخدم")
             return redirect("manage_users")
         else:
             return render(request, "users/user_form.html", {"form": form})
     else:
-        form = CustomUserCreationForm()
+        form = CustomUserCreationForm(user=request.user)
     
     return render(request, "users/user_form.html", {"form": form})
 
@@ -104,14 +114,22 @@ def edit_user(request, pk):
     # 🚫 Block staff users from editing superuser accounts
     if user.is_superuser and not request.user.is_superuser:
         messages.error(request, "لا يمكن تعديل هذا الحساب!")
-        return redirect('manage_users')
+
+
+    # Restrict to same department
+    if not request.user.is_superuser:
+        if request.user.department and user.department != request.user.department:
+             messages.error(request, "ليس لديك صلاحية لتعديل هذا المستخدم!")
+             return redirect('manage_users')
 
     form_reset = ResetPasswordForm(user, data=request.POST or None)
 
     if request.method == "POST":
-        form = CustomUserChangeForm(request.POST, instance=user)
+        form = CustomUserChangeForm(request.POST, instance=user, user=request.user)
         if form.is_valid():
-            user = form.save()
+            user = form.save(commit=False)
+            user.save()
+            user.user_permissions.set(form.cleaned_data["permissions"])
             log_user_action(request, user, "UPDATE", "مستخدم")
             return redirect("manage_users")
         else:
@@ -119,7 +137,7 @@ def edit_user(request, pk):
             return render(request, "users/user_form.html", {"form": form, "edit_mode": True, "form_reset": form_reset})
 
     else:
-        form = CustomUserChangeForm(instance=user)
+        form = CustomUserChangeForm(instance=user, user=request.user)
 
     return render(request, "users/user_form.html", {"form": form, "edit_mode": True, "form_reset": form_reset})
 
@@ -128,6 +146,13 @@ def edit_user(request, pk):
 @user_passes_test(is_superuser)
 def delete_user(request, pk):
     user = get_object_or_404(User, pk=pk)
+
+    # Restrict to same department
+    if not request.user.is_superuser:
+        if request.user.department and user.department != request.user.department:
+             messages.error(request, "ليس لديك صلاحية لحذف هذا المستخدم!")
+             return redirect('manage_users')
+
     if request.method == "POST":
         log_user_action(request, user, "DELETE", "مستخدم")
         user.delete()
@@ -136,22 +161,34 @@ def delete_user(request, pk):
 
 
 # Class Function for the Log
-class UserActivityLogView(LoginRequiredMixin, UserPassesTestMixin, SingleTableView):
+class UserActivityLogView(LoginRequiredMixin, UserPassesTestMixin, SingleTableMixin, FilterView):
     model = UserActivityLog
     table_class = UserActivityLogTable
     filterset_class = UserActivityLogFilter
-    template_name = "user_activity_log.html"
+    template_name = "users/user_activity_log.html"
 
     def test_func(self):
         return self.request.user.is_staff  # Only staff can access logs
     
     def get_queryset(self):
         # Order by timestamp descending by default
-        return super().get_queryset().order_by('-timestamp')
+        qs = super().get_queryset().order_by('-timestamp')
+        if not self.request.user.is_superuser:
+            qs = qs.exclude(user__is_superuser=True)
+            if self.request.user.department:
+                qs = qs.filter(user__department=self.request.user.department)
+        return qs
+
+    def get_table(self, **kwargs):
+        table = super().get_table(**kwargs)
+        if self.request.user.department:
+            table.exclude = ('department',)
+        return table
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["filter"] = self.filterset_class  # Make sure 'filter' is added
+        # Handle the filter object
+        context['filter'] = self.filterset
         return context
 
 
@@ -182,6 +219,12 @@ class UserDetailView(LoginRequiredMixin, UserPassesTestMixin, DetailView):
 def reset_password(request, pk):
     user = get_object_or_404(User, id=pk)
 
+    # Restrict to same department
+    if not request.user.is_superuser:
+        if request.user.department and user.department != request.user.department:
+             messages.error(request, "ليس لديك صلاحية لتعديل هذا المستخدم!")
+             return redirect('manage_users')
+
     if request.method == "POST":
         form = ResetPasswordForm(user=user, data=request.POST)  # ✅ Correct usage with SetPasswordForm
         if form.is_valid():
@@ -213,7 +256,7 @@ def user_profile(request):
             messages.error(request, "هناك خطأ في البيانات المدخلة")
             print(password_form.errors)  # You can log or print errors here for debugging
 
-    return render(request, 'users/profile.html', {
+    return render(request, 'users/profile/profile.html', {
         'user': user,
         'password_form': password_form
     })
@@ -233,4 +276,80 @@ def edit_profile(request):
             messages.error(request, 'حدث خطأ أثناء حفظ التغييرات')
     else:
         form = UserProfileEditForm(instance=request.user)
-    return render(request, 'users/profile_edit.html', {'form': form})
+    return render(request, 'users/profile/profile_edit.html', {'form': form})
+
+# Department Management Views
+# ###########################
+from django.template.loader import render_to_string
+from .forms import DepartmentForm
+from .models import Department
+from .tables import DepartmentTable
+
+@login_required # staff check handled in template or can be added here
+@user_passes_test(is_staff)
+def manage_departments(request):
+    """
+    Returns the initial modal content with the table.
+    """
+    if request.user.department:
+        return JsonResponse({'error': 'Permission denied.'}, status=403)
+
+    table = DepartmentTable(Department.objects.all())
+    RequestConfig(request, paginate={'per_page': 5}).configure(table)
+    
+    context = {'table': table}
+    html = render_to_string('users/partials/department_manager.html', context, request=request)
+    return JsonResponse({'html': html})
+
+@login_required
+@user_passes_test(is_staff)
+def get_department_form(request, pk=None):
+    """
+    Returns the Add/Edit form partial.
+    """
+    if request.user.department:
+        return JsonResponse({'error': 'Permission denied.'}, status=403)
+
+    if pk:
+        department = get_object_or_404(Department, pk=pk)
+        form = DepartmentForm(instance=department)
+    else:
+        form = DepartmentForm()
+        
+    html = render_to_string('users/partials/department_form.html', {'form': form, 'department_id': pk}, request=request)
+    return JsonResponse({'html': html})
+
+@login_required
+@user_passes_test(is_staff)
+def save_department(request, pk=None):
+    """
+    Handles form submission. Returns updated table on success, or form with errors on failure.
+    """
+    if request.user.department:
+        return JsonResponse({'error': 'Permission denied.'}, status=403)
+
+    if request.method == "POST":
+        if pk:
+            department = get_object_or_404(Department, pk=pk)
+            form = DepartmentForm(request.POST, instance=department)
+        else:
+            form = DepartmentForm(request.POST)
+
+        if form.is_valid():
+            form.save()
+            # Return updated table
+            table = DepartmentTable(Department.objects.all())
+            RequestConfig(request, paginate={'per_page': 5}).configure(table)
+            html = render_to_string('users/partials/department_manager.html', {'table': table}, request=request)
+            return JsonResponse({'success': True, 'html': html})
+        else:
+            # Return form with errors
+            html = render_to_string('users/partials/department_form.html', {'form': form, 'department_id': pk}, request=request)
+            return JsonResponse({'success': False, 'html': html})
+    
+    return JsonResponse({'success': False, 'error': 'Invalid method'})
+
+@login_required
+@user_passes_test(is_staff)
+def delete_department(request, pk):
+    return JsonResponse({'success': False, 'error': 'تم تعطيل حذف الأقسام لأسباب أمنية.'})

micro_users-1.4.0/users/templates/users/manage_users.html

@@ -1,70 +0,0 @@
-{% extends "base.html" %}
-{% load django_tables2 %}
-{% load crispy_forms_tags %}
-
-{% block title %}الاعدادت - إدارة المستخدمين{% endblock %}
-
-{% block content %}
-
-    <form method="get" class="py-3 g-2 no-print">
-        {% crispy filter.form %}
-    </form>
-
-    <div class="card border-light shadow">
-        <div class="card-body p-0 table-responsive-lg">
-            <!-- Render the table -->
-            {% render_table table %}
-        </div>
-    </div>
-
-    <div class="mt-3">
-        <a href="{% url 'create_user' %}" class="btn btn-secondary no-print" title="إضافة مستخدم جديد">
-            <i class="bi bi-person-plus-fill text-light me-1 h4"></i> إضافة مستخدم جديد
-        </a>
-    </div>
-
-    <!-- Delete Modal -->
-    {% if request.user.is_superuser %}
-    <form id="deleteForm" method="post">
-        {% csrf_token %}
-        <div class="modal fade" id="deleteModal" tabindex="-1" aria-labelledby="deleteModalLabel" aria-hidden="true">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title" id="deleteModalLabel">تأكيد الحذف</h5>
-                        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-                    </div>
-                    <div class="modal-body">
-                        <p>هل انت متأكد انك تريد حذف العضو <strong><span id="userName"></span></strong>؟</p>
-                    </div>
-                    <div class="modal-footer">
-                        <button type="submit" class="btn btn-danger">نعم، احذف</button>
-                        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">إلغاء</button>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </form>
-{% endif %}
-
-{% endblock %}
-
-{% block scripts %}
-
-    <script nonce="{{ request.csp_nonce }}">
-        document.addEventListener("DOMContentLoaded", function () {
-            const deleteModal = document.getElementById("deleteModal");
-            deleteModal.addEventListener("show.bs.modal", function (event) {
-                let button = event.relatedTarget; // Button that triggered the modal
-                let userId = button.getAttribute("data-user-id");
-                let userName = button.getAttribute("data-user-name");
-                let form = document.getElementById("deleteForm");
-
-                // Update the modal content
-                document.getElementById("userName").textContent = userName;
-                form.action = "{% url 'delete_user' 0 %}".replace("/0/", `/${userId}/`);
-            });
-        });
-    </script>
-
-{% endblock %}