Merge in @ldworkin's changes. Fixes #32 and fixes #35.

TurkServer · Aug 14, 2015 · 70ebdf5 · mizzao · Aug 14, 2015 · mizzao
1 parent 2970abe
commit 70ebdf5
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 19 deletions.
diff --git a/admin/admin.coffee b/admin/admin.coffee
@@ -217,16 +217,20 @@ Meteor.methods
         </ExternalQuestion>
       """
 
-    hit = null
+    hitId = null
     try
-      hit = TurkServer.mturk "CreateHIT", params
+      hitId = TurkServer.mturk "CreateHIT", params
     catch e
       throw new Meteor.Error(500, e.toString())
 
     HITs.insert
-      HITId: hit
+      HITId: hitId
       HITTypeId: hitType.HITTypeId
 
+    this.unblock()
+    # Immediately refresh HIT data after creation
+    Meteor.call("ts-admin-refresh-hit", hitId)
+
     return
 
   "ts-admin-refresh-hit": (HITId) ->

diff --git a/admin/mturkAdmin.coffee b/admin/mturkAdmin.coffee
@@ -416,9 +416,6 @@ Template.tsAdminCompletedAssignmentsTable.events
   "click .ts-admin-pay-bonus": ->
     TurkServer._displayModal Template.tsAdminPayBonus, this
 
-  "click .ts-admin-email-worker": ->
-    TurkServer._displayModal Template.tsAdminEmailWorker, this
-
 Template.tsAdminCompletedAssignmentRow.helpers
   labelStatus: ->
     switch @mturkStatus

diff --git a/admin/mturkAdmin.html b/admin/mturkAdmin.html
@@ -571,11 +571,6 @@ <h3>Maintenance</h3>
                     </button>
                     {{/if}}
                 </dd>
-		<dt>Email</dt>
-		<dd><button class="btn btn-xs btn-info ts-admin-email-worker">
-		        <span class="glyphicon glyphicon-envelope"></span>
-		    </button>
-		</dd>
             </dl>
         </td>
         <td>{{> tsDescList exitdata}}</td>

diff --git a/admin/util.coffee b/admin/util.coffee
@@ -65,12 +65,14 @@ Template.tsAdminPayBonus.events
 Template.tsAdminEmailWorker.events
   "submit form": (e, t) ->
     e.preventDefault()
-    subject = t.find("textarea[name=subject]").value
+    subject = t.find("input[name=subject]").value
     message = t.find("textarea[name=message]").value
     recipients = [@workerId]
 
     emailId = WorkerEmails.insert({ subject, message, recipients })
-    Meteor.call "ts-admin-send-message", emailId
+
+    Meteor.call "ts-admin-send-message", emailId, (err) ->
+      bootbox.alert(err) if err
 
     $(t.firstNode).closest(".bootbox.modal").modal('hide')
 
@@ -101,6 +103,10 @@ Template.tsUserPill.helpers
   labelClass: userLabelClass
   identifier: userIdentifier
 
+Template.tsUserPill.events
+  "click .ts-admin-email-worker": ->
+    TurkServer._displayModal Template.tsAdminEmailWorker, this
+
 Template.tsDescList.helpers
   properties: ->
     result = []

diff --git a/admin/util.html b/admin/util.html
@@ -63,6 +63,7 @@
 </template>
 
 <template name="tsAdminPayBonus">
+    <div class="modal-body">
     <form class="form-horizontal">
         <div class="form-group">
             <label class="col-sm-3 control-label">WorkerId</label>
@@ -90,10 +91,11 @@
         </div>
         <button class="btn btn-primary" type="submit">Pay Bonus</button>
     </form>
+    </div>
 </template>
 
 <template name="tsAdminEmailWorker">
-    <div class="clear"></div>
+    <div class="modal-body">
     <form class="form-horizontal">
         <div class="form-group">
             <label class="col-sm-3 control-label">WorkerId</label>
@@ -104,17 +106,18 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">Subject</label>
             <div class="col-sm-9">
-	        <textarea class="form-control" name="subject" rows="1" required></textarea>
+	        <input class="form-control" type="text" name="subject" required>
             </div>
         </div>
-	<div class="form-group">
+	    <div class="form-group">
             <label class="col-sm-3 control-label">Message</label>
             <div class="col-sm-9">
-	        <textarea class="form-control" name="message" rows="4" required></textarea>
+	        <textarea class="form-control" name="message" rows="10" required></textarea>
             </div>
         </div>
         <button class="btn btn-primary" type="submit">Send Message</button>
     </form>
+    </div>
 </template>
 
 <!-- Template for displaying a worker in a dropdown list -->
@@ -157,6 +160,11 @@
             {{/if}}</dd>
         <dt>State:</dt>
         <dd>{{turkserver.state}}</dd>
+        <dt>Contact:</dt>
+        <dd><button class="btn btn-xs btn-info ts-admin-email-worker">
+            <span class="glyphicon glyphicon-envelope"></span>
+            </button>
+        </dd>
     </dl>
 
     {{#if status.online}}

diff --git a/client/ts_client.styl b/client/ts_client.styl
@@ -11,5 +11,3 @@ html, body
 .form-control.width-long
   width: 240px
 
-.clear
-  clear: both