추가개발2

BO/BO.csproj

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

BO/Views/cm/ctr.cshtml

@@ -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>

BO/bin/MyBatis/Maps/CRoom.xml

@@ -459,9 +459,13 @@
 			        ,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
@@ -470,6 +474,8 @@
 			        ,0 rno
 			        ,null time
 			        ,null time2
+			        ,null testsdate
+			        ,null testedate
 			    from lect a
     			where a.lectno=#lectno# and a.userno=#userno#
 			<isNotNull property="exam">
@@ -485,6 +491,8 @@
 				    ,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
@@ -504,6 +512,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=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 &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
+			  ,c.testsdate
+			  ,c.testedate
             from lect a
             inner join cm b on b.cmno=a.cmno
             inner join cmex c on c.exno=#exno#

FO/FO.csproj

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