07/05/2024 - 17h30

master
cherif 2024-05-07 17:38:48 +02:00
parent 09d50b4b8d
commit 98dc4e4ddb
5 changed files with 7307 additions and 36 deletions

View File

@ -1,16 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="05/05/2024 - 17h30"> <list default="true" id="c6d0259a-16e1-410d-91a1-830590ee2a08" name="Changes" comment="06/05/2024 - 22h30">
<change afterPath="$PROJECT_DIR$/categorie_formation_mgt.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/domaine_formation_mgt.py" afterDir="false" />
<change afterPath="$PROJECT_DIR$/metier_formation_mgt.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Log/log_file.log" beforeDir="false" afterPath="$PROJECT_DIR$/Log/log_file.log" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Log/log_file.log" beforeDir="false" afterPath="$PROJECT_DIR$/Log/log_file.log" afterDir="false" />
<change beforePath="$PROJECT_DIR$/categorie_formation_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/categorie_formation_mgt.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/class_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/class_mgt.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/class_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/class_mgt.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/metier_formation_mgt.py" beforeDir="false" afterPath="$PROJECT_DIR$/metier_formation_mgt.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/paiement_condition.py" beforeDir="false" afterPath="$PROJECT_DIR$/paiement_condition.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/prj_common.py" beforeDir="false" afterPath="$PROJECT_DIR$/prj_common.py" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -35,14 +31,14 @@
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" /> <option name="showLibraryContents" value="true" />
</component> </component>
<component name="PropertiesComponent"><![CDATA[{ <component name="PropertiesComponent">{
"keyToString": { &quot;keyToString&quot;: {
"RunOnceActivity.OpenProjectViewOnStart": "true", &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
"RunOnceActivity.ShowReadmeOnStart": "true", &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
"last_opened_file_path": "C:/Users/billa/Documents/myclass.com/Siteweb/Production/Ela_back/Back_Office", &quot;last_opened_file_path&quot;: &quot;C:/Users/billa/Documents/myclass.com/Siteweb/Production/Ela_back/Back_Office&quot;,
"settings.editor.selected.configurable": "preferences.lookFeel" &quot;settings.editor.selected.configurable&quot;: &quot;preferences.lookFeel&quot;
} }
}]]></component> }</component>
<component name="RecentsManager"> <component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="C:\Users\billa\Documents\myclass.com\Siteweb\Production\Ela_back\Back_Office" /> <recent name="C:\Users\billa\Documents\myclass.com\Siteweb\Production\Ela_back\Back_Office" />
@ -80,13 +76,6 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1680804787304</updated> <updated>1680804787304</updated>
</task> </task>
<task id="LOCAL-00238" summary="07/03/2024 - 22h30">
<created>1709847739473</created>
<option name="number" value="00238" />
<option name="presentableId" value="LOCAL-00238" />
<option name="project" value="LOCAL" />
<updated>1709847739474</updated>
</task>
<task id="LOCAL-00239" summary="ddd"> <task id="LOCAL-00239" summary="ddd">
<created>1710064628260</created> <created>1710064628260</created>
<option name="number" value="00239" /> <option name="number" value="00239" />
@ -423,7 +412,14 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1714923761168</updated> <updated>1714923761168</updated>
</task> </task>
<option name="localTasksCounter" value="287" /> <task id="LOCAL-00287" summary="06/05/2024 - 22h30">
<created>1715027674052</created>
<option name="number" value="00287" />
<option name="presentableId" value="LOCAL-00287" />
<option name="project" value="LOCAL" />
<updated>1715027674052</updated>
</task>
<option name="localTasksCounter" value="288" />
<servers /> <servers />
</component> </component>
<component name="Vcs.Log.Tabs.Properties"> <component name="Vcs.Log.Tabs.Properties">
@ -465,7 +461,6 @@
</option> </option>
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="07/04/2024 - 13h19" />
<MESSAGE value="07/04/2024 - 19h19" /> <MESSAGE value="07/04/2024 - 19h19" />
<MESSAGE value="09/04/2024 - 15h19" /> <MESSAGE value="09/04/2024 - 15h19" />
<MESSAGE value="09/04/2024 - 23h50" /> <MESSAGE value="09/04/2024 - 23h50" />
@ -490,6 +485,7 @@
<MESSAGE value="04/05/2024 - 20h30" /> <MESSAGE value="04/05/2024 - 20h30" />
<MESSAGE value="05/05/2024 - 13h30" /> <MESSAGE value="05/05/2024 - 13h30" />
<MESSAGE value="05/05/2024 - 17h30" /> <MESSAGE value="05/05/2024 - 17h30" />
<option name="LAST_COMMIT_MESSAGE" value="05/05/2024 - 17h30" /> <MESSAGE value="06/05/2024 - 22h30" />
<option name="LAST_COMMIT_MESSAGE" value="06/05/2024 - 22h30" />
</component> </component>
</project> </project>

File diff suppressed because it is too large Load Diff

View File

