diff --git a/BO/Views/cm/qs.cshtml b/BO/Views/cm/qs.cshtml index 8803a66..b3e13b2 100644 --- a/BO/Views/cm/qs.cshtml +++ b/BO/Views/cm/qs.cshtml @@ -235,11 +235,12 @@ else if (capResult.code == 123) { var es = capResult.msg.split(';'); msg2("존재하지 않는 문제유형코드가 있습니다. 확인후 다시 업로드해주세요.
" + - (es[0] != "" ? ("분류1: " + es[0] + "
") : "") + - (es[1] != "" ? ("분류2: " + es[1] + "
") : "") + - (es[2] != "" ? ("분류3: " + es[2] + "
") : "") + - (es[3] != "" ? ("분류4: " + es[3] + "
") : "") + - (es[4] != "" ? ("분류5: " + es[4]) : "")); + (es[0] != "" ? ("난이도: " + es[0] + "
") : "") + + (es[1] != "" ? ("분류1: " + es[1] + "
") : "") + + (es[2] != "" ? ("분류2: " + es[2] + "
") : "") + + (es[3] != "" ? ("분류3: " + es[3] + "
") : "") + + (es[4] != "" ? ("분류4: " + es[4] + "
") : "") + + (es[5] != "" ? ("분류5: " + es[5]) : "")); } else { console.log(capResult.msg); diff --git a/Base/Controller/ACommon.cs b/Base/Controller/ACommon.cs index 8b305fc..60b5b0d 100644 --- a/Base/Controller/ACommon.cs +++ b/Base/Controller/ACommon.cs @@ -1257,7 +1257,13 @@ namespace NP.Base.Controllers String eQP3 = ""; String eQP4 = ""; String eQP5 = ""; - foreach (var qd in qds) { if (cc.Where(w => w.cgroup == "ccdiff" && w.cname == qd.Trim()).Count() < 1) { eQD += ", " + qd; } } + foreach (var qd in qds) + { + if (cc.Where(w => w.cgroup == "ccdiff" && w.cname == qd.Trim()).Count() < 1) + { + eQD += ", " + qd; + } + } foreach (var qp in qp1) { if (cc.Where(w => w.cgroup == "cc1" && w.cname == qp.Trim()).Count() < 1) { eQP1 += ", " + qp; } } foreach (var qp in qp2) { if (cc.Where(w => w.cgroup == "cc2" && w.cname == qp.Trim()).Count() < 1) { eQP2 += ", " + qp; } } foreach (var qp in qp3) { if (cc.Where(w => w.cgroup == "cc3" && w.cname == qp.Trim()).Count() < 1) { eQP3 += ", " + qp; } } @@ -1269,9 +1275,9 @@ namespace NP.Base.Controllers eQP3 = eQP3 != "" ? eQP3.Substring(2) : eQP3; eQP4 = eQP4 != "" ? eQP4.Substring(2) : eQP4; eQP5 = eQP5 != "" ? eQP5.Substring(2) : eQP5; - if (eQP1 != "" || eQP2 != "" || eQP3 != "" || eQP4 != "" || eQP5 != "") + if (eQD != "" || eQP1 != "" || eQP2 != "" || eQP3 != "" || eQP4 != "" || eQP5 != "") { - return JsonBack(new JsonRtn() { code = 123, msg = /*eQD + ";" + */ eQP1 + ";" + eQP2 + ";" + eQP3 + ";" + eQP4 + ";" + eQP5 }); + return JsonBack(new JsonRtn() { code = 123, msg = eQD + ";" + eQP1 + ";" + eQP2 + ";" + eQP3 + ";" + eQP4 + ";" + eQP5 }); } else {