From eea3d117bc33914711bc47702e27bdf024e8127c Mon Sep 17 00:00:00 2001
From: agp8x <git@agp8x.org>
Date: Sun, 8 Dec 2019 12:20:30 +0100
Subject: [PATCH] fix media setup to deliver content

---
 partdoc/media/sketches/.gitignore         | 1 +
 partdoc/partdoc/settings.py               | 3 +++
 partdoc/partdoc/urls.py                   | 2 +-
 partdoc/parts/models.py                   | 2 +-
 partdoc/parts/templates/parts/parts.html  | 4 ++--
 partdoc/parts/templates/parts/sketch.html | 1 +
 partdoc/parts/views.py                    | 6 ++++--
 7 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 partdoc/media/sketches/.gitignore

diff --git a/partdoc/media/sketches/.gitignore b/partdoc/media/sketches/.gitignore
new file mode 100644
index 0000000..72e8ffc
--- /dev/null
+++ b/partdoc/media/sketches/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/partdoc/partdoc/settings.py b/partdoc/partdoc/settings.py
index bd524b1..f4093d2 100644
--- a/partdoc/partdoc/settings.py
+++ b/partdoc/partdoc/settings.py
@@ -120,6 +120,9 @@ USE_TZ = True
 STATIC_URL = '/static/'
 STATIC_ROOT = 'static/'
 
+MEDIA_URL = '/media/'
+MEDIA_ROOT = '/app/media/'
+
 DATA_UPLOAD_MAX_NUMBER_FIELDS = 10000
 
 LOGGING = {
diff --git a/partdoc/partdoc/urls.py b/partdoc/partdoc/urls.py
index e592657..783caa4 100644
--- a/partdoc/partdoc/urls.py
+++ b/partdoc/partdoc/urls.py
@@ -21,4 +21,4 @@ from django.conf.urls.static import static
 urlpatterns = [
 	url(r'^parts/', include('parts.urls'), name="parts"),
 	url(r'^admin/', admin.site.urls),
-] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
+] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/partdoc/parts/models.py b/partdoc/parts/models.py
index 931ce3c..aa1a2b4 100644
--- a/partdoc/parts/models.py
+++ b/partdoc/parts/models.py
@@ -34,7 +34,7 @@ class Sketch(PartModel):
 	image = models.FileField(upload_to="sketches/", blank=True, null=True)
 
 	def __str__(self):
-		return "Sketch: " + self.name + " (" + str(self.brand) + ")"
+		return "Sketch: " + self.name + " (" + str(self.product) + ")"
 
 	def get_product(self):
 		if self.product:
diff --git a/partdoc/parts/templates/parts/parts.html b/partdoc/parts/templates/parts/parts.html
index 47831d8..da20131 100644
--- a/partdoc/parts/templates/parts/parts.html
+++ b/partdoc/parts/templates/parts/parts.html
@@ -22,10 +22,10 @@
 {% endfor %}
 
 <tr>
-	<td>Summe:</td>
+	<td>Summe Teile:</td>
 	<td>{{len}}</td>
 	{% for product in product_sums %}
 	<td>{{product}}</td>
 	{% endfor %}
-	<td>Teile</td>
+	<td>{{total_sum}}</td>
 </table>
diff --git a/partdoc/parts/templates/parts/sketch.html b/partdoc/parts/templates/parts/sketch.html
index cc1f785..b03734d 100644
--- a/partdoc/parts/templates/parts/sketch.html
+++ b/partdoc/parts/templates/parts/sketch.html
@@ -1,4 +1,5 @@
 <h1>{{sketch.name}}</h1>
+<a href="{{sketch.image.url}}"><img src="{{sketch.image.url}}" /></a>
 <h2>{% for brand in sketch.get_brand %}{{brand.name}},{% endfor%} - {% for product in sketch.get_product %}{{product.name}},{% endfor%}</h2>
 <ul>
 	{% for usage in sketch.usage_set.all %}
diff --git a/partdoc/parts/views.py b/partdoc/parts/views.py
index 2a53682..1d2cc21 100644
--- a/partdoc/parts/views.py
+++ b/partdoc/parts/views.py
@@ -63,13 +63,15 @@ def parts(request):
 			"sum": sum(prod_qtys),
 			"id": part.id,
 		})
-		
+	
+	product_sum = [product_sums[prod.name] for prod in products]
 	context = {
 		'products': products,
 		'parts': parts,
 		'quantities': quantities,
 		'len': len(quantities),
-		'product_sums': [product_sums[prod.name] for prod in products]
+		'product_sums': product_sum,
+		'total_sum': sum(product_sum),
 	}
 	return render(request, 'parts/parts.html', context)