micro-users 1.4.1__py3-none-any.whl → 1.6.1__py3-none-any.whl

{micro_users-1.4.1.dist-info → micro_users-1.6.1.dist-info}/METADATA

@@ -1,11 +1,12 @@
 Metadata-Version: 2.1
 Name: micro-users
-Version: 1.4.1
+Version: 1.6.1
 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
@@ -33,6 +34,10 @@ Requires-Dist: babel (>=2.1)
 
 [![PyPI version](https://badge.fury.io/py/micro-users.svg)](https://pypi.org/project/micro-users/)
 
+<p align="center">
+  <img src="https://raw.githubusercontent.com/debeski/micro-users/main/users/static/img/login_logo.webp" alt="Micro Users Login Logo" width="200"/>
+</p>
+
 **Arabic** lightweight, reusable Django app providing user management with abstract user, permissions, localization, and activity logging.
 
 ## Requirements
@@ -47,9 +52,10 @@ Requires-Dist: babel (>=2.1)
 
 ## Features
 - Custom AbstractUser model
-- User permissions system  
-- Activity logging (login/logout, CRUD tracking)
-- Specific User detail and log view *new*
+- Scope Management System (replaces Department)
+- Custom Grouped User permissions system
+- Automatic Activity logging (login/logout, CRUD for all models)
+- Specific User detail and log view
 - Localization support
 - Admin interface integration
 - CRUD views and templates
@@ -76,12 +82,22 @@ INSTALLED_APPS = [
 ]
 ```
 
-2. Set custom user model in settings.py:
+2. Add Middleware in `settings.py` (Required for logging):
+```python
+MIDDLEWARE = [
+    # ...
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    # ...
+    'users.middleware.ActivityLogMiddleware',  # Add this line
+]
+```
+
+3. Set custom user model in `settings.py`:
 ```python
 AUTH_USER_MODEL = 'users.CustomUser'
 ```
 
-3. Include URLs in your main project folder `urls.py`:
+4. Include URLs in your main project folder `urls.py`:
 ```python
 urlpatterns = [
     ...
@@ -89,7 +105,7 @@ urlpatterns = [
 ]
 ```
 
-4. Run migrations:
+5. Run migrations:
 ```bash
 python manage.py migrate users
 ```
@@ -100,136 +116,18 @@ Once configured, the app automatically handles user management and activity logg
 
 ### Activity Logging
 
-The app automatically logs **LOGIN** and **LOGOUT** actions. For custom logging of other actions in your application, you can use the following helper functions:
-
-#### Available Helper Functions
-
-1. **Get Client IP** - Extract the user's IP address from request:
-```python
-from users.signals import get_client_ip
-
-# Usage in views
-ip_address = get_client_ip(request)
-```
-
-2. **Log User Action** - Create a reusable logging function:
-```python
-from django.utils import timezone
-from users.models import UserActivityLog
-from users.signals import get_client_ip
-
-def log_user_action(request, instance, action, model_name):
-    """
-    Logs a user action to the activity log.
-    
-    Args:
-        request: HttpRequest object
-        instance: The model instance being acted upon
-        action: Action type (see ACTION_TYPES below)
-        model_name: Name of the model/entity (in Arabic or English)
-    """
-    UserActivityLog.objects.create(
-        user=request.user,
-        action=action,
-        model_name=model_name,
-        object_id=instance.pk,
-        number=instance.number if hasattr(instance, 'number') else '',
-        timestamp=timezone.now(),
-        ip_address=get_client_ip(request),
-        user_agent=request.META.get("HTTP_USER_AGENT", ""),
-    )
-```
-
-#### Action Types Available
-Use these constants when logging actions:
-
-| Action Constant | Arabic Display | Description |
-|-----------------|----------------|-------------|
-| `'LOGIN'` | تسجيل دخـول | User login (auto-logged) |
-| `'LOGOUT'` | تسجيل خـروج | User logout (auto-logged) |
-| `'CREATE'` | انشـاء | Object creation |
-| `'UPDATE'` | تعديـل | Object modification |
-| `'DELETE'` | حــذف | Object deletion |
-| `'VIEW'` | عـرض | Object viewing |
-| `'DOWNLOAD'` | تحميل | File download |
-| `'CONFIRM'` | تأكيـد | Action confirmation |
-| `'REJECT'` | رفــض | Action rejection |
-| `'RESET'` | اعادة ضبط | Password/Data reset |
+The app provides a fully **automated** activity logging system. No manual configuration is required in your views.
 
-#### Usage Examples
+- **Login/Logout**: Automatically tracked.
+- **Create/Update/Delete**: Any change to any model in your app (including `Scope` and `User`) is automatically logged via Django Signals.
+- **Log content**: Tracks the user, action type, model name, object ID, and timestamp.
+    - *Note*: `last_login` field updates are automatically filtered out to prevent redundant "Update" logs on login.
 
-1. **Logging a CREATE action**:
-```python
-def create_document(request):
-    # ... create logic ...
-    document = Document.objects.create(...)
-    
-    # Log the action
-    from users.models import UserActivityLog
-    from users.signals import get_client_ip
-    
-    UserActivityLog.objects.create(
-        user=request.user,
-        action='CREATE',
-        model_name='وثيقة',
-        object_id=document.pk,
-        number=document.number,
-        ip_address=get_client_ip(request),
-        user_agent=request.META.get("HTTP_USER_AGENT", ""),
-    )
-```
-
-2. **Using the helper function**:
-```python
-# Create a helper function in your app
-def log_action(request, instance, action, model_name):
-    from users.models import UserActivityLog
-    from users.signals import get_client_ip
-    from django.utils import timezone
-    
-    UserActivityLog.objects.create(
-        user=request.user,
-        action=action,
-        model_name=model_name,
-        object_id=instance.pk,
-        number=getattr(instance, 'number', ''),
-        timestamp=timezone.now(),
-        ip_address=get_client_ip(request),
-        user_agent=request.META.get("HTTP_USER_AGENT", ""),
-    )
-
-# Usage in views
-def update_order(request, order_id):
-    order = get_object_or_404(Order, pk=order_id)
-    # ... update logic ...
-    log_action(request, order, 'UPDATE', 'طلب')
-```
-
-3. **Logging without an instance** (for general actions):
-```python
-def log_general_action(request, action, model_name, description=''):
-    from users.models import UserActivityLog
-    from users.signals import get_client_ip
-    from django.utils import timezone
-    
-    UserActivityLog.objects.create(
-        user=request.user,
-        action=action,
-        model_name=model_name,
-        object_id=None,
-        number=description,
-        timestamp=timezone.now(),
-        ip_address=get_client_ip(request),
-        user_agent=request.META.get("HTTP_USER_AGENT", ""),
-    )
-
-# Usage
-log_general_action(request, 'CONFIRM', 'نظام', 'تم تأكيد الإعدادات')
-```
+To view logs, navigate to `manage/logs/` or use the Django Admin interface ("حركات السجل").
 
 ## Available URLs
 
-All user management URLs are prefixed with `manage/` as configured. Below is the complete list:
+All user management URLs are prefixed with `manage/` as configured above. Below is the complete list:
 
 | URL Pattern | View/Function | Description |
 |-------------|---------------|-------------|
@@ -244,6 +142,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/scopes/manage/` | `views.manage_scopes` | Scope Manager (Modal) |
 
 ## Structure
 ```
@@ -252,17 +151,39 @@ users/
 ├── urls.py         # URL routing
 ├── tables.py       # User and Activity Log tables
 ├── signals.py      # Logging signals
+├── middleware.py   # Request capture for signals
 ├── models.py       # User model, permissions, activity logs
 ├── forms.py        # Creation, edit,. etc.
 ├── filter.py       # Search filters
 ├── 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
 ```
 
+## Customization
+
+### Replacing Login Logo
+To replace the default login logo, simply place your own `login_logo.webp` image in your project's static directory at `static/img/login_logo.webp`.
+
+### Theme Configuration
+You can configure the login page colors by defining `MICRO_USERS_THEME` in your project's `settings.py`. This dictionary overrides the default CSS variables.
+
+```python
+MICRO_USERS_THEME = {
+    'right_bg': '#474745',
+    'left_bg': 'white',
+    'selection_bg': '#dbdbdb',
+    'gradient_start': '#a2a2a7',
+    'gradient_end': '#474745',
+    # Additional keys supported:
+    # 'selection_moz_bg', 'left_shadow', 'right_shadow', 'right_text',
+    # 'label_color', 'input_text', 'submit_color', 'submit_focus', 'submit_active'
+}
+```
+
 ## Version History
 
 | Version  | Changes |
@@ -283,3 +204,6 @@ users/
 | 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 |
+| v1.6.0   | • **Automated Activity Logging**: dynamic logging for all CREATE/UPDATE/DELETE actions via Middleware & Signals<br> • **Refactor**: Renamed `Department` model to `Scope` (Scope Management)<br> • Removed manual logging requirement<br> • **Architecture**: Decoupled models, forms, and tables using dynamic imports and `apps.get_model` <br> • **Soft Delete**: Users are now marked as inactive with a timestamp instead of being permanently deleted<br> • **Activity Log**: Deleted users appear with a strikethrough<br> • **CSS Refactor**: Extracted and cleaned up styling with CSS variables<br> • **Login**: Refactored login page with separated JS/CSS and a new modern default logo |
+| v1.6.1   | • **Theme Configuration**: Added `MICRO_USERS_THEME` setting for easy color customization <br> • **Bug Fixes**: Explicitly excluded unwanted columns (id, ip_address, user_agent) from Activity Log table <br> • **UI**: Improved Scope Manager button visibility |

micro_users-1.6.1.dist-info/RECORD

@@ -0,0 +1,38 @@
+users/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+users/admin.py,sha256=CRS5muWUSXUC2pQteSCgUgpFjPtGnx1b5z1daODjUMM,1359
+users/apps.py,sha256=rX3NqBsz2zC_spZbHJ_tbhNwkEFaspPjpS19qil9WBo,1162
+users/filters.py,sha256=TwB47ffslp_H2ZEm8JBOKNktGgix23XDiQdy-HWG7yE,4798
+users/forms.py,sha256=4poq6wlFysX_r0KFxUd9I2K9eXhOHV36iSTjncRYHyc,16531
+users/middleware.py,sha256=CgzmKb6_4TUkwMZ0h7UgQd80DKUXsmzKvsc3V2JIujY,976
+users/models.py,sha256=XyA4UaRp4DufvgBJKtAGyal3Ci3fZxevyd1fIPqrpEw,2679
+users/signals.py,sha256=blAx8nHsfmn89hMyRBR0Jf706Z07N81ObQMY_MHaBv8,4543
+users/tables.py,sha256=CTUtH72WqMr_VVHCOHOJvDId9QhoanHzpLMgcm-TRM8,2967
+users/urls.py,sha256=hg4fiVkWcQlbZ82SZ_HjeFPQUkmK1Y7c1ho_lWBFDRg,1491
+users/views.py,sha256=HGa0x8tVY4ltSelOxHdknjsft9fMKfQTKoXvMaMPlbg,14246
+users/migrations/0001_initial.py,sha256=lx9sSKS-lxHhI6gelVH52NOkwqEMJ32TvOJUn9zaOXM,4709
+users/migrations/0002_alter_useractivitylog_action.py,sha256=I7NLxgcPTslCMuADcr1srXS_C_0y_LcZiAFFHBG5NsE,715
+users/migrations/0003_scope_alter_customuser_options_and_more.py,sha256=sp3c_NFCuKwSO7ZZ3zPMYWuD7OUhZaq7993lTGQhnmY,1672
+users/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+users/static/img/default_profile.webp,sha256=BKUoQHo4z_fZnmc6z6I-KFvLEHahDr98U9LnDQKHLAM,3018
+users/static/img/login_logo.webp,sha256=LdLMqrBlBczctcJVfLk-oxasjqcOgYnvHZ17ZMusVNE,27570
+users/static/users/css/login.css,sha256=4HaGq7P6oPxP9Jayr4fC9TtYwUEuhhtQOum7mjrOxB4,2549
+users/static/users/css/style.css,sha256=RITpRciSynpYwjC7jpPumPA5BAB993RFyuKN9oDp_Y8,4817
+users/static/users/js/anime.min.js,sha256=pD9KZEZQimTLQOMTT99lBhGT7AXyMPz3g92G1iyd470,17179
+users/static/users/js/login.js,sha256=ayXC8B5caDNNKL2UDwnDC2BA3lcNHkJu4PPXLDsviDw,1379
+users/templates/registration/login.html,sha256=2kkQR0TLsZM9gSzMY7J5y3dR7r2al6o_qgc_pGAEENs,3759
+users/templates/users/manage_users.html,sha256=ujZWmOLTZVqJJmQp6MU7PoSM-c94hvf059fR8x82D2k,6323
+users/templates/users/user_activity_log.html,sha256=Ns79XPbNegk_lyLRDZ2yZ0PZD32DFOM_6Qvt2qHlSEY,565
+users/templates/users/user_detail.html,sha256=yPiuOGF96rV8t2H1Fl2hhIq78N1588ZFbh5gbAezaxw,2053
+users/templates/users/user_form.html,sha256=jcyI7OQZOY4ue4DajPtfjAt2SmAYO5ZgHNOqTp2-FO0,1352
+users/templates/users/partials/scope_actions.html,sha256=pAcxNMmUHgeZ6baR9pHhy8HUU35emFEb8PDBPnqBSNo,273
+users/templates/users/partials/scope_form.html,sha256=XSUeEoRM-wzDZNFv7AJQBH5TFgaPF1FmwfrKRZ8fpdI,741
+users/templates/users/partials/scope_manager.html,sha256=mqhSg2NA2U_Dc5bIf3OUasTdPqdEfxvxGh5tOjBJ59Y,393
+users/templates/users/partials/user_actions.html,sha256=J44-sn0fMbLUWjdtlcf5YhgT5OYRykr1mFkeVXoI1ew,1543
+users/templates/users/profile/profile.html,sha256=Ir8zvYUgDm89BlwVuuCsPJIVvTPa_2wH3HAaitPc4s8,2911
+users/templates/users/profile/profile_edit.html,sha256=L9DUHlQHG-PmxwxBbSjgPk1dEmy0spPi6wXzT4hQe-U,4218
+users/templates/users/widgets/grouped_permissions.html,sha256=q51WO-xMvg0aAqn6Ey8pMINDbFOHap_BgHcMxOvfLBw,9878
+micro_users-1.6.1.dist-info/LICENSE,sha256=Fco89ULLSSxKkC2KKnx57SaT0R7WOkZfuk8IYcGiN50,1063
+micro_users-1.6.1.dist-info/METADATA,sha256=yNvs2ATDlhoAmzGj2-Yq_YuMAh8QlnNEmIrBTwYngWE,9471
+micro_users-1.6.1.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+micro_users-1.6.1.dist-info/top_level.txt,sha256=tWT24ZcWau2wrlbpU_h3mP2jRukyLaVYiyHBuOezpLQ,6
+micro_users-1.6.1.dist-info/RECORD,,

users/admin.py

@@ -7,12 +7,31 @@ from django.contrib.auth.models import Group
 
 User = get_user_model()
 
+from .models import UserActivityLog, Scope
+
 class CustomUserAdmin(UserAdmin):
     model = User
-    list_display = ['username', 'email', 'is_staff', 'is_active', 'phone', 'occupation']
-    list_filter = ['is_staff', 'is_active']
+    list_display = ['username', 'email', 'scope', 'is_staff', 'is_active', 'phone']
+    list_filter = ['is_staff', 'is_active', 'scope']
     search_fields = ['username', 'email']
     ordering = ['username']
 
+@admin.register(UserActivityLog)
+class UserActivityLogAdmin(admin.ModelAdmin):
+    list_display = ('user', 'action', 'model_name', 'object_id', 'timestamp', 'ip_address')
+    list_filter = ('action', 'model_name', 'timestamp')
+    search_fields = ('user__username', 'model_name', 'object_id', 'ip_address')
+    readonly_fields = ('user', 'action', 'model_name', 'object_id', 'number', 'ip_address', 'user_agent', 'timestamp')
+
+    def has_add_permission(self, request):
+        return False
+
+    def has_change_permission(self, request, obj=None):
+        return False
+
+    def has_delete_permission(self, request, obj=None):
+        return False
+
 admin.site.register(User, CustomUserAdmin)
+admin.site.register(Scope)
 admin.site.unregister(Group)

users/apps.py

@@ -27,4 +27,5 @@ class UsersConfig(AppConfig):
 
     def ready(self):
         from django.contrib.auth.models import Permission
-        Permission.__str__ = custom_permission_str
+        Permission.__str__ = custom_permission_str
+        import users.signals

users/filters.py

@@ -5,7 +5,7 @@ from django.contrib.auth import get_user_model
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Layout, Row, Column, Field, HTML
 from django.db.models import Q
-from .models import UserActivityLog
+from django.apps import apps  # Import apps
 
 User = get_user_model()  # Use custom user model
 
@@ -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(scope__name__icontains=value) |
             Q(first_name__icontains=value) |
             Q(last_name__icontains=value)
         )
@@ -57,7 +57,7 @@ class UserActivityLogFilter(django_filters.FilterSet):
         empty_label="السنة",
     )
     class Meta:
-        model = UserActivityLog
+        model = apps.get_model('users', 'UserActivityLog')
         fields = {
             'timestamp': ['gte', 'lte'],
         }
@@ -65,7 +65,7 @@ class UserActivityLogFilter(django_filters.FilterSet):
         super().__init__(*args, **kwargs)
         
         # Fetch distinct years dynamically
-        years = UserActivityLog.objects.dates('timestamp', 'year').distinct()
+        years = self.Meta.model.objects.dates('timestamp', 'year').distinct()
         self.filters['year'].extra['choices'] = [(year.year, year.year) for year in years]
         self.filters['year'].field.widget.attrs.update({
             'onchange': 'this.form.submit();'
@@ -98,11 +98,11 @@ 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) |
+            Q(scope__name__icontains=value) |
             Q(ip_address__icontains=value)
         )
 

users/forms.py

@@ -14,6 +14,7 @@ from django.db.models import Q
 
 
 from django.forms.widgets import ChoiceWidget
+from django.apps import apps  # Import apps
 
 User = get_user_model()
 
@@ -126,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", "scope", "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.scope:
+            self.fields['scope'].initial = self.user.scope
+            self.fields['scope'].disabled = True
+        
         self.fields["username"].label = "اسم المستخدم"
         self.fields["email"].label = "البريد الإلكتروني"
         self.fields["first_name"].label = "الاسم"
@@ -163,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("scope", css_class="col-md-6"), css_class="col-md-6"),
                 css_class="row"
             ),
             HTML("<hr>"),
