培训

SGGL/BLL/BLL.csproj

@@ -690,11 +690,8 @@
     <Compile Include="HSSE\OccupationHealth\PhysicalExaminationService.cs" />
     <Compile Include="HSSE\Perfomance\PerfomanceRecordService.cs" />
     <Compile Include="HSSE\Perfomance\PersonPerfomanceService.cs" />
-<<<<<<< HEAD
-=======
     <Compile Include="HSSE\PostTraining\PostTrainingRecordDetailService.cs" />
     <Compile Include="HSSE\PostTraining\PostTrainingRecordService.cs" />
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
     <Compile Include="HSSE\PostTraining\PostTrainingStandardService.cs" />
     <Compile Include="HSSE\PostTraining\PostTrainingMethodService.cs" />
     <Compile Include="HSSE\PostTraining\PostTrainingTeachersService.cs" />

SGGL/BLL/Common/Const.cs

@@ -1729,14 +1729,11 @@ namespace BLL
         #region 岗位培训
 
         /// <summary>
-<<<<<<< HEAD
-=======
         /// 岗位培训记录
         /// </summary>
         public const string PostTrainingRecordMenuId = "CEF2A108-DDC2-46A2-A47B-7431F1F890F1";
 
         /// <summary>
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
         /// 岗位培训类别
         /// </summary>
         public const string PostTrainingCategoryMenuId = "465786B2-AD20-483A-A082-B2C944BE998F";

SGGL/BLL/HSSE/PostTraining/PostTrainingCategoryService.cs

@@ -60,11 +60,8 @@ namespace BLL
                 newModel.Code = model.Code;
                 newModel.Name = model.Name;
                 newModel.Remark = model.Remark;
-<<<<<<< HEAD
-=======
                 newModel.CompileDate = model.CompileDate;
                 newModel.CompileMan = model.CompileMan;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
                 Funs.DB.SubmitChanges();
             }
         }

SGGL/BLL/HSSE/PostTraining/PostTrainingCourseService.cs

@@ -1,19 +1,8 @@
-<<<<<<< HEAD
-using EmitMapper;
-using Microsoft.Office.Interop.Word;
-using MiniExcelLibs;
-=======
 using MiniExcelLibs;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using Model;
 using System.Collections.Generic;
 using System;
 using System.Linq;
-<<<<<<< HEAD
-using System.Runtime.CompilerServices;
-using Quartz.Util;
-=======
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace BLL
 {
@@ -75,11 +64,8 @@ namespace BLL
                 newModel.Teachers1 = model.Teachers1;
                 newModel.Teachers2 = model.Teachers2;
                 newModel.Remark = model.Remark;
-<<<<<<< HEAD
-=======
                 newModel.CompileDate = model.CompileDate;
                 newModel.CompileMan = model.CompileMan;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
                 Funs.DB.SubmitChanges();
             }
         }

SGGL/BLL/HSSE/PostTraining/PostTrainingMethodService.cs

@@ -60,11 +60,8 @@ namespace BLL
                 newModel.Code = model.Code;
                 newModel.Name = model.Name;
                 newModel.Remark = model.Remark;
-<<<<<<< HEAD
-=======
                 newModel.CompileDate = model.CompileDate;
                 newModel.CompileMan = model.CompileMan;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
                 Funs.DB.SubmitChanges();
             }
         }

SGGL/BLL/HSSE/PostTraining/PostTrainingRoleService.cs

@@ -50,11 +50,8 @@ namespace BLL
                 newModel.Code = model.Code;
                 newModel.Name = model.Name;
                 newModel.Remark = model.Remark;
-<<<<<<< HEAD
-=======
                 newModel.CompileDate = model.CompileDate;
                 newModel.CompileMan = model.CompileMan;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
                 Funs.DB.SubmitChanges();
             }
         }

SGGL/BLL/HSSE/PostTraining/PostTrainingStandardService.cs

@@ -1,24 +1,9 @@
-<<<<<<< HEAD
-using EmitMapper;
-using Microsoft.Office.Interop.Word;
-using MiniExcelLibs;
-=======
 using MiniExcelLibs;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using Model;
 using System.Collections.Generic;
 using System;
 using System.Linq;
-<<<<<<< HEAD
-using System.Runtime.CompilerServices;
-using Quartz.Util;
-using Microsoft.Office.Interop.Excel;
-using RestSharp;
 using System.Web.UI.WebControls;
-using Microsoft.SqlServer.Dts.Runtime;
-=======
-using System.Web.UI.WebControls;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace BLL
 {

SGGL/BLL/HSSE/PostTraining/PostTrainingTeachersService.cs

@@ -60,11 +60,8 @@ namespace BLL
                 newModel.Code = model.Code;
                 newModel.Name = model.Name;
                 newModel.Remark = model.Remark;
-<<<<<<< HEAD
-=======
                 newModel.CompileDate = model.CompileDate;
                 newModel.CompileMan = model.CompileMan;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
                 Funs.DB.SubmitChanges();
             }
         }

SGGL/FineUIPro.Web/FineUIPro.Web.csproj

@@ -2203,18 +2203,12 @@
     <Content Include="HSSE\Perfomance\PersonPerfomance.aspx" />
     <Content Include="HSSE\Perfomance\PersonPerfomanceEdit.aspx" />
     <Content Include="HSSE\Perfomance\PersonPerfomanceView.aspx" />
-<<<<<<< HEAD
-    <Content Include="HSSE\PostTraining\Standard.aspx" />
-    <Content Include="HSSE\PostTraining\StandardDataIn.aspx" />
-    <Content Include="HSSE\PostTraining\CourseDataIn.aspx" />
-=======
     <Content Include="HSSE\PostTraining\Record.aspx" />
     <Content Include="HSSE\PostTraining\SelectPerson.aspx" />
     <Content Include="HSSE\PostTraining\Standard.aspx" />
     <Content Include="HSSE\PostTraining\StandardDataIn.aspx" />
     <Content Include="HSSE\PostTraining\CourseDataIn.aspx" />
     <Content Include="HSSE\PostTraining\RecordEdit.aspx" />
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
     <Content Include="HSSE\PostTraining\StandardEdit.aspx" />
     <Content Include="HSSE\PostTraining\Teachers.aspx" />
     <Content Include="HSSE\PostTraining\TeachersEdit.aspx" />
@@ -15161,8 +15155,6 @@
     <Compile Include="HSSE\Perfomance\PersonPerfomanceView.aspx.designer.cs">
       <DependentUpon>PersonPerfomanceView.aspx</DependentUpon>
     </Compile>
-<<<<<<< HEAD
-=======
     <Compile Include="HSSE\PostTraining\Record.aspx.cs">
       <DependentUpon>Record.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -15177,7 +15169,6 @@
     <Compile Include="HSSE\PostTraining\SelectPerson.aspx.designer.cs">
       <DependentUpon>SelectPerson.aspx</DependentUpon>
     </Compile>
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
     <Compile Include="HSSE\PostTraining\Standard.aspx.cs">
       <DependentUpon>Standard.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -15199,8 +15190,6 @@
     <Compile Include="HSSE\PostTraining\CourseDataIn.aspx.designer.cs">
       <DependentUpon>CourseDataIn.aspx</DependentUpon>
     </Compile>
-<<<<<<< HEAD
-=======
     <Compile Include="HSSE\PostTraining\RecordEdit.aspx.cs">
       <DependentUpon>RecordEdit.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -15208,7 +15197,6 @@
     <Compile Include="HSSE\PostTraining\RecordEdit.aspx.designer.cs">
       <DependentUpon>RecordEdit.aspx</DependentUpon>
     </Compile>
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
     <Compile Include="HSSE\PostTraining\StandardEdit.aspx.cs">
       <DependentUpon>StandardEdit.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -20115,7 +20103,7 @@
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
   <ProjectExtensions>
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

SGGL/FineUIPro.Web/HSSE/Examine/BehavioralSafetyObservation.aspx.cs

@@ -1,19 +1,8 @@
 using System;
-<<<<<<< HEAD
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
-using BLL;
-using static System.Runtime.CompilerServices.RuntimeHelpers;
-=======
 using System.Data;
 using System.Linq;
 using System.Text;
 using BLL;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.Examine

SGGL/FineUIPro.Web/HSSE/Examine/BehavioralSafetyObservationEdit.aspx.cs

@@ -1,9 +1,5 @@
 using BLL;
 using System;
-<<<<<<< HEAD
-using System.Web;
-=======
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {

SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituation.aspx.cs

@@ -1,19 +1,8 @@
 using System;
-<<<<<<< HEAD
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
-using BLL;
-using static System.Runtime.CompilerServices.RuntimeHelpers;
-=======
 using System.Data;
 using System.Linq;
 using System.Text;
 using BLL;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.Examine

SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituationEdit.aspx.cs

@@ -1,9 +1,5 @@
 using BLL;
 using System;
-<<<<<<< HEAD
-using System.Web;
-=======
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {

SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivities.aspx.cs

@@ -1,19 +1,8 @@
 using System;
-<<<<<<< HEAD
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
-using BLL;
-using static System.Runtime.CompilerServices.RuntimeHelpers;
-=======
 using System.Data;
 using System.Linq;
 using System.Text;
 using BLL;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.Examine

SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivitiesEdit.aspx.cs

@@ -1,9 +1,5 @@
 using BLL;
 using System;
-<<<<<<< HEAD
-using System.Web;
-=======
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {

SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeeting.aspx.cs

@@ -1,19 +1,8 @@
 using System;
-<<<<<<< HEAD
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
-using BLL;
-using static System.Runtime.CompilerServices.RuntimeHelpers;
-=======
 using System.Data;
 using System.Linq;
 using System.Text;
 using BLL;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.Examine

SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeetingEdit.aspx.cs

@@ -1,9 +1,5 @@
 using BLL;
 using System;
-<<<<<<< HEAD
-using System.Web;
-=======
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {

SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituation.aspx.cs

@@ -1,19 +1,8 @@
 using System;
-<<<<<<< HEAD
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
-using BLL;
-using static System.Runtime.CompilerServices.RuntimeHelpers;
-=======
 using System.Data;
 using System.Linq;
 using System.Text;
 using BLL;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.Examine

SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituationEdit.aspx.cs

@@ -1,9 +1,5 @@
 using BLL;
 using System;
-<<<<<<< HEAD
-using System.Web;
-=======
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {

SGGL/FineUIPro.Web/HSSE/Examine/OnePersonPerFile.aspx.cs

@@ -1,17 +1,8 @@
 using BLL;
 using System;
 using System.Collections.Generic;
-<<<<<<< HEAD
-using System.Configuration;
-using System.Data;
-using System.Data.SqlClient;
-using System.Linq;
-using System.Text;
-using AspNet = System.Web.UI.WebControls;
-=======
 using System.Data;
 using System.Linq;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {

SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlan.aspx.cs

@@ -1,19 +1,8 @@
 using System;
-<<<<<<< HEAD
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
-using BLL;
-using static System.Runtime.CompilerServices.RuntimeHelpers;
-=======
 using System.Data;
 using System.Linq;
 using System.Text;
 using BLL;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.Examine

SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlanEdit.aspx.cs

@@ -1,9 +1,5 @@
 using BLL;
 using System;
-<<<<<<< HEAD
-using System.Web;
-=======
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {

SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperience.aspx.cs

@@ -1,16 +1,4 @@
 using System;
-<<<<<<< HEAD
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
-using BLL;
-using static System.Runtime.CompilerServices.RuntimeHelpers;
-using AspNet = System.Web.UI.WebControls;
-
-=======
 using System.Data;
 using System.Linq;
 using System.Text;
@@ -18,7 +6,6 @@ using BLL;
 using AspNet = System.Web.UI.WebControls;
 
 
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 namespace FineUIPro.Web.HSSE.Examine
 {
     public partial class SharingOfSafetyExperience : PageBase

SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperienceEdit.aspx.cs

@@ -1,9 +1,5 @@
 using BLL;
 using System;
-<<<<<<< HEAD
-using System.Web;
-=======
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {

SGGL/FineUIPro.Web/HSSE/Examine/StaffHSEInfoArchives.aspx.cs

@@ -1,19 +1,7 @@
 using BLL;
-<<<<<<< HEAD
-using FineUIPro.Web.HSSE.SitePerson;
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Data.SqlClient;
-using System.Linq;
-using System.Text;
-using AspNet = System.Web.UI.WebControls;
-=======
 using System;
 using System.Data;
 using System.Linq;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.Examine
 {

SGGL/FineUIPro.Web/HSSE/PostTraining/Category.aspx.cs

@@ -1,16 +1,7 @@
 using System;
-<<<<<<< HEAD
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
-=======
 using System.Data;
 using System.Linq;
 using System.Text;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using BLL;
 using AspNet = System.Web.UI.WebControls;
 

SGGL/FineUIPro.Web/HSSE/PostTraining/CategoryEdit.aspx.cs

@@ -1,9 +1,5 @@
 using BLL;
 using System;
-<<<<<<< HEAD
-using System.Web;
-=======
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {

SGGL/FineUIPro.Web/HSSE/PostTraining/Course.aspx.cs

@@ -4,10 +4,6 @@ using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
 using System.Text;
-<<<<<<< HEAD
-using System.Xml.Linq;
-=======
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using BLL;
 using AspNet = System.Web.UI.WebControls;
 

SGGL/FineUIPro.Web/HSSE/PostTraining/CourseDataIn.aspx.cs

@@ -6,11 +6,6 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Web;
-<<<<<<< HEAD
-using System.Web.UI;
-using System.Web.UI.WebControls;
-=======
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {

SGGL/FineUIPro.Web/HSSE/PostTraining/CourseEdit.aspx.cs

@@ -1,9 +1,5 @@
 using BLL;
 using System;
-<<<<<<< HEAD
-using System.Web;
-=======
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {

SGGL/FineUIPro.Web/HSSE/PostTraining/Method.aspx.cs

@@ -1,16 +1,7 @@
 using System;
-<<<<<<< HEAD
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
-=======
 using System.Data;
 using System.Linq;
 using System.Text;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using BLL;
 using AspNet = System.Web.UI.WebControls;
 

SGGL/FineUIPro.Web/HSSE/PostTraining/MethodEdit.aspx.cs

@@ -1,9 +1,5 @@
 using BLL;
 using System;
-<<<<<<< HEAD
-using System.Web;
-=======
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {

SGGL/FineUIPro.Web/HSSE/PostTraining/Role.aspx.cs

@@ -1,16 +1,7 @@
 using System;
-<<<<<<< HEAD
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
-=======
 using System.Data;
 using System.Linq;
 using System.Text;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using BLL;
 using AspNet = System.Web.UI.WebControls;
 

SGGL/FineUIPro.Web/HSSE/PostTraining/RoleEdit.aspx.cs

@@ -1,9 +1,5 @@
 using BLL;
 using System;
-<<<<<<< HEAD
-using System.Web;
-=======
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {

SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx

@@ -61,11 +61,7 @@
                         </f:Toolbar>
                     </Toolbars>
                     <Columns>
-<<<<<<< HEAD
-                        <f:TemplateField ColumnID="tfNumber" Width="50px" HeaderText="序号" HeaderTextAlign="Center" EnableLock="true" Locked="true"
-=======
                         <f:TemplateField ColumnID="tfNumber" Width="60px" HeaderText="序号" HeaderTextAlign="Center" EnableLock="true" Locked="true"
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
                             TextAlign="Center">
                             <ItemTemplate>
                                 <asp:Label ID="lblNumber" runat="server" Text='<%# Grid1.PageIndex * Grid1.PageSize + Container.DataItemIndex + 1 %>'></asp:Label>

SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx.cs

@@ -4,10 +4,6 @@ using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
 using System.Text;
-<<<<<<< HEAD
-using System.Xml.Linq;
-=======
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using BLL;
 using AspNet = System.Web.UI.WebControls;
 
@@ -103,11 +99,7 @@ namespace FineUIPro.Web.HSSE.PostTraining
             }
             if (this.drpRole.SelectedValue != BLL.Const._Null)
             {
-<<<<<<< HEAD
-                strSql += " AND Course.RoleId = @RoleId";
-=======
                 strSql += " AND Standard.RoleId = @RoleId";
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
                 listStr.Add(new SqlParameter("@RoleId", this.drpRole.SelectedValue));
             }
             if (this.drpCategory.SelectedValue != BLL.Const._Null)

SGGL/FineUIPro.Web/HSSE/PostTraining/StandardDataIn.aspx.cs

@@ -6,11 +6,6 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Web;
-<<<<<<< HEAD
-using System.Web.UI;
-using System.Web.UI.WebControls;
-=======
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {

SGGL/FineUIPro.Web/HSSE/PostTraining/StandardEdit.aspx.cs

@@ -1,11 +1,5 @@
 using BLL;
-<<<<<<< HEAD
-using Microsoft.Office.Interop.Excel;
 using System;
-using System.Web;
-=======
-using System;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {
@@ -167,11 +161,7 @@ namespace FineUIPro.Web.HSSE.PostTraining
             //newModel.RoleId = this.drpRole.SelectedValue;
             newModel.CourseId = this.drpCourse.SelectedValue;
             newModel.ClassHour = decimal.Parse(this.txtClassHour.Text.Trim());
-<<<<<<< HEAD
-            newModel.Cycle = int.Parse(this.txtCycle.Text.Trim());
-=======
             newModel.Cycle = decimal.Parse(this.txtCycle.Text.Trim());
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
             newModel.Method = this.drpMethod.SelectedText;
             newModel.Outcome = this.drpOutcome.SelectedText;
             newModel.Teachers = this.drpTeachers.SelectedText;

SGGL/FineUIPro.Web/HSSE/PostTraining/Teachers.aspx.cs

@@ -1,16 +1,7 @@
 using System;
-<<<<<<< HEAD
-using System.Collections.Generic;
-using System.Data;
-using System.Data.SqlClient;
-using System.Linq;
-using System.Text;
-using System.Xml.Linq;
-=======
 using System.Data;
 using System.Linq;
 using System.Text;
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 using BLL;
 using AspNet = System.Web.UI.WebControls;
 

SGGL/FineUIPro.Web/HSSE/PostTraining/TeachersEdit.aspx.cs

@@ -1,9 +1,5 @@
 using BLL;
 using System;
-<<<<<<< HEAD
-using System.Web;
-=======
->>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
 
 namespace FineUIPro.Web.HSSE.PostTraining
 {