db migrated

marktplatz/forms.py

@@ -57,7 +57,8 @@ class SubmissionForm(forms.ModelForm):
 
     class Meta:
         model = Product
-        fields = ('title','country','city','year','owner','teaser_txt','header','category', 'description_txt', 'terms')
+        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')
+
 
     def __init__(self,*args, **kwargs):
        super(SubmissionForm, self).__init__(*args, **kwargs)
@@ -94,6 +95,7 @@ class SubmissionForm(forms.ModelForm):
                'category',
                'teaser_txt',
                'description_txt',
+               'name','claim','beschreibung',
            )
        )
 

marktplatz/models.py

@@ -82,17 +82,17 @@ class Interaction(models.Model):
 
 class Contact(models.Model):
     user = models.OneToOneField(User, on_delete=models.CASCADE,blank=True)
-    first_name = models.CharField(max_length = 100)
-    last_name = models.CharField(max_length = 100)
-    adress = models.CharField(blank=True,max_length = 100)
-    postcode = models.CharField(blank=True, max_length = 100)
-    city = models.CharField(blank=True,max_length = 100)
-    country = models.CharField(blank=True,max_length = 100)
-    email = models.EmailField(unique=True)
-    phonenumber = models.CharField(blank=True,max_length = 100)
-    alternate_phonenumber = models.CharField(blank = True,max_length = 100)
-    skype_name = models.CharField(blank=True,max_length = 300)
-    website = models.URLField(blank=True)
+    first_name = models.CharField(verbose_name="Vorname", max_length = 100)
+    last_name = models.CharField(verbose_name="Nachname", max_length = 100)
+    adress = models.CharField(verbose_name="Adresse", blank=True,max_length = 100)
+    postcode = models.CharField(verbose_name="Postleitzahl", blank=True, max_length = 100)
+    city = models.CharField(verbose_name="Stadt", blank=True,max_length = 100)
+    country = models.CharField(verbose_name="Land", blank=True,max_length = 100)
+    email = models.EmailField(verbose_name="E-Mail-Addresse", unique=True)
+    phonenumber = models.CharField(verbose_name="Telefonnummer", blank=True,max_length = 100)
+    alternate_phonenumber = models.CharField(verbose_name="Telefonnummer", blank = True,max_length = 100)
+    skype_name = models.CharField(verbose_name="Skype", blank=True,max_length = 300)
+    website = models.URLField(verbose_name="Website", blank=True)
 
     def __str__(self):
         return self.first_name + ' ' + self.last_name
@@ -115,28 +115,106 @@ class Category(models.Model):
 
 
 class Product(models.Model):
+
+    STATUS = [
+        ('ENT', 'Entwicklung'),
+        ('BET', 'In Betrieb'),
+        ('ABG', 'Abgeschlossen'),
+    ]
+
+    FREI = [
+        ('JAJA', 'Ja, bitte melden'),
+        ('WART', 'Nein, aber es gibt eine Warteliste'),
+        ('NEIN', 'Nein und es gibt keine Warteliste'),
+    ]
+
+    RECHTSFORM = [
+        ('GMBH', 'GmbH'),
+        ('VERE', 'Verein'),
+        ('ANDE', 'Adere'),
+    ]
+
+    ORT = [
+        ('1010', '1., Innere Stadt'),
+        ('1020', '2., Leopoldstadt'),
+        ('1030', '3., Landstraße'),
+        ('1040', '4., Wieden'),
+        ('1050', '5., Margareten'),
+        ('1060', '6., Mariahilf'),
+        ('1070', '7., Neubau'),
+        ('1080', '8., Josefstadt'),
+        ('1090', '9., Alsergrund'),
+        ('1100', '10., Favoriten'),
+        ('1110', '11., Simmering'),
+        ('1120', '12., Meidling'),
+        ('1130', '13., Hietzing'),
+        ('1140', '14., Penzing'),
+        ('1150', '15., Rudolfsheim-Fünfhaus'),
+        ('1160', '16., Ottakring'),
+        ('1170', '17., Hernals'),
+        ('1180', '18., Währing'),
+        ('1190', '19., Döbling'),
+        ('1200', '20., Brigittenau'),
+        ('1210', '21., Floridsdorf'),
+        ('1220', '22., Donaustadt'),
+        ('1230', '23., Liesing'),
+        ('GERM', 'Deutschland'),
+        ('SCHW', 'Schweiz'),
+        ('GERM', 'Germany'),
+        ('GERM', 'Germany'),
+        ('VORA', 'Vorarlberg'),
+        ('TIRO', 'Tirol'),
+        ('SALZ', 'Salzburg'),
+        ('KAER', 'Kärnten'),
+        ('STEI', 'Steiermark'),
+        ('OBER', 'Oberösterreich'),
+        ('NIER', 'Niederösterreich'),
+        ('BURG', 'Burgenland'),
+        ('WELT', 'Welt'),
+    ]
+
+    ORGANIZATION = [
+        ('SOZ', 'Soziokratie'),
+        ('SON', 'Sonstiges'),
+    ]
+
+    name         = models.CharField( 'Name', max_length = 128, help_text="Name des Projekts", null = True, blank=True )
+    claim        = models.CharField( 'Claim / Untertitel', max_length = 256, help_text="Untertitel", null = True, blank=True )
+    beschreibung = models.CharField( 'Claim / Untertitel', max_length = 256, help_text="", null = True, blank=True )
+    learning     = models.CharField( 'Learning', max_length = 256, help_text="Learning", null = True, blank=True )
+    gruendungsjahr  = models.CharField('Gründungsjahr', max_length = 256, help_text="Gründungsjahr des Projekts", null = True, blank=True )
+    betriebgenommen = models.DateField('in Betrieb genommen in Jahr', max_length = 256, help_text="Wann wurde das Projekt in Betrieb genommen?" , null = True, blank=True )
+    status  = models.CharField( 'Status',    max_length = 3,    choices=STATUS, default='ENT', help_text="Was ist der Status des Projektes" , null = True, blank=True )
+    adresse = models.CharField( 'Adresse',   max_length = 256,  help_text="Adresse des Projektes", null = True, blank=True )
+    website = models.URLField ( 'Website',   max_length = 2048, help_text="Website des des Projektes", null = True, blank=True )
+    frei    = models.CharField( 'Platz frei', max_length = 4,    choices=FREI, default='NEIN', help_text="Gibt es freie Plätze?", null = True, blank=True )
+    mitmachen  = models.BooleanField( 'Mitmachen möglich', default=False, help_text="Kann jemand mitmachen?", null = True, blank=True )
+    rechtsform = models.CharField( 'Rechtsform', max_length = 4, choices=RECHTSFORM, default='ANDE', help_text="Rechtsform des Projektes", null = True, blank=True )
+    ort        = models.CharField( 'Ort',        max_length = 4, choices=ORT, default='WELT', help_text="Ort des Projektes", null = True, blank=True )
+    orga       = models.CharField( 'Organisationsform',        max_length = 3, choices=ORGANIZATION, default='SON', help_text="Organisationsform des Projektes", null = True, blank=True )
+
     title = models.CharField('Product Title',max_length = 100)
