From 63ea452f171449e43d006eeeeb8aa73888998a96 Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Wed, 29 Jun 2016 16:45:56 -0700
Subject: [PATCH 01/40] Add form to contact workers with

---
 expdj/apps/turk/forms.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/expdj/apps/turk/forms.py b/expdj/apps/turk/forms.py
index eb35dad..d5674a3 100644
--- a/expdj/apps/turk/forms.py
+++ b/expdj/apps/turk/forms.py
@@ -31,3 +31,12 @@ def __init__(self, *args, **kwargs):
         self.helper.layout = Layout()
         tab_holder = TabHolder()
         self.helper.add_input(Submit("submit", "Save"))
+
+class WorkerContactForm(forms.Form):
+    subject = forms.CharField(label="Subject")
+    message = forms.CharField(label="Message")
+
+    def __init__(self, *args, **kwargs):
+        super(ContactForm, self).__init__(*args, **kwargs)
+        self.helper = FormHelper(self)
+        self.helper.add_input(Submit("submit", "Send"))

From dc1a96551dd661c2f2f2c0a1b290b35dbcf65265 Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Wed, 29 Jun 2016 16:47:04 -0700
Subject: [PATCH 02/40] add contact worker function to assignment model, this
 model has access to all the information we need to generate connections and
 send information to workers. Add contact worker view to handle creating and
 processing the form

---
 expdj/apps/turk/models.py | 13 +++++++-
 expdj/apps/turk/views.py  | 69 +++++++++++++++++++++++++++++----------
 2 files changed, 63 insertions(+), 19 deletions(-)

diff --git a/expdj/apps/turk/models.py b/expdj/apps/turk/models.py
index 5319836..2d54ce4 100644
--- a/expdj/apps/turk/models.py
+++ b/expdj/apps/turk/models.py
@@ -407,7 +407,6 @@ class Assignment(models.Model):
                                              (True, 'Completed')),
                                               default=False,verbose_name="participant completed the entire assignment")
 
-
     def create(self):
         init_connection_callback(sender=self.hit)
 
@@ -480,6 +479,18 @@ def update(self, mturk_assignment=None, hit=None):
 
         self.save()
 
+    def contact_worker(self, subject, msg):
+        '''contact_worker uses the boto function notify_workers to send a
+            message a specific worker.
+        :subject: Subject of the message to send.
+        :msg: Contents of the message to send.
+        '''
+        self.hit.generate_connection()
+        try:
+            self.hit.connection.notify_workers(self.worker.id, subject, msg)
+        except MTurkRequestError:
+            pass
+
     def __unicode__(self):
         return self.mturk_id
 
diff --git a/expdj/apps/turk/views.py b/expdj/apps/turk/views.py
index 6d12149..7bd9145 100644
--- a/expdj/apps/turk/views.py
+++ b/expdj/apps/turk/views.py
@@ -1,25 +1,32 @@
-from expdj.apps.experiments.views import check_battery_edit_permission, check_mturk_access, \
-get_battery_intro, deploy_battery
-from expdj.apps.turk.utils import get_connection, get_worker_url, get_host, get_worker_experiments
-from django.http.response import HttpResponseRedirect, HttpResponseForbidden, HttpResponse, Http404
-from django.shortcuts import get_object_or_404, render_to_response, render, redirect
-from expdj.apps.turk.tasks import assign_experiment_credit, get_unique_experiments
-from expdj.apps.experiments.utils import get_experiment_type, select_experiments
-from expdj.apps.turk.models import Worker, HIT, Assignment, Result, get_worker
-from expdj.apps.experiments.models import Battery, ExperimentTemplate
+from datetime import timedelta, datetime
+import json
+import os
+import requests
+
 from expfactory.battery import get_load_static, get_experiment_run
-from expdj.settings import BASE_DIR,STATIC_ROOT,MEDIA_ROOT
+from numpy.random import choice
+from optparse import make_option
+
 from django.contrib.auth.decorators import login_required
 from django.core.management.base import BaseCommand
-from django.views.decorators.csrf import ensure_csrf_cookie
-from expdj.apps.turk.forms import HITForm
-from datetime import timedelta, datetime
+from django.http.response import (HttpResponseRedirect, HttpResponseForbidden,
+    HttpResponse, Http404, HttpResponseNotAllowed)
+from django.shortcuts import get_object_or_404, render_to_response, render, redirect
 from django.utils import timezone
-from optparse import make_option
-from numpy.random import choice
-import requests
-import json
-import os
+from django.views.decorators.csrf import ensure_csrf_cookie
+
+from expdj.apps.experiments.models import (Assignment, Battery, 
+    ExperimentTemplate)
+from expdj.apps.experiments.views import (check_battery_edit_permission, 
+    check_mturk_access, get_battery_intro, deploy_battery)
+from expdj.apps.experiments.utils import get_experiment_type, select_experiments
+from expdj.apps.turk.forms import HITForm, WorkerContactForm
+from expdj.apps.turk.models import Worker, HIT, Assignment, Result, get_worker
+from expdj.apps.turk.tasks import (assign_experiment_credit,
+    check_battery_dependencies, get_unique_experiments)
+from expdj.apps.turk.utils import (get_connection, get_host, get_worker_url,
+    get_worker_experiments)
+from expdj.settings import BASE_DIR,STATIC_ROOT,MEDIA_ROOT
 
 media_dir = os.path.join(BASE_DIR,MEDIA_ROOT)
 
@@ -329,6 +336,32 @@ def edit_hit(request, bid, hid=None):
     else:
         return HttpResponseForbidden()
 
+@login_required
+def contact_worker(request, aid):
+    mturk_permission = check_mturk_access(request)
+
+    if mturk_permission == False:
+        return HttpResponseForbidden()
+
+    assignment = Assignments.objects.get(aid)
+    if request.method == "GET":
+        form = WorkerContactForm()
+        worker = assignment.worker
+        context = {
+            "form": form,
+            "worker": worker
+        }
+        return(request, "contact_worker_modal.html", context)
+    elif request.method == "POST":
+        form = WorkerContactForm(request.POST)
+        if form.is_valid():
+            subject = form.cleaned_data['subject']
+            message = form.cleaned_data['message']
+            assignment.contact_worker(subject, message)
+            return manage_hit(assignment.hit.battery.id, assignment.hit.id)
+    else:
+        return HttpResponseNotAllowed()
+
 # Expire a hit
 @login_required
 def expire_hit(request, hid):

From 7e31470b3dac3b0f7058e41257f45cf1ae428b0d Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Wed, 29 Jun 2016 16:48:03 -0700
Subject: [PATCH 03/40] temporary contact worker button in manage hit view,
 still missing modal support, and a proper url route

---
 expdj/apps/turk/templates/turk/manage_hit.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/expdj/apps/turk/templates/turk/manage_hit.html b/expdj/apps/turk/templates/turk/manage_hit.html
index d6e7fde..5b845ff 100644
--- a/expdj/apps/turk/templates/turk/manage_hit.html
+++ b/expdj/apps/turk/templates/turk/manage_hit.html
@@ -158,6 +158,7 @@ <h2>Approved</h2>
             <th>Worker ID</th>
             <th>Status</th>
             <th>Accept Time</th>
+            <th>Contact</th>
           </tr>
         </thead>
         <tbody>
@@ -167,6 +168,7 @@ <h2>Approved</h2>
           <td>{{ assignment.worker }}</td>
           <td>{{ assignment.status }}</td>
           <td>{{ assignment.accept_time | localize }}</td>
+          <td><a class='btn btn-xs btn-default' href='{% url 'contact_worker' %}'> Contact Worker</a></td>
         </tr>
         {% endfor %}
       </tbody>

From d551fe6f752921c889683be744f6910f4b445eac Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Thu, 30 Jun 2016 15:10:04 -0700
Subject: [PATCH 04/40] added template for contact worker form

---
 .../templates/turk/contact_worker_modal.html  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 expdj/apps/turk/templates/turk/contact_worker_modal.html

diff --git a/expdj/apps/turk/templates/turk/contact_worker_modal.html b/expdj/apps/turk/templates/turk/contact_worker_modal.html
new file mode 100644
index 0000000..8fdb15e
--- /dev/null
+++ b/expdj/apps/turk/templates/turk/contact_worker_modal.html
@@ -0,0 +1,19 @@
+{% load crispy_forms_tags %}
+<div class="modal-dialog modal-lg">
+    <div class="modal-content">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+            <h4 class="modal-title">Contact Worker {{ worker }}</h4>
+        </div>
+        <div class="modal-body">
+            <div>
+                <table class="table table-condensed table-striped">
+                    {% crispy form %}
+                </table>
+            </div>
+        </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        </div>
+    </div><!-- /.modal-content -->
+</div><!-- /.modal-dialog -->

From 23c3d9db58811e3a749adf004f7eb92fa8a8e3db Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Sun, 3 Jul 2016 15:32:10 -0700
Subject: [PATCH 05/40] fix import issues in turk views. Added url for contact
 worker. Added code to load contact worker view in manage_hit template

---
 .../apps/turk/templates/turk/manage_hit.html  |  9 ++++-
 expdj/apps/turk/urls.py                       | 39 ++++++++++++++-----
 expdj/apps/turk/utils.py                      | 18 ++++++---
 expdj/apps/turk/views.py                      |  5 +--
 4 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/expdj/apps/turk/templates/turk/manage_hit.html b/expdj/apps/turk/templates/turk/manage_hit.html
index 5b845ff..58e3d46 100644
--- a/expdj/apps/turk/templates/turk/manage_hit.html
+++ b/expdj/apps/turk/templates/turk/manage_hit.html
@@ -168,7 +168,7 @@ <h2>Approved</h2>
           <td>{{ assignment.worker }}</td>
           <td>{{ assignment.status }}</td>
           <td>{{ assignment.accept_time | localize }}</td>
-          <td><a class='btn btn-xs btn-default' href='{% url 'contact_worker' %}'> Contact Worker</a></td>
+          <td><a class='btn btn-xs btn-default contact_worker' href='{% url 'contact_worker' %}'> Contact Worker</a></td>
         </tr>
         {% endfor %}
       </tbody>
@@ -177,6 +177,8 @@ <h2>Approved</h2>
 </div>
 {% endif %}
         </article>
+        <div id="contact_modal" class="modal fade" tabindex="-1" role="dialog">
+        </div>
     </div>
 </div>
 {% endblock %}
@@ -192,6 +194,11 @@ <h2>Approved</h2>
   $('.collapse').collapse('hide');
 })
 
+$('.contact_worker').on("click", function(e) {
+    e.preventDefault();
+    $('#contact_modal').modal("show").load(this.href);
+});
+
 })
 </script>
 {% endblock %}
