mirror of
https://github.com/ae-utbm/sith.git
synced 2025-07-11 12:29:24 +00:00
All: Apply Black coding rules
This commit is contained in:
@ -40,29 +40,40 @@ from core.models import User
|
||||
class SelectionDateForm(forms.Form):
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(SelectionDateForm, self).__init__(*args, **kwargs)
|
||||
self.fields['start_date'] = forms.DateTimeField(
|
||||
['%Y-%m-%d %H:%M:%S'], label=_("Start date"),
|
||||
widget=SelectDateTime, required=True)
|
||||
self.fields['end_date'] = forms.DateTimeField(
|
||||
['%Y-%m-%d %H:%M:%S'], label=_("End date"),
|
||||
widget=SelectDateTime, required=True)
|
||||
self.fields["start_date"] = forms.DateTimeField(
|
||||
["%Y-%m-%d %H:%M:%S"],
|
||||
label=_("Start date"),
|
||||
widget=SelectDateTime,
|
||||
required=True,
|
||||
)
|
||||
self.fields["end_date"] = forms.DateTimeField(
|
||||
["%Y-%m-%d %H:%M:%S"],
|
||||
label=_("End date"),
|
||||
widget=SelectDateTime,
|
||||
required=True,
|
||||
)
|
||||
|
||||
|
||||
class SubscriptionForm(forms.ModelForm):
|
||||
class Meta:
|
||||
model = Subscription
|
||||
fields = ['member', 'subscription_type', 'payment_method', 'location']
|
||||
member = AutoCompleteSelectField('users', required=False, help_text=None)
|
||||
fields = ["member", "subscription_type", "payment_method", "location"]
|
||||
|
||||
member = AutoCompleteSelectField("users", required=False, help_text=None)
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(SubscriptionForm, self).__init__(*args, **kwargs)
|
||||
# Add fields to allow basic user creation
|
||||
self.fields['last_name'] = forms.CharField(max_length=User._meta.get_field('last_name').max_length)
|
||||
self.fields['first_name'] = forms.CharField(max_length=User._meta.get_field('first_name').max_length)
|
||||
self.fields['email'] = forms.EmailField()
|
||||
self.fields.move_to_end('subscription_type')
|
||||
self.fields.move_to_end('payment_method')
|
||||
self.fields.move_to_end('location')
|
||||
self.fields["last_name"] = forms.CharField(
|
||||
max_length=User._meta.get_field("last_name").max_length
|
||||
)
|
||||
self.fields["first_name"] = forms.CharField(
|
||||
max_length=User._meta.get_field("first_name").max_length
|
||||
)
|
||||
self.fields["email"] = forms.EmailField()
|
||||
self.fields.move_to_end("subscription_type")
|
||||
self.fields.move_to_end("payment_method")
|
||||
self.fields.move_to_end("location")
|
||||
|
||||
def clean_member(self):
|
||||
subscriber = self.cleaned_data.get("member")
|
||||
@ -72,19 +83,26 @@ class SubscriptionForm(forms.ModelForm):
|
||||
|
||||
def clean(self):
|
||||
cleaned_data = super(SubscriptionForm, self).clean()
|
||||
if (cleaned_data.get("member") is None
|
||||
and "last_name" not in self.errors.as_data()
|
||||
and "first_name" not in self.errors.as_data()
|
||||
and "email" not in self.errors.as_data()):
|
||||
if (
|
||||
cleaned_data.get("member") is None
|
||||
and "last_name" not in self.errors.as_data()
|
||||
and "first_name" not in self.errors.as_data()
|
||||
and "email" not in self.errors.as_data()
|
||||
):
|
||||
self.errors.pop("member", None)
|
||||
if self.errors:
|
||||
return cleaned_data
|
||||
if User.objects.filter(email=cleaned_data.get("email")).first() is not None:
|
||||
self.add_error("email", ValidationError(_("A user with that email address already exists")))
|
||||
self.add_error(
|
||||
"email",
|
||||
ValidationError(_("A user with that email address already exists")),
|
||||
)
|
||||
else:
|
||||
u = User(last_name=self.cleaned_data.get("last_name"),
|
||||
first_name=self.cleaned_data.get("first_name"),
|
||||
email=self.cleaned_data.get("email"))
|
||||
u = User(
|
||||
last_name=self.cleaned_data.get("last_name"),
|
||||
first_name=self.cleaned_data.get("first_name"),
|
||||
email=self.cleaned_data.get("email"),
|
||||
)
|
||||
u.generate_username()
|
||||
u.set_password(str(random.randrange(1000000, 10000000)))
|
||||
u.save()
|
||||
@ -96,12 +114,16 @@ class SubscriptionForm(forms.ModelForm):
|
||||
if cleaned_data.get("member") is None:
|
||||
# This should be handled here, but it is done in the Subscription model's clean method
|
||||
# TODO investigate why!
|
||||
raise ValidationError(_("You must either choose an existing user or create a new one properly"))
|
||||
raise ValidationError(
|
||||
_(
|
||||
"You must either choose an existing user or create a new one properly"
|
||||
)
|
||||
)
|
||||
return cleaned_data
|
||||
|
||||
|
||||
class NewSubscription(CreateView):
|
||||
template_name = 'subscription/subscription.jinja'
|
||||
template_name = "subscription/subscription.jinja"
|
||||
form_class = SubscriptionForm
|
||||
|
||||
def dispatch(self, request, *arg, **kwargs):
|
||||
@ -111,18 +133,26 @@ class NewSubscription(CreateView):
|
||||
raise PermissionDenied
|
||||
|
||||
def get_initial(self):
|
||||
if 'member' in self.request.GET.keys():
|
||||
return {'member': self.request.GET['member'], 'subscription_type': 'deux-semestres'}
|
||||
return {'subscription_type': 'deux-semestres'}
|
||||
if "member" in self.request.GET.keys():
|
||||
return {
|
||||
"member": self.request.GET["member"],
|
||||
"subscription_type": "deux-semestres",
|
||||
}
|
||||
return {"subscription_type": "deux-semestres"}
|
||||
|
||||
def form_valid(self, form):
|
||||
form.instance.subscription_start = Subscription.compute_start(
|
||||
duration=settings.SITH_SUBSCRIPTIONS[form.instance.subscription_type]['duration'],
|
||||
user=form.instance.member)
|
||||
duration=settings.SITH_SUBSCRIPTIONS[form.instance.subscription_type][
|
||||
"duration"
|
||||
],
|
||||
user=form.instance.member,
|
||||
)
|
||||
form.instance.subscription_end = Subscription.compute_end(
|
||||
duration=settings.SITH_SUBSCRIPTIONS[form.instance.subscription_type]['duration'],
|
||||
duration=settings.SITH_SUBSCRIPTIONS[form.instance.subscription_type][
|
||||
"duration"
|
||||
],
|
||||
start=form.instance.subscription_start,
|
||||
user=form.instance.member
|
||||
user=form.instance.member,
|
||||
)
|
||||
return super(NewSubscription, self).form_valid(form)
|
||||
|
||||
@ -133,41 +163,41 @@ class SubscriptionsStatsView(FormView):
|
||||
|
||||
def dispatch(self, request, *arg, **kwargs):
|
||||
import datetime
|
||||
|
||||
self.start_date = datetime.datetime.today()
|
||||
self.end_date = self.start_date
|
||||
res = super(SubscriptionsStatsView, self).dispatch(
|
||||
request, *arg, **kwargs)
|
||||
res = super(SubscriptionsStatsView, self).dispatch(request, *arg, **kwargs)
|
||||
if request.user.is_root or request.user.is_board_member:
|
||||
return res
|
||||
raise PermissionDenied
|
||||
|
||||
def post(self, request, *args, **kwargs):
|
||||
self.form = self.get_form()
|
||||
self.start_date = self.form['start_date']
|
||||
self.end_date = self.form['end_date']
|
||||
res = super(SubscriptionsStatsView, self).post(
|
||||
request, *args, **kwargs)
|
||||
self.start_date = self.form["start_date"]
|
||||
self.end_date = self.form["end_date"]
|
||||
res = super(SubscriptionsStatsView, self).post(request, *args, **kwargs)
|
||||
if request.user.is_root or request.user.is_board_member:
|
||||
return res
|
||||
raise PermissionDenied
|
||||
|
||||
def get_initial(self):
|
||||
init = {
|
||||
'start_date': self.start_date.strftime('%Y-%m-%d %H:%M:%S'),
|
||||
'end_date': self.end_date.strftime('%Y-%m-%d %H:%M:%S')
|
||||
"start_date": self.start_date.strftime("%Y-%m-%d %H:%M:%S"),
|
||||
"end_date": self.end_date.strftime("%Y-%m-%d %H:%M:%S"),
|
||||
}
|
||||
return init
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
from subscription.models import Subscription
|
||||
|
||||
kwargs = super(SubscriptionsStatsView, self).get_context_data(**kwargs)
|
||||
kwargs['subscriptions_total'] = Subscription.objects.filter(
|
||||
subscription_end__gte=self.end_date,
|
||||
subscription_start__lte=self.start_date)
|
||||
kwargs['subscriptions_types'] = settings.SITH_SUBSCRIPTIONS
|
||||
kwargs['payment_types'] = settings.SITH_COUNTER_PAYMENT_METHOD
|
||||
kwargs['locations'] = settings.SITH_SUBSCRIPTION_LOCATIONS
|
||||
kwargs["subscriptions_total"] = Subscription.objects.filter(
|
||||
subscription_end__gte=self.end_date, subscription_start__lte=self.start_date
|
||||
)
|
||||
kwargs["subscriptions_types"] = settings.SITH_SUBSCRIPTIONS
|
||||
kwargs["payment_types"] = settings.SITH_COUNTER_PAYMENT_METHOD
|
||||
kwargs["locations"] = settings.SITH_SUBSCRIPTION_LOCATIONS
|
||||
return kwargs
|
||||
|
||||
def get_success_url(self, **kwargs):
|
||||
return reverse_lazy('subscriptions:stats')
|
||||
return reverse_lazy("subscriptions:stats")
|
||||
|
||||
Reference in New Issue
Block a user