lend form; misc

Author: linesarefuzzy

context_processors.py

@@ -0,0 +1,10 @@
+# from django.conf import settings # import the settings file
+import tww
+
+def settings_processor(request):
+	# d = {}
+	# for key in dir(settings):
+	# 	if not key.startswith('__'):
+	# 		d[key] = getattr(settings, key)
+	# return d
+	return {'settings':tww.settings.__dict__}

loans/models.py

@@ -10,6 +10,10 @@
 from django.db import models
 from django.contrib.auth.models import User
 
+# class MyModel(models.Model):
+# 	def __unicode__(self):
+# 		return unicode(self.id)
+
 class Currency(models.Model):
 	id = models.AutoField(primary_key=True, db_column='ID')
 	name = models.CharField(max_length=150, db_column='Name')
@@ -163,13 +167,12 @@ class Meta:
 	def __unicode__(self):
 		return self.name
 
-	def picture_path(self):
-		return get_picture_path('Cooperatives', self.id)
-	picture_path = property(picture_path)
-
-	def thumb_path(self):
-		return get_thumb_path('Cooperatives', self.id)
-	thumb_path = property(thumb_path)
+	# def picture_path(self):
+	# 	return get_picture_path('Cooperatives', self.id)
+	# picture_path = property(picture_path)
+	# def thumb_path(self):
+	# 	return get_thumb_path('Cooperatives', self.id)
+	# thumb_path = property(thumb_path)
 
 class ExchangeRate(models.Model):
 	id = models.AutoField(primary_key=True, db_column='ID')
@@ -354,15 +357,18 @@ def __unicode__(self):
 		except Cooperative.DoesNotExist:
 			return 'Loan ' + unicode(self.id)
 
-	def picture_path(self):
-		paths = get_picture_paths('Loans', self.id) or get_picture_paths('Cooperatives', self.cooperative.id)
-		return paths['picture']
-	picture_path = property(picture_path)
+	# def picture_path(self):
+	# 	paths = get_picture_paths('Loans', self.id) or get_picture_paths('Cooperatives', self.cooperative.id)
+	# 	return paths['picture']
+	# picture_path = property(picture_path)
+	# def thumb_path(self):
+	# 	paths = get_picture_paths('Loans', self.id) or get_picture_paths('Cooperatives', self.cooperative.id)
+	# 	return paths['thumb']
+	# thumb_path = property(thumb_path)
 
-	def thumb_path(self):
+	def picture_paths(self):
 		paths = get_picture_paths('Loans', self.id) or get_picture_paths('Cooperatives', self.cooperative.id)
-		return paths['thumb']
-	thumb_path = property(thumb_path)
+		return paths
 
 	def get_description(self, language_code='EN'):
 		return get_translation('Loans', 'Description', self.id, language_code)
@@ -756,7 +762,7 @@ def __unicode__(self):
 
 
 class UserAccount(models.Model):
-	user = models.OneToOneField(User)
+	user = models.OneToOneField(User, related_name='user_account')
 	balance = models.DecimalField(max_digits=12, decimal_places=2, default=0)
 	loans = models.ManyToManyField(Loan, through='UserLoanContribution')
 
@@ -785,14 +791,23 @@ class UserLoanContribution(models.Model):
 
 import re
 
-def get_picture_paths(table_name, id):
+def get_picture_paths(table_name, id, order_by=('priority','media_path')):
 	try:
-		image = Media.objects.filter(context_table=table_name, context_id=id).order_by('priority','media_path')[0]
+		image = Media.objects.filter(context_table=table_name, context_id=id).order_by(*order_by)[0]
 	except IndexError:
 		return
-	# insert ".thumb" into image path
-	thumb_path = re.sub(r'(\.[^.]+)$', r'.thumb\1', image.media_path)
-	return {'picture':image.media_path, 'thumb':thumb_path}
+	# insert various things into file name
+	thumb = re.sub(r'(\.[^.]+)$', r'.thumb\1', image.media_path)
+	small = re.sub(r'(\.[^.]+)$', r'.small\1', image.media_path)
+	medium = re.sub(r'(\.[^.]+)$', r'.medium\1', image.media_path)
+	large = re.sub(r'(\.[^.]+)$', r'.large\1', image.media_path)
+	return {
+		'full':image.media_path, 
+		'thumb':thumb,
+		'small':small,
+		'medium':medium,
+		'large':large,
+	}
 
 # def get_thumb_path(table_name, id):
 # 	images = Media.objects.filter(context_table=table_name, context_id=id).order_by('-priority','media_path')
