KimHanJin
/
YNICTE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This commit is contained in:
kdh0120 2021-06-03 01:43:16 +00:00
parent 802a278457
commit b7156f1494
23 changed files with 56 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BO/Controllers/dataController.cs
View File

@ -164,9 +164,9 @@ namespace NP.BO.Controllers
vm.CGs = Dao.Get<CG>("cm.cgs", new System.Collections.Hashtable() { { "isuse", 1 }, { "isdel", 0 } });
vm.Terms = Dao.Get<Term>("cm.term.ys", new System.Collections.Hashtable() { });
vm.stringval = vm.stringval ?? DateTime.Now.Year.ToString();
if (vm.tabidx == 0) { vm.tabidx = 6; }
if (vm.tabidx == 0)
{
vm.Datas = Dao.Get<Data>("cm.data.lect.byc", new System.Collections.Hashtable() {
{ "year" + vm.stringval2 == null ? "" : "x", vm.stringval }, { "tmno", vm.stringval2 }, { "cshape", 0 }, { "pcgno", vm.stringval4 }, { "cgno", vm.stringval5 }
});

2
BO/Views/cm/cmreginning.cshtml
View File

@ -262,7 +262,7 @@
capp("/acommon/cminningsave", { cmino: _cmino, cmno: @Model.CM.cmno, isonline: getrv("isonline"), ititle: getv("ititle"), ctno: $("#contentdatabox li").attr("data-no"), istaste: getrv("istaste"), sttime: getint(val("sttime")), atime: getint(val("atime")), mstime: getint(val("mstime")), metime: getint(val("metime")), userno: val("userno"), iseq: val("iseq") }, "cbcminningsave", null, null,null,true);
} else {
if (@Model.CM.cshape == 2) {
msg2("온라인 혼합 교육시 교육장 회차는 등록 할 수 없습니다.");
msg2("온라인 교육시 교육장 회차는 등록 할 수 없습니다.");
return;
}
var data = new FormData();

3
BO/Views/cm/cms.cshtml
View File

@ -54,7 +54,8 @@
<th>교육유형</th>
<td>
<div class="col-md-12">
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "0:온라인;1:교육장;2:온라인 혼합" }, { "name", "stringval3" }, { "selected", Model.stringval3 }, { "style", "width: 100%" }, { "df", ":-유형선택" } })
@*@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "0:온라인;1:교육장;2:온라인 혼합" }, { "name", "stringval3" }, { "selected", Model.stringval3 }, { "style", "width: 100%" }, { "df", ":-유형선택" } })*@
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "1:교육장교육;2:온라인교육" }, { "name", "stringval3" }, { "selected", Model.stringval3 }, { "style", "width: 100%" }, { "df", ":-유형선택" } })
</div>
</td>
</tr>

5
BO/Views/croom/encourageset.cshtml
View File

@ -21,11 +21,12 @@
</tr>
</thead>
<tbody class="data" id="tbody1">
@for (var i = 0; i < 9; i++)
@*@for (var i = 0; i < 9; i++)*@
@for (var i = 0; i < 8; i++)
{
var scdlect = Model.SCDLects.Where(w => w.scdno == i + 1).FirstOrDefault() ?? new NP.Model.SCDLect();
<tr data-no="@(i + 1)">
<td>작업@(i+1). @(i == 7 ? "교육장" : i == 8 ? "자격검정" : "온라인 혼합")</td>
<td>작업@(i+1). @(i == 7 ? "교육장" : i == 8 ? "자격검정" : "온라인교육")</td>
<td>@(i < 2 || i > 6 ? "출석" : i == 2 ? "진행평가" : i == 3 ? "최종평가" : i == 4 ? "과제" : i == 5 ? "토론" : i == 6 ? "강의평가" : "-")</td>
<td>@(i < 2 ? "진도율 80% 미만" : i == 2 || i == 3 ? "미응시자 대상" : i == 4 || i == 5 ? "미제출자 대상" : i == 6 ? "미참여자 대상" : i == 7 ? "교육일" : i == 8 ? "시험일" : "")</td>
<td class="dday">@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "special", "fromto" }, { "start", 1 }, { "end", 10 }, { "name", "dday" }, { "selected", scdlect.dday } }) 일 남음</td>

