+
{% if messages %}
{% for message in messages %}
diff --git a/config/settings/base.py b/config/settings/base.py
index d0da613..c1b3d3e 100644
--- a/config/settings/base.py
+++ b/config/settings/base.py
@@ -273,8 +273,4 @@ SOCIALACCOUNT_FORMS = {"signup": "benchcoach.users.forms.UserSocialSignupForm"}
# Your stuff...
# ------------------------------------------------------------------------------
INSTALLED_APPS += ["teamsnap", "instagen"]
-SOCIALACCOUNT_PROVIDERS = {
- 'teamsnap': {
- 'SCOPE': ["read", "write"]
- }
-}
+SOCIALACCOUNT_PROVIDERS = {"teamsnap": {"SCOPE": ["read", "write"]}}
diff --git a/config/settings/local.py b/config/settings/local.py
index 1d61629..6a5adb2 100644
--- a/config/settings/local.py
+++ b/config/settings/local.py
@@ -64,7 +64,14 @@ INSTALLED_APPS += ["django_extensions"] # noqa F405
# Your stuff...
# ------------------------------------------------------------------------------
-ALLOWED_HOSTS += ["localhost", "0.0.0.0", "127.0.0.1", "asc-nas.local", "10.0.1.4", "benchcoach-dev.ascorrea.com"]
+ALLOWED_HOSTS += [
+ "localhost",
+ "0.0.0.0",
+ "127.0.0.1",
+ "asc-nas.local",
+ "10.0.1.4",
+ "benchcoach-dev.ascorrea.com",
+]
ACCOUNT_AUTHENTICATION_METHOD = "email"
ACCOUNT_EMAIL_REQUIRED = True
ACCOUNT_USERNAME_REQUIRED = False
diff --git a/docs/conf.py b/docs/conf.py
index 3d45fbb..610663e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -12,6 +12,7 @@
import os
import sys
+
import django
if os.getenv("READTHEDOCS", default=False) == "True":
diff --git a/instagen/utils/gen_image.py b/instagen/utils/gen_image.py
index c8c0b67..dfa2f40 100644
--- a/instagen/utils/gen_image.py
+++ b/instagen/utils/gen_image.py
@@ -2,10 +2,8 @@ import os
from dataclasses import dataclass
from datetime import datetime
from pathlib import Path
-from typing import List
-from zoneinfo import ZoneInfo
-from PIL import Image, ImageDraw, ImageFilter, ImageFont
+from PIL import Image, ImageDraw, ImageFont
# image_directory = 'input/images/logos-bw/{filename}.{ext}'
@@ -115,19 +113,6 @@ def gen_image(
# transparent color.
tmp = Image.new("RGBA", background_image.size, (0, 0, 0, 0))
- # Create a drawing context for it.
- draw = ImageDraw.Draw(tmp)
-
- # section margin describes the margin of the section rectangles from the sides of the image
- section_margin_pct = 0.05
- llx = int(section_margin_pct * background_image.size[0])
- urx = int((1 - section_margin_pct) * background_image.size[0])
- lly = int((1 - section_margin_pct) * background_image.size[1])
- ury = int(0.50 * background_image.size[1])
-
- lly2 = int(0.49 * background_image.size[1])
- ury2 = int(0.05 * background_image.size[1])
-
section_info = Image.open(
Path(
"instagen/static/instagen/graphics/{name}{ext}".format(
@@ -150,7 +135,6 @@ def gen_image(
font = ImageFont.truetype(font_regular_path, 62)
text = f"{date:%a, %B %-d %-I:%M %p}".upper()
# text = date
- text_size = draw.textsize(text, font)
loc = (1050, 280)
section_info_draw.text(loc, text, (14, 42, 28), font=font, anchor="ra")
@@ -160,7 +144,6 @@ def gen_image(
text = location.name.upper()
else:
text = location_name.upper()
- text_size = section_info_draw.textsize(text, font)
loc = (1050, 355)
section_info_draw.text(loc, text, (14, 42, 28), font=font, anchor="ra")
@@ -169,7 +152,6 @@ def gen_image(
text = "VS"
else:
text = "AT"
- text_size = section_title_draw.textsize(text, font)
loc = (540, 120)
color = (255, 255, 255)
section_title_draw.text(loc, text, color, font=font, anchor="mm")
@@ -249,19 +231,6 @@ def gen_results_image(
# transparent color.
tmp = Image.new("RGBA", background_image.size, (0, 0, 0, 0))
- # Create a drawing context for it.
- draw = ImageDraw.Draw(tmp)
-
- # section margin describes the margin of the section rectangles from the sides of the image
- section_margin_pct = 0.05
- llx = int(section_margin_pct * background_image.size[0])
- urx = int((1 - section_margin_pct) * background_image.size[0])
- lly = int((1 - section_margin_pct) * background_image.size[1])
- ury = int(0.50 * background_image.size[1])
-
- lly2 = int(0.49 * background_image.size[1])
- ury2 = int(0.05 * background_image.size[1])
-
section_info = Image.open(
Path(
"instagen/static/instagen/graphics/{name}{ext}".format(
@@ -301,7 +270,6 @@ def gen_results_image(
text = f"{date:%a, %B %-d %-I:%M %p}".upper()
# text = date
font = ImageFont.truetype(font_condensed_path, 34)
- text_size = section_info_draw.textsize(text, font)
loc = (1050, 355)
section_info_draw.text(loc, text, (14, 42, 28), font=font, anchor="ra")
@@ -310,7 +278,6 @@ def gen_results_image(
text = "VS"
else:
text = "AT"
- text_size = section_title_draw.textsize(text, font)
loc = (540, 120)
color = (255, 255, 255)
section_title_draw.text(loc, text, color, font=font, anchor="mm")
diff --git a/setup.cfg b/setup.cfg
index e1fcf64..0e936ed 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,7 @@
[flake8]
max-line-length = 120
exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv
+ignore = W503
[pycodestyle]
max-line-length = 120
diff --git a/teamsnap/forms.py b/teamsnap/forms.py
index a86a08b..d263989 100644
--- a/teamsnap/forms.py
+++ b/teamsnap/forms.py
@@ -52,3 +52,17 @@ class LineupEntryForm(forms.Form):
LineupEntryFormset = formset_factory(
LineupEntryForm, can_delete=True, can_order=True, extra=0
)
+
+
+class EventChooseForm(forms.Form):
+ event_id = forms.ChoiceField()
+
+ # checked = forms.BooleanField(required=False)
+ # def __init__(self, events, *args, **kwargs):
+ # super(EventChooseForm, self).__init__(*args, **kwargs)
+ # self.fields['foo'].choices = [e.data['id'] for e in events]
+
+
+LineupEntryFormset = formset_factory(
+ LineupEntryForm, can_delete=True, can_order=True, extra=0
+)
diff --git a/teamsnap/migrations/0001_initial.py b/teamsnap/migrations/0001_initial.py
index c7ba542..6a5fc68 100644
--- a/teamsnap/migrations/0001_initial.py
+++ b/teamsnap/migrations/0001_initial.py
@@ -15,11 +15,25 @@ class Migration(migrations.Migration):
operations = [
migrations.CreateModel(
- name='Preferences',
+ name="Preferences",
fields=[
- ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
- ('managed_team_id', models.IntegerField()),
- ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+ (
+ "id",
+ models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ ("managed_team_id", models.IntegerField()),
+ (
+ "user",
+ models.OneToOneField(
+ on_delete=django.db.models.deletion.CASCADE,
+ to=settings.AUTH_USER_MODEL,
+ ),
+ ),
],
),
]
diff --git a/teamsnap/urls.py b/teamsnap/urls.py
index faa9e83..0e12217 100644
--- a/teamsnap/urls.py
+++ b/teamsnap/urls.py
@@ -6,10 +6,10 @@ from .views import (
PreferencesFormView,
dashboard,
edit_lineup,
+ multi_lineup_choose,
schedule_view,
- view_event,
submit_lineup,
- gamecard
+ view_event,
)
urlpatterns = default_urlpatterns(TeamsnapProvider)
@@ -31,15 +31,18 @@ urlpatterns += [
name="teamsnap_edit_lineup",
),
path(
- '/event//submit_lineup/',
+ "/event//submit_lineup/",
submit_lineup,
- name='teamsnap_submit_lineup'
+ name="teamsnap_submit_lineup",
+ ),
+ path(
+ "/event//edit_lineup/",
+ edit_lineup,
+ name="teamsnap_edit_multiple_lineups",
+ ),
+ path(
+ "/multievent/choose",
+ multi_lineup_choose,
+ name="teamsnap_choose_multiple_lineups",
),
- path('/event//edit_lineup/',
- edit_lineup,
- name='teamsnap_edit_multiple_lineups'
- ),
- path('/schedule/edit_lineup//gamecard/',
- gamecard,
- name='gamecard'),
]
diff --git a/teamsnap/views.py b/teamsnap/views.py
index 8cac25b..0edc0c9 100644
--- a/teamsnap/views.py
+++ b/teamsnap/views.py
@@ -1,19 +1,25 @@
import datetime
+import pyteamsnap.api
import requests
from allauth.socialaccount.providers.oauth2.views import (
OAuth2Adapter,
OAuth2CallbackView,
OAuth2LoginView,
)
+from django.http import (
+ HttpResponse,
+ HttpResponseNotAllowed,
+ HttpResponseServerError,
+ JsonResponse,
+)
from django.shortcuts import redirect, render
from django.views.generic.edit import FormView
-from django.http import HttpResponseNotAllowed, HttpResponse, JsonResponse, HttpResponseServerError
from .forms import PreferencesForm
from .models import Preferences
from .provider import TeamsnapProvider
-import pyteamsnap.api
+
class TeamsnapAdapter(OAuth2Adapter):
provider_id = TeamsnapProvider.id
@@ -46,6 +52,7 @@ class TeamsnapAdapter(OAuth2Adapter):
oauth2_login = OAuth2LoginView.adapter_view(TeamsnapAdapter)
oauth2_callback = OAuth2CallbackView.adapter_view(TeamsnapAdapter)
+
def get_teamsnap_client(request):
request.user.socialaccount_set.filter(provider="teamsnap").first()
current_teamsnap_user = request.user.socialaccount_set.filter(
@@ -58,6 +65,7 @@ def get_teamsnap_client(request):
return pyteamsnap.api.TeamSnap(token=ts_token)
+
class PreferencesFormView(FormView):
template_name = "preferences.html"
form_class = PreferencesForm
@@ -190,8 +198,6 @@ def view_event(request, event_id, team_id=None):
def edit_lineup(request, event_ids, team_id):
import re
- from teamsnap.forms import LineupEntryFormset
-
from pyteamsnap.api import (
Availability,
AvailabilitySummary,
@@ -199,9 +205,10 @@ def edit_lineup(request, event_ids, team_id):
EventLineup,
EventLineupEntry,
Member,
- TeamSnap,
)
+ from teamsnap.forms import LineupEntryFormset
+
client = get_teamsnap_client(request)
event_ids = str(event_ids).split(",")
@@ -231,28 +238,34 @@ def edit_lineup(request, event_ids, team_id):
for lineup_entry in ts_lineup_entries:
members.append(
{
- "member": getattr(ts_member_lookup[lineup_entry.data['member_id']],'data'),
+ "member": getattr(
+ ts_member_lookup[lineup_entry.data["member_id"]], "data"
+ ),
"availability": getattr(
- ts_availability_lookup.get(lineup_entry.data['member_id'], {}), "data", {}
- ),
- "lineup_entry": getattr(
- lineup_entry, "data", {}
+ ts_availability_lookup.get(lineup_entry.data["member_id"], {}),
+ "data",
+ {},
),
+ "lineup_entry": getattr(lineup_entry, "data", {}),
}
)
- in_lineup_already = [m['member'] for m in members]
+ in_lineup_already = [m["member"] for m in members]
for member in ts_members:
- if not member.data in in_lineup_already:
+ if member.data not in in_lineup_already:
members.append(
{
"member": getattr(member, "data"),
"availability": getattr(
- ts_availability_lookup.get(member.data["id"], {}), "data", {}
+ ts_availability_lookup.get(member.data["id"], {}),
+ "data",
+ {},
),
"lineup_entry": getattr(
- ts_lineup_entries_lookup.get(member.data["id"], {}), "data", {}
+ ts_lineup_entries_lookup.get(member.data["id"], {}),
+ "data",
+ {},
),
}
)
@@ -346,9 +359,7 @@ def edit_lineup(request, event_ids, team_id):
}
)
- return render(
- request, "lineup/multiple_edit.html", context={"contexts": contexts}
- )
+ return render(request, "lineup/multiple_edit.html", context={"contexts": contexts})
def dashboard(request, team_id=None):
@@ -389,14 +400,14 @@ def dashboard(request, team_id=None):
def submit_lineup(request, team_id, event_id):
+ from pyteamsnap.api import Event, EventLineup, EventLineupEntry
+
from teamsnap.forms import LineupEntryFormset
- from pyteamsnap.api import EventLineup, TeamSnap, EventLineupEntry, Event
-
client = get_teamsnap_client(request)
- ts_event = Event.get(client,event_id)
+ ts_event = Event.get(client, event_id)
ts_lineup = EventLineup.search(client, event_id=event_id)
- event_lineup_id = ts_lineup[0].data['id']
+ event_lineup_id = ts_lineup[0].data["id"]
if request.GET:
return HttpResponseNotAllowed()
if request.POST:
@@ -405,12 +416,14 @@ def submit_lineup(request, team_id, event_id):
r = []
for form in formset:
data = form.cleaned_data
- if data.get('event_lineup_entry_id'):
- event_lineup_entry = EventLineupEntry.get(client, id=data.get('event_lineup_entry_id'))
- if data.get('position_only'):
- data['label'] = data['label'] + ' [PO]'
+ if data.get("event_lineup_entry_id"):
+ event_lineup_entry = EventLineupEntry.get(
+ client, id=data.get("event_lineup_entry_id")
+ )
+ if data.get("position_only"):
+ data["label"] = data["label"] + " [PO]"
event_lineup_entry.data.update(data)
- if not data.get('sequence') and not data.get('label'):
+ if not data.get("sequence") and not data.get("label"):
try:
r.append(event_lineup_entry.delete())
except Exception as e:
@@ -418,13 +431,14 @@ def submit_lineup(request, team_id, event_id):
else:
try:
r.append(event_lineup_entry.put())
- except:
+ except Exception as e:
+ e
pass
pass
- elif data.get('sequence') is not None and data.get('label'):
+ elif data.get("sequence") is not None and data.get("label"):
event_lineup_entry = EventLineupEntry.new(client)
- if data.get('position_only'):
- data['label'] = data['label'] + ' [PO]'
+ if data.get("position_only"):
+ data["label"] = data["label"] + " [PO]"
event_lineup_entry.data.update(data)
event_lineup_entry.data.update({"event_lineup_id": event_lineup_id})
try:
@@ -441,92 +455,57 @@ def submit_lineup(request, team_id, event_id):
return JsonResponse(ts_event.data)
pass
return HttpResponseServerError
-def gamecard(request, team_id, event_id):
- import re
- from pyteamsnap.api import Event, Availability, Member, EventLineupEntry, EventLineup, \
- AvailabilitySummary
+
+
+def multi_lineup_choose(request, team_id):
+ from django.forms import formset_factory
+ from pyteamsnap.api import Event
+
+ from .forms import EventChooseForm
+
client = get_teamsnap_client(request)
- ts_bulkload = client.bulk_load(team_id=team_id,
- types=[Event, EventLineup, EventLineupEntry, AvailabilitySummary, Member],
- event__id=event_id)
- formsets_lineup = []
- formsets_bench = []
- formsets = []
- events = []
- contexts = []
- ts_event = [i for i in ts_bulkload if isinstance(i, Event) and i.data['id'] == event_id][0]
- ts_availabilities = Availability.search(client, event_id=ts_event.data['id'])
- ts_availability_summary = \
- [i for i in ts_bulkload if isinstance(i, AvailabilitySummary) and i.data['event_id'] == event_id][0]
- ts_lineup_entries = EventLineupEntry.search(client, event_id=event_id)
- if ts_lineup_entries:
- ts_lineup = EventLineup.get(client, id=ts_lineup_entries[0].data['event_lineup_id'])
- else:
- ts_lineup = EventLineup.search(client, event_id=event_id)
+ if request.method == "POST":
+ ts_events = Event.search(client, team_id=team_id)
+ EventChooseFormset = formset_factory(EventChooseForm)
+ formset = EventChooseFormset(request.POST)
+ choices = [(e.data["id"], e.data["formatted_title"]) for e in ts_events]
- ts_members = [i for i in ts_bulkload if isinstance(i, Member)]
- ts_member_lookup = {m.data['id']: m for m in ts_members}
- ts_availability_lookup = {m.data['member_id']: m for m in ts_availabilities}
- ts_lineup_entries_lookup = {m.data['member_id']: m for m in ts_lineup_entries}
+ for form in formset:
+ form.fields["event_id"].choices = choices
- members = []
-
- for member in ts_members:
- if not member.data['is_non_player']:
- members.append({
- "member": getattr(member, 'data'),
- "availability": getattr(ts_availability_lookup.get(member.data['id'], {}), 'data', {}),
- "lineup_entry": getattr(ts_lineup_entries_lookup.get(member.data['id'], {}), 'data', {})
- }
- )
-
- members = sorted(members, key=lambda d: (
- {
- None: 3, # No Response
- 0: 2, # No
- 2: 1, # Maybe
- 1: 0 # Yes
-
- }.get(d['availability'].get('status_code')),
- d['member'].get('last_name'))
- )
-
- members_startinglineup = []
- members_startingpositiononly = []
-
- for member in members:
- if re.search(r'([A-Z0-9]+)(?:\s+\[(.*)\])?', member['lineup_entry'].get('label', '')):
- position, position_note = re.search(r'([A-Z0-9]+)(?:\s+\[(.*)\])?',
- member['lineup_entry'].get('label', '')).groups()
+ if formset.is_valid():
+ event_ids = [f.cleaned_data["event_id"] for f in formset]
else:
- position, position_note = ("", "")
+ event_ids = request.GET.get("event_ids").split(",")
+ EventChooseFormset = formset_factory(EventChooseForm)
+ formset = EventChooseFormset(request.POST)
- position_only = position_note == "PO"
+ return redirect(
+ "teamsnap_edit_multiple_lineups",
+ team_id=team_id,
+ event_ids=",".join(event_ids),
+ )
+ elif not request.GET.get("num"):
+ return HttpResponse(500)
+ else:
+ num = int(request.GET.get("num"))
+ TEAM_ID = team_id
- if position_only:
- member['lineup_entry']['label'] = position
+ ts_events = Event.search(client, team_id=TEAM_ID)
+ ts_events = {e.data["id"]: e for e in ts_events}
- if member['lineup_entry'].get('id') and not position_only:
- members_startinglineup.append(member)
- elif member['lineup_entry'].get('id') and position_only:
- members_startingpositiononly.append(member)
+ EventChooseFormset = formset_factory(EventChooseForm, extra=num)
+ formset = EventChooseFormset()
- members_startinglineup = sorted(
- members_startinglineup,
- key=lambda d: d.get('lineup_entry',{}).get('sequence', 100)
+ choices = [(id, e.data["formatted_title"]) for id, e in ts_events.items()]
+
+ for form in formset:
+ form.fields["event_id"].choices = choices
+
+ pass
+ return render(
+ request,
+ "lineup/multiple_choose.html",
+ context={"formset": formset, "team_id": team_id},
)
-
- from teamsnap.forms import LineupEntryFormset, LineupEntryForm
-
- initial = []
- l=[]
- # l = [(member,ts_availability_lookup.get(member['member_id'])) for member in members if not member['is_non_player']]
-
- context={
- "event": ts_event,
- "members": members,
- "members_startinglineup":members_startinglineup,
- "members_startingpositiononly":members_startingpositiononly
- }
- return render(request, "lineup/gamecard.html", context=context)