diff --git a/expdj/apps/turk/urls.py b/expdj/apps/turk/urls.py
index 1bdf124..73c84d8 100644
--- a/expdj/apps/turk/urls.py
+++ b/expdj/apps/turk/urls.py
@@ -1,6 +1,6 @@
-from expdj.apps.turk.views import edit_hit, delete_hit, expire_hit, preview_hit, \
-serve_hit, multiple_new_hit, end_assignment, finished_view, not_consent_view, \
-survey_submit, manage_hit
+from expdj.apps.turk.views import (edit_hit, delete_hit, expire_hit,
+    preview_hit, serve_hit, multiple_new_hit, end_assignment, finished_view,
+    not_consent_view, survey_submit, manage_hit, contact_worker)
 from expdj.apps.experiments.views import sync
 from django.views.generic.base import TemplateView
 from django.conf.urls import patterns, url
@@ -8,9 +8,21 @@
 urlpatterns = patterns('',
     # HITS
     url(r'^hits/(?P<bid>\d+|[A-Z]{8})/new$',edit_hit,name='new_hit'),
-    url(r'^hits/(?P<bid>\d+|[A-Z]{8})/(?P<hid>\d+|[A-Z]{8})/manage$',manage_hit,name='manage_hit'),
-    url(r'^hits/(?P<bid>\d+|[A-Z]{8})/multiple$',multiple_new_hit,name='multiple_new_hit'),
-    url(r'^hits/(?P<bid>\d+|[A-Z]{8})/(?P<hid>\d+|[A-Z]{8})/edit$',edit_hit,name='edit_hit'),
+    url(
+        r'^hits/(?P<bid>\d+|[A-Z]{8})/(?P<hid>\d+|[A-Z]{8})/manage$',
+        manage_hit,
+        name='manage_hit'
+    ),
+    url(
+        r'^hits/(?P<bid>\d+|[A-Z]{8})/multiple$',
+        multiple_new_hit,
+        name='multiple_new_hit'
+    ),
+    url(
+        r'^hits/(?P<bid>\d+|[A-Z]{8})/(?P<hid>\d+|[A-Z]{8})/edit$',
+        edit_hit,
+        name='edit_hit'
+    ),
     url(r'^hits/(?P<hid>\d+|[A-Z]{8})/delete$',delete_hit,name='delete_hit'),
     url(r'^hits/(?P<hid>\d+|[A-Z]{8})/expire$',expire_hit,name='expire_hit'),
 
@@ -18,9 +30,18 @@
     url(r'^accept/(?P<hid>\d+|[A-Z]{8})',serve_hit,name='serve_hit'),
     url(r'^turk/(?P<hid>\d+|[A-Z]{8})',preview_hit,name='preview_hit'),
     url(r'^turk/preview',not_consent_view,name='not_consent_view'),
-    url(r'^turk/end/(?P<rid>\d+|[A-Z]{8})',end_assignment,name='end_assignment'),
-    url(r'^surveys/(?P<rid>\d+|[A-Z]{8})/(?P<hid>[A-Za-z0-9]{30})/submit$',survey_submit,name='survey_submit'),
+    url(
+        r'^turk/end/(?P<rid>\d+|[A-Z]{8})',
+        end_assignment,
+        name='end_assignment'
+    ),
+    url(
+        r'^surveys/(?P<rid>\d+|[A-Z]{8})/(?P<hid>[A-Za-z0-9]{30})/submit$',
+        survey_submit,
+        name='survey_submit'
+    ),
     url(r'^sync/(?P<rid>\d+|[A-Z]{8})/$',sync,name='sync_data'),
     url(r'^sync/$',sync,name='sync_data'),
-    url(r'^finished$', finished_view, name="finished_view")
+    url(r'^finished$', finished_view, name="finished_view"),
+    url(r'^worker/contact/(?P<aid>\d+)',contact_worker,name='contact_worker')
 )
diff --git a/expdj/apps/turk/utils.py b/expdj/apps/turk/utils.py
index ad525ee..c8902f9 100644
--- a/expdj/apps/turk/utils.py
+++ b/expdj/apps/turk/utils.py
@@ -1,16 +1,19 @@
-from expdj.apps.experiments.models import Experiment
-from boto.mturk.connection import MTurkConnection
-from expdj.settings import BASE_DIR, MTURK_ALLOW
-from boto.mturk.question import ExternalQuestion
-from boto.mturk.price import Price
 import ConfigParser
 import datetime
-import pandas
 import json
 import os
 
+from boto.mturk.connection import MTurkConnection
+from boto.mturk.price import Price
+from boto.mturk.question import ExternalQuestion
+import pandas
+
 from django.conf import settings
 
+from expdj.apps.experiments.models import Experiment
+from expdj.settings import BASE_DIR, MTURK_ALLOW
+
+
 
 # RESULTS UTILS
 def to_dict(input_ordered_dict):
@@ -132,3 +135,6 @@ def get_time_difference(d1,d2,format='%Y-%m-%d %H:%M:%S'):
     if isinstance(d2,str):
         d2 = datetime.datetime.strptime(d2, format)
     return (d2 - d1).total_seconds() / 60
+
+
+
diff --git a/expdj/apps/turk/views.py b/expdj/apps/turk/views.py
index 7bd9145..335689c 100644
--- a/expdj/apps/turk/views.py
+++ b/expdj/apps/turk/views.py
@@ -15,15 +15,14 @@
 from django.utils import timezone
 from django.views.decorators.csrf import ensure_csrf_cookie
 
-from expdj.apps.experiments.models import (Assignment, Battery, 
-    ExperimentTemplate)
+from expdj.apps.experiments.models import (Battery, ExperimentTemplate)
 from expdj.apps.experiments.views import (check_battery_edit_permission, 
     check_mturk_access, get_battery_intro, deploy_battery)
 from expdj.apps.experiments.utils import get_experiment_type, select_experiments
 from expdj.apps.turk.forms import HITForm, WorkerContactForm
 from expdj.apps.turk.models import Worker, HIT, Assignment, Result, get_worker
 from expdj.apps.turk.tasks import (assign_experiment_credit,
-    check_battery_dependencies, get_unique_experiments)
+    get_unique_experiments)
 from expdj.apps.turk.utils import (get_connection, get_host, get_worker_url,
     get_worker_experiments)
 from expdj.settings import BASE_DIR,STATIC_ROOT,MEDIA_ROOT

From 786ef3b47620a662c90e63175be4802b06cb2c60 Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Sun, 3 Jul 2016 15:49:37 -0700
Subject: [PATCH 06/40] fixed a couple sytax issues

---
 expdj/apps/turk/forms.py | 2 +-
 expdj/apps/turk/views.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/expdj/apps/turk/forms.py b/expdj/apps/turk/forms.py
index d5674a3..4f7ccf3 100644
--- a/expdj/apps/turk/forms.py
+++ b/expdj/apps/turk/forms.py
@@ -37,6 +37,6 @@ class WorkerContactForm(forms.Form):
     message = forms.CharField(label="Message")
 
     def __init__(self, *args, **kwargs):
-        super(ContactForm, self).__init__(*args, **kwargs)
+        super(WorkerContactForm, self).__init__(*args, **kwargs)
         self.helper = FormHelper(self)
         self.helper.add_input(Submit("submit", "Send"))
diff --git a/expdj/apps/turk/views.py b/expdj/apps/turk/views.py
index 335689c..628af15 100644
--- a/expdj/apps/turk/views.py
+++ b/expdj/apps/turk/views.py
@@ -342,7 +342,7 @@ def contact_worker(request, aid):
     if mturk_permission == False:
         return HttpResponseForbidden()
 
-    assignment = Assignments.objects.get(aid)
+    assignment = Assignment.objects.get(id=aid)
     if request.method == "GET":
         form = WorkerContactForm()
         worker = assignment.worker
@@ -350,7 +350,7 @@ def contact_worker(request, aid):
             "form": form,
             "worker": worker
         }
-        return(request, "contact_worker_modal.html", context)
+        return render(request, "turk/contact_worker_modal.html", context)
     elif request.method == "POST":
         form = WorkerContactForm(request.POST)
         if form.is_valid():

From 6b2f4cb428e1d2845ae9810de3d4e0a039bc1e5e Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Sun, 3 Jul 2016 15:51:36 -0700
Subject: [PATCH 07/40] forgot to pass request to manage_hit when redirecting
 in contact worker

---
 expdj/apps/turk/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/expdj/apps/turk/views.py b/expdj/apps/turk/views.py
index 628af15..317c98d 100644
--- a/expdj/apps/turk/views.py
+++ b/expdj/apps/turk/views.py
@@ -357,7 +357,8 @@ def contact_worker(request, aid):
             subject = form.cleaned_data['subject']
             message = form.cleaned_data['message']
             assignment.contact_worker(subject, message)
-            return manage_hit(assignment.hit.battery.id, assignment.hit.id)
+            return manage_hit(request, assignment.hit.battery.id, 
+                              assignment.hit.id)
     else:
         return HttpResponseNotAllowed()
 

From 81e3cea70bf1d7c6d55e1b01353f56f657cd14c7 Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Sun, 3 Jul 2016 16:00:21 -0700
Subject: [PATCH 08/40] added missing form tags for contact worker modal

---
 expdj/apps/turk/templates/turk/contact_worker_modal.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/expdj/apps/turk/templates/turk/contact_worker_modal.html b/expdj/apps/turk/templates/turk/contact_worker_modal.html
index 8fdb15e..7d6f9ad 100644
--- a/expdj/apps/turk/templates/turk/contact_worker_modal.html
+++ b/expdj/apps/turk/templates/turk/contact_worker_modal.html
@@ -7,9 +7,9 @@ <h4 class="modal-title">Contact Worker {{ worker }}</h4>
         </div>
         <div class="modal-body">
             <div>
-                <table class="table table-condensed table-striped">
+                <form method="post">
                     {% crispy form %}
-                </table>
+                </form>
             </div>
         </div>
         <div class="modal-footer">

From 16b72511b7f1cedabc07f249ca3cdc5651fa5f7e Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Tue, 5 Jul 2016 15:12:10 -0700
Subject: [PATCH 09/40] added url to post for contact worker modal, since modal
 appered to be posting to the url that it was called from not the url it got
 its html from

---
 expdj/apps/turk/forms.py                                 | 1 +
 expdj/apps/turk/templates/turk/contact_worker_modal.html | 2 +-
 expdj/apps/turk/templates/turk/manage_hit.html           | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/expdj/apps/turk/forms.py b/expdj/apps/turk/forms.py
index 4f7ccf3..31d3f0d 100644
--- a/expdj/apps/turk/forms.py
+++ b/expdj/apps/turk/forms.py
@@ -39,4 +39,5 @@ class WorkerContactForm(forms.Form):
     def __init__(self, *args, **kwargs):
         super(WorkerContactForm, self).__init__(*args, **kwargs)
         self.helper = FormHelper(self)
+        self.helper.layout = Layout()
         self.helper.add_input(Submit("submit", "Send"))
diff --git a/expdj/apps/turk/templates/turk/contact_worker_modal.html b/expdj/apps/turk/templates/turk/contact_worker_modal.html
index 7d6f9ad..7fd4eae 100644
--- a/expdj/apps/turk/templates/turk/contact_worker_modal.html
+++ b/expdj/apps/turk/templates/turk/contact_worker_modal.html
@@ -7,7 +7,7 @@ <h4 class="modal-title">Contact Worker {{ worker }}</h4>
         </div>
         <div class="modal-body">
             <div>
