CAMP/itf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

individual profile help texts

Browse Source
This commit is contained in:
Sanjay B 2014-09-03 20:35:11 +05:30
parent 4e4a4f32f1
commit c203db7e8a
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
itf/itfprofiles/forms.py
View File

@ -172,11 +172,11 @@ class PersonGroupForm(ItfForm):
class Meta:
model = PersonGroup
ConnectionsInline = itf_inlineformset_factory(Person, PersonPerson, fk_name='person1', form=ConnectionsForm, extra=1, title="Add / Edit Connections", help_text="select the people you are connected with and how you are related in the theatre world")
ProductionsInline = itf_inlineformset_factory(Person, PersonProduction, form=PersonProductionForm, extra=1, title="Productions you have worked in")
ConnectionsInline = itf_inlineformset_factory(Person, PersonPerson, fk_name='person1', form=ConnectionsForm, extra=1, title="Connections", help_text="Find or add people that you are connected with in the theatre world")
ProductionsInline = itf_inlineformset_factory(Person, PersonProduction, form=PersonProductionForm, extra=1, title="Productions", help_text="If you have been involved in any productions, we would like to know more")
GroupsInline = itf_inlineformset_factory(Person, PersonGroup, extra=1, form=PersonGroupForm, title="Theatre groups you are a part of or have worked with")
PersonOccupationsInline = itf_inlineformset_factory(Person, PersonOccupation, extra=1, form=PersonOccupationForm, title="Select your occupation / you can add as many as you like")
GroupsInline = itf_inlineformset_factory(Person, PersonGroup, extra=1, form=PersonGroupForm, title="Groups", help_text="Tell us about the tehatre groups you are part of and/or have worked with")
PersonOccupationsInline = itf_inlineformset_factory(Person, PersonOccupation, extra=1, form=PersonOccupationForm, title="Occupation / Position")
#Actual person form definition

38
itf/itfprofiles/models.py
View File

