Interface inicial do 2o loop da tarefa e file upload modificado para salvar numa pasta de sessão

Adabriand Furtado
1 parent 44e216fd
Showing 6 changed files with 144 additions and 52 deletions Show diff stats
corretor.py
main.py
pyutil.py
view/assets/css/main.css
view/img/thumbnail.png
view/template.html
@@ -39,6 +39,8 @@ class Corretor:
         template = self.env.get_template('template.html')
         project.info['task_presenter'] = template.render(server=self.config['HOST_ENDPOINT'])
         project.info['thumbnail'] = self.config['HOST_ENDPOINT'] + "/img/thumbnail.png"
+        project.info['sched'] = "incremental"
+        project.allow_anonymous_contributors = False
         pbclient.update_project(project)
     def create_project(self):
@@ -70,17 +72,26 @@ class Corretor:
         return '.' in filename and filename.rsplit('.', 1)[1] in allowed_extensions
     def upload_file(self):
+        upload_session_id = request.form['upload_session_id']
+        sign_name = request.form['sign_name']
         file = request.files['file']
         result_msg = ""
-        code = 200
-        if file and self.__allowed_file(file.filename):
+        code = 400
+        if (not pyutil.is_int(upload_session_id)):
+            result_msg = "Invalid upload session id: " + upload_session_id
+        elif file and not self.__allowed_file(file.filename):
+            result_msg = file.filename + " extension is not acceptable."
+        else:
             filename = secure_filename(file.filename)
-            file.save(os.path.join(self.config['UPLOAD_FOLDER'], filename))
+            upload_dir = os.path.join(self.config['UPLOAD_FOLDER'], upload_session_id)
+            if not os.path.exists(upload_dir):
+                os.makedirs(upload_dir)
+            uploaded_file = os.path.join(upload_dir, filename)
+            file.save(uploaded_file)
+            renamed_file = os.path.join(upload_dir, secure_filename(sign_name + "_CORRIGIDO.blend"))
+            os.rename(uploaded_file, renamed_file)
             # validar o .blend
+            code = 200
             result_msg = "File " + filename + " was uploaded."
-        else:
-            result_msg = file.filename + " extension is not acceptable."
-            code = 400
         pyutil.log(result_msg)
         return make_response(result_msg, code)
-    
@@ -42,7 +42,7 @@ def upload_file():
 @app.route("/finish_task", methods=["POST"])
 def finish_task():
-    # TODO
+    # TODO read - request.data['upload_session_id'] e request.data['sign_name']
     return
 def read_settings(app):
@@ -59,3 +59,10 @@ def print_stack_trace():
 def get_date_now():
     return datetime.datetime.now().strftime('%Y-%m-%dT%H:%M:%S')
+
+def is_int(string):
+    try:
+        int(string)
+        return True
+    except ValueError:
+        return False
@@ -37,11 +37,15 @@ video {
 }
 /* Body */
-#body-container {
+.body-container {
 	background: rgba(236, 238, 242, 1.0);
 	padding-bottom: 10px;
 }
