Merge branch 'dev' of https://github.com/amadeusproject/amadeuslms into dev

Gustavo Bernardo
2 parents ca9cd1f3 d60d4b07
Showing 5 changed files with 45 additions and 79 deletions Show diff stats
amadeus/staticfiles/js/modal_exam.js
core/static/css/base/amadeus.css
exam/static/css/exam.css
exam/static/js/Exam.js
exam/templates/exam/create.html
@@ -1,43 +0,0 @@
-//controles do modal
-$(window).ready(function() { // utilizado para abrir o modal quando tiver tido algum erro no preenchimento do formulario
-  if($('.not_submited').length){
-      $('#exam').modal('show');
-  }
-});
-var Answer = {
-    init: function(url) { // utilizado para adicionar um novo campo de resposta
-      $.get(url, function(data){
-        $("#form").append(data);
-        var cont = 1;
-        $("#form div div div input").each(function(){
-                $(this).attr('name',cont++);
-        });
-      });
-    }
-};
-
-var Submite = {
-  post: function(url,dados){
-    $('#exam').modal('hide');
-      $.post(url,dados, function(data){
-      }).fail(function(data){
-        $("div.modal-backdrop.fade.in").remove();
-        $("#modal_exam").empty();
-        $("#modal_exam").append(data.responseText);
-      });
-  },
-  remove: function(url,dados, id_li_link){
-    $('#exam').modal('hide');
-      $.post(url,dados, function(data){
-        $(id_li_link).remove();
-        $("#modal_exam").empty();
-        $("div.modal-backdrop.fade.in").remove();
-      }).fail(function(){
-        $("#modal_exam").empty();
-        $("#modal_exam").append(data);
-        $('#exam').modal('show');
-      });
-  }
-}
-
-alert("essfd");
@@ -456,4 +456,4 @@ ul, li {
  
 #panel2 .col-md-2, #panel2 .col-md-10{
   padding-left: 0;
 -}
+}
 \ No newline at end of file
@@ -0,0 +1,3 @@
+.primary-label-TF{
+    padding-left: 0px;
+}
 \ No newline at end of file
-//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) {
@@ -53,7 +28,9 @@
             '</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 class="col-md-8 col-md-offset-2">'+
+              '<button type="button" class="btn btn-raised btn-primary" id="newAlternative_'+questionType_id+'" onclick="functionNewAlternative(radios_'+questionType_id+')">New Alternative</button>'+
+            '</div>'+
           '</div>'+
         '</div>';
     } else if (elem.value == 1) {
@@ -68,9 +45,8 @@
               '<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>'+
+                  '<div class="radio radio-primary form-group" value="1">'+
+                      '<label class="primary-label-TF">'+
                         '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>'+
                       '</label>'+
                       '<label>'+
@@ -79,10 +55,9 @@
                       '<label>'+
                         '<input type="radio" name="true-or-false-1" value="F">'+
                       '</label>'+
-                    '</div>'+
                   '</div>'+
-                  '<div class="radio form-group" value="2">'+
-                      '<label>'+
+                  '<div class="radio radio-primary form-group" value="2">'+
+                      '<label class="primary-label-TF">'+
                         '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>'+
                       '</label>'+
                       '<label>'+
@@ -91,11 +66,13 @@
                       '<label>'+
                        '<input type="radio" name="true-or-false-2" value="F">'+
                       '</label>'+
-                    '</div>'+
                   '</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 class="col-md-8 col-md-offset-2">'+
+                  '<button type="button" class="btn btn-raised btn-primary" id="newAlternative_'+questionType_id+'" onclick="functionNewAlternativeTF(radiosTF_'+questionType_id+')">New Alternative</button>'+
+                '</div>'+
               '</div>'+
             '</div>';
     } else if (elem.value == 3) {
@@ -113,6 +90,7 @@
       $('#questionChoice_'+ questionType_id).detach();
     }
     $(questionChoice).insertBefore('#hr_'+questionType_id);
+    $('.primary-label-TF').css('padding-left', '0px');
     $.material.init() //O material deve ser iniciado aqui para funcionar os botoes de radio.
   }
 //Bug quando criamos sem ser na ordem
