X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=index.html;h=1310540840045d73848cacd4555f2b75f7440e51;hb=27907dbe8cb9df3a2db9be1715cbbdeebf084651;hp=fd6343281f12150dc393766702b97325a5289309;hpb=1bcde3c6ba88a93deaa0848df4de0b0857d9bf49;p=contractor-progress.git

diff --git a/index.html b/index.html
index fd63432..1310540 100644
--- a/index.html
+++ b/index.html
@@ -11,54 +11,75 @@
 
   <h2>Progress Manager</h2>
 
-  <p>This page is for commissioning Jason Woofenden, working out the details of the tasks, costs and priorities.</p>
+  <p>This page is for giving Jason Woofenden work and figuring out the details of the associated tasks, costs and priorities.</p>
 
-  <p><a href="tasks?tasks_new=1">Commission a new feature/update</a> &bull; <a href="tasks?tasks_new_bug=1">Report a problem</a><!-- &bull; <a href="pay">Pay Jason</a>--></p>
+  <p><a href="tasks?tasks_new=1">Add a task</a> &bull; <!--~not_contractor_links start~--><a href="tasks?tasks_new_bug=1">Report a problem</a><!-- &bull; <a href="pay">Pay Jason</a>--><!--~end~--><!--~contractor_links start~--><a href="people">Manage accounts</a><!--~end~--><!--~su_link start~--> &bull; <a href="su">Switch login</a><!--~end~--></p>
 
-  <!--~needs_attention start~-->
+  <!--~needs_attention_header start~-->
     <h3>Tasks needing your attention:</h3>
-    <!--~needs_attention_row start~-->
-    <div><a href="tasks?tasks_edit_id=~task_id~">Task #~task_id~: ~task_title.html~</a> (~task_state~)</div>
-    <!--~end~-->
   <!--~end~-->
-
-  <!--~queue start~-->
-    <h3>Prioritized queue</h3>
-    <p>Use the arrows on the left to change the order.</p>
-    <!--~queue_row start~-->
-    <div><a href="tasks?tasks_id=~task_id~">Task #~task_id~: ~task_title.html~</a> (~task_price.money~)</div>
+    <!--~needs_approval_row start~-->
+    <div class="task_link">~client.html~ <a href="tasks?tasks_id=~task_id~">#~task_id~: ~task_title.html~</a> (~task_state~)</div>
+    <!--~end~-->
+    <!--~needs_fixing_row start~-->
+    <div class="task_link">~client.html~ <a href="tasks?tasks_edit_id=~task_id~">#~task_id~: ~task_title.html~</a> (~task_state~)</div>
     <!--~end~-->
-  <!--~end~-->
 
   <!--~jason start~-->
     <h3>Tasks waiting for Jason:</h3>
     <!--~jason_row start~-->
-    <div><a href="tasks?tasks_id=~task_id~">Task #~task_id~: ~task_title.html~</a> (~task_state~)</div>
+    <div class="task_link"><a href="tasks?tasks_id=~task_id~">#~task_id~: ~task_title.html~</a> (~task_state~)</div>
     <!--~end~-->
   <!--~end~-->
 
   <!--~jason_working start~-->
-    <h3>Jason is currently working on:</h3>
+    <h4>Jason is currently working on:</h4>
     <!--~jason_working_row start~-->
-    <div><a href="tasks?tasks_id=~task_id~">Task #~task_id~: ~task_title.html~</a> (~task_price.money~)</div>
+    <div class="task_link"><a href="tasks?tasks_id=~task_id~">#~task_id~: ~task_title.html~</a> (~task_price.money~)</div>
+    <!--~end~-->
+  <!--~end~-->
+
+  <!--~queue start~-->
+    <h4>Queued tasks</h4>
+    <div>Jason hasn't started on these yet. You can use the arrows to set the priority order. Jason will do the top one first.</div>
+    <!--~queue_row start~-->
+    <div class="task_link"><span class="updown"><div class="updown_links"> <a href="tasks?tasks_edit_id=~task_id~&amp;bump=down">later</a> <a href="tasks?tasks_edit_id=~task_id~&amp;bump=up">sooner</a> <a href="tasks?tasks_edit_id=~task_id~&amp;bump=bottom">last</a> <a href="tasks?tasks_edit_id=~task_id~&amp;bump=top">first</a></div></span> ~client.html~ <a href="tasks?tasks_id=~task_id~">#~task_id~: ~task_title.html~</a> (~task_price.money~)</div>
     <!--~end~-->
   <!--~end~-->
 
+  <!--~finished_untested start~-->
+    <h3>Finished but not tested</h3>
+    <!--~finished_untested_row start~-->
+    <div class="task_link">~client.html~ <a href="tasks?tasks_id=~task_id~">#~task_id~: ~task_title.html~</a> (~task_price.money~)</div>
+    <!--~end~-->
+    <div>Total: ~task_total.money~</div>
+  <!--~end~-->
+
   <!--~finished_unpaid start~-->
-    <h3>Finished tasks (unpaid)</h3>
+    <h3>Finished tasks</h3>
     <!--~finished_unpaid_row start~-->
-    <div><a href="tasks?tasks_id=~task_id~">Task #~task_id~: ~task_title.html~</a> (~task_price.money~)</div>
+    <div class="task_link">~client.html~ <a href="tasks?tasks_id=~task_id~">#~task_id~: ~task_title.html~</a> (~task_price.money~)</div>
     <!--~end~-->
     <div>Total: ~task_total.money~</div>
   <!--~end~-->
 
+  <!--~unpaid_totals start~-->
+    <h3>Unpaid totals</h3>
+    <table cellpadding="3" cellspacing="0" border="1" summary="">
+    <tr><th>Client</th><th>Queued<br />&amp; WIP</th><th>Done</th><th>Done &amp;<br />Tested</th><th>Done But<br />Not Tested</th></tr>
+    <!--~unpaid_totals_row start~-->
+    <tr><td>~client.html~</td><td class="num">~queued_total.money~</td><td class="num">~done_total.money~</td><td class="num">~tested_total.money~</td><td class="num">~not_tested_total.money~</td></tr>
+    <!--~end~-->
+    </table>
+  <!--~end~-->
+
   <!--~finished_paid start~-->
     <h3>Finished and paid for</h3>
     <!--~finished_paid_row start~-->
-    <div><a href="tasks?tasks_id=~task_id~">Task #~task_id~: ~task_title.html~</div>
+    <div class="task_link">~client.html~ <a href="tasks?tasks_id=~task_id~">#~task_id~: ~task_title.html~</a></div>
     <!--~end~-->
     <!--~finished_paid_and_more start~-->
-    <div>...</div>
+    <div class="task_link">...</div>
     <!--~end~-->
   <!--~end~-->