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

수정사항 일괄커밋

This commit is contained in:
jity7777 2024-06-24 03:45:12 +00:00
parent bb1bcb62ba
commit 38f453a81a
10 changed files with 48 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,6 +62,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.ischkatt }, { "name", "User.ischkatt" } })</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.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 @(Model.viewname =="user" ? "req" : "")">이메일</label>
@ -596,7 +600,7 @@
else if (check("User_username", null, "이름을 입력해주세요.")) { }
else if (('@Model.viewname' == 'user') && check("User_email",null,"이메일을 입력해주세요")) { }
//else if (('@Model.viewname' == 'user') && check("User_mobile", null, "핸드폰 번호를 입력해주세요")) { }
else if (!isnulloremt(val("User_email")) && !isemail(val("User_email"))) { focus("User_email"); msg("이메일주소를 올바르게 입력해주세요."); }
else if (!isnulloremt(val("User_email")) && !isemail(val("User_email")) && !isemail2(val("User_email"))) { focus("User_email"); msg("이메일주소를 올바르게 입력해주세요."); }
//else if (!isnulloremt(val("User_mobile")) && (!ismobile(val("User_mobile")) )) { focus("User_mobile"); msg("핸드폰번호를 올바르게 입력해주세요."); }
//else if ((val("User_usertype") == "1" || val("User_usertype") == "81") && val("User_asno") == "") { msg("소속을 등록해주세요.");}
else if (confirm(txt)) {

8
BO/js/site.js
View File

@ -1198,6 +1198,14 @@ function isemail(v) {
}
return false;
}
function isemail2(v) {
//이메일 검사
var regExp = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
if (regExp.test(v)) {
return true;
}
return false;
}
function checkid(v) {
var idReg = /^[a-z]+[a-z0-9]{5,15}$/g;
if (!idReg.test(v)) {

1
Base/Controller/FOCommon.cs
View File

@ -411,6 +411,7 @@ namespace NP.Base.Controllers
return JsonOK(0);
}
[HttpPost]
/// 반환값이 100일때 플레이바 및 다음페이지이동 허용
public JsonResult PRGRS(Int64 lectno, Int64 cmino)
{
if (SUserInfo.UserNo > 0)

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

@ -280,11 +280,13 @@
order by a.iseq
</select>
<select id="cr.getprogress" parameterClass="hashtable" resultClass="int">
select case when b.atime=0 then 100
select case when b.atime=0 or ifnull(us.no,0) > 0 then 100
else case when floor(a.totstudy / (b.sttime * 60) * 100) &gt; 100 then 100 else floor(a.totstudy / (b.sttime * 60) * 100) end end
from lectinning a
inner join cminning b on b.cmino=a.cmino
where a.lectno=#lectno# and a.cmino=#cmino#
from lectinning a
inner join cminning b on b.cmino=a.cmino
inner join lect c on a.lectno = c.lectno
left outer join userstatus us on c.userno = us.userno and us.playbar = 1
where a.lectno=#lectno# and a.cmino=#cmino#
</select>
<select id="cr.checklectdate" parameterClass="hashtable" resultClass="lect">
select a.lectno,a.sdate,a.edate

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

@ -246,8 +246,9 @@
,case when c.refcode='9' then a.ccpositionetc else c.cname end ccpositionname
,case when a.usertype=1 then '교육생' when d.authname is null then '-' else d.authname end usertypestr
,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
,row_number() over(order by <isNotNull property="orderby">$orderby$</isNotNull><isNull property="orderby">a.username</isNull>) rno
,a.uduty,a.slevel,a.isacceptmobile,a.vssn,a.di,a.ci,a.ischkatt,a.authplatform
, ifnull(us.playbar, 0) as playbar
,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
left outer join assign b on b.asno=a.asno and b.isdel=0
@ -256,6 +257,7 @@
select distinct usertype,authname
from menuauth
) d on d.usertype = a.usertype
left outer join userstatus us on a.userno = us.userno
where a.status &lt; 99
<isNull property="includesysadmin">and a.usertype &lt;&gt; 91</isNull>
<isNotNull property="userno">and a.userno =#userno#</isNotNull>
@ -356,6 +358,7 @@
update userpasslog set userpass = #userpass#
where userno=#userno#;
</isNotNull>
update users set <include refid="sql.up"></include>
@ -395,11 +398,21 @@
</isEqual>
,status =case when #status# &gt; 0 then #status# else status end
,ischkatt = #ischkatt#
,authplatform =case when #authplatform# &gt; 0 then #authplatform# else authplatform end
,di =case when #di# is not null then #di# else di end
,ci =case when #ci# is not null then #ci# else ci end
,vssn =case when #vssn# is not null then #vssn# else vssn end
where userno=#userno#;
,authplatform =case when #authplatform# &gt; 0 then #authplatform# else authplatform end
,di =case when #di# is not null then #di# else di end
,ci =case when #ci# is not null then #ci# else ci end
,vssn =case when #vssn# is not null then #vssn# else vssn end
where userno=#userno#;
update userstatus set playbar = #playbar#
where userno = #userno#;
insert into userstatus(userno, playbar)
select a.userno, #playbar#
from users a
left outer join userstatus b on a.userno = b.userno
where a.userno = #userno# and b.no is null;
</update>
<update id="users.exitjoin" parameterClass="hashtable">
update users set <include refid="sql.up"></include>

2
FO/Views/Account/FindMe.cshtml
View File

@ -56,7 +56,7 @@
});
function findme() {
setv("email", val("email").replace(/ /, '').replace(/ /, ''));
if (!isemail(val("email"))) { focus("email"); msg("올바른 이메일주소를 입력해주세요."); }
if (!isemail(val("email")) && !isemail2(val("email"))) { focus("email"); msg("올바른 이메일주소를 입력해주세요."); }
else {
capp("/focommon/findme", { email: val("email") }, "cbfindme");
}

3
FO/Views/CDMS/Contents.cshtml
View File

@ -543,6 +543,7 @@
//clearInterval(_timerlog);
golog(true);
}
function getprgrs() {
var r = -1;
if (@Model.istaste == 1) {
@ -550,7 +551,7 @@
} else {
$.ajax({
type: "post",
url: "/focommon/prgrs",
url: "/focommon/prgrs", @*플레이바 제어매서드*@
async: false,
data: { lectno: @Model.lip.lectno, cmino: @Model.lip.cmino},
success: function (r2) {

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

@ -350,7 +350,7 @@
else if (val("userpass") != "" && val("userpass") != val("userpass2")) { focus("userpass2"); msg("비밀번호 확인이 다릅니다."); }
else if (check("mobile", null, "휴대전화번호를 입력해주세요.")) { }
else if (!ismobilenumber(val("mobile"))) { focus("mobile"); msg("휴대전화번호를 확인해주세요."); }
else if (!isemail(val("email"))) { focus("email1"); msg("올바른 이메일주소를 입력해주세요."); }
else if (!isemail(val("email")) && !isemail2(val("email"))) { focus("email1"); msg("올바른 이메일주소를 입력해주세요."); }
//else if ($("input:radio[name='isCompany']:checked").val() == "1" && check("asno", "btnassign", "직장을 선택해주세요.")) { }
else {
cap("/fcommon/UserPassCheck", "mform", "save2");

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

2
Model/Users.cs
View File

@ -253,6 +253,8 @@ namespace NP.Model
public String ci { get; set; }
public String vssn { get; set; }
public int ischkatt { get; set; }
public short lectcomp { get; set; }
public short playbar { get; set; }
public AuthPlatform authplatform { get; set; }
}