diff --git a/BO/Views/cm/cmreg.cshtml b/BO/Views/cm/cmreg.cshtml
index 3f19f4f..7ec0ea0 100644
--- a/BO/Views/cm/cmreg.cshtml
+++ b/BO/Views/cm/cmreg.cshtml
@@ -100,6 +100,10 @@
@Html.Partial("./Partial/Radio", Model.CM.cshape, new ViewDataDictionary() { { "valuetext", "0:온라인;1:교육장;2:온라인 혼합" }, { "checked", Model.CM.cshape }, { "name", "CM.cshape" } })
+
@@ -358,13 +362,19 @@
if ('@(Model.CM.ismaster)' == '0') {
$("#pcgno,#CM_cgno").hide();
}
+
if ($("input[name='CM.cshape']:checked").val() != '0') {
+ $(".isaccommodation").show();
+ }
+ else {
+ $(".isaccommodation").hide();
+ }
+ if ($("input[name='CM.isaccommodation']:checked").val() != '0') {
$("#spnaccommofee").show();
}
else {
$("#spnaccommofee").hide();
}
-
if ($("input[name='CM.cshape']:checked").val() == '1') {
$("#alldays").prop("disabled", true);
}
@@ -383,10 +393,11 @@
}
$("input[name='CM.cshape']").on("change", function () {
if ($(this).val() == "0") {
- $("#spnaccommofee").hide();
+ $(".isaccommodation").hide();
+ $("input:radio[name='CM.isaccommodation']:radio[value='0']").click();
}
else {
- $("#spnaccommofee").show();
+ $(".isaccommodation").show();
}
if ($(this).val() == "1") {
@@ -396,6 +407,15 @@
$("#alldays").prop("disabled", false);
}
});
+ $("input[name='CM.isaccommodation']").on("click", function () {
+ if ($(this).val() == "0") {
+ $("#spnaccommofee").hide();
+ $("#CM_accommofee").val("");
+ }
+ else {
+ $("#spnaccommofee").show();
+ }
+ });
loadlegal($("#pcgno").val());
$("#alldays").on("click", function () {
diff --git a/Model/CM.cs b/Model/CM.cs
index 37ae46a..5a4dd07 100644
--- a/Model/CM.cs
+++ b/Model/CM.cs
@@ -64,14 +64,14 @@ namespace NP.Model
///
/// 강좌/과정키, 패키지강좌의 강좌키
///
- public int cmno {get;set;}
+ public int cmno { get; set; }
public String cmnos { get; set; }
public int orgcmno { get; set; }
///
/// 과정여부 0:강좌,1:과정,2:패키지
///
- public int ismaster {get;set;}
+ public int ismaster { get; set; }
public String ismastername
{
get
@@ -82,19 +82,19 @@ namespace NP.Model
///
/// fkcmcg 과정분류 CG.CGNo
///
- public int cgno {get;set;}
+ public int cgno { get; set; }
public String cgname { get; set; }
public int pcgno { get; set; }
public String pcgname { get; set; }
///
/// fkcmcm 과정키 cm.cmno
///
- public int? pcmno {get;set;}
+ public int? pcmno { get; set; }
public String pcname { get; set; }
///
/// 100 과정명
///
- public String cname {get;set;}
+ public String cname { get; set; }
///
/// 100 키워드
///
@@ -102,7 +102,7 @@ namespace NP.Model
///
/// fkcmterm 기수키 term.tmno
///
- public int? tmno {get;set;}
+ public int? tmno { get; set; }
///
/// 기수년도
///
@@ -121,7 +121,7 @@ namespace NP.Model
///
/// 반
///
- public int? classno {get;set;}
+ public int? classno { get; set; }
public String cnameclassno
{
get
@@ -133,11 +133,11 @@ namespace NP.Model
///
/// 신청시작
///
- public DateTime? rstime {get;set;}
+ public DateTime? rstime { get; set; }
///
/// 신청종료
///
- public DateTime? retime {get;set;}
+ public DateTime? retime { get; set; }
public int isnewcm
{
get
@@ -156,7 +156,7 @@ namespace NP.Model
{
get
{
- return retimeymd == "2099-12-31" ? string.Format("상시 ({0}일)", rsretimeToDay ) : rstime == null && retime == null ? "" : string.Format("{0} ~ {1}", rstime == null ? "" : rstime.Value.ToString("yyyy-MM-dd"), retime == null ? "" : retime.Value.ToString("yyyy-MM-dd"));
+ return retimeymd == "2099-12-31" ? string.Format("상시 ({0}일)", rsretimeToDay) : rstime == null && retime == null ? "" : string.Format("{0} ~ {1}", rstime == null ? "" : rstime.Value.ToString("yyyy-MM-dd"), retime == null ? "" : retime.Value.ToString("yyyy-MM-dd"));
}
}
@@ -164,7 +164,7 @@ namespace NP.Model
{
get
{
- return rstime == null && retime == null ? "" : string.Format("{0}", Convert.ToDateTime(retime).DayOfYear - Convert.ToDateTime(rstime).DayOfYear);
+ return rstime == null && retime == null ? "" : string.Format("{0}", Convert.ToDateTime(retime).DayOfYear - Convert.ToDateTime(rstime).DayOfYear);
}
}
public int isrequesting {
@@ -175,7 +175,7 @@ namespace NP.Model
///
/// 학습시작
///
- public DateTime? sstime {get;set;}
+ public DateTime? sstime { get; set; }
public String sstimeymd
{
get
@@ -194,7 +194,7 @@ namespace NP.Model
{
get
{
- return sstime == null && setime == null ? studydays+"일" : string.Format("{0} ~ {1}", sstime == null ? "" : sstime.Value.ToString("yyyy-MM-dd"), setime == null ? "" : setime.Value.ToString("yyyy-MM-dd"));
+ return sstime == null && setime == null ? studydays + "일" : string.Format("{0} ~ {1}", sstime == null ? "" : sstime.Value.ToString("yyyy-MM-dd"), setime == null ? "" : setime.Value.ToString("yyyy-MM-dd"));
}
}
public String ssretimeToDay
@@ -208,7 +208,7 @@ namespace NP.Model
///
/// 학습종료
///
- public DateTime? setime {get;set;}
+ public DateTime? setime { get; set; }
public String setimeymd
{
get
@@ -262,11 +262,11 @@ namespace NP.Model
///
/// 성적처리시작
///
- public DateTime? gstime {get;set;}
+ public DateTime? gstime { get; set; }
///
/// 성적처리종료
///
- public DateTime? getime {get;set;}
+ public DateTime? getime { get; set; }
public String getimeymd
{
get
@@ -277,7 +277,7 @@ namespace NP.Model
///
/// 강의유형 0: 온라인, 1: 교육장, 2: 혼합(온+오프)
///
- public int cshape {get;set;}
+ public int cshape { get; set; }
public String cshapename
{
get
@@ -288,11 +288,11 @@ namespace NP.Model
///
/// 회원수강료
///
- public int infee {get;set;}
+ public int infee { get; set; }
///
/// 비회원수강료
///
- public int outfee {get;set;}
+ public int outfee { get; set; }
///
/// 합숙비용
///
@@ -301,7 +301,7 @@ namespace NP.Model
///
/// 정원 0: 제한없음
///
- public int quota {get;set;}
+ public int quota { get; set; }
public String quotastr
{
get
@@ -312,19 +312,19 @@ namespace NP.Model
///
/// 과정소개/패키지메모 에디터
///
- public String introhtml {get;set;}
+ public String introhtml { get; set; }
///
/// 학습대상 에디터
///
- public String targethtml {get;set;}
+ public String targethtml { get; set; }
///
/// 학습목표 에디터
///
- public String goalhtml {get;set;}
+ public String goalhtml { get; set; }
///
/// 학습내용 에디터
///
- public String contenthtml {get;set;}
+ public String contenthtml { get; set; }
///
/// 200 학습장소 오프라인강좌전용 comcode.cgroup=studyplace
///
@@ -333,28 +333,28 @@ namespace NP.Model
///
/// 학습시간 단위: Hour
///
- public float studytime {get;set;}
+ public float studytime { get; set; }
///
/// fkcmcc 자격증 ComCode.CGroup=Cert
///
- public int? certcc {get;set;}
+ public int? certcc { get; set; }
///
/// fkcmcc2 급수 ComCode.CGroup=CertGrade
///
- public int? certgradecc {get;set;}
+ public int? certgradecc { get; set; }
public String certgradeccname { get; set; }
///
/// 100 추천직무 ComCode.CGroup=Job, 콤마로분리
///
- public String jobcc {get;set;}
+ public String jobcc { get; set; }
///
/// 추천직급 0:사원,1:대리급,2:과장급
///
- public String jobpositiongrade {get;set;}
+ public String jobpositiongrade { get; set; }
///
/// 난이도 0:입문,1:기초,2:초급,3:중급
///
- public int? difficulty {get;set;}
+ public int? difficulty { get; set; }
public String difficultyname
{
get
@@ -365,7 +365,7 @@ namespace NP.Model
///
/// 환급여부 0:환급아님,1:환급
///
- public int isrefund {get;set;}
+ public int isrefund { get; set; }
///
/// 순차학습방식 여부
///
@@ -388,7 +388,7 @@ namespace NP.Model
///
/// 회원가 패키지생성시점
///
- public int orginfee { get; set; }
+ public int orginfee { get; set; }
///
/// 비회원가 패키지생성시점
///
@@ -401,7 +401,7 @@ namespace NP.Model
public int countlect { get; set; }
public int lectstatus { get; set; }
public int countstandby { get; set; }
-
+
public int countcomplete { get; set; }
public int countnoresult { get; set; }
public int isjoin { get; set; }
@@ -415,7 +415,7 @@ namespace NP.Model
{
get
{
- return string.IsNullOrEmpty(tasteurl) ? isbig == 1 ? "/img/online/fair_sample01.jpg" : "/img/main/main_edu_thumb02.jpg" : (NP.Model.Base.Files+ tasteurl);
+ return string.IsNullOrEmpty(tasteurl) ? isbig == 1 ? "/img/online/fair_sample01.jpg" : "/img/main/main_edu_thumb02.jpg" : (NP.Model.Base.Files + tasteurl);
}
}
public Int64 cmino { get; set; }
@@ -485,6 +485,10 @@ namespace NP.Model
public String username { get; set; }
public Int64 lectnocheck { get; set; }
public int ischkatt { get; set; }
+ ///
+ /// 합숙여부
+ ///
+ public int isaccommodation { get; set;}
}
[Serializable]