Version 1.2.3

Мини исправление бага с заданиями radio-buttons

js/auto_mode.js

@@ -57,6 +57,10 @@ function auto_mode() {
 	test = document.getElementsByClassName('editableDiv');
 	answers = document.getElementsByClassName('correctAnsDiv');
 	if(test&&answers) fill_editable(test,answers);
+	//moveToken
+	test = document.getElementsByClassName('moveToken');
+	answers = document.getElementsByClassName('answerSentClass');
+	if(test&&answers) fill_sorting(test,answers);
 }
 //Заполнить задания, где есть selectBox
 function fill_selectbox(test,answers) { 
@@ -103,11 +107,11 @@ function fill_radio(test,answers) {
 			answer+=item1.innerHTML.replace(/(^\s*)|(\s*)$/g, '');
 			if(item1.innerHTML!=='-')answer+=' ';
 		});
-		answer=answer.replace(/(^\s*)|(\s*)$/g, '');
+		answer=answer.replace('/','').replace(/(^\s*)|(\s*)$/g, '');
 		var text_test_arr = Array.prototype.slice.call(test_arr[i].getElementsByClassName('optionText'));
 		if(text_test_arr) text_test_arr.forEach(function(item1,j) {
-			if(item1.innerHTML.includes(answer)) {
-				var c = item1.innerHTML.replace(answer, '');
+			if(item1.innerText.includes(answer)) {
+				var c = item1.innerText.replace(answer, '');
 				if( c.search(/[a-zA-Z]/) === -1 ) radio_arr[j].click();
 			}
 		});
@@ -150,16 +154,19 @@ function fill_pronunciation(test,answers) {
 function fill_phrases(test,answers) { 
 	var test_arr = Array.prototype.slice.call(test);
 	var answers_arr = Array.prototype.slice.call(answers);
+	var d = [];
+	if(answers_arr&&test_arr)answers_arr.forEach(function(item, i) {
+		Array.prototype.slice.call(item.getElementsByClassName('dndAnswerLineClass')).forEach(function(item) {d.push(item);});;
+	});
+	if(d.length>0)answers_arr=d;
 	var test_choises = document.getElementsByClassName('all-items-container')[0];
 	var txt_answers_arr = [];
 	if(test_choises){
 		var text_test_choises = Array.prototype.slice.call(test_choises.getElementsByClassName('ng-binding'));
 		test_choises=test_choises.getElementsByClassName('dragger');
 	}
-	if(answers_arr&&test_arr)answers_arr.forEach(function(item, i) {
-		txt_answers_arr = push_answer_b(answers,txt_answers_arr);
-	});
-	if(answers_arr&&test_arr)answers_arr.forEach(function(item, i) {
+	if(answers_arr&&test_arr)txt_answers_arr = push_answer_b(answers,txt_answers_arr);
+	if(answers_arr&&test_arr)test_arr.forEach(function(item, i) {
 		var lil = 0;
 		/*var text_answers_arr = Array.prototype.slice.call(answers_arr[i].getElementsByTagName('b'));
 		var a = "";
@@ -196,13 +203,38 @@ function fill_columns(test) {
 		if(test_arr[i+test_arr.length/2])if(test_arr[i+test_arr.length/2].checked)item.click();
 	});
 }
+//Заполнить задания, где надо перемещать
+function fill_sorting(test,answers) { 
+	var test_arr = Array.prototype.slice.call(test);
+	var answers_arr = Array.prototype.slice.call(answers);
+	if(test_arr&&answers_arr)test_arr.forEach(function(item, i) {
+		var text_test_choises = Array.prototype.slice.call(item.getElementsByClassName('ng-binding'));
+		var test_choises = Array.prototype.slice.call(item.getElementsByClassName('sorting_li ng-scope'));
+		var answer = answers_arr[i].innerHTML.replace(/<[^>]+>/g,'').replace(/(^\s*)|(\s*)$/g, '');
+		var size = text_test_choises.length;
+		var a = answer;
+		var b = "";
+		while (size > 0){
+			text_test_choises.forEach(function(item1, i) {
+				if(item1.innerHTML.toUpperCase().includes(a.toUpperCase())){
+					size--;
+					answer=answer.substring(a.length,answer.length).replace(/(^\s*)|(\s*)$/g, '');
+					a=answer;
+					b = b + test_choises[i].outerHTML;
+				}
+			});
+			a = a.substring(0,a.length-1);
+		}
+		item.innerHTML = b;
+	});
+}
 //Заполнить задания, где надо исправить ошибки
 function fill_editable(test,answers) { 
 	var test_buttons = document.getElementsByClassName('buttonContainer');
 	var test_arr = Array.prototype.slice.call(test);
 	var answers_arr = Array.prototype.slice.call(answers);
 	if(test_arr&&answers_arr)test_arr.forEach(function(item, i) {
-		test_buttons[i].getElementsByTagName('button')[1].click();
+		test_buttons[i].getElementsByTagName('button')[0].click();
 		if(!answers_arr[i].innerHTML.includes("No change"))
 			item.innerHTML=answers_arr[i].innerHTML.replace(/<[^>]+>/g,'');
 	});
@@ -213,7 +245,7 @@ function push_answer_b(answer_arr,answers_arr){
 	if(answers)answers.forEach(function(answers) {
 		if(answers){
 			var txt = answers.innerHTML+" ";
-			var answer = "";
+			var answer = " ";
 			var mode = 0;
 			var i = 0;
 			for(var i=0; i<txt.length;i++) {
@@ -224,6 +256,8 @@ function push_answer_b(answer_arr,answers_arr){
 							var b = txt.substring(i,txt.length);
 							if(b.startsWith("<b>")){
 								mode = 2;
+								answer+=" ";
+								if(answer.endsWith(" - "))answer=answer.substring(0,answer.length-3)+"-";
 							}
 						}
 						break;
@@ -231,8 +265,9 @@ function push_answer_b(answer_arr,answers_arr){
 						if(a === "<"){
 							var b = txt.substring(i,txt.length);
 							if(b.startsWith("</b>")){
+								if(answer.endsWith(" .")||answer.endsWith(" ,"))answer=answer.substring(0,answer.length-2)+answer.substring(answer.length-1,answer.length);
 								mode = 0;
-								if(!b.startsWith("</b><b>")){
+								if(!(b.startsWith("</b><b>")||b.startsWith("</b> <b>"))){
 									answer=answer.replace(/(^\s*)|(\s*)$/g, '');
 									answers_arr.push(answer);
 									answer = "";