diff --git a/AyaNovaQBI/Map.Designer.cs b/AyaNovaQBI/Map.Designer.cs index 696930d..9567d69 100644 --- a/AyaNovaQBI/Map.Designer.cs +++ b/AyaNovaQBI/Map.Designer.cs @@ -28,10 +28,10 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.objectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.customersToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -209,17 +209,17 @@ this.gridAya.AllowUserToAddRows = false; this.gridAya.AllowUserToDeleteRows = false; this.gridAya.AllowUserToResizeRows = false; - dataGridViewCellStyle13.BackColor = System.Drawing.Color.WhiteSmoke; - this.gridAya.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.gridAya.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.gridAya.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle14.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.gridAya.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.gridAya.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.gridAya.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.gridAya.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.AyaName, @@ -232,7 +232,6 @@ this.gridAya.ReadOnly = true; this.gridAya.Size = new System.Drawing.Size(338, 510); this.gridAya.TabIndex = 4; - this.gridAya.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.gridAya_CellClick); this.gridAya.SelectionChanged += new System.EventHandler(this.gridAya_SelectionChanged); // // AyaName @@ -266,17 +265,17 @@ this.gridQB.AllowUserToAddRows = false; this.gridQB.AllowUserToDeleteRows = false; this.gridQB.AllowUserToResizeRows = false; - dataGridViewCellStyle15.BackColor = System.Drawing.Color.WhiteSmoke; - this.gridQB.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; + this.gridQB.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; this.gridQB.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle16.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle16.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle16.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle16.SelectionBackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle16.SelectionForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.gridQB.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.gridQB.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.gridQB.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.gridQB.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridViewTextBoxColumn1, @@ -289,7 +288,6 @@ this.gridQB.ReadOnly = true; this.gridQB.Size = new System.Drawing.Size(381, 510); this.gridQB.TabIndex = 5; - this.gridQB.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.gridQB_CellClick); this.gridQB.SelectionChanged += new System.EventHandler(this.gridQB_SelectionChanged); // // dataGridViewTextBoxColumn1 diff --git a/AyaNovaQBI/Map.cs b/AyaNovaQBI/Map.cs index fc4d85b..3f54ee8 100644 --- a/AyaNovaQBI/Map.cs +++ b/AyaNovaQBI/Map.cs @@ -891,7 +891,7 @@ namespace AyaNovaQBI handleCheckOfObjectTypeMenuItem(sender, e); if (_Type == AyaType.Customer) return; _Type = AyaType.Customer; - this.Text = "Map / Import - Customers"; + this.Text = "Customers"; updateSelectedItemsToolStripMenuItem.Visible = true; Initialize(); } @@ -901,7 +901,7 @@ namespace AyaNovaQBI handleCheckOfObjectTypeMenuItem(sender, e); if (_Type == AyaType.ServiceRate) return; _Type = AyaType.ServiceRate; - this.Text = "Map / Import - Service rates"; + this.Text = "Service rates"; updateSelectedItemsToolStripMenuItem.Visible = false; Initialize(); } @@ -911,7 +911,7 @@ namespace AyaNovaQBI handleCheckOfObjectTypeMenuItem(sender, e); if (_Type == AyaType.TravelRate) return; _Type = AyaType.TravelRate; - this.Text = "Map / Import - Travel rates"; + this.Text = "Travel rates"; updateSelectedItemsToolStripMenuItem.Visible = false; Initialize(); } @@ -921,7 +921,7 @@ namespace AyaNovaQBI handleCheckOfObjectTypeMenuItem(sender, e); if (_Type == AyaType.Part) return; _Type = AyaType.Part; - this.Text = "Map / Import - Parts"; + this.Text = "Parts"; updateSelectedItemsToolStripMenuItem.Visible = true; Initialize(); if (!util.QBIntegration.Items.Any(z => z.AType == AyaType.Vendor)) @@ -942,7 +942,7 @@ namespace AyaNovaQBI handleCheckOfObjectTypeMenuItem(sender, e); if (_Type == AyaType.Vendor) return; _Type = AyaType.Vendor; - this.Text = "Map / Import - Vendors"; + this.Text = "Vendors"; updateSelectedItemsToolStripMenuItem.Visible = true; Initialize(); } @@ -963,17 +963,7 @@ namespace AyaNovaQBI } - private void gridAya_CellClick(object sender, DataGridViewCellEventArgs e) - { - } - - - - private void gridQB_CellClick(object sender, DataGridViewCellEventArgs e) - { - - } private void gridQB_SelectionChanged(object sender, EventArgs e) { @@ -997,29 +987,13 @@ namespace AyaNovaQBI - - - #endregion utility stuff private async void updateSelectedItemsToolStripMenuItem_Click(object sender, EventArgs e) { - //Parts in v7 default update would do price / cost both ways in addition to the part description and other fields - // however the user could go to map and select to *only* update the prices in AyaNova from QB but not the other fields - //for v8 going to simplify this to update all by default still for selected items or optionally pick "Price and cost only" - - //Parts either grid separate checkbox "update Price and cost only" which does that otherwise does price/cost and other fields both ways - - //customers either grid offer to update the opposite - - //vendors either grid offer to update the opposite, this is new functionality - - //Rates are not offered - same as v7 - - - + if (gridAya.SelectedRows.Count == 0 && gridQB.SelectedRows.Count == 0) return; bool IsAyaGrid = false; IsAyaGrid = gridAya.SelectedRows.Count > 0; diff --git a/AyaNovaQBI/MapApproveUpdateSelectedItems.Designer.cs b/AyaNovaQBI/MapApproveUpdateSelectedItems.Designer.cs index c279d67..891db4f 100644 --- a/AyaNovaQBI/MapApproveUpdateSelectedItems.Designer.cs +++ b/AyaNovaQBI/MapApproveUpdateSelectedItems.Designer.cs @@ -87,6 +87,7 @@ this.Controls.Add(this.btnCancel); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; this.Name = "MapApproveUpdateSelectedItems"; + this.ShowInTaskbar = false; this.Text = "Update selected items?"; this.Load += new System.EventHandler(this.MapApproveUpdateSelectedItems_Load); this.ResumeLayout(false); diff --git a/AyaNovaQBI/auth.Designer.cs b/AyaNovaQBI/auth.Designer.cs index d818f6a..1af4e41 100644 --- a/AyaNovaQBI/auth.Designer.cs +++ b/AyaNovaQBI/auth.Designer.cs @@ -47,7 +47,7 @@ this.edServerUrl.Location = new System.Drawing.Point(12, 46); this.edServerUrl.Name = "edServerUrl"; this.edServerUrl.Size = new System.Drawing.Size(590, 20); - this.edServerUrl.TabIndex = 0; + this.edServerUrl.TabIndex = 3; // // label1 // @@ -73,14 +73,14 @@ this.edUserName.Location = new System.Drawing.Point(52, 137); this.edUserName.Name = "edUserName"; this.edUserName.Size = new System.Drawing.Size(550, 20); - this.edUserName.TabIndex = 3; + this.edUserName.TabIndex = 0; // // edPassword // this.edPassword.Location = new System.Drawing.Point(52, 200); this.edPassword.Name = "edPassword"; this.edPassword.Size = new System.Drawing.Size(550, 20); - this.edPassword.TabIndex = 4; + this.edPassword.TabIndex = 1; // // pictureBox2 // @@ -107,7 +107,7 @@ this.btnLogin.Location = new System.Drawing.Point(527, 262); this.btnLogin.Name = "btnLogin"; this.btnLogin.Size = new System.Drawing.Size(75, 23); - this.btnLogin.TabIndex = 9; + this.btnLogin.TabIndex = 2; this.btnLogin.Text = "Login"; this.btnLogin.UseVisualStyleBackColor = true; this.btnLogin.Click += new System.EventHandler(this.btnLogin_Click); @@ -130,7 +130,6 @@ this.AutoSize = true; this.CancelButton = this.btnCancel; this.ClientSize = new System.Drawing.Size(614, 321); - this.ControlBox = false; this.Controls.Add(this.btnCancel); this.Controls.Add(this.btnLogin); this.Controls.Add(this.pictureBox2); @@ -140,10 +139,11 @@ this.Controls.Add(this.btnTest); this.Controls.Add(this.label1); this.Controls.Add(this.edServerUrl); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "auth"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "AyaNova login"; + this.Text = "QBI login to AyaNova "; this.Load += new System.EventHandler(this.auth_Load); ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); diff --git a/AyaNovaQBI/devinfo.txt b/AyaNovaQBI/devinfo.txt index d0f5f3c..ff2b220 100644 --- a/AyaNovaQBI/devinfo.txt +++ b/AyaNovaQBI/devinfo.txt @@ -1,7 +1,6 @@ TODO: Screenshots before expires!!!! -REFRESH / UPDATE was previously done in v7 plugin in clients, parts grids etc, now needs to be added into qbi itself, maybe in the link form and then also need to rename the link form in the UI - as it's doing a *lot* of stuff, maybe just "Linking and updating", "Linked objects"? + Test persisted form settings for server url (ONCE POSTED NEW BUILD OF AYANOVA TO TEST SERVER) Docs should not refer to autoclose anymore, it's status driven now DOCS UI use "Link" and do not use "map" anywhere diff --git a/docs/docs/img/grid-select-all.png b/docs/docs/img/grid-select-all.png new file mode 100644 index 0000000..5e96319 Binary files /dev/null and b/docs/docs/img/grid-select-all.png differ diff --git a/docs/docs/img/grid-select-rows.png b/docs/docs/img/grid-select-rows.png new file mode 100644 index 0000000..644112b Binary files /dev/null and b/docs/docs/img/grid-select-rows.png differ diff --git a/docs/docs/img/link-export-to-ay-confirm.png b/docs/docs/img/link-export-to-ay-confirm.png new file mode 100644 index 0000000..895068f Binary files /dev/null and b/docs/docs/img/link-export-to-ay-confirm.png differ diff --git a/docs/docs/img/link-export-to-qb-confirm.png b/docs/docs/img/link-export-to-qb-confirm.png new file mode 100644 index 0000000..8f1cd21 Binary files /dev/null and b/docs/docs/img/link-export-to-qb-confirm.png differ diff --git a/docs/docs/img/link-menu-autolink.png b/docs/docs/img/link-menu-autolink.png new file mode 100644 index 0000000..cd91b94 Binary files /dev/null and b/docs/docs/img/link-menu-autolink.png differ diff --git a/docs/docs/img/link-menu-export.png b/docs/docs/img/link-menu-export.png new file mode 100644 index 0000000..3a6435e Binary files /dev/null and b/docs/docs/img/link-menu-export.png differ diff --git a/docs/docs/img/link-menu-link.png b/docs/docs/img/link-menu-link.png new file mode 100644 index 0000000..fc9bbc6 Binary files /dev/null and b/docs/docs/img/link-menu-link.png differ diff --git a/docs/docs/img/link-menu-object.png b/docs/docs/img/link-menu-object.png new file mode 100644 index 0000000..2753b8b Binary files /dev/null and b/docs/docs/img/link-menu-object.png differ diff --git a/docs/docs/img/link-menu-show.png b/docs/docs/img/link-menu-show.png new file mode 100644 index 0000000..5a25f82 Binary files /dev/null and b/docs/docs/img/link-menu-show.png differ diff --git a/docs/docs/img/link-menu-update.png b/docs/docs/img/link-menu-update.png new file mode 100644 index 0000000..d01b6d5 Binary files /dev/null and b/docs/docs/img/link-menu-update.png differ diff --git a/docs/docs/img/link-sync.png b/docs/docs/img/link-sync.png new file mode 100644 index 0000000..0ee1930 Binary files /dev/null and b/docs/docs/img/link-sync.png differ diff --git a/docs/docs/img/link-to-aya.png b/docs/docs/img/link-to-aya.png new file mode 100644 index 0000000..83e4b99 Binary files /dev/null and b/docs/docs/img/link-to-aya.png differ diff --git a/docs/docs/img/link-to-qb-confirm.png b/docs/docs/img/link-to-qb-confirm.png new file mode 100644 index 0000000..b0a759e Binary files /dev/null and b/docs/docs/img/link-to-qb-confirm.png differ diff --git a/docs/docs/img/link-to-qb.png b/docs/docs/img/link-to-qb.png new file mode 100644 index 0000000..18ffc3b Binary files /dev/null and b/docs/docs/img/link-to-qb.png differ diff --git a/docs/docs/img/link-update-to-aya-confirm.png b/docs/docs/img/link-update-to-aya-confirm.png new file mode 100644 index 0000000..1ab6978 Binary files /dev/null and b/docs/docs/img/link-update-to-aya-confirm.png differ diff --git a/docs/docs/img/link-update-to-qb-confirm.png b/docs/docs/img/link-update-to-qb-confirm.png new file mode 100644 index 0000000..c8e4a43 Binary files /dev/null and b/docs/docs/img/link-update-to-qb-confirm.png differ