diff --git a/Nuvolar.Module.CSharp/Gantt/GanttAppointments.cs b/Nuvolar.Module.CSharp/Gantt/GanttAppointments.cs new file mode 100644 index 0000000..a342d07 --- /dev/null +++ b/Nuvolar.Module.CSharp/Gantt/GanttAppointments.cs @@ -0,0 +1,135 @@ +using DevExpress.Xpo; +using DevExpress.Persistent.Base; +using DevExpress.Persistent.BaseImpl; +using System.ComponentModel; +using System; + +namespace Nuvolar.Module.CSharp +{ + [DefaultClassOptions,NavigationItem(false),CreatableItem(false)] + + public class GanttAppointments : XPLiteObject + { + public GanttAppointments(Session session) + : base(session) + { + } + public override void AfterConstruction() + { + base.AfterConstruction(); + + } + private int _TType; + private DateTime _StartDate; + private DateTime _EndDate; + private bool _AllDay; + private string _Subject; + private string _Location; + private string _Description; + private bool _Status; + private int _Label; + private int _ResourceId; + private string _ResourceIds; + private string _ReminderInfo; + private string _RecurrenceInfo; + private int _PercentComplete; + private string _TimeZoneId; + private string _CustomField1; + + + + [Key(AutoGenerate = true), Browsable(false)] + public int UniqueId { get; set; } + + public int TType + { + get { return _TType; } + set { SetPropertyValue("TType", ref _TType, value); } + } + public DateTime StartDate + { + get { return _StartDate; } + set { SetPropertyValue("StartDate", ref _StartDate, value); } + } + public DateTime EndDate + { + get { return _EndDate; } + set { SetPropertyValue("EndDate", ref _EndDate, value); } + } + public bool AllDay + { + get { return _AllDay; } + set { SetPropertyValue("AllDay", ref _AllDay, value); } + } + [Size(-1)] + public string Subject + { + get { return _Subject; } + set { SetPropertyValue("Subject", ref _Subject, value); } + } + [Size(-1)] + public string Location + { + get { return _Location; } + set { SetPropertyValue("Location", ref _Location, value); } + } + [Size(-1)] + public string Description + { + get { return _Description; } + set { SetPropertyValue("Description", ref _Description, value); } + } + public bool Status + { + get { return _Status; } + set { SetPropertyValue("Status", ref _Status, value); } + } + public int Label + { + get { return _Label; } + set { SetPropertyValue("Label", ref _Label, value); } + } + public int ResourceId + { + get { return _ResourceId; } + set { SetPropertyValue("ResourceId", ref _ResourceId, value); } + } + [Size(-1)] + public string ResourceIds + { + get { return _ResourceIds; } + set { SetPropertyValue("ResourceIds", ref _ResourceIds, value); } + } + [Size(-1)] + public string ReminderInfo + { + get { return _ReminderInfo; } + set { SetPropertyValue("ReminderInfo", ref _ReminderInfo, value); } + } + [Size(-1)] + public string RecurrenceInfo + { + get { return _RecurrenceInfo; } + set { SetPropertyValue("RecurrenceInfo", ref _RecurrenceInfo, value); } + } + public int PercentComplete + { + get { return _PercentComplete; } + set { SetPropertyValue("PercentComplete", ref _PercentComplete, value); } + } + [Size(-1)] + public string TimeZoneId + { + get { return _TimeZoneId; } + set { SetPropertyValue("TimeZoneId", ref _TimeZoneId, value); } + } + [Size(-1)] + public string CustomField1 + { + get { return _CustomField1; } + set { SetPropertyValue("CustomField1", ref _CustomField1, value); } + } + + + } +} \ No newline at end of file diff --git a/Nuvolar.Module.CSharp/Gantt/GanttResources.cs b/Nuvolar.Module.CSharp/Gantt/GanttResources.cs new file mode 100644 index 0000000..d018ae9 --- /dev/null +++ b/Nuvolar.Module.CSharp/Gantt/GanttResources.cs @@ -0,0 +1,67 @@ +using DevExpress.Xpo; +using System.ComponentModel; +using DevExpress.Persistent.Base; +using DevExpress.Persistent.BaseImpl; +using System.Drawing; + +namespace Nuvolar.Module.CSharp +{ + [DefaultClassOptions, NavigationItem(false), CreatableItem(false)] + public class GanttResources : XPLiteObject + { + public GanttResources(Session session) + : base(session) + { + } + public override void AfterConstruction() + { + base.AfterConstruction(); + } + + private int _IdSort; + private int _ParentId; + private string _Description; + private int _Color; + private System.Drawing.Image _Image; + private string _CustomField1; + + + [Key(AutoGenerate = true), Browsable(false)] + public int Id { get; set; } + public int IdSort + { + get { return _IdSort; } + set { SetPropertyValue("IdSort", ref _IdSort, value); } + } + public int ParentId + { + get { return _ParentId; } + set { SetPropertyValue("ParentId", ref _ParentId, value); } + } + [Size(-1)] + public string Description + { + get { return _Description; } + set { SetPropertyValue("Description", ref _Description, value); } + } + public int Color + { + get { return _Color; } + set { SetPropertyValue("Color", ref _Color, value); } + } + [ValueConverter(typeof(DevExpress.Xpo.Metadata.ImageValueConverter))] + public Image Image + { + get { return _Image; } + set { SetPropertyValue("Image", ref _Image, value); } + } + [Size(-1)] + public string CustomField1 + { + get { return _CustomField1; } + set { SetPropertyValue("CustomField1", ref _CustomField1, value); } + } + + + } +} \ No newline at end of file diff --git a/Nuvolar.Module.CSharp/Gantt/GanttTaskDependencies.cs b/Nuvolar.Module.CSharp/Gantt/GanttTaskDependencies.cs new file mode 100644 index 0000000..9694b15 --- /dev/null +++ b/Nuvolar.Module.CSharp/Gantt/GanttTaskDependencies.cs @@ -0,0 +1,50 @@ +using DevExpress.Xpo; +using System.ComponentModel; +using DevExpress.Persistent.Base; +using DevExpress.Persistent.BaseImpl; + +namespace Nuvolar.Module.CSharp +{ + [DefaultClassOptions, NavigationItem(false), CreatableItem(false)] + public class GanttTaskDependencies : XPLiteObject + { + public GanttTaskDependencies(Session session) + : base(session) + { + } + public override void AfterConstruction() + { + base.AfterConstruction(); + + } + + private int _ParentId; + private int _DependentId; + private int _TType; + + [Key(AutoGenerate = true), Browsable(false)] + public int Id { get; set; } + public int ParentId + { + get { return _ParentId; } + set { SetPropertyValue("ParentId", ref _ParentId, value); } + } + /// + /// DependentId -> a függőségekhez + /// + public int DependentId + { + get { return _DependentId; } + set { SetPropertyValue("DependentId", ref _DependentId, value); } + } + /// + /// Type + /// + public int TType + { + get { return _TType; } + set { SetPropertyValue("TType", ref _TType, value); } + } + + } +} \ No newline at end of file diff --git a/Nuvolar.Module.CSharp/Nuvolar.Module.CSharp.csproj b/Nuvolar.Module.CSharp/Nuvolar.Module.CSharp.csproj index 56a5726..8f01b36 100644 --- a/Nuvolar.Module.CSharp/Nuvolar.Module.CSharp.csproj +++ b/Nuvolar.Module.CSharp/Nuvolar.Module.CSharp.csproj @@ -302,6 +302,9 @@ + + + Component diff --git a/Nuvolar.Module.Win.CSharp/Controllers/GIROInfo_VC.cs b/Nuvolar.Module.Win.CSharp/Controllers/GIROInfo_VC.cs index e8e6820..4355ca9 100644 --- a/Nuvolar.Module.Win.CSharp/Controllers/GIROInfo_VC.cs +++ b/Nuvolar.Module.Win.CSharp/Controllers/GIROInfo_VC.cs @@ -61,7 +61,7 @@ namespace Nuvolar.Module.Win.CSharp.Controllers if (_OpenFileDialog.ShowDialog() == DialogResult.OK && (!String.IsNullOrEmpty(_OpenFileDialog.FileName))) { - StreamReader _textStreamReader = new StreamReader(_OpenFileDialog.FileName,Encoding.Default); + StreamReader _textStreamReader = new StreamReader(_OpenFileDialog.FileName,Encoding.UTF8); string _StrBuffer; _StrBuffer = _textStreamReader.ReadToEnd(); diff --git a/Nuvolar.Module.Win.CSharp/Editor/GanttListEditor.cs b/Nuvolar.Module.Win.CSharp/Editor/GanttListEditor.cs new file mode 100644 index 0000000..f9f861e --- /dev/null +++ b/Nuvolar.Module.Win.CSharp/Editor/GanttListEditor.cs @@ -0,0 +1,11 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Nuvolar.Module.Win.CSharp.Editor +{ + class GanttListEditor + { + } +} diff --git a/Nuvolar.Module.Win.CSharp/Editor/GanttUserControl.Designer.cs b/Nuvolar.Module.Win.CSharp/Editor/GanttUserControl.Designer.cs new file mode 100644 index 0000000..d9d1c27 --- /dev/null +++ b/Nuvolar.Module.Win.CSharp/Editor/GanttUserControl.Designer.cs @@ -0,0 +1,111 @@ +namespace Nuvolar.Module.Win.CSharp.Editor +{ + partial class GanttUserControl + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Component Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + DevExpress.XtraScheduler.TimeRuler timeRuler1 = new DevExpress.XtraScheduler.TimeRuler(); + DevExpress.XtraScheduler.TimeRuler timeRuler2 = new DevExpress.XtraScheduler.TimeRuler(); + DevExpress.XtraScheduler.TimeRuler timeRuler3 = new DevExpress.XtraScheduler.TimeRuler(); + this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl(); + this.resourcesTree = new DevExpress.XtraScheduler.UI.ResourcesTree(); + this.schedulerControl = new DevExpress.XtraScheduler.SchedulerControl(); + this.schedulerStorage = new DevExpress.XtraScheduler.SchedulerStorage(this.components); + ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit(); + this.splitContainerControl1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.resourcesTree)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.schedulerControl)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.schedulerStorage)).BeginInit(); + this.SuspendLayout(); + // + // splitContainerControl1 + // + this.splitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainerControl1.Location = new System.Drawing.Point(0, 0); + this.splitContainerControl1.Name = "splitContainerControl1"; + this.splitContainerControl1.Panel1.Controls.Add(this.resourcesTree); + this.splitContainerControl1.Panel1.Text = "Panel1"; + this.splitContainerControl1.Panel2.Controls.Add(this.schedulerControl); + this.splitContainerControl1.Panel2.Text = "Panel2"; + this.splitContainerControl1.Size = new System.Drawing.Size(884, 551); + this.splitContainerControl1.SplitterPosition = 228; + this.splitContainerControl1.TabIndex = 0; + this.splitContainerControl1.Text = "splitContainerControl1"; + // + // resourcesTree + // + this.resourcesTree.Dock = System.Windows.Forms.DockStyle.Fill; + this.resourcesTree.Location = new System.Drawing.Point(0, 0); + this.resourcesTree.Name = "resourcesTree"; + this.resourcesTree.OptionsBehavior.Editable = false; + this.resourcesTree.SchedulerControl = this.schedulerControl; + this.resourcesTree.Size = new System.Drawing.Size(228, 551); + this.resourcesTree.TabIndex = 0; + // + // schedulerControl + // + this.schedulerControl.ActiveViewType = DevExpress.XtraScheduler.SchedulerViewType.Gantt; + this.schedulerControl.DataStorage = this.schedulerStorage; + this.schedulerControl.Dock = System.Windows.Forms.DockStyle.Fill; + this.schedulerControl.Location = new System.Drawing.Point(0, 0); + this.schedulerControl.Name = "schedulerControl"; + this.schedulerControl.Size = new System.Drawing.Size(651, 551); + this.schedulerControl.Start = new System.DateTime(2017, 12, 17, 0, 0, 0, 0); + this.schedulerControl.TabIndex = 0; + this.schedulerControl.Text = "schedulerControl"; + this.schedulerControl.Views.DayView.TimeRulers.Add(timeRuler1); + this.schedulerControl.Views.FullWeekView.Enabled = true; + this.schedulerControl.Views.FullWeekView.TimeRulers.Add(timeRuler2); + this.schedulerControl.Views.WeekView.Enabled = false; + this.schedulerControl.Views.WorkWeekView.TimeRulers.Add(timeRuler3); + // + // GanttUserControl + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.splitContainerControl1); + this.Name = "GanttUserControl"; + this.Size = new System.Drawing.Size(884, 551); + ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).EndInit(); + this.splitContainerControl1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.resourcesTree)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.schedulerControl)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.schedulerStorage)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.SplitContainer splitContainer1; + private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1; + private DevExpress.XtraScheduler.UI.ResourcesTree resourcesTree; + private DevExpress.XtraScheduler.SchedulerControl schedulerControl; + public DevExpress.XtraScheduler.SchedulerStorage schedulerStorage; + } +} diff --git a/Nuvolar.Module.Win.CSharp/Editor/GanttUserControl.cs b/Nuvolar.Module.Win.CSharp/Editor/GanttUserControl.cs new file mode 100644 index 0000000..636501a --- /dev/null +++ b/Nuvolar.Module.Win.CSharp/Editor/GanttUserControl.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Drawing; +using System.Data; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using DevExpress.XtraScheduler; + +namespace Nuvolar.Module.Win.CSharp.Editor +{ + public partial class GanttUserControl : UserControl + { + public GanttUserControl() + { + InitializeComponent(); + } + } +} diff --git a/Nuvolar.Module.Win.CSharp/Editor/GanttUserControl.resx b/Nuvolar.Module.Win.CSharp/Editor/GanttUserControl.resx new file mode 100644 index 0000000..0f4ab7c --- /dev/null +++ b/Nuvolar.Module.Win.CSharp/Editor/GanttUserControl.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/Nuvolar.Module.Win.CSharp/Module.Designer.cs b/Nuvolar.Module.Win.CSharp/Module.Designer.cs index 3673daa..fa194e0 100644 --- a/Nuvolar.Module.Win.CSharp/Module.Designer.cs +++ b/Nuvolar.Module.Win.CSharp/Module.Designer.cs @@ -23,10 +23,14 @@ /// the contents of this method with the code editor. /// private void InitializeComponent() { - // - // WinCSharpModule - // - this.RequiredModuleTypes.Add(typeof(DevExpress.ExpressApp.SystemModule.SystemModule)); + // + // WinCSharpModule + // + this.RequiredModuleTypes.Add(typeof(DevExpress.ExpressApp.SystemModule.SystemModule)); + this.RequiredModuleTypes.Add(typeof(Nuvolar.Module.CSharp.CSharpModule)); + this.RequiredModuleTypes.Add(typeof(Nuvolar.Module.NuvolarModule)); + this.RequiredModuleTypes.Add(typeof(Nuvolar.Module.Win.NuvolarWindowsFormsModule)); + } #endregion diff --git a/Nuvolar.Module.Win.CSharp/Module.resx b/Nuvolar.Module.Win.CSharp/Module.resx index 9c3d4fe..1af7de1 100644 --- a/Nuvolar.Module.Win.CSharp/Module.resx +++ b/Nuvolar.Module.Win.CSharp/Module.resx @@ -60,45 +60,45 @@ : and then encoded with base64 encoding. --> - + - + - - - - + + + + - - + + - - + + - - - - + + + + - + - + @@ -112,9 +112,9 @@ 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 - + \ No newline at end of file diff --git a/Nuvolar.Module.Win.CSharp/Nuvolar.Module.Win.CSharp.csproj b/Nuvolar.Module.Win.CSharp/Nuvolar.Module.Win.CSharp.csproj index 5fd85f1..23e4c00 100644 --- a/Nuvolar.Module.Win.CSharp/Nuvolar.Module.Win.CSharp.csproj +++ b/Nuvolar.Module.Win.CSharp/Nuvolar.Module.Win.CSharp.csproj @@ -21,6 +21,21 @@ SAK SAK SAK + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true true @@ -109,14 +124,28 @@ False + + False + + + + + + + + + + + System False + System.Data False @@ -124,11 +153,14 @@ False + System.XML False + + @@ -156,6 +188,13 @@ Transfer_VC.cs + + + UserControl + + + GanttUserControl.cs + Component @@ -171,6 +210,9 @@ NewCustomersFromVC.cs + + GanttUserControl.cs + Designer @@ -207,6 +249,14 @@ + + + + + False + .NET Framework 3.5 SP1 + false +