mgoetz/roofis2
Archived
1
1
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Add accesspoint model

Browse Source
This commit is contained in:
Götz 2018-06-09 01:09:40 +02:00
parent 97ed915086
commit f1ab54c1f0
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roofis2/roomservice/admin.py
View File

@ -1,5 +1,6 @@
from django.contrib import admin from django.contrib import admin
from .models import Staff, Room, RoomType, BookingGroup, Booking, Equipment, Location, Buildings, NumEquipment from .models import Staff, Room, RoomType, BookingGroup, Booking, Equipment, Location, Building, NumEquipment, \
AccessPoint
# Register your models here. # Register your models here.
admin.site.register(Staff) admin.site.register(Staff)
@ -9,5 +10,6 @@ admin.site.register(BookingGroup)
admin.site.register(Booking) admin.site.register(Booking)
admin.site.register(Equipment) admin.site.register(Equipment)
admin.site.register(Location) admin.site.register(Location)
admin.site.register(Buildings) admin.site.register(Building)
admin.site.register(NumEquipment) admin.site.register(NumEquipment)
admin.site.register(AccessPoint)

14
roofis2/roomservice/models.py
View File

@ -10,7 +10,7 @@ class Location(models.Model):
return '{}'.format(self.name) return '{}'.format(self.name)
class Buildings(models.Model): class Building(models.Model):
name = models.CharField(max_length=16) name = models.CharField(max_length=16)
location = models.ForeignKey(Location, on_delete=models.CASCADE) location = models.ForeignKey(Location, on_delete=models.CASCADE)
@ -42,7 +42,7 @@ class Staff(models.Model):
class Room(models.Model): class Room(models.Model):
building = models.ForeignKey(Buildings, on_delete=models.CASCADE) building = models.ForeignKey(Building, on_delete=models.CASCADE)
room_number = models.CharField(max_length=16) room_number = models.CharField(max_length=16)
capacity = models.IntegerField() capacity = models.IntegerField()
seating = models.BooleanField() seating = models.BooleanField()
@ -52,6 +52,8 @@ class Room(models.Model):
floor = models.SmallIntegerField() floor = models.SmallIntegerField()
admin = models.ForeignKey(BookingGroup, on_delete=models.SET_DEFAULT, default=1) admin = models.ForeignKey(BookingGroup, on_delete=models.SET_DEFAULT, default=1)
service_staff = models.ForeignKey(Staff, on_delete=models.PROTECT) service_staff = models.ForeignKey(Staff, on_delete=models.PROTECT)
latitude = models.FloatField()
longitude = models.FloatField()
def __str__(self): def __str__(self):
return '{} - {}'.format(self.building.name, self.room_number) return '{} - {}'.format(self.building.name, self.room_number)
@ -91,3 +93,11 @@ class Booking(models.Model):
def __str__(self): def __str__(self):
return '{} - {} - {}'.format(self.room.room_number, self.start_date.strftime('%Y - %m - %d'), return '{} - {} - {}'.format(self.room.room_number, self.start_date.strftime('%Y - %m - %d'),
self.end_date.strftime('%Y - %m - %d')) self.end_date.strftime('%Y - %m - %d'))
class AccessPoint(models.Model):
mac_address = models.CharField(max_length=12)
rooms = models.ManyToManyField(Room)
def __str__(self):
return '{}'.format(self.mac_address)