@fixed validate + amélioration expérience utilisateur

Controller/BackOffice/JupyterVirtualClassroomController.php

@@ -28,20 +28,20 @@ use Logipro\Bundle\PhoenixJupyterBundle\Services\PhoenixServices;
 class JupyterVirtualClassroomController extends AppController
 {
 	/**
-     * ouvre la classe jupyter pour le formateur
-     *
-     * @param Request $request
-     * @param interger $jupyterVirtualClassroomId
-     * @return void
-     */
-    public function openTrainerJupyterVirtualClassroom(Request $request,$jupyterVirtualClassroomId,PhoenixServices $phoenixService)
+	 * ouvre la classe jupyter pour le formateur
+	 *
+	 * @param Request $request
+	 * @param interger $jupyterVirtualClassroomId
+	 * @return void
+	 */
+	public function openTrainerJupyterVirtualClassroom(Request $request, $jupyterVirtualClassroomId, PhoenixServices $phoenixService)
 	{
 		// ignore l'interruption utilisateur
 		ignore_user_abort(true);
 
 		$doctrine = $this->getDoctrine();
 		$manager = $doctrine->getManager();
-		
+
 		$jupyterVirtualClassroomRepository = $manager->getRepository(JupyterVirtualClassroom::class);
 		$classRoom = $jupyterVirtualClassroomRepository->find($jupyterVirtualClassroomId);
 		$url = $phoenixService->startTrainerServer($classRoom);
@@ -49,4 +49,16 @@ class JupyterVirtualClassroomController extends AppController
 		$response = new RedirectResponse($url);
 		return $response;
 	}
-}
+
+	public function validateNotebook(Request $request, $jupyterVirtualClassroomId, PhoenixServices $phoenixService)
+	{
+		$doctrine = $this->getDoctrine();
+		$manager = $doctrine->getManager();
+
+		$jupyterVirtualClassroomRepository = $manager->getRepository(JupyterVirtualClassroom::class);
+		$classRoom = $jupyterVirtualClassroomRepository->find($jupyterVirtualClassroomId);
+		$result = $phoenixService->validateNotebook($classRoom);
+
+		return $this->json($result);
+	}
+}

Resources/assets/Js/back-office.js

@@ -42,5 +42,22 @@ function initSequenceJupyterClassroom(sequenceJupyterClassroom)
                 $("#notebook-import").addClass('d-none');
             }
         });
+
+        $("#validate_notebook").on('click', function(event){
+            event.preventDefault();
+        
+            $.get($(this).attr("href"),function(result)
+            {
+                let modal = $('#validate_modal').clone();
+                $('body').append(modal);
+
+                modal.find('.modal-body').html(result['log']);
+                modal.on('hidden.bs.modal',function(){
+                    modal.remove();
+                });
+                
+                modal.modal();
+            });
+        });
     });
 }

Resources/assets/Js/learning-space.js

