Skip to content
Snippets Groups Projects
Commit e76c0d06 authored by Branson Craig Stephens's avatar Branson Craig Stephens
Browse files

Finished removing AnalysisType from userprofile app.

parent 4d44b238
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
userprofile/admin.py
+ 1
− 5
View file @ e76c0d06
from models import AnalysisType, Contact, Trigger
from models import Contact, Trigger
from django.contrib import admin
class AnalysisTypeManager(admin.ModelAdmin):
list_display = [ 'display' ]
class ContactManager(admin.ModelAdmin):
pass
# list_display = [ 'user', 'desc' ]
......@@ -15,7 +12,6 @@ class TriggerManager(admin.ModelAdmin):
# exclude = [ 'labels' ]
# list_display = [ 'user', ]
admin.site.register(AnalysisType, AnalysisTypeManager)
admin.site.register(Contact, ContactManager)
admin.site.register(Trigger, TriggerManager)
userprofile/migrations/0006_auto__add_m2m_pipelines.py 0 → 100644
+ 100
− 0
View file @ e76c0d06
# -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
class Migration(SchemaMigration):
def forwards(self, orm):
# Adding M2M table for field pipelines on 'Trigger'
m2m_table_name = db.shorten_name(u'userprofile_trigger_pipelines')
db.create_table(m2m_table_name, (
('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
('trigger', models.ForeignKey(orm[u'userprofile.trigger'], null=False)),
('pipeline', models.ForeignKey(orm[u'gracedb.pipeline'], null=False))
))
db.create_unique(m2m_table_name, ['trigger_id', 'pipeline_id'])
def backwards(self, orm):
# Removing M2M table for field pipelines on 'Trigger'
db.delete_table(db.shorten_name(u'userprofile_trigger_pipelines'))
models = {
u'auth.group': {
'Meta': {'object_name': 'Group'},
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
},
u'auth.permission': {
'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
},
u'auth.user': {
'Meta': {'object_name': 'User'},
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
},
u'contenttypes.contenttype': {
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
},
u'gracedb.label': {
'Meta': {'object_name': 'Label'},
'defaultColor': ('django.db.models.fields.CharField', [], {'default': "'black'", 'max_length': '20'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'})
},
u'gracedb.pipeline': {
'Meta': {'object_name': 'Pipeline'},
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
},
u'userprofile.analysistype': {
'Meta': {'object_name': 'AnalysisType'},
'code': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
'display': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
},
u'userprofile.contact': {
'Meta': {'object_name': 'Contact'},
'desc': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
},
u'userprofile.trigger': {
'Meta': {'object_name': 'Trigger'},
'atypes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['userprofile.AnalysisType']", 'symmetrical': 'False', 'blank': 'True'}),
'contacts': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['userprofile.Contact']", 'symmetrical': 'False', 'blank': 'True'}),
'farThresh': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'labels': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['gracedb.Label']", 'symmetrical': 'False', 'blank': 'True'}),
'pipelines': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['gracedb.Pipeline']", 'symmetrical': 'False', 'blank': 'True'}),
'triggerType': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
}
}
complete_apps = ['userprofile']
\ No newline at end of file
userprofile/migrations/0007_populate_pipelines_on_triggers.py 0 → 100644
+ 122
− 0
View file @ e76c0d06
# -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import DataMigration
from django.db import models
ANALYSIS_TYPE_TO_PIPELINE = {
'RD' : 'Ringdown',
'OM' : 'Omega',
'Q' : 'Q',
'X' : 'X',
'MBTA' : 'MBTAOnline',
'HWINJ' : 'HardwareInjection',
}
class Migration(DataMigration):
def forwards(self, orm):
# fetch some pipelines
gstlal = orm['gracedb.Pipeline'].objects.get(name='gstlal')
Fermi = orm['gracedb.Pipeline'].objects.get(name='Fermi')
Swift = orm['gracedb.Pipeline'].objects.get(name='Swift')
CWB = orm['gracedb.Pipeline'].objects.get(name='CWB')
CWB2G = orm['gracedb.Pipeline'].objects.get(name='CWB2G')
for trigger in orm.Trigger.objects.all():
for atype in trigger.atypes.all():
if atype.code in ['LM','HM']:
trigger.pipelines.add(gstlal)
elif atype.code=='GRB':
trigger.pipelines.add(Fermi)
trigger.pipelines.add(Swift)
elif atype.code=='CWB':
trigger.pipelines.add(CWB)
trigger.pipelines.add(CWB2G)
elif atype.code in ANALYSIS_TYPE_TO_PIPELINE.keys():
p = orm['gracedb.Pipeline'].objects.get(name=ANALYSIS_TYPE_TO_PIPELINE[atype.code])
trigger.pipelines.add(p)
else:
pass
def backwards(self, orm):
for trigger in orm.Trigger.objects.all():
trigger.pipelines.clear()
models = {
u'auth.group': {
'Meta': {'object_name': 'Group'},
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
},
u'auth.permission': {
'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
},
u'auth.user': {
'Meta': {'object_name': 'User'},
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
},
u'contenttypes.contenttype': {
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
},
u'gracedb.label': {
'Meta': {'object_name': 'Label'},
'defaultColor': ('django.db.models.fields.CharField', [], {'default': "'black'", 'max_length': '20'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'})
},
u'gracedb.pipeline': {
'Meta': {'object_name': 'Pipeline'},
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
},
u'userprofile.analysistype': {
'Meta': {'object_name': 'AnalysisType'},
'code': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
'display': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
},
u'userprofile.contact': {
'Meta': {'object_name': 'Contact'},
'desc': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
},
u'userprofile.trigger': {
'Meta': {'object_name': 'Trigger'},
'atypes': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['userprofile.AnalysisType']", 'symmetrical': 'False', 'blank': 'True'}),
'contacts': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['userprofile.Contact']", 'symmetrical': 'False', 'blank': 'True'}),
'farThresh': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'labels': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['gracedb.Label']", 'symmetrical': 'False', 'blank': 'True'}),
'pipelines': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['gracedb.Pipeline']", 'symmetrical': 'False', 'blank': 'True'}),
'triggerType': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
}
}
complete_apps = ['userprofile']
symmetrical = True
userprofile/migrations/0008_auto__del_analysistype.py 0 → 100644
+ 104
− 0
View file @ e76c0d06
# -*- coding: utf-8 -*-
from south.utils import datetime_utils as datetime
from south.db import db
from south.v2 import SchemaMigration
from django.db import models
class Migration(SchemaMigration):
def forwards(self, orm):
# Deleting model 'AnalysisType'
db.delete_table(u'userprofile_analysistype')
# Removing M2M table for field atypes on 'Trigger'
db.delete_table(db.shorten_name(u'userprofile_trigger_atypes'))
def backwards(self, orm):
# Adding model 'AnalysisType'
db.create_table(u'userprofile_analysistype', (
('code', self.gf('django.db.models.fields.CharField')(max_length=20, unique=True)),
('display', self.gf('django.db.models.fields.CharField')(max_length=20, unique=True)),
(u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
))
db.send_create_signal(u'userprofile', ['AnalysisType'])
# Adding M2M table for field atypes on 'Trigger'
m2m_table_name = db.shorten_name(u'userprofile_trigger_atypes')
db.create_table(m2m_table_name, (
('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
('trigger', models.ForeignKey(orm[u'userprofile.trigger'], null=False)),
('analysistype', models.ForeignKey(orm[u'userprofile.analysistype'], null=False))
))
db.create_unique(m2m_table_name, ['trigger_id', 'analysistype_id'])
models = {
u'auth.group': {
'Meta': {'object_name': 'Group'},
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
},
u'auth.permission': {
'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
},
u'auth.user': {
'Meta': {'object_name': 'User'},
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
},
u'contenttypes.contenttype': {
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
},
u'gracedb.label': {
'Meta': {'object_name': 'Label'},
'defaultColor': ('django.db.models.fields.CharField', [], {'default': "'black'", 'max_length': '20'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '20'})
},
u'gracedb.pipeline': {
'Meta': {'object_name': 'Pipeline'},
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
},
u'userprofile.contact': {
'Meta': {'object_name': 'Contact'},
'desc': ('django.db.models.fields.CharField', [], {'max_length': '20'}),
'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
},
u'userprofile.trigger': {
'Meta': {'object_name': 'Trigger'},
'contacts': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['userprofile.Contact']", 'symmetrical': 'False', 'blank': 'True'}),
'farThresh': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'labels': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['gracedb.Label']", 'symmetrical': 'False', 'blank': 'True'}),
'pipelines': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['gracedb.Pipeline']", 'symmetrical': 'False', 'blank': 'True'}),
'triggerType': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
}
}
complete_apps = ['userprofile']
\ No newline at end of file
userprofile/models.py
+ 4
− 23
View file @ e76c0d06
from django.db import models
from gracedb.models import Label, Event
from gracedb.models import Label, Pipeline
from django.contrib.auth.models import User
......@@ -13,26 +13,6 @@ from django.contrib.auth.models import User
# onTypeChange = models.CharField(max_length=20, choices=TYPES, blank=True)
# email = models.EmailField()
class AnalysisType(models.Model):
# XXX Event.analysisType should probably point to this.
# The choice list thing is obnoxious for notifications to track
code = models.CharField(max_length=20, unique=True)
display = models.CharField(max_length=20, unique=True)
def __unicode__(self):
return self.display
def populateAnalysisType():
lastError = None
for code, display in Event.ANALYSIS_TYPE_CHOICES:
try:
atype = AnalysisType(code=code, display=display)
atype.save()
except Exception, e:
lastError = e
if lastError is not None:
raise lastError
class Contact(models.Model):
user = models.ForeignKey(User, null=False)
#new_user = models.ForeignKey(DjangoUser, null=True)
......@@ -49,7 +29,8 @@ class Trigger(models.Model):
#new_user = models.ForeignKey(DjangoUser, null=True)
triggerType = models.CharField(max_length=20, choices=TYPES, blank=True)
labels = models.ManyToManyField(Label, blank=True)
atypes = models.ManyToManyField(AnalysisType, blank=True, verbose_name="Analysis Types")
#atypes = models.ManyToManyField(AnalysisType, blank=True, verbose_name="Analysis Types")
pipelines = models.ManyToManyField(Pipeline, blank=True)
contacts = models.ManyToManyField(Contact, blank=True)
farThresh = models.FloatField(blank=True, null=True)
......@@ -65,7 +46,7 @@ class Trigger(models.Model):
if self.farThresh:
thresh = " & (far < %s)" % self.farThresh
return ("(%s) & (%s)%s -> %s") % (
"|".join([a.display for a in self.atypes.all()]) or "any type",
"|".join([a.name for a in self.pipelines.all()]) or "any pipeline",
"|".join([a.name for a in self.labels.all()]) or "creating",
thresh,
",".join([x.desc for x in self.contacts.all()])
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment