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

240826 추가 요청건 일괄 커밋

This commit is contained in:
jity7777 2024-08-26 06:49:05 +00:00
parent d41c5b012d
commit cc9330f357
6 changed files with 54 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BO/Content/homeDepth2.htm
View File

@ -28,8 +28,6 @@
<li id="liedu04"><a href="javascript: schIpt('3', '32', '안전관리계속교육(16시간)'); ">안전관리계속교육(16시간)</a></li>
<li id="liedu05"><a href="javascript: schIpt('3', '33', 'PQ가점교육'); ">PQ가점교육</a></li>
<li id="liedu06"><a href="javascript: schIpt('3', '34', '기타교육'); ">기타교육</a></li>
<li id="liedu08"><a href="javascript: schIpt('3', '107', '필수계속교육'); ">필수계속교육</a></li>
<li id="liedu09"><a href="javascript: schIpt('3', '108', '일반계속교육'); ">일반계속교육</a></li>
</ul>
</div>
</div>
@ -133,4 +131,4 @@
</div>
</div>
</li>
<li><a href="#" class="msBtn">교육신청</a></li>
<li><a href="#" class="msBtn"><span>일정확인</span><span> 및 </span>교육신청</a></li>

9
Dao/MyBatis/Maps/Lect.xml
View File

@ -2695,6 +2695,15 @@
,fgno=null
where lectno=#lectno# and sdno=#sdno#;
</update>
<select id="lect.get.lectsdChk" parameterClass="hashtable" resultClass="lect">
SELECT l.lectno, ( CASE WHEN g.stime IS NULL THEN 0 ELSE 1 END) intv1
FROM lect l
INNER JOIN users u ON l.userno= u.userno
INNER JOIN cminning ci ON l.cmno = ci.cmno AND ci.isscd=1 AND ci.scdtype=0
LEFT OUTER JOIN lectinning g ON g.cmino = ci.cmino AND g.lectno = l.lectno
WHERE l.lectno in ($lectnos$)
</select>
</statements>
</sqlMap>

20
FO/Controllers/MyController.cs
View File

@ -233,6 +233,7 @@ namespace NP.FO.Controllers
foreach (var item in vm.Lects)
{
item.intv1 = 0;
if ((item.iscomplete == null || item.iscomplete == 0) && item.edate < DateTime.Now)
{
item.lectStatus = "미수료";
@ -251,6 +252,25 @@ namespace NP.FO.Controllers
}
}
if (vm.Lects.Count > 0)
{
string lectsNos = string.Join(",", vm.Lects.Select(c => c.lectno).ToList());
var getLectAtt = Dao.Get<Lect>("lect.get.lectsdChk", new Hashtable { { "lectnos", lectsNos } });
if (getLectAtt.Count > 0)
{
foreach (var item in getLectAtt.Where(c => c.intv1 == 1).ToList())
{
var lectitem = vm.Lects.Where(c => c.lectno == item.lectno).FirstOrDefault();
if (lectitem != null)
{
lectitem.intv1 = 1;
}
}
}
}
return View(vm);
}
public ActionResult CertPrint(VMMy vm)

12
FO/Views/CRoom/Estimation.cshtml
View File

@ -15,8 +15,16 @@
<div class="evaList">
<table>
<tbody>
@foreach (var d in Model.Datas.Where(w=>w.dtype > -1))
{
@{
List<long> allowLectNos = Array.ConvertAll("104069,102553,105325,104402,106226,62683".Split(','), long.Parse).ToList();
}
@foreach (var d in Model.Datas.Where(w=>w.dtype > -1))
{
if(allowLectNos.IndexOf(Model.croomlectno) > -1)
{
ViewBag.exCheck = true;
}
<tr>
<th>
<h5><b>@(d.dtype == 0 ? "진행평가":d.dtype==1?"최종평가":d.dtype == 2?"과제":d.dtype==3?"토론":"")</b><span> @d.strval</span></h5>

7
FO/Views/My/LectureOn.cshtml
View File

@ -60,7 +60,14 @@
</div>
</th>
<td class="ltaBtn" data-th="교육일정변경 : ">
@if (d.intv1 == 0)
{
<dl><dd class="blu"><a href="#" onclick="javscript: openScd(@d.cmno,@d.lectno,@d.cshape);">변경</a></dd></dl>
}
else
{
<dl><dd class="blu"><a href="#" onclick="javscript: msg('이미 출석을 완료한 교육과정입니다.');">변경</a></dd></dl>
}
</td>
</tr>
}

4
FO/Web.config
View File

@ -40,9 +40,9 @@
<add key="ssonoauth" value="Y" />
<add key="daokey" value="ynictelms2020" />
<!--<add key="configpath" value="Product" />-->
<add key="configpath" value="Product" />
<!--<add key="configpath" value="ProductDev" />-->
<add key="configpath" value="Staging" />
<!--<add key="configpath" value="Staging" />-->
<add key="isstaging" value="1" />
<add key="thumbnailexe" value="D:\\dev_tool\\ffmpeg.exe" />