-                <form method="post">
+                <form method="post" action="{% url 'contact_worker' assignment.id %}">
                     {% crispy form %}
                 </form>
             </div>
diff --git a/expdj/apps/turk/templates/turk/manage_hit.html b/expdj/apps/turk/templates/turk/manage_hit.html
index 58e3d46..7673b43 100644
--- a/expdj/apps/turk/templates/turk/manage_hit.html
+++ b/expdj/apps/turk/templates/turk/manage_hit.html
@@ -73,6 +73,7 @@ <h2>In Progress</h2>
             <th>Worker ID</th>
             <th>Status</th>
             <th>Accept Time</th>
+            <th>Contact</th>
           </tr>
         </thead>
         <tbody>
@@ -82,6 +83,7 @@ <h2>In Progress</h2>
           <td>{{ assignment.worker }}</td>
           <td>{{ assignment.status }}</td>
           <td>{{ assignment.accept_time | localize }}</td>
+          <td><a class='btn btn-xs btn-default contact_worker' href='{% url 'contact_worker' assignment.id %}'> Contact Worker</a></td>
         </tr>
         {% endfor %}
       </tbody>

From d30a8b2deaae16d98b95b8dff80adee20a04769f Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Tue, 5 Jul 2016 15:12:53 -0700
Subject: [PATCH 10/40] moved call to contact worker out of assignment model
 and into view. This will make it easier/more efficent to send a message to
 multiple workers at once.

---
 expdj/apps/turk/models.py | 12 ------------
 expdj/apps/turk/views.py  | 19 ++++++++++++++-----
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/expdj/apps/turk/models.py b/expdj/apps/turk/models.py
index 2d54ce4..940da73 100644
--- a/expdj/apps/turk/models.py
+++ b/expdj/apps/turk/models.py
@@ -479,18 +479,6 @@ def update(self, mturk_assignment=None, hit=None):
 
         self.save()
 
-    def contact_worker(self, subject, msg):
-        '''contact_worker uses the boto function notify_workers to send a
-            message a specific worker.
-        :subject: Subject of the message to send.
-        :msg: Contents of the message to send.
-        '''
-        self.hit.generate_connection()
-        try:
-            self.hit.connection.notify_workers(self.worker.id, subject, msg)
-        except MTurkRequestError:
-            pass
-
     def __unicode__(self):
         return self.mturk_id
 
diff --git a/expdj/apps/turk/views.py b/expdj/apps/turk/views.py
index 317c98d..05a46d1 100644
--- a/expdj/apps/turk/views.py
+++ b/expdj/apps/turk/views.py
@@ -23,8 +23,8 @@
 from expdj.apps.turk.models import Worker, HIT, Assignment, Result, get_worker
 from expdj.apps.turk.tasks import (assign_experiment_credit,
     get_unique_experiments)
-from expdj.apps.turk.utils import (get_connection, get_host, get_worker_url,
-    get_worker_experiments)
+from expdj.apps.turk.utils import (get_connection, get_credentials, get_host,
+    get_worker_url, get_worker_experiments)
 from expdj.settings import BASE_DIR,STATIC_ROOT,MEDIA_ROOT
 
 media_dir = os.path.join(BASE_DIR,MEDIA_ROOT)
@@ -343,20 +343,29 @@ def contact_worker(request, aid):
         return HttpResponseForbidden()
 
     assignment = Assignment.objects.get(id=aid)
+    worker = assignment.worker
     if request.method == "GET":
         form = WorkerContactForm()
-        worker = assignment.worker
         context = {
             "form": form,
-            "worker": worker
+            "worker": worker,
+            "assignment": assignment
         }
         return render(request, "turk/contact_worker_modal.html", context)
     elif request.method == "POST":
         form = WorkerContactForm(request.POST)
         if form.is_valid():
+            AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY_ID = get_credentials(
+                battery=assignment.hit.battery
+            )
+            conn = get_connection(
+                AWS_ACCESS_KEY_ID,
+                AWS_SECRET_ACCESS_KEY_ID,
+                hit=assignment.hit
+            )
             subject = form.cleaned_data['subject']
             message = form.cleaned_data['message']
-            assignment.contact_worker(subject, message)
+            conn.notify_workers([worker.id], subject, message)
             return manage_hit(request, assignment.hit.battery.id, 
                               assignment.hit.id)
     else:

From 68beb401d022827c70db63999815aac36ac12110 Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Tue, 5 Jul 2016 16:17:35 -0700
Subject: [PATCH 11/40] replaced call to manage_hit view function with an
 redirect to manage_hit to keep the url set to something we want to see when
 contact_worker is POSTed to.

---
 expdj/apps/turk/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/expdj/apps/turk/views.py b/expdj/apps/turk/views.py
index 05a46d1..7e97f42 100644
--- a/expdj/apps/turk/views.py
+++ b/expdj/apps/turk/views.py
@@ -366,8 +366,8 @@ def contact_worker(request, aid):
             subject = form.cleaned_data['subject']
             message = form.cleaned_data['message']
             conn.notify_workers([worker.id], subject, message)
-            return manage_hit(request, assignment.hit.battery.id, 
-                              assignment.hit.id)
+            return redirect('manage_hit', bid=assignment.hit.battery.id, 
+                            hid=assignment.hit.id)
     else:
         return HttpResponseNotAllowed()
 

From eb0375b6fc64112e183b2276da42784877024968 Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Wed, 29 Jun 2016 16:45:56 -0700
Subject: [PATCH 12/40] Add form to contact workers with

---
 expdj/apps/turk/forms.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/expdj/apps/turk/forms.py b/expdj/apps/turk/forms.py
index eb35dad..d5674a3 100644
--- a/expdj/apps/turk/forms.py
+++ b/expdj/apps/turk/forms.py
@@ -31,3 +31,12 @@ def __init__(self, *args, **kwargs):
         self.helper.layout = Layout()
         tab_holder = TabHolder()
         self.helper.add_input(Submit("submit", "Save"))
+
+class WorkerContactForm(forms.Form):
+    subject = forms.CharField(label="Subject")
+    message = forms.CharField(label="Message")
+
+    def __init__(self, *args, **kwargs):
+        super(ContactForm, self).__init__(*args, **kwargs)
+        self.helper = FormHelper(self)
+        self.helper.add_input(Submit("submit", "Send"))

From d02ad1f5da7f84226ffbc19d443131eb76573a34 Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Wed, 29 Jun 2016 16:47:04 -0700
Subject: [PATCH 13/40] add contact worker function to assignment model, this
 model has access to all the information we need to generate connections and
 send information to workers. Add contact worker view to handle creating and
 processing the form

---
 expdj/apps/turk/models.py | 13 ++++++++++++-
 expdj/apps/turk/views.py  | 38 +++++++++++++++++++++++++++++++++-----
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/expdj/apps/turk/models.py b/expdj/apps/turk/models.py
index 5319836..2d54ce4 100644
--- a/expdj/apps/turk/models.py
+++ b/expdj/apps/turk/models.py
@@ -407,7 +407,6 @@ class Assignment(models.Model):
                                              (True, 'Completed')),
                                               default=False,verbose_name="participant completed the entire assignment")
 
-
     def create(self):
         init_connection_callback(sender=self.hit)
 
@@ -480,6 +479,18 @@ def update(self, mturk_assignment=None, hit=None):
 
         self.save()
 
+    def contact_worker(self, subject, msg):
+        '''contact_worker uses the boto function notify_workers to send a
+            message a specific worker.
+        :subject: Subject of the message to send.
+        :msg: Contents of the message to send.
+        '''
+        self.hit.generate_connection()
+        try:
+            self.hit.connection.notify_workers(self.worker.id, subject, msg)
+        except MTurkRequestError:
+            pass
+
     def __unicode__(self):
         return self.mturk_id
 
diff --git a/expdj/apps/turk/views.py b/expdj/apps/turk/views.py
index c8e337c..9c6aae0 100644
--- a/expdj/apps/turk/views.py
+++ b/expdj/apps/turk/views.py
@@ -9,16 +9,18 @@
 
 from django.contrib.auth.decorators import login_required
 from django.core.management.base import BaseCommand
-from django.http.response import HttpResponseRedirect, HttpResponseForbidden, HttpResponse, Http404
+from django.http.response import (HttpResponseRedirect, HttpResponseForbidden,
+    HttpResponse, Http404, HttpResponseNotAllowed)
 from django.shortcuts import get_object_or_404, render_to_response, render, redirect
 from django.utils import timezone
 from django.views.decorators.csrf import ensure_csrf_cookie
 
-from expdj.apps.experiments.models import Battery, ExperimentTemplate
-from expdj.apps.experiments.views import check_battery_edit_permission, check_mturk_access, \
-get_battery_intro, deploy_battery
+from expdj.apps.experiments.models import (Assignment, Battery, 
+    ExperimentTemplate)
+from expdj.apps.experiments.views import (check_battery_edit_permission, 
+    check_mturk_access, get_battery_intro, deploy_battery)
 from expdj.apps.experiments.utils import get_experiment_type, select_experiments
-from expdj.apps.turk.forms import HITForm
+from expdj.apps.turk.forms import HITForm, WorkerContactForm
 from expdj.apps.turk.models import Worker, HIT, Assignment, Result, get_worker
 from expdj.apps.turk.tasks import (assign_experiment_credit,
     check_battery_dependencies, get_unique_experiments)
@@ -339,6 +341,32 @@ def edit_hit(request, bid, hid=None):
     else:
         return HttpResponseForbidden()
 
+@login_required
+def contact_worker(request, aid):
+    mturk_permission = check_mturk_access(request)
+
+    if mturk_permission == False:
+        return HttpResponseForbidden()
+
+    assignment = Assignments.objects.get(aid)
+    if request.method == "GET":
+        form = WorkerContactForm()
+        worker = assignment.worker
+        context = {
+            "form": form,
+            "worker": worker
+        }
+        return(request, "contact_worker_modal.html", context)
+    elif request.method == "POST":
+        form = WorkerContactForm(request.POST)
+        if form.is_valid():
+            subject = form.cleaned_data['subject']
+            message = form.cleaned_data['message']
+            assignment.contact_worker(subject, message)
+            return manage_hit(assignment.hit.battery.id, assignment.hit.id)
+    else:
+        return HttpResponseNotAllowed()
+
 # Expire a hit
 @login_required
 def expire_hit(request, hid):

From f0b684dbdee342774df219543f8813969fdeda30 Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Wed, 29 Jun 2016 16:48:03 -0700
Subject: [PATCH 14/40] temporary contact worker button in manage hit view,
 still missing modal support, and a proper url route

---
 expdj/apps/turk/templates/turk/manage_hit.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/expdj/apps/turk/templates/turk/manage_hit.html b/expdj/apps/turk/templates/turk/manage_hit.html
