diff --git a/main/forms.py b/main/forms.py
index 425d128..5d5604f 100644
--- a/main/forms.py
+++ b/main/forms.py
@@ -2,17 +2,18 @@ from django import forms
from models import *
-class OrderForm(forms.Form):
- pass
+class OrderForm(forms.ModelForm):
+ # TODO : validate that the customer can afford the order
+ class Meta:
+ model = Order
+ fields = ('customer',)
-class OrderLineForm(forms.ModelForm):
- #product = forms.CharField(required=True, widget=forms.HiddenInput)
- #amount = forms.IntegerField(required=True)
- class Meta:
- model = OrderLine
- fields = ('amount','product')
- widgets = {
- 'product': forms.HiddenInput(),
- 'amount': forms.TextInput(attrs={'size': '2'}),
- }
- # TODO : Validation
+class OrderLineForm(forms.Form):
+ product = forms.IntegerField(required=True)
+ amount = forms.IntegerField(required=True)
+ unit_price = forms.FloatField(required=True)
+
+class DepositForm(forms.ModelForm):
+
+ class Meta:
+ model = Transaction
diff --git a/main/models.py b/main/models.py
index 9dfbd5f..df95b2e 100755
--- a/main/models.py
+++ b/main/models.py
@@ -21,12 +21,12 @@ class Product(models.Model):
updated = models.DateTimeField(auto_now=True)
class Order(models.Model):
- user = models.ForeignKey(User)
+ customer = models.ForeignKey(User)
order_sum = models.FloatField(db_column='sum')
created = models.DateTimeField(auto_now_add=True)
def __unicode__(self):
- return "{0}: {1} kr".format(self.user, self.order_sum)
+ return "{0}: {1} kr".format(self.customer, self.order_sum)
class OrderLine(models.Model):
order = models.ForeignKey(Order)
diff --git a/main/urls.py b/main/urls.py
index c750a8d..eab47e6 100644
--- a/main/urls.py
+++ b/main/urls.py
@@ -2,4 +2,5 @@ from django.conf.urls.defaults import patterns, include, url
urlpatterns = patterns('main.views',
url(r'^register/$', 'register', name='register'),
+ url(r'^deposit/$', 'deposit', name='deposit'),
)
diff --git a/main/views.py b/main/views.py
index d1b209a..5380b34 100755
--- a/main/views.py
+++ b/main/views.py
@@ -26,22 +26,64 @@ def home(request):
form = AuthenticationForm(request)
return render_to_response('home.html', locals(), context_instance=RequestContext(request))
-@login_required
def register(request):
- if request.method == "POST":
- # TODO: Form processing is not working at all
- form = OrderLineForm(data=request.POST)
- if form.is_valid():
- form.save()
- return HttpResponseRedirect( reverse('main.views.register') )
products = Product.objects.all()
- users = User.objects.all()
- # Formset for orderlines
- # FIXME: Like this?
- #OrderLineFormSet = formset_factory(OrderLineForm, extra=products.count())
- #formset = OrderLineFormSet()
+ users = User.objects.filter(userprofile__balance__gt=0)
+ users_js = "[{0}]".format(
+ ",".join(['"'+user+'"' for user in users.values_list('username', flat=True)]))
+
+ # multiple orderlines (one per product)
+ OrderLineFormSet = formset_factory(OrderLineForm)
+ if request.method == "POST":
+ orderform = OrderForm(request.POST)
+ formset = OrderLineFormSet(request.POST)
+ if formset.is_valid() and orderform.is_valid():
+ order_sum = sum([orderline['amount'] * orderline['unit_price'] for orderline in formset.cleaned_data])
+ order = orderform.save(commit=False)
+ order.order_sum = order_sum
+ order.save()
+
+ profile = order.customer.get_profile()
+ profile.balance -= order.order_sum
+ profile.save()
+
+ for ol in formset.cleaned_data:
+ if ol['amount'] > 0:
+ product = Product.objects.get(pk=ol['product'])
+ OrderLine.objects.create(
+ order=order,
+ product=product,
+ amount=ol['amount'],
+ unit_price=ol['unit_price'])
+
+ return HttpResponseRedirect( reverse('main.views.register') )
+ else:
+ # errors
+ orderform = OrderForm(request.POST)
+ formset = OrderLineFormSet(request.POST)
+ else:
+ orderform = OrderForm()
+ formset = OrderLineFormSet()
return render_to_response('register.html', locals(), context_instance=RequestContext(request))
+def deposit(request):
+ users = User.objects.all()
+
+ if request.method == "POST":
+ form = DepositForm(request.POST)
+ if form.is_valid():
+ transaction = form.save()
+ profile = transaction.user.get_profile()
+ profile.balance += transaction.amount
+ profile.save()
+ return HttpResponseRedirect( reverse('main.views.deposit') )
+ else:
+ form = DepositForm(request.POST)
+ else:
+ form = DepositForm()
+
+ return render_to_response('deposit.html', locals(), context_instance=RequestContext(request))
+
def logout(request):
auth_logout(request)
return render_to_response('registration/logout.html', locals(), context_instance=RequestContext(request))
diff --git a/static/DNSlogo.png b/static/DNSlogo.png
deleted file mode 100644
index 1e0e2be..0000000
Binary files a/static/DNSlogo.png and /dev/null differ
diff --git a/static/gaute/config.rb b/static/gaute/config.rb
index 148088b..f0e12c6 100644
--- a/static/gaute/config.rb
+++ b/static/gaute/config.rb
@@ -1,4 +1,5 @@
# Require any additional compass plugins here.
+require 'compass_twitter_bootstrap'
# Set this to the root of your project when deployed:
http_path = "/"
@@ -9,12 +10,11 @@ javascripts_dir = "javascripts"
# You can select your preferred output style here (can be overridden via the command line):
# output_style = :expanded or :nested or :compact or :compressed
-
# To enable relative paths to assets via compass helper functions. Uncomment:
# relative_assets = true
# To disable debugging comments that display the original location of your selectors. Uncomment:
-# line_comments = false
+line_comments = false
# If you prefer the indented syntax, you might want to regenerate this
diff --git a/static/gaute/img/borg.jpg b/static/gaute/img/borg.jpg
new file mode 100644
index 0000000..dc18f48
Binary files /dev/null and b/static/gaute/img/borg.jpg differ
diff --git a/static/gaute/img/edb_brick.png b/static/gaute/img/edb_brick.png
new file mode 100644
index 0000000..ca5e205
Binary files /dev/null and b/static/gaute/img/edb_brick.png differ
diff --git a/static/gaute/img/eplekak.jpg b/static/gaute/img/eplekak.jpg
new file mode 100644
index 0000000..1068010
Binary files /dev/null and b/static/gaute/img/eplekak.jpg differ
diff --git a/static/gaute/img/glyphicons-halflings-white.png b/static/gaute/img/glyphicons-halflings-white.png
new file mode 100755
index 0000000..a20760b
Binary files /dev/null and b/static/gaute/img/glyphicons-halflings-white.png differ
diff --git a/static/gaute/img/glyphicons-halflings.png b/static/gaute/img/glyphicons-halflings.png
new file mode 100755
index 0000000..92d4445
Binary files /dev/null and b/static/gaute/img/glyphicons-halflings.png differ
diff --git a/static/gaute/images/grid.png b/static/gaute/img/grid.png
similarity index 100%
rename from static/gaute/images/grid.png
rename to static/gaute/img/grid.png
diff --git a/static/gaute/images/product.png b/static/gaute/img/product.png
similarity index 100%
rename from static/gaute/images/product.png
rename to static/gaute/img/product.png
diff --git a/static/gaute/images/unknown.png b/static/gaute/img/unknown.png
similarity index 100%
rename from static/gaute/images/unknown.png
rename to static/gaute/img/unknown.png
diff --git a/static/gaute/sass/ie.scss b/static/gaute/sass/ie.scss
index a867281..e69de29 100644
--- a/static/gaute/sass/ie.scss
+++ b/static/gaute/sass/ie.scss
@@ -1,16 +0,0 @@
-@import "blueprint";
-
-// To generate css equivalent to the blueprint css but with your configuration applied, uncomment:
-// +blueprint-ie
-
-//Recommended Blueprint configuration with scoping and semantic layout:
-body.bp {
- @include blueprint-ie(true);
- // Note: Blueprint centers text to fix IE6 container centering.
- // This means all your texts will be centered under all version of IE by default.
- // If your container does not have the .container class, don't forget to restore
- // the correct behavior to your main container (but not the body tag!)
- // Example:
- // .my-container
- // text-align: left
-}
diff --git a/static/gaute/sass/partials/_base.scss b/static/gaute/sass/partials/_base.scss
deleted file mode 100644
index fb77f7b..0000000
--- a/static/gaute/sass/partials/_base.scss
+++ /dev/null
@@ -1,10 +0,0 @@
-// Here is where you can define your constants for your application and to configure the blueprint framework.
-// Feel free to delete these if you want keep the defaults:
-
-$blueprint-grid-columns: 24;
-$blueprint-container-size: 950px;
-$blueprint-grid-margin: 10px;
-
-// Use this to calculate the width based on the total width.
-// Or you can set $blueprint-grid-width to a fixed value and unset $blueprint-container-size -- it will be calculated for you.
-$blueprint-grid-width: ($blueprint-container-size + $blueprint-grid-margin) / $blueprint-grid-columns - $blueprint-grid-margin;
diff --git a/static/gaute/sass/partials/_form.scss b/static/gaute/sass/partials/_form.scss
deleted file mode 100644
index 8cfade0..0000000
--- a/static/gaute/sass/partials/_form.scss
+++ /dev/null
@@ -1,6 +0,0 @@
-// Only apply the blueprint form styles to forms with
-// a class of "bp". This makes it easier to style
-// forms from scratch if you need to.
-
-form.bp {
- @include blueprint-form; }
diff --git a/static/gaute/sass/partials/_page.scss b/static/gaute/sass/partials/_page.scss
deleted file mode 100644
index 574db67..0000000
--- a/static/gaute/sass/partials/_page.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-// Import the non-default scaffolding module to help us get started.
-@import "blueprint/scaffolding";
-
-// This configuration will only apply the
-// blueprint styles to pages with a body class of "bp"
-// This makes it easier to have pages without blueprint styles
-// when you're using a single/combined stylesheet.
-
-body.bp {
- @include blueprint-typography(true);
- @include blueprint-utilities;
- @include blueprint-debug;
- @include blueprint-interaction;
- // Remove the scaffolding when you're ready to start doing visual design.
- // Or leave it in if you're happy with how blueprint looks out-of-the-box
- @include blueprint-scaffolding; }
diff --git a/static/gaute/sass/partials/_two_col.scss b/static/gaute/sass/partials/_two_col.scss
deleted file mode 100644
index 3388747..0000000
--- a/static/gaute/sass/partials/_two_col.scss
+++ /dev/null
@@ -1,38 +0,0 @@
-// Page layout can be done using mixins applied to your semantic classes and IDs
-// For instance this layout defines a two column layout on pages with
-// a body class of "two-col".
-//
-// The markup would look like:
-//
- {%endblock%}
+ 
+ {%endblock%}
+