Compare commits

..

No commits in common. "bd5fc1cdfb3fbeda9ef9ee8e0b42e3ef3d044c7d" and "a85375e94e61a3cbcadee82625b31eb5f19970a0" have entirely different histories.

13 changed files with 61 additions and 2064 deletions

View File

@ -713,7 +713,9 @@
<Content Include="Views\user\LeaveHistory.cshtml" /> <Content Include="Views\user\LeaveHistory.cshtml" />
<Content Include="Views\Shared\Partial\UserBoxSelect.cshtml" /> <Content Include="Views\Shared\Partial\UserBoxSelect.cshtml" />
<Content Include="Views\cm\cmregexset.cshtml" /> <Content Include="Views\cm\cmregexset.cshtml" />
<Content Include="Web.Staging.config" /> <None Include="Web.Staging.config">
<DependentUpon>Web.config</DependentUpon>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="App_Data\" /> <Folder Include="App_Data\" />

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -18,8 +18,8 @@
<li class="active"><a href="#" data-toggle="tab">학습콘텐츠</a></li> <li class="active"><a href="#" data-toggle="tab">학습콘텐츠</a></li>
@if (!ViewBag.IsSubAdmin96) @if (!ViewBag.IsSubAdmin96)
{ {
<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(0);" data-toggle="tab">그룹코드관리</a></li>
<li class=""><a href="#" onclick="gotab(2);" data-toggle="tab">문제</a></li>
<li class=""><a href="#" onclick="gotab(3);" data-toggle="tab">설문지</a></li> <li class=""><a href="#" onclick="gotab(3);" data-toggle="tab">설문지</a></li>
} }
</ul> </ul>

View File

@ -459,13 +459,9 @@
,0 rno ,0 rno
,null time ,null time
,null time2 ,null time2
,null testsdate
,null testedate
from (select 1 col1) a from (select 1 col1) a
where a.col1=0 where a.col1=0
union all union all
select -1 dtype select -1 dtype
,null strval,0 intval10 ,null strval,0 intval10
,0 intval,0 intval2,0 intval3,0 intval4,a.attrate intval5 ,0 intval,0 intval2,0 intval3,0 intval4,a.attrate intval5
@ -474,8 +470,6 @@
,0 rno ,0 rno
,null time ,null time
,null time2 ,null time2
,null testsdate
,null testedate
from lect a from lect a
where a.lectno=#lectno# and a.userno=#userno# where a.lectno=#lectno# and a.userno=#userno#
<isNotNull property="exam"> <isNotNull property="exam">
@ -491,8 +485,6 @@
,row_number() over (partition by b.extype order by b.extype, b.cdt) rno ,row_number() over (partition by b.extype order by b.extype, b.cdt) rno
,a.edate time ,a.edate time
,a.sdate time2 ,a.sdate time2
,b.testsdate
,b.testedate
from lect a from lect a
inner join cm a2 on a2.cmno=a.cmno inner join cm a2 on a2.cmno=a.cmno
inner join cmex b on b.cmno=a.cmno and b.isdel=0 inner join cmex b on b.cmno=a.cmno and b.isdel=0
@ -512,8 +504,6 @@
,row_number() over (order by b.cdt) rno ,row_number() over (order by b.cdt) rno
,a.edate time ,a.edate time
,a.sdate time2 ,a.sdate time2
,null testsdate
,null testedate
from lect a from lect a
inner join cm a2 on a2.cmno=a.cmno 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 inner join cmsd b on b.cmno=a.cmno and b.sdtype=0 and b.isdel=0
@ -533,8 +523,6 @@
,row_number() over (order by b.cdt) rno ,row_number() over (order by b.cdt) rno
,a.edate time ,a.edate time
,a.sdate time2 ,a.sdate time2
,null testsdate
,null testedate
from lect a from lect a
inner join cm a2 on a2.cmno=a.cmno 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 inner join cmsd b on b.cmno=a.cmno and b.sdtype=1 and b.isdel=0
@ -557,8 +545,6 @@
,case when ,case when
case when case when a.isrebate = 1 then f.midcutrfd else f.midcut end &lt;= 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 &lt;= ifnull(e.ex1lectpoint,0) then 1 else 0 end = 1 case when case when a.isrebate = 1 then f.midcutrfd else f.midcut end &lt;= 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 &lt;= ifnull(e.ex1lectpoint,0) then 1 else 0 end = 1
then 1 else 0 end ispass then 1 else 0 end ispass
,c.testsdate
,c.testedate
from lect a from lect a
inner join cm b on b.cmno=a.cmno inner join cm b on b.cmno=a.cmno
inner join cmex c on c.exno=#exno# inner join cmex c on c.exno=#exno#

Binary file not shown.

Binary file not shown.

View File

@ -758,13 +758,13 @@
<Content Include="Views\Course\SmartSearch.cshtml" /> <Content Include="Views\Course\SmartSearch.cshtml" />
<Content Include="Views\Account\FindIDPW.cshtml" /> <Content Include="Views\Account\FindIDPW.cshtml" />
<Content Include="Views\Account\NewPassword.cshtml" /> <Content Include="Views\Account\NewPassword.cshtml" />
<Content Include="Properties\PublishProfiles\FolderProfile.pubxml" /> <None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
<Content Include="Web.Develop.config"> <None Include="Web.Develop.config">
<DependentUpon>Web.config</DependentUpon> <DependentUpon>Web.config</DependentUpon>
</Content> </None>
<Content Include="Web.Staging.config"> <None Include="Web.Staging.config">
<DependentUpon>Web.config</DependentUpon> <DependentUpon>Web.config</DependentUpon>
</Content> </None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Base\Base.csproj"> <ProjectReference Include="..\Base\Base.csproj">