3
BO/Views/croom/grades.cshtml
View File

@ -19,7 +19,8 @@
<option value="@t.tmno" @(Model.stringval2 == t.tmno.ToString() ? "selected" : "")>@t.tseq 기</option>
}
</select>
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-유형선택;0:온라인;1:교육장;2:온라인 혼합" }, { "name", "stringval3" }, { "selected", Model.stringval3 } })
@*@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-유형선택;0:온라인;1:교육장;2:온라인 혼합" }, { "name", "stringval3" }, { "selected", Model.stringval3 } })*@
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-유형선택;1:교육장교육;2:온라인교육" }, { "name", "stringval3" }, { "selected", Model.stringval3 } })
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-수료처리여부;3:수료처리;4:수료 미처리" }, { "name", "stringval4" }, { "selected", Model.stringval4 } })
@Html.Partial("./Partial/Text", Model.stringval5, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval5", Value = Model.stringval5, PH = "강좌명을 입력하세요.", CssClass = "ff" }))
@Html.Partial("./Partial/Button", new NP.Model.Button() { Special = "search" })

3
BO/Views/croom/lectcms.cshtml
View File

@ -19,7 +19,8 @@
<option value="@t.tmno" @(Model.stringval2 == t.tmno.ToString() ? "selected" : "")>@t.tseq 기</option>
}
</select>
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-유형선택;0:온라인;1:교육장;2:온라인 혼합" }, { "name", "stringval3" }, { "selected", Model.stringval3 } })
@*@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-유형선택;0:온라인;1:교육장;2:온라인 혼합" }, { "name", "stringval3" }, { "selected", Model.stringval3 } })*@
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-유형선택;1:교육장교육;2:온라인교육" }, { "name", "stringval3" }, { "selected", Model.stringval3 } })
<br /><br />
교육기간 @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval5) ? (DateTime?)null : Convert.ToDateTime(Model.stringval5), new ViewDataDictionary { { "name", "stringval5" } }) ~ @Html.Partial("./Partial/Date", string.IsNullOrEmpty(Model.stringval6) ? (DateTime?)null : Convert.ToDateTime(Model.stringval6), new ViewDataDictionary { { "name", "stringval6" } })
@Html.Partial("./Partial/Text", Model.stringval4, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval4", Value = Model.stringval4, PH = "강좌명을 입력하세요.", CssClass = "ff" }))

3
BO/Views/croom/pay.cshtml
View File

@ -85,7 +85,8 @@
<td class="text-left">
@Html.HiddenFor(m => m.stringval14)
@*@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":상품구분;0:강좌;1:패키지;2:교재;3:시험;4:자격증강좌" }, { "name", "stringval11" }, { "selected", Model.stringval11 } })*@
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":상품유형;0:온라인;1:교육장;2:온라인 혼합" }, { "name", "stringval12" }, { "selected", Model.stringval12 } })
@*@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":상품유형;0:온라인;1:교육장;2:온라인 혼합" }, { "name", "stringval12" }, { "selected", Model.stringval12 } })*@
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":상품유형;1:교육장교육;2:온라인교육" }, { "name", "stringval12" }, { "selected", Model.stringval12 } })
@Html.Partial("./Partial/Select", Model.CGs, new ViewDataDictionary { { "name", "stringval13" }, { "selected", Model.stringval13 }, { "df", ":-과정분류" } })&nbsp;&nbsp;
<label><input type="checkbox" name="rebate" value="1" @(sv14.Contains(",1,") ? "checked" : "") /> 환급</label>&nbsp;&nbsp;
<label><input type="checkbox" name="rebate" value="0" @(sv14.Contains(",0,") ? "checked" : "") /> 비환급</label>&nbsp;&nbsp;

3
BO/Views/croom/rss.cshtml
View File

