detailview, clean ups, more fields.

marktplatz/forms.py

@@ -71,7 +71,7 @@ class SubmissionForm(forms.ModelForm):
         fields = (
         # 'title','country','city','year','owner','teaser_txt','header','category', 'description_txt',
          'terms',
-        'name','claim','beschreibung','learning','gruendungsjahr','betriebgenommen','status','adresse','website','frei','mitmachen','rechtsform','ort','orga',
+        'name','claim','beschreibung','learning','gruendungsjahr','betriebgenommen','status','adresse','website','email','frei','kfrei', 'mitmachen','rechtsform','ort','orga',
          'eigentum', 'inseratstext', 'altneu', 'schwerpunkt', 'artmodell', 'bautraeger', 'aerwachsene', 'akinder', 'awohnungen', 'wohnflaeche', 'gewerbeflaechen', 'gemeinschaftsflaeche', 'sonstige_flaechen', 'gemeinschaftr', 'sonderwohnformen', 'raumangebot', 'parbeiten', 'karbeiten', 'bauweise', 'zielgruppen', 'gprojekte', 'oekologie', 'freiraumangebote', 'gaestwohnungen',
          )
 
@@ -100,7 +100,7 @@ class SubmissionForm(forms.ModelForm):
        #
        #
        #
-       
+
        # self.fields['description_txt'].max_length = 2000
        # self.fields['teaser_txt'].max_length = 750
 
@@ -121,7 +121,26 @@ class SubmissionForm(forms.ModelForm):
                # 'description_txt',
 
 
-               'name','claim','beschreibung','learning','status','adresse','ort','website','frei','mitmachen','rechtsform','orga',
+               'name','claim','beschreibung','learning','status',
+
+              Div(
+                  Div('adresse',  css_class='col-sm-6 col-6'),
+                  Div('ort', css_class='col-sm-6 col-6'),
+                  css_class='form-row  row'),
+
+              Div(
+                  Div('frei',  css_class='col-sm-6 col-6'),
+                  Div('kfrei', css_class='col-sm-6 col-6'),
+                  css_class='form-row  row'),
+
+              'mitmachen','rechtsform','orga',
+
+              Div(
+                  Div('website',  css_class='col-sm-6 col-6'),
+                  Div('email', css_class='col-sm-6 col-6'),
+                  css_class='form-row  row'),
+
+
               Div(
                   Div('gruendungsjahr',  css_class='col-sm-6 col-6'),
                   Div('betriebgenommen', css_class='col-sm-6 col-6'),
@@ -196,7 +215,7 @@ class CreditForm(forms.ModelForm):
         self.fields['interaction_design'].max_length = 100
         self.fields['sponsor'].max_length = 100
         self.fields['module_elems'].max_length = 100
-#
+
         self.helper = FormHelper()
         self.helper.field_class = 'form_border'
         self.helper.form_tag = False

marktplatz/models.py

@@ -186,24 +186,30 @@ class Product(models.Model):
         ('Sonstiges', 'Sonstiges'),
     ]
 
-    name         = CharField( 'Name', max_length = 128, help_text="Name des Projekts", null = True, blank=True )
-    claim        = CharField( 'Claim / Untertitel', max_length = 256, help_text="Claim / Untertitel", null = True, blank=True )
-    beschreibung = CharField( 'Beschreibung', max_length = 256, help_text="Beschreibung des Projektes", null = True, blank=True )
-    learning     = CharField( 'Learning', max_length = 256, help_text="Learning", null = True, blank=True )
+    @property
+    def kind_of_product(self):
+            return "Allgemeines Produkt"
+
+    name            = CharField( 'Name', max_length = 128, help_text="Name des Projekts", null = True, blank=True )
+    claim           = CharField( 'Claim / Untertitel', max_length = 256, help_text="Claim / Untertitel", null = True, blank=True )
+    beschreibung    = TextField( 'Beschreibung', max_length = 4096, help_text="Beschreibung des Projektes", null = True, blank=True )
+    learning        = CharField( 'Learning', max_length = 256, help_text="Learning", null = True, blank=True )
     gruendungsjahr  = IntegerField('Gründungsjahr', help_text="Gründungsjahr des Projekts", validators=[MinValueValidator(0), MaxValueValidator(9999)], null = True, blank=True )
     betriebgenommen = IntegerField('in Betrieb genommen in Jahr', help_text="Wann wurde das Projekt in Betrieb genommen?", validators=[MinValueValidator(0), MaxValueValidator(9999)], null = True, blank=True )