@ -224,7 +224,7 @@ def Update_Class_Categorie(diction):
" Impossible de mettre à jour la catégorie de formation (2) ") " Impossible de mettre à jour la catégorie de formation (2) ")
return False, " Impossible de mettre à jour la catégorie de formation (2) " return False, " Impossible de mettre à jour la catégorie de formation (2) "
return True, " Laatégorie de formation a été correctement mise à jour" return True, " La catégorie de formation a été correctement mise à jour"
except Exception as e: except Exception as e:
exc_type, exc_obj, exc_tb = sys.exc_info() exc_type, exc_obj, exc_tb = sys.exc_info()
@ -377,10 +377,14 @@ def Get_List_Class_Categorie(diction):
RetObject = [] RetObject = []
val_tmp = 0 val_tmp = 0
for retval in MYSY_GV.dbname['class_categorie'].find(data_cle): for retval in MYSY_GV.dbname['class_categorie'].find(data_cle).sort([("_id", pymongo.DESCENDING), ]):
user = retval user = retval
user['id'] = str(val_tmp) user['id'] = str(val_tmp)
val_tmp = val_tmp + 1 val_tmp = val_tmp + 1
if( "class_domaine_id" not in retval.keys() ):
user['class_domaine_id'] = ""
RetObject.append(mycommon.JSONEncoder().encode(user)) RetObject.append(mycommon.JSONEncoder().encode(user))
return True, RetObject return True, RetObject

View File

@ -962,16 +962,13 @@ def update_class(diction):
if ("domaine" in diction.keys()): if ("domaine" in diction.keys()):
if diction['domaine']: mydata['domaine'] = diction['domaine']
mydata['domaine'] = diction['domaine']
if ("version" in diction.keys()): if ("version" in diction.keys()):
if diction['version']: mydata['version'] = diction['version']
mydata['version'] = diction['version']
if ("categorie" in diction.keys()): if ("categorie" in diction.keys()):
if diction['categorie']: mydata['categorie'] = diction['categorie']
mydata['categorie'] = diction['categorie']
if ("zone_diffusion" in diction.keys()): if ("zone_diffusion" in diction.keys()):
@ -2411,10 +2408,16 @@ def get_partner_class(diction):
if ("domain" not in retVal.keys()): if ("domain" not in retVal.keys()):
retVal['domain'] = "" retVal['domain'] = ""
if ("metier" not in retVal.keys()): if ("metier" not in retVal.keys()):
retVal['metier'] = "" retVal['metier'] = ""
if ("version" not in retVal.keys()):
retVal['version'] = ""
if ("categorie" not in retVal.keys()):
retVal['categorie'] = ""
if ("duration" not in retVal.keys()): if ("duration" not in retVal.keys()):
retVal['duration'] = "" retVal['duration'] = ""
@ -2696,6 +2699,12 @@ def find_partner_class_like(diction):
retVal['metier'] = "" retVal['metier'] = ""
if ("version" not in retVal.keys()):
retVal['version'] = ""
if ("categorie" not in retVal.keys()):
retVal['categorie'] = ""
if ("price" not in retVal.keys()): if ("price" not in retVal.keys()):
retVal['price'] = "0" retVal['price'] = "0"

View File

@ -130,7 +130,7 @@ def Add_class_metier(diction):
return False, " Impossible de créer le métier de formation (2) " return False, " Impossible de créer le métier de formation (2) "
return True, " La metier a été correctement ajoutée" return True, " La metier a été correctement ajouté "
except Exception as e: except Exception as e:
exc_type, exc_obj, exc_tb = sys.exc_info() exc_type, exc_obj, exc_tb = sys.exc_info()
@ -224,7 +224,7 @@ def Update_class_metier(diction):
" Impossible de mettre à jour le métier de formation (2) ") " Impossible de mettre à jour le métier de formation (2) ")
return False, " Impossible de mettre à jour le métier de formation (2) " return False, " Impossible de mettre à jour le métier de formation (2) "
return True, " Laatégorie de formation a été correctement mise à jour" return True, " Le métier de formation a été correctement mis à jour"
except Exception as e: except Exception as e:
exc_type, exc_obj, exc_tb = sys.exc_info() exc_type, exc_obj, exc_tb = sys.exc_info()
@ -377,9 +377,21 @@ def Get_List_class_metier(diction):
RetObject = [] RetObject = []
val_tmp = 0 val_tmp = 0
for retval in MYSY_GV.dbname['class_metier'].find(data_cle): for retval in MYSY_GV.dbname['class_metier'].find(data_cle).sort([("_id", pymongo.DESCENDING), ]):
user = retval user = retval
user['id'] = str(val_tmp) user['id'] = str(val_tmp)
if ("class_domaine_id" not in retval.keys()):
user['class_domaine_id'] = ""
user['class_domaine_nom'] = ""
else:
my_domaine_data = MYSY_GV.dbname['class_domaine'].find_one({"_id":ObjectId(str(retval['class_domaine_id'])),
'valide':'1',
'locked':'0'})
if( my_domaine_data and "nom" in my_domaine_data.keys() ):
user['class_domaine_nom'] = my_domaine_data['nom']
val_tmp = val_tmp + 1 val_tmp = val_tmp + 1
RetObject.append(mycommon.JSONEncoder().encode(user)) RetObject.append(mycommon.JSONEncoder().encode(user))