Initial commit

Author: essyem

adminops/__pycache__/__init__.cpython-312.pyc

@@ -1,7 +1,88 @@
-#from django.contrib import admin
+from hawwa.models import CustomUser
+from adminops.forms import UserCreationForm
+from adminops.models import Department, UserProfile, Expense, Revenue, Report
 from django.contrib import admin
-from .models import Department, UserProfile
+from django.contrib.auth.admin import UserAdmin
+from django.contrib.auth.models import Group
 
+# Register Department model
 admin.site.register(Department)
-admin.site.register(UserProfile)
-# Register your models here.
+
+# Register Expense model
+@admin.register(Expense)
+class ExpenseAdmin(admin.ModelAdmin):
+    list_display = ('category', 'amount', 'date')
+    search_fields = ('category', 'description')
+
+# Register Revenue model
+@admin.register(Revenue)
+class RevenueAdmin(admin.ModelAdmin):
+    list_display = ('source', 'amount', 'date')
+    search_fields = ('source', 'description')
+
+# Register Report model
+@admin.register(Report)
+class ReportAdmin(admin.ModelAdmin):
+    list_display = ('title', 'generated_on')
+    search_fields = ('title',)
+
+# Register UserProfile model
+@admin.register(UserProfile)
+class UserProfileAdmin(admin.ModelAdmin):
+    list_display = ('user', 'get_department')  # Display username and department
+    search_fields = ('user__username', 'user__department__name')  # Search user details
+    ordering = ('user__username',)
+    actions = ['set_rbac_permissions', 'create_user']  # Add create_user action
+
+    # Method to retrieve the department from CustomUser
+    def get_department(self, obj):
+        return obj.user.department
+    get_department.short_description = 'Department'
+
+    # Action to manage RBAC permissions
+    def set_rbac_permissions(self, request, queryset):
+        for userprofile in queryset:
+            try:
+                group = Group.objects.get(name="View Group")
+                userprofile.user.user_permissions.add(*group.permissions.all())
+            except Group.DoesNotExist:
+                self.message_user(request, "View Group does not exist. Please create it first.", level="error")
+        self.message_user(request, "RBAC permissions updated successfully!")
+
+    # Custom action to create a new user
+    def create_user(self, request, queryset):
+        from django.shortcuts import render
+        from django.http import HttpResponseRedirect
+        from django.urls import reverse
+        from adminops.forms import UserCreationForm
+
+        if request.method == 'POST':
+            form = UserCreationForm(request.POST)
+            if form.is_valid():
+                new_user = form.save()
+                self.message_user(request, f"User '{new_user.username}' created successfully.")
+                return HttpResponseRedirect(reverse('admin:adminops_userprofile_changelist'))
+        else:
+            form = UserCreationForm()
+
+        return render(request, 'admin/create_user.html', {'form': form})
+    create_user.short_description = 'Create a new user'
+
+# Register CustomUser model
+@admin.register(CustomUser)
+class CustomUserAdmin(UserAdmin):
+    fieldsets = (
+        (None, {'fields': ('username', 'password')}),
+        ('Personal Info', {'fields': ('first_name', 'last_name', 'email', 'department')}),
+        ('Permissions', {'fields': ('is_active', 'is_staff', 'is_superuser', 'groups', 'user_permissions')}),
+        ('Important Dates', {'fields': ('last_login', 'date_joined')}),
+    )
+    add_fieldsets = (
+        (None, {
+            'classes': ('wide',),
+            'fields': ('username', 'password1', 'password2', 'email', 'department'),
+        }),
+    )
+    list_display = ('username', 'email', 'first_name', 'last_name', 'department', 'is_staff')
+    search_fields = ('username', 'email', 'first_name', 'last_name')
+    ordering = ('username',)

adminops/__pycache__/admin.cpython-312.pyc

@@ -0,0 +1,20 @@
+from django import forms
+from django.contrib.auth.models import Group
+from hawwa.models import CustomUser
+from adminops.models import Department
+
+class UserCreationForm(forms.ModelForm):
+    password = forms.CharField(widget=forms.PasswordInput)
+    department = forms.ModelChoiceField(queryset=Department.objects.all())
+    rbac_group = forms.ModelChoiceField(queryset=Group.objects.all(), required=False)
+
+    class Meta:
+        model = CustomUser
+        fields = ['username', 'password', 'email', 'first_name', 'last_name', 'department']
+
+    def save(self, commit=True):
+        user = super().save(commit=False)
+        user.set_password(self.cleaned_data['password'])
+        if commit:
+            user.save()
+        return user

adminops/__pycache__/apps.cpython-312.pyc

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.6 on 2025-02-26 06:24
+# Generated by Django 5.1.7 on 2025-03-20 04:26
 
 import django.db.models.deletion
 from django.conf import settings
@@ -22,13 +22,40 @@ class Migration(migrations.Migration):
                 ('description', models.TextField(blank=True)),
             ],
         ),
+        migrations.CreateModel(
+            name='Expense',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('category', models.CharField(max_length=100)),
+                ('amount', models.DecimalField(decimal_places=2, max_digits=10)),
+                ('date', models.DateField()),
+                ('description', models.TextField(blank=True, null=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Report',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=200)),
+                ('content', models.TextField()),
+                ('generated_on', models.DateField(auto_now_add=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Revenue',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('source', models.CharField(max_length=100)),
+                ('amount', models.DecimalField(decimal_places=2, max_digits=10)),
+                ('date', models.DateField()),
+                ('description', models.TextField(blank=True, null=True)),
+            ],
+        ),
         migrations.CreateModel(
             name='UserProfile',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('role', models.CharField(max_length=50)),
-                ('department', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='adminops.department')),
-                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='adminops_userprofile', to=settings.AUTH_USER_MODEL)),
             ],
         ),
     ]

