Merge pull request #26 from pyvec/beta

Update models

program/migrations/0004_rename_difficulty_talk_minimum_python_knowledge_and_more.py

@@ -0,0 +1,94 @@
+# Generated by Django 4.2.1 on 2023-07-31 19:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("program", "0003_alter_talk_difficulty_alter_workshop_difficulty"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="talk",
+            old_name="difficulty",
+            new_name="minimum_python_knowledge",
+        ),
+        migrations.RenameField(
+            model_name="workshop",
+            old_name="difficulty",
+            new_name="minimum_python_knowledge",
+        ),
+        migrations.RemoveField(
+            model_name="talk",
+            name="in_data_track",
+        ),
+        migrations.RemoveField(
+            model_name="workshop",
+            name="in_data_track",
+        ),
+        migrations.AddField(
+            model_name="speaker",
+            name="linkedin",
+            field=models.CharField(blank=True, max_length=255),
+        ),
+        migrations.AddField(
+            model_name="speaker",
+            name="personal_website",
+            field=models.CharField(blank=True, max_length=255),
+        ),
+        migrations.AddField(
+            model_name="talk",
+            name="minimum_topic_knowledge",
+            field=models.CharField(
+                choices=[
+                    ("few-times", "Attendees who used it few times"),
+                    ("regular-basis", "Attendees who use it on a regular basis"),
+                    ("no-previous-knowledge", "No previous knowledge needed"),
+                ],
+                default="no-previous-knowledge",
+                max_length=256,
+            ),
+        ),
+        migrations.AddField(
+            model_name="talk",
+            name="track",
+            field=models.CharField(
+                choices=[
+                    ("pydata", "PyData"),
+                    ("beginners", "Beginners"),
+                    ("general", "General"),
+                ],
+                default="beginner",
+                max_length=16,
+            ),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="workshop",
+            name="minimum_topic_knowledge",
+            field=models.CharField(
+                choices=[
+                    ("few-times", "Attendees who used it few times"),
+                    ("regular-basis", "Attendees who use it on a regular basis"),
+                    ("no-previous-knowledge", "No previous knowledge needed"),
+                ],
+                default="no-previous-knowledge",
+                max_length=256,
+            ),
+        ),
+        migrations.AddField(
+            model_name="workshop",
+            name="track",
+            field=models.CharField(
+                choices=[
+                    ("pydata", "PyData"),
+                    ("beginners", "Beginners"),
+                    ("general", "General"),
+                ],
+                default="beginner",
+                max_length=16,
+            ),
+            preserve_default=False,
+        ),
+    ]

program/models.py

@@ -7,6 +7,8 @@ class Speaker(models.Model):
     short_bio = models.TextField(blank=True, help_text="for keynote speakers")
     twitter = models.CharField(max_length=255, blank=True)
     github = models.CharField(max_length=255, blank=True)
+    linkedin = models.CharField(max_length=255, blank=True)
+    personal_website = models.CharField(max_length=255, blank=True)
     email = models.EmailField()
     photo = models.ImageField()
     talks = models.ManyToManyField("Talk", blank=True, related_name="talk_speakers")
@@ -41,18 +43,33 @@ class Meta:
         ("intermediate", "Intermediate"),
         ("advanced", "Advanced"),
     )
+    TRACK = {
+        ("general", "General"),
+        ("pydata", "PyData"),
+        ("beginners", "Beginners"),
+    }
+    TOPIC_KNOWLEDGE = {
+        ("no-previous-knowledge", "No previous knowledge needed"),
+        ("few-times", "Attendees who used it few times"),
+        ("regular-basis", "Attendees who use it on a regular basis"),
+    }
 
     type = models.CharField(max_length=10, choices=TYPE)
     language = models.CharField(max_length=2, choices=LANGUAGES, default="en")
-    difficulty = models.CharField(max_length=16, choices=DIFFICULTY, default="beginner")
+    minimum_python_knowledge = models.CharField(
+        max_length=16, choices=DIFFICULTY, default="beginner"
+    )
+    minimum_topic_knowledge = models.CharField(
+        max_length=256, choices=TOPIC_KNOWLEDGE, default="no-previous-knowledge"
+    )
+    track = models.CharField(max_length=16, choices=TRACK)
     order = models.SmallIntegerField(
         unique=True, help_text="display order on front-end"
     )
     title = models.CharField(max_length=250)
     abstract = models.TextField()
     is_backup = models.BooleanField(default=False, blank=True)
     is_public = models.BooleanField(default=False, blank=True)
-    in_data_track = models.BooleanField("PyData Track", default=False, blank=True)
     private_note = models.TextField(
         default="", blank=True, help_text="DO NOT SHOW ON WEBSITE"
     )