-    status   = CharField( 'Status',    max_length = 3,    choices=STATUS, default='ENT', help_text="Was ist der Status des Projektes" , null = True, blank=True )
-    adresse  = CharField( 'Adresse',   max_length = 256,  help_text="Adresse des Projektes", null = True, blank=True )
+    status          = CharField( 'Status',    max_length = 3,    choices=STATUS, default='ENT', help_text="Was ist der Status des Projektes" , null = True, blank=True )
+    adresse         = CharField( 'Adresse',   max_length = 256,  help_text="Adresse des Projektes", null = True, blank=True )
     plz             = CharField   ( 'Adresse',   max_length = 256,  help_text="PLZ des Projektes", null = True, blank=True )
     adresse_zusatz  = CharField   ( 'Adresse Zusatz',   max_length = 256,  help_text="Adresse Zusatz", null = True, blank=True )
     ort             = CharField   ( 'Ort',        max_length = 4, choices=ORT, default='WELT', help_text="Ort des Projektes", null = True, blank=True )
-    website  = URLField ( 'Website',   max_length = 2048, help_text="Website des des Projektes", null = True, blank=True )
-    frei     = CharField( 'Platz frei', max_length = 4,    choices=FREI, default='NEIN', help_text="Gibt es freie Plätze?", null = True, blank=False )
+    website         = URLField    ( 'Website',   max_length = 2048, help_text="Website des Projektes", null = True, blank=True )
+    email           = EmailField  ( 'Email',   max_length = 2048, help_text="Email des Projektes", null = True, blank=True )
+    frei            = CharField   ( 'Platz frei', max_length = 4,    choices=FREI, default='NEIN', help_text="Gibt es freie Plätze?", null = True, blank=False )
+    kfrei           = CharField   ( 'Platz frei - Kommentar',   max_length = 2048,  help_text="Kommentar", null = True, blank=True )
     rechtsform      = CharField   ( 'Rechtsform', max_length = 32, help_text="Rechtsform des Projektes", null = True, blank=True )
     orga            = CharField   ( 'Organisationsform',  max_length = 64, help_text="Organisationsform des Projektes.", null = True, blank=True )
     mitmachen  = BooleanField( 'Mitmachen möglich', default=False, help_text="Kann jemand mitmachen?", null = True, blank=False )
     terms = NullBooleanField(help_text="")
-    
+
     title = CharField('Product Title',max_length = 100,null = True, blank=True)
     country = CountryField(blank=True,multiple=True, help_text="")
     city = CharField(max_length = 100,null = True, blank=True, help_text="")
@@ -334,6 +340,10 @@ class Wohnprojekt(Product):
         ('Kinderspielplatz', 'Kinderspielplatz'),
     ]
 
+    @property
+    def kind_of_product(self):
+            return "Wohnprojekt"
+
     eigentum          = CharField   ( 'Rechtliche Konstruktion', max_length = 6,    choices=EIGENTUM, default='GEMIET', help_text="Rechtliche Konstruktion", null = True, blank=True )
     inseratstext      = CharField   ( 'Inseratstext',   max_length = 2048,  help_text="Inseratstext", null = True, blank=True )
     altneu            = CharField   ( 'Altbau/Neubau',  max_length = 4, choices=ALTNEU, help_text="Altbau/Neubau", null = True, blank=False )
@@ -352,7 +362,7 @@ class Wohnprojekt(Product):
     sonstige_flaechen      = IntegerField( 'Sonstige Flächen', help_text="Sonstige Flächen", validators=[MinValueValidator(0)], default = 0, null = True, blank=True )
     @property
     def flaeche(self):
-            return wohnflaeche + gewerbeflaechen + gemeinschaftsflaechen + sonstige_flaechen
+            return self.wohnflaeche + self.gewerbeflaechen + self.gemeinschaftsflaeche + self.sonstige_flaechen
     gemeinschaftr      = MultiSelectField ( 'Gemeinschaftsräume',    max_length = 4096,   choices=GEMEINSCHAFTR, help_text="Gemeinschaftsräume", null = True, blank=True )
     sonderwohnformen   = CharField        ( 'Sonderwohnformen',   max_length = 2048,  help_text="Sonderwohnformen, z.B. Wohncluster, WGs, Sonstiges", null = True, blank=True )
     raumangebot        = MultiSelectField ( 'Raumangebot nach Außen',    max_length = 4096,   choices=RAUMANGEBOT, help_text="Raumangebot nach Außen", null = True, blank=True )

marktplatz/templates/marktplatz/add.html

@@ -35,14 +35,8 @@
       {% crispy product %}
     </div>
 
-    <div class="col-sm-10">
-      {% if description %}
-      {{ description|crispy }}
-      {% endif %}
-    </div>
-    <div class="col-sm-10">
 
-      {% crispy lnks lnks_helper %}
+    <div class="col-sm-10">
 
     </div>
 

marktplatz/templates/marktplatz/myProducts.html

