Skip to content

E
em
Commit 278ec95f by Kim Gyeongeun
Options

#57291 【eモニ 1.3】条件付必須回答を設定し、回答側のフリーアンサー設定をチェックすると(該当選択肢の必須にするをチェック)、必須条件を回答してなくても入力欄に入力できる

parent f413a53b
Showing with 62 additions and 10 deletions
src/main/java/jp/agentec/sinaburocast/csv/MemberInfoCsv.java
...@@ -332,6 +332,9 @@ public class MemberInfoCsv extends AbstractCsv { ...@@ -332,6 +332,9 @@ public class MemberInfoCsv extends AbstractCsv {
errorMessage.append(SinaburoViewUtil.getMessage("errors.email", SinaburoViewUtil.getMessage("labels.mainPcEmail"))); errorMessage.append(SinaburoViewUtil.getMessage("errors.email", SinaburoViewUtil.getMessage("labels.mainPcEmail")));
} }
} else {
// メインPC必須チェック
errorMessage.append(SinaburoViewUtil.getMessage("errors.required", SinaburoViewUtil.getMessage("labels.mainPcEmail")));
} }
// サブPCメールチェック // サブPCメールチェック
......
src/main/webapp/WEB-INF/view/common/enquete_mb.vm
...@@ -73,7 +73,7 @@ $tools.getMsg("errorheader") ...@@ -73,7 +73,7 @@ $tools.getMsg("errorheader")
##<!-- 自由入力欄。freeTextFlg=1(あり)、2(必須) --> ##<!-- 自由入力欄。freeTextFlg=1(あり)、2(必須) -->
#if($!answer.freeTextFlg == "1" || $!answer.freeTextFlg == "2") #if($!answer.freeTextFlg == "1" || $!answer.freeTextFlg == "2")
<input type="text" class="#he($!question.questionId)" id="#he($!answer.answerId)" name="$answerValue" size="$!answer.freeTextColWidth" value="$!escape.html($!answer.answerValue)" /> <input type="text" class="#he($!question.questionId)" id="#he($!answer.answerId)_ft" name="$answerValue" size="$!answer.freeTextColWidth" value="$!escape.html($!answer.answerValue)" #if($!question.questionInitDisable == "1") disabled #end />
#end #end
##<!-- 1:CHECKBOX answer.answerNo値を値にする。--> ##<!-- 1:CHECKBOX answer.answerNo値を値にする。-->
#elseif($!question.controlId == "1") #elseif($!question.controlId == "1")
...@@ -86,7 +86,7 @@ $tools.getMsg("errorheader") ...@@ -86,7 +86,7 @@ $tools.getMsg("errorheader")
##<!-- 自由入力欄。freeTextFlg=1(あり)、2(必須) --> ##<!-- 自由入力欄。freeTextFlg=1(あり)、2(必須) -->
#if($!answer.freeTextFlg == "1" || $!answer.freeTextFlg == "2") #if($!answer.freeTextFlg == "1" || $!answer.freeTextFlg == "2")
<input type="text" class="#he($!question.questionId)" id="#he($!answer.answerId)" name="$answerValue" size="$!answer.freeTextColWidth" value="$!escape.html($!answer.answerValue)" #if($!question.questionInitDisable == "1") disabled #end /> <input type="text" class="#he($!question.questionId)" id="#he($!answer.answerId)_ft" name="$answerValue" size="$!answer.freeTextColWidth" value="$!escape.html($!answer.answerValue)" #if($!question.questionInitDisable == "1") disabled #end />
#end #end
##<!-- 2:SELECTMENU answer.answerNo値を値にする。--> ##<!-- 2:SELECTMENU answer.answerNo値を値にする。-->
#elseif($!question.controlId == "2") #elseif($!question.controlId == "2")
......
src/main/webapp/WEB-INF/view/common/enquete_sp.vm
...@@ -87,7 +87,7 @@ $tools.getMsg("errorheader") ...@@ -87,7 +87,7 @@ $tools.getMsg("errorheader")
##<!-- 自由入力欄。freeTextFlg=1(あり)、2(必須) --> ##<!-- 自由入力欄。freeTextFlg=1(あり)、2(必須) -->
#if($!answer.freeTextFlg == 1 || $!answer.freeTextFlg == 2) #if($!answer.freeTextFlg == 1 || $!answer.freeTextFlg == 2)
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<input type="text" class="#he($!question.questionId) #he($!answer.answerId)" id="$answerValue" name="$answerValue" size="$!answer.freeTextColWidth" value="$!escape.html($!answer.answerValue)" /> <input type="text" class="#he($!question.questionId) #he($!answer.answerId)_ft" id="$answerValue" name="$answerValue" size="$!answer.freeTextColWidth" value="$!escape.html($!answer.answerValue)" #if($!question.questionInitDisable == "1") disabled #end/>
<label for=$answerValue class="ui-hidden-accessible"></label> <label for=$answerValue class="ui-hidden-accessible"></label>
</div> </div>
#end #end
...@@ -106,7 +106,7 @@ $tools.getMsg("errorheader") ...@@ -106,7 +106,7 @@ $tools.getMsg("errorheader")
##<!-- 自由入力欄。freeTextFlg=1(あり)、2(必須) --> ##<!-- 自由入力欄。freeTextFlg=1(あり)、2(必須) -->
#if($!answer.freeTextFlg == 1 || $!answer.freeTextFlg == 2) #if($!answer.freeTextFlg == 1 || $!answer.freeTextFlg == 2)
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<input type="text" class="#he($!question.questionId) #he($!answer.answerId)" id="$answerValue" name="$answerValue" size="$!answer.freeTextColWidth" value="$!escape.html($!answer.answerValue)" #if($!question.questionInitDisable == "1") disabled #end/> <input type="text" class="#he($!question.questionId) #he($!answer.answerId)_ft" id="$answerValue" name="$answerValue" size="$!answer.freeTextColWidth" value="$!escape.html($!answer.answerValue)" #if($!question.questionInitDisable == "1") disabled #end/>
<label for=$answerValue class="ui-hidden-accessible"></label> <label for=$answerValue class="ui-hidden-accessible"></label>
</div> </div>
#end #end
......
src/main/webapp/WEB-INF/view/common/question_disable.vm
...@@ -42,6 +42,10 @@ $(function() { ...@@ -42,6 +42,10 @@ $(function() {
if ("${question.condRequiredAnswer}".split(",").indexOf(selectAnswerId) < 0) { if ("${question.condRequiredAnswer}".split(",").indexOf(selectAnswerId) < 0) {
if ("${question.controlId}" == "0" || "${question.controlId}" == "1") { if ("${question.controlId}" == "0" || "${question.controlId}" == "1") {
radioOrCheckboxEvent("${answer.answerId}", true); radioOrCheckboxEvent("${answer.answerId}", true);
//自由入力欄
if ("${answer.freeTextFlg}" == "1" || "${answer.freeTextFlg}" == "2") {
etcEvent("${answer.answerId}_ft", true);
}
} else if ( "${question.controlId}" == "2" } else if ( "${question.controlId}" == "2"
|| "${question.controlId}" == "3" || "${question.controlId}" == "3"
|| "${question.controlId}" == "4" || "${question.controlId}" == "4"
...@@ -57,6 +61,10 @@ $(function() { ...@@ -57,6 +61,10 @@ $(function() {
} else { } else {
if ("${question.controlId}" == "0" || "${question.controlId}" == "1") { if ("${question.controlId}" == "0" || "${question.controlId}" == "1") {
radioOrCheckboxEvent("${answer.answerId}", false); radioOrCheckboxEvent("${answer.answerId}", false);
//自由入力欄
if ("${answer.freeTextFlg}" == "1" || "${answer.freeTextFlg}" == "2") {
etcEvent("${answer.answerId}_ft", false);
}
} else if ("${question.controlId}" == "2" } else if ("${question.controlId}" == "2"
|| "${question.controlId}" == "3" || "${question.controlId}" == "3"
|| "${question.controlId}" == "4" || "${question.controlId}" == "4"
...@@ -84,6 +92,10 @@ $(function() { ...@@ -84,6 +92,10 @@ $(function() {
&& ("${question.controlId}" == "0" || "${question.controlId}" == "1")) { && ("${question.controlId}" == "0" || "${question.controlId}" == "1")) {
if ($(this).is(":checked")) { if ($(this).is(":checked")) {
radioOrCheckboxEvent("${answer.answerId}", true); radioOrCheckboxEvent("${answer.answerId}", true);
//自由入力欄
if ("${answer.freeTextFlg}" == "1" || "${answer.freeTextFlg}" == "2") {
etcEvent("${answer.answerId}_ft", true);
}
} else { } else {
var array = "${question.condRequiredAnswer}".split(","); var array = "${question.condRequiredAnswer}".split(",");
var judgeDisable = true; var judgeDisable = true;
...@@ -95,6 +107,10 @@ $(function() { ...@@ -95,6 +107,10 @@ $(function() {
} }
if (judgeDisable) { if (judgeDisable) {
radioOrCheckboxEvent("${answer.answerId}", true); radioOrCheckboxEvent("${answer.answerId}", true);
//自由入力欄
if ("${answer.freeTextFlg}" == "1" || "${answer.freeTextFlg}" == "2") {
etcEvent("${answer.answerId}_ft", true);
}
} }
} }
} else if ( "${question.controlId}" == "2" } else if ( "${question.controlId}" == "2"
...@@ -136,6 +152,10 @@ $(function() { ...@@ -136,6 +152,10 @@ $(function() {
if ("${question.controlId}" == "0" || "${question.controlId}" == "1") { if ("${question.controlId}" == "0" || "${question.controlId}" == "1") {
if ($(this).is(":checked")) { if ($(this).is(":checked")) {
radioOrCheckboxEvent("${answer.answerId}", false); radioOrCheckboxEvent("${answer.answerId}", false);
//自由入力欄
if ("${answer.freeTextFlg}" == "1" || "${answer.freeTextFlg}" == "2") {
etcEvent("${answer.answerId}_ft", false);
}
} else { } else {
var array = "${question.condRequiredAnswer}".split(","); var array = "${question.condRequiredAnswer}".split(",");
var judgeDisable = true; var judgeDisable = true;
...@@ -147,6 +167,10 @@ $(function() { ...@@ -147,6 +167,10 @@ $(function() {
} }
if (judgeDisable) { if (judgeDisable) {
radioOrCheckboxEvent("${answer.answerId}", true); radioOrCheckboxEvent("${answer.answerId}", true);
//自由入力欄
if ("${answer.freeTextFlg}" == "1" || "${answer.freeTextFlg}" == "2") {
etcEvent("${answer.answerId}_ft", true);
}
} }
} }
} else if ("${question.controlId}" == "2" } else if ("${question.controlId}" == "2"
......
src/main/webapp/WEB-INF/view/common/question_disable_sp.vm
...@@ -65,6 +65,10 @@ $(function() { ...@@ -65,6 +65,10 @@ $(function() {
if ("${question.condRequiredAnswer}".split(",").indexOf(selectAnswerId) < 0) { if ("${question.condRequiredAnswer}".split(",").indexOf(selectAnswerId) < 0) {
if ("${question.controlId}" == "0" || "${question.controlId}" == "1") { if ("${question.controlId}" == "0" || "${question.controlId}" == "1") {
radioOrCheckboxEvent("${answer.answerId}", true); radioOrCheckboxEvent("${answer.answerId}", true);
//自由入力欄
if ("${answer.freeTextFlg}" == "1" || "${answer.freeTextFlg}" == "2") {
textEvent("${answer.answerId}_ft", true);
}
} else if ( "${question.controlId}" == "2" } else if ( "${question.controlId}" == "2"
|| "${question.controlId}" == "3" || "${question.controlId}" == "3"
|| "${question.controlId}" == "4" || "${question.controlId}" == "4"
...@@ -82,6 +86,10 @@ $(function() { ...@@ -82,6 +86,10 @@ $(function() {
} else { } else {
if ("${question.controlId}" == "0" || "${question.controlId}" == "1") { if ("${question.controlId}" == "0" || "${question.controlId}" == "1") {
radioOrCheckboxEvent("${answer.answerId}", false); radioOrCheckboxEvent("${answer.answerId}", false);
//自由入力欄
if ("${answer.freeTextFlg}" == "1" || "${answer.freeTextFlg}" == "2") {
textEvent("${answer.answerId}_ft", false);
}
} else if ("${question.controlId}" == "2" } else if ("${question.controlId}" == "2"
|| "${question.controlId}" == "3" || "${question.controlId}" == "3"
|| "${question.controlId}" == "4" || "${question.controlId}" == "4"
...@@ -111,6 +119,10 @@ $(function() { ...@@ -111,6 +119,10 @@ $(function() {
&& ("${question.controlId}" == "0" || "${question.controlId}" == "1")) { && ("${question.controlId}" == "0" || "${question.controlId}" == "1")) {
if ($(this).is(":checked")) { if ($(this).is(":checked")) {
radioOrCheckboxEvent("${answer.answerId}", true); radioOrCheckboxEvent("${answer.answerId}", true);
//自由入力欄
if ("${answer.freeTextFlg}" == "1" || "${answer.freeTextFlg}" == "2") {
textEvent("${answer.answerId}_ft", true);
}
} else { } else {
var array = "${question.condRequiredAnswer}".split(","); var array = "${question.condRequiredAnswer}".split(",");
var judgeDisable = true; var judgeDisable = true;
...@@ -122,6 +134,10 @@ $(function() { ...@@ -122,6 +134,10 @@ $(function() {
} }
if (judgeDisable) { if (judgeDisable) {
radioOrCheckboxEvent("${answer.answerId}", true); radioOrCheckboxEvent("${answer.answerId}", true);
//自由入力欄
if ("${answer.freeTextFlg}" == "1" || "${answer.freeTextFlg}" == "2") {
textEvent("${answer.answerId}_ft", true);
}
} }
} }
} else if ( "${question.controlId}" == "2" } else if ( "${question.controlId}" == "2"
...@@ -167,6 +183,11 @@ $(function() { ...@@ -167,6 +183,11 @@ $(function() {
if ("${question.controlId}" == "0" || "${question.controlId}" == "1") { if ("${question.controlId}" == "0" || "${question.controlId}" == "1") {
if ($(this).is(":checked")) { if ($(this).is(":checked")) {
radioOrCheckboxEvent("${answer.answerId}", false); radioOrCheckboxEvent("${answer.answerId}", false);
//自由入力欄
if ("${answer.freeTextFlg}" == "1" || "${answer.freeTextFlg}" == "2") {
textEvent("${answer.answerId}_ft", false);
}
} else { } else {
var array = "${question.condRequiredAnswer}".split(","); var array = "${question.condRequiredAnswer}".split(",");
var judgeDisable = true; var judgeDisable = true;
...@@ -178,6 +199,10 @@ $(function() { ...@@ -178,6 +199,10 @@ $(function() {
} }
if (judgeDisable) { if (judgeDisable) {
radioOrCheckboxEvent("${answer.answerId}", true); radioOrCheckboxEvent("${answer.answerId}", true);
//自由入力欄
if ("${answer.freeTextFlg}" == "1" || "${answer.freeTextFlg}" == "2") {
textEvent("${answer.answerId}_ft", true);
}
} }
} }
} else if ("${question.controlId}" == "2" } else if ("${question.controlId}" == "2"
......
src/main/webapp/WEB-INF/view/user/enquete/enquete.html
...@@ -218,7 +218,7 @@ $tools.getMsg("errorheader") ...@@ -218,7 +218,7 @@ $tools.getMsg("errorheader")
##<!-- 自由入力欄。freeTextFlg=1(あり)、2(必須) --> ##<!-- 自由入力欄。freeTextFlg=1(あり)、2(必須) -->
#if($!answer.freeTextFlg == "1" || $!answer.freeTextFlg == "2") #if($!answer.freeTextFlg == "1" || $!answer.freeTextFlg == "2")
<input type="text" class="#he($!question.questionId)" id="#he($!answer.answerId)" name="$answerValue" size="$!answer.freeTextColWidth" value="$!escape.html($!answer.answerValue)" /> <input type="text" class="#he($!question.questionId)" id="#he($!answer.answerId)_ft" name="$answerValue" size="$!answer.freeTextColWidth" value="$!escape.html($!answer.answerValue)" #if($!question.questionInitDisable == "1") disabled #end />
#end #end
##<!-- 1:CHECKBOX answer.answerNo値を値にする。--> ##<!-- 1:CHECKBOX answer.answerNo値を値にする。-->
#elseif($!question.controlId == "1") #elseif($!question.controlId == "1")
...@@ -229,7 +229,7 @@ $tools.getMsg("errorheader") ...@@ -229,7 +229,7 @@ $tools.getMsg("errorheader")
##<!-- 自由入力欄。freeTextFlg=1(あり)、2(必須) --> ##<!-- 自由入力欄。freeTextFlg=1(あり)、2(必須) -->
#if($!answer.freeTextFlg == "1" || $!answer.freeTextFlg == "2") #if($!answer.freeTextFlg == "1" || $!answer.freeTextFlg == "2")
<input type="text" class="#he($!question.questionId)" id="#he($!answer.answerId)" name="$answerValue" size="$!answer.freeTextColWidth" value="$!escape.html($!answer.answerValue)" #if($!question.questionInitDisable == "1") disabled #end/> <input type="text" class="#he($!question.questionId)" id="#he($!answer.answerId)_ft" name="$answerValue" size="$!answer.freeTextColWidth" value="$!escape.html($!answer.answerValue)" #if($!question.questionInitDisable == "1") disabled #end/>
#end #end
##<!-- 3:TEXTAREA ユーザー入力値を値にする。--> ##<!-- 3:TEXTAREA ユーザー入力値を値にする。-->
#elseif($!question.controlId == "3") #elseif($!question.controlId == "3")
......
src/main/webapp/WEB-INF/view/user/enquete/enquete_pub.html
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
##<!-- 自由入力欄。freeTextFlg=1(あり)、2(必須) --> ##<!-- 自由入力欄。freeTextFlg=1(あり)、2(必須) -->
#if($!answer.freeTextFlg == "1" || $!answer.freeTextFlg == "2") #if($!answer.freeTextFlg == "1" || $!answer.freeTextFlg == "2")
<input type="text" class="#he($!question.questionId)" id="#he($!answer.answerId)" name="$answerValue" size="$!answer.freeTextColWidth" value="$!escape.html($!answer.answerValue)" /> <input type="text" class="#he($!question.questionId)" id="#he($!answer.answerId)_ft" name="$answerValue" size="$!answer.freeTextColWidth" value="$!escape.html($!answer.answerValue)" #if($!question.questionInitDisable == "1") disabled #end />
#end #end
##<!-- 1:CHECKBOX answer.answerNo値を値にする。--> ##<!-- 1:CHECKBOX answer.answerNo値を値にする。-->
#elseif($!question.controlId == "1") #elseif($!question.controlId == "1")
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
##<!-- 自由入力欄。freeTextFlg=1(あり)、2(必須) --> ##<!-- 自由入力欄。freeTextFlg=1(あり)、2(必須) -->
#if($!answer.freeTextFlg == "1" || $!answer.freeTextFlg == "2") #if($!answer.freeTextFlg == "1" || $!answer.freeTextFlg == "2")
<input type="text" class="#he($!question.questionId)" id="#he($!answer.answerId)" name="$answerValue" size="$!answer.freeTextColWidth" value="$!escape.html($!answer.answerValue)" #if($!question.questionInitDisable == "1") disabled #end /> <input type="text" class="#he($!question.questionId)" id="#he($!answer.answerId)_ft" name="$answerValue" size="$!answer.freeTextColWidth" value="$!escape.html($!answer.answerValue)" #if($!question.questionInitDisable == "1") disabled #end />
#end #end
##<!-- 3:TEXTAREA ユーザー入力値を値にする。--> ##<!-- 3:TEXTAREA ユーザー入力値を値にする。-->
#elseif($!question.controlId == "3") #elseif($!question.controlId == "3")
......
src/main/webapp/WEB-INF/view/user/enquete/enquete_web_rec.html
...@@ -157,7 +157,7 @@ $!enqueteForm.enquete.header ...@@ -157,7 +157,7 @@ $!enqueteForm.enquete.header
##<!-- 自由入力欄。freeTextFlg=1(あり)、2(必須) --> ##<!-- 自由入力欄。freeTextFlg=1(あり)、2(必須) -->
#if($!answer.freeTextFlg == "1" || $!answer.freeTextFlg == "2") #if($!answer.freeTextFlg == "1" || $!answer.freeTextFlg == "2")
<input type="text" class="#he($!question.questionId)" id="#he($!answer.answerId)" name="$answerValue" size="$!answer.freeTextColWidth" value="$!escape.html($!answer.answerValue)" /> <input type="text" class="#he($!question.questionId)" id="#he($!answer.answerId)_ft" name="$answerValue" size="$!answer.freeTextColWidth" value="$!escape.html($!answer.answerValue)" #if($!question.questionInitDisable == "1") disabled #end/>
#end #end
##<!-- 1:CHECKBOX answer.answerNo値を値にする。--> ##<!-- 1:CHECKBOX answer.answerNo値を値にする。-->
#elseif($!question.controlId == "1") #elseif($!question.controlId == "1")
...@@ -169,7 +169,7 @@ $!enqueteForm.enquete.header ...@@ -169,7 +169,7 @@ $!enqueteForm.enquete.header
##<!-- 自由入力欄。freeTextFlg=1(あり)、2(必須) --> ##<!-- 自由入力欄。freeTextFlg=1(あり)、2(必須) -->
#if($!answer.freeTextFlg == "1" || $!answer.freeTextFlg == "2") #if($!answer.freeTextFlg == "1" || $!answer.freeTextFlg == "2")
<input type="text" name="$answerValue" size="$!answer.freeTextColWidth" value="$!escape.html($!answer.answerValue)" #if($!question.questionInitDisable == "1") disabled #end/> <input type="text" class="#he($!question.questionId)" id="#he($!answer.answerId)_ft" name="$answerValue" size="$!answer.freeTextColWidth" value="$!escape.html($!answer.answerValue)" #if($!question.questionInitDisable == "1") disabled #end/>
#end #end
##<!-- 3:TEXTAREA ユーザー入力値を値にする。--> ##<!-- 3:TEXTAREA ユーザー入力値を値にする。-->
#elseif($!question.controlId == "3") #elseif($!question.controlId == "3")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment