추가개발2
This commit is contained in:
parent
fe9f3252b0
commit
06251c9a4a
|
|
@ -713,9 +713,13 @@
|
|||
<Content Include="Views\user\LeaveHistory.cshtml" />
|
||||
<Content Include="Views\Shared\Partial\UserBoxSelect.cshtml" />
|
||||
<Content Include="Views\cm\cmregexset.cshtml" />
|
||||
<<<<<<< HEAD
|
||||
<None Include="Web.Staging.config">
|
||||
<DependentUpon>Web.config</DependentUpon>
|
||||
</None>
|
||||
=======
|
||||
<Content Include="Web.Staging.config" />
|
||||
>>>>>>> 8c571ed (추가개발2)
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="App_Data\" />
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@
|
|||
<li class="active"><a href="#" data-toggle="tab">학습콘텐츠</a></li>
|
||||
@if (!ViewBag.IsSubAdmin96)
|
||||
{
|
||||
<li class=""><a href="#" onclick="gotab(0);" data-toggle="tab">그룹코드관리</a></li>
|
||||
<li class=""><a href="#" onclick="gotab(2);" data-toggle="tab">문제</a></li>
|
||||
<li class=""><a href="#" onclick="gotab(0);" data-toggle="tab">그룹코드관리</a></li>
|
||||
<li class=""><a href="#" onclick="gotab(3);" data-toggle="tab">설문지</a></li>
|
||||
}
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -451,40 +451,48 @@
|
|||
<select id="cr.myestimation" parameterClass="hashtable" resultClass="data">
|
||||
select a.*
|
||||
from (
|
||||
select 0 dtype
|
||||
,null strval,0 intval10
|
||||
,0 intval,0 intval2,0 intval3,0 intval4,0 intval5
|
||||
,0 intval6
|
||||
,0 intval7
|
||||
,0 rno
|
||||
,null time
|
||||
,null time2
|
||||
from (select 1 col1) a
|
||||
where a.col1=0
|
||||
union all
|
||||
select -1 dtype
|
||||
,null strval,0 intval10
|
||||
,0 intval,0 intval2,0 intval3,0 intval4,a.attrate intval5
|
||||
,0 intval6
|
||||
,a.iscomplete intval7
|
||||
,0 rno
|
||||
,null time
|
||||
,null time2
|
||||
from lect a
|
||||
where a.lectno=#lectno# and a.userno=#userno#
|
||||
select 0 dtype
|
||||
,null strval,0 intval10
|
||||
,0 intval,0 intval2,0 intval3,0 intval4,0 intval5
|
||||
,0 intval6
|
||||
,0 intval7
|
||||
,0 rno
|
||||
,null time
|
||||
,null time2
|
||||
,null testsdate
|
||||
,null testedate
|
||||
from (select 1 col1) a
|
||||
where a.col1=0
|
||||
|
||||
union all
|
||||
|
||||
select -1 dtype
|
||||
,null strval,0 intval10
|
||||
,0 intval,0 intval2,0 intval3,0 intval4,a.attrate intval5
|
||||
,0 intval6
|
||||
,a.iscomplete intval7
|
||||
,0 rno
|
||||
,null time
|
||||
,null time2
|
||||
,null testsdate
|
||||
,null testedate
|
||||
from lect a
|
||||
where a.lectno=#lectno# and a.userno=#userno#
|
||||
<isNotNull property="exam">
|
||||
union all
|
||||
select b.extype dtype
|
||||
,b.exname strval,b.exno intval10
|
||||
,case when a.sdate < now() and a.edate > now() then a.attrate else -1 end intval,b.econdition intval2
|
||||
,case when c.eend is null then 0 else 1 end intval3
|
||||
,a.attrate intval5
|
||||
,null intval4
|
||||
,a2.studytime intval6
|
||||
,a.iscomplete intval7
|
||||
,row_number() over (partition by b.extype order by b.extype, b.cdt) rno
|
||||
,a.edate time
|
||||
,a.sdate time2
|
||||
,b.exname strval,b.exno intval10
|
||||
,case when a.sdate < now() and a.edate > now() then a.attrate else -1 end intval,b.econdition intval2
|
||||
,case when c.eend is null then 0 else 1 end intval3
|
||||
,a.attrate intval5
|
||||
,null intval4
|
||||
,a2.studytime intval6
|
||||
,a.iscomplete intval7
|
||||
,row_number() over (partition by b.extype order by b.extype, b.cdt) rno
|
||||
,a.edate time
|
||||
,a.sdate time2
|
||||
,b.testsdate
|
||||
,b.testedate
|
||||
from lect a
|
||||
inner join cm a2 on a2.cmno=a.cmno
|
||||
inner join cmex b on b.cmno=a.cmno and b.isdel=0
|
||||
|
|
@ -494,16 +502,18 @@
|
|||
<isNotNull property="subject">
|
||||
union all
|
||||
select 2 dtype
|
||||
,b.sdname strval,b.sdno intval10
|
||||
,case when a.sdate < now() and a.edate > now() then a.attrate else -1 end intval,b.sdcondition intval2
|
||||
,case when c.submittime is null then 0 else 1 end intval3
|
||||
,case when c.checktime is null then 0 else 1 end intval4
|
||||
,a.attrate intval5
|
||||
,a2.studytime intval6
|
||||
,a.iscomplete intval7
|
||||
,row_number() over (order by b.cdt) rno
|
||||
,a.edate time
|
||||
,a.sdate time2
|
||||
,b.sdname strval,b.sdno intval10
|
||||
,case when a.sdate < now() and a.edate > now() then a.attrate else -1 end intval,b.sdcondition intval2
|
||||
,case when c.submittime is null then 0 else 1 end intval3
|
||||
,case when c.checktime is null then 0 else 1 end intval4
|
||||
,a.attrate intval5
|
||||
,a2.studytime intval6
|
||||
,a.iscomplete intval7
|
||||
,row_number() over (order by b.cdt) rno
|
||||
,a.edate time
|
||||
,a.sdate time2
|
||||
,null testsdate
|
||||
,null testedate
|
||||
from lect a
|
||||
inner join cm a2 on a2.cmno=a.cmno
|
||||
inner join cmsd b on b.cmno=a.cmno and b.sdtype=0 and b.isdel=0
|
||||
|
|
@ -523,6 +533,8 @@
|
|||
,row_number() over (order by b.cdt) rno
|
||||
,a.edate time
|
||||
,a.sdate time2
|
||||
,null testsdate
|
||||
,null testedate
|
||||
from lect a
|
||||
inner join cm a2 on a2.cmno=a.cmno
|
||||
inner join cmsd b on b.cmno=a.cmno and b.sdtype=1 and b.isdel=0
|
||||
|
|
@ -545,6 +557,8 @@
|
|||
,case when
|
||||
case when case when a.isrebate = 1 then f.midcutrfd else f.midcut end <= ifnull(e.ex0lectpoint,0) then 1 else 0 end = 1 and case when case when a.isrebate = 1 then f.finalcutrfd else f.finalcut end <= ifnull(e.ex1lectpoint,0) then 1 else 0 end = 1
|
||||
then 1 else 0 end ispass
|
||||
,c.testsdate
|
||||
,c.testedate
|
||||
from lect a
|
||||
inner join cm b on b.cmno=a.cmno
|
||||
inner join cmex c on c.exno=#exno#
|
||||
|
|
@ -567,16 +581,16 @@
|
|||
<include refid="lectexcreate"></include>
|
||||
|
||||
select case when a.etime = 0 then 99999999 else TIMESTAMPDIFF(MINUTE, now(), date_add(ifnull(b.estart, now()), interval a.etime MINUTE)) end etime
|
||||
,a.qcount,a.evtype,a.israndqi,a.tpoint,a.isblur,a.isusebackup,a.isseq
|
||||
,b.cblock
|
||||
,c.atext,c.qseq
|
||||
,d.eqno,d.rpoint
|
||||
,e.atype,e.qtext,e.qno,e.rightcount,e.ispassspace,e.isignorecase
|
||||
,a.qcount,a.evtype,a.israndqi,a.tpoint,a.isblur,a.isusebackup,a.isseq
|
||||
,b.cblock
|
||||
,c.atext,c.qseq
|
||||
,d.eqno,d.rpoint
|
||||
,e.atype,e.qtext,e.qno,e.rightcount,e.ispassspace,e.isignorecase
|
||||
from cmex a
|
||||
inner join cm a3 on a3.cmno=a.cmno
|
||||
inner join lect a2 on a2.lectno=#lectno# and a2.userno=#userno#
|
||||
inner join lectex b on b.lectno=a2.lectno and b.exno=a.exno and b.eend is null and (a.etime = 0 or date_add(ifnull(b.estart, now()), interval a.etime MINUTE) > now())
|
||||
and ifnull(b.entercount,0) <= ifnull(a.relaylimit, 999)
|
||||
and ifnull(b.entercount,0) <= ifnull(a.relaylimit, 999)
|
||||
inner join lectexq c on c.lectno=b.lectno and c.exno=b.exno
|
||||
inner join cmexq d on d.eqno=c.eqno
|
||||
inner join question e on e.qno=d.qno
|
||||
|
|
@ -587,11 +601,11 @@
|
|||
inner join lect a2 on a2.lectno=a.lectno and a2.userno=#userno#
|
||||
inner join cmex b on b.exno=a.exno
|
||||
set
|
||||
a.estart=case when a.estart is null then now() else a.estart end
|
||||
,a.entercount=ifnull(a.entercount,0)+1
|
||||
,a.uno=#uno#
|
||||
,a.uip=#uip#
|
||||
,a.eip=#uip#
|
||||
a.estart=case when a.estart is null then now() else a.estart end
|
||||
,a.entercount=ifnull(a.entercount,0)+1
|
||||
,a.uno=#uno#
|
||||
,a.uip=#uip#
|
||||
,a.eip=#uip#
|
||||
where a.lectno=#lectno# and a.exno=#exno# and a.eend is null and ifnull(a.entercount,0) <= ifnull(b.relaylimit, 999)
|
||||
</select>
|
||||
<select id="cr.userexamquestionitem.get" parameterClass="hashtable" resultClass="questionitem">
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -762,9 +762,13 @@
|
|||
<None Include="Web.Develop.config">
|
||||
<DependentUpon>Web.config</DependentUpon>
|
||||
</None>
|
||||
<<<<<<< HEAD
|
||||
<None Include="Web.Staging.config">
|
||||
<DependentUpon>Web.config</DependentUpon>
|
||||
</None>
|
||||
=======
|
||||
<None Include="Web.Staging.config" />
|
||||
>>>>>>> 8c571ed (추가개발2)
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Base\Base.csproj">
|
||||
|
|
|
|||
Loading…
Reference in New Issue