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

<기능개선> 

통합테스트목록 - {540}
BO/Views/croom/attscds.cshtml
BO/Views/croom/cmlects.cshtml
BO/Views/croom/grade0.cshtml
BO/Views/croom/gradeall0.cshtml
BO/Views/croom/gradeall2.cshtml
BO/Views/croom/gradeall4.cshtml
BO/Views/croom/payview.cshtml
Dao/MyBatis/Maps/Lect.xml
Model/CM.cs
관리자 교육일정변경 버튼, 목록
This commit is contained in:
kdh0120 2021-11-10 01:11:16 +00:00
parent fd98ddd1eb
commit 5f5ad0d2cb
9 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BO/Views/croom/attscds.cshtml
View File

@ -93,9 +93,9 @@
<td>@d.cname</td>
<td>@d.usernameid</td>
<td>@((d.cshape == 0 && d.isrebate == 0 ? d.payoktime : d.sdate).Value.ToShortDateString())</td>
@if (d.cshape == 2)
@if (d.cshape == 2 )
{
if (d.estart != null && d.estart > Convert.ToDateTime("1900-01-01") && d.estart.ToShortDateString() != "0001-01-01" && d.estart >= DateTime.Now)
if (d.iscomplete != 1)
{
<td class="link text-center"><a href="#" onclick="javascript: openScd(@d.cmno,@d.lectno,@d.cmisno);">@d.eend.ToShortDateString()</a></td>
}

2
BO/Views/croom/cmlects.cshtml
View File

@ -101,7 +101,7 @@
<td>@d.cdtymd</td>
<td>@d.statusname</td>
<td class="link text-center"><a href="#" onclick="viewrefund(@d.payno, @d.pstatus, @d.payuserno)">@d.pstatusname</a></td>
@if (d.cshape == 2 && d.estart != null && d.estart > Convert.ToDateTime("1900-01-01") && d.estart.ToShortDateString() != "0001-01-01" && d.estart >= DateTime.Now) //혼합모드라면
@if (d.iscomplete != 1) //혼합모드라면
{
<td class="link text-center"><a href="#" onclick="javascript: openScd(@Model.CM.cmno,@d.lectno, @d.cmisno);">@d.estart.ToShortDateString()</a></td>
}

2
BO/Views/croom/grade0.cshtml
View File

@ -139,7 +139,7 @@
<td>@((Model.CM.cshape == 0 && d.isrebate == 0 ? d.payoktime : d.sdate).Value.ToShortDateString())</td>
@if(Model.CMEV.cshape == 2)
{
if(d.estart != null && d.estart > Convert.ToDateTime("1900-01-01") && d.estart.ToShortDateString() != "0001-01-01" && d.estart >= DateTime.Now)
if(d.iscomplete != 1)
{
<td class="link text-center"><a href="#" onclick="javascript: openScd(@Model.CM.cmno,@d.lectno,@d.cmisno);">@d.eend.ToShortDateString()</a></td>
}

2
BO/Views/croom/gradeall0.cshtml
View File

@ -66,7 +66,7 @@
<td>@((d.cshape == 0 && d.isrebate == 0 ? d.payoktime : d.sdate).Value.ToShortDateString())</td>
@if(d.cshape == 2)
{
if(d.estart != null && d.estart > Convert.ToDateTime("1900-01-01") && d.estart.ToShortDateString() != "0001-01-01" && d.estart >= DateTime.Now)
if(d.iscomplete != 1)
{
<td class="link text-center"><a href="#" onclick="javascript: openScd(@d.cmno,@d.lectno,@d.cmisno);">@d.eend.ToShortDateString()</a></td>
}

2
BO/Views/croom/gradeall2.cshtml
View File

@ -57,7 +57,7 @@
<td>@((d.cshape == 0 && d.isrebate == 0 ? d.payoktime : d.sdate).Value.ToShortDateString())</td>
@if (d.cshape == 2)
{
if (d.lestart != null && d.lestart > Convert.ToDateTime("1900-01-01") && d.lestart.ToShortDateString() != "0001-01-01" && d.lestart >= DateTime.Now)
if (d.iscomplete != 1)
{
<td class="link text-center"><a href="#" onclick="javascript: openScd(@d.cmno,@d.lectno,@d.cmisno);">@d.leend.ToShortDateString()</a></td>
}

2
BO/Views/croom/gradeall4.cshtml
View File

@ -50,7 +50,7 @@
<td>@((d.cshape == 0 && d.isrebate == 0 ? d.payoktime : d.sdate).Value.ToShortDateString())</td>
@if (d.cshape == 2)
{
if (d.lestart != null && d.lestart > Convert.ToDateTime("1900-01-01") && d.lestart.ToShortDateString() != "0001-01-01" && d.lestart >= DateTime.Now)
if (d.iscomplete != 1)
{
<td class="link text-center"><a href="#" onclick="javascript: openScd(@d.cmno,@d.lectno,@d.cmisno);">@d.leend.ToShortDateString()</a></td>
}

9
BO/Views/croom/payview.cshtml
View File

@ -313,9 +313,12 @@ else if (p.isunpay == 3)
<td>@Model.Lect.estart.ToString("yyyy-MM-dd HH:mm")</td>
</tr>
</table>
<div style="padding: 5px 10px; text-align: right;">
<a href="#" class="btn btn-primary" onclick="openScd(@Model.CM.cmno,@Model.Lect.lectno, @Model.Lect.cmisno);">수정</a><br />
</div>
@if(Model.Lect.iscomplete != 1)
{
<div style="padding: 5px 10px; text-align: right;">
<a href="#" class="btn btn-primary" onclick="openScd(@Model.CM.cmno,@Model.Lect.lectno, @Model.Lect.cmisno);">수정</a><br />
</div>
}
</section>
}
}

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

@ -170,7 +170,7 @@
,c.pstatus,c.payno,c.userno payuserno
,b.rstatus
,a2.rstime,a2.retime,a.sdate sstime,a.edate setime,a2.cshape,a2.studydays
,a.sdate,a.edate,a.isrebate
,a.sdate,a.edate,a.isrebate,a.iscomplete
,scd.estart,scd.eend,scd.studyplace
,pp.typeman, pp.typeedu, pp.typegrade, pp.typejob, pp.pplno
,row_number() over(order by <isNotNull property="orderby">$orderby$</isNotNull><isNull property="orderby">a.payno,a.pino</isNull>) rno
@ -1504,7 +1504,8 @@
where a.userno=#userno# and a.status=1 and a.ischanged=0 and a.sdate &lt; <include refid="sql.now"></include>
<isNotNull property="cshape">and b.cshape=#cshape#</isNotNull>
<isNotNull property="issubtable">
and (ifnull(a.iscomplete,0) = 0 and b.cshape = 2 and scd.estart &gt; '1900-01-01' and scd.eend &gt; '1900-01-01' and ifnull(a.iscomplete,0) = 0 and scd.estart &gt; now()
and (ifnull(a.iscomplete,0) = 0 and b.cshape = 2 and scd.estart &gt; '1900-01-01' and scd.eend &gt; '1900-01-01'
and scd.estart &gt; now()
<!--and (date_add(scd.eend,interval +5 day) &gt; date_format(now(),'%Y-%m-%d 23:59:59'))-->
and date_add(a.cdt, interval +1 year) &gt;= date_format(now(),'%Y-%m-%d 23:59:59'))
</isNotNull>

4
Model/CM.cs
View File

@ -3378,7 +3378,7 @@ namespace NP.Model
{
if (cshape == 2)
{
if (lestart != null && lestart > Convert.ToDateTime("1900-01-01") && lestart.ToShortDateString() != "0001-01-01" && lestart >= DateTime.Now)
if (iscomplete != 1)
{
return "<td class=\"link text-center\"><a href=\"#\" onclick=\"javascript: openScd(" + cmno + "," + lectno + "," + cmisno + ");\">" + leend.ToShortDateString() + "</a></td>";
}
@ -3669,7 +3669,7 @@ namespace NP.Model
{
if(cshape == 2)
{
if(lestart != null && lestart > Convert.ToDateTime("1900-01-01") && lestart.ToShortDateString() != "0001-01-01" && lestart >= DateTime.Now)
if(iscomplete != 1)
{
return "<td class=\"link text-center\"><a href=\"#\" onclick=\"javascript: openScd(" + cmno + "," + lectno + "," + cmisno + ");\">" + leend.ToShortDateString() + "</a></td>";
}