Skip to content

Commit 26ada08

Browse files
shaili-shahshaili-shah
committed
changes for experience detail
1 parent 8d2644f commit 26ada08

26 files changed

+355
-8
lines changed

‎.vs/Demo/v16/.suo‎

6 KB
Binary file not shown.

‎Controllers/DetailController.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@ public ActionResult TeamDetail(TeamDetailModel model, HttpPostedFileBase postedF
8989
model.ResumeFileModel = fileModel;
9090
}
9191

92+
if(model != null && model.LstExprienceDetailModel != null && model.LstExprienceDetailModel.Any())
93+
{
94+
model.LstExprienceDetailModel = model.LstExprienceDetailModel.Where(x => x.Company != null).ToList();
95+
}
96+
9297

9398
Ide.AddTeamDetail(model);
9499

@@ -97,6 +102,12 @@ public ActionResult TeamDetail(TeamDetailModel model, HttpPostedFileBase postedF
97102
return RedirectToAction("Index");
98103
}
99104

105+
public ActionResult NewExprienceDetailRow(int id)
106+
{
107+
var model = new ExprienceDetailModel { Id = id };
108+
return View("_NewExprienceDetailRow", model);
109+
}
110+
100111
public ActionResult Detail(int? activeTab)
101112
{
102113
ViewBag.ActiveTab = activeTab;

‎DbModel.Context.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
2828
public virtual DbSet<BankDetail> BankDetails { get; set; }
2929
public virtual DbSet<CurrentStatu> CurrentStatus { get; set; }
3030
public virtual DbSet<Detail> Details { get; set; }
31+
public virtual DbSet<ExprienceDetail> ExprienceDetails { get; set; }
3132
public virtual DbSet<File> Files { get; set; }
3233
public virtual DbSet<ProfessionalDetail> ProfessionalDetails { get; set; }
3334
public virtual DbSet<Skill> Skills { get; set; }

‎DbModel.edmx‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,19 @@
4040
<Property Name="Email" Type="nvarchar" MaxLength="50" Nullable="false" />
4141
<Property Name="FileId" Type="int" />
4242
</EntityType>
43+
<EntityType Name="ExprienceDetail">
44+
<Key>
45+
<PropertyRef Name="Id" />
46+
</Key>
47+
<Property Name="Id" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
48+
<Property Name="Company" Type="nvarchar" MaxLength="50" Nullable="false" />
49+
<Property Name="Designation" Type="nvarchar" MaxLength="50" />
50+
<Property Name="Department" Type="nvarchar" MaxLength="50" />
51+
<Property Name="CTC" Type="nvarchar" MaxLength="50" />
52+
<Property Name="From" Type="datetime" />
53+
<Property Name="To" Type="datetime" />
54+
<Property Name="DetailId" Type="int" Nullable="false" />
55+
</EntityType>
4356
<EntityType Name="File">
4457
<Key>
4558
<PropertyRef Name="Id" />
@@ -103,6 +116,18 @@
103116
</Dependent>
104117
</ReferentialConstraint>
105118
</Association>
119+
<Association Name="FK_ExprienceDetail_Details">
120+
<End Role="Details" Type="Self.Details" Multiplicity="1" />
121+
<End Role="ExprienceDetail" Type="Self.ExprienceDetail" Multiplicity="*" />
122+
<ReferentialConstraint>
123+
<Principal Role="Details">
124+
<PropertyRef Name="Id" />
125+
</Principal>
126+
<Dependent Role="ExprienceDetail">
127+
<PropertyRef Name="DetailId" />
128+
</Dependent>
129+
</ReferentialConstraint>
130+
</Association>
106131
<Association Name="FK_ProfessionalDetail_Details">
107132
<End Role="Details" Type="Self.Details" Multiplicity="1" />
108133
<End Role="ProfessionalDetail" Type="Self.ProfessionalDetail" Multiplicity="*" />
@@ -131,6 +156,7 @@
131156
<EntitySet Name="BankDetails" EntityType="Self.BankDetails" Schema="dbo" store:Type="Tables" />
132157
<EntitySet Name="CurrentStatus" EntityType="Self.CurrentStatus" Schema="dbo" store:Type="Tables" />
133158
<EntitySet Name="Details" EntityType="Self.Details" Schema="dbo" store:Type="Tables" />
159+
<EntitySet Name="ExprienceDetail" EntityType="Self.ExprienceDetail" Schema="dbo" store:Type="Tables" />
134160
<EntitySet Name="File" EntityType="Self.File" Schema="dbo" store:Type="Tables" />
135161
<EntitySet Name="ProfessionalDetail" EntityType="Self.ProfessionalDetail" Schema="dbo" store:Type="Tables" />
136162
<EntitySet Name="Skill" EntityType="Self.Skill" Schema="dbo" store:Type="Tables" />
@@ -146,6 +172,10 @@
146172
<End Role="File" EntitySet="File" />
147173
<End Role="Details" EntitySet="Details" />
148174
</AssociationSet>
175+
<AssociationSet Name="FK_ExprienceDetail_Details" Association="Self.FK_ExprienceDetail_Details">
176+
<End Role="Details" EntitySet="Details" />
177+
<End Role="ExprienceDetail" EntitySet="ExprienceDetail" />
178+
</AssociationSet>
149179
<AssociationSet Name="FK_ProfessionalDetail_Details" Association="Self.FK_ProfessionalDetail_Details">
150180
<End Role="Details" EntitySet="Details" />
151181
<End Role="ProfessionalDetail" EntitySet="ProfessionalDetail" />
@@ -163,6 +193,7 @@
163193
<EntitySet Name="BankDetails" EntityType="DemoModel.BankDetail" />
164194
<EntitySet Name="CurrentStatus" EntityType="DemoModel.CurrentStatu" />
165195
<EntitySet Name="Details" EntityType="DemoModel.Detail" />
196+
<EntitySet Name="ExprienceDetails" EntityType="DemoModel.ExprienceDetail" />
166197
<EntitySet Name="Files" EntityType="DemoModel.File" />
167198
<EntitySet Name="ProfessionalDetails" EntityType="DemoModel.ProfessionalDetail" />
168199
<EntitySet Name="Skills" EntityType="DemoModel.Skill" />
@@ -178,6 +209,10 @@
178209
<End Role="File" EntitySet="Files" />
179210
<End Role="Detail" EntitySet="Details" />
180211
</AssociationSet>
212+
<AssociationSet Name="FK_ExprienceDetail_Details" Association="DemoModel.FK_ExprienceDetail_Details">
213+
<End Role="Detail" EntitySet="Details" />
214+
<End Role="ExprienceDetail" EntitySet="ExprienceDetails" />
215+
</AssociationSet>
181216
<AssociationSet Name="FK_ProfessionalDetail_Details" Association="DemoModel.FK_ProfessionalDetail_Details">
182217
<End Role="Detail" EntitySet="Details" />
183218
<End Role="ProfessionalDetail" EntitySet="ProfessionalDetails" />
@@ -226,8 +261,23 @@
226261
<NavigationProperty Name="BankDetails" Relationship="DemoModel.FK_BankDetails_Details" FromRole="Detail" ToRole="BankDetail" />
227262
<NavigationProperty Name="CurrentStatus" Relationship="DemoModel.FK_CurrentStatus_Details" FromRole="Detail" ToRole="CurrentStatu" />
228263
<NavigationProperty Name="File" Relationship="DemoModel.FK_Details_File" FromRole="Detail" ToRole="File" />
264+
<NavigationProperty Name="ExprienceDetails" Relationship="DemoModel.FK_ExprienceDetail_Details" FromRole="Detail" ToRole="ExprienceDetail" />
229265
<NavigationProperty Name="ProfessionalDetails" Relationship="DemoModel.FK_ProfessionalDetail_Details" FromRole="Detail" ToRole="ProfessionalDetail" />
230266
</EntityType>
267+
<EntityType Name="ExprienceDetail">
268+
<Key>
269+
<PropertyRef Name="Id" />
270+
</Key>
271+
<Property Name="Id" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
272+
<Property Name="Company" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
273+
<Property Name="Designation" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
274+
<Property Name="Department" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
275+
<Property Name="CTC" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
276+
<Property Name="From" Type="DateTime" Precision="3" />
277+
<Property Name="To" Type="DateTime" Precision="3" />
278+
<Property Name="DetailId" Type="Int32" Nullable="false" />
279+
<NavigationProperty Name="Detail" Relationship="DemoModel.FK_ExprienceDetail_Details" FromRole="ExprienceDetail" ToRole="Detail" />
280+
</EntityType>
231281
<EntityType Name="File">
232282
<Key>
233283
<PropertyRef Name="Id" />
@@ -295,6 +345,18 @@
295345
</Dependent>
296346
</ReferentialConstraint>
297347
</Association>
348+
<Association Name="FK_ExprienceDetail_Details">
349+
<End Type="DemoModel.Detail" Role="Detail" Multiplicity="1" />
350+
<End Type="DemoModel.ExprienceDetail" Role="ExprienceDetail" Multiplicity="*" />
351+
<ReferentialConstraint>
352+
<Principal Role="Detail">
353+
<PropertyRef Name="Id" />
354+
</Principal>
355+
<Dependent Role="ExprienceDetail">
356+
<PropertyRef Name="DetailId" />
357+
</Dependent>
358+
</ReferentialConstraint>
359+
</Association>
298360
<Association Name="FK_ProfessionalDetail_Details">
299361
<End Type="DemoModel.Detail" Role="Detail" Multiplicity="1" />
300362
<End Type="DemoModel.ProfessionalDetail" Role="ProfessionalDetail" Multiplicity="*" />
@@ -363,6 +425,20 @@
363425
</MappingFragment>
364426
</EntityTypeMapping>
365427
</EntitySetMapping>
428+
<EntitySetMapping Name="ExprienceDetails">
429+
<EntityTypeMapping TypeName="DemoModel.ExprienceDetail">
430+
<MappingFragment StoreEntitySet="ExprienceDetail">
431+
<ScalarProperty Name="DetailId" ColumnName="DetailId" />
432+
<ScalarProperty Name="To" ColumnName="To" />
433+
<ScalarProperty Name="From" ColumnName="From" />
434+
<ScalarProperty Name="CTC" ColumnName="CTC" />
435+
<ScalarProperty Name="Department" ColumnName="Department" />
436+
<ScalarProperty Name="Designation" ColumnName="Designation" />
437+
<ScalarProperty Name="Company" ColumnName="Company" />
438+
<ScalarProperty Name="Id" ColumnName="Id" />
439+
</MappingFragment>
440+
</EntityTypeMapping>
441+
</EntitySetMapping>
366442
<EntitySetMapping Name="Files">
367443
<EntityTypeMapping TypeName="DemoModel.File">
368444
<MappingFragment StoreEntitySet="File">

‎DbModel.edmx.diagram‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@
55
<!-- Diagram content (shape and connector positions) -->
66
<edmx:Diagrams>
77
<Diagram DiagramId="545b04df9b1343df8b0d29a768294e2e" Name="Diagram1">
8-
<EntityTypeShape EntityType="DemoModel.BankDetail" Width="1.5" PointX="5.25" PointY="6.25" />
9-
<EntityTypeShape EntityType="DemoModel.CurrentStatu" Width="1.5" PointX="5.25" PointY="9.375" />
10-
<EntityTypeShape EntityType="DemoModel.Detail" Width="1.5" PointX="3" PointY="4.25" />
11-
<EntityTypeShape EntityType="DemoModel.File" Width="1.5" PointX="0.75" PointY="4.625" />
12-
<EntityTypeShape EntityType="DemoModel.ProfessionalDetail" Width="1.5" PointX="5.25" PointY="2.5" />
8+
<EntityTypeShape EntityType="DemoModel.BankDetail" Width="1.5" PointX="5.25" PointY="3.125" />
9+
<EntityTypeShape EntityType="DemoModel.CurrentStatu" Width="1.5" PointX="5.25" PointY="9.5" />
10+
<EntityTypeShape EntityType="DemoModel.Detail" Width="1.5" PointX="3" PointY="6" />
11+
<EntityTypeShape EntityType="DemoModel.ExprienceDetail" Width="1.5" PointX="5.25" PointY="12.875" />
12+
<EntityTypeShape EntityType="DemoModel.File" Width="1.5" PointX="0.75" PointY="6.625" />
13+
<EntityTypeShape EntityType="DemoModel.ProfessionalDetail" Width="1.5" PointX="8.25" PointY="6.375" />
1314
<EntityTypeShape EntityType="DemoModel.Skill" Width="1.5" PointX="0.75" PointY="0.75" />
1415
<AssociationConnector Association="DemoModel.FK_BankDetails_Details" />
1516
<AssociationConnector Association="DemoModel.FK_CurrentStatus_Details" />
1617
<AssociationConnector Association="DemoModel.FK_Details_File" />
18+
<AssociationConnector Association="DemoModel.FK_ExprienceDetail_Details" />
1719
<AssociationConnector Association="DemoModel.FK_ProfessionalDetail_Details" />
1820
<AssociationConnector Association="DemoModel.FK_ProfessionalDetail_File" />
1921
</Diagram>

‎Demo.csproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,9 @@
158158
<Compile Include="Detail.cs">
159159
<DependentUpon>DbModel.tt</DependentUpon>
160160
</Compile>
161+
<Compile Include="ExprienceDetail.cs">
162+
<DependentUpon>DbModel.tt</DependentUpon>
163+
</Compile>
161164
<Compile Include="File.cs">
162165
<DependentUpon>DbModel.tt</DependentUpon>
163166
</Compile>
@@ -166,6 +169,7 @@
166169
</Compile>
167170
<Compile Include="Models\BankDetailModel.cs" />
168171
<Compile Include="Models\CurrentStatusModel.cs" />
172+
<Compile Include="Models\ExprienceDetailModel.cs" />
169173
<Compile Include="Models\FileModel.cs" />
170174
<Compile Include="Models\PersonalDetailModel.cs" />
171175
<Compile Include="Models\ProfessionalDetailModel.cs" />
@@ -240,6 +244,7 @@
240244
<Content Include="Views\Detail\PersonalDetail.cshtml" />
241245
<Content Include="Views\Detail\BankDetails.cshtml" />
242246
<Content Include="Views\Detail\TeamDetail.cshtml" />
247+
<Content Include="Views\Detail\_NewExprienceDetailRow.cshtml" />
243248
</ItemGroup>
244249
<ItemGroup>
245250
<Folder Include="App_Data\" />

‎Detail.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public Detail()
1919
{
2020
this.BankDetails = new HashSet<BankDetail>();
2121
this.CurrentStatus = new HashSet<CurrentStatu>();
22+
this.ExprienceDetails = new HashSet<ExprienceDetail>();
2223
this.ProfessionalDetails = new HashSet<ProfessionalDetail>();
2324
}
2425

@@ -36,6 +37,8 @@ public Detail()
3637
public virtual ICollection<CurrentStatu> CurrentStatus { get; set; }
3738
public virtual File File { get; set; }
3839
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
40+
public virtual ICollection<ExprienceDetail> ExprienceDetails { get; set; }
41+
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
3942
public virtual ICollection<ProfessionalDetail> ProfessionalDetails { get; set; }
4043
}
4144
}

