Esthétique + Trad + Formation vers Training Courses

app/Resources/translations/messages.en.yml

@@ -3,6 +3,9 @@ information: "Information"
 help: "Help"
 about: "About"
 
+answersView: "Show answers"
+answersEdit: "Answer questions"
+
 scenarisation: "Storyboarding"
 sequenceQuestion: "Sequence Question"
 sessionQuestion: "Session Question"
@@ -21,16 +24,19 @@ goals: "Goals"
 title: "Title"
 description: "Description"
 position: "Position"
+design: "Design"
 
-referentLecturer: "Referent Teacher"
+admin: "Administration"
+questionBank: "Bank of questions"
+referentLecturer: "Referent teacher"
 projects: "Projects"
 project: "Project"
-course: "Course"
-courses: "Courses"
 trainingCourses: "Training courses"
+trainingCourse: "Training course"
 
 user: "Users"
-pedagogicalScenario: "Pedagogical scenarios"
+pedagogicalScenarios: "Pedagogical scenarios"
+pedagogicalScenario:  "Pedagogical scenario"
 
 add: "Add"
 create: "Create"
@@ -39,6 +45,7 @@ backToList: "Back to the list"
 show: "Show"
 edit: "Edit"
 signout: "Sign out"
+exportToPdf: "PDF export"
 shortname: "Shortname"
 fullname: "Fullname"
 
@@ -59,12 +66,6 @@ actions: "Actions"
 parameters: "Settings"
 scenarios: "Scenarios"
 
-menu:
-    Courses:   "Courses"
-    utilisateurs: "Users"
-    questions:    "Questions"
-    scenarisationProcess: "Scenarisation Process"
-
 pageLogin:
     connectezVous: "Sign in"
     placeholder:
@@ -73,6 +74,10 @@ pageLogin:
         seSouvenirDeMoi: "Remember me"
         connexion: "Sign in"
 
+currentProcess: "Current process"
+
 appDescription: 'Design and export of pedagogical scenarios'
 associatedScenarios: "Pedagogical scenarios associated"
 footer: "Txuleton platform is hosted by "
+
+processNoStage : "No stage in the scenarisation process for the current scenario."

app/Resources/translations/messages.es.yml

-save: "ENREGISTRER"
+save: "Grabar"
 information: "Informaciones"
 help: "Ayuda"
 about: "Acerca de"
 
+answersView: "Ver respuestas"
+answersEdit: "Responder a las preguntas"
+
 scenarisation: "Escenarización"
 sequenceQuestion: "Pregunta secuencia"
 sessionQuestion: "Pregunta sesión"
@@ -21,16 +24,19 @@ goals: "Objectivos"
 title: "Título"
 description: "Descripción"
 position: "Posición"
+design: "Diseñar"
 
+admin: "Administratión"
+questionBank: "Banco de preguntas"
 referentTeacher: "Profesor referente"
 projects: "Proyectos"
 project: "Project"
-course: "Course"
-courses: "Courses"
 trainingCourses: "Formaciones"
+trainingCourse: "Formación"
 
 user: "Usuarios"
-pedagogicalScenario: "Escenarios pedagógicos"
+pedagogicalScenarios: "Escenarios pedagógicos"
+pedagogicalScenario:  "Escenario pedagógico"
 
 add: "Añadir"
 create: "Crear"
@@ -38,6 +44,7 @@ delete: "Suprimir"
 backToList: "Vuelta a la lista"
 show: "Ver"
 edit: "Editar"
+exportToPdf: "Exportar a PDF"
 signout: "Desconectarse"
 shortname: "Nombre breve"
 fullname: "Nombre completo"
@@ -58,18 +65,18 @@ actions: "Acciones"
 parameters: "Parámetros"
 scenarios: "Escenarios"
 
-menu:
-    questions: "Preguntas"
-    scenarisationProcess: ""
-
 pageLogin:
     connectezVous: "Conectarse"
     placeholder:
         email: "Email"
         mdp: "Contraseña"
         seSouvenirDeMoi: "Acordarse de mi"
-        connexion: "Conección"
+        connexion: "Conexión"
+
+currentProcess: "Proceso actual"
 
 appDescription: 'Diseño y exportación de escenarios pedagógicos'
 associatedScenarios: ""
 footer: "La plataforma Txuleton está albergada por la "
