Commit e8ec32ea by Kim Gyeongeun

#57316 【eモニ 1.3】会員一括登録で、性別を「その他」「入力しない」で登録すると、性別にチェックが付かない

#57318 【eモニ 1.3】メールアドレス登録時のアラートについて
#57321 【eモニ 1.3】パブリックコメントとWebアンケートの「PC」表示のみ、日付に条件付必須回答を設定すると、初期表示にカレンダーが表示され選択できる
#57322 【eモニ 1.3】Webアンケートの「PC」表示のみ、ラジオボタンに条件付必須回答を設定すると、初期表示に選択できる
parent 278ec95f
...@@ -229,7 +229,7 @@ public class MemberEditAction extends AbstractAction { ...@@ -229,7 +229,7 @@ public class MemberEditAction extends AbstractAction {
messages = new ActionMessages(); messages = new ActionMessages();
} }
messages.add("subPcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.E014"))); messages.add("subPcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.E015")));
request.setAttribute(Globals.ERROR_KEY, messages); request.setAttribute(Globals.ERROR_KEY, messages);
return "/admin/member/memberEdit.html"; return "/admin/member/memberEdit.html";
} }
...@@ -244,7 +244,7 @@ public class MemberEditAction extends AbstractAction { ...@@ -244,7 +244,7 @@ public class MemberEditAction extends AbstractAction {
if (messages == null) { if (messages == null) {
messages = new ActionMessages(); messages = new ActionMessages();
} }
messages.add("subPcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.E014")+SinaburoViewUtil.getMessage("errors.E049"))); messages.add("subPcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.E015")+SinaburoViewUtil.getMessage("errors.E049")));
request.setAttribute(Globals.ERROR_KEY, messages); request.setAttribute(Globals.ERROR_KEY, messages);
return "/admin/member/memberEdit.html"; return "/admin/member/memberEdit.html";
...@@ -304,7 +304,7 @@ public class MemberEditAction extends AbstractAction { ...@@ -304,7 +304,7 @@ public class MemberEditAction extends AbstractAction {
if (messages == null) { if (messages == null) {
messages = new ActionMessages(); messages = new ActionMessages();
} }
messages.add("subPcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.E014")+SinaburoViewUtil.getMessage("errors.E049"))); messages.add("subPcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.E015")+SinaburoViewUtil.getMessage("errors.E049")));
request.setAttribute(Globals.ERROR_KEY, messages); request.setAttribute(Globals.ERROR_KEY, messages);
err = true; err = true;
//return "/admin/member/memberEdit.html"; //return "/admin/member/memberEdit.html";
......
...@@ -234,7 +234,7 @@ public class UserEditAction extends AbstractAction { ...@@ -234,7 +234,7 @@ public class UserEditAction extends AbstractAction {
messages = new ActionMessages(); messages = new ActionMessages();
} }
messages.add("subPcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.E014"))); messages.add("subPcEmail", new ActionMessage(SinaburoViewUtil.getMessage("errors.E015")));
request.setAttribute(Globals.ERROR_KEY, messages); request.setAttribute(Globals.ERROR_KEY, messages);
return "/user/userEdit/uEdit.html"; return "/user/userEdit/uEdit.html";
} }
......
...@@ -652,6 +652,13 @@ public interface SinaburoConstant { ...@@ -652,6 +652,13 @@ public interface SinaburoConstant {
short YES = 1; short YES = 1;
short NO = 0; short NO = 0;
} }
interface GENDER_CODE {
Integer MAN = 0;
Integer WOMAN = 1;
Integer OTHERS = 2;
Integer NOT_INPUT = 3;
}
} }
...@@ -21,6 +21,7 @@ import org.seasar.s2csv.csv.annotation.entity.CSVRecordValidator; ...@@ -21,6 +21,7 @@ import org.seasar.s2csv.csv.annotation.entity.CSVRecordValidator;
import org.seasar.s2csv.csv.exception.runtime.CSVValidationException; import org.seasar.s2csv.csv.exception.runtime.CSVValidationException;
import org.seasar.struts.util.RequestUtil; import org.seasar.struts.util.RequestUtil;
import jp.agentec.sinaburocast.common.SinaburoConstant.GENDER_CODE;
import jp.agentec.sinaburocast.common.util.SinaburoUtil; import jp.agentec.sinaburocast.common.util.SinaburoUtil;
import jp.agentec.sinaburocast.common.util.SinaburoViewUtil; import jp.agentec.sinaburocast.common.util.SinaburoViewUtil;
import jp.agentec.sinaburocast.entity.Member; import jp.agentec.sinaburocast.entity.Member;
...@@ -227,11 +228,15 @@ public class MemberInfoCsv extends AbstractCsv { ...@@ -227,11 +228,15 @@ public class MemberInfoCsv extends AbstractCsv {
} }
if (args.equals("男")) { if (args.equals("男")) {
genderCd = 0; genderCd = GENDER_CODE.MAN;
} else if (args.equals("女")) { } else if (args.equals("女")) {
genderCd = 1; genderCd = GENDER_CODE.WOMAN;
} else if (args.equals("その他")) {
genderCd = GENDER_CODE.OTHERS;
} else if (args.equals("入力しない")) {
genderCd = GENDER_CODE.NOT_INPUT;
} else { } else {
genderCd = null; genderCd = -1;
} }
return true; return true;
...@@ -357,10 +362,14 @@ public class MemberInfoCsv extends AbstractCsv { ...@@ -357,10 +362,14 @@ public class MemberInfoCsv extends AbstractCsv {
} }
} }
// 性別チェック
if (genderCd != null && genderCd.equals(-1)) {
errorMessage.append(SinaburoViewUtil.getMessage("errors.invalid", SinaburoViewUtil.getMessage("labels.genderCd")));
}
if(StringUtil.isNotBlank(errorMessage.toString())){ if(StringUtil.isNotBlank(errorMessage.toString())){
throw new CSVValidationException("errors.custom", new Object[]{errorMessage}); throw new CSVValidationException("errors.custom", new Object[]{errorMessage});
} }
return true; return true;
} }
} }
...@@ -119,7 +119,7 @@ public class GiftExchangeService extends AbstractService<GiftExchange> { ...@@ -119,7 +119,7 @@ public class GiftExchangeService extends AbstractService<GiftExchange> {
public String getGiftExchangeForCsv(GiftExchangeSearchForm giftExchangeSearchForm) throws UnsupportedEncodingException, Exception{ public String getGiftExchangeForCsv(GiftExchangeSearchForm giftExchangeSearchForm) throws UnsupportedEncodingException, Exception{
StringBuffer str = new StringBuffer(); StringBuffer str = new StringBuffer();
str.append("\"申請日\",\"会員ID\",\"氏名\",\"メールアドレス\",\"申請(枚数/ポイント数)\",\"郵便番号\",\"都道府県\",\"市区町村\",\"町名・番地\",\"建物名\",\"会員番号\",\"電話番号\""+"\r\n"); str.append("\"申請日\",\"会員ID\",\"氏名\",\"E-mail(メイン)\",\"申請(枚数/ポイント数)\",\"郵便番号\",\"都道府県\",\"市区町村\",\"町名・番地\",\"建物名\",\"会員番号\",\"電話番号\""+"\r\n");
List<GiftExchange> giftExchangeList = getGiftExchangeByFromDayAndToDay(giftExchangeSearchForm); List<GiftExchange> giftExchangeList = getGiftExchangeByFromDayAndToDay(giftExchangeSearchForm);
......
...@@ -53,7 +53,7 @@ errors.E010=E-mail(\u30e1\u30a4\u30f3)\u306f\u5fc5\u9808\u3067\u3059\u3002 ...@@ -53,7 +53,7 @@ errors.E010=E-mail(\u30e1\u30a4\u30f3)\u306f\u5fc5\u9808\u3067\u3059\u3002
errors.E011=\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002 errors.E011=\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u4e00\u81f4\u3057\u307e\u305b\u3093\u3002
errors.E012=\u30ed\u30b0\u30a4\u30f3ID\u3082\u3057\u304f\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u4e0d\u6b63\u3067\u3059\u3002 errors.E012=\u30ed\u30b0\u30a4\u30f3ID\u3082\u3057\u304f\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u4e0d\u6b63\u3067\u3059\u3002
errors.E013=\u73fe\u5728\u306e\u30dd\u30a4\u30f3\u30c8\u6570\u3088\u308a\u30dd\u30a4\u30f3\u30c8\u6d88\u8cbb\u6570\u304c\u5927\u304d\u3044\u3067\u3059\u3002 errors.E013=\u73fe\u5728\u306e\u30dd\u30a4\u30f3\u30c8\u6570\u3088\u308a\u30dd\u30a4\u30f3\u30c8\u6d88\u8cbb\u6570\u304c\u5927\u304d\u3044\u3067\u3059\u3002
errors.E014=\u65e2\u306b\u767b\u9332\u6e08\u307f\u306eE-mail\u3067\u3059\u3002 errors.E014=\u65e2\u306b\u767b\u9332\u6e08\u307f\u306eE-mail(\u30e1\u30a4\u30f3)\u3067\u3059\u3002
errors.E015=\u65e2\u306b\u767b\u9332\u6e08\u307f\u306eE-mail(\u30b5\u30d6)\u3067\u3059\u3002 errors.E015=\u65e2\u306b\u767b\u9332\u6e08\u307f\u306eE-mail(\u30b5\u30d6)\u3067\u3059\u3002
errors.E016=\u65e2\u306b\u767b\u9332\u6e08\u307f\u306e\u30ed\u30b0\u30a4\u30f3ID\u3067\u3059\u3002 errors.E016=\u65e2\u306b\u767b\u9332\u6e08\u307f\u306e\u30ed\u30b0\u30a4\u30f3ID\u3067\u3059\u3002
errors.E017=\u65e5\u5225\u306e\u691c\u7d22\u306f\u671f\u9593(from)\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 errors.E017=\u65e5\u5225\u306e\u691c\u7d22\u306f\u671f\u9593(from)\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
...@@ -112,7 +112,7 @@ errors.E067=ICHICO\u30dd\u30a4\u30f3\u30c8\u4f1a\u54e1\u756a\u53f7\u3092\u5165\u ...@@ -112,7 +112,7 @@ errors.E067=ICHICO\u30dd\u30a4\u30f3\u30c8\u4f1a\u54e1\u756a\u53f7\u3092\u5165\u
errors.E068=ICHICO\u30dd\u30a4\u30f3\u30c8\u4f1a\u54e1\u756a\u53f7\u306f\u534a\u89d2\u6570\u5b57\u3067\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 errors.E068=ICHICO\u30dd\u30a4\u30f3\u30c8\u4f1a\u54e1\u756a\u53f7\u306f\u534a\u89d2\u6570\u5b57\u3067\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
errors.E069=ICHICO\u30dd\u30a4\u30f3\u30c8\u4f1a\u54e1\u756a\u53f7\u306f8\u6841\u3067\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 errors.E069=ICHICO\u30dd\u30a4\u30f3\u30c8\u4f1a\u54e1\u756a\u53f7\u306f8\u6841\u3067\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002
errors.E070=\u5f53\u6708\u306f\u65e2\u306b\u7533\u8acb\u6e08\u307f\u3067\u3059\u3002 errors.E070=\u5f53\u6708\u306f\u65e2\u306b\u7533\u8acb\u6e08\u307f\u3067\u3059\u3002
errors.E071=E-mail(\u30e1\u30a4\u30f3)\u3068E-mail(\u30b5\u30d6)\u304c\u91cd\u8907\u3067\u3059\u3002 errors.E071=E-mail(\u30e1\u30a4\u30f3)\u307e\u305f\u306fE-mail(\u30b5\u30d6)\u304c\u91cd\u8907\u3057\u3066\u307e\u3059\u3002
#\u30b7\u30b9\u30c6\u30e0 #\u30b7\u30b9\u30c6\u30e0
errors.S000=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002 errors.S000=\u30b7\u30b9\u30c6\u30e0\u30a8\u30e9\u30fc\u304c\u767a\u751f\u3057\u307e\u3057\u305f\u3002
......
#set($title = "アンケート") #set($title = "アンケート")
<!-- preHeader --> <!-- preHeader -->
#parse( "/WEB-INF/view/common/preHeader_mb.vm" ) #parse( "/WEB-INF/view/common/preHeader_mb.vm" )
<script language="javascript" type="text/javascript" charset="utf-8">
<!--
function reInput() {
location.href = "/em/user/enquete/reInput/";
}
//-->
</script>
<body style="font-family: monospace; width: 240px; border: 2px solid black;"> <body style="font-family: monospace; width: 240px; border: 2px solid black;">
<!--ヘッダー--> <!--ヘッダー-->
<div align="left" style="background-color:white;margin-bottom:2px"><img src="/em/images/mb_pubHead.gif"/></div> <div align="left" style="background-color:white;margin-bottom:2px"><img src="/em/images/mb_pubHead.gif"/></div>
...@@ -31,7 +38,7 @@ Public Comment ...@@ -31,7 +38,7 @@ Public Comment
<br><input value="意見を送信する" type="submit"> <br><input value="意見を送信する" type="submit">
<br> <br>
<br><input type="button" value="戻る" onclick="history.back();" /> <br><input type="button" value="戻る" onclick="reInput();return false;" />
<hr size="1"> <hr size="1">
#if($enqueteForm.enquete.footer) #if($enqueteForm.enquete.footer)
......
#set($title = "アンケート") #set($title = "アンケート")
<!-- preHeader --> <!-- preHeader -->
#parse( "/WEB-INF/view/common/preHeader_mb.vm" ) #parse( "/WEB-INF/view/common/preHeader_mb.vm" )
<script language="javascript" type="text/javascript" charset="utf-8">
<!--
function reInput() {
location.href = "/em/user/enquete/reInput/";
}
//-->
</script>
<body style="font-family: monospace; width: 240px; border: 2px solid black;"> <body style="font-family: monospace; width: 240px; border: 2px solid black;">
<!--ヘッダー--> <!--ヘッダー-->
<div align="left" style="background-color:white;margin-bottom:2px"><img src="/em/images/mb_pubHead.gif"/></div> <div align="left" style="background-color:white;margin-bottom:2px"><img src="/em/images/mb_pubHead.gif"/></div>
...@@ -27,7 +34,7 @@ ...@@ -27,7 +34,7 @@
<br><input value="内容を確認して送信する" type="submit"> <br><input value="内容を確認して送信する" type="submit">
<br> <br>
<br><input type="button" value="戻る" onclick="history.back();" /> <br><input type="button" value="戻る" onclick="reInput();return false;" />
<hr size="1"> <hr size="1">
#if($enqueteForm.enquete.footer) #if($enqueteForm.enquete.footer)
......
#set($title = "アンケート回答確認画面") #set($title = "アンケート回答確認画面")
<!-- preHeader --> <!-- preHeader -->
#parse( "/WEB-INF/view/common/preHeader_sp.vm" ) #parse( "/WEB-INF/view/common/preHeader_sp.vm" )
<script language="javascript" type="text/javascript" charset="utf-8">
<!--
function reInput() {
location.href = "/em/user/enquete/reInput/";
}
//-->
</script>
<body> <body>
<div data-role="page" id="enqueteConfirm" data-theme="f"> <div data-role="page" id="enqueteConfirm" data-theme="f">
<!--ヘッダー--> <!--ヘッダー-->
...@@ -33,7 +39,7 @@ ...@@ -33,7 +39,7 @@
#parse( "/WEB-INF/view/common/enqueteConfirm_sp.vm" ) #parse( "/WEB-INF/view/common/enqueteConfirm_sp.vm" )
<br><input value="意見を送信する" type="submit"> <br><input value="意見を送信する" type="submit">
<br><input type="button" value="戻る" onclick="history.back();" /> <br><input type="button" value="戻る" onclick="reInput();return false;" />
<hr> <hr>
#if($enqueteForm.enquete.footer) #if($enqueteForm.enquete.footer)
#if($enqueteForm.enquete.footer != "") #if($enqueteForm.enquete.footer != "")
......
#set($title = "アンケート回答確認画面") #set($title = "アンケート回答確認画面")
<!-- preHeader --> <!-- preHeader -->
#parse( "/WEB-INF/view/common/preHeader_sp.vm" ) #parse( "/WEB-INF/view/common/preHeader_sp.vm" )
<script language="javascript" type="text/javascript" charset="utf-8">
<!--
function reInput() {
location.href = "/em/user/enquete/reInput/";
}
//-->
</script>
<body> <body>
<div data-role="page" id="enqueteConfirm" data-theme="f"> <div data-role="page" id="enqueteConfirm" data-theme="f">
<!--ヘッダー--> <!--ヘッダー-->
...@@ -33,7 +39,7 @@ ...@@ -33,7 +39,7 @@
#parse( "/WEB-INF/view/common/enqueteConfirm_sp.vm" ) #parse( "/WEB-INF/view/common/enqueteConfirm_sp.vm" )
<br><input value="内容を確認して送信する" type="submit"> <br><input value="内容を確認して送信する" type="submit">
<br><input type="button" value="戻る" onclick="history.back();" /> <br><input type="button" value="戻る" onclick="reInput();return false;" />
<hr> <hr>
#if($enqueteForm.enquete.footer) #if($enqueteForm.enquete.footer)
......
...@@ -192,7 +192,9 @@ $!enqueteForm.enquete.header ...@@ -192,7 +192,9 @@ $!enqueteForm.enquete.header
<table width="800" cellspacing="0" cellpadding="0" border="0"> <table width="800" cellspacing="0" cellpadding="0" border="0">
<tr> <tr>
<td class="text12px" align="center" valign="top"> <td class="text12px" align="center" valign="top">
<input type="button" value="戻る" onclick="history.back()"> <a class="btn_return" href="/em/user/enquete/reInput/">
<input type="button" value="戻る" />
</a>
</td> </td>
</tr> </tr>
</table> </table>
......
...@@ -214,7 +214,9 @@ $!enqueteForm.enquete.header ...@@ -214,7 +214,9 @@ $!enqueteForm.enquete.header
<table width="800" cellspacing="0" cellpadding="0" border="0"> <table width="800" cellspacing="0" cellpadding="0" border="0">
<tr> <tr>
<td class="text12px" align="center" valign="top"> <td class="text12px" align="center" valign="top">
<input type="button" value="戻る" onclick="history.back();" /> <a class="btn_return" href="/em/user/enquete/reInput/">
<input type="button" value="戻る" />
</a>
</td> </td>
</tr> </tr>
</table> </table>
......
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
#elseif($!question.controlId == "5") #elseif($!question.controlId == "5")
#set($dateIndex = $dateIndex+1) #set($dateIndex = $dateIndex+1)
<input name="$answerValue" id="enqStartFrom${dateIndex}" type="text" class="w100 mgl10 #he($!question.questionId)" value="$!escape.html($!answer.answerValue)" #if($!question.questionInitDisable == "1") disabled #end> <input name="$answerValue" id="enqStartFrom${dateIndex}" type="text" class="w100 mgl10 #he($!question.questionId)" value="$!escape.html($!answer.answerValue)" #if($!question.questionInitDisable == "1") disabled #end>
<div style="display: none;"><img id="enqFrom${dateIndex}" src="/em/images/icon_cal.gif" style="padding-left:5px;padding-right:5px; vertical-align: middle;" #if($!question.questionInitDisable == '1') display: none; #end"></div> <div style="display: none;"><img id="enqFrom${dateIndex}" src="/em/images/icon_cal.gif" style="padding-left:5px;padding-right:5px; vertical-align: middle; #if($!question.questionInitDisable == '1') display: none; #end"></div>
<input type="hidden" name="$answerIdValueName" value="$!answer.answerId" /> <input type="hidden" name="$answerIdValueName" value="$!answer.answerId" />
#elseif($!question.controlId == "6") #elseif($!question.controlId == "6")
<select name="$answerIdValueName" id="#he($!question.questionId)" #if($!question.questionInitDisable == "1") disabled #end> <select name="$answerIdValueName" id="#he($!question.questionId)" #if($!question.questionInitDisable == "1") disabled #end>
......
...@@ -150,8 +150,9 @@ $!enqueteForm.enquete.header ...@@ -150,8 +150,9 @@ $!enqueteForm.enquete.header
<!-- 0:RADIO インデクスを値にする。 --> <!-- 0:RADIO インデクスを値にする。 -->
#if($!question.controlId == "0") #if($!question.controlId == "0")
##if($!answer.freeTextFlg != "1" && $!answer.freeTextFlg != "2") ##if($!answer.freeTextFlg != "1" && $!answer.freeTextFlg != "2")
<input type="radio" class="#he($!question.questionId)" id="#he($!answer.answerId)" name="$!answerIdValueRadioName" value="$velocityCount" #if($!answer.answerIdValue == $velocityCount.toString() && $enqueteForm.initCount =="2") checked #{end} <input type="radio" class="#he($!question.questionId)" id="#he($!answer.answerId)" name="$!answerIdValueRadioName" value="$velocityCount" #if($!answer.answerIdValue == $velocityCount.toString() && $enqueteForm.initCount =="2") checked #end
#if($!answer.defaultFlg == 1 && $enqueteForm.initCount =="1") checked #end #if($!answer.defaultFlg == 1 && $enqueteForm.initCount =="1") checked #end
#if($!question.questionInitDisable == "1") disabled #end
> $!escape.html($!answer.answer) > $!escape.html($!answer.answer)
##end ##end
...@@ -181,7 +182,7 @@ $!enqueteForm.enquete.header ...@@ -181,7 +182,7 @@ $!enqueteForm.enquete.header
#elseif($!question.controlId == "5") #elseif($!question.controlId == "5")
#set($dateIndex = $dateIndex+1) #set($dateIndex = $dateIndex+1)
<input name="$answerValue" id="enqStartFrom${dateIndex}" type="text" class="w100 mgl10 #he($!question.questionId)" value="$!escape.html($!answer.answerValue)" #if($!question.questionInitDisable == "1") disabled #end> <input name="$answerValue" id="enqStartFrom${dateIndex}" type="text" class="w100 mgl10 #he($!question.questionId)" value="$!escape.html($!answer.answerValue)" #if($!question.questionInitDisable == "1") disabled #end>
<div style="display: none;"><img id="enqFrom${dateIndex}" src="/em/images/icon_cal.gif" style="padding-left:5px;padding-right:5px; vertical-align: middle;" #if($!question.questionInitDisable == '1') display: none; #end"></div> <div style="display: none;"><img id="enqFrom${dateIndex}" src="/em/images/icon_cal.gif" style="padding-left:5px;padding-right:5px; vertical-align: middle; #if($!question.questionInitDisable == '1') display: none; #end"></div>
<input type="hidden" name="$answerIdValueName" value="$!answer.answerId" /> <input type="hidden" name="$answerIdValueName" value="$!answer.answerId" />
#elseif($!question.controlId == "6") #elseif($!question.controlId == "6")
<select name="$answerIdValueName" id="#he($!question.questionId)" #if($!question.questionInitDisable == "1") disabled #end> <select name="$answerIdValueName" id="#he($!question.questionId)" #if($!question.questionInitDisable == "1") disabled #end>
......
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