From 7663e1aa7b337ab3523dcc8b6ee8ac829ee3ea6e Mon Sep 17 00:00:00 2001 From: ljs0531 Date: Tue, 20 Dec 2022 03:43:04 +0000 Subject: [PATCH] =?UTF-8?q?<=EC=B6=94=EA=B0=80=EA=B0=9C=EB=B0=9C>=20=20(?= =?UTF-8?q?=EC=A3=BC=EC=9A=94)=EC=9E=91=EC=97=85=EB=82=B4=EC=9A=A9=20BO/Vi?= =?UTF-8?q?ews/croom/payview.cshtml=20=EA=B2=B0=EC=9E=AC=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=20=EC=9D=BC=EC=A0=95=20cshape=20=EC=A1=B0=EA=B1=B4=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20Dao/MyBatis/Maps/CM.xml=20=EA=B5=90=EC=9C=A1?= =?UTF-8?q?=EC=A2=85=EB=A3=8C=EC=9D=BC=20-4=20=EA=B8=B0=EC=A4=80=20?= =?UTF-8?q?=EB=BA=8C=20FO/Views/Course/ApplyEdu.cshtml=20FO/Views/Shared/P?= =?UTF-8?q?artial/Select.cshtml=20=EC=9D=B4=EB=A9=94=EC=9D=BC=20=EC=84=A0?= =?UTF-8?q?=ED=83=9D=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80=20FO/Views/?= =?UTF-8?q?Course/ApplyPay.cshtml=20=EB=AC=B8=EA=B5=AC=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BO/Views/croom/payview.cshtml | 2 +- Dao/MyBatis/Maps/CM.xml | 2 +- FO/Views/Course/ApplyEdu.cshtml | 6 ++ FO/Views/Course/ApplyPay.cshtml | 7 +- FO/Views/Shared/Partial/Select.cshtml | 145 ++++++++++++++++++++++++++ 5 files changed, 157 insertions(+), 5 deletions(-) create mode 100644 FO/Views/Shared/Partial/Select.cshtml diff --git a/BO/Views/croom/payview.cshtml b/BO/Views/croom/payview.cshtml index 5dac144..bcbbe11 100644 --- a/BO/Views/croom/payview.cshtml +++ b/BO/Views/croom/payview.cshtml @@ -321,7 +321,7 @@ 수정
- if (Model.Lect.cshape == 2) + if (Model.Lect.cshape == 2 || Model.Lect.cshape == 1) {
교육일정
diff --git a/Dao/MyBatis/Maps/CM.xml b/Dao/MyBatis/Maps/CM.xml index c3153ee..e5327d6 100644 --- a/Dao/MyBatis/Maps/CM.xml +++ b/Dao/MyBatis/Maps/CM.xml @@ -1925,7 +1925,7 @@ ,a.remainPeople ,a.isselected - ,case when a.estart < date_add(date_add(date_format(now() ,'%Y-%m-%d 00:00:00'),interval 3 day ),interval -1 second) + ,case when a.estart < date_format(now() ,'%Y-%m-%d 00:00:00') then 0 else 1 end isend diff --git a/FO/Views/Course/ApplyEdu.cshtml b/FO/Views/Course/ApplyEdu.cshtml index ed60629..9c940ef 100644 --- a/FO/Views/Course/ApplyEdu.cshtml +++ b/FO/Views/Course/ApplyEdu.cshtml @@ -263,6 +263,7 @@
  • @Html.TextBoxFor(x => x.Assign.taxemail1, new { @maxlength = "100" })
  • @Html.TextBoxFor(x => x.Assign.taxemail2, new { @maxlength = "30" })
  • + @Html.Partial("./Partial/Select",null,new ViewDataDictionary { { "special","email"},{ "name","taxemail3"},{"df",":직접입력" },{"onchange","emailchange()" } }) @@ -736,5 +737,10 @@ } return; } + function emailchange() { + if ($("#taxemail3").val() != "") { + $("#Assign_taxemail2").val($("#taxemail3").val()); + } + } diff --git a/FO/Views/Course/ApplyPay.cshtml b/FO/Views/Course/ApplyPay.cshtml index 51474a4..fb5c787 100644 --- a/FO/Views/Course/ApplyPay.cshtml +++ b/FO/Views/Course/ApplyPay.cshtml @@ -102,8 +102,8 @@

    ■ 카드결제 시
    - 반드시 소속 회사의 법인카드로 결제 해 주세요. (개인카드 결제 시 환급불가)
    - - 카드결제 후 결제한 카드 앞면을 복사하여 입교 시 지참해 주세요.
    - ※ 결제 한 카드가 법인명의라는 것을 노동부에 증빙하기 위하여 필요한 서류 이며 회사 명이 잘 보이도록 앞면 만 복사하시면 됩니다.

    + - 법인카드결제 후 결제한 법인카드 앞면을 복사하여 입교 시 지참해 주세요.
    + ※ 결제 한 법인카드가 법인명의라는 것을 증빙하기 위하여 노동부에서 요청하는 서류 이며 회사 명이 잘 보이도록 앞면 만 복사하시면 됩니다.

    ■ 무통장입금 시
    @@ -155,7 +155,8 @@

    diff --git a/FO/Views/Shared/Partial/Select.cshtml b/FO/Views/Shared/Partial/Select.cshtml new file mode 100644 index 0000000..593f903 --- /dev/null +++ b/FO/Views/Shared/Partial/Select.cshtml @@ -0,0 +1,145 @@ +@model dynamic +@{ + var selected = (ViewData["selected"] ?? "").ToString(); + var name = (ViewData["name"] ?? "").ToString(); + var id = (ViewData["name"] ?? "").ToString().Replace(".", "_"); + var df = (ViewData["df"] ?? "").ToString(); + var cssclass = (ViewData["class"] ?? "").ToString(); + var onchange = (ViewData["onchange"] ?? "").ToString(); + var special = (ViewData["special"] ?? "").ToString(); + var start = Convert.ToInt32((ViewData["start"] ?? "0").ToString()); + var end = Convert.ToInt32((ViewData["end"] ?? "0").ToString()); + var textadd = (ViewData["textadd"] ?? "").ToString(); + var disabled = (ViewData["disabled"] ?? "").ToString() == "" ? "" : "disabled"; + var valuetext = (ViewData["valuetext"] ?? "").ToString() == "" ? new string[] { } : (ViewData["valuetext"] ?? "").ToString().Split(';'); + var style = (ViewData["style"] ?? "").ToString(); + var formgroupstyle = (ViewData["formgroupstyle"] ?? "").ToString(); +} +@if (name == "PageRowCount") +{ + var rc = (int)Model; + @:전체: @rc.ToString("#,0") 건 + +} +else if (special.ToLower() == "fromto") +{ + +} +else if (special == "fromtodesc") +{ + +} +else if (special == "Hour") +{ + +} +else if (special == "Minute") +{ + +} +else if (special == "reg" || name == "SearchType") +{ + +} +else if (special == "email") +{ + +} +else if (valuetext.Length > 0) +{ + +} +else +{ +
    + +
    +} \ No newline at end of file