Skip to content

Commit 1dbe9bf

Browse files
emiliosanchezemiliosanchez
committed
Add fields to store middle initial and name suffix of incoming authors. See ietf-tools#626
- Legacy-Id: 2902
1 parent cdeb47f commit 1dbe9bf

2 files changed

Lines changed: 177 additions & 0 deletions

File tree

‎ietf/submit/migrations/0003_add_extra_name_fields.py‎

Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
1+
2+
from south.db import db
3+
from django.db import models
4+
from ietf.submit.models import *
5+
6+
class Migration:
7+
8+
def forwards(self, orm):
9+
10+
# Adding field 'TempIdAuthors.middle_initial'
11+
db.add_column('temp_id_authors', 'middle_initial', orm['submit.tempidauthors:middle_initial'])
12+
13+
# Adding field 'TempIdAuthors.name_suffix'
14+
db.add_column('temp_id_authors', 'name_suffix', orm['submit.tempidauthors:name_suffix'])
15+
16+
17+
18+
def backwards(self, orm):
19+
20+
# Deleting field 'TempIdAuthors.middle_initial'
21+
db.delete_column('temp_id_authors', 'middle_initial')
22+
23+
# Deleting field 'TempIdAuthors.name_suffix'
24+
db.delete_column('temp_id_authors', 'name_suffix')
25+
26+
27+
28+
models = {
29+
'idtracker.acronym': {
30+
'Meta': {'db_table': "'acronym'"},
31+
'acronym': ('django.db.models.fields.CharField', [], {'max_length': '12'}),
32+
'acronym_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
33+
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
34+
'name_key': ('django.db.models.fields.CharField', [], {'max_length': '50'})
35+
},
36+
'idtracker.area': {
37+
'Meta': {'db_table': "'areas'"},
38+
'area_acronym': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['idtracker.Acronym']", 'unique': 'True', 'primary_key': 'True'}),
39+
'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
40+
'concluded_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
41+
'extra_email_addresses': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
42+
'last_modified_date': ('django.db.models.fields.DateField', [], {'auto_now': 'True', 'blank': 'True'}),
43+
'start_date': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'blank': 'True'}),
44+
'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['idtracker.AreaStatus']"})
45+
},
46+
'idtracker.areadirector': {
47+
'Meta': {'db_table': "'area_directors'"},
48+
'area': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['idtracker.Area']", 'null': 'True', 'db_column': "'area_acronym_id'"}),
49+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
50+
'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['idtracker.PersonOrOrgInfo']", 'db_column': "'person_or_org_tag'"})
51+
},
52+
'idtracker.areastatus': {
53+
'Meta': {'db_table': "'area_status'"},
54+
'status': ('django.db.models.fields.CharField', [], {'max_length': '25', 'db_column': "'status_value'"}),
55+
'status_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
56+
},
57+
'idtracker.ietfwg': {
58+
'Meta': {'db_table': "'groups_ietf'"},
59+
'area_director': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['idtracker.AreaDirector']", 'null': 'True'}),
60+
'comments': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
61+
'concluded_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
62+
'dormant_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
63+
'email_address': ('django.db.models.fields.CharField', [], {'max_length': '60', 'blank': 'True'}),
64+
'email_archive': ('django.db.models.fields.CharField', [], {'max_length': '95', 'blank': 'True'}),
65+
'email_keyword': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
66+
'email_subscribe': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
67+
'group_acronym': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['idtracker.Acronym']", 'unique': 'True', 'primary_key': 'True'}),
68+
'group_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['idtracker.WGType']"}),
69+
'last_modified_date': ('django.db.models.fields.DateField', [], {}),
70+
'meeting_scheduled': ('django.db.models.fields.CharField', [], {'max_length': '3', 'blank': 'True'}),
71+
'meeting_scheduled_old': ('django.db.models.fields.CharField', [], {'max_length': '3', 'blank': 'True'}),
72+
'proposed_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
73+
'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
74+
'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['idtracker.WGStatus']"})
75+
},
76+
'idtracker.personororginfo': {
77+
'Meta': {'db_table': "'person_or_org_info'"},
78+
'address_type': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}),
79+
'created_by': ('django.db.models.fields.CharField', [], {'max_length': '8', 'null': 'True', 'blank': 'True'}),
80+
'date_created': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}),
81+
'date_modified': ('django.db.models.fields.DateField', [], {'auto_now': 'True', 'null': 'True', 'blank': 'True'}),
82+
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
83+
'first_name_key': ('django.db.models.fields.CharField', [], {'max_length': '20', 'blank': 'True'}),
84+
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
85+
'last_name_key': ('django.db.models.fields.CharField', [], {'max_length': '50', 'blank': 'True'}),
86+
'middle_initial': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}),
87+
'middle_initial_key': ('django.db.models.fields.CharField', [], {'max_length': '4', 'null': 'True', 'blank': 'True'}),
88+
'modified_by': ('django.db.models.fields.CharField', [], {'max_length': '8', 'null': 'True', 'blank': 'True'}),
89+
'name_prefix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
90+
'name_suffix': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
91+
'person_or_org_tag': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
92+
'record_type': ('django.db.models.fields.CharField', [], {'max_length': '8', 'null': 'True', 'blank': 'True'})
93+
},
94+
'idtracker.wgstatus': {
95+
'Meta': {'db_table': "'g_status'"},
96+
'status': ('django.db.models.fields.CharField', [], {'max_length': '25', 'db_column': "'status_value'"}),
97+
'status_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
98+
},
99+
'idtracker.wgtype': {
100+
'Meta': {'db_table': "'g_type'"},
101+
'group_type_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
102+
'type': ('django.db.models.fields.CharField', [], {'max_length': '25', 'db_column': "'group_type'"})
103+
},
104+
'submit.idapproveddetail': {
105+
'Meta': {'db_table': "'id_approved_detail'"},
106+
'approved_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
107+
'approved_person_tag': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
108+
'approved_status': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
109+
'filename': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
110+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
111+
'recorded_by': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
112+
},
113+
'submit.idsubmissiondetail': {
114+
'Meta': {'db_table': "'id_submission_detail'"},
115+
'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
116+
'auth_key': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
117+
'comment_to_sec': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
118+
'creation_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
119+
'error_message': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
120+
'file_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}),
121+
'filename': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
122+
'filesize': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
123+
'first_two_pages': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
124+
'group_acronym': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['idtracker.IETFWG']", 'null': 'True', 'blank': 'True'}),
125+
'id_document_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
126+
'idnits_failed': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
127+
'idnits_message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
128+
'invalid_version': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
129+
'last_updated_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
130+
'last_updated_time': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}),
131+
'man_posted_by': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
132+
'man_posted_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
133+
'remote_ip': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
134+
'revision': ('django.db.models.fields.CharField', [], {'max_length': '3', 'null': 'True', 'blank': 'True'}),
135+
'status': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['submit.IdSubmissionStatus']", 'null': 'True', 'db_column': "'status_id'", 'blank': 'True'}),
136+
'sub_email_priority': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
137+
'submission_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
138+
'submission_hash': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
139+
'submission_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
140+
'submitter_tag': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
141+
'temp_id_document_tag': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
142+
'txt_page_count': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
143+
'warning_message': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
144+
'wg_submission': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'})
145+
},
146+
'submit.idsubmissionstatus': {
147+
'Meta': {'db_table': "'id_submission_status'"},
148+
'status_id': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}),
149+
'status_value': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'})
150+
},
151+
'submit.tempidauthors': {
152+
'Meta': {'db_table': "'temp_id_authors'"},
153+
'author_order': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
154+
'email_address': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
155+
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
156+
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
157+
'id_document_tag': ('django.db.models.fields.IntegerField', [], {}),
158+
'last_modified_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
159+
'last_modified_time': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}),
160+
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}),
161+
'middle_initial': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
162+
'name_suffix': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
163+
'submission': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['submit.IdSubmissionDetail']"})
164+
}
165+
}
166+
167+
complete_apps = ['submit']

‎ietf/submit/models.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import re
2+
13
from django.conf import settings
24
from django.db import models
35
from django.utils.hashcompat import md5_constructor
@@ -84,9 +86,17 @@ class TempIdAuthors(models.Model):
8486
last_modified_time = models.CharField(blank=True, max_length=100)
8587
author_order = models.IntegerField(null=True, blank=True)
8688
submission = models.ForeignKey(IdSubmissionDetail)
89+
middle_initial = models.CharField(blank=True, max_length=255, null=True)
90+
name_suffix = models.CharField(blank=True, max_length=255, null=True)
8791

8892
class Meta:
8993
db_table = 'temp_id_authors'
9094

9195
def email(self):
9296
return ('%s %s' % (self.first_name, self.last_name), self.email_address)
97+
98+
def get_full_name(self):
99+
full_name = ('%s %s %s %s') % (self.first_name, self.middle_initial or '',
100+
self.last_name, self.name_suffix or '')
101+
full_name = re.sub(' +', ' ', full_name).strip()
102+
return full_name

0 commit comments

Comments
 (0)