+
+processNoStage : "Ninguna etapa en el proceso de escenarización del actual escenario."

app/Resources/translations/messages.fr.yml

@@ -3,6 +3,9 @@ information: "Informations"
 help: "Aide"
 about: "À propos"
 
+answersView: "Voir réponses"
+answersEdit: "Répondre aux questions"
+
 scenarisation: "Scénarisation"
 sequenceQuestion: "Question Séquence"
 sessionQuestion: "Question Séance"
@@ -21,16 +24,19 @@ goals: "Objectifs"
 title: "Intitulé"
 description: "Description"
 position: "Position"
+design: "Concevoir"
 
-referentTeacher: "Enseignant Référent"
+admin: "Administration"
+questionBank: "Banque de questions"
+referentTeacher: "Enseignant référent"
 projects: "Projets"
-project: "Project"
-course: "Course"
-courses: "Courses"
+project: "Projet"
 trainingCourses: "Formations"
+trainingCourse: "Formation"
 
 user: "Utilisateurs"
-pedagogicalScenario: "Scénarios pédagogiques"
+pedagogicalScenarios: "Scénarios pédagogiques"
+pedagogicalScenario:  "Scénario pédagogique"
 
 add: "Ajouter"
 create: "Créer"
@@ -38,6 +44,7 @@ delete: "Supprimer"
 backToList: "Retour à la liste"
 show: "Voir"
 edit: "Editer"
+exportToPdf: "Exporter en PDF"
 signout: "Se déconnecter"
 shortname: "Nom court"
 fullname: "Nom complet"
@@ -59,11 +66,6 @@ actions: "Actions"
 parameters: "Paramètres"
 scenarios: "Scénarios"
 
-menu:
-    utilisateurs: "Utilisateurs"
-    questions: "Questions"
-    scenarisationProcess: "Démarche de scénarisation"
-
 pageLogin:
     connectezVous: "S'identifier"
     placeholder:
@@ -72,6 +74,10 @@ pageLogin:
         seSouvenirDeMoi: "Se souvenir de moi"
         connexion: "Connexion"
 
+currentProcess: "Démarche courante"
+
 appDescription: 'Conception et exportation de scénarios pédagogiques'
 associatedScenarios: "Scénarios pédagogiques associés"
 footer: "La plateforme Txuleton est hébergée par l'"
+
+processNoStage: "Pas d'étape de scénarisation dans la démarche du scénario courant."

app/Resources/views/baseLogin.html.twig

@@ -54,7 +54,7 @@
    </div>
   </div>
 
-  	<div class="row animated fadeInUp" style="padding-top : 15px;">
+  	<div class="row" style="padding-top : 15px;">
       <div class="col-md-12">
         {% block body %}
         {% endblock %}

app/Resources/views/menu.html.twig

 <!-- Sidebar -->
 
 <div class="panel panel-default">
-  <div class="panel-heading"><strong>{{'scenarios'|trans}}</strong></div>
+  <div class="panel-heading"><strong>{{'admin'|trans}}</strong></div>
   <div>
 
     <ul class="list-group" style='margin-bottom: 0;'>
       <li class="list-group-item {{app.session.get('menu').pedagogical_scenario}}">
         <a href="{{ path('pedagogicalscenario_index', { 'userRole': currentRole })}}">
           <i class="fa fa-book" aria-hidden="true"></i>
-          {{'pedagogicalScenario'|trans}}
+          {{'pedagogicalScenarios'|trans}}
         </a>
       </li>
 
@@ -66,8 +66,8 @@
 
         <li class="list-group-item {{app.session.get('menu').question}}">
           <a href="{{ path('question_index')}}">
-            <i class="fa fa-question"  aria-hidden="true"></i>
-            {{'menu.questions'|trans}}
+            <i class="fa  fa-comments-o"  aria-hidden="true"></i>
+            {{'questionBank'|trans}}
           </a>
         </li>
 
@@ -81,7 +81,6 @@
   <div>
 
     <ul class="list-group" style='margin-bottom: 0;'>
-
       <li class="list-group-item">
         <a href="#">
           <i class="fa fa-info-circle"  aria-hidden="true"></i>

config

+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
+	precomposeunicode = true

description

+Unnamed repository; edit this file 'description' to name the repository.

