Commit 1f0a4cd8 authored by LE GAC Renaud's avatar LE GAC Renaud
Browse files

Polish the interface

parent 9219bcad
......@@ -29,12 +29,13 @@
'Demanded': 'Demandé',
'Domain': 'Domaine',
'Duration': 'Duration',
'End': 'End',
'End': 'Fin',
'end': '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 an integer between %(min)g and %(max)g': 'enter an integer between %(min)g and %(max)g',
'Event': 'Evènement',
'events': 'évènement',
'events': 'évènements',
'Executed': 'Executé',
'Filter agencies': 'Filtrer les agences',
'Filter budgets': 'Filtrer les budgets',
......@@ -60,6 +61,7 @@
'Hdr': 'Hdr',
'Hdr Date': 'Hdr Date',
'Hdr defense date': "Date de soutenace de l'hdr",
'Help': 'Aide',
'History': 'Historique',
'history': 'historique',
'Id': 'Id',
......@@ -84,8 +86,8 @@
'Notified': 'Notifié',
'Organization': 'Organisation',
'organizations': 'organisations',
'People': 'People',
'people': 'personnel',
'People': 'People',
'Percentage': 'Pourcentage',
'Period': 'Periode',
'Period End': 'Period End',
......@@ -109,7 +111,8 @@
'Stage': 'Stage',
'Stage Title': 'Titre du stage',
'Stage University': 'Université',
'Start': 'Start',
'Start': 'Début',
'start': 'début',
'Start Date': 'Date de début',
'startswith': 'startswith',
'Store': 'Store',
......
......@@ -24,6 +24,7 @@ fieldsModifier.configure_field('id_people', editable='false', mode='local')
# hardware selector
#
fieldsModifier = dbui.FieldsModifier('hardware_selector')
fieldsModifier.configure_field('id_people', editable='false', mode='local')
fieldsModifier.configure_field('period_start', flex=1)
fieldsModifier.configure_field('period_end', flex=1)
fieldsModifier.merge_fields('period_start', 'period_end', fieldLabel=T('Period'))
......@@ -42,16 +43,10 @@ fieldsModifier.configure_field('id_people', editable='false', mode='local')
fieldsModifier.configure_field('note', height=150)
#
# people
# history selector
#
fieldsModifier = dbui.FieldsModifier('people')
fieldsModifier.configure_field('phd_flag', flex=0.1)
fieldsModifier.configure_field('phd_date', flex=1)
fieldsModifier.merge_fields('phd_flag', 'phd_date', fieldLabel=T('Phd'))
fieldsModifier.configure_field('hdr_flag', flex=0.1)
fieldsModifier.configure_field('hdr_date', flex=1)
fieldsModifier.merge_fields('hdr_flag', 'hdr_date', fieldLabel=T('Hdr'))
fieldsModifier = dbui.FieldsModifier('history_selector')
fieldsModifier.configure_field('id_people', editable='false', mode='local')
#
# people selector
......@@ -76,6 +71,7 @@ fieldsModifier.configure_field('id_people', editable='false', mode='local')
# responsibilities selector
#
fieldsModifier = dbui.FieldsModifier('responsibilities_selector')
fieldsModifier.configure_field('id_people', editable='false', mode='local')
fieldsModifier.configure_field('period_start', flex=1)
fieldsModifier.configure_field('period_end', flex=1)
fieldsModifier.merge_fields('period_start', 'period_end', fieldLabel=T('Period'))
......@@ -40,6 +40,13 @@ gridModifier.configure_column('code', width=20)
gridModifier.configure_column('usual', width=20)
gridModifier.set_rownumbering()
#
# events
#
gridModifier = dbui.GridModifier('events')
gridModifier.configure_column('event', width=20)
gridModifier.set_rownumbering()
#
# hardware
#
......@@ -62,7 +69,10 @@ gridModifier.set_filters(plugins=['pFormToolTip'], width=300)
#
gridModifier = dbui.GridModifier('history')
gridModifier.append_plugins('pGridPaging', 'pGridExport')
gridModifier.hide_columns('id_projects', 'id_agencies')
gridModifier.hide_columns('id_projects',
'id_agencies',
'stage_title',
'stage_university')
gridModifier.set_rownumbering()
gridModifier.append_filter(('people.last_name', 'contains', T('contains')))
......@@ -74,6 +84,27 @@ gridModifier.append_filter(('end_date', '<=', T('less or equal to')))
gridModifier.set_filters(plugins=['pFormToolTip'], width=300)
#
# lines
#
gridModifier = dbui.GridModifier('lines')
gridModifier.configure_column('line', width=20)
gridModifier.set_rownumbering()
#
# levels
#
gridModifier = dbui.GridModifier('levels')
gridModifier.configure_column('level', width=20)
gridModifier.set_rownumbering()
#
# organizations
#
gridModifier = dbui.GridModifier('organizations')
gridModifier.configure_column('organization', width=20)
gridModifier.set_rownumbering()
#
# people
#
......
......@@ -65,13 +65,13 @@ reportNode.sort_children()
schemaNode = dbui.Panel(autoLoad='/'+request.application+'/default/schema')
versionNode = dbui.Panel(autoLoad='/'+request.application+'/default/versions')
toolNode = dbui.Node(T('Tools'))
toolNode.add_child(T('database schema'), schemaNode)
toolNode.add_child(T('versions'), versionNode)
toolNode.sort_children()
helpNode = dbui.Node(T('Help'))
helpNode.add_child(T('database schema'), schemaNode)
helpNode.add_child(T('versions'), versionNode)
helpNode.sort_children()
#
# The viewport with its navigation tree
#
viewportModifier = dbui.ViewportModifier()
viewportModifier.add_node(gridNode, toolNode, reportNode)
viewportModifier.add_node(helpNode, gridNode, reportNode)
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