From: Jason Woofenden <jason283@herkamire.com>
Date: Wed, 17 Dec 2008 05:43:02 +0000 (-0500)
Subject: reordering existing code works (ugly code, ugly display)
X-Git-Url: https://jasonwoof.com/gitweb/?p=contractor-progress.git;a=commitdiff_plain;h=5cbc553fa7adf352e63aaff4fe99600e476e6c59

reordering existing code works (ugly code, ugly display)
---

diff --git a/index.html b/index.html
index 5a966b6..db50f39 100644
--- a/index.html
+++ b/index.html
@@ -43,7 +43,7 @@
     <h4>Queued tasks</h4>
     <div>Jason hasn't started on these yet, so you can change them if you want. At some point you'll also be able to prioritize them.</div>
     <!--~queue_row start~-->
-    <div class="task_link">~client.html~ <a href="tasks?tasks_id=~task_id~">#~task_id~: ~task_title.html~</a> (~task_price.money~)</div>
+    <div class="task_link">~client.html~ <a href="tasks?tasks_edit_id=~task_id~&amp;bump=top">^^</a> <a href="tasks?tasks_edit_id=~task_id~&amp;bump=up">^</a> <a href="tasks?tasks_edit_id=~task_id~&amp;bump=down">v</a> <a href="tasks?tasks_edit_id=~task_id~&amp;bump=bottom">vv</a> <a href="tasks?tasks_id=~task_id~">#~task_id~: ~task_title.html~</a> (~task_price.money~)</div>
     <!--~end~-->
   <!--~end~-->
 
diff --git a/index.php b/index.php
index 73bc2a5..d5e0205 100644
--- a/index.php
+++ b/index.php
@@ -76,14 +76,14 @@ function _index_main() {
 		task_summary('needs_fixing', 'where (state=%i || state=%i) || (client_id=%i && (state<%i || state=%i)) order by id desc', TASK_NEEDS_QUOTE, TASK_BUG, $client_id, TASK_DRAFT, TASK_NEEDS_CLARIFICATION);
 		task_summary('finished_unpaid', 'where state=%i && paid = 0 order by finished_at desc', TASK_FINISHED);
 		task_summary('finished_paid', 'where state=%i && paid = 1 order by finished_at desc limit 20', TASK_FINISHED);
-		task_summary('queue', 'where state=%i order by client_id, ord', TASK_QUEUED);
+		task_summary('queue', 'where state=%i order by client_id, ord desc', TASK_QUEUED);
 	} else {
 		if(db_count('tasks', 'where client_id=%i && (state=%i || state=%i || state=%i || state=%i)', $client_id, TASK_DRAFT, TASK_NEEDS_CLARIFICATION, TASK_NEEDS_GO_AHEAD, TASK_NEEDS_TESTING)) {
 			tem_show('needs_attention_header');
 			task_summary('needs_approval', 'where client_id=%i && (state=%i || state=%i) order by id', $client_id, TASK_NEEDS_GO_AHEAD, TASK_NEEDS_TESTING);
 			task_summary('needs_fixing', 'where client_id=%i && (state=%i || state=%i) order by id', $client_id, TASK_DRAFT, TASK_NEEDS_CLARIFICATION);
 		}
-		task_summary('queue', 'where client_id=%i && state=%i order by ord', $client_id, TASK_QUEUED);
+		task_summary('queue', 'where client_id=%i && state=%i order by ord desc', $client_id, TASK_QUEUED);
 		task_summary('jason', 'where client_id=%i && (state=%i || state=%i) order by id desc', $client_id, TASK_NEEDS_QUOTE, TASK_BUG);
 		task_summary('jason_working', 'where client_id=%i && state=%i order by id desc', $client_id, TASK_WORKING);
 		task_summary('finished_unpaid', 'where client_id=%i && state=%i && paid=0 order by finished_at desc', $client_id, TASK_FINISHED);
diff --git a/tasks.php b/tasks.php
index b13a2db..128023a 100644
--- a/tasks.php
+++ b/tasks.php
@@ -168,6 +168,127 @@ function tasks_display_main() {
 	}
 }
 
+define('MAX_PRIORITY', 20);
+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':
+			message('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
@@ -189,6 +310,17 @@ 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;
 	}
@@ -306,7 +438,8 @@ function tasks_edit_main() {
 					# if client entered the task, no price is set
 					$price = 0;
 				}
-				db_insert('tasks', 'client_id,title,url,description,state,paid,price', $client_id, $title, $url, $description, $state, $paid, $price);
+				$ord = new_lowest_priority($client_id);
+				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") {