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

<기능개선> 

1. PMS NO : 5358,5338
2. (주요)작업내용 
(1) 관련 작업 일괄 커밋
This commit is contained in:
jity7777 2024-06-25 08:07:05 +00:00
parent 38f453a81a
commit 3a4eee406c
11 changed files with 84 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BO/Views/user/ur.cshtml
View File

@ -66,6 +66,10 @@
<label class="col-sm-4 col-md-2 control-label">영상플레이바 제한해제</label>
<div class="col-sm-8 col-md-10">@Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "1:예;0:아니오" }, { "checked", Model.User.playbar }, { "name", "User.playbar" } })</div>
</div>
<div class="line line-dashed line-lg pull-in"></div><div class="form-group">
<label class="col-sm-4 col-md-2 control-label">영상 제한해제</label>
<div class="col-sm-8 col-md-10">@Html.Partial("./Partial/Radio", null, new ViewDataDictionary() { { "valuetext", "1:예;0:아니오" }, { "checked", Model.User.isplay }, { "name", "User.isplay" } })</div>
</div>
}
<div class="line line-dashed line-lg pull-in"></div><div class="form-group">
<label class="col-sm-4 col-md-2 control-label @(Model.viewname =="user" ? "req" : "")">이메일</label>

4
BO/Web.config
View File

@ -56,9 +56,9 @@
<add key="talk" value="https://dev-alimtalk-api.bizmsg.kr:1443/v2/sender/send,?,?,?,?,?,023103312" />
<!--<add key="talk" value="https://alimtalk-api.bizmsg.kr/v2/sender/send,?,?,?,?,?,023103312" />-->
<!--<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="lgdacomConfigPath" value="D:\3rdparti\lgdacomyicte" />

1
Base/Controller/ACommonUser.cs
View File

@ -81,6 +81,7 @@ namespace NP.Base.Controllers
{
AuthSet(new AuthLog() { uno = SUserInfo.UserNo, uip = GetUserIP(), logtype = 1, usertypenew = vm.User.usertype, userno = vm.User.userno });
}
var result = Dao.Save("users.up", vm.User);
// 상태값 휴면 선택시

35
Dao/MyBatis/Maps/CRoom.xml
View File

@ -178,23 +178,24 @@
,case when b.isonline=1 then df.fileurl else df3.fileurl end fileurl
,case when b.isonline=1 then df.fileno else df3.fileno end fileno
<!--,concat('/', d.ccode, '/', e.srcp) tasteurl-->
,df2.fileurl tasteurl
from lect a
inner join pay p on p.payno = a.payno
inner join cm a2 on a2.cmno=a.cmno
inner join cminning b on b.cmno=a2.cmno
left outer join lectinning c on c.lectno=a.lectno and c.cmino=b.cmino
left outer join cminning bp on bp.cmno=b.cmno and bp.iseq=b.iseq-1
left outer join lectinning cp on cp.lectno=a.lectno and cp.cmino=bp.cmino
left outer join ct d on b.isonline = 1 and d.ctno=b.ctno <!--and d.ctype=0-->
left outer join fileinfo df2 on b.isonline=1 and df2.fgno=d.fgnothumb and df2.isdel=0
left outer join fileinfo df on b.isonline=1 and df.fgno=d.fgnotf and df.isdel=0
left outer join fileinfo df3 on b.isonline=0 and df3.fgno=b.fgnotf and df3.isdel=0
left outer join ctpage e on e.ctno=d.ctno and e.pseq=1
left outer join cminningscd scd on a.cmisno = scd.cmisno
left outer join comcode com on scd.studyplace = com.ccode
where a.lectno=#lectno# and a.userno=#userno# and ifnull(b.isscd,0) = 0
<isNotNull property="notstudy">and ifnull(c.istatus,0) &lt; 2 and a.sdate &lt; now() and a.edate &gt; now()</isNotNull>
,df2.fileurl tasteurl, ifnull(isplay,0) as isplay
from lect a
inner join pay p on p.payno = a.payno
inner join cm a2 on a2.cmno=a.cmno
inner join cminning b on b.cmno=a2.cmno
left outer join lectinning c on c.lectno=a.lectno and c.cmino=b.cmino
left outer join cminning bp on bp.cmno=b.cmno and bp.iseq=b.iseq-1
left outer join lectinning cp on cp.lectno=a.lectno and cp.cmino=bp.cmino
left outer join ct d on b.isonline = 1 and d.ctno=b.ctno <!--and d.ctype=0-->
left outer join fileinfo df2 on b.isonline=1 and df2.fgno=d.fgnothumb and df2.isdel=0
left outer join fileinfo df on b.isonline=1 and df.fgno=d.fgnotf and df.isdel=0
left outer join fileinfo df3 on b.isonline=0 and df3.fgno=b.fgnotf and df3.isdel=0
left outer join ctpage e on e.ctno=d.ctno and e.pseq=1
left outer join cminningscd scd on a.cmisno = scd.cmisno
left outer join comcode com on scd.studyplace = com.ccode
left outer join userstatus us on a.userno = us.userno
where a.lectno=#lectno# and a.userno=#userno# and ifnull(b.isscd,0) = 0
<isNotNull property="notstudy">and ifnull(c.istatus,0) &lt; 2 and a.sdate &lt; now() and a.edate &gt; now()</isNotNull>
order by b.iseq
<isNotNull property="limit">limit $limit$</isNotNull>
</select>

2
Dao/MyBatis/Maps/User.xml
View File

