altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 5 Packages Projects Releases Wiki Activity

Updated the api resources file with the new meeting model fields.

Browse source 
- Legacy-Id: 9609
This commit is contained in:
Henrik Levkowetz 2015-05-07 19:58:07 +00:00
parent 09abdf60e6
commit 213e769d76
1 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
ietf/meeting/resources.py
View file

@ -10,8 +10,8 @@ from ietf.meeting.models import ( Meeting, ResourceAssociation, Constraint, Room
from ietf.name.resources import MeetingTypeNameResource from ietf.name.resources import MeetingTypeNameResource
class MeetingResource(ModelResource): class MeetingResource(ModelResource):
type = ToOneField(MeetingTypeNameResource, 'type') type = ToOneField(MeetingTypeNameResource, 'type')
agenda = ToOneField('ietf.meeting.resources.ScheduleResource', 'agenda', null=True) agenda = ToOneField('ietf.meeting.resources.ScheduleResource', 'agenda', null=True)
class Meta: class Meta:
queryset = Meeting.objects.all() queryset = Meeting.objects.all()
#resource_name = 'meeting' #resource_name = 'meeting'
@ -22,6 +22,10 @@ class MeetingResource(ModelResource):
"city": ALL, "city": ALL,
"country": ALL, "country": ALL,
"time_zone": ALL, "time_zone": ALL,
"idsubmit_cutoff_day_offset_00": ALL,
"idsubmit_cutoff_day_offset_01": ALL,
"idsubmit_cutoff_time_utc": ALL,
"idsubmit_cutoff_warning_days": ALL,
"venue_name": ALL, "venue_name": ALL,
"venue_addr": ALL, "venue_addr": ALL,
"break_area": ALL, "break_area": ALL,
@ -70,18 +74,22 @@ class ConstraintResource(ModelResource):
} }
api.meeting.register(ConstraintResource()) api.meeting.register(ConstraintResource())
from ietf.name.resources import TimeSlotTypeNameResource
class RoomResource(ModelResource): class RoomResource(ModelResource):
meeting = ToOneField(MeetingResource, 'meeting') meeting = ToOneField(MeetingResource, 'meeting')
resources = ToManyField(ResourceAssociationResource, 'resources', null=True) resources = ToManyField(ResourceAssociationResource, 'resources', null=True)
session_types = ToManyField(TimeSlotTypeNameResource, 'session_types', null=True)
class Meta: class Meta:
queryset = Room.objects.all() queryset = Room.objects.all()
#resource_name = 'room' #resource_name = 'room'
filtering = { filtering = {
"id": ALL, "id": ALL,
"name": ALL, "name": ALL,
"functional_name": ALL,
"capacity": ALL, "capacity": ALL,
"meeting": ALL_WITH_RELATIONS, "meeting": ALL_WITH_RELATIONS,
"resources": ALL_WITH_RELATIONS, "resources": ALL_WITH_RELATIONS,
"session_types": ALL_WITH_RELATIONS,
} }
api.meeting.register(RoomResource()) api.meeting.register(RoomResource())
@ -105,15 +113,16 @@ api.meeting.register(ScheduleResource())
from ietf.group.resources import GroupResource from ietf.group.resources import GroupResource
from ietf.doc.resources import DocumentResource from ietf.doc.resources import DocumentResource
from ietf.name.resources import SessionStatusNameResource from ietf.name.resources import TimeSlotTypeNameResource, SessionStatusNameResource
from ietf.person.resources import PersonResource from ietf.person.resources import PersonResource
class SessionResource(ModelResource): class SessionResource(ModelResource):
meeting = ToOneField(MeetingResource, 'meeting') meeting = ToOneField(MeetingResource, 'meeting')
group = ToOneField(GroupResource, 'group') type = ToOneField(TimeSlotTypeNameResource, 'type')
requested_by = ToOneField(PersonResource, 'requested_by') group = ToOneField(GroupResource, 'group')
status = ToOneField(SessionStatusNameResource, 'status') requested_by = ToOneField(PersonResource, 'requested_by')
materials = ToManyField(DocumentResource, 'materials', null=True) status = ToOneField(SessionStatusNameResource, 'status')
resources = ToManyField(ResourceAssociationResource, 'resources', null=True) materials = ToManyField(DocumentResource, 'materials', null=True)
resources = ToManyField(ResourceAssociationResource, 'resources', null=True)
requested_duration = api.TimedeltaField() requested_duration = api.TimedeltaField()
class Meta: class Meta:
queryset = Session.objects.all() queryset = Session.objects.all()
@ -130,6 +139,7 @@ class SessionResource(ModelResource):
"scheduled": ALL, "scheduled": ALL,
"modified": ALL, "modified": ALL,
"meeting": ALL_WITH_RELATIONS, "meeting": ALL_WITH_RELATIONS,
"type": ALL_WITH_RELATIONS,
"group": ALL_WITH_RELATIONS, "group": ALL_WITH_RELATIONS,
"requested_by": ALL_WITH_RELATIONS, "requested_by": ALL_WITH_RELATIONS,
"status": ALL_WITH_RELATIONS, "status": ALL_WITH_RELATIONS,