Commit e1ae1dd0 authored by LE GAC Renaud's avatar LE GAC Renaud
Browse files

Polish the trainee interface.

parent f72131fe
......@@ -33,6 +33,7 @@
'Definition': 'Définition',
'Demanded': 'Demandé',
'Domain': 'Domaine',
'Domaine': 'Domaine',
'Duration': 'Durée',
'End': 'Fin',
'end': 'fin',
......
......@@ -113,7 +113,7 @@ db.define_table("history",
Field("percentage", "integer", default=None),
Field("stage_title", "text", label=T('Title')),
Field("stage_university", "text", label=T('University')),
Field("stage_category", "string", default=undef, label=T("Type")),
Field("stage_category", "string", default=undef, label=T("Domain")),
Field("id_organizations", db.organizations, default=undef_id, label='Organization'),
Field("id_organization_levels", db.organization_levels, default=undef_id, label='Level'),
Field("responsibility", "text"),
......
......@@ -139,8 +139,12 @@ virtdb.define_table('trainee_selector',
Field('year', 'integer', default=year),
Field('period_start', 'date'),
Field('period_end', 'date'),
Field('stage_category', 'string', label=T("Domain")),
Field('format', 'string', default='html'))
virtdb.trainee_selector.stage_category.requires = \
db.history.stage_category.requires
virtdb.trainee_selector.format.requires = IS_IN_SET(FORMATS)
#
......@@ -155,7 +159,7 @@ virtdb.define_table('trainee_wizard',
Field("stage_level", "string", label=T("Level")),
Field("stage_title", "text", label=T('Title')),
Field("stage_university", "text", label=T('University')),
Field("stage_category", "string", default='PHY', label=T("Category")),
Field("stage_category", "string", default='PHY', label=T("Domain")),
Field("id_teams", db.teams, default=id_lhcb, label='Team'),
Field("id_projects", db.projects, default=undef_id, label='Project'))
......
......@@ -12,6 +12,7 @@
# regular columns to be displayed in the view
columns = ['people.last_name',
'people_categories.code',
'history.stage_category',
'history.start_date',
'history.end_date']
......
Markdown is supported
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