X-Git-Url: http://git.shiar.net/minimedit.git/blobdiff_plain/5adffaba1226d6a75a1937e1ef836f34c991f7fd..2ffefa0117565475a16a12fef01c8b6fb83824bd:/widget/reply.php

diff --git a/widget/reply.php b/widget/reply.php
index 4c7a304..53fe34f 100644
--- a/widget/reply.php
+++ b/widget/reply.php
@@ -2,7 +2,9 @@
 global $User, $Db, $Issue;
 require_once 'database.inc.php';
 
-print '<h3>Reacties</h3>'."\n";
+$journalcol = [
+	'assign' => 'Toegewezen aan',
+];
 
 if ($_POST) {
 	try {
@@ -16,10 +18,36 @@ if ($_POST) {
 		if (!$query->rowCount()) {
 			throw new Exception('Fout bij opslaan');
 		}
+		$newcomment = $Db->dbh->lastInsertId('comments_id_seq');
 
 		if (isset($Issue)) {
-			$row = ['updated' => ['now()']];
-			$Db->set('issues', $row, ['id = ?', $Issue->id]);
+			$row = [];
+			foreach (array_keys($journalcol) as $col) {
+				if (!isset($_POST[$col])) continue;
+				$row[$col] = $_POST[$col] ?: NULL;
+			}
+			if (isset($_POST['status'])) {
+				$reset = !empty($_POST['status']);
+				if (isset($Issue->closed) !== $reset) {
+					$row['closed'] = $reset ? ['now()'] : NULL;
+				}
+			}
+			$derived = ['updated' => ['now()']];
+			$filter = ['id = ? RETURNING *', $Issue->id];
+			$subquery = $Db->set('issues', $row + $derived, $filter);
+
+			if ($updated = $subquery->fetch()) {
+				foreach (array_keys($row) as $col) {
+					if ($updated->$col === $Issue->$col) continue; # unaltered
+					$Db->set('journal', [
+						'comment_id' => $newcomment,
+						'property'   => 'attr',
+						'col'        => $col,
+						'old_value'  => $Issue->$col,
+						'value'      => $updated->$col,
+					]);
+				}
+			}
 		}
 		$_POST['reply'] = NULL;
 	}
@@ -28,7 +56,8 @@ if ($_POST) {
 	}
 }
 
-$query = $Db->query('SELECT * FROM comments WHERE page = ? ORDER BY created', [$Page]);
+$cols = '*, (SELECT json_agg(journal.*) FROM journal WHERE comment_id = comments.id) AS journal';
+$query = $Db->query("SELECT $cols FROM comments WHERE page = ? ORDER BY created", [$Page]);
 
 print '<ul class="replies">';
 
@@ -39,12 +68,53 @@ while ($row = $query->fetch()) {
 		$rowuser->html, showdate(preg_split('/\D/', $row->created))
 	);
 	printf("<blockquote>%s</blockquote>\n", $row->message);
+	if ($changes = json_decode($row->journal)) {
+		print '<ul>';
+		foreach ($changes as $change) {
+			print '<li>';
+			if ($change->col == 'closed') {
+				printf('<em>%s</em>', isset($change->value) ? 'Gesloten' : 'Heropend');
+			}
+			else {
+				printf("<em>%s</em> %s",
+					$journalcol[$change->col], sprintf(
+						!isset($change->old_value) ? 'gewijzigd naar <q>%2$s</q>' :
+						(!isset($change->value) ? 'verwijderd (<strike>%s</strike>)' :
+						'gewijzigd van <q>%s</q> naar <q>%s</q>'),
+						$change->old_value, $change->value
+					)
+				);
+			}
+			print "</li>\n";
+		}
+		print "</ul>\n";
+	}
 	print "</li>\n";
 }
 
 if ($User) {
 	print '<li>';
 	print '<form method="post" action="">';
+	if (isset($Issue) and $User->admin("edit $Page")) {
+		print '<p>';
+		printf(
+			'<label for="%s">%s:</label> '
+			. '<input id="%1$s" name="%1$s" value="%s" />'."\n",
+			'assign',
+			$journalcol['assign'],
+			htmlspecialchars($Issue->assign ?? '')
+		);
+		printf(
+			'<input type="hidden" name="%s" value="" />' .
+			'<input type="checkbox" id="%1$s" name="%1$s" value="%s"%s />'
+			. '<label for="%1$s"> %s</label>'."\n",
+			'status',
+			'resolved',
+			isset($Issue->closed) ? ' checked' : '',
+			'Gesloten'
+		);
+		print "</p>\n";
+	}
 	printf('<textarea id="%s" name="%1$s" cols=60 rows=3 placeholder="%s">%s</textarea>'."\n",
 		'reply',
 		"Bericht van {$User->login}",