From 07c678a9f17217682e23a1b0fe9f6369193cd61b Mon Sep 17 00:00:00 2001
From: coderkun <coderkun@localhost>
Date: Wed, 23 Apr 2014 15:09:38 +0200
Subject: [PATCH] format overview of all Quests as list instead of table

---
 controllers/QuestsController.inc |  2 +-
 models/CharactersModel.inc       | 20 +++++------
 views/html/quests/index.tpl      | 62 ++++++++++++++------------------
 3 files changed, 36 insertions(+), 48 deletions(-)

diff --git a/controllers/QuestsController.inc b/controllers/QuestsController.inc
index 04fd1d31..8a44aab3 100644
--- a/controllers/QuestsController.inc
+++ b/controllers/QuestsController.inc
@@ -340,7 +340,7 @@
 				$questmedia = $this->Media->getSeminaryMediaById($quest['questsmedia_id']);
 			}
 			
-			// Get submitted Character submissions
+			// Get submitted Character submissions waiting for approval
 			$submittedSubmissionCharacters = $this->Characters->getCharactersSubmittedQuest($quest['id']);
 			
 			// Get unsolved Character submissions
diff --git a/models/CharactersModel.inc b/models/CharactersModel.inc
index b3eac8b7..e15198ca 100644
--- a/models/CharactersModel.inc
+++ b/models/CharactersModel.inc
@@ -379,17 +379,15 @@
 				'SELECT characters.id, characters.created, characters.charactertype_id, characters.name, characters.url, characters.user_id, characters.xps, characters.xplevel, charactertypes.name AS charactertype_name, charactertypes.url AS charactertype_url '.
 				'FROM v_characters AS characters '.
 				'LEFT JOIN charactertypes ON charactertypes.id = characters.charactertype_id '.
-				'WHERE EXISTS ('.
-					'SELECT character_id FROM quests_characters WHERE character_id = characters.id AND quest_id = ? AND status = ?'.
-				') AND NOT EXISTS ('.
-					'SELECT character_id FROM quests_characters WHERE character_id = characters.id AND quest_id = ? AND status = ?'.
-				') AND NOT EXISTS ('.
-					'SELECT character_id FROM quests_characters WHERE character_id = characters.id AND quest_id = ? AND status = ?'.
-				')',
-				'iiiiii',
-				$questId, QuestsModel::QUEST_STATUS_SUBMITTED,
-				$questId, QuestsModel::QUEST_STATUS_UNSOLVED,
-				$questId, QuestsModel::QUEST_STATUS_SOLVED
+				'WHERE ('.
+					'SELECT status '.
+					'FROM quests_characters '.
+					'WHERE quest_id = ? AND character_id = characters.id '.
+					'ORDER BY created DESC '.
+					'LIMIT 1'.
+				') = ?',
+				'ii',
+				$questId, QuestsModel::QUEST_STATUS_SUBMITTED
 			);
 		}
 		
diff --git a/views/html/quests/index.tpl b/views/html/quests/index.tpl
index 00d7e576..d603a056 100644
--- a/views/html/quests/index.tpl
+++ b/views/html/quests/index.tpl
@@ -7,43 +7,33 @@
 <h2><?=_('Quests')?></h2>
 
 <form method="post">
-	<table>
-		<thead>
-			<tr>
-				<th>
-					<select name="filters[questgroup]">
-						<option value="0"><?=_('Questgroup')?></option>
-						<?php foreach($filters['questgroups'] as &$filter) : ?>
-						<option value="<?=$filter['id']?>" <?php if($filter['id'] == $selectedFilters['questgroup']) : ?>selected="selected"<?php endif ?>><?=$filter['title']?></option>
-						<?php endforeach ?>
-					</select>
-				</th>
-				<th><?=_('Questname')?></th>
-				<th>
-					<select name="filters[questtype]">
-						<option value=""><?=_('Questtype')?></option>
-						<?php foreach($filters['questtypes'] as &$filter) : ?>
-						<option value="<?=$filter['classname']?>" <?php if($filter['classname'] == $selectedFilters['questtype']) : ?>selected="selected"<?php endif ?>><?=$filter['title']?></option>
-						<?php endforeach ?>
-					</select>
-				</th>
-				<th>XPs</th>
-				<th><?=('Submissions')?></th>
-			</tr>
-		</thead>
-		<tbody>
-			<?php foreach($quests as &$quest) : ?>
-			<tr>
-				<td><a href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$quest['questgroup']['url']))?>"><?=$quest['questgroup']['title']?></a></td>
-				<td><a href="<?=$linker->link(array('quests','quest',$seminary['url'],$quest['questgroup']['url'],$quest['url']))?>"><?=$quest['title']?></a></td>
-				<td><?=$quest['questtype']['title']?></td>
-				<td><?=$quest['xps']?></td>
-				<td><?=$quest['opensubmissionscount']?></td>
-			</tr>
+	<fieldset>
+		<legend>Filter</legend>
+		<label for="filters[questgroup]"><?=_('Questgroup')?>:</label>
+		<select name="filters[questgroup]">
+			<option value="0">alle</option>
+			<?php foreach($filters['questgroups'] as &$filter) : ?>
+			<option value="<?=$filter['id']?>" <?php if($filter['id'] == $selectedFilters['questgroup']) : ?>selected="selected"<?php endif ?>><?=$filter['title']?></option>
 			<?php endforeach ?>
-		</tbody>
-	</table>
-	
+		</select><br />
+		<label for="filters[questtype]"><?=_('Questtype')?>:</label>
+		<select name="filters[questtype]">
+			<option value="">alle</option>
+			<?php foreach($filters['questtypes'] as &$filter) : ?>
+			<option value="<?=$filter['classname']?>" <?php if($filter['classname'] == $selectedFilters['questtype']) : ?>selected="selected"<?php endif ?>><?=$filter['title']?></option>
+			<?php endforeach ?>
+		</select>
+	</fieldset>
 	<input type="submit" name="filter" value="<?=_('Apply filters')?>" />
 	<input type="submit" name="reset" value="<?=_('Reset filters')?>" />
 </form>
+
+<ul>
+	<?php foreach($quests as &$quest) : ?>
+	<li>
+		<a href="<?=$linker->link(array('questgroups','questgroup',$seminary['url'],$quest['questgroup']['url']))?>"><?=$quest['questgroup']['title']?></a><br />
+		<h3><a href="<?=$linker->link(array('quest',$seminary['url'],$quest['questgroup']['url'],$quest['url']),1)?>"><?=$quest['title']?></a></h3>
+		<?=$quest['questtype']['title']?>, <?=$quest['xps']?> XPs, <a href="<?=$linker->link(array('submissions',$seminary['url'],$quest['questgroup']['url'],$quest['url']),1)?>"><?=$quest['opensubmissionscount']?> open submissions</a>
+	</li>
+	<?php endforeach ?>
+</ul>