really made it so you can put tasks on hold. contractor can switch logins multiple...

[contractor-progress.git] / tasks.php

diff --git a/tasks.php b/tasks.php
index 6d382bc..8418502 100644 (file)
--- a/tasks.php
+++ b/tasks.php
@@ -141,8 +141,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 +157,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');
@@ -328,6 +333,13 @@ function tasks_edit_main() {
                $state = TASK_BUG;
        }
 
+       if(isset($_REQUEST['tasks_hold_id'])) {
+               $id = $_REQUEST['tasks_hold_id'];
+               db_update('tasks', 'state', TASK_ON_HOLD, 'where id=%i', $id);
+               message("Task removed from Jason's to-do list.");
+               return './';
+       }
+
        if(isset($_REQUEST['tasks_mark_paid_id'])) {
                if(!logged_in_as_contractor()) {
                        message("Error: only Jason can mark tasks as paid.");
@@ -420,13 +432,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);
@@ -440,7 +452,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;