X-Git-Url: https://jasonwoof.com/gitweb/?p=contractor-progress.git;a=blobdiff_plain;f=tasks.php;h=e4a8b50b6c526d344371378cdd0fa051674362aa;hp=395d99500cd34bd6ecc25b03916d18027a428685;hb=ee6685eef368fdd21c4916b32a0ad26880146cce;hpb=ca9fd4b5358f875195fd81632589cf5305f2ac69 diff --git a/tasks.php b/tasks.php index 395d995..e4a8b50 100644 --- a/tasks.php +++ b/tasks.php @@ -1,5 +1,20 @@ . + require_once('code/tasks.php'); $GLOBALS['tasks_form_recipient'] = "fixme@example.com"; @@ -16,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; } @@ -73,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); @@ -96,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; @@ -104,13 +118,19 @@ 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 break; } } else { @@ -148,6 +168,126 @@ function tasks_display_main() { } } +define('MAX_PRIORITY', 2000000000); +define('MIN_PRIORITY', 0); +define('MID_PRIORITY', floor((MAX_PRIORITY - MIN_PRIORITY) / 2)); + +function new_lowest_priority($client_id) { + $lowest_ord = db_get_value('tasks', 'ord', 'where client_id=%i && state=%i order by ord asc limit 1', $client_id, TASK_QUEUED); + if($lowest_ord === false) { + return MID_PRIORITY; + } + if($lowest_ord == MIN_PRIORITY) { + reprioritize_tasks($client_id); # make room + $lowest_ord = db_get_value('tasks', 'ord', 'where client_id=%i && state=%i order by ord asc limit 1', $client_id, TASK_QUEUED); + } + return MIN_PRIORITY + floor(($lowest_ord - MIN_PRIORITY) / 2); +} + +# keep everything in the same order, but space them out so there's room to squeeze things in anywhere +function reprioritize_tasks($client_id) { + $ids = db_get_column('tasks', 'id', 'where client_id=%i && state=%i order by ord desc, id desc', $client_id, TASK_QUEUED); + $step = floor((MAX_PRIORITY - MIN_PRIORITY) / (count($ids) + 1)); + $cur = MAX_PRIORITY; + foreach($ids as $id) { + $cur -= $step; + db_update('tasks', 'ord', $cur, 'where id=%i', $id); + } +} + + +# pass the task id and one of (up,down,top,bottom) +function prioritize_task($id, $change) { + $row = db_get_row('tasks', 'client_id,ord', 'where id=%i', $id); + if(!$row) { + message('Database error #2242'); + return; + } + list($client_id, $ord) = $row; + switch($change) { + case 'top': + list($highest_id, $highest_ord) = db_get_row('tasks', 'id,ord', 'where client_id=%i && state=%i order by ord desc limit 1', $client_id, TASK_QUEUED); + if($highest_id == $id) { + message('Already highest priority'); + return; + } + + if($highest_ord == MAX_PRIORITY) { + reprioritize_tasks($client_id); # make room + $highest_ord = db_get_value('tasks', 'ord', 'where client_id=%i && state=%i order by ord desc limit 1', $client_id, TASK_QUEUED); + } + + $new_ord = MAX_PRIORITY - floor((MAX_PRIORITY - $highest_ord) / 2); + db_update('tasks', 'ord', $new_ord, 'where id=%i', $id); + return; + case 'bottom': + list($lowest_id, $lowest_ord) = db_get_row('tasks', 'id,ord', 'where client_id=%i && state=%i order by ord asc limit 1', $client_id, TASK_QUEUED); + if($lowest_id == $id) { + message('Already lowest priority'); + return $lowest_ord; + } + + if($lowest_ord == MIN_PRIORITY) { + reprioritize_tasks($client_id); # make room + $lowest_ord = db_get_value('tasks', 'ord', 'where client_id=%i && state=%i order by ord asc limit 1', $client_id, TASK_QUEUED); + } + + $new_ord = MIN_PRIORITY + floor(($lowest_ord - MIN_PRIORITY) / 2); + db_update('tasks', 'ord', $new_ord, 'where id=%i', $id); + return; + case 'up': + case 'down': + if($change == 'up') { + $rows = db_get_rows('tasks', 'id,ord', 'where client_id=%i && state=%i order by ord desc, id desc', $client_id, TASK_QUEUED); + if($rows[0][0] == $id) { + message('Already highest priority'); + return; + } + if($rows[1][0] == $id) { + prioritize_task($id, 'top'); + return; + } + } else { + $rows = db_get_rows('tasks', 'id,ord', 'where client_id=%i && state=%i order by ord asc, id asc', $client_id, TASK_QUEUED); + if($rows[0][0] == $id) { + message('Already lowest priority'); + return; + } + if($rows[1][0] == $id) { + prioritize_task($id, 'bottom'); + return; + } + } + # find the one we're moving + $cur_index = 0; + $done = count($rows); + for($i = 2; $i < $done ; ++$i) { + if($rows[$i][0] == $id) { + $cur_index = $i; + break; + } + } + $before_ord = $rows[$cur_index - 1][1]; + $before_before_ord = $rows[$cur_index - 2][1]; + if(abs($before_before_ord - $before_ord) < 2) { + reprioritize_tasks($client_id); + $before_ord = db_get_value('tasks', 'ord', 'where id=%i', $rows[$cur_index - 1][0]); + $before_before_ord = db_get_value('tasks', 'ord', 'where id=%i', $rows[$cur_index - 2][0]); + if($before_before_ord == $before_ord) { + message('Programmer error #8592'); + return; + } + } + $new_ord = $before_ord + floor(($before_before_ord - $before_ord) / 2); + db_update('tasks', 'ord', $new_ord, 'where id=%i', $id); + return; + default: + message('invalid change'); + return; + } + +} + function tasks_edit_main() { $state = TASK_DRAFT; # will be overwritten $client_id = logged_in(); # fixed shortly if we're contractor @@ -169,18 +309,41 @@ function tasks_edit_main() { $state = db_get_value('tasks', 'state', 'where id=%i', $edit_id); } + if(isset($_REQUEST['bump'])) { + switch($_REQUEST['bump']) { + case 'up': + case 'down': + case 'top': + case 'bottom': + prioritize_task($edit_id, $_REQUEST['bump']); + return './'; + } + } + if(isset($_REQUEST['tasks_new_bug'])) { $state = TASK_BUG; } + if(isset($_REQUEST['tasks_mark_paid_id'])) { + if(!logged_in_as_contractor()) { + message("Error: only Jason can mark tasks as paid."); + return './'; + } + $id = $_REQUEST['tasks_mark_paid_id']; + db_update('tasks', 'paid', 1, 'where id=%i', $id); + message('Marked as paid.'); + return './'; + } + 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 './'; } - db_update('tasks', 'state', TASK_QUEUED, 'where id=%i', $id); + $ord = new_lowest_priority($owner); + db_update('tasks', 'state,ord', TASK_QUEUED, $ord, 'where id=%i', $id); message('Price approved.'); return './'; } @@ -202,7 +365,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 './'; } @@ -231,16 +394,20 @@ function tasks_edit_main() { if(isset($_REQUEST['title'])) { list($title, $url, $description, $price) = tasks_get_fields(); + $queuing = false; # FIXME if(isset($_REQUEST['save_draft'])) { $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; + $queuing = true; } else { $state = TASK_NEEDS_GO_AHEAD; } @@ -255,19 +422,37 @@ 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) { + $tables = 'title,url,description,state'; + $values = array($title, $url, $description, $state); 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); - } else { - db_update('tasks', 'title,url,description,state', $title, $url, $description, $state, 'where id=%i', $edit_id); + $tables .= ',price'; + array_push($values, $price); } + if($queuing) { + $client_id = db_get_value('tasks', 'client_id', 'where id=%i', $edit_id); + $tables .= ',ord'; + array_push($values, new_lowest_priority($client_id)); + } + db_update('tasks', $tables, $values, 'where id=%i', $edit_id); message('Task updated.'); } else { # 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; + } + if($state == TASK_QUEUED) { + $ord = new_lowest_priority($client_id); + } else { + $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($GLOBALS['tasks_form_recipient'] != "fixme@example.com") { @@ -313,6 +498,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 @@ -334,7 +524,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'); + } } }