return (strpos($description, 'FIXME') !== false);
}
-# encode as html, make it display newlines and leading spaces
-function enc_htmlbrtab($str) {
- $str = enc_htmlbr($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;
-}
-
function tasks_get_fields() {
$title = format_oneline($_REQUEST['title']);
$url = format_oneline($_REQUEST['url']);
$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,client_id,paid', 'where id=%i', $task_id);
+ $row = db_get_row('tasks', 'title,url,description,state,price,client_id,paid,finished_at,tested_at', 'where id=%i', $task_id);
} else {
- $row = db_get_row('tasks', 'title,url,description,state,price,client_id,paid', 'where id=%i && client_id=%i', $task_id, $client_id);
+ $row = db_get_row('tasks', 'title,url,description,state,price,client_id,paid,finished_at,tested_at', 'where id=%i && client_id=%i', $task_id, $client_id);
}
if($row) {
- list($title, $url, $description, $state, $price, $owner_id, $paid) = $row;
+ list($title, $url, $description, $state, $price, $owner_id, $paid, $finished_at, $tested_at) = $row;
tem_set('task_id', $task_id);
tem_set('title', $title);
tem_set('url', $url);
tem_set('description', $description);
tem_set('state', task_state_pretty($state));
tem_set('price', $price);
+ if($finished_at) {
+ tem_set('finished_at', $finished_at);
+ tem_show('finished_at_section');
+ }
+ if($tested_at) {
+ tem_set('tested_at', $tested_at);
+ tem_show('tested_at_section');
+ }
if($state == TASK_BUG) {
tem_show('bug_title');
} else {
message("Error: can't test a task entered by/for another client.");
return './';
}
- db_update('tasks', 'state', TASK_FINISHED, 'where id=%i', $id);
+ db_update('tasks', 'state,tested_at', TASK_FINISHED, date('Y-m-d'), 'where id=%i', $id);
message('Task marked as finished.');
# FIXME also mark it as paid if client's balance can cover it
return './';
}
}
- 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 you change this change the one above
if($edit_id) {
$tables = 'title,url,description,state';
$values = array($title, $url, $description, $state);
$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;
$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'];
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
# 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: