+
{% include 'messages.html' %}
-
-
-{% endblock %}
\ No newline at end of file
diff --git a/teamsnap/templates/teamsnap/player-table.html b/teamsnap/templates/teamsnap/player-table.html
deleted file mode 100644
index e56044b..0000000
--- a/teamsnap/templates/teamsnap/player-table.html
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
-
- {# | #}
- {# | #}
- {# Name | #}
- {# Pos | #}
-
-
-
- {% for form in formset %}
-
- {{ form.id.as_hidden }}
- {{ form.event.as_hidden }}
- {{ form.sequence.as_hidden }}
- {{ form.member.as_hidden }}
- {{ form.teamsnap_id.as_hidden }}
- |
- {% if form.availability.status_code == 2 %}
-
- {% elif form.availability.status_code == 1%}
-
- Maybe
- {% elif form.availability.status_code == 0%}
-
- No
- {% else %}
-
- Unknown
- {% endif %}
- |
-
- {% if form.sequence.value %}
-
- {% elif form.sequence.value == 0 %}
-
- {% endif %}
- |
-
- {{ form.instance.member.first_name }} {{ form.instance.member.last_name }}
- #{{ form.instance.member.jersey_number }}
- {#
{{ form.statline }}#}
- |
-
- {{ form.label }}
- |
- {# {{ form.instance.position }} | #}
-
- {% endfor %}
-
-
\ No newline at end of file
diff --git a/teamsnap/templates/teamsnap/event-table.html b/teamsnap/templates/teamsnap/table.html
similarity index 62%
rename from teamsnap/templates/teamsnap/event-table.html
rename to teamsnap/templates/teamsnap/table.html
index 3850a13..7881eb1 100644
--- a/teamsnap/templates/teamsnap/event-table.html
+++ b/teamsnap/templates/teamsnap/table.html
@@ -1,13 +1,8 @@
-
-
-
-
-
Title
-
-
-
-{{ formset.management_form }}
-
+{% extends 'base.html' %}
+{% block content %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/teamsnap/urls.py b/teamsnap/urls.py
index c8d30d8..dd6c8e5 100644
--- a/teamsnap/urls.py
+++ b/teamsnap/urls.py
@@ -7,9 +7,11 @@ from . import views
urlpatterns = [
path('', views.home, name='teamsnap home'),
- path('events', views.EventsListView.as_view(), name="teamsnap list events"),
- path('events-table', views.EventsTableView.as_view(), name="teamsnap table events"),
+ # path('events', views.EventsListView.as_view(), name="teamsnap list events"),
+ # path('event-table', views.EventsTableView.as_view(), name="teamsnap table events"),
+ path('table/', views.TeamsnapObjTableView.as_view(), name="teamsnap table obj"),
path('edit/event/', views.edit_event, name='teamsnap edit event'),
- path('sync_teamsnap_db', views.sync_teamsnap_db, name="sync teamsnap db"),
+ path('sync_teamsnap_db', views.sync_teamsnapdb_with_teamsnapapi, name="sync with teamsnapapi"),
+ path('sync_benchcoach_db', views.sync_teamsnapdb_to_benchcoachdb, name="sync benchcoach"),
# path('import_teamsnap', views.import_teamsnap, name="import teamsnap"),
]
\ No newline at end of file
diff --git a/teamsnap/utils/import_teamsnap.py b/teamsnap/utils/import_teamsnap.py
index cb8665a..5297686 100644
--- a/teamsnap/utils/import_teamsnap.py
+++ b/teamsnap/utils/import_teamsnap.py
@@ -29,9 +29,10 @@ def update_teamsnap_object(d, teamsnap_object: TeamsnapBaseModel, benchcoach_mod
if teamsnap_object.benchcoach_object:
#TODO I'm not sure this does anything. need to make sure.
- benchcoach_object = benchcoach_model.objects.filter(id=teamsnap_object.benchcoach_object.id).first()
+ benchcoach_object = benchcoach_model.objects.filter(id=teamsnap_object.benchcoach_object.id)
+ benchcoach_object.update(**d)
created = False
- r.append((benchcoach_object, created))
+ r.append((benchcoach_object.first(), created))
elif not teamsnap_object.benchcoach_object and create_benchcoach_object:
benchcoach_object = benchcoach_model(**d) # create new benchcoach object
teamsnap_object.benchcoach_object = benchcoach_object
diff --git a/teamsnap/utils/import_teamsnap_2.py b/teamsnap/utils/import_teamsnap_2.py
deleted file mode 100644
index e52d471..0000000
--- a/teamsnap/utils/import_teamsnap_2.py
+++ /dev/null
@@ -1,198 +0,0 @@
-import os
-import sys
-
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "benchcoachproject.settings")
-os.environ["DJANGO_SETTINGS_MODULE"] = "benchcoachproject.settings"
-import django
-django.setup()
-
-from teamsnap.teamsnap.api import TeamSnap
-import teamsnap.teamsnap.api
-from teamsnap.models import User, Member, Team, Event, Location, Availability, Opponent, TeamsnapBaseModel
-from typing import List, Type, Tuple
-from benchcoachproject.models import Profile as BenchcoachUser
-import benchcoach.models
-from django.db import models
-import pytz
-
-def update_teamsnapbasemodel_from_teamsnap(
- TeamsnapModel: Type[TeamsnapBaseModel],
- teamsnap_client: teamsnap.teamsnap.api.TeamSnap,
- fields: List[str]= ['created_at', 'updated_at'],
- additional_fields: List[str] = [],
- related_fields: List[Tuple[str, Type[TeamsnapBaseModel]]] = [],
- create = True,
- create_related = True,
- **teamsnap_search_kwargs
-):
- api_response_objects = TeamsnapModel.ApiObject.search(
- client=teamsnap_client, **teamsnap_search_kwargs
- )
-
- r = []
-
- for response_object in api_response_objects:
- d = {k:response_object.data[k] for k in fields}
- d.update({k:response_object.data[k] for k in additional_fields})
-
- for related_field_name, RelatedTeamSnapModel in related_fields:
- related_field_name = f"{related_field_name}_id"
- filter_criteria = {related_field_name:response_object.data[related_field_name]}
- if related_field_name == "team_id" and RelatedTeamSnapModel.__name__ == "Team":
- filter_criteria = {'id':response_object.data[related_field_name]}
- related_teamsnap_object = RelatedTeamSnapModel.objects.filter(**filter_criteria).first()
- if related_teamsnap_object:
- d[related_field_name] = related_teamsnap_object
- elif not related_teamsnap_object and create_related:
- related_teamsnap_object = RelatedTeamSnapModel(**{related_field_name:response_object.data[related_field_name]})
- related_teamsnap_object.save()
- elif not related_teamsnap_object and not create_related:
- raise RelatedTeamSnapModel.DoesNotExist
-
- teamsnap_object = TeamsnapModel.objects.filter(id=response_object.data['id'])
- if teamsnap_object:
- teamsnap_object.update(**d)
- created = False
- r.append((teamsnap_object.first(), created))
- elif not teamsnap_object and create:
- new_teamsnap_object = TeamsnapModel(**d) # create new benchcoach object
- new_teamsnap_object.save()
- created = True
- r.append((new_teamsnap_object, created))
- elif not teamsnap_object and not create:
- raise TeamsnapModel.DoesNotExist
-
- return r
-
-def update_events(
- teamsnap_client: teamsnap.teamsnap.api.TeamSnap,
- create: bool = True,
- create_related: bool = False,
- **teamsnap_search_kwargs
-):
- r = update_teamsnapbasemodel_from_teamsnap(
- TeamsnapModel= Event,
- teamsnap_client= teamsnap_client,
- additional_fields=['label', 'start_date', 'formatted_title', 'points_for_opponent', 'points_for_team', 'is_game', 'game_type'],
- related_fields=[('location', Location), ('opponent', Opponent), ('team', Team)],
- create=create,
- create_related=create_related,
- **teamsnap_search_kwargs
- )
-
- return r
-
-def update_opponents(
- teamsnap_client: teamsnap.teamsnap.api.TeamSnap,
- create: bool = True,
- create_related: bool = False,
- **teamsnap_search_kwargs
-):
- r = update_teamsnapbasemodel_from_teamsnap(
- TeamsnapModel= Opponent,
- teamsnap_client= teamsnap_client,
- additional_fields=['name'],
- related_fields=[('team', Team)],
- create=create,
- create_related=create_related,
- **teamsnap_search_kwargs
- )
-
- return r
-
-def update_teams(
- teamsnap_client: teamsnap.teamsnap.api.TeamSnap,
- create: bool = True,
- create_related: bool = False,
- **teamsnap_search_kwargs
-):
- r = update_teamsnapbasemodel_from_teamsnap(
- TeamsnapModel=Team,
- teamsnap_client=teamsnap_client,
- additional_fields=['name'],
- create=create,
- create_related=create_related,
- **teamsnap_search_kwargs
- )
-
-
-def update_locations(
- teamsnap_client: teamsnap.teamsnap.api.TeamSnap,
- create: bool = True,
- create_related: bool = False,
- **teamsnap_search_kwargs
-):
- r = update_teamsnapbasemodel_from_teamsnap(
- TeamsnapModel=Location,
- teamsnap_client=teamsnap_client,
- additional_fields=['name'],
- related_fields=[('team', Team)],
- create=create,
- create_related=create_related,
- **teamsnap_search_kwargs
- )
-
-def update_availabilities(teamsnap_client: teamsnap.teamsnap.api.TeamSnap,
- create: bool = True,
- create_related: bool = False,
- **teamsnap_search_kwargs
-):
- r = update_teamsnapbasemodel_from_teamsnap(
- TeamsnapModel= Availability,
- teamsnap_client= teamsnap_client,
- related_fields=[('event', Event), ('member', Member), ('team', Team)],
- create=create,
- create_related=create_related,
- **teamsnap_search_kwargs
- )
-
-def import_teamsnap():
- user = BenchcoachUser.objects.get(id=1)
- TOKEN = user.teamsnap_access_token
- USER_ID = user.teamsnap_user.id
- TEAM_ID = user.teamsnapsettings.managed_team.id
- CLIENT = TeamSnap(token=TOKEN)
-
- l = []
- for team in Opponent.objects.filter(managed_by_team_id=TEAM_ID):
- l += update_opponent(team, create_benchcoach_object=True, create_related=True)
-
- for team in Team.objects.filter(id=TEAM_ID):
- l += update_team(team, create_benchcoach_object=True, create_related=True)
-
- for location in Location.objects.filter(managed_by_team_id=TEAM_ID):
- l += update_location(location, create_benchcoach_object=True, create_related=True)
-
- for member in Member.objects.filter(managed_by_team_id=TEAM_ID, is_non_player=False):
- l += update_member(member, create_benchcoach_object= True, create_related=True)
-
- for event in Event.objects.filter(managed_by_team_id=TEAM_ID):
- l += update_event(event, create_benchcoach_object=True, create_related=True)
-
- for availability in Availability.objects.filter(managed_by_team_id=TEAM_ID):
- l += update_availability(availability, create_benchcoach_object=True, create_related=True)
-
- pass
- # l += update_teams(CLIENT, team_id=TEAM_ID)
- # l += update_members(CLIENT, team_id=TEAM_ID)
- # l += update_locations(CLIENT, team_id=TEAM_ID)
- # l += update_events(CLIENT, team_id=TEAM_ID)
- # l += update_availabilities(CLIENT, team_id=TEAM_ID)
-
-if __name__ == "__main__":
-
- TOKEN = BenchcoachUser.objects.get(id=1).teamsnap_access_token
- USER_ID = BenchcoachUser.objects.get(id=1).teamsnap_user_id
- TEAM_ID = BenchcoachUser.objects.get(id=1).teamsnapsettings.managed_team_id
- CLIENT = TeamSnap(token=TOKEN)
- for Obj in [User]:
- a = Obj.ApiObject.search(CLIENT, id=USER_ID)
- for _a in a:
- obj, created = Obj.update_or_create_from_teamsnap_api(_a.data)
-
- for Obj in [Event, Availability, Location, Member, Opponent, Team]:
- a = Obj.ApiObject.search(CLIENT, team_id=TEAM_ID)
- for _a in a:
- obj, created = Obj.update_or_create_from_teamsnap_api(_a.data)
- # update_opponents(CLIENT, team_id=TEAM_ID)
- # update_events(CLIENT, team_id=TEAM_ID)
\ No newline at end of file
diff --git a/teamsnap/views.py b/teamsnap/views.py
index 090ccb3..ce3c94a 100644
--- a/teamsnap/views.py
+++ b/teamsnap/views.py
@@ -4,20 +4,20 @@ from .teamsnap.api import Event as TsApiEvent
from .teamsnap.api import TeamSnap
from .models import User, Member, Team, Event, Location, LineupEntry, Opponent, Availability
from lib.views import BenchcoachListView
-from .forms import LineupEntryForm, LineupEntryFormSet, EventForm, EventFormSet
+from .forms import EventForm, MemberForm, OpponentForm, TeamForm, LocationForm
from django.urls import reverse
from django.db.models import Case, When
from django.views import View
from django.http import HttpResponse
import benchcoachproject.models
import benchcoach.models
-import teamsnap.teamsnap.api
-import json
from django.http import JsonResponse
from .utils.teamsnap_object_utils import update_users, update_teams, update_events, update_members, update_locations, update_availabilities
from django.contrib import messages
from django.template.loader import render_to_string
from .utils.import_teamsnap import update_team, update_event, update_member, update_location, update_opponent, update_availability, update_teamsnap_object
+from django.forms import modelformset_factory
+import django.db.models
def queryset_from_ids(Model, id_list):
#https://stackoverflow.com/questions/4916851/django-get-a-queryset-from-array-of-ids-in-specific-order
@@ -40,61 +40,45 @@ def home(request):
}
return render(request, 'teamsnap/home.html', context)
-class EventsTableView(View):
- def get(self, request):
- qs = Event.objects.all()
- formset = EventFormSet(queryset=qs)
- return render(request,'teamsnap/event-table.html', context={'formset':formset})
+class TeamsnapObjTableView(View):
+ Model = None
+ Form = None
+ template = 'teamsnap/table.html'
+ options = {
+ 'event': (Event, EventForm),
+ 'location': (Location, LocationForm),
+ 'member': (Member, MemberForm),
+ 'opponent': (Opponent, OpponentForm),
+ 'team': (Team, TeamForm)
+ }
-class EventsListView(BenchcoachListView):
- Model = Event
- edit_url = 'teamsnap edit event'
- list_url = 'teamsnap list events'
- page_title = "TeamSnap Events"
- title_strf = '{item.formatted_title}'
- body_strf = "{item.start_date:%a, %b %-d, %-I:%M %p},\n{item.location.name}"
+ def post(self, request, object):
+ self.Model, self.Form = self.options[object]
+ self.Formset = modelformset_factory(
+ model=self.Model,
+ form=self.Form,
+ extra=0
+ )
+ formset = self.Formset(request.POST, request.FILES)
+ if formset.is_valid():
+ formset.save()
+ return HttpResponse(200)
+ else:
+ return HttpResponse(422)
+ pass
- def get_context_data(self):
- context = super().get_context_data()
- for item in context['items']:
- item['buttons'].append(
- {
- 'label': 'Edit Lineup',
- 'href': reverse('teamsnap edit lineup', args=[item['id']])
- }
- )
- return context
+ def get(self, request, object):
+ self.Model, self.Form = self.options[object]
+ self.Formset = modelformset_factory(
+ model=self.Model,
+ form=self.Form,
+ extra=0
+ )
+ qs = self.Model.objects.all()
+ formset = self.Formset(queryset=qs)
+ return render(request, self.template, context={'formset': formset})
-class TeamListView(BenchcoachListView):
- Model = Team
- edit_url = 'teamsnap edit team'
- list_url = 'teamsnap list teams'
- page_title = "TeamSnap Teams"
-
-class LocationListView(BenchcoachListView):
- Model = Location
- edit_url = 'teamsnap edit location'
- list_url = 'teamsnap list locations'
- page_title = "TeamSnap Locations"
-
-def update_from_teamsnap_event(request):
- TOKEN = benchcoachproject.models.User.objects.get(id=1).teamsnap_access_token
- CLIENT = TeamSnap(token=TOKEN)
- teamsnap_event_id=request.POST.get('teamsnap event')
- benchcoach_event_id=request.POST.get('teamsnap event')
- if teamsnap_event_id:
- benchcoach_event = benchcoach.models.Event.objects.get(id=benchcoach_event_id)
- teamsnap_object = benchcoach.models.Event.objects.get(id=teamsnap_event_id)
- teamsnap_id = teamsnap_object.teamsnap_id
- teamsnap_response = TsApiEvent.search(client=CLIENT, id=teamsnap_id)
- if teamsnap_response[0]:
- data = teamsnap_response[0].data
- location = Location.objects.get(teamsnap_id=data['location_id'])
- opponent = Team.objects.get(teamsnap_id=data['opponent_id'])
-
- return HttpResponse(f'Success, {data}')
-
-def sync_with_teamsnap_api(request):
+def sync_teamsnapdb_with_teamsnapapi(request):
'''
This sync the internal TeamSnap Database with the TeamSnap API
'''
@@ -119,6 +103,7 @@ def sync_with_teamsnap_api(request):
obj, created = Obj.update_or_create_from_teamsnap_api(_a.data)
r[Obj.__name__].append((obj, created))
+
for object_name, results in r.items():
if len(r) == 0:
messages.error(request, f"Error! No {object_name} objects created or updated")
@@ -132,7 +117,7 @@ def sync_with_teamsnap_api(request):
return JsonResponse(data)
-def sync_teamsnap_db(request):
+def sync_teamsnapdb_to_benchcoachdb(request):
'''
This syncs the internal BenchCoach Database and the TeamSnap Database
'''
@@ -148,7 +133,7 @@ def sync_teamsnap_db(request):
r['location'] = []
for location in Location.objects.filter(team_id=TEAM_ID):
- r['team/location'] += update_location(location, create_benchcoach_object=True, create_related=True)
+ r['location'] += update_location(location, create_benchcoach_object=True, create_related=True)
r['member'] = []
for member in Member.objects.filter(team_id=TEAM_ID, is_non_player=False):
@@ -159,8 +144,9 @@ def sync_teamsnap_db(request):
r['event'] += update_event(event, create_benchcoach_object=True, create_related=True)
r['availability'] = []
- for availability in Availability.objects.filter(team_id=TEAM_ID):
+ for availability in Availability.objects.filter(team_id=TEAM_ID, member__is_non_player=False):
r['availability'] += update_availability(availability, create_benchcoach_object=True, create_related=True)
+ pass
for object_name, results in r.items():
if len(r) == 0: