saved date when tasks are completed, and sorted completed dates by that. also fixed...

[contractor-progress.git] / index.php

diff --git a/index.php b/index.php
index 0c3ae09..73bc2a5 100644 (file)
--- a/index.php
+++ b/index.php
@@ -68,10 +68,14 @@ function _index_main() {
        if(logged_in_as_contractor()) {
                tem_show('su_link');
                tem_show('needs_attention_header');
-               task_summary('needs_approval', 'where state=%i order by id desc', TASK_WORKING);
-               task_summary('needs_fixing', 'where (state=%i || state=%i) || (client_id=1 && state<%i) order by id desc', TASK_NEEDS_QUOTE, TASK_BUG, TASK_QUEUED);
-               task_summary('finished_unpaid', 'where state=%i && paid = 0 order by id desc', TASK_FINISHED);
-               task_summary('finished_paid', 'where state=%i && paid = 1 order by id desc', TASK_FINISHED);
+
+               # things with a view link:
+               task_summary('needs_approval', 'where state=%i || (client_id=%i && (state=%i || state=%i || state=%i)) order by id desc', TASK_WORKING, $client_id, TASK_NEEDS_TESTING, TASK_NEEDS_GO_AHEAD, TASK_BUG);
+
+               # things with an edit link:
+               task_summary('needs_fixing', 'where (state=%i || state=%i) || (client_id=%i && (state<%i || state=%i)) order by id desc', TASK_NEEDS_QUOTE, TASK_BUG, $client_id, TASK_DRAFT, TASK_NEEDS_CLARIFICATION);
+               task_summary('finished_unpaid', 'where state=%i && paid = 0 order by finished_at desc', TASK_FINISHED);
+               task_summary('finished_paid', 'where state=%i && paid = 1 order by finished_at desc limit 20', TASK_FINISHED);
                task_summary('queue', 'where state=%i order by client_id, ord', TASK_QUEUED);
        } else {
                if(db_count('tasks', 'where client_id=%i && (state=%i || state=%i || state=%i || state=%i)', $client_id, TASK_DRAFT, TASK_NEEDS_CLARIFICATION, TASK_NEEDS_GO_AHEAD, TASK_NEEDS_TESTING)) {
@@ -82,8 +86,8 @@ function _index_main() {
                task_summary('queue', 'where client_id=%i && state=%i order by ord', $client_id, TASK_QUEUED);
                task_summary('jason', 'where client_id=%i && (state=%i || state=%i) order by id desc', $client_id, TASK_NEEDS_QUOTE, TASK_BUG);
                task_summary('jason_working', 'where client_id=%i && state=%i order by id desc', $client_id, TASK_WORKING);
-               task_summary('finished_unpaid', 'where client_id=%i && state=%i && paid=0 order by id desc', $client_id, TASK_FINISHED);
-               task_summary('finished_paid', 'where client_id=%i && state=%i && paid=1 order by id desc', $client_id, TASK_FINISHED);
+               task_summary('finished_unpaid', 'where client_id=%i && state=%i && paid=0 order by finished_at desc', $client_id, TASK_FINISHED);
+               task_summary('finished_paid', 'where client_id=%i && state=%i && paid=1 order by finished_at desc', $client_id, TASK_FINISHED);
        }
        return;
 }