Update models and automated tasks for collecting data

news/admin.py

@@ -12,15 +12,28 @@ def wrapper(klass):
 @admin.register(models.location)
 class LocationAdmin(admin.ModelAdmin):
     list_display = ('city','state','keywords')
+    exclude = ('position',)
 
 class URLInline(admin.TabularInline):
     model = models.url
     exclude = ()
 
-@admin.register(models.tweet)
-class TweetAdmin(admin.ModelAdmin):
-    list_displat = ('text','status','source','location','ignore')
-    list_filter = ('ignore',)
+@admin.register(models.advisory_feed)
+class AdvisoryFeedAdmin(admin.ModelAdmin):
+    list_display = ('source','feed',)
+
+@admin.register(models.advisory_keyword)
+class AdvisoryKeywordAdmin(admin.ModelAdmin):
+    list_display = ('source','keyword',)
+
+@admin.register(models.alert)
+class AlertAdmin(admin.ModelAdmin):
+    list_display = ('sourceId','text','status','source','location','ignore')
+    list_filter = ('ignore','source')
     inlines = [
     	URLInline,
     ]
+
+@admin.register(models.utility)
+class UtilityAdmin(admin.ModelAdmin):
+    list_display = ('name','has_contaminats','violation')

news/choice.py

@@ -1,4 +1,11 @@
 
+SOURCE = (
+    ('goog','Google News Feed'),
+    ('twitter','Twitter'),
+    ('',''),
+)
+
+
 WATER_STATUS = (
     ('info','Informational'),
     ('boil','Boil Water'),

news/fixtures/advisory_feeds.json

@@ -0,0 +1,10 @@
+[
+{
+    "model": "news.advisory_feed",
+    "pk": 1,
+    "fields": {
+        "source": "goog",
+        "feed": "https://www.google.com/alerts/feeds/08966076892725477175/13883181635165243708"
+    }
+}
+]

news/fixtures/advisory_keywords.json

@@ -0,0 +1,18 @@
+[
+{
+    "model": "news.advisory_keyword",
+    "pk": 2,
+    "fields": {
+        "source": "twitter",
+        "keyword": "water advisory"
+    }
+},
+{
+    "model": "news.advisory_keyword",
+    "pk": 3,
+    "fields": {
+        "source": "twitter",
+        "keyword": "drink advisory"
+    }
+}
+]