index d6e7fde..5b845ff 100644
--- a/expdj/apps/turk/templates/turk/manage_hit.html
+++ b/expdj/apps/turk/templates/turk/manage_hit.html
@@ -158,6 +158,7 @@ <h2>Approved</h2>
             <th>Worker ID</th>
             <th>Status</th>
             <th>Accept Time</th>
+            <th>Contact</th>
           </tr>
         </thead>
         <tbody>
@@ -167,6 +168,7 @@ <h2>Approved</h2>
           <td>{{ assignment.worker }}</td>
           <td>{{ assignment.status }}</td>
           <td>{{ assignment.accept_time | localize }}</td>
+          <td><a class='btn btn-xs btn-default' href='{% url 'contact_worker' %}'> Contact Worker</a></td>
         </tr>
         {% endfor %}
       </tbody>

From 9e1a47f728426aaff3d1050b28170c9c38446a7e Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Thu, 30 Jun 2016 15:10:04 -0700
Subject: [PATCH 15/40] added template for contact worker form

---
 .../templates/turk/contact_worker_modal.html  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 expdj/apps/turk/templates/turk/contact_worker_modal.html

diff --git a/expdj/apps/turk/templates/turk/contact_worker_modal.html b/expdj/apps/turk/templates/turk/contact_worker_modal.html
new file mode 100644
index 0000000..8fdb15e
--- /dev/null
+++ b/expdj/apps/turk/templates/turk/contact_worker_modal.html
@@ -0,0 +1,19 @@
+{% load crispy_forms_tags %}
+<div class="modal-dialog modal-lg">
+    <div class="modal-content">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+            <h4 class="modal-title">Contact Worker {{ worker }}</h4>
+        </div>
+        <div class="modal-body">
+            <div>
+                <table class="table table-condensed table-striped">
+                    {% crispy form %}
+                </table>
+            </div>
+        </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        </div>
+    </div><!-- /.modal-content -->
+</div><!-- /.modal-dialog -->

From 761422c730e83ed02a766eaeff30cdf5768df2ec Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Sun, 3 Jul 2016 15:32:10 -0700
Subject: [PATCH 16/40] fix import issues in turk views. Added url for contact
 worker. Added code to load contact worker view in manage_hit template

---
 .../apps/turk/templates/turk/manage_hit.html  |  9 ++++-
 expdj/apps/turk/urls.py                       | 39 ++++++++++++++-----
 expdj/apps/turk/utils.py                      | 18 ++++++---
 expdj/apps/turk/views.py                      |  5 +--
 4 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/expdj/apps/turk/templates/turk/manage_hit.html b/expdj/apps/turk/templates/turk/manage_hit.html
index 5b845ff..58e3d46 100644
--- a/expdj/apps/turk/templates/turk/manage_hit.html
+++ b/expdj/apps/turk/templates/turk/manage_hit.html
@@ -168,7 +168,7 @@ <h2>Approved</h2>
           <td>{{ assignment.worker }}</td>
           <td>{{ assignment.status }}</td>
           <td>{{ assignment.accept_time | localize }}</td>
-          <td><a class='btn btn-xs btn-default' href='{% url 'contact_worker' %}'> Contact Worker</a></td>
+          <td><a class='btn btn-xs btn-default contact_worker' href='{% url 'contact_worker' %}'> Contact Worker</a></td>
         </tr>
         {% endfor %}
       </tbody>
@@ -177,6 +177,8 @@ <h2>Approved</h2>
 </div>
 {% endif %}
         </article>
+        <div id="contact_modal" class="modal fade" tabindex="-1" role="dialog">
+        </div>
     </div>
 </div>
 {% endblock %}
@@ -192,6 +194,11 @@ <h2>Approved</h2>
   $('.collapse').collapse('hide');
 })
 
+$('.contact_worker').on("click", function(e) {
+    e.preventDefault();
+    $('#contact_modal').modal("show").load(this.href);
+});
+
 })
 </script>
 {% endblock %}
diff --git a/expdj/apps/turk/urls.py b/expdj/apps/turk/urls.py
index 1bdf124..73c84d8 100644
--- a/expdj/apps/turk/urls.py
+++ b/expdj/apps/turk/urls.py
@@ -1,6 +1,6 @@
-from expdj.apps.turk.views import edit_hit, delete_hit, expire_hit, preview_hit, \
-serve_hit, multiple_new_hit, end_assignment, finished_view, not_consent_view, \
-survey_submit, manage_hit
+from expdj.apps.turk.views import (edit_hit, delete_hit, expire_hit,
+    preview_hit, serve_hit, multiple_new_hit, end_assignment, finished_view,
+    not_consent_view, survey_submit, manage_hit, contact_worker)
 from expdj.apps.experiments.views import sync
 from django.views.generic.base import TemplateView
 from django.conf.urls import patterns, url
@@ -8,9 +8,21 @@
 urlpatterns = patterns('',
     # HITS
     url(r'^hits/(?P<bid>\d+|[A-Z]{8})/new$',edit_hit,name='new_hit'),
-    url(r'^hits/(?P<bid>\d+|[A-Z]{8})/(?P<hid>\d+|[A-Z]{8})/manage$',manage_hit,name='manage_hit'),
-    url(r'^hits/(?P<bid>\d+|[A-Z]{8})/multiple$',multiple_new_hit,name='multiple_new_hit'),
-    url(r'^hits/(?P<bid>\d+|[A-Z]{8})/(?P<hid>\d+|[A-Z]{8})/edit$',edit_hit,name='edit_hit'),
+    url(
+        r'^hits/(?P<bid>\d+|[A-Z]{8})/(?P<hid>\d+|[A-Z]{8})/manage$',
+        manage_hit,
+        name='manage_hit'
+    ),
+    url(
+        r'^hits/(?P<bid>\d+|[A-Z]{8})/multiple$',
+        multiple_new_hit,
+        name='multiple_new_hit'
+    ),
+    url(
+        r'^hits/(?P<bid>\d+|[A-Z]{8})/(?P<hid>\d+|[A-Z]{8})/edit$',
+        edit_hit,
+        name='edit_hit'
+    ),
     url(r'^hits/(?P<hid>\d+|[A-Z]{8})/delete$',delete_hit,name='delete_hit'),
     url(r'^hits/(?P<hid>\d+|[A-Z]{8})/expire$',expire_hit,name='expire_hit'),
 
@@ -18,9 +30,18 @@
     url(r'^accept/(?P<hid>\d+|[A-Z]{8})',serve_hit,name='serve_hit'),
     url(r'^turk/(?P<hid>\d+|[A-Z]{8})',preview_hit,name='preview_hit'),
     url(r'^turk/preview',not_consent_view,name='not_consent_view'),
-    url(r'^turk/end/(?P<rid>\d+|[A-Z]{8})',end_assignment,name='end_assignment'),
-    url(r'^surveys/(?P<rid>\d+|[A-Z]{8})/(?P<hid>[A-Za-z0-9]{30})/submit$',survey_submit,name='survey_submit'),
+    url(
+        r'^turk/end/(?P<rid>\d+|[A-Z]{8})',
+        end_assignment,
+        name='end_assignment'
+    ),
+    url(
+        r'^surveys/(?P<rid>\d+|[A-Z]{8})/(?P<hid>[A-Za-z0-9]{30})/submit$',
+        survey_submit,
+        name='survey_submit'
+    ),
     url(r'^sync/(?P<rid>\d+|[A-Z]{8})/$',sync,name='sync_data'),
     url(r'^sync/$',sync,name='sync_data'),
-    url(r'^finished$', finished_view, name="finished_view")
+    url(r'^finished$', finished_view, name="finished_view"),
+    url(r'^worker/contact/(?P<aid>\d+)',contact_worker,name='contact_worker')
 )
diff --git a/expdj/apps/turk/utils.py b/expdj/apps/turk/utils.py
index 6ec8592..1f9b803 100644
--- a/expdj/apps/turk/utils.py
+++ b/expdj/apps/turk/utils.py
@@ -1,16 +1,19 @@
-from expdj.apps.experiments.models import Experiment
-from boto.mturk.connection import MTurkConnection
-from expdj.settings import BASE_DIR, MTURK_ALLOW
-from boto.mturk.question import ExternalQuestion
-from boto.mturk.price import Price
 import ConfigParser
 import datetime
-import pandas
 import json
 import os
 
+from boto.mturk.connection import MTurkConnection
+from boto.mturk.price import Price
+from boto.mturk.question import ExternalQuestion
+import pandas
+
 from django.conf import settings
 
+from expdj.apps.experiments.models import Experiment
+from expdj.settings import BASE_DIR, MTURK_ALLOW
+
+
 
 # RESULTS UTILS
 def to_dict(input_ordered_dict):
@@ -132,3 +135,6 @@ def get_time_difference(d1,d2,format='%Y-%m-%d %H:%M:%S'):
     if isinstance(d2,str):
         d2 = datetime.datetime.strptime(d2, format)
     return (d2 - d1).total_seconds() / 60
+
+
+
diff --git a/expdj/apps/turk/views.py b/expdj/apps/turk/views.py
index 9c6aae0..76d3e3e 100644
--- a/expdj/apps/turk/views.py
+++ b/expdj/apps/turk/views.py
@@ -15,15 +15,14 @@
 from django.utils import timezone
 from django.views.decorators.csrf import ensure_csrf_cookie
 
-from expdj.apps.experiments.models import (Assignment, Battery, 
-    ExperimentTemplate)
+from expdj.apps.experiments.models import (Battery, ExperimentTemplate)
 from expdj.apps.experiments.views import (check_battery_edit_permission, 
     check_mturk_access, get_battery_intro, deploy_battery)
 from expdj.apps.experiments.utils import get_experiment_type, select_experiments
 from expdj.apps.turk.forms import HITForm, WorkerContactForm
 from expdj.apps.turk.models import Worker, HIT, Assignment, Result, get_worker
 from expdj.apps.turk.tasks import (assign_experiment_credit,
-    check_battery_dependencies, get_unique_experiments)
+    get_unique_experiments)
 from expdj.apps.turk.utils import (get_connection, get_host, get_worker_url,
     get_worker_experiments)
 from expdj.settings import BASE_DIR,STATIC_ROOT,MEDIA_ROOT

From 8b60c7cecbfdb71ebf19ed525e519b0c94bb6311 Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Sun, 3 Jul 2016 15:49:37 -0700
Subject: [PATCH 17/40] fixed a couple sytax issues

---
 expdj/apps/turk/forms.py | 2 +-
 expdj/apps/turk/views.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/expdj/apps/turk/forms.py b/expdj/apps/turk/forms.py
index d5674a3..4f7ccf3 100644
--- a/expdj/apps/turk/forms.py
+++ b/expdj/apps/turk/forms.py
@@ -37,6 +37,6 @@ class WorkerContactForm(forms.Form):
     message = forms.CharField(label="Message")
 
     def __init__(self, *args, **kwargs):
-        super(ContactForm, self).__init__(*args, **kwargs)
+        super(WorkerContactForm, self).__init__(*args, **kwargs)
         self.helper = FormHelper(self)
         self.helper.add_input(Submit("submit", "Send"))
diff --git a/expdj/apps/turk/views.py b/expdj/apps/turk/views.py
index 76d3e3e..4f2f722 100644
--- a/expdj/apps/turk/views.py
+++ b/expdj/apps/turk/views.py
@@ -347,7 +347,7 @@ def contact_worker(request, aid):
     if mturk_permission == False:
         return HttpResponseForbidden()
 
-    assignment = Assignments.objects.get(aid)
+    assignment = Assignment.objects.get(id=aid)
     if request.method == "GET":
         form = WorkerContactForm()
         worker = assignment.worker
@@ -355,7 +355,7 @@ def contact_worker(request, aid):
             "form": form,
             "worker": worker
         }
-        return(request, "contact_worker_modal.html", context)
+        return render(request, "turk/contact_worker_modal.html", context)
     elif request.method == "POST":
         form = WorkerContactForm(request.POST)
         if form.is_valid():

From 4e5565b94aff6b8b9c0d256d3bc577d5539a9696 Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Sun, 3 Jul 2016 15:51:36 -0700
Subject: [PATCH 18/40] forgot to pass request to manage_hit when redirecting
 in contact worker

---
 expdj/apps/turk/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/expdj/apps/turk/views.py b/expdj/apps/turk/views.py
index 4f2f722..067014a 100644
--- a/expdj/apps/turk/views.py
+++ b/expdj/apps/turk/views.py
@@ -362,7 +362,8 @@ def contact_worker(request, aid):
             subject = form.cleaned_data['subject']
             message = form.cleaned_data['message']
             assignment.contact_worker(subject, message)
-            return manage_hit(assignment.hit.battery.id, assignment.hit.id)
+            return manage_hit(request, assignment.hit.battery.id, 
+                              assignment.hit.id)
     else:
         return HttpResponseNotAllowed()
 

From e06b802e45f24cd0ef60ad4f5abde490f63066d1 Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Sun, 3 Jul 2016 16:00:21 -0700
Subject: [PATCH 19/40] added missing form tags for contact worker modal

---
 expdj/apps/turk/templates/turk/contact_worker_modal.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/expdj/apps/turk/templates/turk/contact_worker_modal.html b/expdj/apps/turk/templates/turk/contact_worker_modal.html
index 8fdb15e..7d6f9ad 100644
--- a/expdj/apps/turk/templates/turk/contact_worker_modal.html
+++ b/expdj/apps/turk/templates/turk/contact_worker_modal.html
@@ -7,9 +7,9 @@ <h4 class="modal-title">Contact Worker {{ worker }}</h4>
         </div>
         <div class="modal-body">
             <div>
-                <table class="table table-condensed table-striped">
+                <form method="post">
                     {% crispy form %}
-                </table>
+                </form>
             </div>
         </div>
         <div class="modal-footer">

From 3ae83c4b40b9b72149cc73d0e68b294d49dc6134 Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Tue, 5 Jul 2016 15:12:10 -0700
Subject: [PATCH 20/40] added url to post for contact worker modal, since modal
 appered to be posting to the url that it was called from not the url it got
 its html from

---
 expdj/apps/turk/forms.py                                 | 1 +
 expdj/apps/turk/templates/turk/contact_worker_modal.html | 2 +-
 expdj/apps/turk/templates/turk/manage_hit.html           | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/expdj/apps/turk/forms.py b/expdj/apps/turk/forms.py
index 4f7ccf3..31d3f0d 100644
--- a/expdj/apps/turk/forms.py
+++ b/expdj/apps/turk/forms.py
@@ -39,4 +39,5 @@ class WorkerContactForm(forms.Form):
     def __init__(self, *args, **kwargs):
         super(WorkerContactForm, self).__init__(*args, **kwargs)
         self.helper = FormHelper(self)
+        self.helper.layout = Layout()
         self.helper.add_input(Submit("submit", "Send"))
diff --git a/expdj/apps/turk/templates/turk/contact_worker_modal.html b/expdj/apps/turk/templates/turk/contact_worker_modal.html
index 7d6f9ad..7fd4eae 100644
--- a/expdj/apps/turk/templates/turk/contact_worker_modal.html
+++ b/expdj/apps/turk/templates/turk/contact_worker_modal.html
@@ -7,7 +7,7 @@ <h4 class="modal-title">Contact Worker {{ worker }}</h4>
         </div>
         <div class="modal-body">
             <div>
-                <form method="post">
+                <form method="post" action="{% url 'contact_worker' assignment.id %}">
                     {% crispy form %}
                 </form>
             </div>
diff --git a/expdj/apps/turk/templates/turk/manage_hit.html b/expdj/apps/turk/templates/turk/manage_hit.html
index 58e3d46..7673b43 100644
--- a/expdj/apps/turk/templates/turk/manage_hit.html
+++ b/expdj/apps/turk/templates/turk/manage_hit.html
@@ -73,6 +73,7 @@ <h2>In Progress</h2>
             <th>Worker ID</th>
             <th>Status</th>
             <th>Accept Time</th>
+            <th>Contact</th>
           </tr>
         </thead>
         <tbody>
@@ -82,6 +83,7 @@ <h2>In Progress</h2>
           <td>{{ assignment.worker }}</td>
           <td>{{ assignment.status }}</td>
           <td>{{ assignment.accept_time | localize }}</td>
+          <td><a class='btn btn-xs btn-default contact_worker' href='{% url 'contact_worker' assignment.id %}'> Contact Worker</a></td>
         </tr>
         {% endfor %}
       </tbody>

From 3ad5f249613f9f21bc7e48058825455bd806ccf3 Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Tue, 5 Jul 2016 15:12:53 -0700
Subject: [PATCH 21/40] moved call to contact worker out of assignment model
 and into view. This will make it easier/more efficent to send a message to
 multiple workers at once.

---
 expdj/apps/turk/models.py | 12 ------------
 expdj/apps/turk/views.py  | 19 ++++++++++++++-----
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/expdj/apps/turk/models.py b/expdj/apps/turk/models.py
index 2d54ce4..940da73 100644
--- a/expdj/apps/turk/models.py
+++ b/expdj/apps/turk/models.py
@@ -479,18 +479,6 @@ def update(self, mturk_assignment=None, hit=None):
 
         self.save()
 
-    def contact_worker(self, subject, msg):
-        '''contact_worker uses the boto function notify_workers to send a
-            message a specific worker.
-        :subject: Subject of the message to send.
-        :msg: Contents of the message to send.
-        '''
-        self.hit.generate_connection()
-        try:
-            self.hit.connection.notify_workers(self.worker.id, subject, msg)
-        except MTurkRequestError:
-            pass
-
     def __unicode__(self):
         return self.mturk_id
 
diff --git a/expdj/apps/turk/views.py b/expdj/apps/turk/views.py
index 067014a..dcc714a 100644
--- a/expdj/apps/turk/views.py
+++ b/expdj/apps/turk/views.py
@@ -23,8 +23,8 @@
 from expdj.apps.turk.models import Worker, HIT, Assignment, Result, get_worker
 from expdj.apps.turk.tasks import (assign_experiment_credit,
     get_unique_experiments)
-from expdj.apps.turk.utils import (get_connection, get_host, get_worker_url,
-    get_worker_experiments)
+from expdj.apps.turk.utils import (get_connection, get_credentials, get_host,
+    get_worker_url, get_worker_experiments)
 from expdj.settings import BASE_DIR,STATIC_ROOT,MEDIA_ROOT
 
 media_dir = os.path.join(BASE_DIR,MEDIA_ROOT)
@@ -348,20 +348,29 @@ def contact_worker(request, aid):
         return HttpResponseForbidden()
 
     assignment = Assignment.objects.get(id=aid)
+    worker = assignment.worker
     if request.method == "GET":
         form = WorkerContactForm()
-        worker = assignment.worker
         context = {
             "form": form,
-            "worker": worker
+            "worker": worker,
+            "assignment": assignment
         }
         return render(request, "turk/contact_worker_modal.html", context)
     elif request.method == "POST":
         form = WorkerContactForm(request.POST)
         if form.is_valid():
+            AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY_ID = get_credentials(
+                battery=assignment.hit.battery
+            )
+            conn = get_connection(
+                AWS_ACCESS_KEY_ID,
+                AWS_SECRET_ACCESS_KEY_ID,
+                hit=assignment.hit
+            )
             subject = form.cleaned_data['subject']
             message = form.cleaned_data['message']
-            assignment.contact_worker(subject, message)
+            conn.notify_workers([worker.id], subject, message)
             return manage_hit(request, assignment.hit.battery.id, 
                               assignment.hit.id)
     else:

From e444627f704b5121663b4faff7542a5a222a5bba Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Tue, 5 Jul 2016 16:17:35 -0700
Subject: [PATCH 22/40] replaced call to manage_hit view function with an
 redirect to manage_hit to keep the url set to something we want to see when
 contact_worker is POSTed to.

---
 expdj/apps/turk/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/expdj/apps/turk/views.py b/expdj/apps/turk/views.py
index dcc714a..88720ad 100644
--- a/expdj/apps/turk/views.py
+++ b/expdj/apps/turk/views.py
@@ -371,8 +371,8 @@ def contact_worker(request, aid):
             subject = form.cleaned_data['subject']
             message = form.cleaned_data['message']
             conn.notify_workers([worker.id], subject, message)
-            return manage_hit(request, assignment.hit.battery.id, 
-                              assignment.hit.id)
+            return redirect('manage_hit', bid=assignment.hit.battery.id, 
+                            hid=assignment.hit.id)
     else:
         return HttpResponseNotAllowed()
 

From 2529717a1bb17a07e5c0d007fcdc03933756bbe3 Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Wed, 29 Jun 2016 16:45:56 -0700
Subject: [PATCH 23/40] Add form to contact workers with

---
 expdj/apps/turk/forms.py | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/expdj/apps/turk/forms.py b/expdj/apps/turk/forms.py
index eb35dad..d5674a3 100644
--- a/expdj/apps/turk/forms.py
+++ b/expdj/apps/turk/forms.py
@@ -31,3 +31,12 @@ def __init__(self, *args, **kwargs):
         self.helper.layout = Layout()
         tab_holder = TabHolder()
         self.helper.add_input(Submit("submit", "Save"))
+
+class WorkerContactForm(forms.Form):
+    subject = forms.CharField(label="Subject")
+    message = forms.CharField(label="Message")
+
+    def __init__(self, *args, **kwargs):
+        super(ContactForm, self).__init__(*args, **kwargs)
+        self.helper = FormHelper(self)
+        self.helper.add_input(Submit("submit", "Send"))

From bc07669ab818e8f6a851b2f4d40bcd33381fc587 Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Wed, 29 Jun 2016 16:47:04 -0700
Subject: [PATCH 24/40] add contact worker function to assignment model, this
 model has access to all the information we need to generate connections and
 send information to workers. Add contact worker view to handle creating and
 processing the form