@@ -10,57 +10,31 @@ $(document).ready(function()
 
 function initBundle()
 {
-    $('.modal-ajax').on('click',function(event)
-    {
-        event.preventDefault();
 
-        $(document).phxLock();
-        $.get($(this).attr('href'),function(result)
+    $('.ali-LSSequenceItem-li').each(function(){
+        let bloc = $(this);
+        let model = bloc.find('.modal-autograde');
+        bloc.find('.modal-ajax').on('click',function(event)
         {
-            $(document).phxUnlock();
-
-            let modal = $('<div>',
+            event.preventDefault();
+    
+            $(document).phxLock();
+            $.get($(this).attr('href'),function(result)
             {
-                'class': 'modal fade',
-                'tabindex': '-1',
-                'role':'dialog',
-                'aria-hidden':'true'
-            })
-            .append(
-                $('<div>',
-                {
-                    'class':'modal-dialog'
-                }).append(
-                    $('<div>',{
-                        class: 'modal-content'
-                    }).append(
-                        $('<p>').text(result.log)
-                    )
-                )
-            );
+                $(document).phxUnlock();
+    
+                let modal = model.clone();
+    
+                modal.find('.ali-DeleteMessage').text(result['log']);
+    
+                $('.ali-LSContainer').append(modal);
+                modal.modal();
+            });
+    
             
-
-           /* .append(
-                $('<div>',
-                {
-                    'class':'modal-dialog modal-lg'
-                }).append(
-                    $('<div>',{
-                        class: 'modal-content'
-                    })
-                    .append(
-                        $('p').text(result.log)
-                    )
-                )
-            );*/
-
-            $('.ali-LSContainer').append(modal);
-            modal.modal();
         });
-
-        
     });
-       
+
 
     $('.ali-LSSequenceItem-li').each(function()
     {

Resources/config/routes.yaml

@@ -8,8 +8,15 @@ open_trainer_jupyter_classroom:
   requirements:
     jupyterVirtualClassroomId: '\d+'
 
+validate_notebook:
+  methods: [GET]
+  path: /jupyter/trainer/validate/{jupyterVirtualClassroomId}
+  controller: Logipro\Bundle\PhoenixJupyterBundle\Controller\BackOffice\JupyterVirtualClassroomController::validateNotebook
+  requirements:
+    jupyterVirtualClassroomId: '\d+'
+
 open_student_jupyter_classroom:
-  path: /learning-space/jupyter/student/open/{jupyterVirtualClassroomId}
+  path: /learning-space/jupyter/trainer/validate/{jupyterVirtualClassroomId}
   controller: Logipro\Bundle\PhoenixJupyterBundle\Controller\LearningSpace\JupyterVirtualClassroomController::openStudentJupyterVirtualClassroom
   requirements:
     jupyterVirtualClassroomId: '\d+'

Resources/views/back-office/formUpdate.html.twig

@@ -5,6 +5,7 @@
         <legend class="ali-EditorSequenceItem-legende">{{ 'label_sequence_item_editor_page'|trans }}</legend>
         <div class="ali-EditorSequenceItem-editorPage mb-3">
             <a target="_blank" href="{{ path('open_trainer_jupyter_classroom',{'jupyterVirtualClassroomId' : sequenceItem.sequenceItemId }) }}" class="btn btn-md btn-primary text-white">Editer le notebook</a>
+            <a id="validate_notebook" target="_blank" href="{{ path('validate_notebook',{'jupyterVirtualClassroomId' : sequenceItem.sequenceItemId }) }}" class="btn btn-md btn-primary text-white">Valider le notebook</a>
         </div>
     </fieldset>
 
@@ -42,7 +43,8 @@
         </div>
     </fieldset>
 
-
     <input type="hidden" name="serviceName" value="phoenix.bundle.learningpath.jupyter">
 
+    {% include '@LogiproPhoenixJupyter/back-office/modal.html.twig' with { 'modalId':'validate_modal' } %}
+
 </div>

Resources/views/back-office/modal.html.twig

@@ -0,0 +1 @@
+{% extends "back-office/admin/layouts/modals/layout.base.html.twig" %}

Resources/views/learning_space/blocBottom.html.twig

@@ -38,4 +38,5 @@
         {% endif %}
         </ul>
     </div>
-{% endif %}
+{% endif %}
+{% include '@LogiproPhoenixJupyter/learning_space/modalLog.html.twig' with {'hide':true} %}

Resources/views/learning_space/modalLog.html.twig

@@ -1,11 +1,18 @@
-{% extends 'learning_space/popup_messages/popup_message_layout.html.twig' %}
-
-{% block MessageContent %}
-<div class="ali-PopupMessageBox text-white">
-    <div class="d-flex justify-content-center align-items-center flex-column flex-xl-row text-center text-xl-left">
-        <i class="material-icons ali-TextSize-8 mr-0 mr-xl-3">warning</i>
-        <span class="ali-TextSize-2-5">{{ 'warning_duration_not_save'|trans }}<br/>
-        </span>
-    </div>
-</div>
-{% endblock %}
+ <!-- Modal -->
+    <div class="modal fade modal-autograde" tabindex="-1" role="dialog" aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered" role="document">
+            <div class="modal-content ali-ModalContent" style="overflow:hidden;">
+                <div class="modal-header flex-column text-center position-relative">
+                    <button class="ali-btn-close p-0 border-0 bg-transparent align-self-end" type="button" data-dismiss="modal" aria-label="Close">
+                        <i class="material-icons">
+                            close
+                        </i>
+                    </button>
+                </div>
+                <div class="ali-ModalContent modal-body" style="height:100%;">
+                    <div class="ali-DeleteMessage w-75 mx-auto">
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>

Services/ApiLayer/ApiLayerService.php

@@ -785,7 +785,7 @@ class ApiLayerService
      */
     private function getIdMask($id)
     {
-        return hash('crc32', $id);
+        return hash('crc32', $id) . 'ecfdfvxcvcfe';
     }
 
     /**
@@ -1011,4 +1011,19 @@ class ApiLayerService
         }
         return '';
     }
+
+    public function validateNotebook($token,$url)
+    {
+        $path = $this->buildPath(
+            array(
+                'phoenix',
+                'validate',
+                $token->getUuid(),
+                $this->getFolderNameByUrl($url, false)
+            )
+        );
+
+        return $this->doApiGet($path, array(200, 404));
+    }
+
 }

Services/PhoenixServices.php

@@ -629,7 +629,7 @@ class PhoenixServices extends Services
 
 		$jupyterClassroomRegistrationRepository = $this->getRepository(JupyterClassroomRegistration::class);
 		if ($sequenceItem->getIsAssesment()) {
-			$url = $layer->resetAssesmentNotebook($sequenceItem,$trainerToken, $personToken, $sequenceItem->getUrl());
+			$url = $layer->resetAssesmentNotebook($sequenceItem, $trainerToken, $personToken, $sequenceItem->getUrl());
 			if ($url != "") {
 				$jupyterClassroomRegistration = $jupyterClassroomRegistrationRepository->getLastClassroomRegistration($sequenceItem, $person, false);
 				$jupyterClassroomRegistration->setUrl($url);
@@ -651,4 +651,12 @@ class PhoenixServices extends Services
 
 		return $layer->resetNotebook($trainerToken, $personToken, $sequenceItem->getUrl(), $jupyterClassroomRegistration->getUrl());
 	}
+
+	public function validateNotebook(JupyterVirtualClassroom $sequenceItem)
+	{
+		$layer = $this->getApiService();
+
+		$trainerToken = $this->getToken($sequenceItem->getTrainer());
+		return $layer->validateNotebook($trainerToken, $sequenceItem->getUrl());
+	}
 }