Jingga/oms-Surveys
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Surveys.git synced 2026-02-16 07:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make id public, organigram impl. media password/encryption, settings bug fix, Money->FloatInt change, ...

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-06 11:42:06 +00:00
parent a66b2a6fbf
commit cbda7c75b0
19 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Models/SurveyAnswer.php
View File

@ -30,7 +30,7 @@ final class SurveyAnswer
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
protected int $id = 0; public int $id = 0;
/** /**
* Constructor * Constructor

2
Models/SurveyTemplate.php
View File

@ -36,7 +36,7 @@ class SurveyTemplate
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
protected int $id = 0; public int $id = 0;
/** /**
* Status. * Status.

2
Models/SurveyTemplateElement.php
View File

@ -32,7 +32,7 @@ class SurveyTemplateElement
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
protected int $id = 0; public int $id = 0;
/** /**
* Type. * Type.

2
Models/SurveyTemplateElementL11n.php
View File

@ -32,7 +32,7 @@ class SurveyTemplateElementL11n implements \JsonSerializable
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
protected int $id = 0; public int $id = 0;
/** /**
* Surveys ID. * Surveys ID.

2
Models/SurveyTemplateL11n.php
View File

@ -32,7 +32,7 @@ class SurveyTemplateL11n implements \JsonSerializable
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
protected int $id = 0; public int $id = 0;
/** /**
* Surveys ID. * Surveys ID.

2
Models/SurveyTemplateLabelL11n.php
View File

@ -32,7 +32,7 @@ class SurveyTemplateLabelL11n implements \JsonSerializable
* @var int * @var int
* @since 1.0.0 * @since 1.0.0
*/ */
protected int $id = 0; public int $id = 0;
/** /**
* element ID. * element ID.

18
Theme/Backend/surveys-create.tpl.php
View File

@ -146,15 +146,15 @@ echo $this->getData('nav')->render(); ?>
foreach ($elementValues as $elementValue) : foreach ($elementValues as $elementValue) :
if ($element->type === SurveyElementType::CHECKBOX) : ?> if ($element->type === SurveyElementType::CHECKBOX) : ?>
<div class="input-control value"> <div class="input-control value">
<label class="checkbox" for="i<?= $element->getId() . '-' . $this->printHtml($elementValue); ?>"> <label class="checkbox" for="i<?= $element->id . '-' . $this->printHtml($elementValue); ?>">
<input id="i<?= $element->getId() . '-' . $this->printHtml($elementValue); ?>" type="checkbox" name="i<?= $element->getId() . '-' . $this->printHtml($elementValue); ?>" value="1"> <input id="i<?= $element->id . '-' . $this->printHtml($elementValue); ?>" type="checkbox" name="i<?= $element->id . '-' . $this->printHtml($elementValue); ?>" value="1">
<span class="checkmark"></span> <span class="checkmark"></span>
</label> </label>
</div> </div>
<?php elseif ($element->type === SurveyElementType::RADIO) : ?> <?php elseif ($element->type === SurveyElementType::RADIO) : ?>
<div class="input-control value"> <div class="input-control value">
<label class="radio" for="i<?= $element->getId() . '-' . $this->printHtml($elementValue); ?>"> <label class="radio" for="i<?= $element->id . '-' . $this->printHtml($elementValue); ?>">
<input id="i<?= $element->getId() . '-' . $this->printHtml($elementValue); ?>" type="radio" name="i<?= $element->getId(); ?>" value="<?= $this->printHtml($elementValue); ?>"<?= isset($survey) && $survey->hasPublicResult ? '' : ''; ?>> <input id="i<?= $element->id . '-' . $this->printHtml($elementValue); ?>" type="radio" name="i<?= $element->id; ?>" value="<?= $this->printHtml($elementValue); ?>"<?= isset($survey) && $survey->hasPublicResult ? '' : ''; ?>>
<span class="checkmark"></span> <span class="checkmark"></span>
</label> </label>
</div> </div>
@ -163,20 +163,20 @@ echo $this->getData('nav')->render(); ?>
elseif ($element->type === SurveyElementType::DROPDOWN) : elseif ($element->type === SurveyElementType::DROPDOWN) :
$elementValues = $element->getValues(); $elementValues = $element->getValues();
echo '<select name="i' . $element->getId() . '>'; echo '<select name="i' . $element->id . '>';
$elementLabels = \array_values($element->getLabels()); $elementLabels = \array_values($element->getLabels());
foreach ($elementValues as $key => $elementValue) : ?> foreach ($elementValues as $key => $elementValue) : ?>
<option value="<?= $this->printHtml($elementValue); ?>"><?= $this->printHtml($elementLabels[$key]->title); ?> <option value="<?= $this->printHtml($elementValue); ?>"><?= $this->printHtml($elementLabels[$key]->title); ?>
<?php endforeach; <?php endforeach;
echo '</select>'; echo '</select>';
elseif ($element->type === SurveyElementType::TEXTFIELD) : ?> elseif ($element->type === SurveyElementType::TEXTFIELD) : ?>
<input type="text" name="i<?= $element->getId() ?>"> <input type="text" name="i<?= $element->id ?>">
<?php elseif ($element->type === SurveyElementType::TEXTAREA) : ?> <?php elseif ($element->type === SurveyElementType::TEXTAREA) : ?>
<textarea name="i<?= $element->getId() ?>"></textarea> <textarea name="i<?= $element->id ?>"></textarea>
<?php elseif ($element->type === SurveyElementType::NUMERIC) : ?> <?php elseif ($element->type === SurveyElementType::NUMERIC) : ?>
<input type="number" name="i<?= $element->getId() ?>"> <input type="number" name="i<?= $element->id ?>">
<?php elseif ($element->type === SurveyElementType::DATE) : ?> <?php elseif ($element->type === SurveyElementType::DATE) : ?>
<input type="datetime-local" name="i<?= $element->getId() ?>"> <input type="datetime-local" name="i<?= $element->id ?>">
<?php endif; <?php endif;
echo '</div>'; // closing "values-section" echo '</div>'; // closing "values-section"
echo '</div>'; // closing "survey-value-element" echo '</div>'; // closing "survey-value-element"

12
Theme/Backend/surveys-list.tpl.php
View File

@ -23,14 +23,14 @@ $surveys = $this->getData('surveys') ?? [];
/** @var \Modules\Admin\Models\Account $account */ /** @var \Modules\Admin\Models\Account $account */
$account = $this->getData('account'); $account = $this->getData('account');
$accountDir = $account->getId() . ' ' . $account->login; $accountDir = $account->id . ' ' . $account->login;
/** @var \Modules\Media\Models\Collection[] */ /** @var \Modules\Media\Models\Collection[] */
$collections = $this->getData('collections'); $collections = $this->getData('collections');
$mediaPath = \urldecode($this->getData('path') ?? '/'); $mediaPath = \urldecode($this->getData('path') ?? '/');
$previous = empty($surveys) ? '{/base}/survey/list' : '{/base}/survey/list?{?}&id=' . \reset($surveys)->getId() . '&ptype=p'; $previous = empty($surveys) ? '{/base}/survey/list' : '{/base}/survey/list?{?}&id=' . \reset($surveys)->id . '&ptype=p';
$next = empty($surveys) ? '{/base}/survey/list' : '{/base}/survey/list?{?}&id=' . \end($surveys)->getId() . '&ptype=n'; $next = empty($surveys) ? '{/base}/survey/list' : '{/base}/survey/list?{?}&id=' . \end($surveys)->id . '&ptype=n';
echo $this->getData('nav')->render(); ?> echo $this->getData('nav')->render(); ?>
@ -152,13 +152,13 @@ echo $this->getData('nav')->render(); ?>
<td><a href="<?= $url; ?>"><i class="fa fa-folder-open-o"></i></a> <td><a href="<?= $url; ?>"><i class="fa fa-folder-open-o"></i></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a> <td><a href="<?= $url; ?>"><?= $this->printHtml($value->name); ?></a>
<td> <td>
<td><a class="content" href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $value->createdBy->getId()); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$value->createdBy->name1, $value->createdBy->name2, $value->createdBy->name3, $value->createdBy->login ?? ''])); ?></a> <td><a class="content" href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $value->createdBy->id); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$value->createdBy->name1, $value->createdBy->name2, $value->createdBy->name3, $value->createdBy->login ?? ''])); ?></a>
<td><a href="<?= $url; ?>"><?= $this->printHtml($value->createdAt->format('Y-m-d')); ?></a> <td><a href="<?= $url; ?>"><?= $this->printHtml($value->createdAt->format('Y-m-d')); ?></a>
<?php endforeach; ?> <?php endforeach; ?>
<?php <?php
$count = 0; $count = 0;
foreach ($surveys as $key => $value) : ++$count; foreach ($surveys as $key => $value) : ++$count;
$url = UriFactory::build('{/base}/survey/edit?{?}&id=' . $value->getId()); $url = UriFactory::build('{/base}/survey/edit?{?}&id=' . $value->id);
?> ?>
<tr data-href="<?= $url; ?>"> <tr data-href="<?= $url; ?>">
<td><label class="checkbox" for="surveyList-<?= $key; ?>"> <td><label class="checkbox" for="surveyList-<?= $key; ?>">
@ -168,7 +168,7 @@ echo $this->getData('nav')->render(); ?>
<td> <td>
<td><a href="<?= $url; ?>"><?= $value->getL11n()->title; ?></a> <td><a href="<?= $url; ?>"><?= $value->getL11n()->title; ?></a>
<td> <td>
<td><a class="content" href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $value->createdBy->getId()); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$value->createdBy->name1, $value->createdBy->name2, $value->createdBy->name3, $value->createdBy->login ?? ''])); ?></a> <td><a class="content" href="<?= UriFactory::build('{/base}/profile/single?{?}&for=' . $value->createdBy->id); ?>"><?= $this->printHtml($this->renderUserName('%3$s %2$s %1$s', [$value->createdBy->name1, $value->createdBy->name2, $value->createdBy->name3, $value->createdBy->login ?? ''])); ?></a>
<td><a href="<?= $url; ?>"><?= $value->createdAt->format('Y-m-d'); ?></a> <td><a href="<?= $url; ?>"><?= $value->createdAt->format('Y-m-d'); ?></a>
<?php endforeach; ?> <?php endforeach; ?>
<?php if ($count === 0) : ?> <?php if ($count === 0) : ?>

