Commit 68ea9c23 authored by LE GAC Renaud's avatar LE GAC Renaud
Browse files

Add the field stage_category in history.

parent 50f35ab6
......@@ -12,7 +12,6 @@
'careers': 'carrières',
'categories': 'catégories',
'Category': 'Catégorie',
'Category1': 'Category1',
'Catégorie': 'Catégorie',
'CDD': 'CDD',
'Cdd': 'Cdd',
......@@ -30,7 +29,7 @@
'Definition': 'Définition',
'Demanded': 'Demandé',
'Domain': 'Domaine',
'Duration': 'Duration',
'Duration': 'Durée',
'End': 'Fin',
'end': 'fin',
'End Date': 'Date de fin',
......@@ -60,7 +59,7 @@
'Grade': 'Grade',
'greater or equal to': 'plus grand ou égual à',
'hardware': 'matériel',
'Hardware': 'Hardware',
'Hardware': 'Matériel',
'Hardware Cost': 'Hardware Cost',
'Hardware Model': 'Hardware Model',
'HDR': 'HDR',
......@@ -94,7 +93,7 @@
'Organization': 'Organisation',
'organizations': 'organisations',
'people': 'personnel',
'People': 'People',
'People': 'Personnel',
'Percentage': 'Pourcentage',
'Period': 'Periode',
'Period End': 'Period End',
......@@ -118,6 +117,7 @@
'Select a teams and/or a project !!!': 'Select a teams and/or a project !!!',
'select...': 'selectionner...',
'Stage': 'Stage',
'Stage Category': 'Stage Category',
'Stage Title': 'Titre du stage',
'Stage University': 'Université',
'Start': 'Début',
......
......@@ -146,9 +146,10 @@ db.define_table("history",
Field("id_events", db.events, default=undef_id, label='Event'),
Field("start_date", "date", default=today, notnull=True),
Field("end_date", "date"),
Field("percentage", "integer", default=100),
Field("percentage", "integer", default=None),
Field("stage_title", "text", label=T('Title')),
Field("stage_university", "text", label=T('University')),
Field("stage_category", "string", label=T("Category")),
Field("id_organizations", db.organizations, default=undef_id, label='Organization'),
Field("id_levels", db.levels, default=undef_id, label='Level'),
Field("responsibility", "text"),
......@@ -178,5 +179,8 @@ IS_IN_DB(db, 'people.id', 'people.last_name')
db.history.id_projects.requires = \
IS_IN_DB(db, 'projects.id', 'projects.project')
db.history.stage_category.requires = \
IS_IN_SET(('PHY', 'IR'))
db.history.id_teams.requires = \
IS_IN_DB(db, 'teams.id', 'teams.team')
......@@ -46,6 +46,7 @@ formModifier.merge_fields('hardware_model',
formModifier.merge_fields('stage_title',
'stage_university',
'stage_category',
dbui.Spacer(height=25),
title=T('Stage'),
flex=1)
......
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