Skip to content

Commit

Permalink
fix: div閉じタグ足らず
Browse files Browse the repository at this point in the history 
NetCommons3/NetCommons3#1438
  • Loading branch information
@akagane99
akagane99 committed Mar 1, 2019
1 parent 0658ca9 commit 3346430
Show file tree
Hide file tree
Showing 2 changed files with 101 additions and 100 deletions.
197 changes: 98 additions & 99 deletions View/QuestionnaireEdit/edit_question.ctp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ $jsPostData = $this->QuestionEdit->getJsPostData($questionnaireKey, $ajaxPostUrl
<?php echo $this->Wizard->navibar('edit_question'); ?>

<div class="panel panel-default">

<?php echo $this->NetCommonsForm->create('QuestionnaireQuestion', $postUrl); ?>
<?php echo $this->NetCommonsForm->create('QuestionnaireQuestion', $postUrl); ?>

<?php echo $this->NetCommonsForm->hidden('Frame.id'); ?>
<?php echo $this->NetCommonsForm->hidden('Block.id'); ?>
Expand All @@ -67,111 +66,111 @@ $jsPostData = $this->QuestionEdit->getJsPostData($questionnaireKey, $ajaxPostUrl

<?php echo $this->element('Questionnaires.QuestionnaireEdit/EditQuestion/hidden_page_info_set'); ?>

<div ng-cloak uib-accordion close-others="true">
<div uib-accordion-group
class="form-horizontal panel-default"
ng-repeat="(qIndex, question) in page.questionnaireQuestion"
is-open="question.isOpen">
<div ng-cloak uib-accordion close-others="true">
<div uib-accordion-group
class="form-horizontal panel-default"
ng-repeat="(qIndex, question) in page.questionnaireQuestion"
is-open="question.isOpen">

<div uib-accordion-heading>
<?php /* 質問ヘッダーセット（移動ボタン、削除ボタンなどの集合体 */
echo $this->element('Questionnaires.QuestionnaireEdit/EditQuestion/accordion_heading', array('isPublished' => $isPublished)); ?>
<div class="clearfix"></div>
</div>
<div uib-accordion-heading>
<?php /* 質問ヘッダーセット（移動ボタン、削除ボタンなどの集合体 */
echo $this->element('Questionnaires.QuestionnaireEdit/EditQuestion/accordion_heading', array('isPublished' => $isPublished)); ?>
<div class="clearfix"></div>
</div>

<?php echo $this->element('Questionnaires.QuestionnaireEdit/EditQuestion/hidden_question_info_set'); ?>

<?php /* ここから質問本体設定 */
/* 質問タイトル */
echo $this->QuestionEdit->questionInput('QuestionnairePage.{{pageIndex}}.QuestionnaireQuestion.{{qIndex}}.question_value',
__d('questionnaires', 'question title'),
array('type' => 'text',
'ng-model' => 'question.questionValue',
'required' => 'required',
));
/* 必須 */
echo $this->QuestionEdit->questionInput('QuestionnairePage.{{pageIndex}}.QuestionnaireQuestion.{{qIndex}}.is_require',
__d('questionnaires', 'Required'),
array(
'type' => 'checkbox',
'ng-checked' => 'question.isRequire == ' . QuestionnairesComponent::USES_USE,
'ng-model' => 'question.isRequire',
),
__d('questionnaires', 'set answer to this question is required'));
/* 質問文 */
echo $this->QuestionEdit->questionInput('QuestionnairePage.{{pageIndex}}.QuestionnaireQuestion.{{qIndex}}.description',
__d('questionnaires', 'question sentence'),
array('type' => 'wysiwyg',
'id' => false,
'ng-model' => 'question.description',
));
/* 質問種別 */
echo $this->QuestionEdit->questionInput('QuestionnairePage.{{pageIndex}}.QuestionnaireQuestion.{{qIndex}}.question_type',
__d('questionnaires', 'Question type'),
array('type' => 'select',
'required' => true,
'options' => $questionTypeOptions,
'ng-model' => 'question.questionType',
'ng-change' => 'changeQuestionType($event, {{pageIndex}}, {{qIndex}})',
'empty' => null
));
?>
<div class="row form-group">
<div class="col-xs-12">
<div class="well">
<div ng-if="question.questionType == <?php echo QuestionnairesComponent::TYPE_SELECTION; ?>">
<?php echo $this->element($elementFolder . 'simple_choice_option'); ?>
</div>
<div ng-if="question.questionType == <?php echo QuestionnairesComponent::TYPE_MULTIPLE_SELECTION; ?>">
<?php echo $this->element($elementFolder . 'simple_choice_option'); ?>
</div>
<div ng-if="question.questionType == <?php echo QuestionnairesComponent::TYPE_TEXT; ?>">
<?php echo $this->element($elementFolder . 'text_option'); ?>
</div>
<div ng-if="question.questionType == <?php echo QuestionnairesComponent::TYPE_TEXT_AREA; ?>">
<?php echo $this->element($elementFolder . 'text_area_option'); ?>
</div>
<div ng-if="question.questionType == <?php echo QuestionnairesComponent::TYPE_MATRIX_SELECTION_LIST; ?>">
<?php echo $this->element($elementFolder . 'matrix_choice_option'); ?>
</div>
<div ng-if="question.questionType == <?php echo QuestionnairesComponent::TYPE_MATRIX_MULTIPLE; ?>">
<?php echo $this->element($elementFolder . 'matrix_choice_option'); ?>
</div>
<div ng-if="question.questionType == <?php echo QuestionnairesComponent::TYPE_DATE_AND_TIME; ?>">
<?php echo $this->element($elementFolder . 'date_option'); ?>
</div>
<div ng-if="question.questionType == <?php echo QuestionnairesComponent::TYPE_SINGLE_SELECT_BOX; ?>">
<?php echo $this->element($elementFolder . 'simple_choice_option'); ?>
<?php echo $this->element('Questionnaires.QuestionnaireEdit/EditQuestion/hidden_question_info_set'); ?>

<?php /* ここから質問本体設定 */
/* 質問タイトル */
echo $this->QuestionEdit->questionInput('QuestionnairePage.{{pageIndex}}.QuestionnaireQuestion.{{qIndex}}.question_value',
__d('questionnaires', 'question title'),
array('type' => 'text',
'ng-model' => 'question.questionValue',
'required' => 'required',
));
/* 必須 */
echo $this->QuestionEdit->questionInput('QuestionnairePage.{{pageIndex}}.QuestionnaireQuestion.{{qIndex}}.is_require',
__d('questionnaires', 'Required'),
array(
'type' => 'checkbox',
'ng-checked' => 'question.isRequire == ' . QuestionnairesComponent::USES_USE,
'ng-model' => 'question.isRequire',
),
__d('questionnaires', 'set answer to this question is required'));
/* 質問文 */
echo $this->QuestionEdit->questionInput('QuestionnairePage.{{pageIndex}}.QuestionnaireQuestion.{{qIndex}}.description',
__d('questionnaires', 'question sentence'),
array('type' => 'wysiwyg',
'id' => false,
'ng-model' => 'question.description',
));
/* 質問種別 */
echo $this->QuestionEdit->questionInput('QuestionnairePage.{{pageIndex}}.QuestionnaireQuestion.{{qIndex}}.question_type',
__d('questionnaires', 'Question type'),
array('type' => 'select',
'required' => true,
'options' => $questionTypeOptions,
'ng-model' => 'question.questionType',
'ng-change' => 'changeQuestionType($event, {{pageIndex}}, {{qIndex}})',
'empty' => null
));
?>
<div class="row form-group">
<div class="col-xs-12">
<div class="well">
<div ng-if="question.questionType == <?php echo QuestionnairesComponent::TYPE_SELECTION; ?>">
<?php echo $this->element($elementFolder . 'simple_choice_option'); ?>
</div>
<div ng-if="question.questionType == <?php echo QuestionnairesComponent::TYPE_MULTIPLE_SELECTION; ?>">
<?php echo $this->element($elementFolder . 'simple_choice_option'); ?>
</div>
<div ng-if="question.questionType == <?php echo QuestionnairesComponent::TYPE_TEXT; ?>">
<?php echo $this->element($elementFolder . 'text_option'); ?>
</div>
<div ng-if="question.questionType == <?php echo QuestionnairesComponent::TYPE_TEXT_AREA; ?>">
<?php echo $this->element($elementFolder . 'text_area_option'); ?>
</div>
<div ng-if="question.questionType == <?php echo QuestionnairesComponent::TYPE_MATRIX_SELECTION_LIST; ?>">
<?php echo $this->element($elementFolder . 'matrix_choice_option'); ?>
</div>
<div ng-if="question.questionType == <?php echo QuestionnairesComponent::TYPE_MATRIX_MULTIPLE; ?>">
<?php echo $this->element($elementFolder . 'matrix_choice_option'); ?>
</div>
<div ng-if="question.questionType == <?php echo QuestionnairesComponent::TYPE_DATE_AND_TIME; ?>">
<?php echo $this->element($elementFolder . 'date_option'); ?>
</div>
<div ng-if="question.questionType == <?php echo QuestionnairesComponent::TYPE_SINGLE_SELECT_BOX; ?>">
<?php echo $this->element($elementFolder . 'simple_choice_option'); ?>
</div>
</div>
</div>
</div>
</div >
</div >

</div>
</div>
</div>

<?php echo $this->element('Questionnaires.QuestionnaireEdit/EditQuestion/add_question_button'); ?>
<?php echo $this->element('Questionnaires.QuestionnaireEdit/EditQuestion/add_question_button'); ?>

<?php if (! $isPublished): ?>
<div class="text-center">
<button class="btn btn-danger" type="button"
ng-disabled="questionnaire.questionnairePage.length < 2"
ng-click="deletePage($index, '<?php echo __d('questionnaires', 'Do you want to delete this page?'); ?>')">
<span class="glyphicon glyphicon-remove"></span><?php echo __d('questionnaires', 'Delete this page'); ?>
</button>
</div>
<?php endif; ?>
</div>
</uib-tab>
<?php if (! $isPublished): ?>
<a class="questionnaire-add-page-tab" ng-click="addPage($event)">
<span class="glyphicon glyphicon-plus"></span>
<span class=""><?php echo __d('questionnaires', 'Add Page'); ?></span>
</a>
<?php endif; ?>
</uib-tabset>
<?php if (! $isPublished): ?>
<div class="text-center">
<button class="btn btn-danger" type="button"
ng-disabled="questionnaire.questionnairePage.length < 2"
ng-click="deletePage($index, '<?php echo __d('questionnaires', 'Do you want to delete this page?'); ?>')">
<span class="glyphicon glyphicon-remove"></span><?php echo __d('questionnaires', 'Delete this page'); ?>
</button>
</div>
<?php endif; ?>
</div>
</uib-tab>
<?php if (! $isPublished): ?>
<a class="questionnaire-add-page-tab" ng-click="addPage($event)">
<span class="glyphicon glyphicon-plus"></span>
<span class=""><?php echo __d('questionnaires', 'Add Page'); ?></span>
</a>
<?php endif; ?>
</uib-tabset>

</div>
</div>

<div class="panel-footer text-center">
<?php echo $this->Wizard->buttons(
Expand All @@ -182,8 +181,8 @@ $jsPostData = $this->QuestionEdit->getJsPostData($questionnaireKey, $ajaxPostUrl
true); ?>
</div>


<?php echo $this->NetCommonsForm->end(); ?>
</div>

<?php echo $this->QuestionEdit->questionnaireGetFinallySubmit($postUrl); ?>

Expand Down
4 changes: 3 additions & 1 deletion View/QuestionnaireEdit/edit_result.ctp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ $jsPostData = $this->QuestionEdit->getJsPostData($questionnaireKey, $ajaxPostUrl
<?php echo $this->Wizard->navibar('edit_result'); ?>

<div class="panel panel-default">

<?php echo $this->NetCommonsForm->create('QuestionnaireQuestion', $postUrl); ?>

<?php $this->NetCommonsForm->unlockField('QuestionnairePage'); ?>
Expand Down Expand Up @@ -96,7 +95,10 @@ $jsPostData = $this->QuestionEdit->getJsPostData($questionnaireKey, $ajaxPostUrl
$prevUrl,
['type' => 'button', 'ng-click' => 'post(\'edit_result\')']); ?>
</div>

<?php echo $this->NetCommonsForm->end(); ?>
</div>

<?php echo $this->QuestionEdit->questionnaireGetFinallySubmit($postUrl, array(
'Questionnaire.is_total_show' => 'questionnaire.questionnaire.isTotalShow',
'Questionnaire.total_comment' => 'questionnaire.questionnaire.totalComment',
Expand Down

0 comments on commit 3346430

Please sign in to comment.