6
tests/Controller/ApiControllerTest.php
View File

@ -126,7 +126,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
$request->setData('media', \json_encode([1])); $request->setData('media', \json_encode([1]));
$this->module->apiSurveyTemplateCreate($request, $response); $this->module->apiSurveyTemplateCreate($request, $response);
self::assertGreaterThan(0, $response->get('')['response']->getId()); self::assertGreaterThan(0, $response->get('')['response']->id);
} }
/** /**
@ -167,7 +167,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
} }
$this->module->apiSurveyTemplateElementCreate($request, $response); $this->module->apiSurveyTemplateElementCreate($request, $response);
self::assertGreaterThan(0, $response->get('')['response']->getId()); self::assertGreaterThan(0, $response->get('')['response']->id);
} }
/** /**
@ -201,7 +201,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
$this->module->apiSurveyAnswerCreate($request, $response); $this->module->apiSurveyAnswerCreate($request, $response);
self::markTestIncomplete(); self::markTestIncomplete();
self::assertGreaterThan(0, $response->get('')['response']->getId()); self::assertGreaterThan(0, $response->get('')['response']->id);
} }
/** /**

2
tests/Models/NullSurveyTemplateElementL11nTest.php
View File

@ -37,6 +37,6 @@ final class NullSurveyTemplateElementL11nTest extends \PHPUnit\Framework\TestCas
public function testId() : void public function testId() : void
{ {
$null = new NullSurveyTemplateElementL11n(2); $null = new NullSurveyTemplateElementL11n(2);
self::assertEquals(2, $null->getId()); self::assertEquals(2, $null->id);
} }
} }

2
tests/Models/NullSurveyTemplateElementTest.php
View File

@ -37,6 +37,6 @@ final class NullSurveyTemplateElementTest extends \PHPUnit\Framework\TestCase
public function testId() : void public function testId() : void
{ {
$null = new NullSurveyTemplateElement(2); $null = new NullSurveyTemplateElement(2);
self::assertEquals(2, $null->getId()); self::assertEquals(2, $null->id);
} }
} }

2
tests/Models/NullSurveyTemplateL11nTest.php
View File

@ -37,6 +37,6 @@ final class NullSurveyTemplateL11nTest extends \PHPUnit\Framework\TestCase
public function testId() : void public function testId() : void
{ {
$null = new NullSurveyTemplateL11n(2); $null = new NullSurveyTemplateL11n(2);
self::assertEquals(2, $null->getId()); self::assertEquals(2, $null->id);
} }
} }

2
tests/Models/NullSurveyTemplateLabelL11nTest.php
View File

@ -37,6 +37,6 @@ final class NullSurveyTemplateLabelL11nTest extends \PHPUnit\Framework\TestCase
public function testId() : void public function testId() : void
{ {
$null = new NullSurveyTemplateLabelL11n(2); $null = new NullSurveyTemplateLabelL11n(2);
self::assertEquals(2, $null->getId()); self::assertEquals(2, $null->id);
} }
} }

2
tests/Models/NullSurveyTemplateTest.php
View File

@ -37,6 +37,6 @@ final class NullSurveyTemplateTest extends \PHPUnit\Framework\TestCase
public function testId() : void public function testId() : void
{ {
$null = new NullSurveyTemplate(2); $null = new NullSurveyTemplate(2);
self::assertEquals(2, $null->getId()); self::assertEquals(2, $null->id);
} }
} }

2
tests/Models/SurveyTemplateElementL11nTest.php
View File

@ -38,7 +38,7 @@ final class SurveyTemplateElementL11nTest extends \PHPUnit\Framework\TestCase
*/ */
public function testDefault() : void public function testDefault() : void
{ {
self::assertEquals(0, $this->l11n->getId()); self::assertEquals(0, $this->l11n->id);
self::assertEquals('', $this->l11n->text); self::assertEquals('', $this->l11n->text);
self::assertEquals('', $this->l11n->description); self::assertEquals('', $this->l11n->description);
self::assertEquals('', $this->l11n->descriptionPlain); self::assertEquals('', $this->l11n->descriptionPlain);

2
tests/Models/SurveyTemplateElementTest.php
View File

@ -40,7 +40,7 @@ final class SurveyTemplateElementTest extends \PHPUnit\Framework\TestCase
*/ */
public function testDefault() : void public function testDefault() : void
{ {
self::assertEquals(0, $this->element->getId()); self::assertEquals(0, $this->element->id);
$date = new \DateTime('now'); $date = new \DateTime('now');
self::assertEquals([], $this->element->getLabels()); self::assertEquals([], $this->element->getLabels());

2
tests/Models/SurveyTemplateL11nTest.php
View File

@ -38,7 +38,7 @@ final class SurveyTemplateL11nTest extends \PHPUnit\Framework\TestCase
*/ */
public function testDefault() : void public function testDefault() : void
{ {
self::assertEquals(0, $this->l11n->getId()); self::assertEquals(0, $this->l11n->id);
self::assertEquals('', $this->l11n->title); self::assertEquals('', $this->l11n->title);
self::assertEquals('', $this->l11n->description); self::assertEquals('', $this->l11n->description);
self::assertEquals('', $this->l11n->descriptionPlain); self::assertEquals('', $this->l11n->descriptionPlain);

2
tests/Models/SurveyTemplateLabelL11nTest.php
View File

@ -38,7 +38,7 @@ final class SurveyTemplateLabelL11nTest extends \PHPUnit\Framework\TestCase
*/ */
public function testDefault() : void public function testDefault() : void
{ {
self::assertEquals(0, $this->l11n->getId()); self::assertEquals(0, $this->l11n->id);
self::assertEquals('', $this->l11n->title); self::assertEquals('', $this->l11n->title);
self::assertEquals(ISO639x1Enum::_EN, $this->l11n->getLanguage()); self::assertEquals(ISO639x1Enum::_EN, $this->l11n->getLanguage());
} }

2
tests/Models/SurveyTemplateTest.php
View File

@ -42,7 +42,7 @@ final class SurveyTemplateTest extends \PHPUnit\Framework\TestCase
*/ */
public function testDefault() : void public function testDefault() : void
{ {
self::assertEquals(0, $this->survey->getId()); self::assertEquals(0, $this->survey->id);
$date = new \DateTime('now'); $date = new \DateTime('now');
self::assertEquals([], $this->survey->getElements()); self::assertEquals([], $this->survey->getElements());