-    country = CountryField(blank=True,multiple=True)
-    city = models.CharField(max_length = 100,null = True, blank=True)
-    year = models.IntegerField('Year of Completion',null = True, blank=True)
-    owner = models.CharField(max_length = 300,null = True,blank=True)
-    teaser_txt = models.TextField(blank = True, max_length = 1050)
-    header = models.CharField(max_length = 900,null = True)
-    description_txt = models.TextField(max_length = 3000,null = True)
-    cid = models.IntegerField(null = True,blank=True)
-    class_cid = models.CharField(null = True,max_length = 3, blank=True)
-    sumbitted = models.CharField(null = True,max_length = 10, blank=True)
-    date_submitted = models.DateField(auto_now_add=True)
-    terms = models.NullBooleanField()
-    edit = models.NullBooleanField()
-    public = models.NullBooleanField()
-    photo = models.CharField(max_length=500, null=True, blank=True)
-    videocts = models.CharField(max_length=500, null=True, blank=True)
-    category = models.ManyToManyField(Category, null=True)
-    credits = models.ForeignKey(Credit, null = True,on_delete=models.SET_NULL)
-    description = models.ForeignKey(Description,null = True, on_delete=models.SET_NULL)
-    contact = models.ForeignKey(Contact, null = True,on_delete=models.SET_NULL)
-    interaction = models.ForeignKey(Interaction, null = True,on_delete = models.SET_NULL)
+    country = CountryField(blank=True,multiple=True, help_text="")
+    city = models.CharField(max_length = 100,null = True, blank=True, help_text="")
+    year = models.IntegerField('Year of Completion',null = True, blank=True, help_text="")
+    owner = models.CharField(max_length = 300,null = True,blank=True, help_text="")
+    teaser_txt = models.TextField(blank = True, max_length = 1050, help_text="")
+    header = models.CharField(max_length = 900,null = True, help_text="")
+    description_txt = models.TextField(max_length = 3000,null = True, help_text="")
+    cid = models.IntegerField(null = True,blank=True, help_text="")
+    class_cid = models.CharField(null = True,max_length = 3, blank=True, help_text="")
+    sumbitted = models.CharField(null = True,max_length = 10, blank=True, help_text="")
+    date_submitted = models.DateField(auto_now_add=True, help_text="")
+    terms = models.NullBooleanField(help_text="")
+    edit = models.NullBooleanField(help_text="")
+    public = models.NullBooleanField(help_text="")
+    photo = models.CharField(max_length=500, null=True, blank=True, help_text="")
+    videocts = models.CharField(max_length=500, null=True, blank=True, help_text="")
+    category = models.ManyToManyField(Category, null=True, help_text="")
+    credits = models.ForeignKey(Credit, null = True,on_delete=models.SET_NULL, help_text="")
+    description = models.ForeignKey(Description,null = True, on_delete=models.SET_NULL, help_text="")
+    contact = models.ForeignKey(Contact, null = True,on_delete=models.SET_NULL, help_text="")
+    interaction = models.ForeignKey(Interaction, null = True,on_delete = models.SET_NULL, help_text="")
 
     def __str__(self):
         return str(self.title)

project_base/templates/base_generic.html

@@ -48,7 +48,7 @@
 
         {% if user.is_authenticated %}
         <a  class="nav-link nav-right boldkur" style="color: black;    font-weight: bold;" href="{% url 'NewSubmitView'%}?">ADD PROJECT</a>
-        <a  class="nav-link nav-right boldkur" style="color: black;    font-weight: bold;" href="{% url 'MyProjects'%}">MY PROJECTS</a>
+        <a  class="nav-link nav-right boldkur" style="color: black;    font-weight: bold;" href="{% url 'MyProducts'%}">MY PROJECTS</a>
         <a  class="nav-link nav-right boldkur" style="color: black;    font-weight: bold;" href="{% url 'logout'%}?next={{request.path}}">LOGOUT</a>
         {% endif %}