Merge branch 'master' of c:/Users/Milad/Documents/Jobs/Codiato/sevomin-git

11 years ago · a365f706d0
--- a/Sevomin.Models/JobMiniViewModel.cs
+++ b/Sevomin.Models/JobMiniViewModel.cs
@ -0,0 +1,18 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 //استخدام نیروی «کنترل پروژه» با ×× سال سابقه ×× دارای ×مدرک× ×× برای کار در ×کشور×شهر×

 namespace Sevomin.Models
 {
 
 public class JobMiniViewModel
 {
 public string JobTitle { get; set; }
 public string Country { get; set; }
 public string City { get; set; }
 public Tuple<string,string> Experience { get; set; }
 }
 }
--- a/Sevomin.Models/Migrations/201403310557099_Job
+++ b/Sevomin.Models/Migrations/201403310557099_Job
@ -15,4 +15,4 @@ namespace Sevomin.Models.Migrations
 DropColumn("dbo.Jobs", "CreateDate");
 }
 }
 }
 }
--- a/Sevomin.Models/Migrations/201403310658336_DispalyFormat.Designer.cs
+++ b/Sevomin.Models/Migrations/201403310658336_DispalyFormat.Designer.cs
@ -0,0 +1,29 @@
 // <auto-generated />
 namespace Sevomin.Models.Migrations
 {
 using System.CodeDom.Compiler;
 using System.Data.Entity.Migrations;
 using System.Data.Entity.Migrations.Infrastructure;
 using System.Resources;
 
 [GeneratedCode("EntityFramework.Migrations", "6.1.0-30225")]
 public sealed partial class DispalyFormat : IMigrationMetadata
 {
 private readonly ResourceManager Resources = new ResourceManager(typeof(DispalyFormat));
 
 string IMigrationMetadata.Id
 {
 get { return "201403310658336_DispalyFormat"; }
 }
 
 string IMigrationMetadata.Source
 {
 get { return null; }
 }
 
 string IMigrationMetadata.Target
 {
 get { return Resources.GetString("Target"); }
 }
 }
 }
--- a/Sevomin.Models/Migrations/201403310658336_DispalyFormat.cs
+++ b/Sevomin.Models/Migrations/201403310658336_DispalyFormat.cs
@ -0,0 +1,18 @@
 namespace Sevomin.Models.Migrations
 {
 using System;
 using System.Data.Entity.Migrations;
 
 public partial class DispalyFormat : DbMigration
 {
 public override void Up()
 {
 AddColumn("dbo.JobParameters", "DisplayFormat", c => c.String());
 }
 
 public override void Down()
 {
 DropColumn("dbo.JobParameters", "DisplayFormat");
 }
 }
 }
--- a/Sevomin.Models/Migrations/201403310658336_DispalyFormat.resx
+++ b/Sevomin.Models/Migrations/201403310658336_DispalyFormat.resx
--- a/Sevomin.Models/Migrations/201403310716012_bugfix.Designer.cs
+++ b/Sevomin.Models/Migrations/201403310716012_bugfix.Designer.cs
@ -0,0 +1,29 @@
 // <auto-generated />
 namespace Sevomin.Models.Migrations
 {
 using System.CodeDom.Compiler;
 using System.Data.Entity.Migrations;
 using System.Data.Entity.Migrations.Infrastructure;
 using System.Resources;
 
 [GeneratedCode("EntityFramework.Migrations", "6.1.0-30225")]
 public sealed partial class bugfix : IMigrationMetadata
 {
 private readonly ResourceManager Resources = new ResourceManager(typeof(bugfix));
 
 string IMigrationMetadata.Id
 {
 get { return "201403310716012_bugfix"; }
 }
 
 string IMigrationMetadata.Source
 {
 get { return null; }
 }
 
 string IMigrationMetadata.Target
 {
 get { return Resources.GetString("Target"); }
 }
 }
 }
--- a/Sevomin.Models/Migrations/201403310716012_bugfix.cs
+++ b/Sevomin.Models/Migrations/201403310716012_bugfix.cs
@ -0,0 +1,20 @@
 namespace Sevomin.Models.Migrations
 {
 using System;
 using System.Data.Entity.Migrations;
 
 public partial class bugfix : DbMigration
 {
 public override void Up()
 {
 AddColumn("dbo.Parameters", "DisplayFormat", c => c.String(maxLength: 50));
 DropColumn("dbo.JobParameters", "DisplayFormat");
 }
 
 public override void Down()
 {
 AddColumn("dbo.JobParameters", "DisplayFormat", c => c.String());
 DropColumn("dbo.Parameters", "DisplayFormat");
 }
 }
 }
--- a/Sevomin.Models/Migrations/201403310716012_bugfix.resx
+++ b/Sevomin.Models/Migrations/201403310716012_bugfix.resx
--- a/Sevomin.Models/Parameter.cs
+++ b/Sevomin.Models/Parameter.cs
@ -24,6 +24,9 @@ namespace Sevomin.Models
 [Required]
 public byte DisplayMethod { get; set; }

 [StringLength(50)]
 public string DisplayFormat { get; set; }

 [Required]
 public string GroupName { get; set; }

--- a/Sevomin.Models/Sevomin.Models.csproj
+++ b/Sevomin.Models/Sevomin.Models.csproj
@ -71,6 +71,7 @@
 <Compile Include="Helpers\SevominUserStore.cs" />
 <Compile Include="Helpers\SevominUserValidator.cs" />
 <Compile Include="Job.cs" />
 <Compile Include="JobMiniViewModel.cs" />
 <Compile Include="JobParameter.cs" />
 <Compile Include="JobParameterViewModel.cs" />
 <Compile Include="JobViewModel.cs" />
@ -119,6 +120,14 @@
 <Compile Include="Migrations\201403310557099_Job CreateDate.Designer.cs">
 <DependentUpon>201403310557099_Job CreateDate.cs</DependentUpon>
 </Compile>
 <Compile Include="Migrations\201403310658336_DispalyFormat.cs" />
 <Compile Include="Migrations\201403310658336_DispalyFormat.Designer.cs">
 <DependentUpon>201403310658336_DispalyFormat.cs</DependentUpon>
 </Compile>
 <Compile Include="Migrations\201403310716012_bugfix.cs" />
 <Compile Include="Migrations\201403310716012_bugfix.Designer.cs">
 <DependentUpon>201403310716012_bugfix.cs</DependentUpon>
 </Compile>
 <Compile Include="Migrations\Configuration.cs" />
 <Compile Include="Parameter.cs" />
 <Compile Include="ParameterValue.cs" />
@ -170,6 +179,12 @@
 <EmbeddedResource Include="Migrations\201403310557099_Job CreateDate.resx">
 <DependentUpon>201403310557099_Job CreateDate.cs</DependentUpon>
 </EmbeddedResource>
 <EmbeddedResource Include="Migrations\201403310658336_DispalyFormat.resx">
 <DependentUpon>201403310658336_DispalyFormat.cs</DependentUpon>
 </EmbeddedResource>
 <EmbeddedResource Include="Migrations\201403310716012_bugfix.resx">
 <DependentUpon>201403310716012_bugfix.cs</DependentUpon>
 </EmbeddedResource>
 </ItemGroup>
 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.