update wfpl and templates

[contractor-progress.git] / tasks.php

diff --git a/tasks.php b/tasks.php
index 7966987..ecbf757 100644 (file)
--- 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) {
@@ -328,6 +331,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.");
@@ -399,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'])) {
@@ -420,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("you're happy with the POSTed values") { # 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,13 +453,14 @@ 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;
                                $client_id = logged_in();
                                if(logged_in_as_contractor() && $_REQUEST['client_id']) {
                                        $client_id = format_int($_REQUEST['client_id']);
+                                       $client_name = db_get_value('people', 'name', 'where id=%i', $client_id);
                                } else {
                                        # if client entered the task, no price is set
                                        $price = 0;
@@ -457,7 +471,11 @@ function tasks_edit_main() {
                                        $ord = 0;
                                }
                                db_insert('tasks', 'client_id,title,url,description,state,paid,price,ord', $client_id, $title, $url, $description, $state, $paid, $price, $ord);
-                               message('Task saved.');
+                               if(logged_in_as_contractor()) {
+                                       message("Task saved for $client_name.");
+                               } else {
+                                       message('Task saved.');
+                               }
                        }
                        if($GLOBALS['tasks_form_recipient'] != "fixme@example.com") {
                                $to = $GLOBALS['tasks_form_recipient'];
@@ -481,6 +499,8 @@ function tasks_edit_main() {
                        if($error !== true) {
                                return './';
                        }
+               } else {
+                       message('Error: you must select a client for the task');
                }
                # otherwise, we display the form again. tasks_get_fields() has
                # already put the posted values back into the template engine, so they will
@@ -488,7 +508,7 @@ function tasks_edit_main() {
                # fix their entry in whatever way you require.
        } elseif($edit_id) {
                # we've recieved an edit id, but no data. So we grab the values to be edited from the database
-               list($title, $url, $description, $state, $paid) = db_get_row('tasks', 'title,url,description,state,price', 'where id=%i', $edit_id);
+               list($title, $url, $description, $state, $price) = db_get_row('tasks', 'title,url,description,state,price', 'where id=%i', $edit_id);
                tasks_tem_sets($title, $url, $description, $price);
        } else {
                # form not submitted, you can set default values like so:
@@ -503,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');
                }