---
 expdj/apps/turk/models.py | 13 ++++++++++++-
 expdj/apps/turk/views.py  | 38 +++++++++++++++++++++++++++++++++-----
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/expdj/apps/turk/models.py b/expdj/apps/turk/models.py
index 5319836..2d54ce4 100644
--- a/expdj/apps/turk/models.py
+++ b/expdj/apps/turk/models.py
@@ -407,7 +407,6 @@ class Assignment(models.Model):
                                              (True, 'Completed')),
                                               default=False,verbose_name="participant completed the entire assignment")
 
-
     def create(self):
         init_connection_callback(sender=self.hit)
 
@@ -480,6 +479,18 @@ def update(self, mturk_assignment=None, hit=None):
 
         self.save()
 
+    def contact_worker(self, subject, msg):
+        '''contact_worker uses the boto function notify_workers to send a
+            message a specific worker.
+        :subject: Subject of the message to send.
+        :msg: Contents of the message to send.
+        '''
+        self.hit.generate_connection()
+        try:
+            self.hit.connection.notify_workers(self.worker.id, subject, msg)
+        except MTurkRequestError:
+            pass
+
     def __unicode__(self):
         return self.mturk_id
 
diff --git a/expdj/apps/turk/views.py b/expdj/apps/turk/views.py
index c8e337c..9c6aae0 100644
--- a/expdj/apps/turk/views.py
+++ b/expdj/apps/turk/views.py
@@ -9,16 +9,18 @@
 
 from django.contrib.auth.decorators import login_required
 from django.core.management.base import BaseCommand
-from django.http.response import HttpResponseRedirect, HttpResponseForbidden, HttpResponse, Http404
+from django.http.response import (HttpResponseRedirect, HttpResponseForbidden,
+    HttpResponse, Http404, HttpResponseNotAllowed)
 from django.shortcuts import get_object_or_404, render_to_response, render, redirect
 from django.utils import timezone
 from django.views.decorators.csrf import ensure_csrf_cookie
 
-from expdj.apps.experiments.models import Battery, ExperimentTemplate
-from expdj.apps.experiments.views import check_battery_edit_permission, check_mturk_access, \
-get_battery_intro, deploy_battery
+from expdj.apps.experiments.models import (Assignment, Battery, 
+    ExperimentTemplate)
+from expdj.apps.experiments.views import (check_battery_edit_permission, 
+    check_mturk_access, get_battery_intro, deploy_battery)
 from expdj.apps.experiments.utils import get_experiment_type, select_experiments
-from expdj.apps.turk.forms import HITForm
+from expdj.apps.turk.forms import HITForm, WorkerContactForm
 from expdj.apps.turk.models import Worker, HIT, Assignment, Result, get_worker
 from expdj.apps.turk.tasks import (assign_experiment_credit,
     check_battery_dependencies, get_unique_experiments)
@@ -339,6 +341,32 @@ def edit_hit(request, bid, hid=None):
     else:
         return HttpResponseForbidden()
 
+@login_required
+def contact_worker(request, aid):
+    mturk_permission = check_mturk_access(request)
+
+    if mturk_permission == False:
+        return HttpResponseForbidden()
+
+    assignment = Assignments.objects.get(aid)
+    if request.method == "GET":
+        form = WorkerContactForm()
+        worker = assignment.worker
+        context = {
+            "form": form,
+            "worker": worker
+        }
+        return(request, "contact_worker_modal.html", context)
+    elif request.method == "POST":
+        form = WorkerContactForm(request.POST)
+        if form.is_valid():
+            subject = form.cleaned_data['subject']
+            message = form.cleaned_data['message']
+            assignment.contact_worker(subject, message)
+            return manage_hit(assignment.hit.battery.id, assignment.hit.id)
+    else:
+        return HttpResponseNotAllowed()
+
 # Expire a hit
 @login_required
 def expire_hit(request, hid):

From 3c58ca664db90a49b54982a49db567e2b927f2c6 Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Wed, 29 Jun 2016 16:48:03 -0700
Subject: [PATCH 25/40] temporary contact worker button in manage hit view,
 still missing modal support, and a proper url route

---
 expdj/apps/turk/templates/turk/manage_hit.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/expdj/apps/turk/templates/turk/manage_hit.html b/expdj/apps/turk/templates/turk/manage_hit.html
index d6e7fde..5b845ff 100644
--- a/expdj/apps/turk/templates/turk/manage_hit.html
+++ b/expdj/apps/turk/templates/turk/manage_hit.html
@@ -158,6 +158,7 @@ <h2>Approved</h2>
             <th>Worker ID</th>
             <th>Status</th>
             <th>Accept Time</th>
+            <th>Contact</th>
           </tr>
         </thead>
         <tbody>
@@ -167,6 +168,7 @@ <h2>Approved</h2>
           <td>{{ assignment.worker }}</td>
           <td>{{ assignment.status }}</td>
           <td>{{ assignment.accept_time | localize }}</td>
+          <td><a class='btn btn-xs btn-default' href='{% url 'contact_worker' %}'> Contact Worker</a></td>
         </tr>
         {% endfor %}
       </tbody>

From 511641120f8fe266f9d749ad41896dda8e5fa791 Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Thu, 30 Jun 2016 15:10:04 -0700
Subject: [PATCH 26/40] added template for contact worker form

---
 .../templates/turk/contact_worker_modal.html  | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 expdj/apps/turk/templates/turk/contact_worker_modal.html

diff --git a/expdj/apps/turk/templates/turk/contact_worker_modal.html b/expdj/apps/turk/templates/turk/contact_worker_modal.html
new file mode 100644
index 0000000..8fdb15e
--- /dev/null
+++ b/expdj/apps/turk/templates/turk/contact_worker_modal.html
@@ -0,0 +1,19 @@
+{% load crispy_forms_tags %}
+<div class="modal-dialog modal-lg">
+    <div class="modal-content">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+            <h4 class="modal-title">Contact Worker {{ worker }}</h4>
+        </div>
+        <div class="modal-body">
+            <div>
+                <table class="table table-condensed table-striped">
+                    {% crispy form %}
+                </table>
+            </div>
+        </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        </div>
+    </div><!-- /.modal-content -->
+</div><!-- /.modal-dialog -->

From f10a97be4179ad10fcf687d7292e3cdc8c6eb56d Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Sun, 3 Jul 2016 15:32:10 -0700
Subject: [PATCH 27/40] fix import issues in turk views. Added url for contact
 worker. Added code to load contact worker view in manage_hit template

---
 .../apps/turk/templates/turk/manage_hit.html  |  9 ++++-
 expdj/apps/turk/urls.py                       | 39 ++++++++++++++-----
 expdj/apps/turk/utils.py                      | 18 ++++++---
 expdj/apps/turk/views.py                      |  5 +--
 4 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/expdj/apps/turk/templates/turk/manage_hit.html b/expdj/apps/turk/templates/turk/manage_hit.html
index 5b845ff..58e3d46 100644
--- a/expdj/apps/turk/templates/turk/manage_hit.html
+++ b/expdj/apps/turk/templates/turk/manage_hit.html
@@ -168,7 +168,7 @@ <h2>Approved</h2>
           <td>{{ assignment.worker }}</td>
           <td>{{ assignment.status }}</td>
           <td>{{ assignment.accept_time | localize }}</td>
-          <td><a class='btn btn-xs btn-default' href='{% url 'contact_worker' %}'> Contact Worker</a></td>
+          <td><a class='btn btn-xs btn-default contact_worker' href='{% url 'contact_worker' %}'> Contact Worker</a></td>
         </tr>
         {% endfor %}
       </tbody>
@@ -177,6 +177,8 @@ <h2>Approved</h2>
 </div>
 {% endif %}
         </article>
+        <div id="contact_modal" class="modal fade" tabindex="-1" role="dialog">
+        </div>
     </div>
 </div>
 {% endblock %}
@@ -192,6 +194,11 @@ <h2>Approved</h2>
   $('.collapse').collapse('hide');
 })
 
+$('.contact_worker').on("click", function(e) {
+    e.preventDefault();
+    $('#contact_modal').modal("show").load(this.href);
+});
+
 })
 </script>
 {% endblock %}
diff --git a/expdj/apps/turk/urls.py b/expdj/apps/turk/urls.py
index 1bdf124..73c84d8 100644
--- a/expdj/apps/turk/urls.py
+++ b/expdj/apps/turk/urls.py
@@ -1,6 +1,6 @@
-from expdj.apps.turk.views import edit_hit, delete_hit, expire_hit, preview_hit, \
-serve_hit, multiple_new_hit, end_assignment, finished_view, not_consent_view, \
-survey_submit, manage_hit
+from expdj.apps.turk.views import (edit_hit, delete_hit, expire_hit,
+    preview_hit, serve_hit, multiple_new_hit, end_assignment, finished_view,
+    not_consent_view, survey_submit, manage_hit, contact_worker)
 from expdj.apps.experiments.views import sync
 from django.views.generic.base import TemplateView
 from django.conf.urls import patterns, url
@@ -8,9 +8,21 @@
 urlpatterns = patterns('',
     # HITS
     url(r'^hits/(?P<bid>\d+|[A-Z]{8})/new$',edit_hit,name='new_hit'),
-    url(r'^hits/(?P<bid>\d+|[A-Z]{8})/(?P<hid>\d+|[A-Z]{8})/manage$',manage_hit,name='manage_hit'),
-    url(r'^hits/(?P<bid>\d+|[A-Z]{8})/multiple$',multiple_new_hit,name='multiple_new_hit'),
-    url(r'^hits/(?P<bid>\d+|[A-Z]{8})/(?P<hid>\d+|[A-Z]{8})/edit$',edit_hit,name='edit_hit'),
+    url(
+        r'^hits/(?P<bid>\d+|[A-Z]{8})/(?P<hid>\d+|[A-Z]{8})/manage$',
+        manage_hit,
+        name='manage_hit'
+    ),
+    url(
+        r'^hits/(?P<bid>\d+|[A-Z]{8})/multiple$',
+        multiple_new_hit,
+        name='multiple_new_hit'
+    ),
+    url(
+        r'^hits/(?P<bid>\d+|[A-Z]{8})/(?P<hid>\d+|[A-Z]{8})/edit$',
+        edit_hit,
+        name='edit_hit'
+    ),
     url(r'^hits/(?P<hid>\d+|[A-Z]{8})/delete$',delete_hit,name='delete_hit'),
     url(r'^hits/(?P<hid>\d+|[A-Z]{8})/expire$',expire_hit,name='expire_hit'),
 
@@ -18,9 +30,18 @@
     url(r'^accept/(?P<hid>\d+|[A-Z]{8})',serve_hit,name='serve_hit'),
     url(r'^turk/(?P<hid>\d+|[A-Z]{8})',preview_hit,name='preview_hit'),
     url(r'^turk/preview',not_consent_view,name='not_consent_view'),
-    url(r'^turk/end/(?P<rid>\d+|[A-Z]{8})',end_assignment,name='end_assignment'),
-    url(r'^surveys/(?P<rid>\d+|[A-Z]{8})/(?P<hid>[A-Za-z0-9]{30})/submit$',survey_submit,name='survey_submit'),
+    url(
+        r'^turk/end/(?P<rid>\d+|[A-Z]{8})',
+        end_assignment,
+        name='end_assignment'
+    ),
+    url(
+        r'^surveys/(?P<rid>\d+|[A-Z]{8})/(?P<hid>[A-Za-z0-9]{30})/submit$',
+        survey_submit,
+        name='survey_submit'
+    ),
     url(r'^sync/(?P<rid>\d+|[A-Z]{8})/$',sync,name='sync_data'),
     url(r'^sync/$',sync,name='sync_data'),
-    url(r'^finished$', finished_view, name="finished_view")
+    url(r'^finished$', finished_view, name="finished_view"),
+    url(r'^worker/contact/(?P<aid>\d+)',contact_worker,name='contact_worker')
 )
