From 968bf16013754fae576b2259b3b7f6f24c664c6e Mon Sep 17 00:00:00 2001 From: Stasplahtii Date: Mon, 9 Mar 2015 20:35:14 +0200 Subject: [PATCH 1/2] Update --- .../DataClasses/Vacancy.cs | 50 ++++++++++--------- sources/VacanciesBrowser/VacancyAddOrEdit.cs | 43 ++++++++-------- 2 files changed, 46 insertions(+), 47 deletions(-) diff --git a/sources/HumanResourcesLibrary/DataClasses/Vacancy.cs b/sources/HumanResourcesLibrary/DataClasses/Vacancy.cs index 326ffb2..cad186e 100644 --- a/sources/HumanResourcesLibrary/DataClasses/Vacancy.cs +++ b/sources/HumanResourcesLibrary/DataClasses/Vacancy.cs @@ -10,6 +10,30 @@ public class Vacancy : UniqueItem, IDeepCopy { public string Title { get; set; } + public int VacancyId { get; set; } + + public string Project { get; set; } + + public string City { get; set; } + + public string ResponsiblePerson { get; set; } + + public DateTime DateStart { get; set; } + + public DateTime DateFinish { get; set; } + + public TypeEmployment TypeEmployment { get; set; } + + public LevelEnglish LevelEnglish { get; set; } + + public Status Status { get; set; } + + public string Skills { get; set; } + + public string Description { get; set; } + + public Dictionary ListComment { get; set; } + public Vacancy CreateDeepCopy() { Vacancy copy = new Vacancy(); @@ -26,6 +50,7 @@ public Vacancy CreateDeepCopy() copy.Description = this.Description; return copy; } + public Vacancy() { /*ProjectId = 0; @@ -40,6 +65,7 @@ public Vacancy() Description = System.String.Empty; ListComment = new Dictionary();*/ } + public Vacancy(string name, Project project, City city, Status status, ResponsiblePerson responsiblePerson, DateTime dateStart, DateTime dateFinish, TypeEmployment typeEmployment, LevelEnglish levelEnglish, string skills, string description) { @@ -57,29 +83,5 @@ public Vacancy(string name, Project project, City city, Status status, Responsib //ListComment = listComment; //VacancyId = vacancyId; } - - // public int VacancyId { get; set; } - - public string Project { get; set; } - - public string City { get; set; } - - public string ResponsiblePerson { get; set; } - - public DateTime DateStart { get; set; } - - public DateTime DateFinish { get; set; } - - public TypeEmployment TypeEmployment { get; set; } - - public LevelEnglish LevelEnglish { get; set; } - - public Status Status { get; set; } - - public string Skills { get; set; } - - public string Description { get; set; } - - public Dictionary ListComment { get; set; } } } diff --git a/sources/VacanciesBrowser/VacancyAddOrEdit.cs b/sources/VacanciesBrowser/VacancyAddOrEdit.cs index e6460d1..592f4f7 100644 --- a/sources/VacanciesBrowser/VacancyAddOrEdit.cs +++ b/sources/VacanciesBrowser/VacancyAddOrEdit.cs @@ -19,6 +19,7 @@ public partial class VacancyAddOrEdit : Form public VacancyAddOrEdit() { InitializeComponent(); + this.vacancy = new Vacancy(); } public VacancyAddOrEdit(Vacancy vacancy) { @@ -43,29 +44,25 @@ private void Cancel_Click(object sender, EventArgs e) private void Save_Click(object sender, EventArgs e) { List list = new List(); - repo = RepositoryService.Repository; - list = repo.GetAllVacancies(); - Vacancy vacancy = new Vacancy(); - vacancy.Title = NameVacancy.Text; - vacancy.Project = ListProject.Text; - vacancy.City = ListCity.Text; - vacancy.LevelEnglish = (LevelEnglish)Enum.Parse(typeof(LevelEnglish), ListLevelEnglish.Text.ToString()); - vacancy.Status = (Status)Enum.Parse(typeof(Status), ListStatus.Text.ToString()); - vacancy.Skills = ListSkills.Text; - vacancy.Description = DescriptionVacancy.Text; - vacancy.ResponsiblePerson = ListResponsiblePerson.Text; - vacancy.TypeEmployment = (TypeEmployment)Enum.Parse(typeof(TypeEmployment), ListTypeEmployment.Text.ToString()); - vacancy.DateStart = (DateTime)StartDate.EditValue; - vacancy.DateFinish = (DateTime)FinishDate.EditValue; - /*if (isNew) - { - vacancy.Id = Guid.NewGuid(); - } - */ - repo = RepositoryService.Repository; - repo.SaveVacancy(vacancy); - MessageBox.Show("Вакансия сохранена"); - this.Close(); + repo = RepositoryService.Repository; + if (isNew) + { + vacancy = new Vacancy(); + vacancy.Title = NameVacancy.Text; + vacancy.Project = ListProject.Text; + vacancy.City = ListCity.Text; + vacancy.LevelEnglish = (LevelEnglish)Enum.Parse(typeof(LevelEnglish), ListLevelEnglish.Text.ToString()); + vacancy.Status = (Status)Enum.Parse(typeof(Status), ListStatus.Text.ToString()); + vacancy.Skills = ListSkills.Text; + vacancy.Description = DescriptionVacancy.Text; + vacancy.ResponsiblePerson = ListResponsiblePerson.Text; + vacancy.TypeEmployment = (TypeEmployment)Enum.Parse(typeof(TypeEmployment), ListTypeEmployment.Text.ToString()); + vacancy.DateStart = (DateTime)StartDate.EditValue; + vacancy.DateFinish = (DateTime)FinishDate.EditValue; + } + repo.SaveVacancy(vacancy); + MessageBox.Show("Вакансия сохранена"); + this.Close(); } private void VacancyAddOrEdit_Load(object sender, EventArgs e) From 5e5d4b7c6d8e1c7150cd39855d60932a106f6db5 Mon Sep 17 00:00:00 2001 From: Stasplahtii Date: Tue, 17 Mar 2015 21:02:26 +0200 Subject: [PATCH 2/2] Update --- .../DataClasses/Vacancy.cs | 2 -- .../Properties/Resources.resx | 19 ++++++++++++++----- .../VacanciesBrowser/Properties/licenses.licx | 6 ++++++ .../VacanciesBrowser/VacanciesBrowser.csproj | 5 ++--- .../VacancyAddOrEdit.Designer.cs | 15 ++++++++++++++- sources/VacanciesBrowser/VacancyAddOrEdit.cs | 15 ++++++++++++++- sources/VacanciesBrowser/VacancyMainForm.cs | 5 +++-- 7 files changed, 53 insertions(+), 14 deletions(-) create mode 100644 sources/VacanciesBrowser/Properties/licenses.licx diff --git a/sources/HumanResourcesLibrary/DataClasses/Vacancy.cs b/sources/HumanResourcesLibrary/DataClasses/Vacancy.cs index cad186e..7f3b75a 100644 --- a/sources/HumanResourcesLibrary/DataClasses/Vacancy.cs +++ b/sources/HumanResourcesLibrary/DataClasses/Vacancy.cs @@ -10,8 +10,6 @@ public class Vacancy : UniqueItem, IDeepCopy { public string Title { get; set; } - public int VacancyId { get; set; } - public string Project { get; set; } public string City { get; set; } diff --git a/sources/VacanciesBrowser/Properties/Resources.resx b/sources/VacanciesBrowser/Properties/Resources.resx index af7dbeb..01c595d 100644 --- a/sources/VacanciesBrowser/Properties/Resources.resx +++ b/sources/VacanciesBrowser/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,15 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Лицензионное соглашение устанавливает условия использования программы для ЭВМ «Vacancy» и заключено между любым лицом, использующим Программу («Пользователь»), и Group_1, являющейся правообладателем исключительного права на Программу («Правообладатель»).\n1.1. Пользователь не имеет права воспроизводить и распространять Программу в коммерческих целях (в том числе за плату), в том числе в составе сборников программных продуктов, без письменного согласия Правообладателя.\n1.2. Программа должна использоваться под наименованием: «Vacancy».\n1.3. Программа предоставляется на условиях «как есть» (as is). Правообладатель не предоставляет никаких гарантий в отношении безошибочной и бесперебойной работы Программы. + + + Version №001 + \ No newline at end of file diff --git a/sources/VacanciesBrowser/Properties/licenses.licx b/sources/VacanciesBrowser/Properties/licenses.licx new file mode 100644 index 0000000..7ab5097 --- /dev/null +++ b/sources/VacanciesBrowser/Properties/licenses.licx @@ -0,0 +1,6 @@ +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v14.2, Version=14.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v14.2, Version=14.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v14.2, Version=14.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v14.2, Version=14.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v14.2, Version=14.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v14.2, Version=14.2.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/sources/VacanciesBrowser/VacanciesBrowser.csproj b/sources/VacanciesBrowser/VacanciesBrowser.csproj index 685ea5f..9716dea 100644 --- a/sources/VacanciesBrowser/VacanciesBrowser.csproj +++ b/sources/VacanciesBrowser/VacanciesBrowser.csproj @@ -66,6 +66,7 @@ VacancyAddOrEdit.cs + VacancyMainForm.cs @@ -80,6 +81,7 @@ True Resources.resx + True SettingsSingleFileGenerator @@ -100,9 +102,6 @@ HumanResourcesLibrary - - -