From 4c0de3c98d6f266d1984a86caf4ecf3d2b3f7894 Mon Sep 17 00:00:00 2001
From: juliotoscano <juliotoscanodebrito@gmail.com>
Date: Wed, 23 Nov 2016 09:40:14 -0300
Subject: [PATCH] modifying modal-exam for panel-exam #362

---
 courses/templates/subject/create.html            |   2 +-
 courses/templates/subject/form_view_teacher.html |   2 +-
 exam/static/js/Exam.js                           | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 exam/static/js/modalExam.js                      | 147 ---------------------------------------------------------------------------------------------------------------------------------------------------
 exam/templates/exam/create.html                  | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------
 5 files changed, 199 insertions(+), 218 deletions(-)
 create mode 100644 exam/static/js/Exam.js
 delete mode 100644 exam/static/js/modalExam.js

diff --git a/courses/templates/subject/create.html b/courses/templates/subject/create.html
index 6b4e9b8..a854739 100644
--- a/courses/templates/subject/create.html
+++ b/courses/templates/subject/create.html
@@ -4,7 +4,7 @@
 
 {% block breadcrumbs %}
     {{ block.super }}
-    {% breadcrumb 'Create subject' 'course:create_subject' %}  
+    {% breadcrumb 'Create subject' 'course:create_subject' %}
 {% endblock breadcrumbs %}
 
 {% block content %}
diff --git a/courses/templates/subject/form_view_teacher.html b/courses/templates/subject/form_view_teacher.html
index 18544b6..b1ca3b7 100644
--- a/courses/templates/subject/form_view_teacher.html
+++ b/courses/templates/subject/form_view_teacher.html
@@ -103,7 +103,7 @@
                 <li><a href="javascript:createForum('{% url 'course:forum:create' %}', '{{ topic.id }}')">{% trans 'Create Forum' %}</a></li>
                 <li><a href="javascript:modal.get('{% url 'course:poll:create_poll' topic.slug%}','#poll','#requisicoes_ajax');">{% trans 'Create Poll' %}</a></li>
                 <li><a href="javascript:modal.get('{% url 'course:exercise:create_exercise' topic.slug %}', '#createExercisesModal','#requisicoes_ajax')">{% trans 'Delivery Material' %}</a></li>
-                <li><a href="javascript:modal.get('{% url 'course:exam:create_exam' topic.slug%}','#exam','#requisicoes_ajax');">{% trans 'Create exam' %}</a></li>
+                <li><a href="{% url 'course:exam:create_exam' topic.slug %}">{% trans 'Create exam' %}</a></li>
               </ul>
             </div>
           </div>
