diff --git a/AyaNovaQBI/MainForm.Designer.cs b/AyaNovaQBI/MainForm.Designer.cs index d8f1f07..475ea82 100644 --- a/AyaNovaQBI/MainForm.Designer.cs +++ b/AyaNovaQBI/MainForm.Designer.cs @@ -48,11 +48,13 @@ this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.grid = new System.Windows.Forms.DataGridView(); this.lblStatus = new System.Windows.Forms.Label(); + this.id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.customer = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.wonumber = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ProjectName = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ServiceDate = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.status = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Linked = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.statuscolor = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.customerid = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.menuStrip1.SuspendLayout(); @@ -69,7 +71,7 @@ this.exitToolStripMenuItem}); this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(945, 24); + this.menuStrip1.Size = new System.Drawing.Size(917, 24); this.menuStrip1.TabIndex = 0; this.menuStrip1.Text = "menuStrip1"; // @@ -208,11 +210,13 @@ this.grid.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.grid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.grid.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.id, this.customer, this.wonumber, this.ProjectName, this.ServiceDate, this.status, + this.Linked, this.statuscolor, this.customerid}); this.grid.Dock = System.Windows.Forms.DockStyle.Fill; @@ -221,7 +225,7 @@ this.grid.Name = "grid"; this.grid.ReadOnly = true; this.grid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.grid.Size = new System.Drawing.Size(945, 450); + this.grid.Size = new System.Drawing.Size(917, 450); this.grid.TabIndex = 3; this.grid.Visible = false; this.grid.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.grid_CellFormatting); @@ -234,9 +238,16 @@ this.lblStatus.ForeColor = System.Drawing.SystemColors.WindowText; this.lblStatus.Location = new System.Drawing.Point(0, 0); this.lblStatus.Name = "lblStatus"; - this.lblStatus.Size = new System.Drawing.Size(945, 474); + this.lblStatus.Size = new System.Drawing.Size(917, 474); this.lblStatus.TabIndex = 4; // + // id + // + this.id.HeaderText = "id"; + this.id.Name = "id"; + this.id.ReadOnly = true; + this.id.Visible = false; + // // customer // this.customer.DataPropertyName = "CustomerName"; @@ -267,14 +278,23 @@ // // status // - this.status.DataPropertyName = "Status"; + this.status.DataPropertyName = "WorkorderStatusName"; this.status.HeaderText = "Status"; this.status.Name = "status"; this.status.ReadOnly = true; // + // Linked + // + this.Linked.DataPropertyName = "Linked"; + this.Linked.HeaderText = "Linked"; + this.Linked.Name = "Linked"; + this.Linked.ReadOnly = true; + this.Linked.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.Linked.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // // statuscolor // - this.statuscolor.DataPropertyName = "StatusColor"; + this.statuscolor.DataPropertyName = "Color"; this.statuscolor.HeaderText = "statuscolor"; this.statuscolor.Name = "statuscolor"; this.statuscolor.ReadOnly = true; @@ -294,7 +314,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(945, 474); + this.ClientSize = new System.Drawing.Size(917, 474); this.Controls.Add(this.grid); this.Controls.Add(this.menuStrip1); this.Controls.Add(this.lblStatus); @@ -331,11 +351,13 @@ private System.Windows.Forms.ToolStripMenuItem exitToolStripMenuItem; private System.Windows.Forms.DataGridView grid; private System.Windows.Forms.Label lblStatus; + private System.Windows.Forms.DataGridViewTextBoxColumn id; private System.Windows.Forms.DataGridViewTextBoxColumn customer; private System.Windows.Forms.DataGridViewTextBoxColumn wonumber; private System.Windows.Forms.DataGridViewTextBoxColumn ProjectName; private System.Windows.Forms.DataGridViewTextBoxColumn ServiceDate; private System.Windows.Forms.DataGridViewTextBoxColumn status; + private System.Windows.Forms.DataGridViewCheckBoxColumn Linked; private System.Windows.Forms.DataGridViewTextBoxColumn statuscolor; private System.Windows.Forms.DataGridViewTextBoxColumn customerid; } diff --git a/AyaNovaQBI/MainForm.cs b/AyaNovaQBI/MainForm.cs index d5b5469..b827398 100644 --- a/AyaNovaQBI/MainForm.cs +++ b/AyaNovaQBI/MainForm.cs @@ -412,13 +412,13 @@ namespace AyaNovaQBI _GridTable = new DataTable(); _GridTable.Columns.Add(new DataColumn("CustomerName")); _GridTable.Columns.Add(new DataColumn("Serial")); - _GridTable.Columns.Add(new DataColumn("ServiceDate")); + _GridTable.Columns.Add(new DataColumn("ServiceDate", typeof(DateTime))); _GridTable.Columns.Add(new DataColumn("WorkorderStatusName")); _GridTable.Columns.Add(new DataColumn("ProjectName")); _GridTable.Columns.Add(new DataColumn("Color")); _GridTable.Columns.Add(new DataColumn("CustomerId")); - _GridTable.Columns.Add(new DataColumn("Id")); - _GridTable.Columns.Add(new DataColumn("Linked")); + _GridTable.Columns.Add(new DataColumn("Id")); + _GridTable.Columns.Add(new DataColumn("Linked", typeof(bool))); } _MisMatches.Clear(); @@ -443,7 +443,7 @@ namespace AyaNovaQBI _GridTable.Rows.Add(row); } - + grid.DataSource = _GridTable; //foreach (WorkOrderAccountingListItem z in v) //{ @@ -548,7 +548,7 @@ namespace AyaNovaQBI private void InitializeGrid() { - grid.DataSource = _GridTable; + //grid.DataSource = _GridTable; //grid.Columns["WorkingID"].Visible = false; //grid.Columns["ClientID"].Visible = false; //grid.Columns["Linked"].Visible = false; diff --git a/AyaNovaQBI/MainForm.resx b/AyaNovaQBI/MainForm.resx index ee0d06c..738e304 100644 --- a/AyaNovaQBI/MainForm.resx +++ b/AyaNovaQBI/MainForm.resx @@ -120,6 +120,9 @@ 17, 17 + + True + True @@ -132,6 +135,9 @@ True + + True + True