urbanem & project-card

marktplatz/templates/marktplatz/product_detail_card.html

@@ -49,28 +49,46 @@
 				<img href="{{object.media_set.first.image_big.url}}" src="{{object.media_set.first.image_norm.url }}" class="gallery img-fluid img-responsive" alt="" style="width: 100%;height: auto;vertical-align: middle;">
 			</div>
 			<br />
-			<h5 class=" mediumkur">Steckbrief</h5>
+			<h5 class=" mediumkur">Kontakt</h5>
 			<br />
-			<p>Gegründet {{ object.gruendungsjahr }}, in Betrieb genommen: {{ object.betriebgenommen }}.</p>
-			<p>Rechtsform: {{ object.rechtsform }}</p>
-			<p>{{ object.artmodell }}</p>
-			<p>{{ object.orga }}</p>
-			<p>{% if object.eigentum  %}{% field_name object.wohnprojekt 'eigentum' %}: {{ object.get_eigentum_display }}{% endif %}</p>
-			<p>Gemeinschaftliche Projekte: {{ object.gprojekte }}</p>
-			<p>Gemeinschaftsräume: {{ object.gemeinschaftr }}
-				{% if object.kgemeinschaftr  %} - {{ object.kgemeinschaftr }}{% endif %}
-			</p>
-			<p>{% if object.sonderwohnformen  %}{% field_name object.wohnprojekt 'sonderwohnformen' %}: {{ object.sonderwohnformen }}{% endif %}</p>
-			<p>Besondere Zielgruppen: {{ object.zielgruppen }}</p>
-			<p>Freiraumangebote: {{ object.freiraumangebote }}</p>
-			<p>{% if object.schwerpunkt  %}{% field_name object.wohnprojekt 'schwerpunkt' %}: {{ object.schwerpunkt }}{% endif %}</p>
-			<p>{{ object.oekologie }}</p>
+
+			<p>{{ object.adresse }}{% if object.adresse_zusatz  %},	{{ object.adresse_zusatz }}{% endif %}{% if object.plz  %}, {{ object.plz }}{% endif %}{% if object.ort %}, {{ object.get_ort_display }}{% endif %}</p>
+
+			<div class="row">
+					<div class="col-sm-4">
+						{% if object.email  %}<p>{{ object.email | obfuscate_mailto:'<i class="fas fa-envelope"></i> Email'  }}</p>{% endif %}
+
+					</div>
+					<div class="col-sm-8">
+							{% if object.email  %}<p><a href="mailto:{{ object.email | obfuscate }}" >{{ object.email | obfuscate }}</a></p>{% endif %}
+
+					</div>
+			</div>
+
+			<div class="row">
+					<div class="col-sm-4">
+						{% if object.website  %}<p><a href="{{  object.website }}" target="_blank" rel="noopener">Webseite</a></p>{% endif %}
+
+					</div>
+					<div class="col-sm-8">
+						{% if object.website  %}<p><a href="{{  object.website }}" target="_blank" rel="noopener">{{  object.website }}</a></p>{% endif %}
+
+					</div>
+			</div>
 			<br />
-			<h5 class=" mediumkur">Kontakt</h5>
+			<h5 class=" mediumkur">Steckbrief</h5>
 			<br />
-			<p>{{ object.adresse }}, {{ object.get_ort_display }}</p>
-			{% if object.email  %}<p>{{ object.email | obfuscate_mailto:'<i class="fas fa-envelope"></i> Email'  }}</p>{% endif %}
-			<p><a href="{{  object.website }}">Webseite</a></p>
+			<p>{{ object.kind_of_product }}, gegründet {{ object.gruendungsjahr }}{% if object.betriebgenommen  %}, in Betrieb genommen: {{ object.betriebgenommen }}{% endif %}.</p>
+			<p><strong>Rechtsform</strong>: {{ object.rechtsform }}</p>
+			<!-- XXX --> <p>{{ object.artmodell }}</p>
+			<p>{% if object.orga  %}<strong>{% field_name object 'orga' %}</strong>: {{ object.orga }}{% endif %}</p>
+			<!-- XXX --> <p>{% if object.eigentum  %}<strong>{% field_name object 'eigentum' %}</strong>: {{ object.get_eigentum_display }}{% endif %}</p>
+			<!-- XXX -->  <p>{% if object.gprojekte  %}<strong>Gemeinschaftliche Projekte</strong>: {{ object.gprojekte }}{% endif %}</p>
+			<p>{% if object.zielgruppen  %}<strong>Besondere Zielgruppen</strong>: {{ object.zielgruppen }}{% endif %}</p>
+			<p>{% if object.freiraumangebote  %}<strong>Freiraumangebote</strong>: {{ object.freiraumangebote }}{% endif %}</p>
+			<p>{% if object.oekologie  %}<strong>{% field_name object 'oekologie' %}</strong>: {{ object.oekologie }}{% endif %}</p>
+			<p>{% if object.schwerpunkt  %}<strong>{% field_name object 'schwerpunkt' %}</strong>: {{ object.schwerpunkt }}{% endif %}</p>
+
 		</div>
 		<div class="col-sm-3">
 		</div>

marktplatz/urls.py

@@ -63,6 +63,7 @@ urlpatterns = [
     path('projekte/search', views.SearchProductsView.as_view(), name='search-products'),
         # - FILTERS
     path('projekte/', views.ProductsView.as_view(), name='products'),
+    path('projekte/urbanem/', views.UrbanemProductsView.as_view(), name='products-filter-view'),
     path('projekte/filter/<slug:filter>/', views.FilterProductsView.as_view(), name='products-filter-view'),
 
 

marktplatz/views.py

@@ -430,9 +430,38 @@ class FilterProductsView(ProductsView):
 
     def get(self, request, *args, **kwargs):
 
-        qfilter = kwargs.get('filter', "")
+        qfilter = kwargs.get(  'filter', ""  )
         if qfilter != "":
-            self.object_list = self.get_queryset(qfilter= qfilter  )
+            self.object_list = self.get_queryset(  qfilter = qfilter  )
+
+        allow_empty = self.get_allow_empty()
+
+        context = self.get_context_data()
+        return self.render_to_response(context)
+
+
+
+class UrbanemProductsView(WohnprojekteView):
+
+
+    def get_queryset(self, qfilter=None, **kwargs ):
+        # original qs
+        qs = super().get_queryset()
+
+        if qfilter!=None:
+            mfilter = {}
+            mfilter[qfilter] = True
+            qs =  qs.filter ( **mfilter  )
+
+        qs = qs.order_by('frei')
+
+        return qs.filter(public = True)
+
+    def get(self, request, *args, **kwargs):
+
+        qfilter = 'urbanem'
+        if qfilter != "":
+            self.object_list = self.get_queryset(  qfilter = qfilter  )
 
         allow_empty = self.get_allow_empty()