From d50da3563583a7c18e5dd76fd751cee19bf8bdaa Mon Sep 17 00:00:00 2001
From: Jason Woofenden <jason283@herkamire.com>
Date: Wed, 3 Dec 2008 00:37:53 -0500
Subject: [PATCH] saved date when tasks are completed, and sorted completed
 dates by that. also fixed flow for contractor giving tasks
 to himself

---
 index.php |   16 ++++++++++------
 tasks.php |   16 ++++++++++++----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/index.php b/index.php
index 0c3ae09..73bc2a5 100644
--- 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;
 }
diff --git a/tasks.php b/tasks.php
index 561c1d9..7c5f0d4 100644
--- a/tasks.php
+++ b/tasks.php
@@ -88,12 +88,12 @@ function tasks_display_main() {
 	$task_id = format_int($_REQUEST['tasks_id']);;
 	$client_id = logged_in();
 	if(logged_in_as_contractor()) {
-		$row = db_get_row('tasks', 'title,url,description,state,price', 'where id=%i', $task_id);
+		$row = db_get_row('tasks', 'title,url,description,state,price,client_id', 'where id=%i', $task_id);
 	} else {
-		$row = db_get_row('tasks', 'title,url,description,state,price', 'where id=%i && client_id=%i', $task_id, $client_id);
+		$row = db_get_row('tasks', 'title,url,description,state,price,client_id', 'where id=%i && client_id=%i', $task_id, $client_id);
 	}
 	if($row) {
-		list($title, $url, $description, $state, $price) = $row;
+		list($title, $url, $description, $state, $price, $owner_id) = $row;
 		tem_set('task_id', $task_id);
 		tem_set('title', $title);
 		tem_set('url', $url);
@@ -111,7 +111,10 @@ function tasks_display_main() {
 				case TASK_NEEDS_CLARIFICATION:
 				case TASK_NEEDS_QUOTE:
 				case TASK_BUG:
+					tem_show('normal_edit_link');
+				break;
 				case TASK_NEEDS_GO_AHEAD:
+					tem_show('approve_price_link');
 					tem_show('normal_edit_link');
 					tem_show('price_row');
 				break;
@@ -119,11 +122,16 @@ function tasks_display_main() {
 					tem_show('normal_edit_link');
 					tem_show('working_link');
 					tem_show('price_row');
+				break;
 				case TASK_WORKING:
 					tem_show('price_row');
 					tem_show('needs_testing_link');
 				break;
 				case TASK_NEEDS_TESTING:
+					if($owner_id == logged_in()) {
+						tem_show('finished_link');
+					}
+					# FALL THROUGH
 				case TASK_FINISHED:
 					tem_show('price_row');
 					tem_show('mark_paid_link'); # FIXME
@@ -229,7 +237,7 @@ function tasks_edit_main() {
 			message("Error: only Jason can say when he's done.");
 			return './';
 		}
-		db_update('tasks', 'state', TASK_NEEDS_TESTING, 'where id=%i', $id);
+		db_update('tasks', 'state,finished_at', TASK_NEEDS_TESTING, date('Y-m-d'), 'where id=%i', $id);
 		message('Task awaits testing.');
 		return './';
 	}
-- 
1.7.10.4