X-Git-Url: https://jasonwoof.com/gitweb/?p=contractor-progress.git;a=blobdiff_plain;f=tasks.php;h=ecbf757d1e94ff4328bcbed6621c3c6edf9e4a84;hp=71165677a15292170337aef2f15cdefba18bfd53;hb=HEAD;hpb=5b50b2d1e2eb222ddc6000d68ec612a76347ded9

diff --git a/tasks.php b/tasks.php
index 7116567..ecbf757 100644
--- a/tasks.php
+++ b/tasks.php
@@ -68,8 +68,6 @@ function tasks_main() {
 		}
 		tem_show('edit_body');
 	}
-
-	tem_show('main_body');
 }
 
 function tasks_display_main() {
@@ -141,8 +139,12 @@ function tasks_display_main() {
 			switch($state) {
 				case TASK_DRAFT:
 				case TASK_NEEDS_CLARIFICATION:
-				case TASK_NEEDS_QUOTE:
 				case TASK_BUG:
+				case TASK_ON_HOLD:
+					tem_show('normal_edit_link');
+				break;
+				case TASK_NEEDS_QUOTE:
+					tem_show('hold_link');
 					tem_show('normal_edit_link');
 				break;
 				case TASK_NEEDS_GO_AHEAD:
@@ -153,6 +155,7 @@ function tasks_display_main() {
 				case TASK_QUEUED:
 					tem_show('price_row');
 					tem_show('warning_edit_link');
+					tem_show('hold_link');
 				break;
 				case TASK_WORKING:
 					tem_show('price_row');
@@ -294,7 +297,7 @@ function prioritize_task($id, $change) {
 
 function tasks_edit_main() {
 	$state = TASK_DRAFT; # will be overwritten
-	$client_id = logged_in(); # fixed shortly if we're contractor
+	$client_id = logged_in(); # fixed shortly if we're contractor, unless it's a new task by the contractor
 	$edit_id = format_int($_REQUEST['tasks_edit_id']);
 	unset($_REQUEST['tasks_edit_id']);
 	if($edit_id) {
@@ -406,6 +409,9 @@ function tasks_edit_main() {
 	if(isset($_REQUEST['title'])) {
 		list($title, $url, $description, $price) = tasks_get_fields();
 		$queuing = false;
+		if(logged_in_as_contractor() && $_REQUEST['client_id']) {
+			$client_id = format_int($_REQUEST['client_id']);
+		}
 
 		# FIXME
 		if(isset($_REQUEST['save_draft'])) {
@@ -427,13 +433,13 @@ function tasks_edit_main() {
 		} else { # better be "request_price"
 			if(description_has_fixmes($description)) {
 				$state = TASK_NEEDS_CLARIFICATION;
-				message('The description is not ready to be priced yet because it still contains at least one "FIXME".');
+				message("Error: Not requesting price. To get this task priced, you'll need to edit the description so it no longer contains \"FIXME\".");
 			} else {
 				$state = TASK_NEEDS_QUOTE;
 			}
 		}
 
-		if(!logged_in_as_contractor() || $edit_id || $_REQUEST['client_id']) { # if you change this change the one above
+		if(!logged_in_as_contractor() || $edit_id || $_REQUEST['client_id']) {
 			if($edit_id) {
 				$tables = 'title,url,description,state';
 				$values = array($title, $url, $description, $state);
@@ -447,7 +453,7 @@ function tasks_edit_main() {
 					array_push($values, new_lowest_priority($client_id));
 				}
 				db_update('tasks', $tables, $values, 'where id=%i', $edit_id);
-				message('Task updated.');
+				message('Changes saved.');
 			} else {
 				# new task
 				$paid = 0;
@@ -517,7 +523,7 @@ function tasks_edit_main() {
 	} else {
 		tem_show('new_msg');
 		if(logged_in_as_contractor()) {
-			pulldown('client_id', db_get_rows('people', 'id,name', 'where id > 1'), PULLDOWN_2D);
+			pulldown('client_id', db_get_rows('people', 'id,name', 'where id > 1 order by name'), PULLDOWN_2D);
 			tem_set('client_id', format_int($_REQUEST['client_id']));
 			tem_show('client_row');
 		}