From 81c4bec83aae37fad510502716b19779ab97a026 Mon Sep 17 00:00:00 2001
From: Adabriand Furtado <adabriand@gmail.com>
Date: Thu, 31 Mar 2016 16:15:31 -0300
Subject: [PATCH] Adicionado novos parâmetros na requisição finish_task.

---
 view/assets/js/tmpJSONParser.js |  9 +--------
 view/assets/js/wikilibras.js    | 36 +++++++++++++++++++++++-------------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/view/assets/js/tmpJSONParser.js b/view/assets/js/tmpJSONParser.js
index cdf8c93..9984456 100644
--- a/view/assets/js/tmpJSONParser.js
+++ b/view/assets/js/tmpJSONParser.js
@@ -3,15 +3,8 @@
   var base_parameter_json = {};
   var movement_parameter_json = {};
 
-  function _getLoggedUser() {
-    var pybossa_rembember_token = Cookies.get('remember_token');
-    var splitted_token_id = pybossa_rembember_token.split('|');
-    return splitted_token_id.length > 0 ? splitted_token_id[0]
-        : 'anonymous';
-  }
-
   function _setupBaseParameterJSON(tmpJSON) {
-    base_parameter_json['userId'] = _getLoggedUser();
+    base_parameter_json['userId'] = tmpJSON['userId'];
     base_parameter_json['sinal'] = tmpJSON['sinal'];
     base_parameter_json['interpolacao'] = 'normal';
     base_parameter_json['movimentos'] = [];
diff --git a/view/assets/js/wikilibras.js b/view/assets/js/wikilibras.js
index 1da44d4..6946767 100644
--- a/view/assets/js/wikilibras.js
+++ b/view/assets/js/wikilibras.js
@@ -12,6 +12,7 @@
 	function _setupTmpParameterJSON(sign_name) {
 		tmpParameterJSON = {
 			'sinal' : sign_name,
+			'userId' : _getLoggedUser(),
 			'facial' : {},
 			'right-hand' : {},
 			'left-hand' : {}
@@ -19,6 +20,13 @@
 		parsedParameterJSON = {};
 	}
 
+	function _getLoggedUser() {
+		var pybossa_rembember_token = Cookies.get('remember_token');
+		var splitted_token_id = pybossa_rembember_token.split('|');
+		return splitted_token_id.length > 0 ? splitted_token_id[0]
+				: 'anonymous';
+	}
+
 	function _loadTaskInfo(task) {
 		current_task_id = task.id;
 		var sign_name = task.info.sign_name;
@@ -329,12 +337,12 @@
 		$("#finish-button").show();
 
 		_submitParameterJSON(function() {
-		   $("#render-loading").fadeOut(300);
-		   $("#render-ref video").prop("controls", true);
-		   $("#render-ref video").get(0).play();
-		   $("#finish-button").removeClass("disabled");
-		   _showRenderedAvatar(parsedParameterJSON);
-		 });
+			$("#render-loading").fadeOut(300);
+			$("#render-ref video").prop("controls", true);
+			$("#render-ref video").get(0).play();
+			$("#finish-button").removeClass("disabled");
+			_showRenderedAvatar(parsedParameterJSON);
+		});
 	}
 
 	function _setupApprovalScreen(parameterJSON) {
@@ -417,7 +425,7 @@
 		answer["status"] = status;
 		var last_answer = task.info.last_answer;
 		var hasLastAnswer = typeof last_answer != "undefined";
-		
+
 		if (hasLastAnswer && status == "APPROVED") {
 			answer["number_of_approval"] = last_answer.number_of_approval + 1;
 			answer["parameter_json"] = last_answer.parameter_json;
@@ -435,6 +443,8 @@
 			data : {
 				"task_id" : task.id,
 				"project_id" : task.project_id,
+				"user_id" : _getLoggedUser(),
+				"sign_name" : task.info.sign_name,
 				"number_of_approval" : answer.number_of_approval,
 			},
 			success : function(response) {
@@ -462,14 +472,14 @@
 		// It removes the PyBossa default message
 		$(".row .col-md-12 p").remove();
 	}
-	
+
 	function _loadMainComponents() {
 		dynengine.load();
 		dynworkflow.load();
 		submitSign.setup(upload_signs_url);
 		teachedSigns.setup();
 	}
-	
+
 	pybossa.presentTask(function(task, deferred) {
 		_loadMainComponents();
 		if (!$.isEmptyObject(task) && current_task_id != task.id) {
@@ -488,8 +498,8 @@
 	}
 
 	// Public methods
-	wikilibras.run = function(serverhost, serverbackend, projectname,
-			apihost, uploadsignshost) {
+	wikilibras.run = function(serverhost, serverbackend, projectname, apihost,
+			uploadsignshost) {
 		base_url = serverhost;
 		server_backend_url = serverbackend;
 		videos_url = base_url + "/videos/";
@@ -514,11 +524,11 @@
 	wikilibras.enableIconCheck = function(container, isHover) {
 		_enableIconCheck(container, isHover);
 	}
-	
+
 	wikilibras.canHover = function(container) {
 		return _canHover(container);
 	}
-	
+
 	wikilibras.enableIconHover = function(container, isHover) {
 		_enableIconHover(container, isHover);
 	}
--
libgit2 0.21.2