diff --git a/.vscode/settings.json b/.vscode/settings.json index 4009d4b..0bf16ae 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,5 @@ { - "html.validate.scripts": false - "editor.minimap.enabled": false + "html.validate.scripts": false, + "editor.minimap.enabled": false, + "python.pythonPath": "C:\\Users\\Thien-An\\AppData\\Local\\Programs\\Python\\Python37\\python.exe" } \ No newline at end of file diff --git a/development.ini b/development.ini index 020e55e..f52aca5 100644 --- a/development.ini +++ b/development.ini @@ -19,7 +19,7 @@ pyramid.includes = pyramid_tm -sqlalchemy.url = mysql://root:superbionicle@localhost/bddevfac?charset=utf8 +sqlalchemy.url = mysql://phuoc:phuoc!@192.168.1.17/bddevfac?charset=utf8 # sqlalchemy.url = mysql://phuoc:phuoc!@192.168.0.31/bddevfac?charset=utf8 mondumas.admin_email = cao.thien-phuoc@orange.fr diff --git a/mondumas/templates/dossier/dossier_view.pt b/mondumas/templates/dossier/dossier_view.pt index 11cf108..926cf36 100644 --- a/mondumas/templates/dossier/dossier_view.pt +++ b/mondumas/templates/dossier/dossier_view.pt @@ -329,6 +329,20 @@
Voulez-vous clôturer le dossier ?
%s
%s
%s
' % ligne.libelle
- if ligne.metrage:
- dt_html += ligne.metrage
- if ligne.deduction:
- dt_html += '
déduction :
'
- dt_html += '%s' % ligne.deduction
- dt_html += '
%s
%s
%s
' % ligne.libelle
+ if ligne.metrage:
+ dt_html += ligne.metrage
+ if ligne.deduction:
+ dt_html += '
déduction :
'
+ dt_html += '%s' % ligne.deduction
+ dt_html += '
" + extracted_text.replace("\n", "
") + "
" + extracted_text.replace("\n", "
") + "