@ -19,7 +19,8 @@
<option value="@t.tmno" @(Model.stringval2 == t.tmno.ToString() ? "selected" : "")>@t.tseq 기</option>
}
</select>
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-유형선택;0:온라인;1:교육장;2:온라인 혼합" }, { "name", "stringval3" }, { "selected", Model.stringval3 } })
@*@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-유형선택;0:온라인;1:교육장;2:온라인 혼합" }, { "name", "stringval3" }, { "selected", Model.stringval3 } })*@
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-유형선택;1:교육장교육;2:온라인교육" }, { "name", "stringval3" }, { "selected", Model.stringval3 } })
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", ":-유형선택;0:강의평가;1:사전설문" }, { "name", "stringval4" }, { "selected", Model.stringval4 } })
@Html.Partial("./Partial/Text", Model.stringval5, Helpers.DicText(new NP.Model.TextDic() { Name = "stringval5", Value = Model.stringval5, PH = "강좌명을 입력하세요.", CssClass = "ff" }))
@Html.Partial("./Partial/Button", new NP.Model.Button() { Special = "search" })

6
BO/Views/data/learns.cshtml
View File

@ -5,9 +5,9 @@
<li class="@(Model.tabidx == 1 ? "active" : "")"><a href="#" onclick="gotab(1);" data-toggle="tab">강좌별</a></li>*@
@*<li class="@(Model.tabidx == 2 ? "active" : "")"><a href="#" onclick="gotab(2);" data-toggle="tab">계열별</a></li>*@
@*<li class="@(Model.tabidx == 3 ? "active" : "")"><a href="#" onclick="gotab(3);" data-toggle="tab">직급별</a></li>*@
<li class="@(Model.tabidx == 0 ? "active" : "")"><a href="#" onclick="gotab(0);" data-toggle="tab">온라인</a></li>
<li class="@(Model.tabidx == 6 ? "active" : "")"><a href="#" onclick="gotab(6);" data-toggle="tab">온라인 혼합</a></li>
<li class="@(Model.tabidx == 7 ? "active" : "")"><a href="#" onclick="gotab(7);" data-toggle="tab">교육장</a></li>
@*<li class="@(Model.tabidx == 0 ? "active" : "")"><a href="#" onclick="gotab(0);" data-toggle="tab">온라인</a></li>*@
<li class="@(Model.tabidx == 6 ? "active" : "")"><a href="#" onclick="gotab(6);" data-toggle="tab">온라인교육</a></li>
<li class="@(Model.tabidx == 7 ? "active" : "")"><a href="#" onclick="gotab(7);" data-toggle="tab">교육장교육</a></li>
<li class="@(Model.tabidx == 4 ? "active" : "")"><a href="#" onclick="gotab(4);" data-toggle="tab">RawData</a></li>
</ul>
</div>

3
BO/Views/data/learns1.cshtml
View File

@ -20,7 +20,8 @@
<option value="@t.tmno" @(Model.stringval2 == t.tmno.ToString() ? "selected" : "")>@t.tseq 기</option>
}
</select>
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "0:온라인;1:교육장;2:온라인 혼합" }, { "name", "stringval3" }, { "selected", Model.stringval3 }, { "df", ":-유형선택" } })
@*@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "0:온라인;1:교육장;2:온라인 혼합" }, { "name", "stringval3" }, { "selected", Model.stringval3 }, { "df", ":-유형선택" } })*@
@Html.Partial("./Partial/Select", null, new ViewDataDictionary { { "valuetext", "1:교육장교육;2:온라인교육" }, { "name", "stringval3" }, { "selected", Model.stringval3 }, { "df", ":-유형선택" } })
@Html.Partial("./Partial/Select", Model.CGs.Where(w => w.pcgno == null), new ViewDataDictionary { { "name", "stringval4" }, { "selected", Model.stringval4 }, { "style", "width: 100%" }, { "df", ":-상위분류" } })
@Html.Partial("./Partial/Select", Model.CGs.Where(w => w.pcgno != null && w.pcgno.ToString() == Model.stringval4), new ViewDataDictionary { { "name", "stringval5" }, { "selected", Model.stringval5 }, { "style", "width: 100%;" }, { "df", ":-과정분류" } })
@Html.Partial("./Partial/Button", new NP.Model.Button() { Special = "search", OnClick = "" })

