lpf
/
xinjiang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

培训

This commit is contained in:
夏菊 2025-02-25 16:41:38 +08:00
parent b7c8a426bf 379ff372c5
commit 9a1dae2f31
40 changed files with 280 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SGGL/BLL/BLL.csproj
View File

@ -690,8 +690,11 @@
<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" />

3
SGGL/BLL/Common/Const.cs
View File

@ -1729,11 +1729,14 @@ 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";

3
SGGL/BLL/HSSE/PostTraining/PostTrainingCategoryService.cs
View File

@ -60,8 +60,11 @@ 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();
}
}

14
SGGL/BLL/HSSE/PostTraining/PostTrainingCourseService.cs
View File

@ -1,8 +1,19 @@
<<<<<<< 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
{
@ -64,8 +75,11 @@ 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();
}
}

3
SGGL/BLL/HSSE/PostTraining/PostTrainingMethodService.cs
View File

@ -60,8 +60,11 @@ 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();
}
}

3
SGGL/BLL/HSSE/PostTraining/PostTrainingRoleService.cs
View File

@ -50,8 +50,11 @@ 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();
}
}

15
SGGL/BLL/HSSE/PostTraining/PostTrainingStandardService.cs
View File

@ -1,9 +1,24 @@
<<<<<<< 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
{

3
SGGL/BLL/HSSE/PostTraining/PostTrainingTeachersService.cs
View File

@ -60,8 +60,11 @@ 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();
}
}

14
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -2203,12 +2203,18 @@
<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" />
@ -15155,6 +15161,8 @@
<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>
@ -15169,6 +15177,7 @@
<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>
@ -15190,6 +15199,8 @@
<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>
@ -15197,6 +15208,7 @@
<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>
@ -20103,7 +20115,7 @@
<WCFMetadata Include="Service References\" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions>
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">

11
SGGL/FineUIPro.Web/HSSE/Examine/BehavioralSafetyObservation.aspx.cs
View File

@ -1,8 +1,19 @@
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

4
SGGL/FineUIPro.Web/HSSE/Examine/BehavioralSafetyObservationEdit.aspx.cs
View File

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

11
SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituation.aspx.cs
View File

@ -1,8 +1,19 @@
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

4
SGGL/FineUIPro.Web/HSSE/Examine/BonusScoreSituationEdit.aspx.cs
View File

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

11
SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivities.aspx.cs
View File

@ -1,8 +1,19 @@
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

4
SGGL/FineUIPro.Web/HSSE/Examine/CoConstructionActivitiesEdit.aspx.cs
View File

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

11
SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeeting.aspx.cs
View File

@ -1,8 +1,19 @@
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

4
SGGL/FineUIPro.Web/HSSE/Examine/LeadershipJoinHomeworkAnalysisMeetingEdit.aspx.cs
View File

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

11
SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituation.aspx.cs
View File

@ -1,8 +1,19 @@
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

4
SGGL/FineUIPro.Web/HSSE/Examine/MinusScoreSituationEdit.aspx.cs
View File

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

9
SGGL/FineUIPro.Web/HSSE/Examine/OnePersonPerFile.aspx.cs
View File

@ -1,8 +1,17 @@
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
{

11
SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlan.aspx.cs
View File

@ -1,8 +1,19 @@
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

4
SGGL/FineUIPro.Web/HSSE/Examine/PersonalSafetyActionPlanEdit.aspx.cs
View File

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

13
SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperience.aspx.cs
View File

@ -1,4 +1,16 @@
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;
@ -6,6 +18,7 @@ using BLL;
using AspNet = System.Web.UI.WebControls;
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.Examine
{
public partial class SharingOfSafetyExperience : PageBase

4
SGGL/FineUIPro.Web/HSSE/Examine/SharingOfSafetyExperienceEdit.aspx.cs
View File

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

12
SGGL/FineUIPro.Web/HSSE/Examine/StaffHSEInfoArchives.aspx.cs
View File

@ -1,7 +1,19 @@
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
{

9
SGGL/FineUIPro.Web/HSSE/PostTraining/Category.aspx.cs
View File

@ -1,7 +1,16 @@
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;

4
SGGL/FineUIPro.Web/HSSE/PostTraining/CategoryEdit.aspx.cs
View File

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

4
SGGL/FineUIPro.Web/HSSE/PostTraining/Course.aspx.cs
View File

@ -4,6 +4,10 @@ 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;

5
SGGL/FineUIPro.Web/HSSE/PostTraining/CourseDataIn.aspx.cs
View File

@ -6,6 +6,11 @@ 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
{

4
SGGL/FineUIPro.Web/HSSE/PostTraining/CourseEdit.aspx.cs
View File

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

9
SGGL/FineUIPro.Web/HSSE/PostTraining/Method.aspx.cs
View File

@ -1,7 +1,16 @@
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;

4
SGGL/FineUIPro.Web/HSSE/PostTraining/MethodEdit.aspx.cs
View File

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

9
SGGL/FineUIPro.Web/HSSE/PostTraining/Role.aspx.cs
View File

@ -1,7 +1,16 @@
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;

4
SGGL/FineUIPro.Web/HSSE/PostTraining/RoleEdit.aspx.cs
View File

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

4
SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx
View File

@ -61,7 +61,11 @@
</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>

8
SGGL/FineUIPro.Web/HSSE/PostTraining/Standard.aspx.cs
View File

@ -4,6 +4,10 @@ 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;
@ -99,7 +103,11 @@ 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)

5
SGGL/FineUIPro.Web/HSSE/PostTraining/StandardDataIn.aspx.cs
View File

@ -6,6 +6,11 @@ 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
{

10
SGGL/FineUIPro.Web/HSSE/PostTraining/StandardEdit.aspx.cs
View File

@ -1,5 +1,11 @@
using BLL;
<<<<<<< HEAD
using Microsoft.Office.Interop.Excel;
using System;
using System.Web;
=======
using System;
>>>>>>> 7396d1b654f9a1d0172b2ac898a20175abe94d74
namespace FineUIPro.Web.HSSE.PostTraining
{
@ -161,7 +167,11 @@ 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;

9
SGGL/FineUIPro.Web/HSSE/PostTraining/Teachers.aspx.cs
View File

@ -1,7 +1,16 @@
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;

4
SGGL/FineUIPro.Web/HSSE/PostTraining/TeachersEdit.aspx.cs
View File

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