Skip to content

Commit 4e73bae

Browse files
author
Dairon Medina
committed
User Setings
1 parent 97f0e2a commit 4e73bae

File tree

27 files changed

+8237
-59
lines changed

27 files changed

+8237
-59
lines changed

apps/base/urls.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
from django.conf.urls import patterns, include, url
2-
from base.views import edit_settings, UsersList, DeviceList
2+
from base.views import edit_settings, UsersList, DeviceList, base_data
33

44

55
urlpatterns = patterns('',
66
url(r'^config/$', edit_settings, name="configure"),
77
url(r'^config/operators/$', UsersList.as_view(), name="configure_operators"),
88
url(r'^config/devices/$', DeviceList.as_view(), name="configure_devices"),
9+
url(r'^config/basedata/$', base_data, name="configure_data"),
910
)

apps/base/views.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# -*- coding: utf-8 -*-
2+
# Copyright (C) 2013 OpenWeigh.co.uk
3+
# Developer: Dairon Medina Caro <dairon.medina@gmail.com>
4+
# Co-Developer Rhys Park <sales@openweigh.co.uk>
15
from ast import literal_eval
26

37
from django.shortcuts import render_to_response
@@ -15,6 +19,7 @@
1519

1620
from base.models import Setting
1721
from weighin.models import Device
22+
from products.models import Category, EWC
1823
from base.forms import SettingsForm
1924

2025
@login_required
@@ -44,6 +49,19 @@ def edit_settings(request):
4449
form = SettingsForm(initial=initial)
4550
return render_to_response("settings.html", {'form': form, 'settings_tab': True}, context_instance=RequestContext(request))
4651

52+
53+
@login_required
54+
def base_data(request):
55+
ewc = EWC.objects.all()
56+
categories = Category.objects.all()
57+
58+
return render_to_response("base/basedata/index.html",
59+
{'categories': categories,
60+
'ewc': ewc,
61+
'basedata_tab': True},
62+
context_instance=RequestContext(request))
63+
64+
4765
class UsersList(generic.ListView):
4866
template_name = 'base/users/index.html'
4967
context_object_name = "operators"
@@ -71,3 +89,5 @@ def get_context_data(self, **kwargs):
7189
context = super(DeviceList, self).get_context_data(**kwargs)
7290
context['devices_tab'] = True
7391
return context
92+
93+

apps/customers/report.py

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
# -*- coding: utf-8 -*-
2+
# Copyright (C) 2013 OpenWeigh.co.uk
3+
# Developer: Dairon Medina Caro <dairon.medina@gmail.com>
4+
# Co-Developer Rhys Park <sales@openweigh.co.uk>
15
from django.utils.translation import ugettext_lazy as _
2-
from reporting.reports import ReportCSVFormatter, ReportGenerator, or_empty_char
6+
from reporting.reports import ReportCSVFormatter, ReportPDFFormatter, ReportGenerator, or_empty_char
37

48
from customers.models import Customer
59

@@ -30,12 +34,25 @@ def generate_csv(self, response, customers):
3034
def filename(self):
3135
return self.filename_template
3236

37+
class CustomersPDFFormatter(ReportPDFFormatter):
38+
filename_template = 'customers-report.pdf'
39+
40+
def generate_pdf(self, customers):
41+
context = {}
42+
context['customers'] = customers
43+
template = 'reports/customers_pdf_report.html'
44+
return self.render_pdf(context, template)
45+
46+
def filename(self):
47+
return self.filename_template
48+
3349
class CustomersReportGenerator(ReportGenerator):
3450
code = 'customers'
3551
description = _('Customers')
3652

3753
formatters = {
3854
'CSV_formatter': CustomersCSVFormatter,
55+
'PDF_formatter': CustomersPDFFormatter,
3956
}
4057

4158
def generate(self):

apps/dockets/report.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# -*- coding: utf-8 -*-
2+
# Copyright (C) 2013 OpenWeigh.co.uk
3+
# Developer: Dairon Medina Caro <dairon.medina@gmail.com>
4+
# Co-Developer Rhys Park <sales@openweigh.co.uk>

apps/transactions/models.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
class Transaction(models.Model):
1515
"""
16-
Base model for weight transaction
16+
Base model for weight transaction
1717
"""
1818
device = models.ForeignKey('weighin.Device', verbose_name=_('Select Weighbridge'))
1919
order_number = models.IntegerField(_('Order Number'))
@@ -31,12 +31,12 @@ class Meta:
3131

3232
def __unicode__(self):
3333
return str(self.order_number)
34-
34+
3535
@property
3636
def product_category(self):
3737
return self.product.category.name
38-
39-
38+
39+
4040
#Signals
4141

4242
def post_transaction_save(sender, **kwargs):
@@ -45,11 +45,11 @@ def post_transaction_save(sender, **kwargs):
4545
"""
4646
instance = kwargs.get('instance', None)
4747
created = kwargs.get('created', False)
48-
weight = instance.device.weight
49-
ticket = Docket(docket_number=instance.order_number, gross=weight[0], tare=weight, ind_id=1, ind_id2=2, cancelled=True)
50-
48+
weight = instance.device.weight
49+
ticket = Docket(docket_number=instance.order_number, gross=weight, tare=weight, ind_id=1, ind_id2=2, cancelled=True)
50+
5151
ticket.save()
52-
52+
5353

5454
post_save.connect(post_transaction_save, sender=Transaction,
5555
dispatch_uid='signal_post_transaction_save')

apps/weighin/models.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class Meta:
6666

6767
def __unicode__(self):
6868
return self.name
69-
69+
7070
@property
7171
def weight(self):
7272
#Load Driver
@@ -79,8 +79,8 @@ def weight(self):
7979

8080
#Return the weight
8181
weight = driver.get_weight()
82-
print weight
83-
return weight
84-
82+
print weight[0]
83+
return weight[0]
84+
8585
def save(self):
8686
super(Device, self).save()

0 commit comments

Comments
 (0)