4
Dao/MyBatis/Maps/System.xml
View File

@ -882,7 +882,7 @@
</select>
<select id="cm.data.lect.bycm" parameterClass="hashtable" resultClass="data">
select
b.cshape, case when b.cshape=0 then '온라인' when b.cshape=1 then '오프라인' else '혼합' end cshapename
b.cshape, case when b.cshape=0 then '온라인' when b.cshape=1 then '교육장교육' else '온라인교육' end cshapename
,b3.cgno,b2.cgno,f.cmno
,b3.cgname strval,b2.cgname strval2,f.cname strval3
,count(c.lectno) intval,sum(c.iscomplete) intval2
@ -910,7 +910,7 @@
</select>
<select id="cm.data.lect.byc" parameterClass="hashtable" resultClass="data">
select
b.cshape, case when b.cshape=0 then '온라인' when b.cshape=1 then '오프라인' else '혼합' end cshapename
b.cshape, case when b.cshape=0 then '온라인' when b.cshape=1 then '교육장교육' else '온라인교육' end cshapename
,b3.cgno,b2.cgno,f.cmno,b.cmno
,b3.cgname strval,b2.cgname strval2,f.cname strval3,concat(b.cname,'(',b.classno,')') strval4,concat(date_format(b.sstime,'%y.%m.%d'),'~',date_format(b.setime,'%y.%m.%d')) strval5
,count(c.lectno) intval

11
FO/Controllers/FOBaseController.cs
View File