diff --git a/expdj/apps/turk/utils.py b/expdj/apps/turk/utils.py
index 6ec8592..1f9b803 100644
--- a/expdj/apps/turk/utils.py
+++ b/expdj/apps/turk/utils.py
@@ -1,16 +1,19 @@
-from expdj.apps.experiments.models import Experiment
-from boto.mturk.connection import MTurkConnection
-from expdj.settings import BASE_DIR, MTURK_ALLOW
-from boto.mturk.question import ExternalQuestion
-from boto.mturk.price import Price
 import ConfigParser
 import datetime
-import pandas
 import json
 import os
 
+from boto.mturk.connection import MTurkConnection
+from boto.mturk.price import Price
+from boto.mturk.question import ExternalQuestion
+import pandas
+
 from django.conf import settings
 
+from expdj.apps.experiments.models import Experiment
+from expdj.settings import BASE_DIR, MTURK_ALLOW
+
+
 
 # RESULTS UTILS
 def to_dict(input_ordered_dict):
@@ -132,3 +135,6 @@ def get_time_difference(d1,d2,format='%Y-%m-%d %H:%M:%S'):
     if isinstance(d2,str):
         d2 = datetime.datetime.strptime(d2, format)
     return (d2 - d1).total_seconds() / 60
+
+
+
diff --git a/expdj/apps/turk/views.py b/expdj/apps/turk/views.py
index 9c6aae0..76d3e3e 100644
--- a/expdj/apps/turk/views.py
+++ b/expdj/apps/turk/views.py
@@ -15,15 +15,14 @@
 from django.utils import timezone
 from django.views.decorators.csrf import ensure_csrf_cookie
 
-from expdj.apps.experiments.models import (Assignment, Battery, 
-    ExperimentTemplate)
+from expdj.apps.experiments.models import (Battery, ExperimentTemplate)
 from expdj.apps.experiments.views import (check_battery_edit_permission, 
     check_mturk_access, get_battery_intro, deploy_battery)
 from expdj.apps.experiments.utils import get_experiment_type, select_experiments
 from expdj.apps.turk.forms import HITForm, WorkerContactForm
 from expdj.apps.turk.models import Worker, HIT, Assignment, Result, get_worker
 from expdj.apps.turk.tasks import (assign_experiment_credit,
-    check_battery_dependencies, get_unique_experiments)
+    get_unique_experiments)
 from expdj.apps.turk.utils import (get_connection, get_host, get_worker_url,
     get_worker_experiments)
 from expdj.settings import BASE_DIR,STATIC_ROOT,MEDIA_ROOT

From e6230ea264ff2d21a38a4e2c503371352d6e0762 Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Sun, 3 Jul 2016 15:49:37 -0700
Subject: [PATCH 28/40] fixed a couple sytax issues

---
 expdj/apps/turk/forms.py | 2 +-
 expdj/apps/turk/views.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/expdj/apps/turk/forms.py b/expdj/apps/turk/forms.py
index d5674a3..4f7ccf3 100644
--- a/expdj/apps/turk/forms.py
+++ b/expdj/apps/turk/forms.py
@@ -37,6 +37,6 @@ class WorkerContactForm(forms.Form):
     message = forms.CharField(label="Message")
 
     def __init__(self, *args, **kwargs):
-        super(ContactForm, self).__init__(*args, **kwargs)
+        super(WorkerContactForm, self).__init__(*args, **kwargs)
         self.helper = FormHelper(self)
         self.helper.add_input(Submit("submit", "Send"))
diff --git a/expdj/apps/turk/views.py b/expdj/apps/turk/views.py
index 76d3e3e..4f2f722 100644
--- a/expdj/apps/turk/views.py
+++ b/expdj/apps/turk/views.py
@@ -347,7 +347,7 @@ def contact_worker(request, aid):
     if mturk_permission == False:
         return HttpResponseForbidden()
 
-    assignment = Assignments.objects.get(aid)
+    assignment = Assignment.objects.get(id=aid)
     if request.method == "GET":
         form = WorkerContactForm()
         worker = assignment.worker
@@ -355,7 +355,7 @@ def contact_worker(request, aid):
             "form": form,
             "worker": worker
         }
-        return(request, "contact_worker_modal.html", context)
+        return render(request, "turk/contact_worker_modal.html", context)
     elif request.method == "POST":
         form = WorkerContactForm(request.POST)
         if form.is_valid():

From ded399923b2d845a58a23128c89a075ca79be3bc Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Sun, 3 Jul 2016 15:51:36 -0700
Subject: [PATCH 29/40] forgot to pass request to manage_hit when redirecting
 in contact worker

---
 expdj/apps/turk/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/expdj/apps/turk/views.py b/expdj/apps/turk/views.py
index 4f2f722..067014a 100644
--- a/expdj/apps/turk/views.py
+++ b/expdj/apps/turk/views.py
@@ -362,7 +362,8 @@ def contact_worker(request, aid):
             subject = form.cleaned_data['subject']
             message = form.cleaned_data['message']
             assignment.contact_worker(subject, message)
-            return manage_hit(assignment.hit.battery.id, assignment.hit.id)
+            return manage_hit(request, assignment.hit.battery.id, 
+                              assignment.hit.id)
     else:
         return HttpResponseNotAllowed()
 

From e7ea322a0f34d64ef64084d27ce41943a0cb0cd7 Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Sun, 3 Jul 2016 16:00:21 -0700
Subject: [PATCH 30/40] added missing form tags for contact worker modal

---
 expdj/apps/turk/templates/turk/contact_worker_modal.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/expdj/apps/turk/templates/turk/contact_worker_modal.html b/expdj/apps/turk/templates/turk/contact_worker_modal.html
index 8fdb15e..7d6f9ad 100644
--- a/expdj/apps/turk/templates/turk/contact_worker_modal.html
+++ b/expdj/apps/turk/templates/turk/contact_worker_modal.html
@@ -7,9 +7,9 @@ <h4 class="modal-title">Contact Worker {{ worker }}</h4>
         </div>
         <div class="modal-body">
             <div>
-                <table class="table table-condensed table-striped">
+                <form method="post">
                     {% crispy form %}
-                </table>
+                </form>
             </div>
         </div>
         <div class="modal-footer">

From 224ef0d2aeb98e6be2357556a502791e7e654a79 Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Tue, 5 Jul 2016 15:12:10 -0700
Subject: [PATCH 31/40] added url to post for contact worker modal, since modal
 appered to be posting to the url that it was called from not the url it got
 its html from

---
 expdj/apps/turk/forms.py                                 | 1 +
 expdj/apps/turk/templates/turk/contact_worker_modal.html | 2 +-
 expdj/apps/turk/templates/turk/manage_hit.html           | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/expdj/apps/turk/forms.py b/expdj/apps/turk/forms.py
index 4f7ccf3..31d3f0d 100644
--- a/expdj/apps/turk/forms.py
+++ b/expdj/apps/turk/forms.py
@@ -39,4 +39,5 @@ class WorkerContactForm(forms.Form):
     def __init__(self, *args, **kwargs):
         super(WorkerContactForm, self).__init__(*args, **kwargs)
         self.helper = FormHelper(self)
+        self.helper.layout = Layout()
         self.helper.add_input(Submit("submit", "Send"))
diff --git a/expdj/apps/turk/templates/turk/contact_worker_modal.html b/expdj/apps/turk/templates/turk/contact_worker_modal.html
index 7d6f9ad..7fd4eae 100644
--- a/expdj/apps/turk/templates/turk/contact_worker_modal.html
+++ b/expdj/apps/turk/templates/turk/contact_worker_modal.html
@@ -7,7 +7,7 @@ <h4 class="modal-title">Contact Worker {{ worker }}</h4>
         </div>
         <div class="modal-body">
             <div>
-                <form method="post">
+                <form method="post" action="{% url 'contact_worker' assignment.id %}">
                     {% crispy form %}
                 </form>
             </div>
diff --git a/expdj/apps/turk/templates/turk/manage_hit.html b/expdj/apps/turk/templates/turk/manage_hit.html
index 58e3d46..7673b43 100644
--- a/expdj/apps/turk/templates/turk/manage_hit.html
+++ b/expdj/apps/turk/templates/turk/manage_hit.html
@@ -73,6 +73,7 @@ <h2>In Progress</h2>
             <th>Worker ID</th>
             <th>Status</th>
             <th>Accept Time</th>
+            <th>Contact</th>
           </tr>
         </thead>
         <tbody>
@@ -82,6 +83,7 @@ <h2>In Progress</h2>
           <td>{{ assignment.worker }}</td>
           <td>{{ assignment.status }}</td>
           <td>{{ assignment.accept_time | localize }}</td>
+          <td><a class='btn btn-xs btn-default contact_worker' href='{% url 'contact_worker' assignment.id %}'> Contact Worker</a></td>
         </tr>
         {% endfor %}
       </tbody>

From 7e96513e5e026c5b1e57f3d66a2df3d27781e515 Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Tue, 5 Jul 2016 15:12:53 -0700
Subject: [PATCH 32/40] moved call to contact worker out of assignment model
 and into view. This will make it easier/more efficent to send a message to
 multiple workers at once.

---
 expdj/apps/turk/models.py | 12 ------------
 expdj/apps/turk/views.py  | 19 ++++++++++++++-----
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/expdj/apps/turk/models.py b/expdj/apps/turk/models.py
index 2d54ce4..940da73 100644
--- a/expdj/apps/turk/models.py
+++ b/expdj/apps/turk/models.py
@@ -479,18 +479,6 @@ def update(self, mturk_assignment=None, hit=None):
 
         self.save()
 
-    def contact_worker(self, subject, msg):
-        '''contact_worker uses the boto function notify_workers to send a
-            message a specific worker.
-        :subject: Subject of the message to send.
-        :msg: Contents of the message to send.
-        '''
-        self.hit.generate_connection()
-        try:
-            self.hit.connection.notify_workers(self.worker.id, subject, msg)
-        except MTurkRequestError:
-            pass
-
     def __unicode__(self):
         return self.mturk_id
 