@@ -802,15 +817,47 @@ def get_picture_paths(table_name, id):
 # 		return thumb_path
 
 def get_translation(table_name, column_name, id, language_code='EN'):
-	translations = Translation.objects.filter(remote_table=table_name, remote_id=id, remote_column_name=column_name)
+	translations = Translation.objects.filter(remote_table=table_name, remote_column_name=column_name, remote_id=id)
 	try:
 		content = translations.get(language__code=language_code).translated_content
 	except Translation.DoesNotExist:
 		content = translations.order_by('language__priority')[0].translated_content
 	return content
 
 def first_or_none(some_list):
-	try:
-		some_list[0]
-	except IndexError:
-		pass
+	try: some_list[0]
+	except IndexError: pass
+
+
+## Forms ##
+
+from django import forms
+
+class LendForm(forms.Form):
+	AMOUNT_CHOICES = (
+		(25, '$25'),
+		(50, '$50'),
+		(100, '$100'),
+		(0, 'Other amount'),
+	)
+	amount = forms.DecimalField(widget=forms.Select(
+		choices=AMOUNT_CHOICES, 
+		attrs={'onchange':'show_hide_other()'}))
+	# amount = forms.TypedChoiceField(choices=AMOUNT_CHOICES, coerce='decimal')
+	other_amount = forms.DecimalField(max_digits=12, decimal_places=2, required=False)
+
+	def clean(self):
+		cleaned_data = super(LendForm, self).clean()
+		amount = cleaned_data.get('amount')
+		other_amount = cleaned_data.get('other_amount')
+
+		if amount == 0 and not other_amount:
+			# raise forms.ValidationError('Please enter an amount in the "Other amount" field.')
+			if not 'other_amount' in self._errors:
+				self._errors['other_amount'] = self.error_class([u'Please enter an amount in the "Other amount" field.'])
+			if 'other_amount' in cleaned_data: 
+				del cleaned_data['other_amount']
+
+		# Always return the full collection of cleaned data.
+		return cleaned_data
+	

loans/views.py

@@ -1,9 +1,10 @@
 import re, locale
-from django.shortcuts import render_to_response, get_object_or_404, redirect
-from django.http import Http404
+from django.shortcuts import render_to_response, get_object_or_404, redirect, render
+from django.http import Http404, HttpResponseRedirect
 from django.db import connection
 # from django.db.models import Q
 from django.contrib.auth import logout
+from django.contrib.auth.views import login
 from django.contrib.auth.decorators import login_required
 from loans.models import *
 
@@ -30,13 +31,9 @@ def loan_detail(request, loan_id):
 	l = get_object_or_404(Loan, pk=loan_id)
 	l.short_description = l.get_short_description(language_code='EN')
 	l.description = l.get_description(language_code='EN')	
+	l.picture_path = l.picture_paths()['large']
 	return render_to_response('loans/loan_detail.html', {'loan': l})
 
-@login_required
-def lend_form(request, loan_id):
-	l = get_object_or_404(Loan, pk=loan_id)
-	return render_to_response('loans/lend_form.html', {'loan': l})
-
 @login_required
 def user_profile(request):
 	user_account = UserAccount.objects.get_or_create(user=request.user)[0]
@@ -45,4 +42,37 @@ def user_profile(request):
 def logout_view(request):
 	logout(request)
 	return redirect('/accounts/login?message=loggedOut')
+	# return redirect('login_view', message="You have been logged out.")
 	# return render_to_response('registration/login.html', {'message': "You have been logged out."})
+
+@login_required
+def lend_form(request, loan_id):
+	l = get_object_or_404(Loan, pk=loan_id)
+	l.picture_path = l.picture_paths()['medium']
+	if request.method == 'POST': # If the form has been submitted...
+		form = LendForm(request.POST)
+		if form.is_valid(): # All validation rules pass
+			amount = form.cleaned_data['amount']
+			other_amount = form.cleaned_data['other_amount']
+			if amount == 0:
+				amount = other_amount
+			u = UserAccount.objects.get(user=request.user)
+			c = UserLoanContribution(
+				user = u,
+				loan = l,
+				amount = amount,
+				balance = amount,
+			)
+			c.save()
+			u.balance -= amount
+			u.save()
+			return redirect('loans.views.user_profile') # Redirect after POST
+		# else:
+		# 	if 'other_amount' not in form.errors:
+		# 		form.errors['other_amount'] = form.errors['__all__']
+	else:
+		form = LendForm()
+	
+	return render(request, 'loans/lend_form.html', {'form': form, 'loan': l})
+	# return render_to_response('loans/lend_form.html', {'loan': l})
+