src/ScenarioBundle/Controller/PedagogicalScenarioController.php

@@ -273,7 +273,7 @@ class PedagogicalScenarioController extends Controller
     public function defineTeachersAction(PedagogicalScenario $pedagogicalScenario)
     {
       // We generate the new breadcrumb
-      $this->createBreadcrumb("define_teachers");
+      $this->createBreadcrumb("define_teachers",$pedagogicalScenario);
       $this->updateMenu();
 
       $em   = $this->getDoctrine()->getManager();
@@ -339,7 +339,7 @@ class PedagogicalScenarioController extends Controller
     public function stageQuestionsAnswersViewAction(PedagogicalScenario $pedagogicalScenario, ScenarisationStage $scenarisationStage)
     {
       // We generate the new breadcrumb
-      $this->createBreadcrumb("answers_view", $pedagogicalScenario);
+      $this->createBreadcrumb("answers_view", $pedagogicalScenario, $scenarisationStage);
       $this->updateMenu();
 
       $em = $this->getDoctrine()->getManager();
@@ -368,7 +368,7 @@ class PedagogicalScenarioController extends Controller
     public function stageQuestionsAnswersEditAction(PedagogicalScenario $pedagogicalScenario, ScenarisationStage $scenarisationStage, Request $userRequest)
     {
       // We generate the new breadcrumb
-      $this->createBreadcrumb("answers_view", $pedagogicalScenario);
+      $this->createBreadcrumb("answers_edit", $pedagogicalScenario, $scenarisationStage);
       $this->updateMenu();
 
       $em = $this->getDoctrine()->getManager();
@@ -650,17 +650,18 @@ class PedagogicalScenarioController extends Controller
       return $tab;
     }
 
-    private function createBreadcrumb($currentAction, $pedagogicalScenario = null)
+    private function createBreadcrumb($currentAction, $pedagogicalScenario = null, $scenarisationStage = null)
     {
       $breadcrumbs = $this->get("white_october_breadcrumbs");
+      $breadcrumbs->addItem("admin");
       switch($currentAction)
       {
         case "index":
-          $breadcrumbs->addItem("pedagogicalScenario");
+          $breadcrumbs->addItem("pedagogicalScenarios");
         break;
 
         case "show":
-          $breadcrumbs->addRouteItem("pedagogicalScenario", "pedagogicalscenario_index", [
+          $breadcrumbs->addRouteItem("pedagogicalScenarios", "pedagogicalscenario_index", [
               'userRole' => ($this->get('security.authorization_checker')->isGranted('ROLE_PEDAGOGICAL_ENGINEER')?"pedagogical-engineer":"teacher")
           ]);
           $breadcrumbs->addItem("show");
@@ -668,14 +669,14 @@ class PedagogicalScenarioController extends Controller
         break;
 
         case "new":
-          $breadcrumbs->addRouteItem("pedagogicalScenario", "pedagogicalscenario_index", [
+          $breadcrumbs->addRouteItem("pedagogicalScenarios", "pedagogicalscenario_index", [
               'userRole' => ($this->get('security.authorization_checker')->isGranted('ROLE_PEDAGOGICAL_ENGINEER')?"pedagogical-engineer":"teacher")
           ]);
           $breadcrumbs->addItem("pedagogicalScenario.new");
         break;
 
         case "edit":
-          $breadcrumbs->addRouteItem("pedagogicalScenario", "pedagogicalscenario_index", [
+          $breadcrumbs->addRouteItem("pedagogicalScenarios", "pedagogicalscenario_index", [
               'userRole' => ($this->get('security.authorization_checker')->isGranted('ROLE_PEDAGOGICAL_ENGINEER')?"pedagogical-engineer":"teacher")
           ]);
           $breadcrumbs->addItem("edit");
@@ -683,7 +684,7 @@ class PedagogicalScenarioController extends Controller
         break;
 
         case "training_courses_management":
-          $breadcrumbs->addRouteItem("pedagogicalScenario", "pedagogicalscenario_index", [
+          $breadcrumbs->addRouteItem("pedagogicalScenarios", "pedagogicalscenario_index", [
               'userRole' => ($this->get('security.authorization_checker')->isGranted('ROLE_PEDAGOGICAL_ENGINEER')?"pedagogical-engineer":"teacher")
           ]);
           $breadcrumbs->addRouteItem($pedagogicalScenario->getShortname(), "pedagogicalscenario_show", [
@@ -694,14 +695,18 @@ class PedagogicalScenarioController extends Controller
         break;
 
         case "define_teachers":
-          $breadcrumbs->addRouteItem("pedagogicalScenario", "pedagogicalscenario_index", [
+          $breadcrumbs->addRouteItem("pedagogicalScenarios", "pedagogicalscenario_index", [
               'userRole' => ($this->get('security.authorization_checker')->isGranted('ROLE_PEDAGOGICAL_ENGINEER')?"pedagogical-engineer":"teacher")
           ]);
+          $breadcrumbs->addRouteItem($pedagogicalScenario->getShortname(), "pedagogicalscenario_show", [
+              'userRole' => ($this->get('security.authorization_checker')->isGranted('ROLE_PEDAGOGICAL_ENGINEER')?"pedagogical-engineer":"teacher"),
+              'id' => $pedagogicalScenario->getId()
+          ]);
           $breadcrumbs->addItem("teachersManagement");
         break;
 
         case "design":
-          $breadcrumbs->addRouteItem("pedagogicalScenario", "pedagogicalscenario_index", [
+          $breadcrumbs->addRouteItem("pedagogicalScenarios", "pedagogicalscenario_index", [
               'userRole' => ($this->get('security.authorization_checker')->isGranted('ROLE_PEDAGOGICAL_ENGINEER')?"pedagogical-engineer":"teacher")
           ]);
           $breadcrumbs->addRouteItem($pedagogicalScenario->getShortname(), "pedagogicalscenario_show", [
@@ -711,7 +716,7 @@ class PedagogicalScenarioController extends Controller
           $breadcrumbs->addItem("design");
         break;
         case 'answers_view':
-          $breadcrumbs->addRouteItem("pedagogicalScenario", "pedagogicalscenario_index", [
+          $breadcrumbs->addRouteItem("pedagogicalScenarios", "pedagogicalscenario_index", [
               'userRole' => ($this->get('security.authorization_checker')->isGranted('ROLE_PEDAGOGICAL_ENGINEER')?"pedagogical-engineer":"teacher")
           ]);
           $breadcrumbs->addRouteItem($pedagogicalScenario->getShortname(), "pedagogicalscenario_show", [
@@ -722,10 +727,13 @@ class PedagogicalScenarioController extends Controller
               'userRole' => ($this->get('security.authorization_checker')->isGranted('ROLE_PEDAGOGICAL_ENGINEER')?"pedagogical-engineer":"teacher"),
               'id'       => $pedagogicalScenario->getId()
           ]);
-          $breadcrumbs->addItem("answer_view");
+          $breadcrumbs->addRouteItem($scenarisationStage->getTitle(), "scenarisation_stage_show", [
+              'id'       => $scenarisationStage->getId()
+          ]);
+          $breadcrumbs->addItem("answersView");
         break;
-        case 'answer_edit':
-          $breadcrumbs->addRouteItem("pedagogicalScenario", "pedagogicalscenario_index", [
+        case 'answers_edit':
+          $breadcrumbs->addRouteItem("pedagogicalScenarios", "pedagogicalscenario_index", [
               'userRole' => ($this->get('security.authorization_checker')->isGranted('ROLE_PEDAGOGICAL_ENGINEER')?"pedagogical-engineer":"teacher")
           ]);
           $breadcrumbs->addRouteItem($pedagogicalScenario->getShortname(), "pedagogicalscenario_show", [
@@ -736,7 +744,10 @@ class PedagogicalScenarioController extends Controller
               'userRole' => ($this->get('security.authorization_checker')->isGranted('ROLE_PEDAGOGICAL_ENGINEER')?"pedagogical-engineer":"teacher"),
               'id'       => $pedagogicalScenario->getId()
           ]);
-          $breadcrumbs->addItem("answer_view");
+          $breadcrumbs->addRouteItem($scenarisationStage->getTitle(), "scenarisation_stage_show", [
+              'id'       => $scenarisationStage->getId()
+          ]);
+          $breadcrumbs->addItem("answersEdit");
 
         break;
       }

src/ScenarioBundle/Controller/ProjectController.php

@@ -190,7 +190,7 @@ class ProjectController extends Controller
         $dql_pedagogicalScenariosAvailable = $em->createQuery ('
         select ps
         FROM ScenarioBundle:PedagogicalScenario ps
-        WHERE ps.project != :currentProject');
+        WHERE ps.project != :currentProject or ps.project is null');
         $dql_pedagogicalScenariosAvailable->setParameter('currentProject', $project);
 
         // On récupère la liste des scénarios pédagogiques qui ont pour projet le projet courant
@@ -229,6 +229,7 @@ class ProjectController extends Controller
     private function createBreadcrumb($currentAction, $project = null)
     {
       $breadcrumbs = $this->get("white_october_breadcrumbs");
+      $breadcrumbs->addItem("admin");
       switch($currentAction)
       {
         case "index":

src/ScenarioBundle/Controller/TrainingCourseController.php

@@ -294,6 +294,7 @@ class TrainingCourseController extends Controller
     private function createBreadcrumb($currentAction, $trainingCourse = null)
     {
       $breadcrumbs = $this->get("white_october_breadcrumbs");
+      $breadcrumbs->addItem("admin");
       switch($currentAction)
       {
         case "index":

src/ScenarioBundle/Entity/PedagogicalScenario.php

@@ -199,8 +199,10 @@ class PedagogicalScenario
      *
      * @return PedagogicalScenario
      */
-    public function setProject(\ScenarioBundle\Entity\Project $project)
+    public function setProject(\ScenarioBundle\Entity\Project $project = null)
     {
+        if ($this->project != null)
+          $this->project->removePedagogicalScenario($this);
         // faudra faire un remove coco
         $this->project = $project;
 

src/ScenarioBundle/Resources/translations/messages.en.yml

 pedagogicalScenario:
-    new:  "Add a new pedagogical scenario"
-    list: "Pedagogical scenarios list"
-    edit: "Pedagogical scenario edit"
-    add:  "Pedagogical scenrio creation"
-    info: "Pedagogical scenario informations"
+    show:  "Show pedagogical scenario"
+    new:   "Add a new pedagogical scenario"
+    list:  "Pedagogical scenarios list"
+    editName:  "Pedagogical scenario edition"
+    editVerb: "Edit pedagogical scenario"
+    add:   "Pedagogical scenario creation"
+    info:  "Pedagogical scenario information"
+    design: "Design pedagogical scenario"
+    teachersManagement: ""
 
 project:
     new:  "Add a new project"
     list: "Projects list"
-    edit: "Project edit"
+    edit: "Project edition"
     add:  "Project creation"
-    info: "Project informations"
+    info: "Project information"
 
 trainingCourse:
     new:  "Add a new training course"
-    list: "Training training courses list"
-    edit: "Training training course edit"
-    add:  "Training training course creation"
-    info: "Training training course informations"
+    list: "Training courses list"
+    edit: "Training course edition"
+    add:  "Training course creation"
+    info: "Training course information"
     management: "Associated training courses"
+    link: "Link to training courses"

src/ScenarioBundle/Resources/translations/messages.es.yml

 pedagogicalScenario:
-    new:  "Create a new Pedagogical scenario"
-    list: "Pedagogical Scenarios list"
-    edit: ""
-    add:  ""
-    info: "Escenario pedagogico informationes"
+    show:  "Ver escenario pedagógico"
+    new:   "Crear un escenario pedagógico"
+    list:  "Lista de escenarios pedagógicos"
+    editName:  "Edicion de un escenario pedagógico"
+    editVerb: "Editar escenario pedagógico"
+    add:   "Creación de un escenario pedagógico"
+    info:  "Informaciones del escenario pedagógico"
+    design: "Diseñar escenario pedagógico"
+    teachersManagement: ""
 
 project:
-    new: ""
-    list: ""
-    edit: ""
-    add: ""
-    info: "Proyecto informationes"
+    new: "Crear un proyecto"
+    list: "Lista de proyectos"
+    edit: "Edicion de un proyecto"
+    add:  "Creación de un proyecto"
+    info: "Informaciones del proyecto"
 
 trainingCourse:
-    new: ""
-    list: ""
-    edit: ""
-    add: ""
-    info: "Training training course informationes"
-    management: ""
+    new: "Crear una formación"
+    list: "Lista de formaciones"
+    edit: "Edicion de una formación"
+    add:  "Creación de una formación"
+    info: "Informaciones de la formación"
+    management: "Formaciones asociadas"
+    link: "Asociar formaciones"

src/ScenarioBundle/Resources/translations/messages.fr.yml

 pedagogicalScenario:
-    new: "Ajouter un nouveau scénario pédagogique"
-    list: "Liste des scénarios pédagogiques"
-    edit: "Editer un scénario pédagogique"
-    add: "Ajout d'un scénario pédagogique"
-    info: "Informations d'un scénario pédagogique"
+    show:  "Voir scénario pédagogique"
+    new:   "Ajouter un nouveau scénario pédagogique"
+    list:  "Liste des scénarios pédagogiques"
+    editName:  "Edition d'un scénario pédagogique"
+    editVerb: "Editer scénario pédagogique"
+    add:   "Ajout d'un scénario pédagogique"
+    info:  "Informations du scénario pédagogique"
+    design: "Concevoir scénario pédagogique"
+    teachersManagement: "Gestion des enseignants concepteurs"
 
 project:
     new:  "Ajouter un nouveau projet"
     list: "Liste des projets"
     edit: "Editer un projet"
     add:  "Ajout d'un projet"
-    info: "Informations d'un projet"
+    info: "Informations du projet"
 
 trainingCourse:
     new:  "Ajouter une nouvelle formation"
     list: "Liste des formations"
     edit: "Editer une formation"
     add:  "Ajout d'une formation"
-    info: "Informations d'une formation"
-    management: "Formations associés"
+    info: "Informations de la formation"
+    management: "Formations associées"
+    link: "Associer formations"

src/ScenarioBundle/Resources/views/pedagogicalscenario/defineteachers.html.twig

@@ -5,61 +5,96 @@
 
 {% block body %}
 
-    <h1>{{'pedagogicalScenario.teachersManagement'|trans}}</h1>
-
-    <h2>{{ pedagogicalScenario.shortname }} - Enseignant référent : {{ pedagogicalScenario.referentTeacher.firstname }} {{ pedagogicalScenario.referentTeacher.lastname }} </h2>
-    <hr/>
-    <p> Liste des enseignants concevant le scénario pédagogique : </p>
+  <div class="panel-heading">
+    <h4>
+      <b>{{ 'pedagogicalScenario.teachersManagement'|trans }}</b>
+    </h4>
+    <h6>
+      {{'pedagogicalScenario'|trans}}
+      :
+      {{ pedagogicalScenario.shortname }}
+    </h6>
+    <h6>
+      {{'referentTeacher'|trans}}
+      :
+      {{ pedagogicalScenario.referentTeacher.firstname }}
+      {{ pedagogicalScenario.referentTeacher.lastname }}
+    </h6>
+  </div>
+  <div class="panel-body">
+    <p>
+      Liste des enseignants concevant le scénario pédagogique :
+    </p>
     {# Si le cours est designé par des enseignants #}
     {% if teachersDesigning is not empty %}
 
       {# On parcourt la liste des utilisateurs #}
-        <table class="table table-striped">
-              <thead>
-                  <tr>
-                      <th>{{'user'|trans}}</th>
-                      <th>{{'action'|trans}}</th>
-                  </tr>
-              </thead>
-              <tbody>
-                {# On affiche chacune des utilisateurs #}
-                {% for teacher in teachersDesigning %}
-                  <tr>
-                    <td>{{ teacher.lastname }} {{ teacher.firstname }}</td>
-                    <td><a href="{{ path('pedagogicalscenario_remove_teacher', {'userRole': currentRole, 'id' : pedagogicalScenario.id, 'teacher' : teacher.id}) }}">RETIRER</a></td>
-                  </tr>
-                {% endfor %}
-              </tbody>
-        </table>
-      {% else %}
-        <p> <i> &nbsp; &nbsp; Aucun enseignant inscrit dans la conception de ce scénario pédagogique </i> </p>
-      {% endif %}
+      <table class="table table-striped table-bordered">
+        <thead>
+          <tr>
+            <th>{{'user'|trans}}</th>
+            <th class="littleColumn">{{'actions'|trans}}</th>
+          </tr>
+        </thead>
+        <tbody>