From: Guillaume Pellerin Date: Tue, 22 Apr 2014 11:10:08 +0000 (+0200) Subject: update result link to parameters, add model diagram X-Git-Tag: 0.5.5~1^2~48 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bd514eb7ed297a25cc39eeeb54954db662819341;p=timeside.git update result link to parameters, add model diagram --- diff --git a/tests/server/diagram/timeside.dot b/tests/server/diagram/timeside.dot new file mode 100644 index 0000000..5ec8a86 --- /dev/null +++ b/tests/server/diagram/timeside.dot @@ -0,0 +1,541 @@ +digraph model_graph { + + fontname = "Helvetica" + fontsize = 8 + splines = true + + node [ + fontname = "Helvetica" + fontsize = 8 + shape = "plaintext" + ] + + edge [ + fontname = "Helvetica" + fontsize = 8 + ] + + + + timeside_models_BaseResource [label=< + + + + + + + + + +
+ + BaseResource +
+ date_added + + DateTimeField +
+ date_modified + + DateTimeField +
+ uuid + + CharField +
+ >] + + timeside_models_DocBaseResource [label=< + + + + + + + + + + + + + +
+ + DocBaseResource
<BaseResource> +
+ date_added + + DateTimeField +
+ date_modified + + DateTimeField +
+ description + + TextField +
+ title + + CharField +
+ uuid + + CharField +
+ >] + + timeside_models_Selection [label=< + + + + + + + + + + + + + + + + + +
+ + Selection
<DocBaseResource> +
+ id + + AutoField +
+ author + + ForeignKey (id) +
+ date_added + + DateTimeField +
+ date_modified + + DateTimeField +
+ description + + TextField +
+ title + + CharField +
+ uuid + + CharField +
+ >] + + timeside_models_Item [label=< + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + Item
<DocBaseResource> +
+ id + + AutoField +
+ author + + ForeignKey (id) +
+ date_added + + DateTimeField +
+ date_modified + + DateTimeField +
+ description + + TextField +
+ file + + FileField +
+ hdf5 + + FileField +
+ lock + + BooleanField +
+ mime_type + + CharField +
+ sha1 + + CharField +
+ title + + CharField +
+ url + + URLField +
+ uuid + + CharField +
+ >] + + timeside_models_Experience [label=< + + + + + + + + + + + + + + + + + + + +
+ + Experience
<DocBaseResource> +
+ id + + AutoField +
+ author + + ForeignKey (id) +
+ date_added + + DateTimeField +
+ date_modified + + DateTimeField +
+ description + + TextField +
+ is_preset + + BooleanField +
+ title + + CharField +
+ uuid + + CharField +
+ >] + + timeside_models_Processor [label=< + + + + + + + + + +
+ + Processor +
+ id + + AutoField +
+ pid + + CharField +
+ version + + CharField +
+ >] + + timeside_models_Result [label=< + + + + + + + + + + + + + + + + + + + + + + + +
+ + Result
<BaseResource> +
+ id + + AutoField +
+ item + + ForeignKey (id) +
+ parameters + + ForeignKey (id) +
+ date_added + + DateTimeField +
+ date_modified + + DateTimeField +
+ hdf5 + + FileField +
+ output + + FileField +
+ output_mime_type + + CharField +
+ status + + IntegerField +
+ uuid + + CharField +
+ >] + + timeside_models_Parameters [label=< + + + + + + + + + + + +
+ + Parameters +
+ id + + AutoField +
+ processor + + ForeignKey (id) +
+ is_preset + + BooleanField +
+ parameters + + TextField +
+ >] + + timeside_models_Task [label=< + + + + + + + + + + + + + +
+ + Task +
+ id + + AutoField +
+ author + + ForeignKey (id) +
+ experience + + ForeignKey (id) +
+ selection + + ForeignKey (id) +
+ status + + IntegerField +
+ >] + + + + + + timeside_models_DocBaseResource -> timeside_models_BaseResource + [label="abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both]; + django_contrib_auth_models_User [label=< + + +
+ User +
+ >] + timeside_models_Selection -> django_contrib_auth_models_User + [label="author (selections)"] [arrowhead=none, arrowtail=dot, dir=both]; + + timeside_models_Selection -> timeside_models_Item + [label="items (selections)"] [arrowhead=dot arrowtail=dot, dir=both]; + + timeside_models_Selection -> timeside_models_Selection + [label="selections (other_selections)"] [arrowhead=dot arrowtail=dot, dir=both]; + + timeside_models_Selection -> timeside_models_DocBaseResource + [label="abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both]; + django_contrib_auth_models_User [label=< + + +
+ User +
+ >] + timeside_models_Item -> django_contrib_auth_models_User + [label="author (items)"] [arrowhead=none, arrowtail=dot, dir=both]; + + timeside_models_Item -> timeside_models_DocBaseResource + [label="abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both]; + django_contrib_auth_models_User [label=< + + +
+ User +
+ >] + timeside_models_Experience -> django_contrib_auth_models_User + [label="author (experiences)"] [arrowhead=none, arrowtail=dot, dir=both]; + + timeside_models_Experience -> timeside_models_Processor + [label="processors (experiences)"] [arrowhead=dot arrowtail=dot, dir=both]; + + timeside_models_Experience -> timeside_models_Experience + [label="experiences (other_experiences)"] [arrowhead=dot arrowtail=dot, dir=both]; + + timeside_models_Experience -> timeside_models_DocBaseResource + [label="abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both]; + + timeside_models_Result -> timeside_models_Item + [label="item (results)"] [arrowhead=none, arrowtail=dot, dir=both]; + + timeside_models_Result -> timeside_models_Parameters + [label="parameters (results)"] [arrowhead=none, arrowtail=dot, dir=both]; + + timeside_models_Result -> timeside_models_BaseResource + [label="abstract\ninheritance"] [arrowhead=empty, arrowtail=none, dir=both]; + + timeside_models_Parameters -> timeside_models_Processor + [label="processor (parameters)"] [arrowhead=none, arrowtail=dot, dir=both]; + + timeside_models_Task -> timeside_models_Experience + [label="experience (task)"] [arrowhead=none, arrowtail=dot, dir=both]; + + timeside_models_Task -> timeside_models_Selection + [label="selection (task)"] [arrowhead=none, arrowtail=dot, dir=both]; + django_contrib_auth_models_User [label=< + + +
+ User +
+ >] + timeside_models_Task -> django_contrib_auth_models_User + [label="author (tasks)"] [arrowhead=none, arrowtail=dot, dir=both]; + +} + diff --git a/tests/server/diagram/timeside.pdf b/tests/server/diagram/timeside.pdf new file mode 100644 index 0000000..5c5ec6d Binary files /dev/null and b/tests/server/diagram/timeside.pdf differ diff --git a/timeside/migrations/0004_auto__del_field_result_processor__add_field_result_parameters.py b/timeside/migrations/0004_auto__del_field_result_processor__add_field_result_parameters.py new file mode 100644 index 0000000..6b03bcf --- /dev/null +++ b/timeside/migrations/0004_auto__del_field_result_processor__add_field_result_parameters.py @@ -0,0 +1,144 @@ +# -*- 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 field 'Result.processor' + db.delete_column('timeside_results', 'processor_id') + + # Adding field 'Result.parameters' + db.add_column('timeside_results', 'parameters', + self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='results', null=True, on_delete=models.SET_NULL, to=orm['timeside.Parameters']), + keep_default=False) + + + def backwards(self, orm): + # Adding field 'Result.processor' + db.add_column('timeside_results', 'processor', + self.gf('django.db.models.fields.related.ForeignKey')(related_name='results', null=True, to=orm['timeside.Processor'], on_delete=models.SET_NULL, blank=True), + keep_default=False) + + # Deleting field 'Result.parameters' + db.delete_column('timeside_results', 'parameters_id') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + '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', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + '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', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + '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'}), + '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'}) + }, + 'timeside.experience': { + 'Meta': {'object_name': 'Experience', 'db_table': "'timeside_experiences'"}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'experiences'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'experiences': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'other_experiences'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Experience']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_preset': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'processors': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'experiences'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Processor']"}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), + 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) + }, + 'timeside.item': { + 'Meta': {'ordering': "['title']", 'object_name': 'Item', 'db_table': "'timeside_items'"}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'items'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), + 'hdf5': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'lock': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'mime_type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}), + 'sha1': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), + 'url': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'blank': 'True'}), + 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) + }, + 'timeside.parameters': { + 'Meta': {'object_name': 'Parameters'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_preset': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'parameters': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'processor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'parameters'", 'null': 'True', 'to': "orm['timeside.Processor']"}) + }, + 'timeside.processor': { + 'Meta': {'object_name': 'Processor', 'db_table': "'timeside_processors'"}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'pid': ('django.db.models.fields.CharField', [], {'max_length': '256'}), + 'version': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}) + }, + 'timeside.result': { + 'Meta': {'object_name': 'Result', 'db_table': "'timeside_results'"}, + 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'hdf5': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'item': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'results'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['timeside.Item']"}), + 'output': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), + 'output_mime_type': ('django.db.models.fields.CharField', [], {'max_length': '256', 'blank': 'True'}), + 'parameters': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'results'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['timeside.Parameters']"}), + 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) + }, + 'timeside.selection': { + 'Meta': {'object_name': 'Selection', 'db_table': "'timeside_selections'"}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'selections'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'date_added': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'date_modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'items': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'selections'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Item']"}), + 'selections': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'other_selections'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['timeside.Selection']"}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '512', 'blank': 'True'}), + 'uuid': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '512', 'blank': 'True'}) + }, + 'timeside.task': { + 'Meta': {'object_name': 'Task', 'db_table': "'timeside_tasks'"}, + 'author': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tasks'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': "orm['auth.User']"}), + 'experience': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'task'", 'null': 'True', 'to': "orm['timeside.Experience']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'selection': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'task'", 'null': 'True', 'to': "orm['timeside.Selection']"}), + 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}) + } + } + + complete_apps = ['timeside'] \ No newline at end of file diff --git a/timeside/models.py b/timeside/models.py index b5fb624..2934f10 100644 --- a/timeside/models.py +++ b/timeside/models.py @@ -140,7 +140,7 @@ class Processor(models.Model): class Result(BaseResource): item = models.ForeignKey('Item', related_name="results", verbose_name=_('item'), blank=True, null=True, on_delete=models.SET_NULL) - processor = models.ForeignKey('Processor', related_name="results", verbose_name=_('processor'), blank=True, null=True, on_delete=models.SET_NULL) + parameters = models.ForeignKey('Parameters', related_name="results", verbose_name=_('parameters'), blank=True, null=True, on_delete=models.SET_NULL) hdf5 = models.FileField(_('HDF5 result file'), upload_to='results/%Y/%m/%d', blank=True, max_length=1024) output = models.FileField(_('Output file'), upload_to='results/%Y/%m/%d', blank=True, max_length=1024) output_mime_type = models.CharField(_('Output mime type'), blank=True, max_length=256)