new

osinaweb/osinacore/api/serializers.py

@@ -5,7 +5,7 @@ from osinacore.models import *
 class UserSerializer(serializers.ModelSerializer):
     class Meta:
         model = User
-        fields = ['username', 'email', 'password']
+        fields = ['username', 'email', 'password', 'first_name', 'last_name']
 
 class CustomerProfileSerializer(serializers.ModelSerializer):
     class Meta:

osinaweb/osinacore/custom_context.py

@@ -51,7 +51,7 @@ def utilities(request):
         open_task_count = Task.objects.filter(status='Open').count()
         working_on_task_count = Task.objects.filter(status='Working On').count()
     
-    elif request.user.is_authenticated:
+    elif request.user.is_authenticated and StaffProfile.objects.filter(user=request.user):
         open_task_count = Task.objects.filter(assigned_to=request.user.staffprofile, status='Open').count()
         working_on_task_count = Task.objects.filter(assigned_to=request.user.staffprofile, status='Working On').count()
         
@@ -93,7 +93,7 @@ def last_status(request):
     hours_ago = 0 
     hours_minutes_ago = ""
     current_date = datetime.now().strftime('%Y-%m-%d')
-    if request.user.is_authenticated:
+    if request.user.is_authenticated and StaffProfile.objects.filter(user=request.user):
         last_status = Status.objects.filter(staff=request.user.staffprofile).last()
         if last_status:
             # Convert the 'time' field to a datetime object