show correct answer only with link (Issue #46)

This commit is contained in:
coderkun 2014-03-22 21:19:25 +01:00
commit 1cf1e86ff7
10 changed files with 48 additions and 41 deletions

View file

@ -125,7 +125,6 @@
$this->set('field', $dndField);
$this->set('drops', $drops);
$this->set('drags', $drags);
$this->set('solved', $solved);
}

View file

@ -13,5 +13,5 @@
</div>
<br />
<input type="submit" name="submit" value="<?=_('solve')?>" <?=($solved) ? 'disabled="disabled"' : '' ?> />
<input type="submit" name="submit" value="<?=_('solve')?>" />
</form>

View file

@ -96,8 +96,13 @@
{
// Get questions
$questions = $this->Multiplechoice->getQuestionsOfQuest($quest['id']);
foreach($questions as &$question) {
$question['answer'] = $this->Multiplechoice->getCharacterSubmission($question['id'], $character['id']);
// Get user answers
if($this->request->getGetParam('show-answer') == 'true')
{
foreach($questions as &$question) {
$question['answer'] = $this->Multiplechoice->getCharacterSubmission($question['id'], $character['id']);
}
}
// Has Character already solved Quest?

View file

@ -2,10 +2,10 @@
<ol>
<?php foreach($questions as $i => &$question) : ?>
<li>
<input type="checkbox" id="answers[<?=$i?>]" name="answers[<?=$i?>]" value="true" <?=($question['answer']) ? 'checked="checked"' : '' ?> <?=($solved) ? 'disabled="disabled"' : '' ?>/>
<input type="checkbox" id="answers[<?=$i?>]" name="answers[<?=$i?>]" value="true" <?=(array_key_exists('answer', $question) && $question['answer']) ? 'checked="checked"' : '' ?> />
<label for="answers[<?=$i?>]"><?=\hhu\z\Utils::t($question['question'])?></label>
</li>
<?php endforeach ?>
</ol>
<input type="submit" name="submit" value="<?=_('solve')?>" <?=($solved) ? 'disabled="disabled"' : '' ?> />
<input type="submit" name="submit" value="<?=_('solve')?>" />
</form>

View file

@ -104,9 +104,13 @@
$textParts = preg_split('/(\$\$)/', $task['text'], -1, PREG_SPLIT_NO_EMPTY);
// Get Character answers
$regexs = $this->Textinput->getTextinputRegexs($quest['id']);
foreach($regexs as &$regex) {
$regex['answer'] = $this->Textinput->getCharacterSubmission($regex['id'], $character['id']);
$regexs = null;
if($this->request->getGetParam('show-answer') == 'true')
{
$regexs = $this->Textinput->getTextinputRegexs($quest['id']);
foreach($regexs as &$regex) {
$regex['answer'] = $this->Textinput->getCharacterSubmission($regex['id'], $character['id']);
}
}
// Has Character already solved Quest?
@ -116,7 +120,6 @@
// Pass data to view
$this->set('texts', $textParts);
$this->set('regexs', $regexs);
$this->set('solved', $solved);
}

View file

@ -1,11 +1,11 @@
<form method="post">
<?php foreach($texts as $i => &$text) : ?>
<?php if($i > 0) : ?>
<input type="text" name="answers[<?=$i-1?>]" value="<?=$regexs[$i-1]['answer']?>" <?=($solved) ? 'disabled="disabled"' : '' ?>/>
<input type="text" name="answers[<?=$i-1?>]" value="<?=$regexs[$i-1]['answer']?>" />
<?php endif ?>
<?=\hhu\z\Utils::t($text)?>
<?php endforeach ?>
<br /><br />
<input type="submit" name="submit" value="<?=_('solve')?>" <?=($solved) ? 'disabled="disabled"' : '' ?> />
<input type="submit" name="submit" value="<?=_('solve')?>" />
</form>