From 788ba1956b3cc01237562ad15d6fd47e83fc2329 Mon Sep 17 00:00:00 2001 From: cherif Date: Mon, 31 Oct 2022 18:42:40 +0100 Subject: [PATCH] 30/10/22 - 17h30 --- Inscription_mgt.py | 15 +++++- ...onfirmation_Pre_inscription_formation.html | 6 ++- main.py | 13 ++++- opco.py | 52 +++++++++++++++++++ 4 files changed, 81 insertions(+), 5 deletions(-) create mode 100644 opco.py diff --git a/Inscription_mgt.py b/Inscription_mgt.py index 86242c8..b73c7d9 100644 --- a/Inscription_mgt.py +++ b/Inscription_mgt.py @@ -41,7 +41,7 @@ def AddStagiairetoClass(diction): # field_list. ''' field_list = ['nom', 'prenom', 'email', 'telephone', 'modefinancement', 'opco', - 'class_internal_url', 'session_id'] + 'class_internal_url', 'session_id', 'employeur'] incom_keys = diction.keys() for val in incom_keys: if val not in field_list: @@ -94,6 +94,10 @@ def AddStagiairetoClass(diction): if diction['prenom']: mydata['prenom'] = diction['prenom'] + if ("employeur" in diction.keys()): + if diction['employeur']: + mydata['employeur'] = diction['employeur'] + if ("telephone" in diction.keys()): if diction['telephone']: mydata['telephone'] = diction['telephone'] @@ -179,7 +183,7 @@ Mettre à jour les infomration d'un stgiaire def UpdateStagiairetoClass(diction): try: field_list = ['token', 'email', 'nom', 'prenom', 'telephone', 'modefinancement', 'opco', - 'status', 'class_internal_url', 'session_id', 'price'] + 'status', 'class_internal_url', 'session_id', 'price', 'employeur'] incom_keys = diction.keys() for val in incom_keys: if val not in field_list: @@ -241,6 +245,10 @@ def UpdateStagiairetoClass(diction): if diction['price']: mydata['price'] = diction['price'] + if ("employeur" in diction.keys()): + if diction['employeur']: + mydata['employeur'] = diction['employeur'] + user_prenom = "" if ("prenom" in diction.keys()): if diction['prenom']: @@ -304,12 +312,15 @@ def UpdateStagiairetoClass(diction): local_query = {'formation_session_id':str(mysession_id)} print("### local_query = "+str(local_query)) + for local_tmp_session in MYSY_GV.dbname['session_formation'].find(local_query): + local_date_du = "" if ("date_debut" in local_tmp_session.keys() and local_tmp_session['date_debut']): local_date_du = local_tmp_session['date_debut'] email_data['date_du'] = local_date_du + local_date_au = "" if ("date_fin" in local_tmp_session.keys() and local_tmp_session['date_fin']): local_date_au = local_tmp_session['date_fin'] diff --git a/Template/MySy_confirmation_Pre_inscription_formation.html b/Template/MySy_confirmation_Pre_inscription_formation.html index 00bde17..70ca779 100644 --- a/Template/MySy_confirmation_Pre_inscription_formation.html +++ b/Template/MySy_confirmation_Pre_inscription_formation.html @@ -87,11 +87,13 @@ {% if params.adresse == "enligne" %}

­ - Il s'agit d'une formation en ligne. + Il s'agit d'une formation en ligne.

{% else %}

­ - Cette formation organisée se tiendra au {{ params.adresse }}. + Cette formation se tiendra au {{ params.adresse }}.

{% endif %} diff --git a/main.py b/main.py index b217479..247c975 100644 --- a/main.py +++ b/main.py @@ -34,7 +34,7 @@ import emargement as emargement import Session_Formation as SF import email_mgt as emails import email_inscription_mgt as emails_support - +import opco as opco app = Flask(__name__) cors = CORS(app, resources={r"/foo": {"origins": "*"}}) @@ -1894,6 +1894,17 @@ def MysyOrderEmail_tpl(): +""" +API de recuperation de liste de OPCO +""" +@app.route('/myclass/api/GetListOpco/', methods=['POST','GET']) +@crossdomain(origin='*') +def GetListOpco(): + # On recupere le corps (payload) de la requete + payload = request.form.to_dict() + print(" ### GetListOpco : payload = ",str(payload)) + localStatus, message= opco.GetListOpco() + return jsonify(status=localStatus, message=message ) diff --git a/opco.py b/opco.py new file mode 100644 index 0000000..b92ae17 --- /dev/null +++ b/opco.py @@ -0,0 +1,52 @@ +""" +Fichier de gestion des opco +""" +import pymongo +from pymongo import MongoClient +import json +from bson import ObjectId +import re +from datetime import datetime +import prj_common as mycommon +import secrets +import inspect +import sys, os +import csv +import pandas as pd +from pymongo import ReturnDocument +import GlobalVariable as MYSY_GV +from math import isnan +import GlobalVariable as MYSY_GV +from datetime import timedelta +import email_inscription_mgt as email_session + + +def GetListOpco(): + try: + + + + + ## Recuperation de toutes les stagiaire rattaché à cette session + coll_opco = MYSY_GV.dbname['liste_opco'] + myquery = {} + myquery['valide'] = "1" + + RetObject = [] + val_tmp = 1 + + # print(" #### myquery = "+str(myquery)) + + for retval in coll_opco.find(myquery): + user = retval + user['id'] = str(val_tmp) + val_tmp = val_tmp + 1 + RetObject.append(mycommon.JSONEncoder().encode(user)) + + return True, RetObject + except Exception as e: + exc_type, exc_obj, exc_tb = sys.exc_info() + mycommon.myprint(str(inspect.stack()[0][3]) + " -" + str(e) + " - ERRORRRR AT Line : " + str(exc_tb.tb_lineno)) + return False, "Impossible de recuperer la liste des opco " + +