diff --git a/exam/static/js/Exam.js b/exam/static/js/Exam.js
new file mode 100644
index 0000000..96ea05b
--- /dev/null
+++ b/exam/static/js/Exam.js
@@ -0,0 +1,146 @@
+//Insert Create select with question type
+  var idQuestionType = 1;
+  $("#addQuestion").on("click", function(event){
+    var element =
+    '<div class="row form-group" id="questionType_' + idQuestionType +'">' +
+    '<label for="questionType" class="col-md-2 control-label">' +
+    '{% trans "Question Type" %}</label>' + '<div class="col-md-10">' +
+          '<select id="questionType'+ idQuestionType +'" class="form-control" name="option_question" onchange="showDiv (this, '+ idQuestionType +')">' +
+            '<option selected disabled>{% trans "Question Type" %}</option>' +
+            '<option value="0">{% trans "Multiple Choice" %}</option>' +
+            '<option value="1">{% trans "True or False" %}</option>' +
+            '<option value="2">{% trans "Gap Filling" %}</option>' +
+            '<option value="3">{% trans "Discursive Question" %}</option>' +
+          '</select>' +
+        '</div>' +
+      '</div>' + '<hr id="hr_'+idQuestionType+'">'
+      ;
+      if (idQuestionType == 1){
+        $(element).insertAfter('#buttonAddQuestion');
+      }else{
+        var idhr = '#hr_'+(idQuestionType-1);
+        $(element).insertAfter(idhr);
+      }
+    idQuestionType++;
+  })
+
+  //Insert question choice
+  function showDiv (elem, questionType_id) {
+    if (elem.value == 0) {
+      var questionChoice =
+      '<div id="questionChoice_'+questionType_id+'">' +
+          '<div class="row form-group">'+
+            '<label for="question-name" class="col-md-2 control-label">Question</label>'+
+            '<div class="col-md-10">'+
+              '<textarea class="form-control" rows="1" id="question-name" placeholder="Wording"></textarea>'+
+            '</div>'+
+          '</div>'+
+          '<div class="row form-group">'+
+            '<label for="alternatives" class="col-md-2 control-label">Alternatives</label>'+
+            '<div class="col-md-10" id="radios_'+questionType_id+'">'+
+              '<div class="radio radio-primary form-group">'+
+                '<label>'+
+                  '<input checked type="radio" name="multiple-choice" id="alternative1" value="1">'+
+                  '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>'+
+                '</label>'+
+              '</div>'+
+              '<div class="radio radio-primary form-group">'+
+                '<label>'+
+                  '<input type="radio" name="multiple-choice" id="alternative2" value="2">'+
+                  '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>'+
+                '</label>'+
+              '</div>'+
+            '</div>'+
+          '</div>'+
+          '<div class="row form-group">'+
+            '<button type="button" class="btn btn-raised btn-primary" id="newAlternative_'+questionType_id+'" onclick="functionNewAlternative(radios_'+questionType_id+')">New Alternative</button>'+
+          '</div>'+
+        '</div>';
+    } else if (elem.value == 1) {
+      var questionChoice =
+        '<div id="questionChoice_'+questionType_id+'">'+
+              '<div class="row form-group">'+
+                '<label for="question-name" class="col-md-2 control-label">Question True or False</label>'+
+                '<div class="col-md-10">'+
+                  '<textarea class="form-control" rows="1" id="question-name" placeholder="Wording"></textarea>'+
+                '</div>'+
+              '</div>'+
+              '<div class="row form-group">'+
+                '<label for="alternative" class="col-md-2 control-label">Alternatives: T/F</label>'+
+                '<div class="col-md-10" id="radiosTF_'+questionType_id+'">'+
+                  '<div class="radio form-group" value="1">'+
+                    '<div class="radio">'+
+                        '<label>'+
+                        '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>'+
+                      '</label>'+
+                      '<label>'+
+                        '<input type="radio" name="true-or-false-1" value="T">'+
+                      '</label>'+
+                      '<label>'+
+                        '<input type="radio" name="true-or-false-1" value="F">'+
+                      '</label>'+
+                    '</div>'+
+                  '</div>'+
+                  '<div class="radio form-group" value="2">'+
+                      '<label>'+
+                        '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>'+
+                      '</label>'+
+                      '<label>'+
+                        '<input type="radio" name="true-or-false-2" value="T">'+
+                      '</label>'+
+                      '<label>'+
+                       '<input type="radio" name="true-or-false-2" value="F">'+
+                      '</label>'+
+                    '</div>'+
+                  '</div>'+
+                '</div>'+
+              '<div class="row form-group">'+
+                '<button type="button" class="btn btn-raised btn-primary" id="newAlternative_'+questionType_id+'" onclick="functionNewAlternativeTF(radiosTF_'+questionType_id+')">New Alternative</button>'+
+              '</div>'+
+            '</div>';
+    } else if (elem.value == 3) {
+      var questionChoice =
+      '<div id="questionChoice_'+questionType_id+'">'+
+        '<div class="row form-group">'+
+          '<label for="question-name" class="col-md-2 control-label">Name Question discursive</label>'+
+          '<div class="col-md-10">'+
+            '<textarea class="form-control" rows="2" id="question" placeholder="Wording"></textarea>'+
+          '</div>'+
+        '</div>'+
+      '</div>';
+    }
+    if(document.getElementById('questionChoice_'+ questionType_id)){
+      $('#questionChoice_'+ questionType_id).detach();
+    }
+    $(questionChoice).insertBefore('#hr_'+questionType_id);
+    $.material.init() //O material deve ser iniciado aqui para funcionar os botoes de radio.
+  }
+//Bug quando criamos sem ser na ordem
+function functionNewAlternative(Question_Id){
+  var alternative = parseInt($("div input").last().val()) + 1;
+   var element = '<div class="radio radio-primary form-group">' +
+    '<label>' +
+      '<input type="radio" name="alternatives" id="alternative_'+alternative+'_'+Question_Id+'"' + 'value="'+alternative+'">' +
+        '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>' +
+      '</label>'+
+    '</div>';
+    $(Question_Id).append(element);
+    $.material.init() //O material deve ser iniciado aqui para funcionar os botoes de radio.
+}
+function functionNewAlternativeTF(Question_Id){
+  var alternative = parseInt($("div").last().val()) + 1;
+   var element =
+    '<div class="radio form-group">'+
+      '<label>'+
+        '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>'+
+      '</label>'+
+      '<label>'+
+        '<input type="radio" name="true-or-false-2" value="T">'+
+      '</label>'+
+      '<label>'+
+        '<input type="radio" name="true-or-false-2" value="F">'+
+      '</label>'+
+    '</div>';
+    $(Question_Id).append(element);
+    $.material.init() //O material deve ser iniciado aqui para funcionar os botoes de radio.
+}
\ No newline at end of file
diff --git a/exam/static/js/modalExam.js b/exam/static/js/modalExam.js
deleted file mode 100644
index 9f5a197..0000000
--- a/exam/static/js/modalExam.js
+++ /dev/null
@@ -1,147 +0,0 @@
-
-//Insert Create select with question type
-  var idQuestionType = 1;
-  $("#addQuestion").on("click", function(event){
-    var element =
-    '<div class="row form-group" id="questionType_' + idQuestionType +'">' +
-    '<label for="questionType" class="col-md-2 control-label">' +
-    '{% trans "Question Type" %}</label>' + '<div class="col-md-10">' +
-          '<select id="questionType'+ idQuestionType +'" class="form-control" name="option_question" onchange="showDiv (this, '+ idQuestionType +')">' +
-            '<option selected disabled>{% trans "Question Type" %}</option>' +
-            '<option value="0">{% trans "Multiple Choice" %}</option>' +
-            '<option value="1">{% trans "True or False" %}</option>' +
-            '<option value="2">{% trans "Gap Filling" %}</option>' +
-            '<option value="3">{% trans "Discursive Question" %}</option>' +
-          '</select>' +
-        '</div>' +
-      '</div>' + '<hr id="hr_'+idQuestionType+'">'
-      ;
-      if (idQuestionType == 1){
-        $(element).insertAfter('#buttonAddQuestion');
-      }else{
-        var idhr = '#hr_'+(idQuestionType-1);
-        $(element).insertAfter(idhr);
-      }
-    idQuestionType++;
-  })
-
-  //Insert question choice
-  function showDiv (elem, questionType_id) {
-    if (elem.value == 0) {
-      var questionChoice =
-      '<div id="questionChoice_'+questionType_id+'">' +
-          '<div class="row form-group">'+
-            '<label for="question-name" class="col-md-2 control-label">Question</label>'+
-            '<div class="col-md-10">'+
-              '<textarea class="form-control" rows="1" id="question-name" placeholder="Wording"></textarea>'+
-            '</div>'+
-          '</div>'+
-          '<div class="row form-group">'+
-            '<label for="alternatives" class="col-md-2 control-label">Alternatives</label>'+
-            '<div class="col-md-10" id="radios_'+questionType_id+'">'+
-              '<div class="radio radio-primary form-group">'+
-                '<label>'+
-                  '<input checked type="radio" name="multiple-choice" id="alternative1" value="1">'+
-                  '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>'+
-                '</label>'+
-              '</div>'+
-              '<div class="radio radio-primary form-group">'+
-                '<label>'+
-                  '<input type="radio" name="multiple-choice" id="alternative2" value="2">'+
-                  '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>'+
-                '</label>'+
-              '</div>'+
-            '</div>'+
-          '</div>'+
-          '<div class="form-group">'+
-            '<button type="button" class="btn btn-raised btn-primary" id="newAlternative_'+questionType_id+'" onclick="functionNewAlternative(radios_'+questionType_id+')">New Alternative</button>'+
-          '</div>'+
-        '</div>';
-    } else if (elem.value == 1) {
-      var questionChoice =
-        '<div id="questionChoice_'+questionType_id+'">'+
-              '<div class="row form-group">'+
-                '<label for="question-name" class="col-md-2 control-label">Question True or False</label>'+
-                '<div class="col-md-10">'+
-                  '<textarea class="form-control" rows="1" id="question-name" placeholder="Wording"></textarea>'+
-                '</div>'+
-              '</div>'+
-              '<div class="row form-group">'+
-                '<label for="alternative" class="col-md-2 control-label">Alternatives: T/F</label>'+
-                '<div class="col-md-10" id="radiosTF_'+questionType_id+'">'+
-                  '<div class="radio form-group" value="1">'+
-                    '<div class="radio">'+
-                        '<label>'+
-                        '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>'+
-                      '</label>'+
-                      '<label>'+
-                        '<input type="radio" name="true-or-false-1" value="T">'+
-                      '</label>'+
-                      '<label>'+
-                        '<input type="radio" name="true-or-false-1" value="F">'+
-                      '</label>'+
-                    '</div>'+
-                  '</div>'+
-                  '<div class="radio form-group" value="2">'+
-                      '<label>'+
-                        '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>'+
-                      '</label>'+
-                      '<label>'+
-                        '<input type="radio" name="true-or-false-2" value="T">'+
-                      '</label>'+
-                      '<label>'+
-                       '<input type="radio" name="true-or-false-2" value="F">'+
-                      '</label>'+
-                    '</div>'+
-                  '</div>'+
-                '</div>'+
-              '<div class="form-group">'+
-                '<button type="button" class="btn btn-raised btn-primary" id="newAlternative_'+questionType_id+'" onclick="functionNewAlternativeTF(radiosTF_'+questionType_id+')">New Alternative</button>'+
-              '</div>'+
-            '</div>';
-    } else if (elem.value == 3) {
-      var questionChoice =
-      '<div id="questionChoice_'+questionType_id+'">'+
-        '<div class="row form-group">'+
-          '<label for="question-name" class="col-md-2 control-label">Name Question discursive</label>'+
-          '<div class="col-md-10">'+
-            '<textarea class="form-control" rows="2" id="question" placeholder="Wording"></textarea>'+
-          '</div>'+
-        '</div>'+
-      '</div>';
-    }
-    if(document.getElementById('questionChoice_'+ questionType_id)){
-      $('#questionChoice_'+ questionType_id).detach();
-    }
-    $(questionChoice).insertBefore('#hr_'+questionType_id);
-    $.material.init() //O material deve ser iniciado aqui para funcionar os botoes de radio.
-  }
-//Bug quando criamos sem ser na ordem
-function functionNewAlternative(Question_Id){
-  var alternative = parseInt($("div input").last().val()) + 1;
-   var element = '<div class="radio radio-primary form-group">' +
-    '<label>' +
-      '<input type="radio" name="alternatives" id="alternative_'+alternative+'_'+Question_Id+'"' + 'value="'+alternative+'">' +
-        '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>' +
-      '</label>'+
-    '</div>';
-    $(Question_Id).append(element);
-    $.material.init() //O material deve ser iniciado aqui para funcionar os botoes de radio.
-}
-function functionNewAlternativeTF(Question_Id){
-  var alternative = parseInt($("div").last().val()) + 1;
-   var element =
-    '<div class="radio form-group">'+
-      '<label>'+
-        '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>'+
-      '</label>'+
-      '<label>'+
-        '<input type="radio" name="true-or-false-2" value="T">'+
-      '</label>'+
-      '<label>'+
-        '<input type="radio" name="true-or-false-2" value="F">'+
-      '</label>'+
-    '</div>';
-    $(Question_Id).append(element);
-    $.material.init() //O material deve ser iniciado aqui para funcionar os botoes de radio.
-}
\ No newline at end of file
diff --git a/exam/templates/exam/create.html b/exam/templates/exam/create.html
index 703e996..f999106 100644
--- a/exam/templates/exam/create.html
+++ b/exam/templates/exam/create.html
@@ -1,80 +1,62 @@
+{% extends 'subject/index.html' %}
 
