New changes

osinaweb/osinacore/admin.py

@@ -31,5 +31,6 @@ admin.site.register(Epic)
 admin.site.register(Note)
 admin.site.register(Task)
 admin.site.register(Status)
+admin.site.register(Tag)
 
 

osinaweb/osinacore/views.py

@@ -47,7 +47,7 @@ def signout(request):
 @login_required
 def home(request, *args, **kwargs):
     notes = Note.objects.filter(user=request.user).order_by('-date')[:6]
-    recent_note = Note.objects.last()
+    recent_note = Note.objects.filter(user=request.user).last()
 
     if request.user.is_superuser:
         # Superadmin can see the last 8 tasks for all users
@@ -78,13 +78,13 @@ def home(request, *args, **kwargs):
 def my_projects(request, *args, **kwargs):
     user = request.user
 
-    try:
-        staff_profile = StaffProfile.objects.get(user=user)
-
-        projects = Project.objects.filter(models.Q(manager=staff_profile) | models.Q(members=staff_profile)).distinct().order_by('-project_id')
+    if user.is_superuser:
+        # Superadmin can see all projects
+        projects = Project.objects.all()
+    else:
+        # Non-superuser, filter projects where the user is either the manager or a member
+        projects = Project.objects.filter(Q(manager=user.staffprofile) | Q(members=user.staffprofile)).distinct()
 
-    except StaffProfile.DoesNotExist:
-        projects = []
     
     context = {
 

osinaweb/templates/main.html

@@ -108,7 +108,7 @@
                         <a href="{% url 'users' %}">
                             <div
                                 class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 text-[18px] cursor-pointer">
-                                <p class="text-white">Staff Profiles</p>
+                                <p class="text-white">Staffs</p>
                             </div>
                         </a>
                     </div>