diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..02775e4 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,34 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "python", + "request": "launch", + "name": "Pserve", + "python": "/Users/phuoc/AppData/Local/Programs/Python/Python37", + "program": "/pyramid10/Scripts/pserve", + "args": [ + "-v", + "development.ini" + ], + "console": "integratedTerminal", + "debugOptions": [ + "RedirectOutput", + "WaitOnAbnormalExit", + "WaitOnNormalExit" + ], + "python.unitTest.promptToConfigure":false, + "files.exclude": { + "**/.git": true, + "**/.svn": true, + "**/.hg": true, + "**/.DS_Store": true, + ".idea": true, + "**/*.pyc": true, + }, + } + ] +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..f0604df --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "python.pythonPath": "C:\\pyramid10\\Scripts\\python.exe" +} \ No newline at end of file diff --git a/mondumas/models/parametres.py b/mondumas/models/parametres.py index ae8978a..3d8cb9b 100644 --- a/mondumas/models/parametres.py +++ b/mondumas/models/parametres.py @@ -57,11 +57,11 @@ def get_cabinets_by_id(request, code): def get_experts_by_id(request, code_cab, code_exp): # lire les experts du cabinet if code_exp == '0': - query = """SELECT * FROM P_EXPERTS WHERE code_cab=:code_cab AND en_activite <> 0 ORDER BY nom;""" + query = """SELECT * FROM P_EXPERTS WHERE code_cab=:code_cab ORDER BY nom;""" results = request.dbsession.execute(query, {'code_cab': code_cab}).fetchall() else: query = """SELECT * FROM P_EXPERTS WHERE code_cab=:code_cab AND code_exp=:code_exp;""" - results = request.dbsession.execute(query, {'code_cab': code_cab}, {'code_exp': code_exp}).first() + results = request.dbsession.execute(query, {'code_cab': code_cab, 'code_exp': code_exp}).first() return results def get_rdf_causes_by_id(request, code): @@ -162,3 +162,50 @@ def delete_article(request, ref): query = "DELETE FROM articles WHERE ref = :ref ;" execute_query(request, query, {'ref': ref}) +def update_cabinet(request, code, new_values): + # formater les champs + s = '' + for param in new_values.keys(): + if s: + s += ",%s=:%s" % (param, param) + else: + s = "%s=:%s" % (param, param) + + if code == '0': + query = "CALL spINS_P_CABINET(:nom);" + results = request.dbsession.execute(query, {'nom': new_values['NOM']}).first() + # recupère lenouveau code créé + code = results.newligne + + new_values['code'] = code + query = "UPDATE p_cabinet SET %s WHERE code = :code;" % s + execute_query(request, query, new_values) + +def delete_cabinet(request, code): + query = "DELETE FROM p_cabinet WHERE code = :code ;" + execute_query(request, query, {'code': code}) + +def update_expert(request, code_cab, code_exp, new_values): + # formater les champs + s = '' + for param in new_values.keys(): + if s: + s += ",%s=:%s" % (param, param) + else: + s = "%s=:%s" % (param, param) + + if code_exp == '0': + query = "CALL spINS_P_EXPERT(:code_cab, :nom);" + results = request.dbsession.execute(query, {'code_cab': code_cab, 'nom': new_values['NOM']}).first() + # recupère lenouveau code créé + code_exp = results.newligne + + new_values['code_cab'] = code_cab + new_values['code_exp'] = code_exp + query = "UPDATE p_experts SET %s WHERE code_cab = :code_cab AND code_exp = :code_exp;" % s + execute_query(request, query, new_values) + +def delete_expert(request, code_cab, code_exp): + query = "DELETE FROM p_experts WHERE code_cab = :code_cab AND code_exp = :code_exp;" + execute_query(request, query, {'code_cab': code_cab, 'code_exp': code_exp}) + diff --git a/mondumas/templates/parametres/cabinet_edit.pt b/mondumas/templates/parametres/cabinet_edit.pt index 1afaa44..cf923fe 100644 --- a/mondumas/templates/parametres/cabinet_edit.pt +++ b/mondumas/templates/parametres/cabinet_edit.pt @@ -3,152 +3,141 @@

- - -
-
+

CABINET

+
-

CABINET

- - -
- -
- -
+
+ +
+

${code}

-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- -
-
- -
- -
-

${cabinet.modif_le.strftime('%d-%m-%Y %H:%M')}

-
-
-
-
- - Annuler - - -
-
-
- - -
-

EXPERTS

-

- - Nouvel expert -

- - - - - - - - - - - - - - - -
CodeNom expertTél 1Tél 2Email
${expert.CODE_EXP} - ${expert.NOM} - ${expert.TEL1}${expert.TEL2}${expert.email}
+
+ +
+ +
-
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+ +
+ +
+

${cabinet.modif_le.strftime('%d-%m-%Y %H:%M')}

+
+
+
+
+ + Annuler + + +
+
+ + +
+

EXPERTS

+

+ + Nouvel expert +

+ + + + + + + + + + + + + + + + +
CodeNom expertTél 1Tél 2Email
${expert.CODE_EXP}${expert.CODE_EXP} + ${expert.NOM} + ${expert.TEL1}${expert.TEL2}${expert.email}



@@ -157,7 +146,7 @@