From 9137006c609b4d4f98685ed53e9a64f2620ace39 Mon Sep 17 00:00:00 2001
From: Ruben van de Ven <git@rubenvandeven.com>
Date: Wed, 22 Jan 2020 20:40:08 +0100
Subject: [PATCH] Fix return/reject terminology

---
 sorteerhoed/central_management.py | 4 +++-
 www/worker_specs/index.html       | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sorteerhoed/central_management.py b/sorteerhoed/central_management.py
index cb2734b..92900a9 100644
--- a/sorteerhoed/central_management.py
+++ b/sorteerhoed/central_management.py
@@ -347,7 +347,7 @@ class CentralManagement():
 
                         elif signal.name == 'sqs.AssignmentReturned':
                             self.logger.info(f'Set status progress to returned')
-                            sqsAssignment.returned_at = datetime.datetime.strptime(signal.params['event']['EventTimestamp'],"%Y-%m-%dT%H:%M:%SZ")
+                            sqsAssignment.rejected_at = datetime.datetime.strptime(signal.params['event']['EventTimestamp'],"%Y-%m-%dT%H:%M:%SZ")
                             # {'event': {'HITGroupId': '301G7MYOAJ85NEW128ZDGF5DSBW53S', 'EventType': 'AssignmentReturned', 'EventTimestamp': '2019-10-23T20:16:47Z', 'HITId': '3IH9TRB0FBAKKZFP3JUD6D9YWQ1I1F', 'AssignmentId': '3BF51CHDTWLN3ZGHRKDUHFKPWIJ0H3', 'WorkerId': 'A1CK46PK9VEUH5', 'HITTypeId': '3EYXOXDEN7RX0YSMN4UMVN01AYKZJ0'}}
                         elif signal.name == 'sqs.AssignmentSubmitted':
                             # {'MessageId': '4b37dfdf-6a12-455d-a111-9a361eb54d88', 'ReceiptHandle': 'AQEBHc0yAdIrEmAV3S8TIoDCRxrItDEvjy0VQko56/Lb+ifszC0gdZ0Bbed24HGHZYr5DSnWkgBJ/H59ZXxFS1iVEH9sC8+YrmKKOTrKvW3gj6xYiBU2fBb8JRq+sEiNSxWLw2waxr1VYdpn/SWcoOJCv6PlS7P9EB/2IQ++rCklhVwV7RfARHy4J87bjk5R3+uEXUUi00INhCeunCbu642Mq4c239TFRHq3mwM6gkdydK+AP1MrXGKKAE1W5nMbwEWAwAN8KfoM1NkkUg5rTSYWmxxZMdVs/QRNcMFKVSf1bop2eCALSoG6l3Iu7+UXIl4HLh+rHp4bc8NoftbUJUii8YXeiNGU3wCM9T1kOerwYVgksK93KQrioD3ee8navYExQRXne2+TrUZUDkxRIdtPGA==', 'MD5OfBody': '01ccb1efe47a84b68704c4dc611a4d8d', 'Body': '{"Events":[{"Answer":"<?xml version=\\"1.0\\" encoding=\\"ASCII\\"?><QuestionFormAnswers xmlns=\\"http://mechanicalturk.amazonaws.com/AWSMechanicalTurkDataSchemas/2005-10-01/QuestionFormAnswers.xsd\\"><Answer><QuestionIdentifier>surveycode<\\/QuestionIdentifier><FreeText>test<\\/FreeText><\\/Answer><\\/QuestionFormAnswers>","HITGroupId":"301G7MYOAJ85NEW128ZDGF5DSBW53S","EventType":"AssignmentSubmitted","EventTimestamp":"2019-10-30T08:01:43Z","HITId":"3NSCTNUR2ZY42ZXASI4CS5YWV0S5AB","AssignmentId":"3ZAZR5XV02TTOCBR9MCLCNQV1XKCZL","WorkerId":"A1CK46PK9VEUH5","HITTypeId":"3EYXOXDEN7RX0YSMN4UMVN01AYKZJ0"}],"EventDocId":"34af4cd7f2829216f222d4b6e66f3a3ff9ad8ea6","SourceAccount":"600103077174","CustomerId":"A1CK46PK9VEUH5","EventDocVersion":"2014-08-15"}'}
@@ -580,6 +580,8 @@ class CentralManagement():
         a = self.currentHit.getLastAssignment()
         if not a:
             return False
+        if a.abandoned_at or a.rejected_at:
+            return False
         if self.currentHit.plotted_at: # wait till plotter is done
             return False
         return True
diff --git a/www/worker_specs/index.html b/www/worker_specs/index.html
index d4d47a0..6262cfa 100644
--- a/www/worker_specs/index.html
+++ b/www/worker_specs/index.html
@@ -46,7 +46,7 @@
 	<div class='transition' v-if="hit.hit_id" :class="[{'no_arrow': !hit.assignment}]">
 		<p v-if="!hit.assignment">waiting for worker</p>
 		<template v-else>
-			<p v-if="hit.assignment.returned_at || hit.assignment.abandoned_at">task abandoned</p>
+			<p v-if="hit.assignment.rejected_at || hit.assignment.abandoned_at">task abandoned</p>
 			<p v-else>task accepted</p>
 		</template>
 	</div>
@@ -55,13 +55,13 @@
 	<template v-if="hit.assignment">
 
 	<div class='state' v-if="hit.assignment"
-		:class="[{'assignment-hidden': hit.assignment.returned_at || hit.assignment.abandoned_at}]">
+		:class="[{'assignment-hidden': hit.assignment.rejected_at || hit.assignment.abandoned_at}]">
 
 			<h2>guest worker</h2>
 
 			<!-- IF statement of worker id al beschikbaar is -->
 			<p class="descriptor">worker id</p>
-			<p>test{{hit.assignment.worker_id}}</p>
+			<p>{{hit.assignment.worker_id}}</p>
 
 			<p class="descriptor">visiting from</p>
 			<!-- {{hit.assignment.turk_browser}} /   / {{hit.assignment.turk_os}}   ({{hit.assignment.turk_ip}}) -->