templates/registration/login.html renamed to templates/accounts/login.html

@@ -7,13 +7,18 @@
 <p>Your username and password didn't match. Please try again.</p>
 {% endif %}
 
+{# {% if message %} #}
+{# <p><b>{{ message }}</b></p> #}
+{# {% endif %} #}
+
 {% if request.GET.message == 'loggedOut' %}
 <p><b>You have been logged out.</b></p>
 {% endif %}
 
 <form method="post" action="{% url 'django.contrib.auth.views.login' %}">
 {% csrf_token %}
 <table>
+	{# {{ form.as_table }} #}
 	<tr>
 		<td>{{ form.username.label_tag }}</td>
 		<td>{{ form.username }}</td>

templates/accounts/profile.html

@@ -10,6 +10,6 @@ <h1>{{ user.first_name }} {{ user.last_name }} ({{ user.username }})</h1>
 
 <p>Balance: ${{ account.balance }}</p>
 
-<p><a href="/accounts/logout">Log out</a></p>
+<p><a href="{% url loans.views.logout_view %}">Log out</a></p>
 
 {% endblock content %}

templates/base.html

@@ -3,6 +3,8 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<title>{% block title %}The Working World{% endblock %}</title>
+	<script src="{{ settings.PATHS.jquery }}"></script>
+	{% block head %}{% endblock %}
 </head>
 <body>
 	{% block content %}{% endblock %}

templates/loans/lend_form.html

@@ -2,6 +2,21 @@
 
 {% block title %}{{ loan }}: Lend{% endblock %}
 
+{% block head %}
+<script>
+	function show_hide_other(speed) {
+		if (!speed) speed = 'fast'
+		amount = $('#id_amount').val()
+		if (amount == "0") 
+			$('#div_other_amount').show(speed)
+		else $('#div_other_amount').hide(speed)
+	}
+	$(document).ready(function() {
+		show_hide_other('')
+	})
+</script>
+{% endblock %}
+
 {% block content %}
 
 <h1>{{ loan }}: Lend</h1>
@@ -16,12 +31,28 @@ <h1>{{ loan }}: Lend</h1>
 <div class="short_description">
 	{{ loan.short_description|default:'' }}
 </div>
-<div class="description">
-	<h3>Details</h3>
-	{{ loan.description|default:'<span style="font-style:italic;" class="notfound">No description found.</span>' }}
-</div>
-<div class="lend">
-	<a class="button" href="{% url loans.views.lend_form loan.id %}">Lend</a>
+
+<div class="lend_form">
+	{# <ul class="errorlist"> #}
+	{# 	{% for key, value in form.errors %} #}
+	{# 		<li>{{key}}: {{ value }}</li> #}
+	{# 	{% endfor %} #}
+	{# </ul> #}
+	{# {% if form.form_errors %}<p class="error_message"><strong>{{ form.form_errors }}</strong></p>{% endif %} #}
+	<form method="post" action="{% url loans.views.lend_form loan.id %}">
+		{% csrf_token %}
+		{{ form.amount.errors }}
+		{{ form.other_amount.errors }}
+		<div id="div_amount">
+			{{ form.amount.label_tag }}: 
+			{{ form.amount }}
+		</div>
+		<div id="div_other_amount">
+			{{ form.other_amount.label_tag }}:
+			{{ form.other_amount }}
+		</div>
+		<input type="submit" value="Lend">
+	</form>
 </div>
 
 {% endblock %}

urls.py

@@ -14,7 +14,7 @@
 	(r'^admin/', include(admin.site.urls)),
 
 	(r'^$', 'home'),
-	(r'^accounts/login/$', 'django.contrib.auth.views.login'),
+	(r'^accounts/login/$', 'django.contrib.auth.views.login', {'template_name':'accounts/login.html'}),
 	# (r'^accounts/logout/$', 'django.contrib.auth.views.logout_then_login'),
 	(r'^accounts/logout/$', 'loans.views.logout_view'),
 )
@@ -34,4 +34,4 @@
 	(r'^loans/(?P<loan_id>\d+)/$', 'loan_detail'),
 	(r'^loans/(?P<loan_id>\d+)/lend$', 'lend_form'),
 	(r'^accounts/profile/$', 'user_profile')
-)
+)