@@ -131,7 +109,7 @@ function functionNewAlternativeTF(Question_Id){
   var alternative = parseInt($("div").last().val()) + 1;
    var element =
     '<div class="radio form-group">'+
-      '<label>'+
+      '<label class="primary-label-TF" >'+
         '<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>'+
       '</label>'+
       '<label>'+
@@ -142,5 +120,6 @@ function functionNewAlternativeTF(Question_Id){
       '</label>'+
     '</div>';
     $(Question_Id).append(element);
+    $('.primary-label-TF').css('padding-left', '0px');
     $.material.init() //O material deve ser iniciado aqui para funcionar os botoes de radio.
 }
 \ No newline at end of file
@@ -55,6 +55,33 @@
  
 {% block javascript %}
   <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
+  <script type="text/javascript">
+    //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++;
+    })
+  </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-->
...	...	@@ -1,43 +0,0 @@
1		-//controles do modal
2		-$(window).ready(function() { // utilizado para abrir o modal quando tiver tido algum erro no preenchimento do formulario
3		- if($('.not_submited').length){
4		- $('#exam').modal('show');
5		- }
6		-});
7		-var Answer = {
8		- init: function(url) { // utilizado para adicionar um novo campo de resposta
9		- $.get(url, function(data){
10		- $("#form").append(data);
11		- var cont = 1;
12		- $("#form div div div input").each(function(){
13		- $(this).attr('name',cont++);
14		- });
15		- });
16		- }
17		-};
18		-
19		-var Submite = {
20		- post: function(url,dados){
21		- $('#exam').modal('hide');
22		- $.post(url,dados, function(data){
23		- }).fail(function(data){
24		- $("div.modal-backdrop.fade.in").remove();
25		- $("#modal_exam").empty();
26		- $("#modal_exam").append(data.responseText);
27		- });
28		- },
29		- remove: function(url,dados, id_li_link){
30		- $('#exam').modal('hide');
31		- $.post(url,dados, function(data){
32		- $(id_li_link).remove();
33		- $("#modal_exam").empty();
34		- $("div.modal-backdrop.fade.in").remove();
35		- }).fail(function(){
36		- $("#modal_exam").empty();
37		- $("#modal_exam").append(data);
38		- $('#exam').modal('show');
39		- });
40		- }
41		-}
42		-
43		-alert("essfd");
...	...	@@ -456,4 +456,4 @@ ul, li {
456	456
457	457	#panel2 .col-md-2, #panel2 .col-md-10{
458	458	padding-left: 0;
459	459	-}
	460	+}
460	461	\ No newline at end of file
...	...
...	...	@@ -0,0 +1,3 @@
	1	+.primary-label-TF{
	2	+ padding-left: 0px;
	3	+}
0	4	\ No newline at end of file
...	...
1		-//Insert Create select with question type
2		- var idQuestionType = 1;
3		- $("#addQuestion").on("click", function(event){
4		- var element =
5		- '<div class="row form-group" id="questionType_' + idQuestionType +'">' +
6		- '<label for="questionType" class="col-md-2 control-label">' +
7		- '{% trans "Question Type" %}</label>' + '<div class="col-md-10">' +
8		- '<select id="questionType'+ idQuestionType +'" class="form-control" name="option_question" onchange="showDiv (this, '+ idQuestionType +')">' +
9		- '<option selected disabled>{% trans "Question Type" %}</option>' +
10		- '<option value="0">{% trans "Multiple Choice" %}</option>' +
11		- '<option value="1">{% trans "True or False" %}</option>' +
12		- '<option value="2">{% trans "Gap Filling" %}</option>' +
13		- '<option value="3">{% trans "Discursive Question" %}</option>' +
14		- '</select>' +
15		- '</div>' +
16		- '</div>' + '<hr id="hr_'+idQuestionType+'">'
17		- ;
18		- if (idQuestionType == 1){
19		- $(element).insertAfter('#buttonAddQuestion');
20		- }else{
21		- var idhr = '#hr_'+(idQuestionType-1);
22		- $(element).insertAfter(idhr);
23		- }
24		- idQuestionType++;
25		- })
26	1
27	2	//Insert question choice
28	3	function showDiv (elem, questionType_id) {
...	...	@@ -53,7 +28,9 @@
53	28	'</div>'+
54	29	'</div>'+
55	30	'<div class="row form-group">'+
56		- '<button type="button" class="btn btn-raised btn-primary" id="newAlternative_'+questionType_id+'" onclick="functionNewAlternative(radios_'+questionType_id+')">New Alternative</button>'+
	31	+ '<div class="col-md-8 col-md-offset-2">'+
	32	+ '<button type="button" class="btn btn-raised btn-primary" id="newAlternative_'+questionType_id+'" onclick="functionNewAlternative(radios_'+questionType_id+')">New Alternative</button>'+
	33	+ '</div>'+
57	34	'</div>'+
58	35	'</div>';
59	36	} else if (elem.value == 1) {
...	...	@@ -68,9 +45,8 @@
68	45	'<div class="row form-group">'+
69	46	'<label for="alternative" class="col-md-2 control-label">Alternatives: T/F</label>'+
70	47	'<div class="col-md-10" id="radiosTF_'+questionType_id+'">'+
71		- '<div class="radio form-group" value="1">'+
72		- '<div class="radio">'+
73		- '<label>'+
	48	+ '<div class="radio radio-primary form-group" value="1">'+
	49	+ '<label class="primary-label-TF">'+
74	50	'<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>'+
75	51	'</label>'+
76	52	'<label>'+
...	...	@@ -79,10 +55,9 @@
79	55	'<label>'+
80	56	'<input type="radio" name="true-or-false-1" value="F">'+
81	57	'</label>'+
82		- '</div>'+
83	58	'</div>'+
84		- '<div class="radio form-group" value="2">'+
85		- '<label>'+
	59	+ '<div class="radio radio-primary form-group" value="2">'+
	60	+ '<label class="primary-label-TF">'+
86	61	'<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>'+
87	62	'</label>'+
88	63	'<label>'+
...	...	@@ -91,11 +66,13 @@
91	66	'<label>'+
92	67	'<input type="radio" name="true-or-false-2" value="F">'+
93	68	'</label>'+
94		- '</div>'+
95	69	'</div>'+
96	70	'</div>'+
	71	+ '</div>'+
97	72	'<div class="row form-group">'+
98		- '<button type="button" class="btn btn-raised btn-primary" id="newAlternative_'+questionType_id+'" onclick="functionNewAlternativeTF(radiosTF_'+questionType_id+')">New Alternative</button>'+
	73	+ '<div class="col-md-8 col-md-offset-2">'+
	74	+ '<button type="button" class="btn btn-raised btn-primary" id="newAlternative_'+questionType_id+'" onclick="functionNewAlternativeTF(radiosTF_'+questionType_id+')">New Alternative</button>'+
	75	+ '</div>'+
99	76	'</div>'+
100	77	'</div>';
101	78	} else if (elem.value == 3) {
...	...	@@ -113,6 +90,7 @@
113	90	$('#questionChoice_'+ questionType_id).detach();
114	91	}
115	92	$(questionChoice).insertBefore('#hr_'+questionType_id);
	93	+ $('.primary-label-TF').css('padding-left', '0px');