@@ -193,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
 
 
@@ -219,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", "scope", "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.scope:
+            self.fields['scope'].disabled = True
         
         # Labels
         self.fields["username"].label = "اسم المستخدم"
@@ -239,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()
@@ -256,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("scope", css_class="col-md-6"), css_class="col-md-6"),
                 css_class="row"
             ),
             HTML("<hr>"),
@@ -294,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
 
 
@@ -329,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)
@@ -338,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):
@@ -369,4 +378,18 @@ class ArabicPasswordChangeForm(PasswordChangeForm):
     new_password2 = forms.CharField(
         label=_('تأكيد كلمة المرور الجديدة'),
         widget=forms.PasswordInput(attrs={'autocomplete': 'new-password', 'dir': 'rtl'}),
-    )
+    )
+
+class ScopeForm(forms.ModelForm):
+    class Meta:
+        model = apps.get_model('users', 'Scope')
+        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'),
+        )

users/middleware.py

@@ -0,0 +1,32 @@
+
+import threading
+
+_thread_locals = threading.local()
+
+def get_current_user():
+    return getattr(_thread_locals, 'user', None)
+
+def get_current_request():
+    return getattr(_thread_locals, 'request', None)
+
+class ActivityLogMiddleware:
+    """
+    Middleware to capture the current request and user in a thread-local variable.
+    This allows access to the user in signals where request is not available.
+    """
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        _thread_locals.user = getattr(request, 'user', None)
+        _thread_locals.request = request
+        
+        response = self.get_response(request)
+        
+        # Clean up to prevent memory leaks or data pollution in reused threads
+        if hasattr(_thread_locals, 'user'):
+            del _thread_locals.user
+        if hasattr(_thread_locals, 'request'):
+            del _thread_locals.request
+            
+        return response