-{% load i18n widget_tweaks dict_access static%}
+{% load i18n widget_tweaks static django_bootstrap_breadcrumbs %}
 
-{# {% block style %} #}
-  <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
-  <script src="{% static 'js/modalExam.js' %}"></script>
-  <!-- Init material Bootstrap -->
-  <script type="text/javascript">$.material.init()</script><!-- O botao radio volta a funcionar quando coloco essa função-->
-{# {% endblock %} #}
+{% block breadcrumbs %}
+    {{ block.super }}
+    {% breadcrumb 'Create exam' 'course:create_exam' %}
+{% endblock breadcrumbs %}
 
 {% block content %}
-<!-- Modal (remember to change the ids!!!) -->
-<div class="modal fade" id="exam" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-
-      <!-- Modal Header -->
-      <div class="modal-header">
-
-        {% block title_exam %}
-        <!-- Put your title here!!!  -->
-          <h4 class="modal-title" id="myModalLabel">{% trans "Create a Exam" %}</h4>
-        {% endblock title_exam %}
+<div class="panel panel-primary">
+  <div class="panel-heading">
+    <h4 class="panel-title" id="exam-title">{% trans "Create a Exam" %}</h4>
+  </div>
+  <div class="panel-body">
+    <div class="row form-group">
+      <label for="exam_name" class="col-md-2 control-label">{% trans "Exam Name" %}</label>
+      <div class="col-md-10">
+        <input type="text" name="exam_name" class="form-control" id="exam_name" placeholder="{% trans 'Exam Name' %}">
       </div>
-      <!-- Modal Body -->
-      <div class="modal-body">
-
-          {% block content_exam %}
-
-          <div class="panel-body">
-            <div class="row form-group">
-              <label for="exam_name" class="col-md-2 control-label">{% trans "Exam Name" %}</label>
-              <div class="col-md-10">
-                <input type="text" name="exam_name" class="form-control" id="exam_name" placeholder="{% trans 'Exam Name' %}">
-              </div>
-            </div>
-            <div class="row form-group">
-              <label for="begin_date" class="col-md-2 control-label">{% trans "Exam's begin date" %}</label>
-              <div class="col-md-10">
-                <input type="date" name="begin_date" class="form-control" id="begin_date" placeholder='{% trans "Begin Date" %}'>
-              </div>
-            </div>
-            <div class="row form-group">
-              <label for="end_date" class="col-md-2 control-label">{% trans "Exam's end date" %}</label>
-              <div class="col-md-10">
-                <input type="date" name="end_date" class="form-control" id="end_date" placeholder='{% trans "End Date" %}'>
-              </div>
-            </div>
-            <div class="row form-group">
-              <div class="col-md-10">
-                <div class="checkbox">
-                  <label>
-                    <input type="checkbox" name="checkbox"><span class="checkbox-material"></span> {% trans "Allow submissions after deadline?" %}
-                  </label>
-                </div>
-              </div>
-            </div>
-            <div class="row form-group" id="buttonAddQuestion">
-              <div class="col-md-10">
-                <button id="addQuestion" type="button" class="btn btn-raised btn-default">Add new question buton</button>
-              </div>
-            </div>
-            <!-- Modal Footer -->
-            <div class="modal-footer">
-              <!-- Don't remove that!!!  -->
-              <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
-              {% block button_save %}
-              <!-- Put curtom buttons here!!!  -->
-              <button type="submite" id="button" form="form" class="btn btn-primary btn-raised">{% trans "Create" %}</button>
-              {% endblock button_save %}
-            </div>
-
-
-          {% endblock content_exam %}
+    </div>
+    <div class="row form-group">
+      <label for="begin_date" class="col-md-2 control-label">{% trans "Exam's begin date" %}</label>
+      <div class="col-md-4">
+        <input type="date" name="begin_date" class="form-control" id="begin_date" placeholder='{% trans "Begin Date" %}'>
+      </div>
+      <label for="end_date" class="col-md-2 control-label">{% trans "Exam's end date" %}</label>
+      <div class="col-md-4">
+        <input type="date" name="end_date" class="form-control" id="end_date" placeholder='{% trans "End Date" %}'>
+      </div>
+    </div>
+    <div class="row form-group">
+      <div class="col-md-10">
+        <div class="checkbox">
+          <label>
+            <input type="checkbox" name="checkbox"><span class="checkbox-material"></span> {% trans "Allow submissions after deadline?" %}
+          </label>
+        </div>
+      </div>
+    </div>
+    <div class="row form-group" id="buttonAddQuestion">
+      <div class="col-md-10">
+        <button id="addQuestion" type="button" class="btn btn-raised btn-default">Add new question buton</button>
       </div>
     </div>
   </div>
+  <div class="panel-footer">
+    <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
+    {% block button_save %}
+    <!-- Put curtom buttons here!!!  -->
+    <button type="submite" id="button" form="form" class="btn btn-primary btn-raised">{% trans "Create" %}</button>
+    {% endblock button_save %}
+  </div>
 </div>
 
+{% block javascript %}
+  <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+  <script src="{% static 'js/Exam.js' %}"></script>
+  <!-- Init material Bootstrap -->
+  <script type="text/javascript">$.material.init()</script><!-- O botao radio volta a funcionar quando coloco essa função-->
+{% endblock %}
 {% endblock content %}
--
libgit2 0.21.2