Commit 7ee54089 authored by LE GAC Renaud's avatar LE GAC Renaud
Browse files

Polish the history form.

parent e20b406d
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
'Code': 'Code', 'Code': 'Code',
'Collections': 'Collections', 'Collections': 'Collections',
'contains': 'contiens', 'contains': 'contiens',
'Contract': 'Contrat',
'Controller': 'Controller', 'Controller': 'Controller',
'Cost': 'Coût', 'Cost': 'Coût',
'Coverage': 'Coverage', 'Coverage': 'Coverage',
...@@ -32,8 +33,8 @@ ...@@ -32,8 +33,8 @@
'End Date': 'Date de fin', 'End Date': 'Date de fin',
'enter a number between %(min)g and %(max)g': 'enter a number between %(min)g and %(max)g', 'enter a number between %(min)g and %(max)g': 'enter a number between %(min)g and %(max)g',
'enter an integer between %(min)g and %(max)g': 'enter an integer between %(min)g and %(max)g', 'enter an integer between %(min)g and %(max)g': 'enter an integer between %(min)g and %(max)g',
'Event': 'Event', 'Event': 'Evènement',
'events': 'events', 'events': 'évènement',
'Executed': 'Executé', 'Executed': 'Executé',
'Filter agencies': 'Filtrer les agences', 'Filter agencies': 'Filtrer les agences',
'Filter budgets': 'Filtrer les budgets', 'Filter budgets': 'Filtrer les budgets',
...@@ -50,6 +51,7 @@ ...@@ -50,6 +51,7 @@
'First Name': 'Prénom', 'First Name': 'Prénom',
'Format': 'Format', 'Format': 'Format',
'Forms': 'Formulaire', 'Forms': 'Formulaire',
'General': 'Général',
'Grade': 'Grade', 'Grade': 'Grade',
'greater or equal to': 'plus grand ou égual à', 'greater or equal to': 'plus grand ou égual à',
'hardware': 'matériel', 'hardware': 'matériel',
...@@ -104,6 +106,7 @@ ...@@ -104,6 +106,7 @@
'Select': 'Selectionnez', 'Select': 'Selectionnez',
'Select a teams and/or a project !!!': 'Select a teams and/or a project !!!', 'Select a teams and/or a project !!!': 'Select a teams and/or a project !!!',
'select...': 'selectionner...', 'select...': 'selectionner...',
'Stage': 'Stage',
'Stage Title': 'Titre du stage', 'Stage Title': 'Titre du stage',
'Stage University': 'Université', 'Stage University': 'Université',
'Start': 'Start', 'Start': 'Start',
...@@ -114,8 +117,12 @@ ...@@ -114,8 +117,12 @@
'Team': 'Équipe', 'Team': 'Équipe',
'teams': 'équipes', 'teams': 'équipes',
'Time': 'Temps', 'Time': 'Temps',
'Title': 'Titre',
'Titre': 'Titre',
'Tools': 'Outils', 'Tools': 'Outils',
'undefined': 'indéfini', 'undefined': 'indéfini',
'University': 'Université',
'Université': 'Université',
'unknown': 'unknown', 'unknown': 'unknown',
'Usual': 'Habituel', 'Usual': 'Habituel',
'versions': 'versions', 'versions': 'versions',
......
...@@ -172,8 +172,8 @@ db.define_table("history", ...@@ -172,8 +172,8 @@ db.define_table("history",
Field("start_date", "date", default=today, notnull=True), Field("start_date", "date", default=today, notnull=True),
Field("end_date", "date"), Field("end_date", "date"),
Field("percentage", "integer", default=100), Field("percentage", "integer", default=100),
Field("stage_title", "text"), Field("stage_title", "text", label=T('Title')),
Field("stage_university", "text"), Field("stage_university", "text", label=T('University')),
Field("note", "text"), Field("note", "text"),
migrate="history.table") migrate="history.table")
......
...@@ -39,6 +39,8 @@ fieldsModifier.merge_fields('start_date', 'end_date', fieldLabel=T('Period')) ...@@ -39,6 +39,8 @@ fieldsModifier.merge_fields('start_date', 'end_date', fieldLabel=T('Period'))
# select a person by typing first letters of his name in the combobox # select a person by typing first letters of his name in the combobox
fieldsModifier.configure_field('id_people', editable='false', mode='local') fieldsModifier.configure_field('id_people', editable='false', mode='local')
fieldsModifier.configure_field('note', height=150)
# #
# people # people
# #
......
...@@ -5,4 +5,44 @@ ...@@ -5,4 +5,44 @@
# #
# plugins for all forms # plugins for all forms
# #
dbui.configure_forms(db, plugins=['pFormToolTip']) dbui.configure_forms(db, plugins=['pFormToolTip'])
\ No newline at end of file
#
# History
#
formModifier = dbui.FormModifier('history')
formModifier.merge_fields('id_people',
'id_teams',
'id_projects',
'id_categories',
'id_events',
'start_date',
title=T('General'),
flex=1)
formModifier.merge_fields('id_agencies',
'percentage',
'cdd_flag',
dbui.Spacer(height=75),
title=T('Contract'),
flex=1)
formModifier.merge_fields('stage_title',
'stage_university',
dbui.Spacer(height=25),
title=T('Stage'),
flex=1)
formModifier.merge_fields('note',
title=T('Note'),
flex=1)
formModifier.set_mapper(dbui.map_tabpanel)
formModifier.configure(buttonAlign='right',
labelWidth=80,
labelAlign='right',
width=350,
height=270,
defaults={'height': 200})
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