X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=tasks.php;h=b13a2db8c9891356a23fe023763c0bcce65bb0fe;hb=9f423711f09068df37d0ac666e68eaa2a110ec41;hp=561c1d9fb96e625fa441d67683af85836fd98745;hpb=2001b81dd9d0e90d86484fa09e6ddaebb5340c0a;p=contractor-progress.git

diff --git a/tasks.php b/tasks.php
index 561c1d9..b13a2db 100644
--- a/tasks.php
+++ b/tasks.php
@@ -31,15 +31,11 @@ function description_has_fixmes($description) {
 	return (strpos($description, 'FIXME') !== false);
 }
 
-# replace every character in $str with " "
-function tonbsp($matches) {
-	return str_repeat(' ', strlen($matches[0]) * 2);
-}
-
 # encode as html, make it display newlines and leading spaces
 function enc_htmlbrtab($str) {
 	$str = enc_htmlbr($str);
-	$str = preg_replace_callback("|^ *|m", tonbsp, $str);
+	$space_to_nbsp = create_function('$matches', 'return str_repeat(\' \', strlen($matches[0]) * 2);');
+	$str = preg_replace_callback("|^ *|m", $space_to_nbsp, $str);
 	return $str;
 }
 
@@ -88,12 +84,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 +107,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 +118,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
@@ -202,7 +206,7 @@ function tasks_edit_main() {
 
 	if(isset($_REQUEST['tasks_approve_price_id'])) {
 		$id = $_REQUEST['tasks_approve_price_id'];
-		$owner = db_get_value('tasks', 'client_id', 'where id=%i', $id);;
+		$owner = db_get_value('tasks', 'client_id', 'where id=%i', $id);
 		if(logged_in() != $owner) {
 			message("Error: can't approve a task entered by/for another client.");
 			return './';
@@ -229,7 +233,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 './';
 	}
@@ -264,9 +268,11 @@ function tasks_edit_main() {
 			$state = TASK_DRAFT;
 		} elseif(isset($_REQUEST['save_bug'])) {
 			$state = TASK_BUG;
+		} elseif(isset($_REQUEST['save_price_no_tiny']) && logged_in_as_contractor()) {
+			$state = TASK_NEEDS_GO_AHEAD;
 		} elseif(isset($_REQUEST['save_price']) && logged_in_as_contractor()) {
 			$tiny_agreement = db_get_value('people', 'tiny_agreement', 'where id=%i', $client_id);
-			if($price < $tiny_agreement) {
+			if($price <= $tiny_agreement) {
 				$state = TASK_QUEUED;
 			} else {
 				$state = TASK_NEEDS_GO_AHEAD;
@@ -282,7 +288,7 @@ function tasks_edit_main() {
 			}
 		}
 
-		if("you're happy with the POSTed values") {
+		if("you're happy with the POSTed values") { # if you change this change the one above
 			if($edit_id) {
 				if(isset($_REQUEST['price']) && logged_in_as_contractor()) {
 					db_update('tasks', 'title,url,description,state,price', $title, $url, $description, $state, $price, 'where id=%i', $edit_id);
@@ -294,7 +300,13 @@ function tasks_edit_main() {
 				# new task
 				$paid = 0;
 				$client_id = logged_in();
-				db_insert('tasks', 'client_id,title,url,description,state,paid', $client_id, $title, $url, $description, $state, $paid);
+				if(logged_in_as_contractor() && $_REQUEST['client_id']) {
+					$client_id = format_int($_REQUEST['client_id']);
+				} else {
+					# if client entered the task, no price is set
+					$price = 0;
+				}
+				db_insert('tasks', 'client_id,title,url,description,state,paid,price', $client_id, $title, $url, $description, $state, $paid, $price);
 				message('Task saved.');
 			}
 			if($GLOBALS['tasks_form_recipient'] != "fixme@example.com") {
@@ -340,6 +352,11 @@ function tasks_edit_main() {
 		tem_show('bug_msg');
 	} else {
 		tem_show('new_msg');
+		if(logged_in_as_contractor()) {
+			pulldown('client_id', db_get_rows('people', 'id,name', 'where id > 1'), PULLDOWN_2D);
+			tem_set('client_id', format_int($_REQUEST['client_id']));
+			tem_show('client_row');
+		}
 	}
 
 	# display instructions
@@ -361,7 +378,20 @@ function tasks_edit_main() {
 		} else {
 			tem_show('normal_instructions');
 		}
-		tem_show('normal_submits');
+		if(logged_in_as_contractor()) {
+			tem_show('contractor_submits');
+			switch($state) {
+				case TASK_DRAFT:
+				case TASK_NEEDS_CLARIFICATION:
+				case TASK_NEEDS_QUOTE:
+				case TASK_NEEDS_GO_AHEAD:
+				case TASK_QUEUED:
+				case TASK_BUG:
+				tem_show('price_field');
+			}
+		} else {
+			tem_show('normal_submits');
+		}
 	}
 }