log when tasks are tested, and show testing date and completion date (when applicable...

[contractor-progress.git] / tasks.html

diff --git a/tasks.html b/tasks.html
index 80d3dba..cf845df 100644 (file)
--- a/tasks.html
+++ b/tasks.html
@@ -15,14 +15,14 @@
 
   <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~-->
 
@@ -66,9 +66,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>