Compare commits
2 Commits
05fb45dd98
...
95b51a673d
| Author | SHA1 | Date |
|---|---|---|
 김한진
|
95b51a673d | |
|
김한진
|
1676697e5d |
|
|
@ -931,7 +931,7 @@ namespace NP.BO.Controllers
|
|||
|
||||
//교육일정이 존재하는지 조회
|
||||
var scd = Dao.Get<int>("cm.cminnigscd.exists", new Hashtable() { { "cmno", vm.CM.cmno } });
|
||||
ViewBag.Scd = scd.FirstOrDefault();
|
||||
ViewBag.InningScd = scd.FirstOrDefault();
|
||||
|
||||
return View("cmregexset", vm);
|
||||
}
|
||||
|
|
|
|||
2313
BO/Logs/log.txt
2313
BO/Logs/log.txt
File diff suppressed because one or more lines are too long
5484
BO/Logs/log.txt.1
5484
BO/Logs/log.txt.1
File diff suppressed because one or more lines are too long
9863
BO/Logs/query.txt
9863
BO/Logs/query.txt
File diff suppressed because one or more lines are too long
|
|
@ -469,6 +469,8 @@
|
|||
$("input:radio[name=istudyplace][value=" + d.studyplace + "]").attr("checked", true);
|
||||
}
|
||||
//교강사 체크
|
||||
$(".chkInstructor").prop("checked", false);
|
||||
|
||||
$.each($(".chkInstructor"), function (i, item) {
|
||||
if (d.instructors != null) {
|
||||
let tc = d.instructors.split(',');
|
||||
|
|
|
|||
|
|
@ -1,9 +1,14 @@
|
|||
@model NP.Model.VMCM
|
||||
@{
|
||||
int esTsCnt = 0;
|
||||
int scdType = 0; //교육회차 scdtype = 0(교육장_오프라인),1(온라인대체)
|
||||
if (Model.ESTs != null) {
|
||||
esTsCnt = Model.ESTs.Count;
|
||||
}
|
||||
|
||||
if (Model.CMInnings != null) {
|
||||
scdType = Convert.ToInt32(Model.CMInnings.FirstOrDefault().scdtype);
|
||||
}
|
||||
}
|
||||
<!-- div[id=container] -->
|
||||
<div style="@(Model.CM.cmno < 1 ? "display: none;" : "")">
|
||||
|
|
@ -21,8 +26,9 @@
|
|||
<!-- // div[id=container] -->
|
||||
<!-- form[id=mform] -->
|
||||
<form id="mform" method="post" class="form-horizontal">
|
||||
<input type="hidden" id="hdnScdCnt" value="@ViewBag.Scd" />
|
||||
<input type="hidden" id="hdnScdCnt" value="@ViewBag.InningScd" />
|
||||
<input type="hidden" id="hdnExCnt" value="@esTsCnt" />
|
||||
<input type="hidden" id="hdnScdType" value="@scdType" />
|
||||
<!-- section[class=panel panel-default] -->
|
||||
<section class="panel panel-default" style="border-top: 1px solid #ddd; margin-top: 5px;">
|
||||
<div class="panel-body">
|
||||
|
|
@ -276,15 +282,16 @@
|
|||
@*/* 평가 추가 함수 */*@
|
||||
function add(idx, no)
|
||||
{
|
||||
if ($("#hdnScdCnt").val() == 0) {
|
||||
if (@Model.CMInnings.Count == 0) {
|
||||
msg("교육일정 탭에서 교육회차를 먼저 등록해주세요.");
|
||||
return;
|
||||
}
|
||||
|
||||
var inningcnt = @Model.CMInnings.Count; //온라인대체
|
||||
if (no == 0 && inningcnt > 0 && parseInt($("#hdnExCnt").val()) > 0) {
|
||||
msg2("온라인 100%인 교육은 1개의 최종평가만 등록 가능합니다.");
|
||||
return;
|
||||
if ($("#hdnScdType").val() == 1) {
|
||||
if (no == 0 && parseInt($("#hdnExCnt").val()) > 0) {
|
||||
msg2("온라인 100%인 교육은 1개의 최종평가만 등록 가능합니다.");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (idx == 0) {
|
||||
|
|
|
|||
|
|
@ -1433,11 +1433,11 @@
|
|||
|
||||
insert into cmncsd(cmno, ndno, <include refid="sql.inc"></include>)
|
||||
select #cmno#, ndno, <include refid="sql.inv"></include>
|
||||
from cmncsd
|
||||
where cmno = #orgcmno#;
|
||||
from cmncsd
|
||||
where cmno = #orgcmno#;
|
||||
|
||||
insert into cminningscd(cmino, estart, eend, quota, studyplace, sseq, <include refid="sql.inc"></include>)
|
||||
select t.new_cmino, estart, eend, quota, studyplace, sseq, <include refid="sql.inv"></include>
|
||||
insert into cminningscd(cmino, estart, eend, quota, studyplace, sseq, instructors, <include refid="sql.inc"></include>)
|
||||
select t.new_cmino, a.estart, a.eend, a.quota, a.studyplace, a.sseq, a.instructors, <include refid="sql.inv"></include>
|
||||
from cminningscd a
|
||||
inner join temp_cminning_mapping t on a.cmino = t.old_cmino
|
||||
where a.cmino in (select old_cmino from temp_cminning_mapping);
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
// <autogenerated />
|
||||
using System;
|
||||
using System.Reflection;
|
||||
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6", FrameworkDisplayName = ".NET Framework 4.6")]
|
||||
Binary file not shown.
|
|
@ -1 +0,0 @@
|
|||
3d2fb68056bf373553568c0cc5d2e950c04075eb
|
||||
|
|
@ -1,118 +0,0 @@
|
|||
D:\Project\git\git_YNICTE\BO\bin\ApplicationInsights.config
|
||||
D:\Project\git\git_YNICTE\BO\bin\MyBatis\Maps\board.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\MyBatis\Maps\Exam.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\MyBatis\Maps\Attend.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\MyBatis\Maps\Grade.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\MyBatis\Maps\CRoom.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\MyBatis\Maps\Lect.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\MyBatis\Maps\Common.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\MyBatis\Maps\Config.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\MyBatis\Maps\Manage.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\MyBatis\Maps\System.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\MyBatis\Maps\CM.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\MyBatis\Maps\Pay.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\MyBatis\Maps\Site.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\MyBatis\Maps\User.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\MyBatis\SqlMapStaging.config
|
||||
D:\Project\git\git_YNICTE\BO\bin\MyBatis\SqlMapProduct.config
|
||||
D:\Project\git\git_YNICTE\BO\bin\MyBatis\SqlMapProductDev.config
|
||||
D:\Project\git\git_YNICTE\BO\bin\NP.BO.dll.config
|
||||
D:\Project\git\git_YNICTE\BO\bin\NP.BO.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\NP.BO.pdb
|
||||
D:\Project\git\git_YNICTE\BO\bin\Antlr3.Runtime.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\Common.Logging.Core.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\Common.Logging.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\IBatisNet.Common.Logging.Log4Net.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\Linkhub.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\log4net.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\Microsoft.AI.Agent.Intercept.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\Microsoft.AI.DependencyCollector.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\Microsoft.AI.PerfCounterCollector.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\Microsoft.AI.ServerTelemetryChannel.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\Microsoft.AI.Web.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\Microsoft.AI.WindowsServer.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\Microsoft.ApplicationInsights.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\Microsoft.Web.Infrastructure.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\Newtonsoft.Json.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\NP.Base.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\NP.Dao.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\NP.Model.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\NPDao.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\Popbill.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\Spring.Aop.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\Spring.Core.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\Spring.Data.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\Spring.Web.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\Spring.Web.Mvc5.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\System.Net.Http.Formatting.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\System.Web.Helpers.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\System.Web.Http.Common.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\System.Web.Http.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\System.Web.Http.WebHost.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\System.Web.Mvc.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\System.Web.Optimization.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\System.Web.Razor.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\System.Web.WebPages.Deployment.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\System.Web.WebPages.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\System.Web.WebPages.Razor.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\WebGrease.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\ICSharpCode.SharpZipLib.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\EPPlus.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\MySql.Data.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\Excel.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\XPayClientNet.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\IBatisNet.Common.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\QRCoder.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\IBatisNet.DataMapper.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\NP.Base.pdb
|
||||
D:\Project\git\git_YNICTE\BO\bin\NP.Base.dll.config
|
||||
D:\Project\git\git_YNICTE\BO\bin\NP.Dao.pdb
|
||||
D:\Project\git\git_YNICTE\BO\bin\NP.Model.pdb
|
||||
D:\Project\git\git_YNICTE\BO\bin\Common.Logging.pdb
|
||||
D:\Project\git\git_YNICTE\BO\bin\Common.Logging.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\Common.Logging.Core.pdb
|
||||
D:\Project\git\git_YNICTE\BO\bin\Common.Logging.Core.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\Newtonsoft.Json.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\Spring.Aop.pdb
|
||||
D:\Project\git\git_YNICTE\BO\bin\Spring.Aop.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\Spring.Core.pdb
|
||||
D:\Project\git\git_YNICTE\BO\bin\Spring.Core.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\Spring.Data.pdb
|
||||
D:\Project\git\git_YNICTE\BO\bin\Spring.Data.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\Spring.Web.pdb
|
||||
D:\Project\git\git_YNICTE\BO\bin\Spring.Web.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\Spring.Web.Mvc5.pdb
|
||||
D:\Project\git\git_YNICTE\BO\bin\Spring.Web.Mvc5.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\System.Net.Http.Formatting.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\System.Web.Http.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\System.Web.Http.Common.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\System.Web.Http.WebHost.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\System.Web.Mvc.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\System.Web.Helpers.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\System.Web.Optimization.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\System.Web.Razor.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\System.Web.WebPages.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\System.Web.WebPages.Deployment.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\System.Web.WebPages.Razor.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\Antlr3.Runtime.pdb
|
||||
D:\Project\git\git_YNICTE\BO\bin\Microsoft.ApplicationInsights.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\Microsoft.AI.DependencyCollector.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\Microsoft.AI.ServerTelemetryChannel.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\Microsoft.AI.WindowsServer.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\Microsoft.AI.Web.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\EPPlus.xml
|
||||
D:\Project\git\git_YNICTE\BO\bin\Excel.pdb
|
||||
D:\Project\git\git_YNICTE\BO\bin\ko\System.Web.Mvc.resources.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\ko\System.Web.Helpers.resources.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\ko\System.Web.Optimization.resources.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\ko\System.Web.Razor.resources.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\ko\System.Web.WebPages.resources.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\ko\System.Web.WebPages.Deployment.resources.dll
|
||||
D:\Project\git\git_YNICTE\BO\bin\ko\System.Web.WebPages.Razor.resources.dll
|
||||
D:\Project\git\git_YNICTE\BO\obj\Debug\BO.csproj.AssemblyReference.cache
|
||||
D:\Project\git\git_YNICTE\BO\obj\Debug\BO.csproj.CoreCompileInputs.cache
|
||||
D:\Project\git\git_YNICTE\BO\obj\Debug\BO.csproj.CopyComplete
|
||||
D:\Project\git\git_YNICTE\BO\obj\Debug\NP.BO.dll
|
||||
D:\Project\git\git_YNICTE\BO\obj\Debug\NP.BO.pdb
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,4 +0,0 @@
|
|||
// <autogenerated />
|
||||
using System;
|
||||
using System.Reflection;
|
||||
[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.6", FrameworkDisplayName = ".NET Framework 4.6")]
|
||||
|
|
@ -1433,11 +1433,11 @@
|
|||
|
||||
insert into cmncsd(cmno, ndno, <include refid="sql.inc"></include>)
|
||||
select #cmno#, ndno, <include refid="sql.inv"></include>
|
||||
from cmncsd
|
||||
where cmno = #orgcmno#;
|
||||
from cmncsd
|
||||
where cmno = #orgcmno#;
|
||||
|
||||
insert into cminningscd(cmino, estart, eend, quota, studyplace, sseq, <include refid="sql.inc"></include>)
|
||||
select t.new_cmino, estart, eend, quota, studyplace, sseq, <include refid="sql.inv"></include>
|
||||
insert into cminningscd(cmino, estart, eend, quota, studyplace, sseq, instructors, <include refid="sql.inc"></include>)
|
||||
select t.new_cmino, a.estart, a.eend, a.quota, a.studyplace, a.sseq, a.instructors, <include refid="sql.inv"></include>
|
||||
from cminningscd a
|
||||
inner join temp_cminning_mapping t on a.cmino = t.old_cmino
|
||||
where a.cmino in (select old_cmino from temp_cminning_mapping);
|
||||
|
|
|
|||
|
|
@ -1433,11 +1433,11 @@
|
|||
|
||||
insert into cmncsd(cmno, ndno, <include refid="sql.inc"></include>)
|
||||
select #cmno#, ndno, <include refid="sql.inv"></include>
|
||||
from cmncsd
|
||||
where cmno = #orgcmno#;
|
||||
from cmncsd
|
||||
where cmno = #orgcmno#;
|
||||
|
||||
insert into cminningscd(cmino, estart, eend, quota, studyplace, sseq, <include refid="sql.inc"></include>)
|
||||
select t.new_cmino, estart, eend, quota, studyplace, sseq, <include refid="sql.inv"></include>
|
||||
insert into cminningscd(cmino, estart, eend, quota, studyplace, sseq, instructors, <include refid="sql.inc"></include>)
|
||||
select t.new_cmino, a.estart, a.eend, a.quota, a.studyplace, a.sseq, a.instructors, <include refid="sql.inv"></include>
|
||||
from cminningscd a
|
||||
inner join temp_cminning_mapping t on a.cmino = t.old_cmino
|
||||
where a.cmino in (select old_cmino from temp_cminning_mapping);
|
||||
|
|
|
|||
|
|
@ -1433,11 +1433,11 @@
|
|||
|
||||
insert into cmncsd(cmno, ndno, <include refid="sql.inc"></include>)
|
||||
select #cmno#, ndno, <include refid="sql.inv"></include>
|
||||
from cmncsd
|
||||
where cmno = #orgcmno#;
|
||||
from cmncsd
|
||||
where cmno = #orgcmno#;
|
||||
|
||||
insert into cminningscd(cmino, estart, eend, quota, studyplace, sseq, <include refid="sql.inc"></include>)
|
||||
select t.new_cmino, estart, eend, quota, studyplace, sseq, <include refid="sql.inv"></include>
|
||||
insert into cminningscd(cmino, estart, eend, quota, studyplace, sseq, instructors, <include refid="sql.inc"></include>)
|
||||
select t.new_cmino, a.estart, a.eend, a.quota, a.studyplace, a.sseq, a.instructors, <include refid="sql.inv"></include>
|
||||
from cminningscd a
|
||||
inner join temp_cminning_mapping t on a.cmino = t.old_cmino
|
||||
where a.cmino in (select old_cmino from temp_cminning_mapping);
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue