Skip to content

GitLab

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

Migrate to Web2py 2.9.5 (define length of each string field for backward 

comaptibility + use controllers plugin_dbui/about, documentaions and
versions).
parent 389d733d
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 240 deletions
languages/fr-fr.py
View file @ b623a262
# coding: utf8
# -*- coding: utf-8 -*-
{
'%s between %s and %s': '%s du %s au %s',
'%s in %s': '%s en %s',
......@@ -81,7 +81,9 @@
'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 a number between %(min)g and %(max)g': 'Enter a number between %(min)g and %(max)g',
'enter a value': 'enter a value',
'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',
'enter date as %(format)s': 'enter date as %(format)s',
'Event': 'Evènement',
......
models/db_events.py
View file @ b623a262
......@@ -3,8 +3,8 @@
"""
db.define_table("events",
Field("event", "string", notnull=True, unique=True),
Field("category", "string", notnull=True),
Field("event", "string", length=255, notnull=True, unique=True),
Field("category", "string", length=255, notnull=True),
Field("definition", "text"),
migrate="events.table")
......
models/db_fundings.py
View file @ b623a262
......@@ -3,7 +3,7 @@
"""
db.define_table("fundings",
Field("agency", "string", notnull=True, unique=True),
Field("agency", "string", length=255, notnull=True, unique=True),
Field("definition", "text"),
migrate="fundings.table")
......
models/db_history.py
View file @ b623a262
......@@ -15,11 +15,11 @@ db.define_table("history",
Field("percentage", "integer", default=None, label='Perc.'),
Field("trainee_title", "text", label=T('Title')),
Field("trainee_university", "text", label=T('University')),
Field("trainee_category", "string", default=undef, label=T("Domain")),
Field("trainee_category", "string", length=255, default=undef, label=T("Domain")),
Field("id_organizations", "reference organizations", default=undef_id, label='Organization'),
Field("id_organization_levels", "reference organization_levels", default=undef_id, label='Level'),
Field("responsibility", "text"),
Field("hardware_model", "string", label=T("Model")),
Field("hardware_model", "string", length=255, label=T("Model")),
Field("hardware_cost", "double", label=T("Cost")),
Field("note", "text"),
migrate="history.table")
......
models/db_organization_levels.py
View file @ b623a262
......@@ -3,7 +3,7 @@
"""
db.define_table("organization_levels",
Field("level", "string", notnull=True, unique=True),
Field("level", "string", length=255, notnull=True, unique=True),
Field("definition", "text"),
migrate="organization_levels.table")
......
models/db_organizations.py
View file @ b623a262
......@@ -3,7 +3,7 @@
"""
db.define_table("organizations",
Field("organization", "string", notnull=True, unique=True),
Field("organization", "string", length=255, notnull=True, unique=True),
Field("definition", "text"),
migrate="organizations.table")
......
models/db_people.py
View file @ b623a262
......@@ -3,9 +3,9 @@
"""
db.define_table("people",
Field("first_name", "string", notnull=True),
Field("last_name", "string", notnull=True),
Field("initials", "string", notnull=True),
Field("first_name", "string", length=255, notnull=True),
Field("last_name", "string", length=255, notnull=True),
Field("initials", "string", length=255, notnull=True),
Field("birth_date", "date"),
Field("note", "text"),
migrate="people.table")
......
models/db_people_categories.py
View file @ b623a262
......@@ -3,8 +3,8 @@
"""
db.define_table("people_categories",
Field("code", "string", notnull=True, unique=True, label=T("Quality")),
Field("category", "string", notnull=True),
Field("code", "string", length=255, notnull=True, unique=True, label=T("Quality")),
Field("category", "string", length=255, notnull=True),
Field("definition", "text"),
migrate="people_categories.table")
......
models/db_projects.py
View file @ b623a262
......@@ -3,7 +3,7 @@
"""
db.define_table("projects",
Field("project", "string", notnull=True, unique=True),
Field("project", "string", length=255, notnull=True, unique=True),
migrate="projects.table")
db.projects._before_delete.append(INHIBIT_CASCADE_DELETE)
models/db_teams.py
View file @ b623a262
......@@ -3,8 +3,8 @@
"""
db.define_table("teams",
Field("team", "string", notnull=True, unique=True),
Field("domain", "string"),
Field("team", "string", length=255, notnull=True, unique=True),
Field("domain", "string", length=255),
migrate="teams.table")
db.teams._before_delete.append(INHIBIT_CASCADE_DELETE)
models/plugin_report.py
View file @ b623a262
......@@ -29,7 +29,7 @@ func_code = "def repr_xxx(value, row):\n"\
" return value\n"
db.define_table("report_functions",
Field("function", "string", default= "repr_xxx", notnull=True, unique=True),
Field("function", "string", length=255, default= "repr_xxx", notnull=True, unique=True),
Field("python_code", "text", default=func_code),
Field("tests", "text", notnull=True, default='Not yet implemented'),
migrate="report_functions.table")
......@@ -92,9 +92,9 @@ T("List of columns appearing in the total row. "
"or 'operator(tablename.fieldname)'. ")
db.define_table("report_objects",
Field("name", "string", notnull=True, unique=True, comment=tp_name),
Field("type", "string", notnull=True, default='sqltable'),
Field("tablename", "string", notnull=True, comment=tp_table),
Field("name", "string", length=255, notnull=True, unique=True, comment=tp_name),
Field("type", "string", length=255, notnull=True, default='sqltable'),
Field("tablename", "string", length=255, notnull=True, comment=tp_table),
Field("conditions", "text", comment=tp_conditions),
Field("columns", "list:string", notnull=True, comment=tp_columns),
Field("labels", "json", comment=tp_labels),
......@@ -121,7 +121,7 @@ virtualfield_code = "def xxx(row):\n"\
" return None\n"
db.define_table("report_virtualfields",
Field("field", "string", default="xxx", notnull=True, unique=True),
Field("field", "string", length=255, default="xxx", notnull=True, unique=True),
Field("python_code", "text", default=virtualfield_code),
Field("tests", "text", notnull=True, default='Not yet implemented'),
migrate="report_virtualfields.table")
......
static/CHANGELOG
View file @ b623a262
--------------------------------- CHANGE LOG ----------------------------------
HEAD
- Migrate to plugin_dbui 0.6.1.0 and Web2py 2.9.5.
- Define the length of each string field to garanty Web2py compatibility.
- Use the controllers plugin_dbui/about, documentations and versions.
- Migrate to plugin_dbui 0.6.0.14 and ExtJS 4.2.1
05d5393 (Mar 14)
- Migrate to plugin_dbui 0.6.0.18 and ExtJS 4.2.1
- This version is not backward compatible
0.3.10-14-gf93ae68 (Sept 13)
0.3.1-14-gf93ae68 (Sept 13)
- Migrate to plugin_dbui 0.4.15.2 and Ext JS 3.4.1.1
- Incubator for the generic plugin report.
- Report are customized by users via the plugin report.
......
views/default/documentations.html deleted 100644 → 0
View file @ 389d733d
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
.my-h2,
.my-h3,
.my-li,
.my-p,
.my-ul {font-family: Liberation Sherif, Sherif;
font-size: 11px;
list-style-type: disc;}
.my-h2,
.my-h3 {font-family: Liberation Sans, Sans;
font-size: 12px;
margin-bottom: 2ex;
margin-left: 3%;
margin-top: 3ex;}
.my-li {margin-left: 9%;
margin-right: 9%;
text-align: justify;}
.my-p {margin-left: 3%;
margin-right: 10%;
text-align: justify;}
.my-small-cap {font-variant: small-caps;}
</style>
</head>
<body>
<h2 class="my-h2 my-small-cap">Documentations</h2>
<table border="0" style="margin-left: 6%">
<tr>
<td class="my-td">track lhcbfrance</td>
<td class="my-td">
<a href="{{=png_db}}" target="_blank">
Schéma de la base de données
</a>
</td>
<td class="my-td">
<a href="{{=epydoc_application}}" target="_blank">
python API
</a>
</td>
<td class="my-td"></td>
</tr>
<tr>
<td class="my-td">
<a href="https://marprod.in2p3.fr/plugin_dbui_book" target="_blank">
plugin dbui
</a>
</td>
<td class="my-td">
<a href="https://marprod.in2p3.fr/plugin_dbui_book/default/chapter/29" target="_blank">
documentation développeurs
</a>
</td>
<td class="my-td">
<a href="{{=epydoc_dbui}}" target="_blank">
python API
</a>
</td>
<td class="my-td">
<a href="{{=jsduck_dbui}}" target="_blank">
javascript API
</a>
</td>
</tr>
<tr>
<td class="my-td">
<a href="http://web2py.com/" target="_blank">
Web2py
</a>
</td>
<td class="my-td">
<a href="http://web2py.com/book" target="_blank">
documentation développeurs
</a>
</td>
<td class="my-td">
<a href="http://www.web2py.com/examples/static/epydoc/index.html" target="_blank">
python API
</a>
</td>
<td class="my-td"></td>
</tr>
<tr>
<td class="my-td">
<a href="http://www.sencha.com/products/extjs/" target="_blank">
Ext JS
</a>
</td>
<td class="my-td"></td>
<td class="my-td"></td>
<td class="my-td">
<a href="http://docs.sencha.com/extjs/4.2.1/" target="_blank">
javascript API
</a>
</td>
</tr>
<tr>
<td class="my-td">
<a href="http://www.mathjax.org/" target="_blank">
MathJax
</a>
</td>
<td class="my-td"></td>
<td class="my-td"></td>
<td class="my-td">
<a href="http://docs.mathjax.org/" target="_blank">
Javascript API
</a>
</td>
</tr>
<tr>
<td class="my-td">
<a href="http://ace.c9.io/#nav=about" target="_blank">
Ace
</a>
</td>
<td class="my-td"></td>
<td class="my-td"></td>
<td class="my-td">
<a href="http://ace.c9.io/#nav=api" target="_blank">
Javascript API
</a>
</td>
</tr>
</table>
<h2 class="my-h2 my-small-cap">Code source</h2>
<table border="0" style="margin-left: 6%">
<tr>
<td class="my-td">
track lhcbfrance
</td>
<td class="my-td">
<em>git clone http://marwww.in2p3.fr/~legac/wap/git/track_lhcbfrance.git</em>
</td>
</tr>
<tr>
<td class="my-td">
plugin dbui
</td>
<td class="my-td">
<em>git clone http://marwww.in2p3.fr/~legac/wap/git/web2py_plugin_dbui.git</em>
</td>
</tr>
<tr>
<td class="my-td">
Web2py
</td>
<td class="my-td">
<em>git clone git://github.com/web2py/web2py.git</em>
</td>
</tr>
<tr>
<td class="my-td">
Ext JS
</td>
<td class="my-td">
A télécharger à partir de leur site web.<br>
Disponible dans le répertoire
<em>track_lhcbfrance/static/plugin_extjs/src</em>
</td>
</tr>
<tr>
<td class="my-td">
MathJax
</td>
<td class="my-td">
<em>git clone http://github.com/mathjax/MathJax</em>
</td>
</tr>
<tr>
<td class="my-td">
Ace
</td>
<td class="my-td">
<em>git clone git://github.com/ajaxorg/ace.git</em>
</td>
</tr>
</table>
<h2 class="my-h2 my-small-cap">Binnaires pour web2py</h2>
<p class="my-p">
Les logiciels tierce
<span class="my-small-cap">ACE</span>,
<span class="my-small-cap">Ext JS</span>,
<span class="my-small-cap">MathJax</span>,
<span class="my-small-cap">Plugin dbui</span>,
sont construits sous la forme de plugins qui peuvent être chargés dans
le serveur webpy.
Des versions cohérentes sont disponible en utilisant
le gestionnaire de version <a href="http://git-scm.com/" target="_blank">git</a> :
<em>git clone http://marwww.in2p3.fr/~legac/wap/git/plugin_dbui_build.git</em>.
</p>
</body>
views/default/versions.html deleted 100644 → 0
View file @ 389d733d
{{
title = 'Software versions'
response.write(P(title, _class="my-p my-small-cap my-large"))
response.write(BR())
table = TABLE(TR(TD("web2py", _class="my-td"), TD(web2py, _class="my-td")),
TR(TD("dbui", _class="my-td"), TD(dbui, _class="my-td")),
TR(TD("extjs", _class="my-td"), TD(extjs, _class="my-td")),
TR(TD("mathjax", _class="my-td"), TD(mathjax, _class="my-td")),
TR(TD(request.application, _class="my-td"), TD(myapp, _class="my-td")),
_style="margin-left:6%")
response.write(P(table))
}}
\ No newline at end of file
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