adminops/__pycache__/forms.cpython-312.pyc

@@ -1,3 +1,4 @@
+from django.conf import settings
 from django.db import models
 from django.contrib.auth.models import User
 
@@ -9,11 +10,34 @@ def __str__(self):
         return self.name
 
 class UserProfile(models.Model):
-    user = models.OneToOneField(User, on_delete=models.CASCADE)
-    department = models.ForeignKey(Department, on_delete=models.CASCADE)
-    role = models.CharField(max_length=50)
+    user = models.OneToOneField(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.CASCADE,
+        related_name="adminops_userprofile"  # Unique related_name
+    )
+
+class Expense(models.Model):
+    category = models.CharField(max_length=100)
+    amount = models.DecimalField(max_digits=10, decimal_places=2)
+    date = models.DateField()
+    description = models.TextField(blank=True, null=True)
+
+    def __str__(self):
+        return f"{self.category} - {self.amount}"
+
+class Revenue(models.Model):
+    source = models.CharField(max_length=100)
+    amount = models.DecimalField(max_digits=10, decimal_places=2)
+    date = models.DateField()
+    description = models.TextField(blank=True, null=True)
 
     def __str__(self):
-        return self.user.username
+        return f"{self.source} - {self.amount}"
+
+class Report(models.Model):
+    title = models.CharField(max_length=200)
+    content = models.TextField()
+    generated_on = models.DateField(auto_now_add=True)
 
-# Create your models here.
+    def __str__(self):
+        return self.title

adminops/__pycache__/models.cpython-312.pyc

@@ -0,0 +1,4 @@
+#from django.contrib import admin
+#from django.contrib.auth.admin import UserAdmin
+#from .models import CustomUser
+

adminops/admin.py

@@ -0,0 +1,6 @@
+from django.contrib.admin import AdminSite
+
+class HawwaAdminSite(AdminSite):
+    site_header = "Hawwa Wellness Admin Panel"
+    site_title = "Hawwa Wellness Portal"
+    index_title = "Rediscover your strength, wellness, and joy with Hawwa."

adminops/forms.py

@@ -0,0 +1,63 @@
+# Generated by Django 5.1.7 on 2025-03-19 10:00
+
+import django.contrib.auth.models
+import django.contrib.auth.validators
+import django.db.models.deletion
+import django.utils.timezone
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CustomUser',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('password', models.CharField(max_length=128, verbose_name='password')),
+                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
+                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
+                ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
+                ('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')),
+                ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
+                ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
+                ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
+                ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
+                ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
+                ('is_verified', models.BooleanField(default=False)),
+                ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')),
+                ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),
+            ],
+            options={
+                'verbose_name': 'user',
+                'verbose_name_plural': 'users',
+                'abstract': False,
+            },
+            managers=[
+                ('objects', django.contrib.auth.models.UserManager()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='EmailOTP',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('otp', models.CharField(max_length=6)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='UserProfile',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='hawwa_userprofile', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

adminops/migrations/0001_initial.py

@@ -0,0 +1,34 @@
+# Generated by Django 5.1.7 on 2025-03-20 05:11
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('adminops', '0001_initial'),
+        ('hawwa', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='customuser',
+            name='is_verified',
+        ),
+        migrations.AddField(
+            model_name='customuser',
+            name='department',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='adminops.department'),
+        ),
+        migrations.AddField(
+            model_name='customuser',
+            name='department',
+            field=models.ForeignKey(
+                to='adminops.Department',
+                on_delete=django.db.models.deletion.SET_NULL,
+                null=True,
+                blank=True
+            ),
+        ),
+    ]

adminops/migrations/__pycache__/0001_initial.cpython-312.pyc

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.7 on 2025-03-20 07:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hawwa', '0002_remove_customuser_is_verified_customuser_department'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='customuser',
+            name='is_verified',
+            field=models.BooleanField(default=False),
+        ),
+    ]

adminops/migrations/__pycache__/0002_userprofile.cpython-312.pyc

@@ -1,7 +1,40 @@
 from django.db import models
-from django.contrib.auth.models import User
+from django.contrib.auth.models import AbstractUser
+from django.conf import settings
 
+# UserProfile model
+class UserProfile(models.Model):
+    user = models.OneToOneField(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.CASCADE,
+        related_name="hawwa_userprofile"  # Ensures a unique related_name
+    )
+
+    def __str__(self):
+        return f"UserProfile for {self.user.username}"
+
+# CustomUser model
+class CustomUser(AbstractUser):
+    # Additional fields
+    department = models.ForeignKey(
+        'adminops.Department',  # Reference to the Department model
+        on_delete=models.SET_NULL,  # Allow null if the department is deleted
+        null=True,
+        blank=True
+    )
+    is_verified = models.BooleanField(default=False)  # Add the missing field
+
+    def __str__(self):
+        return self.username
+
+# EmailOTP model
 class EmailOTP(models.Model):
-    user = models.OneToOneField(User, on_delete=models.CASCADE)
-    otp = models.CharField(max_length=6)
+    user = models.OneToOneField(
+        settings.AUTH_USER_MODEL,  # Use the custom user model
+        on_delete=models.CASCADE
+    )
+    otp = models.CharField(max_length=6)  # OTP code
     created_at = models.DateTimeField(auto_now_add=True)
+
+    def __str__(self):
+        return f"OTP for {self.user.username} created at {self.created_at}"