Skip to content

Commit b09a27b

Browse files
emiliosanchezemiliosanchez
committed
Add enter date and estimated date in object/state relation. Fixes ietf-tools#571
- Legacy-Id: 2751
1 parent 6c2621c commit b09a27b

2 files changed

Lines changed: 146 additions & 4 deletions

File tree

‎ietf/ietfworkflows/migrations/0004_add_object_state_dates.py‎

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
2+
from south.db import db
3+
from django.db import models
4+
from ietf.ietfworkflows.models import *
5+
6+
class Migration:
7+
8+
def forwards(self, orm):
9+
10+
# Adding model 'StateObjectRelationMetadata'
11+
db.create_table('ietfworkflows_stateobjectrelationmetadata', (
12+
('id', orm['ietfworkflows.stateobjectrelationmetadata:id']),
13+
('relation', orm['ietfworkflows.stateobjectrelationmetadata:relation']),
14+
('from_date', orm['ietfworkflows.stateobjectrelationmetadata:from_date']),
15+
('estimated_date', orm['ietfworkflows.stateobjectrelationmetadata:estimated_date']),
16+
))
17+
db.send_create_signal('ietfworkflows', ['StateObjectRelationMetadata'])
18+
19+
20+
21+
def backwards(self, orm):
22+
23+
# Deleting model 'StateObjectRelationMetadata'
24+
db.delete_table('ietfworkflows_stateobjectrelationmetadata')
25+
26+
27+
28+
models = {
29+
'contenttypes.contenttype': {
30+
'Meta': {'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"},
31+
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
32+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
33+
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
34+
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
35+
},
36+
'idtracker.personororginfo': {
37+
'Meta': {'db_table': "'person_or_org_info'"},
38+
'address_type': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}),
39+
'created_by': ('django.db.models.fields.CharField', [], {'max_length': '8', 'null': 'True', 'blank': 'True'}),
40+
'date_created': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
41+
'date_modified': ('django.db.models.fields.DateField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}),
42+
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
43+
'first_name_key': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
44+
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
45+
'last_name_key': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
46+
'middle_initial': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}),
47+
'middle_initial_key': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}),
48+
'modified_by': ('django.db.models.fields.CharField', [], {'max_length': '8', 'null': 'True', 'blank': 'True'}),
49+
'name_prefix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
50+
'name_suffix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
51+
'person_or_org_tag': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
52+
'record_type': ('django.db.models.fields.CharField', [], {'max_length': '8', 'null': 'True', 'blank': 'True'})
53+
},
54+
'ietfworkflows.annotationtag': {
55+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
56+
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
57+
'permission': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['permissions.Permission']", 'null': 'True', 'blank': 'True'}),
58+
'workflow': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'annotation_tags'", 'to': "orm['workflows.Workflow']"})
59+
},
60+
'ietfworkflows.annotationtagobjectrelation': {
61+
'annotation_tag': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ietfworkflows.AnnotationTag']"}),
62+
'content_id': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
63+
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'annotation_tags'", 'null': 'True', 'to': "orm['contenttypes.ContentType']"}),
64+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
65+
},
66+
'ietfworkflows.objectannotationtaghistoryentry': {
67+
'change_date': ('django.db.models.fields.DateTimeField', [], {}),
68+
'comment': ('django.db.models.fields.TextField', [], {}),
69+
'content_id': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
70+
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'annotation_tags_history'", 'null': 'True', 'to': "orm['contenttypes.ContentType']"}),
71+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
72+
'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['idtracker.PersonOrOrgInfo']"}),
73+
'setted': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
74+
'unsetted': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'})
75+
},
76+
'ietfworkflows.objectworkflowhistoryentry': {
77+
'comment': ('django.db.models.fields.TextField', [], {}),
78+
'content_id': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
79+
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'workflow_history'", 'null': 'True', 'to': "orm['contenttypes.ContentType']"}),
80+
'from_state': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
81+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
82+
'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['idtracker.PersonOrOrgInfo']"}),
83+
'to_state': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
84+
'transition_date': ('django.db.models.fields.DateTimeField', [], {})
85+
},
86+
'ietfworkflows.stateobjectrelationmetadata': {
87+
'estimated_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
88+
'from_date': ('django.db.models.fields.DateTimeField', [], {}),
89+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
90+
'relation': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['workflows.StateObjectRelation']"})
91+
},
92+
'ietfworkflows.wgworkflow': {
93+
'selected_states': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['workflows.State']", 'symmetrical': 'False'}),
94+
'selected_tags': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ietfworkflows.AnnotationTag']", 'symmetrical': 'False'}),
95+
'workflow_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['workflows.Workflow']", 'unique': 'True', 'primary_key': 'True'})
96+
},
97+
'permissions.permission': {
98+
'codename': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
99+
'content_types': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['contenttypes.ContentType']", 'null': 'True', 'blank': 'True'}),
100+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
101+
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'})
102+
},
103+
'workflows.state': {
104+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
105+
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
106+
'transitions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['workflows.Transition']", 'null': 'True', 'blank': 'True'}),
107+
'workflow': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'states'", 'to': "orm['workflows.Workflow']"})
108+
},
109+
'workflows.stateobjectrelation': {
110+
'Meta': {'unique_together': "(('content_type', 'content_id', 'state'),)"},
111+
'content_id': ('django.db.models.fields.PositiveIntegerField', [], {'null': 'True', 'blank': 'True'}),
112+
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'state_object'", 'null': 'True', 'to': "orm['contenttypes.ContentType']"}),
113+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
114+
'state': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['workflows.State']"})
115+
},
116+
'workflows.transition': {
117+
'condition': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
118+
'destination': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'destination_state'", 'null': 'True', 'to': "orm['workflows.State']"}),
119+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
120+
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
121+
'permission': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['permissions.Permission']", 'null': 'True', 'blank': 'True'}),
122+
'workflow': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'transitions'", 'to': "orm['workflows.Workflow']"})
123+
},
124+
'workflows.workflow': {
125+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
126+
'initial_state': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'workflow_state'", 'null': 'True', 'to': "orm['workflows.State']"}),
127+
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '100'}),
128+
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['permissions.Permission']", 'symmetrical': 'False'})
129+
}
130+
}
131+
132+
complete_apps = ['ietfworkflows']

