lots of updates ... eeks

events/models.py

@@ -2,7 +2,8 @@ from django.db import models
 from django.core.files.storage import FileSystemStorage
 from django.contrib.auth.models import User
 
-fs = FileSystemStorage(location='/media/flyers')
+promo = FileSystemStorage(location='/media/promo')
+events = FileSystemStorage(location='/media/events')
 # Create your models here.
 
 class Calendar(models.Model):
@@ -14,7 +15,7 @@ class Calendar(models.Model):
 
     class Meta:
         verbose_name_plural = "Calendars"
-        ordering = ['-published', 'id',]
+        ordering = ['name',]
 
     def __unicode__(self):
         return "%s" % self.shortcode
@@ -55,11 +56,6 @@ class Tags(models.Model):
 
 
 class Organization(models.Model):
-    MEMBER_TYPE = (
-            ('Nm', 'Non-Member'),
-            ('Ds', 'DigiSnaxx'),
-            ('Dsp', 'DigiSnaxx +')
-        )
     ORG_TYPE = (
             ('Fb', 'Food & Beverage'),
             ('Re', 'Retail'),
@@ -70,8 +66,8 @@ class Organization(models.Model):
 
     name = models.CharField(max_length=63)
     website = models.CharField(max_length=126, blank=True, null=True)
-    membership = models.CharField(max_length=31, choices=MEMBER_TYPE, default='0')
     org_type = models.CharField(max_length=31, choices=ORG_TYPE, default='3')
+    cal = models.ForeignKey(Calendar, on_delete=models.CASCADE, blank=True, null=True, related_name="cal_events")
 
     short_desc = models.CharField(max_length=63, blank=True, null=True)
     long_desc = models.TextField(blank=True, null=True)
@@ -79,9 +75,7 @@ class Organization(models.Model):
 
     address_numbers = models.CharField(max_length=63, blank=True, null=True)
     address_type = models.CharField(max_length=31, blank=True, null=True)
-    address_complete = models.CharField(max_length=63, blank=True, null=True)
 
-    cal = models.ForeignKey(Calendar, on_delete=models.CASCADE, related_name="cal_events")
     barrio = models.CharField(max_length=127, blank=True, null=True)
     city = models.CharField(max_length=31, blank=True, null=True)
     state = models.CharField(max_length=15, blank=True, null=True)
@@ -90,17 +84,13 @@ class Organization(models.Model):
     phone_number = models.CharField(max_length=255, blank=True, null=True)
     business_email = models.CharField(max_length=63, blank=True, null=True)
 
-    is_listed= models.BooleanField(default=False)
+    is_member= models.BooleanField(default=False)
     is_501c = models.BooleanField(default=False)
     is_venue= models.BooleanField(default=False)
 
     latitude = models.FloatField(blank=True, null=True)
     longitude = models.FloatField(blank=True, null=True)
 
-    contact_name = models.CharField(max_length=63, blank=True, null=True)
-    contact_email = models.CharField(max_length=63, blank=True, null=True)
-    stripe_email = models.CharField(max_length=63, blank=True, null=True)
-    ein = models.CharField(max_length=15, blank=True, null=True)
 
     class Meta:
         unique_together = ("name", "is_venue")
@@ -114,17 +104,40 @@ class Organization(models.Model):
         return u'%s' % self.name
 
 
+class Person(models.Model):
+    username = models.CharField(max_length=63, blank=True, null=True)
+    email = models.CharField(max_length=63, blank=True, null=True)
+    calendar = models.ManyToManyField(Calendar, blank=True, null=True)
+    event_prefs = models.CharField()
+    ad_prefs = models.CharField()
+
+
+    class Meta:
+        verbose_name_plural = "People"
+        ordering = ['username']
+
+    def __unicode__(self):
+        return "%s" % self.username
+
+    def __str__(self):
+        return u'%s' % self.username
+
+
+
+
 class Event(models.Model):
     EVENT_TYPE = (
-        ('Ot', '🤔'),
-        ('Mu', '🎶'),
-        ('Va', 'Visual Art'),
-        ('Gv', '🛠️'),
         ('Ce', 'Civic Engagement'),
-        ('Ed', '🍎'),
-        ('Ma', 'Mutual Aid'),
-        ('Th', '🎭'),
         ('Co', '🍿'),
+        ('Da', '🪇'),
+        ('Ed', '🍎'),
+        ('Ex' ,'💪'),
+        ('Gv', '🛠️'),
+        ('Ma', '🤝'),
+        ('Mu', '🎶'),
+        ('Ot', '🤔'),
+        ('Th', '🎭'),
+        ('Va', 'Visual Art'),
     )
     EVENT_STATE = (
         ('live', 'Live & Direct'),
@@ -135,7 +148,6 @@ class Event(models.Model):
     show_title = models.CharField(max_length=127, blank=True, null=True)
     show_link = models.URLField(blank=True, null=True)
     show_date = models.DateTimeField()
-    show_day = models.DateField()
 
     calendar = models.ManyToManyField(Calendar, blank=True, null=True, related_name="events")
     scraper = models.ForeignKey(Scraper, on_delete=models.CASCADE, null=True)
@@ -143,9 +155,8 @@ class Event(models.Model):
 
     live = models.CharField(max_length=4, choices=EVENT_STATE, default='live')
     event_type = models.CharField(max_length=15, choices=EVENT_TYPE, default='Mu') 
-
-    img_link = models.URLField(max_length=255, blank=True, null=True)
-    flyer_img = models.ImageField(upload_to=fs, blank=True, null=True)
+    event_image = models.ImageField(upload_to="events", blank=True)
+    event_image_url = models.URLField(blank=True, null=True)
 
     guests = models.CharField(max_length=255, blank=True, null=True)
     more_details = models.JSONField(blank=True, null=True)
@@ -165,25 +176,25 @@ class Event(models.Model):
 
 class Promo(models.Model):
     PROMO_TYPE = (
-            ('Ar', 'Art'),
-            ('Fo', 'Food'),
-            ('Ev', 'Event'),
-            ('Re', 'Retail'),
-            ('Sv', 'Service'),
-            ('Ma', 'Mutual Aid'),
-            ('Ca', 'Classified'),
-            ('Jo', 'Job Opening'),
-            ('Ja', 'Journal Article'),
-            ('Sp', 'Startup Pitch'),
-            ('An', 'Academia Nut'),
-            ('Su', 'Survey Question')
+            ('Ar', '🎨'),
+            ('Fo', '🥙'),
+            ('Ev', '🎟️'),
+            ('Re', '🛍️'),
+            ('Sv', '☎️'),
+            ('Ma', '🪢'),
+            ('Ca', '📌'),
+            ('Jo', '🪤'),
+            ('Ja', '✒️'),
+            ('Sp', '💡'),
+            ('An', '🩺'),
+            ('Su', '🧩'),
         )
 
     title = models.CharField(max_length=63)
     organization = models.ForeignKey(Organization, on_delete=models.CASCADE)
     calendar = models.ManyToManyField(Calendar, blank=True, null=True)
-    promo_type = models.CharField(max_length=15, choices=PROMO_TYPE, default='0')
-    overlay_image = models.ImageField(upload_to="overlays", blank=True)
+    promo_type = models.CharField(max_length=15, choices=PROMO_TYPE, default='Ar')
+    promo_image = models.ImageField(upload_to="promo", blank=True)
     short_text = models.CharField(max_length=255,blank=True, null=True)
     long_text = models.TextField(blank=True, null=True)
     target_link = models.URLField(blank=True, null=True)
@@ -229,4 +240,4 @@ class Promo(models.Model):
 #     ))
 
 #     def __str__(self):
-#         return f"{self.user.username}: {self.scope}"
+#         return f"{self.user.username}: {self.scope}"