‎ExprienceDetail.cs‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
//------------------------------------------------------------------------------
2+
// <auto-generated>
3+
// This code was generated from a template.
4+
//
5+
// Manual changes to this file may cause unexpected behavior in your application.
6+
// Manual changes to this file will be overwritten if the code is regenerated.
7+
// </auto-generated>
8+
//------------------------------------------------------------------------------
9+
10+
namespace Demo
11+
{
12+
using System;
13+
using System.Collections.Generic;
14+
15+
public partial class ExprienceDetail
16+
{
17+
public int Id { get; set; }
18+
public string Company { get; set; }
19+
public string Designation { get; set; }
20+
public string Department { get; set; }
21+
public string CTC { get; set; }
22+
public Nullable<System.DateTime> From { get; set; }
23+
public Nullable<System.DateTime> To { get; set; }
24+
public int DetailId { get; set; }
25+
26+
public virtual Detail Detail { get; set; }
27+
}
28+
}

‎Models/ExprienceDetailModel.cs‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
using System;
2+
3+
namespace Demo.Models
4+
{
5+
public class ExprienceDetailModel
6+
{
7+
public int Id { get; set; }
8+
9+
public string Company { get; set; }
10+
11+
public string Designation { get; set; }
12+
13+
public string Department { get; set; }
14+
15+
public string CTC { get; set; }
16+
17+
public DateTime? From { get; set; }
18+
19+
public DateTime? To { get; set; }
20+
21+
public int DetailId { get; set; }
22+
}
23+
}

‎Models/TeamDetailModel.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ public class TeamDetailModel
99
public TeamDetailModel()
1010
{
1111
SkillIds = new List<int>();
12+
LstExprienceDetailModel = new List<ExprienceDetailModel>();
1213
}
1314

1415
public int Id { get; set; }
@@ -62,5 +63,8 @@ public TeamDetailModel()
6263

6364
public DateTime WorkingFrom { get; set; }
6465

66+
// exprience detail
67+
public List<ExprienceDetailModel> LstExprienceDetailModel { get; set; }
68+
6569
}
6670
}

0 commit comments

Comments
 (0)