Parcourir la source

Add of expeId into session

Jérôme BUISINE il y a 4 ans
Parent
commit
70a856771e
2 fichiers modifiés avec 7 ajouts et 3 suppressions
  1. 1 0
      expe/config.py
  2. 6 3
      expe/views.py

+ 1 - 0
expe/config.py

@@ -13,6 +13,7 @@ GET_SCENE_IMAGE_API_URL      = DIRAN_DOMAIN_NAME + WEB_API_PREFIX_URL + "/getIma
 GET_SCENES_API_URL           = DIRAN_DOMAIN_NAME + WEB_API_PREFIX_URL + "/listScenes"
 
 # folder variables
+# TODO : dispatch into day and experiment ID
 model_expe_folder            = "expes_models/{0}/{1}"
 output_expe_folder           = "expes_results"
 output_expe_folder_name_day  = "expes_results/{0}/{1}"

+ 6 - 3
expe/views.py

@@ -93,6 +93,7 @@ def expe(request):
     
     # get param 
     expe_name = request.GET.get('expe')
+    expe_id = request.GET.get('expeId')
     scene_name = request.GET.get('scene')
     
     # unique user ID during session (user can launch multiple exeperiences)
@@ -101,11 +102,11 @@ def expe(request):
 
     # first time expe is launched add expe information
     if 'expe' not in request.session or expe_name != request.session.get('expe'):
-        refresh_data(request, expe_name, scene_name)
+        refresh_data(request, expe_name, expe_id, scene_name)
 
     # refresh if scene_name changed
     if 'scene' not in request.session or scene_name != request.session.get('scene'):
-        refresh_data(request, expe_name, scene_name)
+        refresh_data(request, expe_name, expe_id, scene_name)
 
     # create output folder for expe_result
     current_day = datetime.strftime(datetime.utcnow(), "%Y-%m-%d")
@@ -148,6 +149,7 @@ def expe(request):
         # here generic expe params
         del request.session['expe']
         del request.session['scene']
+        del request.session['expeId']
         del request.session['qualities']
         del request.session['timestamp']
 
@@ -274,11 +276,12 @@ def download_result(request):
 
 
 
-def refresh_data(request, expe_name, scene_name):
+def refresh_data(request, expe_name, expe_id, scene_name):
     '''
     Utils method to refresh data from session
     '''
     request.session['expe'] = expe_name
+    request.session['expeId'] = expe_id
     request.session['scene'] = scene_name
 
     request.session['expe_started'] = False