@@ -54,11 +54,11 @@ $('form').submit(function () {
 
 
  </table>
-    <a href="{% url 'NewSubmitView' %}"><button class="btn border-dark rounded-0 mybtn" type="submit">Add product </button> </a>
+    <a href="{% url 'new-submit-view' %}"><button class="btn border-dark rounded-0 mybtn" type="submit">Add product </button> </a>
  {% else %}
 <div class="container-fluid">
 
-    <h6>Seems like you haven't uploaded anything yet :(<br> Start Sumbitting now :  <a href="{% url 'NewSubmitView' %}"><button class="btn border-dark rounded-0 mybtn" type="submit">Add products </button> </a></h6>
+    <h6>Seems like you haven't uploaded anything yet :(<br> Start Sumbitting now :  <a href="{% url 'new-submit-view' %}"><button class="btn border-dark rounded-0 mybtn" type="submit">Add products </button> </a></h6>
 </div>
 
 {% endif %}

marktplatz/templates/marktplatz/product_detail.html

@@ -6,149 +6,244 @@
 <script src="{% static 'featherlight.min.js' %}" type="text/javascript" charset="utf-8"></script>
 <link href="{% static 'featherlight.gallery.min.css' %}" type="text/css" rel="stylesheet" />
 <script src="{% static 'featherlight.gallery.min.js' %}" type="text/javascript" charset="utf-8"></script>
+
 <script>
-$(document).ready(function(){
+	$(document).ready(function(){
 
-$('.gallery').featherlightGallery({
-		previousIcon: '«',
-		nextIcon: '»',
-		galleryFadeIn: 250,
-		openSpeed: 250,
-	});
+	$('.gallery').featherlightGallery({
+			previousIcon: '«',
+			nextIcon: '»',
+			galleryFadeIn: 250,
+			openSpeed: 250,
+		});
 
-});
+	});
 
 
 </script>
 
 
+
 {% endblock %}
 
 {% block content %}
 
+
+<style>
+
+
+.image-detail{
+
+	margin:40px 60px 40px 0px;
+
+}
+
+
+
+@media (min-width: 500px) {
+
+
+}
+
+
+</style>
+
 <hr style="color: black; background-color: black; margin-top: 0px; width: 130%; display: flex; margin-left: -20px; margin-right:20px ">
 
-<div clas="container">
+<div class="container " style="">
+		<div class="row">
+				<div class="col-sm-6">
+
 
+					<h2 class="titlepro" style="margin-top: 7px;color: black; font-weight: bold">{{ product.name }}
+					      <small class="text-muted">{% if product.year %} {{ product.year }}, {% endif %}  {% for country in product.country %} {{ country.name }}, {% endfor %} {% if product.city %} {{ product.city }} {% endif %}</small>
+					</h2>
 
-<h2 class="titlepro" style="margin-top: 7px;color: black; font-weight: bold">{{ product.name }}
-      <small class="text-muted">{% if product.year %} {{ product.year }}, {% endif %}  {% for country in product.country %} {{ country.name }}, {% endfor %} {% if product.city %} {{ product.city }} {% endif %}</small>
-</h2>
-<p class="lead kur"> {{ product.claim }}</p>
-  <div class="row" style="display: flex">
+					<p class="lead kur"> {{ product.claim }}</p>
 
 
-{% for media in product.media_set.all %}
 
-         <div style="flex: {% get_ratio media %}">
-    <img href="{{media.image_big.url}}" align="middle" src="{{media.image_norm.url }}" class="gallery img-fluid img-responsive"  alt="" style="width: 100%;height: auto;vertical-align: middle;">
 
-         </div>
+					<div class="">
+						&nbsp;
+					</div>
+					<div class="">
+						&nbsp;
+					</div>
+					<div class="">
+						&nbsp;
+					</div>
+					<div class="">
+						&nbsp;
+					</div>
 
-{% endfor %}
+					<div class="">
+						{{  product.get_frei_display  }}
+					</div>
 
 
+					<div class="">
+						{{  product.get_mitmachen_display  }}
+					</div>
 
-  </div>
 
+					<div class="">
+						&nbsp;
+					</div>
 
-    <div class="row" style="margin-top: 10px">
+					<p class=""> {{ product.beschreibung }}</p>
 
-     <div class="col-sm-6">
-         <p><h5 class="black"></h5></p>
-          {% for video in product.video_set.all %}
+					<p class=""> {{ product.learning }}</p>
 
-          <video autoplay style="width: 100%;height: auto;vertical-align: middle; padding-bottom: 10px" controls>
-              <source src="{{video.image.url}}" type="video/mp4">
-          </video>
+					<div class="">
+						&nbsp;
+					</div>
+					<div class="">
+						&nbsp;
+					</div>
 
-      {% endfor %}
-         <p>{{product.claim}}</p>
-         <p>{{product.beschreibung}}</p>
 
-         {% for link in product.link_set.all %}
-         <p> <a href="{{link.link}}">{{link.link}}</a></p>
 
 
-      {% endfor %}
+					{% for video in product.video_set.all %}
 
+						<video autoplay style="width: 100%;height: auto;vertical-align: middle; padding-bottom: 10px" controls>
+							<source src="{{video.image.url}}" type="video/mp4">
+						</video>
 
-     </div>
-     <div class="col-sm-4">
+					{% endfor %}
 
+					{% for media in product.media_set.all %}
+						{% if not forloop.first %}
+							{% if forloop.counter < 6  %}
+								<div class="image-detail" style="flex: {% get_ratio media %}; ">
+									<img href="{{media.image_big.url}}" align="middle" src="{{media.image_norm.url }}" class="gallery img-fluid img-responsive"  alt="" style="width: 100%;height: auto;vertical-align: middle;">
+								</div>
+							{% endif %}
+						{% endif %}
+					{% endfor %}
 
-         {% if request.user|has_group:"jury" %}
-         <p><h5 class="black mediumkur" style="margin: 0px">Please vote here:</h5></p>
-            <form class="form-inline needs-validation" method="POST"> {% csrf_token %}
-                <p><textarea style="margin-top: 0px;padding-top: 0px" type="text" rows="5" cols="25" class="form-control border-dark rounded-0" id="comment" name="comment" placeholder='{% get_comment Product user %}'>{% get_comment Product user %}</textarea></br>
-                <br> <input style='width: 50px;' type="number" class="form-control border-dark rounded-0" id="vote" name="vote" placeholder='{% get_int_vote Product user %}' required> <button  class="btn border-dark rounded-0 mybtn" type="submit">Submit </button> </br>
-                </p>
-                <small class="form-text text-muted">
-                   <p style="margin-bottom: 0px">Only Values between 0 an 10 are taken into account.</p>
-                    <p style="margin-bottom: 0px">0 = weakest</p>
-                    <p style="margin-bottom: 0px">10 = excellent</p>
 
 
-                </small>
+				</div>
 
-                <div class="invalid-feedback"> Please enter a Vote between 0 an 10 </div>
-            </form>
-            <p style="margin-top: 4px"><strong>Award Categories:</strong> {% for cat in product.category.all %} {{cat.name}}{% if not forloop.last %}, {% endif %}{% endfor %}</p>
-         {% endif %}
 
 
+ 			<!-- *************************************************************** -->
 
-         <p><h5 class="black mediumkur">Details</h5></p>
 
-         {% for field, value in credits %}
-         {% if value and not field == "ID" %}
-          <p class="fieldname"><strong class="mediumkur"> {{ field }} :</strong> {{ value }}</p>
-         {% endif %}
-         {% endfor %}
+				<div class="col-sm-6">
 
-          <p><h5 class="mediumkur">Descriptions</h5></p>
 
-         {% for field, value in descriptions %}
-         {% if value and not field == "ID"%}
-          <p class="fieldname"><strong> {{ field }} :</strong> {{ value }}</p>
-         {% endif %}
-         {% endfor %}
+					<div class="image-detail" style="">
+					<!-- <div style="flex: {% get_ratio product.media_set.first %} ; margin:40px 60px 40px 0px; "> -->
+					<img href="{{product.media_set.first.image_big.url}}" align="middle" src="{{product.media_set.first.image_norm.url }}" class="gallery img-fluid img-responsive"  alt="" style="width: 100%;height: auto;vertical-align: middle;">
 
+					</div>
 
 
-         <p><h5 class="mediumkur">Participatory architecture & urban interaction</h5></p>
+					<br />
+					<h5 class="black mediumkur">Steckbrief</h5>
+					<br />
 
-         {% for field, value in interactions %}
-         {% if value and not field == "ID"%}
-          <p class="fieldname"><strong class="mediumkur"> {{ field }} :</strong> {{ value }}</p>
-         {% endif %}
-         {% endfor %}
+					<p>{{ product.wohnprojekt.kind_of_product }}, gegründet {{ product.wohnprojekt.gruendungsjahr }}, in Betrieb genommen: {{ product.wohnprojekt.betriebgenommen }}.</p>
+					<p>Rechtsform: {{ product.wohnprojekt.rechtsform }}</p>
+					<p>{{ product.wohnprojekt.artmodell }}</p>
+					<p>{{ product.wohnprojekt.orga }}</p>
+					<p>Gemeinschaftliche Projekte: {{ product.wohnprojekt.gprojekte }}</p>
+					<p>Gemeinschaftsräume: {{ product.wohnprojekt.gemeinschaftr }}</p>
+					<p>{{ product.wohnprojekt.sonderwohnformen }}</p>
+					<p>Besondere Zielgruppen: {{ product.wohnprojekt.zielgruppen }}</p>
+					<p>Freiraumangebote: {{ product.wohnprojekt.freiraumangebote }}</p>
+					<p>{{ product.wohnprojekt.oekologie }}</p>
 
 
+					<br />
+					<h5 class="black mediumkur">Kenndaten</h5>
+					<br />
 
+					<p>{{ product.wohnprojekt.get_altneu_display }}, {{ product.wohnprojekt.bauweise }}</p>
+					<p>Bautr&auml;ger: {{ product.wohnprojekt.bautraeger }}</p>
+					<p>im Haus Wohnen ca {{ product.wohnprojekt.aerwachsene }} Erwachsene und {{  product.wohnprojekt.akinder }} Kinder</p>
+					<p>{{  product.wohnprojekt.awohnungen  }} Wohnungen</p>
+					<p>Gesamtnutzfläche: {{   product.wohnprojekt.flaeche }} m2</p>
+					<p>Wohnnutzfläche: {{  product.wohnprojekt.wohnflaeche  }} m2</p>
+					<p>gef&ouml;rdert als Wohnheim</p>
+					<p>Gemeinschaftfläche: {{ product.wohnprojekt.gemeinschaftsflaeche   }} m2</p>
+					<p>Gewerbefläche: {{ product.wohnprojekt.gewerbeflaechen  }} m2</p>
+					<p>Sonstige Flächen: {{ product.wohnprojekt.sonstige_flaechen  }} m2</p>
+					<p>Unsere Gewerbefläche sind ein Coworkingspace</p>
+					<p>Im Haus arbeiten ca {{ product.wohnprojekt.parbeiten }} Personen</p>
 
-         <p><h5 class="mediumkur">Mediacredits</h5></p>
 
-         {% for media in product.media_set.all %}
-         {% if media.copyright %}
-          <p class="fieldname"> {{ media.copyright }}</p>
-         {% endif %}
-         {% endfor %}
-         {% for media in product.video_set.all %}
-         {% if media.copyright %}
-          <p class="fieldname"> {{ media.copyright }}</p>
-         {% endif %}
-         {% endfor %}
+					<br />
+					<h5 class="black mediumkur">Kontakt</h5>
+					<br />
 
+					<p>{{ product.wohnprojekt.adresse }}</p>
+					<p>{{  product.wohnprojekt.email  }}</p>
+					<p><a href="{{  product.wohnprojekt.website }}">Webseite</a></p>
 
+					<br />
+					<h5 class="mediumkur">Mediacredits</h5>
+					<br />
+					{% for media in product.media_set.all %}
+						{% if media.copyright %}
+							<p class="fieldname"> {{ media.copyright }}</p>
+						{% endif %}
+					{% endfor %}
+					{% for media in product.video_set.all %}
+						{% if media.copyright %}
+							<p class="fieldname"> {{ media.copyright }}</p>
+						{% endif %}
+					{% endfor %}
 
 
-     </div>
+					{% for media in product.media_set.all %}
+						{% if forloop.counter > 5  %}
+							<div style="flex: {% get_ratio media %}; margin:40px 60px 40px 0px;">
+								<img href="{{media.image_big.url}}" align="middle" src="{{media.image_norm.url }}" class="gallery img-fluid img-responsive"  alt="" style="width: 100%;height: auto;vertical-align: middle;">
+							</div>
+						{% endif %}
+					{% endfor %}
 
- </div>
+
+
+
+
+
+				</div>
+		</div>
 
 </div>
-    </div>
+
+
+<div clas="container">
+
+	<div class="row" style="margin-top: 10px">
+
+		<div class="col-sm-6">
+
+				{% for link in product.link_set.all %}
+					<p> <a href="{{link.link}}">{{link.link}}</a></p>
+				{% endfor %}
+
+
+		</div>
+		<div class="col-sm-4">
+
+			 				 {% for field, value in product.wohnprojekt %}
+			          {% if value and not field == "ID" %}
+			           <p class="fieldname"><strong class="mediumkur"> {{ field }} :</strong> {{ value }}</p>
+			          {% endif %}
+			          {% endfor %}
+
+		</div>
+
+	</div>
+
+</div>
+
 
 
 

marktplatz/urls.py

@@ -16,9 +16,9 @@ urlpatterns = [
     path('votescid/', views.CidView.as_view(), name='votecid-detail'),
     path('admin_panel/', views.AdminView.as_view(), name='admin-panel'),
     path('light-box/', lightboximg.as_view(template_name="mab18/importold.html"),name='lightbox'),
-    path('register/', views.registerView.as_view(), name='registerView'),
-    path('addProduct/', views.NewSubmitView.as_view(), name='NewSubmitView'),
-    path('myProducts/', views.UsersProducts.as_view(), name='MyProducts'),
+    path('register/', views.registerView.as_view(), name='register-view'),
+    path('addProduct/', views.NewSubmitView.as_view(), name='new-submit-view'),
+    path('myProducts/', views.UsersProducts.as_view(), name='my-products'),
     path('editProduct/<int:pk>', views.EditView.as_view(), name='edit-product'),
     path('addImage/<int:pk>', views.uploadView.as_view(), name='add-Image'),
     path('images/<int:pk>', views.MediaView.as_view(), name='media-overview'),

marktplatz/views.py

@@ -68,7 +68,7 @@ def error_404_view(request, exception):
 def home(request):
     user = request.user
     if user.groups.filter(name='submission').exists():
-        return HttpResponseRedirect(reverse('MyProducts'))
+        return HttpResponseRedirect(reverse('my-products'))
     else:
         return  HttpResponseRedirect(reverse('products'))
 
@@ -134,9 +134,11 @@ class DetailView(generic.DetailView):
     def get_context_data(self, **kwargs):
             context = super().get_context_data(**kwargs)
             # context['credits'] = Credit.objects.select_related().get(product = self.kwargs['pk'])
-            # context['descriptions'] = Description.objects.select_related().get(Product = self.kwargs['pk'])
-            # context['interactions'] = Interaction.objects.select_related().get(Product=self.kwargs['pk'])
+            # context['descriptions'] = Description.objects.select_related().get(product = self.kwargs['pk'])
+            # context['interactions'] = Interaction.objects.select_related().get(product=self.kwargs['pk'])
             # context['PAUI'] = Category.objects.get(short_name='PAUI')
+            # context['wohnprojekt'] = self.object.wohnprojekt
+
             return context
 
     def post(self, request, *args, **kwargs):
@@ -402,11 +404,8 @@ class NewSubmitView(LoginRequiredMixin, FormView):
 
         context = request.GET.dict()
         context['product'] =        SubmissionForm
-        # context['credits'] =        CreditForm
-        # context['description'] =    DescriptionForm
-        # context['interaction'] =    InteractionForm
-        context['lnks'] =           LinkFormSet
-        context['lnks_helper'] =    FormsetHelper()
+        # context['lnks'] =           LinkFormSet
+        # context['lnks_helper'] =    FormsetHelper()
         context['use_ajax'] = True
         context['info_txt'] = Template(config.INFO_TXT).render(Context(context))
 
@@ -417,7 +416,7 @@ class NewSubmitView(LoginRequiredMixin, FormView):
     def post(self, request):
 
         product_f   = SubmissionForm(request.POST, request.FILES)
-        lnks_f      = LinkFormSet(request.POST)
+        # lnks_f      = LinkFormSet(request.POST)
 
         if product_f.is_valid():
 
@@ -432,24 +431,24 @@ class NewSubmitView(LoginRequiredMixin, FormView):
             product.save()
             product_f.save_m2m()
 
-            for lnk in lnks_f:
-                if lnk.is_valid():
-                    lnk_ = lnk.save(commit=False)
-                    lnk_.product=product
-                    lnk_.save()
+            # for lnk in lnks_f:
+            #     if lnk.is_valid():
+            #         lnk_ = lnk.save(commit=False)
+            #         lnk_.product=product
+            #         lnk_.save()
 
             if 'addImage' in request.POST:
                 return HttpResponseRedirect(reverse('add-Image', kwargs={'pk': product.pk}))
 
-            return HttpResponseRedirect(reverse('MyProducts'))
+            return HttpResponseRedirect(reverse('my-products'))
 
         else:
 
             context = request.POST.dict()
             context['product'] =        product_f
             context['product_errors']  = product_f.errors
-            context['lnks'] =           lnks_f
-            context['lnks_helper'] =    FormsetHelper()
+            # context['lnks'] =           lnks_f
+            # context['lnks_helper'] =    FormsetHelper()
             context['use_ajax'] = True
             return render(request, self.template_name, context)
 
@@ -571,10 +570,7 @@ class EditView(FormView):
 
         context = request.GET.dict()
 
-        context['product'] =        SubmissionForm(instance=Product.objects.get(pk=pk))
-        # context['credits'] =        CreditForm(instance = Credit.objects.select_related().get(product=pk))
-        # context['description'] =    DescriptionForm(instance = Description.objects.select_related().get(product=pk))
-        # context['interaction'] =    InteractionForm(instance = Interaction.objects.select_related().get(product=pk))
+        context['product'] = SubmissionForm(instance=Wohnprojekt.objects.get(pk=pk))
 
         linkFormSet = inlineformset_factory(Product,Link, form=LinkForm, extra=0)
         myLinkFormSet = linkFormSet(instance=  Product.objects.get(pk=pk)  )
@@ -588,47 +584,43 @@ class EditView(FormView):
 
     def post(self, request, pk):
 
-            product_f = SubmissionForm(request.POST, request.FILES, instance=Product.objects.get(pk=pk))
-            credits_f = CreditForm(request.POST,instance = Credit.objects.select_related().get(product=pk))
-            description_f = DescriptionForm(request.POST,instance = Description.objects.select_related().get(product=pk))
-            lnks_f      = LinkFormSet(request.POST,instance  = Product.objects.get(pk=pk) )
-            interaction_f = InteractionForm(request.POST,instance = Interaction.objects.select_related().get(product=pk))
-            vid1_f = VideoForm(request.POST, request.FILES)
-
-            if product_f.is_valid():
-                if product_f.has_changed():
-                    product_f.save()
-            if credits_f.has_changed() :
-                credits_f.save()
-            if description_f.has_changed() :
-                description_f.save()
-            if interaction_f.has_changed():
-                interaction_f.save()
-
-                product = product_f.save()
-                for lnk in lnks_f:
-                   if lnk.is_valid():
-                       lnk_ = lnk.save(commit=False)
-                       lnk_.product = product
-                       lnk_.save()
+        product_f = SubmissionForm(request.POST, request.FILES, instance=Wohnprojekt.objects.get(pk=pk))
+        # credits_f = CreditForm(request.POST,instance = Credit.objects.select_related().get(product=pk))
+        # description_f = DescriptionForm(request.POST,instance = Description.objects.select_related().get(product=pk))
+        # lnks_f      = LinkFormSet(request.POST,instance  = Wohnprojekt.objects.get(pk=pk) )
+        # interaction_f = InteractionForm(request.POST,instance = Interaction.objects.select_related().get(product=pk))
+        vid1_f = VideoForm(request.POST, request.FILES)
+
+        if product_f.is_valid():
+
+            if product_f.has_changed():
+                product_f.save()
+
+            product = product_f.save()
+            # for lnk in lnks_f:
+            #    if lnk.is_valid():
+            #        print( "link valid   ......................." )
+            #        lnk_ = lnk.save(commit=False)
+            #        lnk_.product = product
+            #        lnk_.save()
 
 
             if 'addImage' in request.POST:
                 return HttpResponseRedirect(reverse('add-Image', kwargs={'pk': pk}))
 
-                return HttpResponseRedirect(reverse('MyProducts'))
+            return HttpResponseRedirect(reverse('my-products'))
+
+        else:
 
-            else:
 
-                context = request.GET.dict()
-                context['product'] =        product_f
-                context['credits'] =        credits_f
-                context['description'] =    description_f
-                context['interaction'] =    interaction_f
-                context['lnks'] =           lnks_f
-                context['lnks_helper'] =    FormsetHelper()
-                context['use_ajax'] = True
-                return render(request, self.template_name, context)
+            print( "not saved xxxxxxx" )
+            context = request.GET.dict()
+            context['product'] =        product_f
+            context['product_errors']  = product_f.errors
+            # context['lnks'] =           lnks_f
+            # context['lnks_helper'] =    FormsetHelper()
+            context['use_ajax'] = True
+            return render(request, self.template_name, context)
 
 
 

project_base/templates/auth/login.html

@@ -24,7 +24,7 @@
   <input style="align-self: start" type="submit" class="btn btn-outline-secondary rounded-0 mybtn" value="login" />
       <input type="hidden" name="next" value="{{ next }}" />
 
-        <a style="align-self: end" class="btn btn-outline-secondary rounded-0 mybtn" href="{% url 'registerView' %}">Register new Account</a>
+        <a style="align-self: end" class="btn btn-outline-secondary rounded-0 mybtn" href="{% url 'register-view' %}">Register new Account</a>
 
 </div>
     </div>

project_base/templates/base_generic.html

@@ -47,8 +47,8 @@
         {% endif %}
 
         {% if user.is_authenticated %}
-        <a  class="nav-link nav-right boldkur" style="color: black;    font-weight: bold;" href="{% url 'NewSubmitView'%}?">PROJEKT EINREICHEN</a>
-        <a  class="nav-link nav-right boldkur" style="color: black;    font-weight: bold;" href="{% url 'MyProducts'%}">MEINE PROJEKTE</a>
+        <a  class="nav-link nav-right boldkur" style="color: black;    font-weight: bold;" href="{% url 'new-submit-view'%}?">PROJEKT EINREICHEN</a>
+        <a  class="nav-link nav-right boldkur" style="color: black;    font-weight: bold;" href="{% url 'my-products'%}">MEINE PROJEKTE</a>
         <a  class="nav-link nav-right boldkur" style="color: black;    font-weight: bold;" href="{% url 'logout'%}?next={{request.path}}">AUSLOGGEN</a>
         {% endif %}