diff --git a/expdj/apps/turk/views.py b/expdj/apps/turk/views.py
index 067014a..dcc714a 100644
--- a/expdj/apps/turk/views.py
+++ b/expdj/apps/turk/views.py
@@ -23,8 +23,8 @@
 from expdj.apps.turk.models import Worker, HIT, Assignment, Result, get_worker
 from expdj.apps.turk.tasks import (assign_experiment_credit,
     get_unique_experiments)
-from expdj.apps.turk.utils import (get_connection, get_host, get_worker_url,
-    get_worker_experiments)
+from expdj.apps.turk.utils import (get_connection, get_credentials, get_host,
+    get_worker_url, get_worker_experiments)
 from expdj.settings import BASE_DIR,STATIC_ROOT,MEDIA_ROOT
 
 media_dir = os.path.join(BASE_DIR,MEDIA_ROOT)
@@ -348,20 +348,29 @@ def contact_worker(request, aid):
         return HttpResponseForbidden()
 
     assignment = Assignment.objects.get(id=aid)
+    worker = assignment.worker
     if request.method == "GET":
         form = WorkerContactForm()
-        worker = assignment.worker
         context = {
             "form": form,
-            "worker": worker
+            "worker": worker,
+            "assignment": assignment
         }
         return render(request, "turk/contact_worker_modal.html", context)
     elif request.method == "POST":
         form = WorkerContactForm(request.POST)
         if form.is_valid():
+            AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY_ID = get_credentials(
+                battery=assignment.hit.battery
+            )
+            conn = get_connection(
+                AWS_ACCESS_KEY_ID,
+                AWS_SECRET_ACCESS_KEY_ID,
+                hit=assignment.hit
+            )
             subject = form.cleaned_data['subject']
             message = form.cleaned_data['message']
-            assignment.contact_worker(subject, message)
+            conn.notify_workers([worker.id], subject, message)
             return manage_hit(request, assignment.hit.battery.id, 
                               assignment.hit.id)
     else:

From 438df93720f00c792eae20997ec8bfe9fa4830ef Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Tue, 5 Jul 2016 16:17:35 -0700
Subject: [PATCH 33/40] replaced call to manage_hit view function with an
 redirect to manage_hit to keep the url set to something we want to see when
 contact_worker is POSTed to.

---
 expdj/apps/turk/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/expdj/apps/turk/views.py b/expdj/apps/turk/views.py
index dcc714a..88720ad 100644
--- a/expdj/apps/turk/views.py
+++ b/expdj/apps/turk/views.py
@@ -371,8 +371,8 @@ def contact_worker(request, aid):
             subject = form.cleaned_data['subject']
             message = form.cleaned_data['message']
             conn.notify_workers([worker.id], subject, message)
-            return manage_hit(request, assignment.hit.battery.id, 
-                              assignment.hit.id)
+            return redirect('manage_hit', bid=assignment.hit.battery.id, 
+                            hid=assignment.hit.id)
     else:
         return HttpResponseNotAllowed()
 

From c81af4a707d98cc352160c7af35744ca70f2dd6c Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Wed, 29 Jun 2016 16:47:04 -0700
Subject: [PATCH 34/40] add contact worker function to assignment model, this
 model has access to all the information we need to generate connections and
 send information to workers. Add contact worker view to handle creating and
 processing the form

---
 expdj/apps/turk/models.py | 12 ++++++++++++
 expdj/apps/turk/views.py  |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/expdj/apps/turk/models.py b/expdj/apps/turk/models.py
index 940da73..2d54ce4 100644
--- a/expdj/apps/turk/models.py
+++ b/expdj/apps/turk/models.py
@@ -479,6 +479,18 @@ def update(self, mturk_assignment=None, hit=None):
 
         self.save()
 
+    def contact_worker(self, subject, msg):
+        '''contact_worker uses the boto function notify_workers to send a
+            message a specific worker.
+        :subject: Subject of the message to send.
+        :msg: Contents of the message to send.
+        '''
+        self.hit.generate_connection()
+        try:
+            self.hit.connection.notify_workers(self.worker.id, subject, msg)
+        except MTurkRequestError:
+            pass
+
     def __unicode__(self):
         return self.mturk_id
 
diff --git a/expdj/apps/turk/views.py b/expdj/apps/turk/views.py
index 88720ad..b8a8541 100644
--- a/expdj/apps/turk/views.py
+++ b/expdj/apps/turk/views.py
@@ -15,7 +15,8 @@
 from django.utils import timezone
 from django.views.decorators.csrf import ensure_csrf_cookie
 
-from expdj.apps.experiments.models import (Battery, ExperimentTemplate)
+from expdj.apps.experiments.models import (Assignment, Battery, 
+    ExperimentTemplate)
 from expdj.apps.experiments.views import (check_battery_edit_permission, 
     check_mturk_access, get_battery_intro, deploy_battery)
 from expdj.apps.experiments.utils import get_experiment_type, select_experiments

From a4cc5cd3a063af7e00ce9313e9c90e67732dc97b Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Sun, 3 Jul 2016 15:32:10 -0700
Subject: [PATCH 35/40] fix import issues in turk views. Added url for contact
 worker. Added code to load contact worker view in manage_hit template

---
 expdj/apps/turk/views.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/expdj/apps/turk/views.py b/expdj/apps/turk/views.py
index b8a8541..88720ad 100644
--- a/expdj/apps/turk/views.py
+++ b/expdj/apps/turk/views.py
@@ -15,8 +15,7 @@
 from django.utils import timezone
 from django.views.decorators.csrf import ensure_csrf_cookie
 
-from expdj.apps.experiments.models import (Assignment, Battery, 
-    ExperimentTemplate)
+from expdj.apps.experiments.models import (Battery, ExperimentTemplate)
 from expdj.apps.experiments.views import (check_battery_edit_permission, 
     check_mturk_access, get_battery_intro, deploy_battery)
 from expdj.apps.experiments.utils import get_experiment_type, select_experiments

From 898f0e330f30937f7a2f1783d8ded586dea9b169 Mon Sep 17 00:00:00 2001
From: Ross Blair <rblair2@stanford.edu>
Date: Tue, 5 Jul 2016 15:12:53 -0700
Subject: [PATCH 36/40] moved call to contact worker out of assignment model
 and into view. This will make it easier/more efficent to send a message to
 multiple workers at once.

---
 expdj/apps/turk/models.py | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/expdj/apps/turk/models.py b/expdj/apps/turk/models.py
index 2d54ce4..940da73 100644
--- a/expdj/apps/turk/models.py
+++ b/expdj/apps/turk/models.py
@@ -479,18 +479,6 @@ def update(self, mturk_assignment=None, hit=None):
 
         self.save()
 
-    def contact_worker(self, subject, msg):
-        '''contact_worker uses the boto function notify_workers to send a
-            message a specific worker.
-        :subject: Subject of the message to send.
-        :msg: Contents of the message to send.
-        '''
-        self.hit.generate_connection()
-        try:
-            self.hit.connection.notify_workers(self.worker.id, subject, msg)
-        except MTurkRequestError:
-            pass
-
     def __unicode__(self):
         return self.mturk_id
 

From a5e09c95a94773c6467c177eb325c020c1be8d08 Mon Sep 17 00:00:00 2001
From: Ross Blair <rosswilsonblair@gmail.com>
Date: Tue, 12 Jul 2016 10:58:30 -0500
Subject: [PATCH 37/40] missed template change during the rebase with testing

---
 expdj/apps/experiments/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/expdj/apps/experiments/views.py b/expdj/apps/experiments/views.py
index 9fa0e38..54f0497 100644
--- a/expdj/apps/experiments/views.py
+++ b/expdj/apps/experiments/views.py
@@ -409,7 +409,7 @@ def serve_battery(request,bid,userid=None):
     missing_batteries, blocking_batteries = check_battery_dependencies(battery, userid)
     if missing_batteries or blocking_batteries:
         return render_to_response(
-            "experiments/battery_requirements_not_met.html",
+            "turk/battery_requirements_not_met.html",
             context={'missing_batteries': missing_batteries,
                      'blocking_batteries': blocking_batteries}
         )

From d98837697e26dac3be3d0b425757771fae8b6e0e Mon Sep 17 00:00:00 2001
From: Ross Blair <rosswilsonblair@gmail.com>
Date: Tue, 12 Jul 2016 13:41:20 -0500
Subject: [PATCH 38/40] updated contact worker form message field to use
 textarea

---
 expdj/apps/turk/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/expdj/apps/turk/forms.py b/expdj/apps/turk/forms.py
index 31d3f0d..1ed3720 100644
--- a/expdj/apps/turk/forms.py
+++ b/expdj/apps/turk/forms.py
@@ -34,7 +34,7 @@ def __init__(self, *args, **kwargs):
 
 class WorkerContactForm(forms.Form):
     subject = forms.CharField(label="Subject")
-    message = forms.CharField(label="Message")
+    message = forms.TextArea(label="Message")
 
     def __init__(self, *args, **kwargs):
         super(WorkerContactForm, self).__init__(*args, **kwargs)

From 20b69ea54ea750f60828af932e8b35b805914a00 Mon Sep 17 00:00:00 2001
From: Ross Blair <rosswilsonblair@gmail.com>
Date: Tue, 12 Jul 2016 13:45:12 -0500
Subject: [PATCH 39/40] mispelling in turk forms

---
 expdj/apps/turk/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/expdj/apps/turk/forms.py b/expdj/apps/turk/forms.py
index 1ed3720..0c0226a 100644
--- a/expdj/apps/turk/forms.py
+++ b/expdj/apps/turk/forms.py
@@ -34,7 +34,7 @@ def __init__(self, *args, **kwargs):
 
 class WorkerContactForm(forms.Form):
     subject = forms.CharField(label="Subject")
-    message = forms.TextArea(label="Message")
+    message = forms.Textarea(label="Message")
 
     def __init__(self, *args, **kwargs):
         super(WorkerContactForm, self).__init__(*args, **kwargs)

From 94555cbbeeaab5172b1754d7d190db2da1132898 Mon Sep 17 00:00:00 2001
From: Ross Blair <rosswilsonblair@gmail.com>
Date: Tue, 12 Jul 2016 13:48:22 -0500
Subject: [PATCH 40/40] set message field to use textarea widget in contactform

---
 expdj/apps/turk/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/expdj/apps/turk/forms.py b/expdj/apps/turk/forms.py
index 0c0226a..c40dfb6 100644
--- a/expdj/apps/turk/forms.py
+++ b/expdj/apps/turk/forms.py
@@ -34,7 +34,7 @@ def __init__(self, *args, **kwargs):
 
 class WorkerContactForm(forms.Form):
     subject = forms.CharField(label="Subject")
-    message = forms.Textarea(label="Message")
+    message = forms.CharField(widget=forms.Textarea, label="Message")
 
     def __init__(self, *args, **kwargs):
         super(WorkerContactForm, self).__init__(*args, **kwargs)