116	94	$.material.init() //O material deve ser iniciado aqui para funcionar os botoes de radio.
117	95	}
118	96	//Bug quando criamos sem ser na ordem
...	...	@@ -131,7 +109,7 @@ function functionNewAlternativeTF(Question_Id){
131	109	var alternative = parseInt($("div").last().val()) + 1;
132	110	var element =
133	111	'<div class="radio form-group">'+
134		- '<label>'+
	112	+ '<label class="primary-label-TF" >'+
135	113	'<textarea class="form-control" rows="1" placeholder="Write your alternative"></textarea>'+
136	114	'</label>'+
137	115	'<label>'+
...	...	@@ -142,5 +120,6 @@ function functionNewAlternativeTF(Question_Id){
142	120	'</label>'+
143	121	'</div>';
144	122	$(Question_Id).append(element);
	123	+ $('.primary-label-TF').css('padding-left', '0px');
145	124	$.material.init() //O material deve ser iniciado aqui para funcionar os botoes de radio.
146	125	}
147	126	\ No newline at end of file
...	...
...	...	@@ -55,6 +55,33 @@
55	55
56	56	{% block javascript %}
57	57	<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
	58	+ <script type="text/javascript">
	59	+ //Insert Create select with question type
	60	+ var idQuestionType = 1;
	61	+ $("#addQuestion").on("click", function(event){
	62	+ var element =
	63	+ '<div class="row form-group" id="questionType_' + idQuestionType +'">' +
	64	+ '<label for="questionType" class="col-md-2 control-label">' +
	65	+ '{% trans "Question Type" %}</label>' + '<div class="col-md-10">' +
	66	+ '<select id="questionType'+ idQuestionType +'" class="form-control" name="option_question" onchange="showDiv (this, '+ idQuestionType +')">' +
	67	+ '<option selected disabled>{% trans "Question Type" %}</option>' +
	68	+ '<option value="0">{% trans "Multiple Choice" %}</option>' +
	69	+ '<option value="1">{% trans "True or False" %}</option>' +
	70	+ '<option value="2">{% trans "Gap Filling" %}</option>' +
	71	+ '<option value="3">{% trans "Discursive Question" %}</option>' +
	72	+ '</select>' +
	73	+ '</div>' +
	74	+ '</div>' + '<hr id="hr_'+idQuestionType+'">'
	75	+ ;
	76	+ if (idQuestionType == 1){
	77	+ $(element).insertAfter('#buttonAddQuestion');
	78	+ }else{
	79	+ var idhr = '#hr_'+(idQuestionType-1);
	80	+ $(element).insertAfter(idhr);
	81	+ }
	82	+ idQuestionType++;
	83	+ })
	84	+ </script>
58	85	<script src="{% static 'js/Exam.js' %}"></script>
59	86	<!-- Init material Bootstrap -->
60	87	<script type="text/javascript">$.material.init()</script><!-- O botao radio volta a funcionar quando coloco essa função-->
...	...