implement task editing for Questtype ?Textinput? (issue #36)

This commit is contained in:
coderkun 2014-07-31 11:21:31 +02:00
commit 3b1bed540f
7 changed files with 449 additions and 19 deletions

View file

@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: The Legend of Z\n"
"POT-Creation-Date: 2014-07-11 11:53+0100\n"
"PO-Revision-Date: 2014-07-11 11:57+0100\n"
"POT-Creation-Date: 2014-07-31 10:52+0100\n"
"PO-Revision-Date: 2014-07-31 11:00+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: de_DE\n"
@ -63,7 +63,7 @@ msgstr "Neuer Lösungsvorschlag"
msgid "Character submission approved"
msgstr "Lösungsvorschlag bewertet"
#: controllers/QuestsController.inc:1227
#: controllers/QuestsController.inc:1284
#: questtypes/submit/html/submission.tpl:30
#: views/html/achievements/conditions.tpl:54
#: views/html/achievements/conditions.tpl:121 views/html/quests/quest.tpl:54
@ -206,6 +206,54 @@ msgstr "Kommentar"
msgid "unsolved"
msgstr "Leider falsch!"
#: questtypes/textinput/html/edittask (Kopie).tpl:3
#: questtypes/textinput/html/edittask.tpl:24
msgid "Text"
msgstr "Text"
#: questtypes/textinput/html/edittask (Kopie).tpl:6
#, php-format
msgid "Use %s for marking field positions"
msgstr "Benutze %s zum Markieren von Feldpositionen"
#: questtypes/textinput/html/edittask (Kopie).tpl:8
msgid "edit text"
msgstr "Text bearbeiten"
#: questtypes/textinput/html/edittask (Kopie).tpl:12
#: questtypes/textinput/html/edittask.tpl:29
msgid "Fields"
msgstr "Felder"
#: questtypes/textinput/html/edittask (Kopie).tpl:37
msgid "edit fields"
msgstr "Felder bearbeiten"
#: questtypes/textinput/html/edittask (Kopie).tpl:41
#: questtypes/textinput/html/edittask.tpl:44
#: views/html/achievements/conditions.tpl:151
#: views/html/achievements/create.tpl:109 views/html/achievements/edit.tpl:112
#: views/html/charactergroupsquests/manage.tpl:66
#: views/html/charactertypes/edit.tpl:124 views/html/library/edit.tpl:46
#: views/html/library/edit.tpl:86 views/html/quests/edit.tpl:112
#: views/html/users/edit.tpl:105 views/html/xplevels/manage.tpl:49
msgid "save"
msgstr "speichern"
#: questtypes/textinput/html/edittask.tpl:10
#: questtypes/textinput/html/edittask.tpl:12
msgid "Regex invalid"
msgstr "Der reguläre Ausdruck ist ungültig"
#: questtypes/textinput/html/edittask.tpl:25
msgid "Add field"
msgstr "Feld hinzufügen"
#: questtypes/textinput/html/edittask.tpl:43
#: questtypes/textinput/html/edittask.tpl:46
msgid "Preview"
msgstr "Vorschau"
#: views/ajax/quests/index.tpl:9 views/html/quests/create.tpl:79
#: views/html/quests/edit.tpl:82 views/html/quests/index.tpl:27
#: views/html/quests/index.tpl:59
@ -374,7 +422,7 @@ msgid "Group by"
msgstr "Gruppiert über"
#: views/html/achievements/conditions.tpl:69
#: views/html/achievements/conditions.tpl:136 views/html/html.tpl:79
#: views/html/achievements/conditions.tpl:136 views/html/html.tpl:80
msgid "Achievement"
msgstr "Achievement"
@ -399,15 +447,6 @@ msgstr "löschen"
msgid "New condition"
msgstr "Neue Bedingung"
#: views/html/achievements/conditions.tpl:151
#: views/html/achievements/create.tpl:109 views/html/achievements/edit.tpl:112
#: views/html/charactergroupsquests/manage.tpl:66
#: views/html/charactertypes/edit.tpl:124 views/html/library/edit.tpl:46
#: views/html/library/edit.tpl:86 views/html/users/edit.tpl:105
#: views/html/xplevels/manage.tpl:49
msgid "save"
msgstr "speichern"
#: views/html/achievements/create.tpl:11
msgid "Create Achievement"
msgstr "Achievement erstellen"
@ -694,7 +733,7 @@ msgstr "Spiele weiter, um diesen geheimen Erfolg freizuschalten"
#: views/html/charactergroupsquests/edit.tpl:94
#: views/html/characters/edit.tpl:108 views/html/charactertypes/index.tpl:24
#: views/html/questgroups/edit.tpl:64 views/html/questgroups/edittexts.tpl:24
#: views/html/questgroupshierarchy/edit.tpl:57 views/html/quests/edit.tpl:111
#: views/html/questgroupshierarchy/edit.tpl:57
#: views/html/quests/edittexts.tpl:63 views/html/seminaries/edit.tpl:77
msgid "edit"
msgstr "bearbeiten"
@ -1331,11 +1370,11 @@ msgstr "oder"
msgid "register yourself"
msgstr "registriere dich"
#: views/html/html.tpl:89
#: views/html/html.tpl:90
msgid "Level-up"
msgstr "Levelaufstieg"
#: views/html/html.tpl:91 views/html/html.tpl:93
#: views/html/html.tpl:92 views/html/html.tpl:94
#, php-format
msgid "You have reached level %d"
msgstr "Du hast Level %d erreicht"
@ -1634,6 +1673,14 @@ msgstr "Soll die Quest „%s“ wirklich gelöscht werden?"
msgid "Edit Quest"
msgstr "Quest bearbeiten"
#: views/html/quests/edit.tpl:111
msgid "edit task"
msgstr "Aufgabe bearbeiten"
#: views/html/quests/edittask.tpl:8
msgid "Edit Quest task"
msgstr "Questaufgabe bearbeiten"
#: views/html/quests/edittexts.tpl:8 views/html/quests/quest.tpl:12
msgid "Edit Quest texts"
msgstr "Questtexte bearbeiten"
@ -2015,9 +2062,6 @@ msgstr "Hallo %s"
#~ msgid "Character Groups Quests"
#~ msgstr "Gruppenquests"
#~ msgid "Skip task"
#~ msgstr "Aufgabe überspringen"
#~ msgid "continue"
#~ msgstr "fortfahren"

View file

@ -19,6 +19,12 @@
*/
class TextinputQuesttypeController extends \hhu\z\controllers\QuesttypeController
{
/**
* Required components
*
* @var array
*/
public $components = array('validation');
@ -165,6 +171,125 @@
}
/**
* Action: edittask.
*
* Edit the task of a Quest.
*
* @param array $seminary Current Seminary data
* @param array $questgroup Current Questgroup data
* @param array $quest Current Quest data
*/
public function edittask($seminary, $questgroup, $quest)
{
// Get Task
$task = $this->Textinput->getTextinputQuest($quest['id']);
$text = $task['text'];
// Get fields
$fields = $this->Textinput->getTextinputFields($quest['id']);
// Get field sizes
$fieldSizes = $this->Textinput->getFieldSizes();
// Values
$validations = array();
// Save data
if($this->request->getRequestMethod() == 'POST')
{
if(!is_null($this->request->getPostParam('preview')) || !is_null($this->request->getPostParam('save')))
{
// Get params and validate them
if(is_null($this->request->getPostParam('text'))) {
throw new \nre\exceptions\ParamsNotValidException('text');
}
$text = $this->request->getPostParam('text');
if(is_null($this->request->getPostParam('fields'))) {
throw new \nre\exceptions\ParamsNotValidException('fields');
}
$fields = $this->request->getPostParam('fields');
$fields = array_values($fields);
$fieldIndex = 0;
foreach($fields as &$field)
{
// Validate regex
$regex = $field['regex'];
//$fieldValidation = $this->Validation->validate($regex, \nre\configs\AppConfig::$validation['regex']);
$fieldValidation = @preg_match($regex, '') !== false;
if($fieldValidation !== true)
{
if(!array_key_exists($fieldIndex, $validations) || !is_array($validations[$fieldIndex])) {
$validations[$fieldIndex] = array();
}
$validations[$fieldIndex] = $this->Validation->addValidationResults($validations[$fieldIndex], 'regex', $fieldValidation);
}
// Validate size
foreach($fieldSizes as $sizeIndex => &$size)
{
if($size['size'] == $field['size'])
{
$field['sizeIndex'] = $sizeIndex;
break;
}
}
if(!array_key_exists('sizeIndex', $field)) {
throw new \nre\exceptions\ParamsNotValidException($fieldIndex);
}
$fieldIndex++;
}
// Save and redirect
if(!is_null($this->request->getPostParam('save')) && empty($validations))
{
// Save text
$this->Textinput->setTextForQuest(
$this->Auth->getUserId(),
$quest['id'],
$text
);
// Save field
foreach($fields as $index => &$field)
{
// Add regex modifiers
$modifiers = substr($field['regex'], strrpos($field['regex'], $field['regex'][0]) + 1);
if(strpos($modifiers, 'u') === false) {
$field['regex'] .= 'u';
}
// Save field
$this->Textinput->setFieldForText(
$quest['id'],
$index + 1,
$fieldSizes[$field['sizeIndex']]['id'],
$field['regex']
);
}
// Redirect
$this->redirect($this->linker->link(array('quest', $seminary['url'], $questgroup['url'], $quest['url']), 1));
}
}
}
// Set colors for fields
foreach($fields as &$field) {
$field['color'] = str_pad(sprintf('%x%x%x', rand(0,255), rand(0,255), rand(0,255)), 6, 9);
}
// Pass data to view
$this->set('task', $task);
$this->set('text', $text);
$this->set('fields', $fields);
$this->set('fieldSizes', $fieldSizes);
$this->set('validations', $validations);
}
/**

View file

@ -113,6 +113,109 @@
return '';
}
/**
* Set the text for a Quest and correct fields count.
*
* @param int $userId ID of user setting text
* @param int $questId ID of Quest to set text for
* @param string $text Text for Quset
*/
public function setTextForQuest($userId, $questId, $text)
{
$this->db->setAutocommit(false);
try {
// Set text
$this->db->query(
'INSERT INTO questtypes_textinput '.
'(quest_id, created_user_id, text) '.
'VALUES '.
'(?, ?, ?) '.
'ON DUPLICATE KEY UPDATE '.
'text = ?',
'iiss',
$questId,
$userId,
$text,
$text
);
// Count fields
$fieldCount = substr_count($text, '[textinput]');
// Remove fields
$this->db->query(
'DELETE FROM questtypes_textinput_fields '.
'WHERE questtypes_textinput_quest_id = ? AND number > ?',
'ii',
$questId,
$fieldCount
);
// Add fields
for($i=1; $i<=$fieldCount; $i++)
{
$this->db->query(
'INSERT IGNORE INTO questtypes_textinput_fields '.
'(questtypes_textinput_quest_id, number, regex) '.
'VALUES '.
'(?, ?, ?) ',
'iis',
$questId,
$i,
''
);
}
$this->db->commit();
}
catch(\Exception $e) {
$this->db->rollback();
$this->db->setAutocommit(true);
throw $e;
}
$this->db->setAutocommit(true);
}
/**
* Set values for a field of a text.
*
* @param int $questId ID of Quest to set field for
* @param int $number Field number
* @param int $sizeId ID of field size
* @param string $regex RegEx for field
*/
public function setFieldForText($questId, $number, $sizeId, $regex)
{
$this->db->query(
'UPDATE questtypes_textinput_fields '.
'SET questtypes_textinput_fieldsize_id = ?, regex = ? '.
'WHERE questtypes_textinput_quest_id = ? AND number = ?',
'isii',
$sizeId,
$regex,
$questId,
$number
);
}
/**
* Get all registered field sizes.
*
* @return List of field sizes
*/
public function getFieldSizes()
{
return $this->db->query(
'SELECT id, size '.
'FROM questtypes_textinput_fieldsizes '.
'ORDER BY size'
);
}
}
?>

View file

@ -0,0 +1,105 @@
<?php if(!empty($validations)) : ?>
<ul>
<?php foreach($validations as $field => &$settings) : ?>
<li>
<ul>
<?php foreach($settings as $setting => $value) : ?>
<li>
<?php
switch($setting) {
case 'regex': echo _('Regex invalid');
break;
default: echo _('Regex invalid');
}
?>
</li>
<?php endforeach ?>
</ul>
</li>
<?php endforeach ?>
</ul>
<?php endif ?>
<form method="post">
<fieldset>
<legend><?=_('Text')?></legend>
<button id="add-field"><?=_('Add field')?></button><br />
<textarea id="text" name="text"><?=$text?></textarea>
</fieldset>
<fieldset>
<legend><?=_('Fields')?></legend>
<ul id="fields">
<?php foreach($fields as $index => &$field) : ?>
<li>
<select name="fields[<?=$index?>][size]">
<?php foreach($fieldSizes as &$size) : ?>
<option value="<?=$size['size']?>" <?php if($fields[$index]['size'] == $size['size']) : ?>selected="selected"<?php endif ?>><?=$size['size']?></option>
<?php endforeach ?>
</select>
<input type="text" name="fields[<?=$index?>][regex]" value="<?=$field['regex']?>" style="border:1px solid #<?=$field['color']?>" <?php if(!empty($validations) && array_key_exists($index, $validations)) : ?>class="invalid"<?php endif ?> />
</li>
<?php endforeach ?>
</ul>
</fieldset>
<input type="submit" name="preview" value="<?=_('Preview')?>" />
<input type="submit" name="save" value="<?=_('save')?>" />
</form>
<h2><?=_('Preview')?></h2>
<p>
<?php $posStart = 0; ?>
<?php foreach($fields as &$field) : ?>
<?php $posEnd = mb_strpos($text, '[textinput]', $posStart, 'UTF-8'); ?>
<?=$t->t(mb_substr($text, $posStart, $posEnd-$posStart, 'UTF-8'))?>
<input type="text" name="answers[]" value="<?=(array_key_exists('answer', $field)) ? $field['answer'] : ''?>" <?php if($field['size'] != 'default') : ?>class="<?=$field['size']?>"<?php endif ?> />
<?php $posStart = $posEnd + mb_strlen('[textinput]', 'UTF-8'); ?>
<?php endforeach ?>
<?=$t->t(mb_substr($text, $posStart, mb_strlen($text, 'UTF-8')-$posStart, 'UTF-8'))?>
</p>
<script>
var index = <?=count($fields)?>;
var selectElement = '<select name="fields[INDEX][size]">' +
<?php foreach($fieldSizes as &$size) : ?>
'<option value="<?=$size['size']?>"><?=$size['size']?></option>' +
<?php endforeach ?>
'</select>';
var inputElement = '<input type="text" name="fields[INDEX][regex]" />';
$("#add-field").click(function(event) {
event.preventDefault();
var caret = getCaret("text");
insertAtCaret("text", caret, "[textinput]");
updateFields();
});
$("#text").on('change keyup paste', function(event) {
updateFields();
});
function updateFields()
{
var newCount = $("#text").val().split("[textinput]").length - 1;
var oldCount = $("#fields li").length;
var caret = getCaret("text");
var pos = $("#text").val().substring(0, caret).split("[textinput]").length - 1;
if(newCount > oldCount)
{
// Add fields
for(var i=oldCount; i<newCount; i++)
{
index++;
var element = '<li>' + selectElement.replace('INDEX', index) + inputElement.replace('INDEX', index) + '</li>';
if($("#fields li").length > pos-1) {
$($("#fields li")[pos-1]).before(element);
}
else {
$($("#fields li")[pos-2]).after(element);
}
}
}
else if(newCount < oldCount)
{
// Remove fields
for(var i=oldCount; i>newCount; i--) {
$($("#fields li")[pos]).remove();
}
}
}
</script>

View file

@ -34,6 +34,7 @@
<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/respond.js/1.4.2/respond.js"></script>
<![endif]-->
<script type="text/javascript" src="/js/misc.js"></script>
<script type="text/javascript" src="/js/dnd.js"></script>
<meta name="description" content="">
<meta name="robots" content="noindex,follow">

52
www/js/misc.js Normal file
View file

@ -0,0 +1,52 @@
/**
* http://stackoverflow.com/questions/1064089/inserting-a-text-where-cursor-is-using-javascript-jquery/1064139#1064139
*/
function getCaret(textareaId)
{
var textarea = document.getElementById(textareaId);
var strPos = 0;
if(textarea.selectionStart || textarea.selectionStart == '0') {
strPos = textarea.selectionStart
}
else if(document.selection)
{
textarea.focus();
var range = document.selection.createRange();
range.moveStart('character', -textarea.value.length);
strPos = range.text.length;
}
else {
strPos = -1;
}
return strPos;
}
function insertAtCaret(textareaId, caret, text)
{
var textarea = document.getElementById(textareaId);
var scrollPos = textarea.scrollTop;
var front = (textarea.value).substring(0, caret);
var back = (textarea.value).substring(caret, textarea.value.length);
textarea.value = front + text + back;
caret = caret + text.length;
if(textarea.selectionStart || textarea.selectionStart == '0')
{
textarea.selectionStart = caret;
textarea.selectionEnd = caret;
textarea.focus();
}
else if(document.selection)
{
textarea.focus();
var range = document.selection.createRange();
range.moveStart('character', -textarea.value.length);
range.moveStart('character', caret);
range.moveEnd('character', 0);
range.select();
}
textarea.scrollTop = scrollPos;
}