@ -31,13 +31,13 @@ class Person(ItfModel):
user = models.OneToOneField(User, blank=True, null=True, db_index=True)
first_name = models.CharField(max_length=255)
last_name = models.CharField(max_length=255)
email = models.EmailField(blank=True, null=True, unique=True, db_index=True)
email = models.EmailField(blank=True, null=True, unique=True, db_index=True, help_text="Your email address will be kept confidential and will not be displayed on your profile page")
tel_no = models.CharField(max_length=100, blank=True, verbose_name='Telephone number')
is_practitioner = models.BooleanField(default=False, verbose_name='Are you a theatre practitioner?')
is_freelancer = models.BooleanField(default=False, verbose_name='Are you a theatre associate?') #Change to is_associate
is_enthusiast = models.BooleanField(default=True, verbose_name='Are you a theatre enthusiast?')
is_practitioner = models.BooleanField(default=False, verbose_name='Are you a theatre practitioner?', help_text="A 'theatre practitioner' refers to anyone actively involved in the process of production, ranging from the actors, to light designers, music directors, production, backstage, and so on")
is_freelancer = models.BooleanField(default=False, verbose_name='Are you a theatre associate?', help_text="By 'theatre associate' we mean anyone who works within the field of theatre, but may not be involved in particular productions: for instance: managers of theatre institutions, scholars, journalists, teachers, curators and so on") #Change to is_associate
is_enthusiast = models.BooleanField(default=True, verbose_name='Are you a theatre enthusiast?', help_text="A theatre enthusiast is simply someone who loves theatre! Please note you can choose more than one of the above options.")
about = models.TextField(blank=True, null=True, verbose_name='About yourself')
about = models.TextField(blank=True, null=True, verbose_name='Brief bio', help_text="Tell us a little about yourself, preferably within 300 words")
dob = models.DateField(null=True, verbose_name="Date of Birth", blank=True)
#Occupation info
@ -45,7 +45,7 @@ class Person(ItfModel):
#Personal info
gender = models.CharField(max_length=255, choices=GENDER_CHOICES, blank=True)
image = models.ImageField(upload_to='images/', blank=True, null=True)
image = models.ImageField(upload_to='images/', blank=True, null=True, verbose_name="Profile Picture", help_text="Upload a picture of yourself. This will be displayed at the top of your profile page.")
# locations = models.ManyToManyField("Location", blank=True, null=True)
locations = generic.GenericRelation("Location")
#Groups and Connections
@ -54,7 +54,7 @@ class Person(ItfModel):
productions = models.ManyToManyField("Production", blank=True, null=True, through='PersonProduction')
trainings = generic.GenericRelation("Training", related_name='Trainee')
# awards = models.ManyToManyField("Award", blank=True, null=True)
languages = models.ManyToManyField("Language", blank=True, null=True) #s added
languages = models.ManyToManyField("Language", blank=True, null=True, help_text="What languages do you work in?") #s added
awards = generic.GenericRelation("Award")
buzzitems = generic.GenericRelation("BuzzItem")
resources = generic.GenericRelation("Resource")
@ -292,15 +292,15 @@ class Location(models.Model):
class PersonOccupation(models.Model):
person = models.ForeignKey(Person, db_index=True)
occupation = models.ForeignKey(Occupation)
is_main = models.BooleanField(default=False, verbose_name='Is this your main occupation?')
occupation = models.ForeignKey(Occupation, verbose_name="Occupation / Position", help_text="In what capacity are you involved with theatre?")
is_main = models.BooleanField(default=False, verbose_name='Is this your main occupation?', help_text="Check this box if this is your main line of work. To add others, click below.")
# order = models.IntegerField()
class PersonPerson(models.Model):
person1 = models.ForeignKey(Person, related_name='PersonFrom', db_index=True)
person2 = models.ForeignKey(Person, related_name='PersonTo', db_index=True, verbose_name='connection')
relation = models.ForeignKey("Relation")
person2 = models.ForeignKey(Person, related_name='PersonTo', db_index=True, verbose_name='Name')
relation = models.ForeignKey("Relation", verbose_name="How are you connected?")
disapproved = models.BooleanField(default=False)
@ -316,8 +316,8 @@ class Training(models.Model):
# title = models.CharField(max_length=255)
# desc= models.TextField(max_length=2048)
person = models.ForeignKey("Person")
area = models.CharField(max_length=255)
with_whom = models.CharField(max_length=255) # Is this a foreign key to person, or group, or just text field like now?
area = models.CharField(max_length=255, verbose_name="Area of training", help_text="What aspect of theatre were you trained in? This may refer to a degree in theatre from an institution, short-term workshops, certificate courses, and so on")
with_whom = models.CharField(max_length=255, verbose_name="With whom / where", help_text="This may refer to a person and/or an institution") # Is this a foreign key to person, or group, or just text field like now?
#trained_by=models.ManyToManyField('Person', related_name='trained')
where = models.ForeignKey("TheatreGroup")
from_when = models.DateField(blank=True, null=True)
@ -533,12 +533,12 @@ SHOWS_NO_CHOICES = (
class PersonProduction(models.Model):
person = models.ForeignKey(Person, db_index=True)
production = models.ForeignKey(Production, db_index=True)
role = models.CharField(max_length=255)
production = models.ForeignKey(Production, db_index=True, verbose_name="Name of production")
role = models.CharField(max_length=255, help_text="In what capacity were you involved in the production? For eg: a director, playwright, set designer etc. If you were an actor in the play, please also mention what character you played")
start_year = models.IntegerField(max_length=4)
years = models.IntegerField(blank=True, null=True)
no_of_shows = models.CharField(max_length=25, choices = SHOWS_NO_CHOICES)
original_cast = models.BooleanField(default=False)
years = models.IntegerField(blank=True, null=True, help_text="How many years were you involved in the production?")
no_of_shows = models.CharField(max_length=25, choices = SHOWS_NO_CHOICES, verbose_name="Number of shows")
original_cast = models.BooleanField(default=False, help_text="Check this box if you were part of the original cast of the play")
def years(self):
if self.years:
@ -549,7 +549,7 @@ class PersonProduction(models.Model):
class PersonGroup(models.Model):
person = models.ForeignKey(Person, db_index=True, help_text="Find your group members on our database; if they are not on the site, then add them by clicking on the '+' button.")
group = models.ForeignKey(TheatreGroup, db_index=True)
group = models.ForeignKey(TheatreGroup, db_index=True, help_text="if the group you are looking for is not listed on the site, click on the + button to add it on the site")
is_admin = models.BooleanField(default=False, help_text="Indicate whether this member is one of the administrators of the group.")
role = models.CharField(max_length=255, blank=True, help_text="What role does this member play in the group? For eg: secretary, director, volunteer, etc.")