bike
/
workstand
mirror of https://github.com/fspc/workstand.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Add `Payment` to `Membership`.

feature/python-error-tracking
Drew Larson 9 years ago
parent
68b005a2d6
commit
967a9b8411
3 changed files with 72 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      bikeshop_project/core/forms.py
  2. 85
      bikeshop_project/core/templates/membership_form.html
  3. 19
      bikeshop_project/core/views.py

13
bikeshop_project/core/forms.py
View File

@ -1,9 +1,9 @@
import logging import logging
from django.forms import BooleanField, CharField, CheckboxInput, RadioSelect, ModelForm, TextInput, HiddenInput from django.forms import BooleanField, CharField, CheckboxInput, RadioSelect, ModelForm, TextInput, HiddenInput, ChoiceField
from registration.models import Member from registration.models import Member
from .models import Membership from .models import Membership, Payment
logger = logging.getLogger('bikeshop') logger = logging.getLogger('bikeshop')
@ -66,3 +66,12 @@ class MembershipForm(ModelForm):
instance.save() instance.save()
return instance return instance
class PaymentForm(ModelForm):
class Meta:
model = Payment
fields = ['type']
widgets = {
'type': RadioSelect(attrs={'class': 'mdl-radio__button'})
}

85
bikeshop_project/core/templates/membership_form.html
View File

