X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=tasks.html;h=192426b4d7501271a4136fb3e1f61cd9ee93f3cb;hb=27907dbe8cb9df3a2db9be1715cbbdeebf084651;hp=448e9892b0c0f57cb2e89ec85d65f08cb663151b;hpb=a8968f20cd3b06b2cc19de6871019d4aaae6b79b;p=contractor-progress.git

diff --git a/tasks.html b/tasks.html
index 448e989..192426b 100644
--- a/tasks.html
+++ b/tasks.html
@@ -15,23 +15,27 @@
 
   <p><strong>Title</strong>: ~title.html~</p>
 
-  <p><strong>Status</strong>: ~state.html~</p>
+  <p><strong>Status</strong>: ~state.html~<!--~finished_at_section start~--> (finished on ~finished_at.mmddyyyy~)<!--~end~--><!--~tested_at_section start~--> (tested on ~tested_at.mmddyyyy~)<!--~end~--></p>
 
   <p><strong>URL</strong>: <a target="_new" href="~url.attr~">~url.html~</a></p>
 
   <p style="padding-left: 20px; text-indent: -20px"><strong>Narrative</strong>:<br />
   ~description.htmlbrtab~</p>
 
-  <!--~price_row start~--><p><strong>Price</strong>: ~price.money~</p><!--~end~-->
+  <!--~price_row start~--><p><strong>Price</strong>: ~price.money~<!--~marked_paid start~--> &nbsp;&nbsp;<strong>Paid</strong><!--~end~--></p><!--~end~-->
+
+  <!--~mark_paid_link start~--><p><a href="tasks?tasks_mark_paid_id=~task_id.attr~">Mark as paid</a></p><!--~end~-->
 
   <!--~approve_price_link start~--><p><a href="tasks?tasks_approve_price_id=~task_id.attr~">Approve price</a></p><!--~end~-->
 
   <!--~normal_edit_link start~--><p><a href="tasks?tasks_edit_id=~task_id.attr~">Edit this task</a></p><!--~end~-->
   <!--~warning_edit_link start~--><p><a href="tasks?tasks_edit_id=~task_id.attr~" onclick="return confirm('Editing this task will invalidate the price, proceed anyway?')">Edit this task</a></p><!--~end~-->
 
-  <!--~working_link start~--><p><a href="tasks?tasks_working_id=~task_id.attr~">I'm starting on this now</a>.</p><!--~end~-->
+  <!--~working_link start~--><p><a href="tasks?tasks_working_id=~task_id.attr~">I'm starting on this now</a></p><!--~end~-->
+
+  <!--~hold_link start~--><p><a href="tasks?tasks_hold_id=~task_id.attr~">Place this task on hold</a></p><!--~end~-->
 
-  <!--~needs_testing_link start~--><p><a href="tasks?tasks_needs_testing_id=~task_id.attr~">Mark this task as finished (request testing)</a>.</p><!--~end~-->
+  <!--~needs_testing_link start~--><p><a href="tasks?tasks_needs_testing_id=~task_id.attr~">Mark this task as finished (request testing)</a></p><!--~end~-->
 
   <!--~finished_link start~--><p>Please test everything in the narrative! If everything is working, <a href="tasks?tasks_finished_id=~task_id.attr~">Mark this task as finished</a> Otherwise please e-mail or call Jason.</p><!--~end~-->
 
@@ -44,6 +48,10 @@
   <form action="tasks" method="post"><!--~editing start~--><input type="hidden" name="tasks_edit_id" value="~tasks_edit_id.attr~" /><!--~end~-->
     <table cellspacing="0" cellpadding="4" border="0" summary="">
 
+<!--~client_row start~-->
+      <tr><td class="caption">Client: </td><td class="field"><select name="client_id"><option value="">Choose One...</option><!--~client_id.options~--></select></td></tr>
+<!--~end~-->
+
       <tr><td class="caption">Title: </td><td class="field"><input type="text" size="40" name="title" value="~title.attr~" /></td></tr>
 
       <tr><td class="caption">URL: </td><td class="field"><input type="text" size="40" name="url" value="~url.attr~" /></td></tr>
@@ -60,9 +68,10 @@
       <tr><td class="caption">Price: </td><td class="field"><input type="text" size="10" name="price" value="~price.attr~" /></td></tr>
 <!--~end~-->
 <!--~contractor_submits start~-->
-      <tr><td class="submit_row" colspan="2"><input type="submit" name="save_price" value="Save With Price" /></td></tr>
-      <tr><td class="submit_row" colspan="2"><input type="submit" name="save_draft" value="Save As Draft" /></td></tr>
-      <tr><td class="submit_row" colspan="2"><input type="submit" name="needs_clarification" value="Needs Clarification" /></td></tr>
+      <tr><td colspan="2"><input type="submit" name="save_price" value="Save With Price" /> (directly to queue if &lt;= tiny)</td></tr>
+      <tr><td colspan="2"><input type="submit" name="save_price_no_tiny" value="Await Price Approval" /> (even if it's &lt;= tiny agreement)</td></tr>
+      <tr><td colspan="2"><input type="submit" name="save_draft" value="Save As Draft" /></td></tr>
+      <tr><td colspan="2"><input type="submit" name="needs_clarification" value="Needs Clarification" /></td></tr>
 <!--~end~-->
 <!--~normal_submits start~-->
       <tr><td class="submit_row" colspan="2"><input type="submit" name="request_price" value="Save and Request Price" /></td></tr>