custum admin pages added and event model updated

Author: Pascal273

api/admin.py

@@ -2,6 +2,18 @@
 
 from .models import *
 
+
+class EventAdmin(admin.ModelAdmin):
+ fieldsets = (
+ (None, {
+ 'fields': ('event_name', 'contract', 'client', 'support_contact',
+ 'status', 'attendees', 'event_date_time', 'notes')
+ }),
+ )
+
+ readonly_fields = ['client', ]
+
+
 admin.site.register(Client)
 admin.site.register(Contract)
-admin.site.register(Event)
+admin.site.register(Event, EventAdmin)

api/models.py

@@ -58,7 +58,7 @@ class Event(models.Model):
  ('CANCELLED', 'CANCELLED')
  )
 
- name = models.CharField(max_length=50, null=True)
+ event_name = models.CharField(max_length=50, null=True)
  contract = models.OneToOneField(to=Contract, # only one event per contract
  on_delete=models.CASCADE,
  related_name='contract')
@@ -69,8 +69,14 @@ class Event(models.Model):
  to=User, on_delete=models.SET_NULL, null=True)
  status = models.CharField(max_length=10, choices=STATUS_OPTIONS)
  attendees = models.IntegerField()
- event_date = models.DateTimeField(null=True)
+ event_date_time = models.DateTimeField(null=True)
  notes = models.CharField(max_length=255, null=True)
 
  def __str__(self):
- return self.name
+ date = self.event_date_time.strftime("%m-%d-&Y, %H:%M")
+ return f'{self.event_name} - {date}'
+
+ def save(self, *args, **kwargs):
+ contract = self.contract
+ self.client = contract.client
+ super(Event, self).save(*args, **kwargs)

api/serializers.py

@@ -29,7 +29,9 @@ class Meta:
 class ContractSerializer(serializers.ModelSerializer):
  """Contract model serializer"""
  client = serializers.HyperlinkedRelatedField(
- view_name='existing_clients-detail', queryset=Client.objects.all())
+ view_name='existing_clients-detail',
+ queryset=Client.objects.all()
+ )
 
  def create(self, validated_data):
  """Modified create method to convert the related client as 'existing'

authentication/admin.py

@@ -33,16 +33,17 @@ class EmployeeUserAdmin(UserAdmin):
 
  list_display = ('email', 'first_name', 'last_name', 'is_staff')
  fieldsets = (
- ('Personal info', {
+ ('Personal Information', {
  'fields': ('first_name', 'last_name', 'email', 'password', 'phone',
  'mobile', 'hire_date', 'birth_date')}),
- ('Important dates', {
- 'fields': ('last_login', 'date_joined')}),
+ ('Other Dates', {
+ 'fields': ('last_login', 'joined')}),
  ('Permissions', {'fields': (
  'is_active', 'is_staff', 'is_superuser',
  # 'groups', 'user_permissions'
  )}),
  )
+ readonly_fields = ['is_staff', 'is_superuser']
  add_fieldsets = (
  ('Personal info', {'fields': (
  'first_name', 'last_name', 'email', 'phone', 'birth_date',

authentication/models.py

@@ -56,12 +56,12 @@ class User(AbstractBaseUser, PermissionsMixin):
  last_name = models.CharField(max_length=50)
  phone = models.CharField(max_length=30, null=True)
  mobile = models.CharField(max_length=30, null=True)
- hire_date = models.DateField(null=True, default=timezone.now)
+ hire_date = models.DateField(null=True)
  birth_date = models.DateField(null=True)
  is_staff = models.BooleanField(default=False)
  is_active = models.BooleanField(default=False)
  is_superuser = models.BooleanField(default=False)
- date_joined = models.DateField(default=timezone.now)
+ joined = models.DateTimeField(default=timezone.now)
 
  objects = UserManager()
 

authentication/serializers.py

@@ -8,9 +8,23 @@
 
 
 class UserSerializer(serializers.ModelSerializer):
+
+ team = serializers.SerializerMethodField() # -> get_team
+
+ def get_team(self, user):
+ team_membership = TeamMembership.objects.filter(user=user).first()
+ if team_membership:
+ return TeamSerializer(
+ team_membership.team, many=False, required=False
+ ).data['name']
+ return None
+
  class Meta:
  model = User
- fields = '__all__'
+ fields = ['email', 'first_name', 'last_name', 'password', 'phone',
+ 'mobile', 'birth_date', 'last_login', 'hire_date',
+ 'joined', 'is_active', 'team']
+ read_only_fields = ['is_staff', 'is_superuser', 'team']
 
 
 class TeamSerializer(serializers.ModelSerializer):