@ -319,12 +319,19 @@ namespace NP.FO.Controllers
sb2auth.Append("</ul></li>");
//영남요청건으로 하위메뉴 보임인건 하나도 없어도 메뉴출력하도록 수정
var menu = GetMENUPAGES.Where(w => w.pdepth == 1 && (w.isopen == 1 || w.isopen == 2) && w.ppno == m.pno && w.pagetype != 4).FirstOrDefault();
sbmauth.Append(string.Format("<li class=\"topmenu{1}\"><a href=\"#\" onclick=\"gomenu({2}, {3}, '{4}', this)\">{0}</a><span></span><ul>", m.pagename, m.pno,menu.pno,menu.pagetype,menu.pageurl));
if(m.pno == 16)
{
sbmauth.Append(string.Format("<li class=\"topmenu{1}\"><a href=\"#\" onclick=\"gomenu({2}, {3}, '{4}', this)\">{0}</a><ul>", m.pagename, m.pno,menu.pno,menu.pagetype,menu.pageurl));
}
else
{
sbmauth.Append(string.Format("<li class=\"topmenu{1}\"><a href=\"#\" onclick=\"gomenu({2}, {3}, '{4}', this)\">{0}</a><span></span><ul>", m.pagename, m.pno,menu.pno,menu.pagetype,menu.pageurl));
}
if (m.usertype == 0)
{
if (m.pno == 16)
{
sbm.Append(string.Format("<li class=\"topmenu{1}\"><a href=\"#\" onclick=\"msg('로그인 후 진행 할 수 있습니다.', null, null, null, 'location.href=\\'/Account/Index?ru={4}\\'')\">{0}</a><span></span><ul>", m.pagename, m.pno, menu.pno, menu.pagetype, menu.pageurl));
sbm.Append(string.Format("<li class=\"topmenu{1}\"><a href=\"#\" onclick=\"msg('로그인 후 진행 할 수 있습니다.', null, null, null, 'location.href=\\'/Account/Index?ru={4}\\'')\">{0}</a><ul>", m.pagename, m.pno, menu.pno, menu.pagetype, menu.pageurl));
}
else
{

4
FO/Views/CRoom/Index.cshtml
View File

@ -141,7 +141,7 @@
@if (d.isonline == 1)
{
//학습기간 종료후에도 시청은 가능하고, 출석인정은 되지않도록 변경 2021-01-25
<a href="#" onclick="playerOpen(@d.cmino, @(d.sdate < DateTime.Now @*&& d.edate > DateTime.Now*@ ? 1 : 0), @(d.isseq == 1 &&d.iseq != 1 && d.preistatus < 2 ? 0 : 1), @(Model.intval > 5 && d.isrebate == 1 ? 0 : 1));" class="lctcStdy">학습하기</a>
<a href="#" onclick="playerOpen(@d.cmino, @(d.sdate < DateTime.Now @*&& d.edate > DateTime.Now*@ ? 1 : 0), @(d.isseq == 1 &&d.iseq != 1 && d.preistatus < 2 ? 0 : 1), @(Model.intval > 7 && d.isrebate == 1 ? 0 : 1));" class="lctcStdy">학습하기</a>
}
</li>
</ul>
@ -169,7 +169,7 @@
} else if (preflag < 1) {
msg("이전 회차 학습을 완료한 이후 학습이 가능합니다.");
} else if (notoverflag < 1) {
msg("일일 최대 학습회차는 6차시입니다.");
msg("일일 최대 학습회차는 8차시입니다.");
} else {
_cmino = cmino;
chkcontent();

4
FO/Views/CRoom/Innings.cshtml
View File

@ -47,7 +47,7 @@
@if (d.isonline == 1)
{
//학습기간 종료후에도 시청은 가능하고, 출석인정은 되지않도록 변경 2021-01-25
<a href="#" onclick="playerOpen(@d.cmino, @(d.sdate < DateTime.Now @*&& d.setime > DateTime.Now *@ ? 1 : 0), @(d.isseq == 1 && d.iseq != 1 && d.preistatus < 2 ? 0 : 1), @(Model.intval > 5 && d.isrebate == 1 ? 0 : 1));" class="lctcStdy">학습하기</a>
<a href="#" onclick="playerOpen(@d.cmino, @(d.sdate < DateTime.Now @*&& d.setime > DateTime.Now *@ ? 1 : 0), @(d.isseq == 1 && d.iseq != 1 && d.preistatus < 2 ? 0 : 1), @(Model.intval > 7 && d.isrebate == 1 ? 0 : 1));" class="lctcStdy">학습하기</a>
}
</li>
</ul>
@ -160,7 +160,7 @@
} else if (preflag < 1) {
msg("이전 회차 학습을 완료한 이후 학습이 가능합니다.");
} else if (notoverflag < 1) {
msg("일일 최대 학습회차는 6차시입니다.");
msg("일일 최대 학습회차는 8차시입니다.");
} else {
_cmino = cmino;
chkcontent();

2
FO/Views/Course/ApplyAgree.cshtml
View File

@ -83,7 +83,7 @@
@if (!string.IsNullOrEmpty(Model.stringval6)){<th>직무분야</th>}
</tr>
<tr>
<td>@(Model.stringval2 == "0" ? "온라인교육" : Model.stringval2 == "1" ? "교육장교육" : "혼합교육")</td>
<td>@(Model.stringval2 == "0" ? "온라인교육" : Model.stringval2 == "1" ? "교육장교육" : "온라인교육")</td>
@if (!string.IsNullOrEmpty(Model.stringval3)){<td>@Model.ComCodes2.Where(w => w.cgroup.ToString() == "typeman" && w.ccode == int.Parse(Model.stringval3)).First().cname</td>}
@if (!string.IsNullOrEmpty(Model.stringval4)){<td>@Model.ComCodes3.Where(w => w.cgroup.ToString() == "typeedu" && w.ccode == int.Parse(Model.stringval4)).First().cname</td>}
@if (!string.IsNullOrEmpty(Model.stringval5)){<td>@Model.ComCodes4.Where(w => w.cgroup.ToString() == "typegrade" && w.ccode == int.Parse(Model.stringval5)).First().cname</td>}

2
FO/Views/Course/OffList.cshtml
View File

@ -48,7 +48,7 @@
}
else
{
<span class="blu" style="@((DateTime.Now < d.rstime.Value || DateTime.Now >= d.retime.Value) ? "color:#888;" : "")">[혼합교육]</span>
<span class="blu" style="@((DateTime.Now < d.rstime.Value || DateTime.Now >= d.retime.Value) ? "color:#888;" : "")">[온라인교육]</span>
}
<a href="#" onclick="javascript:openIntro(@d.cmno);">@d.cname</a>
</h6>

10
FO/Views/Course/SmartSearch.cshtml
View File

@ -13,9 +13,9 @@
<ul class="schCont">
<li>
<select name="stringval2" id="stringval2">
<option value="0" @(Model.stringval2 == "0" ? "selected" : "")>온라인교육</option>
@*<option value="0" @(Model.stringval2 == "0" ? "selected" : "")>온라인교육</option>*@
<option value="1" @(Model.stringval2 == "1" ? "selected" : "")>교육장교육</option>
<option value="2" @(Model.stringval2 == "2" ? "selected" : "")>혼합교육</option>
<option value="2" @(Model.stringval2 == "2" ? "selected" : "")>온라인교육</option>
</select>
</li>
<li>
@ -45,9 +45,9 @@
<ul class="schCont">
<li>
<select name="stringval2" id="stringval2">
<option value="0" @(Model.stringval2 == "0" ? "selected" : "")>온라인교육</option>
@*<option value="0" @(Model.stringval2 == "0" ? "selected" : "")>온라인교육</option>*@
<option value="1" @(Model.stringval2 == "1" ? "selected" : "")>교육장교육</option>
<option value="2" @(Model.stringval2 == "2" ? "selected" : "")>혼합교육</option>
<option value="2" @(Model.stringval2 == "2" ? "selected" : "")>온라인교육</option>
</select>
</li>
<li>
@ -72,7 +72,7 @@
{
<li>
<div class="smtlCont">
<h5><em style="font-size:15px" class="@(item.cshape == 0 ? "org" : item.cshape == 1 ? "grn" : "blu")">@(item.cshape == 0 ? "온라인" : item.cshape == 1 ? "교육장" : "혼합")</em> <span style="font-size:22px">@item.cname</span></h5>
<h5><em style="font-size:15px" class="@(item.cshape == 0 ? "org" : item.cshape == 1 ? "grn" : "blu")">@(item.cshape == 0 ? "온라인" : item.cshape == 1 ? "교육장교육" : "온라인교육")</em> <span style="font-size:22px">@item.cname</span></h5>
<ul class="smtlBtn">
<li style="font-size:18px;"><a href="#" class="smtlBtn02" onclick="javascript: getSubCm(@item.cshape, @item.cmno)">조회하기</a></li>
</ul>

8
FO/Views/Home/Index.cshtml
View File

@ -48,9 +48,9 @@
<div>
<div>
<ul>
<li><a href="javascript:schIpt('1', '0', '온라인교육');">온라인교육</a></li>
@*<li><a href="javascript:schIpt('1', '0', '온라인교육');">온라인교육</a></li>*@
<li><a href="javascript:schIpt('1', '1', '교육장교육');">교육장교육</a></li>
<li><a href="javascript:schIpt('1', '2', '혼합교육');">혼합교육</a></li>
<li><a href="javascript:schIpt('1', '2', '혼합교육');">온라인교육</a></li>
</ul>
</div>
</div>
@ -137,9 +137,9 @@
<div>
<div>
<ul>
<li><a href="javascript:schIpt('1', '0', '온라인교육');">온라인교육</a></li>
@*<li><a href="javascript:schIpt('1', '0', '온라인교육');">온라인교육</a></li>*@
<li><a href="javascript:schIpt('1', '1', '교육장교육');">교육장교육</a></li>
<li><a href="javascript:schIpt('1', '2', '혼합교육');">혼합교육</a></li>
<li><a href="javascript:schIpt('1', '2', '혼합교육');">온라인교육</a></li>
</ul>
</div>
</div>

4
FO/Views/My/Lecture.cshtml
View File

@ -24,8 +24,8 @@
@*<p><input type="checkbox" name="intval" @(Model.intval == 1 ? "checked":"") id="lctQrChk"/><label for="lctQrChk">보수교육만 조회</label></p>*@
<span class="@(string.IsNullOrEmpty(Model.stringval)? "current" : "" )" id="lblAll">전체</span>&nbsp;|&nbsp;
<span class="@(Model.stringval == "1"? "current" : "" )" id="lblOff">교육장교육</span>&nbsp;|&nbsp;
<span class="@(Model.stringval == "2"? "current" : "" )" id="lblMix">온라인(혼합)교육</span>&nbsp;|&nbsp;
<span class="@(Model.stringval == "0"? "current" : "" )" id="lblOn">온라인교육</span>
<span class="@(Model.stringval == "2"? "current" : "" )" id="lblMix">온라인교육</span>&nbsp;|&nbsp;
@*<span class="@(Model.stringval == "0"? "current" : "" )" id="lblOn">온라인교육</span>*@
<ul>
<li><a href="#" onclick="ps()">수료증 최적화 출력방법</a></li>
</ul>

2
FO/Views/My/Ready.cshtml
View File

@ -44,7 +44,7 @@
@*수강기간 : @d.sdate.ToString("yy-MM-dd") ~ @d.edate.ToString("yy-MM-dd")*@
@if (d.cshape == 2)
{
@:| 집체교육기간 : @(d.cmisno == null ? "미정" : ("[" + d.studyplacename + "] " + string.Format("{0}", d.cmiestart.ToString("yy-MM-dd"))))
@:| 집체교육기간 : @(d.cmisno == null ? "미정" : ("[" + d.studyplacename + "] " + string.Format("{0}", d.cmiestart.Value.ToString("yy-MM-dd"))))
}
</dd>
</dl>

2
FO/Views/Shared/Partial/PayReturn.cshtml
View File

@ -14,7 +14,7 @@
<td>
<h5>
<span class="blu">강좌</span>
<span class="ppl">@(d.cshape == 0 ? "ON" : d.cshape == 1 ? "OFF" : "혼합")</span>
<span class="ppl">@(d.cshape == 0 ? "ON" : d.cshape == 1 ? "OFF" : "ON")</span>
@if (d.isrebate == 1)
{
<span class="grn">환급</span>

6
Model/CM.cs
View File

@ -639,7 +639,7 @@ namespace NP.Model
{
get
{
return cshape == 0 ? "온라인" : cshape == 1 ? "교육장" : cshape == 2 ? "온라인 혼합" : "-";
return cshape == 0 ? "온라인" : cshape == 1 ? "교육장교육" : cshape == 2 ? "온라인교육" : "-";
}
}
public Int64 lectno { get; set; }
@ -1117,7 +1117,7 @@ namespace NP.Model
{
get
{
return cshape == 0 ? "온라인" : cshape == 1 ? "교육장" : cshape == 2 ? "온라인 혼합" : "-";
return cshape == 0 ? "온라인" : cshape == 1 ? "교육장교육" : cshape == 2 ? "온라인교육" : "-";
}
}
public String cshapename2 { get; set; }
@ -2279,7 +2279,7 @@ namespace NP.Model
{
get
{
return cshape == 0 ? "온라인" : cshape == 1 ? "교육장" : cshape == 2 ? "온라인 혼합" : "-";
return cshape == 0 ? "온라인" : cshape == 1 ? "교육장교육" : cshape == 2 ? "온라인교육" : "-";
}
}
public String cgname { get; set; }

6
Model/Pay.cs
View File

@ -46,7 +46,7 @@ namespace NP.Model
{
get
{
return cshape == 0 ? "온라인" : cshape == 1 ? "교육장" : "온라인";
return cshape == 0 ? "온라인" : cshape == 1 ? "교육장교육" : "온라인교육";
}
}
/// <summary>
@ -406,7 +406,7 @@ namespace NP.Model
{
get
{
return cshape == 0 ? "온라인" : cshape == 1 ? "교육장" : cshape == 2 ? "온라인 혼합" : "-";
return cshape == 0 ? "온라인" : cshape == 1 ? "교육장교육" : cshape == 2 ? "온라인교육" : "-";
}
}
public String cname { get; set; }
@ -704,7 +704,7 @@ namespace NP.Model
{
get
{
return cshape == 0 ? "ON" : cshape == 1 ? "OFF" : cshape == 2 ? "혼합" : "-";
return cshape == 0 ? "ON" : cshape == 1 ? "OFF" : cshape == 2 ? "ON" : "-";
}
}
public DateTime sstime { get; set; }