From 1cf18a2c5e7297be622027f3483fd57dad16c666 Mon Sep 17 00:00:00 2001
From: Adabriand Furtado <adabriand@gmail.com>
Date: Mon, 14 Nov 2016 12:21:18 -0200
Subject: [PATCH] Handle for the new task model

---
 settings_local.py.tmpl          |  1 -
 view/js/helpers/video-helper.js | 10 ++++++++++
 view/js/submit-sign.js          |  2 +-
 view/js/wikilibras.js           | 14 ++++++++++++--
 wikilibras.py                   |  7 ++++---
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/settings_local.py.tmpl b/settings_local.py.tmpl
index 3490232..0ee4de1 100644
--- a/settings_local.py.tmpl
+++ b/settings_local.py.tmpl
@@ -5,7 +5,6 @@ SERVER_PORT = 8003
 AGREEMENT_NUMBER = 2
 API_HOST = "http://localhost:201"
 API_DB_HOST = "http://localhost:200"
-UPLOAD_SIGN_HOST = "http://localhost:200/addsinal"
 HOMEPAGE_URL = "http://localhost"
 
 # Apache Configuration
diff --git a/view/js/helpers/video-helper.js b/view/js/helpers/video-helper.js
index 5611c6c..b0eac42 100644
--- a/view/js/helpers/video-helper.js
+++ b/view/js/helpers/video-helper.js
@@ -5,6 +5,12 @@
 				+ '<source src="' + encodeURI(videoBaseUrl + '.mp4') + '" type="video/mp4">Sem suporte a vídeos';
 	}
 
+	function _getSourceByWebmUrl(webmUrl) {
+		var mp4Url = webmUrl.replace('.webm', '.mp4');
+		return '<source src="' + encodeURI(webmUrl) + '" type="video/webm">'
+				+ '<source src="' + encodeURI(mp4Url) + '" type="video/mp4">Sem suporte a vídeos';
+	}
+
 	function _controlVideo(elId, toPlay) {
 		if ($(elId).length === 0)
 			return;
@@ -27,4 +33,8 @@
 		return _getSource(videoBaseUrl);
 	};
 
+	videoHelper.getSourceByWebmUrl = function(webmUrl) {
+		return _getSourceByWebmUrl(webmUrl);
+	};
+
 }(window.videoHelper = window.videoHelper || {}, jQuery));
diff --git a/view/js/submit-sign.js b/view/js/submit-sign.js
index 9498f5d..6d17859 100644
--- a/view/js/submit-sign.js
+++ b/view/js/submit-sign.js
@@ -190,7 +190,7 @@
 	};
 
 	submitSign.setup = function(uploadSignHost, user) {
-		submitUrl = uploadSignHost;
+		submitUrl = uploadSignHost + "/addsinal";
 		loggedUser = user;
 		loadHtmlHelper.load('/submit-sign/submit-sign.html',
 				'#submit-sign-container', _setupSubmitSignForm);
diff --git a/view/js/wikilibras.js b/view/js/wikilibras.js
index 83bfb71..91cc5b7 100644
--- a/view/js/wikilibras.js
+++ b/view/js/wikilibras.js
@@ -33,9 +33,19 @@
 	function _loadTaskInfo(task) {
 		currentTaskId = task.id;
 		var signName = task.info.sign_name;
-		var baseRefVidUrl = videosUrl + signName + '_REF';
+		var videoRef = task.info.video_ref;
+		var videoSource = '';
+
+		if (isDemoTask) {
+			var baseRefVidUrl = videosUrl + signName + '_REF';
+			videoSource = videoHelper.getSource(baseRefVidUrl);
+		} else {
+			var webmVideoUrl = uploadSignsUrl + videoRef;
+			videoSource = videoHelper.getSourceByWebmUrl(webmVideoUrl);
+		}
+
 		$('.sign-label').text(signName);
-		$('.ref-video').html(videoHelper.getSource(baseRefVidUrl));
+		$('.ref-video').html(videoSource);
 		_setupTmpParameterJSON(task.info.sign_name);
 	}
 
diff --git a/wikilibras.py b/wikilibras.py
index 56b21c2..a8d25b9 100644
--- a/wikilibras.py
+++ b/wikilibras.py
@@ -18,7 +18,8 @@ class Wikilibras:
     def __create_tasks(self, project):
         test_signs = ["ENSINADO", "ENTANTO", "ENTENDIDO"]
         for sign in test_signs:
-            task = dict(sign_name=sign, submission_date=pyutil.get_date_now())
+            video_ref = "/videos/" + sign + "_REF.webm"
+            task = dict(sign_name=sign, submission_date=pyutil.get_date_now(), video_ref=video_ref)
             pbclient.create_task(project.id, task)
 
     def __setup_pb_client(self):
@@ -40,7 +41,7 @@ class Wikilibras:
             app_shortname = self.config['PYBOSSA_APP_SHORT_NAME'],
             api_host = self.config['API_HOST'],
             homepage_url = self.config['HOMEPAGE_URL'],
-            upload_sign_host = self.config['UPLOAD_SIGN_HOST']
+            upload_sign_host = self.config['API_DB_HOST']
         )
         project.info['thumbnail'] = self.config['HOST_STATIC_FILES_ENDPOINT'] + "/img/thumbnail.png"
         project.info['sched'] = "incremental"
@@ -68,7 +69,7 @@ class Wikilibras:
     def update_project(self):
         app_short_name = self.config['PYBOSSA_APP_SHORT_NAME']
         project = self.__find_project(app_short_name)
-	#self.__create_tasks(project)
+        #self.__create_tasks(project)
         self.__update_project_info(project)
         result_msg = "The project " + app_short_name + " was updated."
         pyutil.log(result_msg)
--
libgit2 0.21.2