@ -248,6 +248,7 @@
,CAST(AES_DECRYPT(UNHEX(a.birthday), <include refid="sql.digest"></include>) AS char) birthday
,a.uduty,a.slevel,a.isacceptmobile,a.vssn,a.di,a.ci,a.ischkatt,a.authplatform
, ifnull(us.playbar, 0) as playbar
, ifnull(us.isplay, 0) as isplay
,row_number() over(order by <isNotNull property="orderby">$orderby$</isNotNull><isNull property="orderby">a.username</isNull>) rno
,count(a.cdt) over() pagetotalcount
from users a
@ -406,6 +407,7 @@
update userstatus set playbar = #playbar#
,isplay = #isplay#
where userno = #userno#;
insert into userstatus(userno, playbar)

1
FO/Controllers/CRoomController.cs
View File

@ -20,6 +20,7 @@ namespace NP.FO.Controllers
public ActionResult Index()
{
vm.Lect = Dao.Get<Lect>("cr.main.mygrade", new System.Collections.Hashtable() { { "lectno", vm.croomlectno }, { "cmno", vm.croomcmno},{ "userno", SUserInfo.UserNo} }).FirstOrDefault();
ViewBag.fronturl = "https://" + Request.Url.Host;
//ViewBag.fronturl = GetConfig("fronturl");
ViewBag.Mobile = Dao.Get<Users>("users.users", new System.Collections.Hashtable() { { "userno", SUserInfo.UserNo } }).FirstOrDefault().mobile;

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

@ -1,5 +1,12 @@
@model NP.Model.VMCRoom
@{
// 임의학습과 같이 영상플레이 제한 해제
int preflag = 0;
bool isplay = false;
if (Model.LectInnings.Count > 0)
{
isplay = Model.LectInnings.First().isplay > 0 ? true : false;
}
}
<div class="lctcScore">
@ -249,8 +256,24 @@
<li class="lctc2">
@if (d.isonline == 1)
{
if(!isplay)
{
if (d.isseq == 1 && d.iseq != 1 && d.preistatus < 2)
{
preflag = 0;
}
else
{
preflag = 1;
}
}
else
{
preflag = 1;
}
//학습기간 종료후에도 시청은 가능하고, 출석인정은 되지않도록 변경 2021-01-25
<a href="#" onclick="playerOpen(@d.cmino, @(d.sdate < DateTime.Now && d.edate.AddYears(1) > DateTime.Now ? 1 : 0), @(d.isseq == 1 &&d.iseq != 1 && d.preistatus < 2 ? 0 : 1), @(d.istatus != 2 && Model.intval >= d.daylectinninglimit ? 0 : 1), @(d.daylectinninglimit));" class="lctcStdy">학습하기</a>
<a href="#" onclick="playerOpen(@d.cmino, @(d.sdate < DateTime.Now && d.edate.AddYears(1) > DateTime.Now ? 1 : 0), @(preflag), @(d.istatus != 2 && Model.intval >= d.daylectinninglimit ? 0 : 1), @(d.daylectinninglimit));" class="lctcStdy">학습하기</a>
}
</li>
</ul>

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

@ -1,6 +1,12 @@
@model NP.Model.VMCRoom
@{
// 임의학습과 같이 영상플레이 제한 해제
int preflag = 0;
bool isplay = false;
if (Model.LectInnings.Count > 0)
{
isplay = Model.LectInnings.First().isplay > 0 ? true : false;
}
}
@*<div class="lrnSch">
<a href="#" onclick="showatt()">출결이력조회</a>
@ -64,8 +70,23 @@
<li class="lctc2">
@if (d.isonline == 1)
{
if (!isplay)
{
if (d.isseq == 1 && d.iseq != 1 && d.preistatus < 2)
{
preflag = 0;
}
else
{
preflag = 1;
}
}
else
{
preflag = 1;
}
//학습기간 종료후에도 시청은 가능하고, 출석인정은 되지않도록 변경 2021-01-25
<a href="#" onclick="playerOpen(@d.cmino, @(d.sdate < DateTime.Now && d.edate.AddYears(1) > DateTime.Now ? 1 : 0), @(d.isseq == 1 && d.iseq != 1 && d.preistatus < 2 ? 0 : 1), @(d.istatus != 2 && Model.intval >= d.daylectinninglimit ? 0 : 1), @(d.daylectinninglimit));" class="lctcStdy">학습하기</a>
<a href="#" onclick="playerOpen(@d.cmino, @(d.sdate < DateTime.Now && d.edate.AddYears(1) > DateTime.Now ? 1 : 0), @(preflag), @(d.istatus != 2 && Model.intval >= d.daylectinninglimit ? 0 : 1), @(d.daylectinninglimit));" class="lctcStdy">학습하기</a>
}
</li>
</ul>

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" />

6
Model/CM.cs
View File

@ -3274,6 +3274,12 @@ namespace NP.Model
/// 일일 학습 회차 제한(0:무제한)
/// </summary>
public int daylectinninglimit { get; set; }
/// <summary>
/// 영상 임의학습과 같이 영상 플레이 (0:불가, 1:가능)
/// </summary>
public short isplay { get; set; }
}
[Serializable]

1
Model/Users.cs
View File

@ -255,6 +255,7 @@ namespace NP.Model
public int ischkatt { get; set; }
public short lectcomp { get; set; }
public short playbar { get; set; }
public short isplay { get; set; }
public AuthPlatform authplatform { get; set; }
}