+#approval-container {
+	display: none;
+}
+
 /* Tabela */
 .table-responsive {
 	border: none;
@@ -179,6 +183,11 @@ h6 {
 	padding-right: 40px;
 }
+#approval-task-container {
+	padding-top: 6px;
+	padding-right: 40px;
+}
+
 .finish-task-button {
 	float: right;
 	padding-bottom: 0px;
@@ -43,21 +43,23 @@
 		</table>
 	</div>
 	<div class="line-separator"></div>
-	<div id="body-container" class="row">
+	<div id="corretor-container" class="row body-container">
 		<div id="avatar-container" class="col-sm-6">
 			<div class="row">
-				<h6>ANIMAÇÃO ATUAL "<span class="sign-label"></span>":</h6>
+				<h6>
+					ANIMAÇÃO ATUAL "<span class="sign-label"></span>":
+				</h6>
 			</div>
 			<div class="row">
-				<video id="avatar-video" src=""
-					preload="metadata" class="video-body" autoplay loop controls>
+				<video id="avatar-video" src="" preload="metadata"
+					class="video-body" autoplay loop controls>
 					<source type="video/webm">
 				</video>
 			</div>
 			<div class="row">
-				<a id="blend-link" href="" 
-					class="btn btn-default" download>DOWNLOAD ARQUIVO DE ANIMAÇÃO
-					.BLENDER <img src="{{ server }}/img/blender.svg"
+				<a id="blend-link" href="" class="btn btn-default" download>DOWNLOAD
+					ARQUIVO DE ANIMAÇÃO .BLENDER <img
+					src="{{ server }}/img/blender.svg"
 					style="width: 22px; height: 22px"></img>
 				</a>
 			</div>
@@ -89,40 +91,23 @@
 		</div>
 		<div id="ref-container" class="col-sm-6">
 			<div class="row">
-				<h6>VÍDEO DE REFERÊNCIA “<span class="sign-label"></span>” :</h6>
+				<h6>
+					VÍDEO DE REFERÊNCIA “<span class="sign-label"></span>”:
+				</h6>
 			</div>
 			<div class="row">
-				<video id="ref-video" src=""
-					preload="metadata" class="video-body" autoplay loop controls>
-					<source type="video/mp4">
+				<video id="ref-video" src="" preload="metadata" class="video-body"
+					autoplay loop controls>
+					<source type="video/webm">
 				</video>
 			</div>
 			<div class="row">
-				<a id="ref-video-link" href=""
-					class="btn btn-default" download>DOWNLOAD VÍDEO DE REFERÊNCIA
-					DO SINAL <img src="{{ server }}/img/download.svg"
+				<a id="ref-video-link" href="" class="btn btn-default" download>DOWNLOAD
+					VÍDEO DE REFERÊNCIA DO SINAL <img
+					src="{{ server }}/img/download.svg"
 					style="width: 22px; height: 22px"></img>
 				</a>
 			</div>
-			<!-- 
-			<div class="row">
-				<h5>ENVIAR NOVO VÍDEO DE REFERÊNCIA DO SINAL:</h5>
-			</div>
-			<div class="row">
-				<div class="col-sm-6">
-					<a href="#" class="btn btn-file" type="input"> <img
-						src="{{ server }}/img/paperclip.svg"
-						style="width: 22px; height: 22px"></img> ENVIAR
-					</a>
-				</div>
-				<div class="col-sm-6">
-					<div class="progress">
-						<div class="progress-bar" role="progressbar" aria-valuenow="40"
-							aria-valuemin="0" aria-valuemax="100" style="width: 40%"></div>
-					</div>
-				</div>
-			</div>
-			 -->
 			<div id="finish-task-container" class="row">
 				<div id="finish-button" class="finish-task-button disabled-button ">
 					FINALIZAR<img class="icon" src="{{ server }}/img/finish.svg"></img>
@@ -133,10 +118,54 @@
 			</div>
 		</div>
 	</div>
+	<div id="approval-container" class="row body-container">
+		<div id="avatar-container" class="col-sm-6">
+			<div class="row">
+				<h6>
+					ANIMAÇÃO"<span class="sign-label"></span>":
+				</h6>
+			</div>
+			<div class="row">
+				<video id="avatar-video"
+					src="{{ server }}/videos/ENSINADO_AVATAR.webm" preload="metadata"
+					class="video-body" autoplay loop controls>
+					<source type="video/webm">
+				</video>
+			</div>
+		</div>
+		<div id="ref-container" class="col-sm-6">
+			<div class="row">
+				<h6>
+					VÍDEO DE REFERÊNCIA “<span class="sign-label"></span>”:
+				</h6>
+			</div>
+			<div class="row">
+				<video src="{{ server }}/videos/ENSINADO_REF.webm"
+					preload="metadata" class="video-body" autoplay loop controls>
+					<source type="video/mp4">
+				</video>
+			</div>
+			<div id="approval-task-container" class="row">
+				<div id="approved-button" class="finish-task-button enabled-button">
+					APROVADO<img class="icon" src="{{ server }}/img/finish.svg"></img>
+				</div>
+				<div id="fix-button" class="finish-task-button enabled-button">
+					CORRIGIR<img class="icon" src="{{ server }}/img/skip.svg"></img>
+				</div>
+			</div>
+		</div>
+	</div>
 </div>
 <script type="text/javascript">
 	var base_url = "{{ server }}/videos/";
+	var upload_session_id = generateSessionID();
+	var current_task_id = -1;
+
+	function generateSessionID() {
+		return (Math.random() + " ").substring(2, 10)
+				+ (Math.random() + " ").substring(2, 10);
+	}
 	function resetUploadProgress() {
 		$("#upload-progress .progress-bar").css("width", "0%");
@@ -146,8 +175,9 @@
 		$("#finish-button").removeClass("disabled-button");
 		$("#finish-button").addClass("enabled-button");
 		$("#finish-button").off("click").on("click", function() {
-			// enviar mensagem para exportar video
-			saveAnswer(task, deferred, "OK");
+			// endpoint - /finish_task
+			// enviar mensagem via POST para renderizar video - upload/<session_hash>/<task.info.sign_name>_CORRIGIDO.blend
+			saveAnswer(task, deferred, "FINISHED");
 		});
 	}
@@ -165,7 +195,10 @@
 		$("#file-upload").fileupload(
 				{
 					url : "{{ server }}/upload",
-					replaceFileInput : false,
+					formData : {
+						"upload_session_id" : upload_session_id,
+						'sign_name' : task.info.sign_name
+					},
 					add : function(e, data) {
 						resetUploadProgress();
 						$("#upload-file-name").text(data.files[0].name)
@@ -175,6 +208,7 @@
 						enableFinishButton(task, deferred);
 					},
 					progressall : function(e, data) {
+						//console.log(data);
 						var progress = parseInt(data.loaded / data.total * 100,
 								10);
 						$("#upload-progress .progress-bar").css("width",
@@ -186,15 +220,31 @@
 						disableFinishButton();
 					}
 				});
+
 		$("#upload-button").off("click").on("click", function() {
 			$("#file-upload").click();
 		});
 		$("#skip-button").off("click").on("click", function() {
 			saveAnswer(task, deferred, "SKIP");
 		});
+		$("#fix-button").off("click").on("click", function() {
+			$("#approval-container").hide();
+			$("#corretor-container").show();
+		});
+		$("#approved-button").off("click").on("click", function() {
+			saveAnswer(task, deferred, "FINISHED");
+		});
 	}
-	function saveAnswer(task, deferred, answer) {
+	function saveAnswer(task, deferred, status) {
+		var answer = {
+			"status" : status
+		};
+		if (status == "FINISHED") {
+			answer["last_edit_date"] = moment(new Date()).format(
+					"YYYY-MM-DDTHH:mm:ss")
+			answer["last_upload_session_id"] = upload_session_id;
+		}
 		pybossa.saveTask(task.id, answer).done(function() {
 			$("#success").fadeIn(500);
 			$("#main-container").hide();
@@ -203,26 +253,41 @@
 			}, 2000);
 		});
 	}
-	
-	function loadTaskInfo(info) {
-		var sign_name = info.sign_name;
+
+	function loadTaskInfo(task) {
+		current_task_id = task.id;
+		var sign_name = task.info.sign_name;
 		var blend_link = base_url + sign_name + "_AVATAR.blend";
 		var avatar_vid_link = base_url + sign_name + "_AVATAR.webm";
 		var ref_vid_link = base_url + sign_name + "_REF.webm";
 		$(".sign-label").text(sign_name);
-		$("#submission-date").text(moment(info.submission_date).format("DD/MM/YYYY"));
+		$("#submission-date").text(
+				moment(task.info.submission_date).format("DD/MM/YYYY"));
 		$("#avatar-video").attr("src", avatar_vid_link);
 		$("#ref-video").attr("src", ref_vid_link);
 		$("#ref-video-link").attr("href", ref_vid_link);
 		$("#blend-link").attr("href", blend_link);
+
+		var last_answer = task.info.last_answer;
+		var hasLastAnswer = typeof last_answer != "undefined";
+		if (hasLastAnswer && last_answer.status == "FINISHED") {
+			$("#last-edit-date").text(
+					moment(last_answer.last_edit_date).format("DD/MM/YYYY"));
+			$("#last-edit-by").text(last_answer.last_edit_by);
+		}
 	}
 	pybossa.presentTask(function(task, deferred) {
-		if (!$.isEmptyObject(task)) {
-			loadTaskInfo(task.info);
+		if (!$.isEmptyObject(task) && current_task_id != task.id) {
+			loadTaskInfo(task);
 			setupButtons(task, deferred);
 			$("#success").hide();
 			$("#main-container").fadeIn(500);
+			var hasLastAnswer = typeof task.info.last_answer != "undefined";
+			if (hasLastAnswer && task.info.last_answer.status == "FINISHED") {
+				$("#corretor-container").hide();
+				$("#approval-container").show();
+			}
 		} else {
 			$("#main-container").hide();
 			$("#finish").fadeIn(500);
	@@ -42,7 +42,7 @@ def upload_file():		@@ -42,7 +42,7 @@ def upload_file():
42		42
43	@app.route("/finish_task", methods=["POST"])	43	@app.route("/finish_task", methods=["POST"])
44	def finish_task():	44	def finish_task():
45	- # TODO	45	+ # TODO read - request.data['upload_session_id'] e request.data['sign_name']
46	return	46	return
47		47
48	def read_settings(app):	48	def read_settings(app):
	@@ -59,3 +59,10 @@ def print_stack_trace():		@@ -59,3 +59,10 @@ def print_stack_trace():
59		59
60	def get_date_now():	60	def get_date_now():
61	return datetime.datetime.now().strftime('%Y-%m-%dT%H:%M:%S')	61	return datetime.datetime.now().strftime('%Y-%m-%dT%H:%M:%S')
		62	+
		63	+def is_int(string):
		64	+ try:
		65	+ int(string)
		66	+ return True
		67	+ except ValueError:
		68	+ return False