users/migrations/0003_scope_alter_customuser_options_and_more.py

@@ -0,0 +1,47 @@
+# Generated by Django 5.2.8 on 2026-01-26 11:53
+
+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='Scope',
+            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='customuser',
+            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='deleted_at',
+            field=models.DateTimeField(blank=True, null=True, verbose_name='تاريخ الحذف'),
+        ),
+        migrations.AddField(
+            model_name='customuser',
+            name='scope',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='users.scope', verbose_name='النطاق'),
+        ),
+    ]

users/models.py

@@ -5,15 +5,30 @@ 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 Scope(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="جهة العمل")
+    scope = models.ForeignKey('Scope', on_delete=models.PROTECT, null=True, blank=True, verbose_name="النطاق")
     profile_picture = models.ImageField(upload_to='profile_pictures/', null=True, blank=True)
+    deleted_at = models.DateTimeField(null=True, blank=True, verbose_name="تاريخ الحذف")
 
     @property
     def full_name(self):
         return f"{self.first_name} {self.last_name}".strip()
 
+    class Meta:
+        verbose_name = "مستخدم"
+        verbose_name_plural = "المستخدمين"
+
 class UserActivityLog(models.Model):
     ACTION_TYPES = [
         ('LOGIN', 'تسجيل دخـول'),
@@ -39,3 +54,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 = "حركات السجل"