‎ietf/ietfworkflows/models.py‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
from django.db import models
44
from django.utils.translation import ugettext_lazy as _
55

6-
from ietf.idtracker.models import PersonOrOrgInfo
7-
from workflows.models import Workflow, State
6+
from ietf.idtracker.models import PersonOrOrgInfo, InternetDraft
7+
from workflows.models import Workflow, State, StateObjectRelation
88
from permissions.models import Permission
99

1010

@@ -49,6 +49,16 @@ class ObjectAnnotationTagHistoryEntry(models.Model):
4949
person = models.ForeignKey(PersonOrOrgInfo)
5050

5151

52+
class StateObjectRelationMetadata(models.Model):
53+
relation = models.ForeignKey(StateObjectRelation)
54+
from_date = models.DateTimeField(_('Initial date'))
55+
estimated_date = models.DateTimeField(_('Estimated date'), blank=True, null=True)
56+
57+
5258
class WGWorkflow(Workflow):
53-
selected_states = models.ManyToManyField(State)
54-
selected_tags = models.ManyToManyField(AnnotationTag)
59+
selected_states = models.ManyToManyField(State, blank=True, null=True)
60+
selected_tags = models.ManyToManyField(AnnotationTag, blank=True, null=True)
61+
62+
class Meta:
63+
verbose_name = 'IETF Workflow'
64+
verbose_name_plural = 'IETF Workflows'

0 commit comments

Comments
 (0)