@ -9,8 +9,9 @@
<div class="mdl-cell mdl-cell--8-col"> <div class="mdl-cell mdl-cell--8-col">
<h1>New Membership</h1> <h1>New Membership</h1>
<form method="post"> <form method="post">
<formset>
{% csrf_token %} {% csrf_token %}
{{ form.member }} {{ membership_form.member }}
<p>The Bridge City Bicycle Co­operative aims to be a safe and respectful environment geared towards education, empowerment and community­building. In order to do so we need your input and support.</p> <p>The Bridge City Bicycle Co­operative aims to be a safe and respectful environment geared towards education, empowerment and community­building. In order to do so we need your input and support.</p>
<h4>Member Privileges</h4> <h4>Member Privileges</h4>
@ -20,9 +21,9 @@
<li>Opportunity to engage in decisions and help to build and develop the community's vision</li> <li>Opportunity to engage in decisions and help to build and develop the community's vision</li>
<li>The Bridge City Bicycle Co­operative (BCBC) values the trust of its volunteers, staff and members and is committed to protecting the privacy of all personal information entrusted to it. As such, collected information will be used in accordance with our privacy policy outlined on our website and in our shop.</li> <li>The Bridge City Bicycle Co­operative (BCBC) values the trust of its volunteers, staff and members and is committed to protecting the privacy of all personal information entrusted to it. As such, collected information will be used in accordance with our privacy policy outlined on our website and in our shop.</li>
</ul> </ul>
{% if form.non_field_errors %} {% if membership_form.non_field_errors %}
<div> <div>
<span class="error">{{ form.errors }}</span> <span class="error">{{ membership_form.errors }}</span>
</div> </div>
{% endif %} {% endif %}
<div> <div>
@ -35,8 +36,8 @@
<li>The BCBC seeks to build a healthy lifestyle community, and behavior seen as hindering this objective will not be tolerated</li> <li>The BCBC seeks to build a healthy lifestyle community, and behavior seen as hindering this objective will not be tolerated</li>
<li>Ask for help: With tools, processes, and even emotions</li> <li>Ask for help: With tools, processes, and even emotions</li>
</ul> </ul>
<label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect" for="{{ form.safe_space.id_for_label }}"> <label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect" for="{{ membership_form.safe_space.id_for_label }}">
{{ form.safe_space }} {{ membership_form.safe_space }}
<span class="mdl-checkbox__label">I acknowledge the BCBC is a safe space and agree to maintain it.</span> <span class="mdl-checkbox__label">I acknowledge the BCBC is a safe space and agree to maintain it.</span>
</label> </label>
</div> </div>
@ -46,8 +47,8 @@
<li>Build positive relationships with Community Members</li> <li>Build positive relationships with Community Members</li>
<li>Build positive relationships with CNYC employees, volunteers, and patrons</li> <li>Build positive relationships with CNYC employees, volunteers, and patrons</li>
</ul> </ul>
<label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect" for="{{ form.respect_community.id_for_label }}"> <label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect" for="{{ membership_form.respect_community.id_for_label }}">
{{ form.respect_community }} {{ membership_form.respect_community }}
<span class="mdl-checkbox__label">I will respect the community.</span> <span class="mdl-checkbox__label">I will respect the community.</span>
</label> </label>
</div> </div>
@ -56,8 +57,8 @@
<p> <p>
Our services are free and Members are encouraged to contribute in any way they can. Our vibrancy comes from the volunteer work of a large community with diverse skills and passions. There are so many ways to be a part of this community, regardless of whether or not you know how to change a tire (yet!). Ask how you can help out or get in touch with our volunteer coordinator (<a href="mailto:volunteer@bridgecitybicyclecoop.com">volunteer@bridgecitybicyclecoop.com</a>) Our services are free and Members are encouraged to contribute in any way they can. Our vibrancy comes from the volunteer work of a large community with diverse skills and passions. There are so many ways to be a part of this community, regardless of whether or not you know how to change a tire (yet!). Ask how you can help out or get in touch with our volunteer coordinator (<a href="mailto:volunteer@bridgecitybicyclecoop.com">volunteer@bridgecitybicyclecoop.com</a>)
</p> </p>
<label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect" for="{{ form.give_back.id_for_label }}"> <label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect" for="{{ membership_form.give_back.id_for_label }}">
{{ form.give_back }} {{ membership_form.give_back }}
<span class="mdl-checkbox__label">I acknowledge that giving back is important</span> <span class="mdl-checkbox__label">I acknowledge that giving back is important</span>
</label> </label>
</div> </div>
@ -73,8 +74,8 @@
<li>Label your bike with your name, phone number, and the last date you worked on it.</li> <li>Label your bike with your name, phone number, and the last date you worked on it.</li>
<li>Do not force tools and use them only for their intended use. If you need help or guidance, ask someone! It’s what we’re here for!</li> <li>Do not force tools and use them only for their intended use. If you need help or guidance, ask someone! It’s what we’re here for!</li>
</ul> </ul>
<label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect" for="{{ form.respect_shop.id_for_label }}"> <label class="mdl-checkbox mdl-js-checkbox mdl-js-ripple-effect" for="{{ membership_form.respect_shop.id_for_label }}">
{{ form.respect_shop }} {{ membership_form.respect_shop }}
<span class="mdl-checkbox__label">I will respect the shop.</span> <span class="mdl-checkbox__label">I will respect the shop.</span>
</label> </label>
</div> </div>
@ -85,50 +86,62 @@
ethnicity so that we can track how well we are including all communities and whether there may be ethnicity so that we can track how well we are including all communities and whether there may be
barriers to certain groups’ participation. Thank you! Do you identify as: (In each category, check barriers to certain groups’ participation. Thank you! Do you identify as: (In each category, check
all that apply)</p> all that apply)</p>
{% for checkbox in form.self_identification %} {% for checkbox in membership_form.self_identification %}
<label class="mdl-radio mdl-js-radio mdl-js-ripple-effect" for="{{ checkbox.id_for_label }}"> <label class="mdl-radio mdl-js-radio mdl-js-ripple-effect" for="{{ checkbox.id_for_label }}">
{{ checkbox }} {{ checkbox }}
<span class="mdl-radio__label">{{ checkbox.label }}</span> <span class="mdl-radio__label">{{ checkbox.label }}</span>
</label> </label>
{% endfor %} {% endfor %}
{% if form.self_identification.errors %} {% if membership_form.self_identification.errors %}
<span class="mdl-textfield__error">{{ form.self_identification.errors }}</span> <span class="mdl-textfield__error">{{ membership_form.self_identification.errors }}</span>
{% else %} {% else %}
<span class="mdl-textfield__error">Hmm</span> <span class="mdl-textfield__error">Hmm</span>
{% endif %} {% endif %}
</div> </div>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label {% if form.gender_other.errors %}is-invalid{% endif %}"> <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label {% if membership_form.gender_other.errors %}is-invalid{% endif %}">
{{ form.self_ident_other }} {{ membership_form.self_ident_other }}
<label class="mdl-textfield__label" for="{{ form.self_ident_other.id_for_label }}">{{ form.self_ident_other.label }}</label> <label class="mdl-textfield__label" for="{{ membership_form.self_ident_other.id_for_label }}">{{ membership_form.self_ident_other.label }}</label>
{% if form.self_ident_other.errors %} {% if membership_form.self_ident_other.errors %}
<span class="mdl-textfield__error">{{ form.self_ident_other.errors }}</span> <span class="mdl-textfield__error">{{ membership_form.self_ident_other.errors }}</span>
{% endif %} {% endif %}
</div> </div>
<div class=""> <div class="">
<h3 class="template__header mdl-typography--body-2">Gender Identification</h3> <h3 class="template__header mdl-typography--body-2">Gender Identification</h3>
{% for checkbox in form.gender %} {% for checkbox in membership_form.gender %}
<label class="mdl-radio mdl-js-radio mdl-js-ripple-effect" for="{{ checkbox.id_for_label }}"> <label class="mdl-radio mdl-js-radio mdl-js-ripple-effect" for="{{ checkbox.id_for_label }}">
{{ checkbox }} {{ checkbox }}
<span class="mdl-radio__label">{{ checkbox.label }}</span> <span class="mdl-radio__label">{{ checkbox.label }}</span>
</label> </label>
{% endfor %} {% endfor %}
</div> </div>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label {% if form.gender_other.errors %}is-invalid{% endif %}"> <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label {% if membership_form.gender_other.errors %}is-invalid{% endif %}">
{{ form.gender_other }} {{ membership_form.gender_other }}
<label class="mdl-textfield__label" for="{{ form.gender_other.id_for_label }}">{{ form.gender_other.label }}</label> <label class="mdl-textfield__label" for="{{ membership_form.gender_other.id_for_label }}">{{ membership_form.gender_other.label }}</label>
{% if form.gender_other.errors %} {% if membership_form.gender_other.errors %}
<span class="mdl-textfield__error">{{ form.gender_other.errors }}</span> <span class="mdl-textfield__error">{{ membership_form.gender_other.errors }}</span>
{% endif %} {% endif %}
</div> </div>
<div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label {% if form.renewed_at.errors %}is-invalid{% endif %}"> <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label {% if membership_form.renewed_at.errors %}is-invalid{% endif %}">
{{ form.renewed_at }} {{ membership_form.renewed_at }}
<label class="mdl-textfield__label" for="{{ form.renewed_at.id_for_label }}">{{ form.renewed_at.label }}</label> <label class="mdl-textfield__label" for="{{ membership_form.renewed_at.id_for_label }}">{{ membership_form.renewed_at.label }}</label>
{% if form.renewed_at %} {% if membership_form.renewed_at %}
<span class="mdl-textfield__error">{{ form.renewed_at.errors }}</span> <span class="mdl-textfield__error">{{ membership_form.renewed_at.errors }}</span>
{% else %} {% else %}
<span class="mdl-textfield__error">Incorrect date.</span> <span class="mdl-textfield__error">Incorrect date.</span>
{% endif %} {% endif %}
</div> </div>
</formset>
<formset>
<div class="">
<h3 class="template__header">Payment Type</h3>
{% for checkbox in payment_form.type %}
<label class="mdl-radio mdl-js-radio mdl-js-ripple-effect" for="{{ checkbox.id_for_label }}">
{{ checkbox }}
<span class="mdl-radio__label">{{ checkbox.label }}</span>
</label>
{% endfor %}
</div>
</formset>
<div> <div>
<button disabled="true" id="submit" type="submit" class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--colored">Submit</button> <button disabled="true" id="submit" type="submit" class="mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--colored">Submit</button>
</div> </div>
@ -146,21 +159,21 @@
past: moment().subtract(100, 'years'), past: moment().subtract(100, 'years'),
trigger: document.getElementById('{{ form.renewed_at.id_for_label }}') trigger: document.getElementById('{{ form.renewed_at.id_for_label }}')
}); });
document.getElementById('{{ form.renewed_at.id_for_label }}').addEventListener('focus', function() { document.getElementById('{{ membership_form.renewed_at.id_for_label }}').addEventListener('focus', function() {
console.log('Toggle!'); console.log('Toggle!');
renewedAt.toggle(); renewedAt.toggle();
}); });
document.getElementById('{{ form.renewed_at.id_for_label }}').addEventListener('onOk', function () { document.getElementById('{{ membership_form.renewed_at.id_for_label }}').addEventListener('onOk', function () {
console.log('onOk'); console.log('onOk');
this.parentNode.classList.add('is-dirty'); this.parentNode.classList.add('is-dirty');
this.value = renewedAt.time.format('YYYY-MM-DD'); this.value = renewedAt.time.format('YYYY-MM-DD');
}) })
var responsibilities = [ var responsibilities = [
document.getElementById('{{ form.safe_space.id_for_label }}'), document.getElementById('{{ membership_form.safe_space.id_for_label }}'),
document.getElementById('{{ form.respect_community.id_for_label }}'), document.getElementById('{{ membership_form.respect_community.id_for_label }}'),
document.getElementById('{{ form.give_back.id_for_label }}'), document.getElementById('{{ membership_form.give_back.id_for_label }}'),
document.getElementById('{{ form.respect_shop.id_for_label }}') document.getElementById('{{ membership_form.respect_shop.id_for_label }}')
]; ];
var checkResponsiblities = function () { var checkResponsiblities = function () {
allAgreed = responsibilities.every(function (checkbox) { allAgreed = responsibilities.every(function (checkbox) {

19
bikeshop_project/core/views.py
View File

@ -8,7 +8,7 @@ from django.views.generic import TemplateView, View
from registration.models import Member from registration.models import Member
from .forms import MembershipForm from .forms import MembershipForm, PaymentForm
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -22,16 +22,21 @@ class NewMembershipView(TemplateView):
template_name = 'membership_form.html' template_name = 'membership_form.html'
def get(self, request, member_id): def get(self, request, member_id):
form = MembershipForm(initial=dict(member=member_id)) membership_form = MembershipForm(initial=dict(member=member_id))
return self.render_to_response(dict(form=form)) payment_form = PaymentForm()
return self.render_to_response(dict(membership_form=membership_form, payment_form=payment_form))
def post(self, request, member_id): def post(self, request, member_id):
form = MembershipForm(request.POST, initial=dict(member=member_id)) membership_form = MembershipForm(request.POST, initial=dict(member=member_id))
payment_form = PaymentForm(request.POST)
member = Member.objects.get(id=member_id) member = Member.objects.get(id=member_id)
if form.is_valid(): if membership_form.is_valid() and payment_form.is_valid():
form.save() new_payment = payment_form.save()
new_membership = membership_form.save()
new_membership.payment = new_payment
new_membership.save()
messages.add_message(request, messages.SUCCESS, 'Successfully created our newest member, {first} {last}' messages.add_message(request, messages.SUCCESS, 'Successfully created our newest member, {first} {last}'
.format(first=member.first_name, last=member.last_name)) .format(first=member.first_name, last=member.last_name))
return HttpResponseRedirect(reverse('member_edit', kwargs=dict(member_id=member_id))) return HttpResponseRedirect(reverse('member_edit', kwargs=dict(member_id=member_id)))
return self.render_to_response(dict(form=form)) return self.render_to_response(dict(membership_form=membership_form, payment_form=payment_form))

Write Preview
Loading…
Cancel
Save