Index: branches/ReklamaReorganizacja/BazaReklam/OrderDetails.cs =================================================================== --- branches/ReklamaReorganizacja/BazaReklam/OrderDetails.cs (revision 667) +++ branches/ReklamaReorganizacja/BazaReklam/OrderDetails.cs (revision 668) @@ -322,4 +322,5 @@ Reklama.GRZBIET = SelectedSection.Id; Reklama.AdLocationId = SelectedAdLocation.Id; + Reklama.KOLOR = lblKolor.Text; if (SelectedNavigationColumn != null && SelectedNavigationColumn.Id > 0) @@ -1662,4 +1663,6 @@ } + RecalculateAdSize(); + //is module in full color if (SelectedModule.Name == "AWEB") @@ -1677,37 +1680,60 @@ Debug.WriteLine(string.Format("Event: {0}", "txtHorizontal_TextChanged")); - if (Validate() && SelectedModule!=null) - { - txtTotalModuleAmount.Text = + if (Validate()) + { + RecalculateAdSize(); + + //txtTotalModuleAmount.Text = + // ReCaluculateModuleAmount(txtHorizontal.Text, txtVertical.Text).ToString(); + + //int horizontal, vertical; + //if (int.TryParse(txtHorizontal.Text, out horizontal) && int.TryParse(txtVertical.Text, out vertical)) + //{ + // AdSize adSize = AdHelper.GetAdSize(horizontal, vertical, SelectedModule); + + // sZERTextBox.Text = adSize.Width.ToString(); + // wYSTextBox.Text = adSize.Height.ToString(); + //} + } + } + + private void txtVertical_TextChanged(object sender, EventArgs e) + { + Debug.WriteLine(string.Format("Event: {0}", "txtVertical_TextChanged")); + + if (Validate()) + { + + RecalculateAdSize(); + + //txtTotalModuleAmount.Text = + // ReCaluculateModuleAmount(txtHorizontal.Text, txtVertical.Text).ToString(); + + //int horizontal, vertical; + //if (int.TryParse(txtHorizontal.Text, out horizontal) && int.TryParse(txtVertical.Text, out vertical)) + //{ + // AdSize adSize = AdHelper.GetAdSize(horizontal, vertical, SelectedModule); + + // sZERTextBox.Text = adSize.Width.ToString(); + // wYSTextBox.Text = adSize.Height.ToString(); + //} + } + } + + private void RecalculateAdSize() + { + if (SelectedModule == null) return; + + + txtTotalModuleAmount.Text = ReCaluculateModuleAmount(txtHorizontal.Text, txtVertical.Text).ToString(); - int horizontal, vertical; - if (int.TryParse(txtHorizontal.Text, out horizontal) && int.TryParse(txtVertical.Text, out vertical)) - { - AdSize adSize = AdHelper.GetAdSize(horizontal, vertical, SelectedModule); - - sZERTextBox.Text = adSize.Width.ToString(); - wYSTextBox.Text = adSize.Height.ToString(); - } - } - } - - private void txtVertical_TextChanged(object sender, EventArgs e) - { - Debug.WriteLine(string.Format("Event: {0}", "txtVertical_TextChanged")); - - if (Validate() && SelectedModule != null) - { - txtTotalModuleAmount.Text = - ReCaluculateModuleAmount(txtHorizontal.Text, txtVertical.Text).ToString(); - - int horizontal, vertical; - if (int.TryParse(txtHorizontal.Text, out horizontal) && int.TryParse(txtVertical.Text, out vertical)) - { - AdSize adSize = AdHelper.GetAdSize(horizontal, vertical, SelectedModule); - - sZERTextBox.Text = adSize.Width.ToString(); - wYSTextBox.Text = adSize.Height.ToString(); - } + int horizontal, vertical; + if (int.TryParse(txtHorizontal.Text, out horizontal) && int.TryParse(txtVertical.Text, out vertical)) + { + AdSize adSize = AdHelper.GetAdSize(horizontal, vertical, SelectedModule); + + sZERTextBox.Text = adSize.Width.ToString(); + wYSTextBox.Text = adSize.Height.ToString(); } } Index: branches/ReklamaReorganizacja/BazaReklam/OrderDetails.Designer.cs =================================================================== --- branches/ReklamaReorganizacja/BazaReklam/OrderDetails.Designer.cs (revision 649) +++ branches/ReklamaReorganizacja/BazaReklam/OrderDetails.Designer.cs (revision 668) @@ -70,7 +70,7 @@ System.Windows.Forms.Label label14; System.Windows.Forms.Label label15; - 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(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OrderDetails)); this.rEKLAMADataSet = new Baza_Reklam.REKLAMADataSet(); @@ -928,12 +928,12 @@ this.ukazeSieDataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.ukazeSieDataGridView.BackgroundColor = System.Drawing.Color.White; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle1.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.ukazeSieDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + 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)(238))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.ukazeSieDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.ukazeSieDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.ukazeSieDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { @@ -959,6 +959,6 @@ // this.nrWydaniaDataGridViewTextBoxColumn.DataPropertyName = "Nr Wydania"; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.nrWydaniaDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.nrWydaniaDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle5; this.nrWydaniaDataGridViewTextBoxColumn.FillWeight = 149.2386F; this.nrWydaniaDataGridViewTextBoxColumn.HeaderText = "Nr wyd."; @@ -981,7 +981,7 @@ this.netto.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.netto.DataPropertyName = "netto"; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle3.Format = "C"; - this.netto.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle6.Format = "C"; + this.netto.DefaultCellStyle = dataGridViewCellStyle6; this.netto.HeaderText = "WartoϾ"; this.netto.Name = "netto"; @@ -1131,12 +1131,11 @@ // this.lblKolor.AutoSize = true; - this.lblKolor.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.rEKLAMABindingSource, "KOLOR", true)); this.lblKolor.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.lblKolor.ForeColor = System.Drawing.Color.Blue; this.lblKolor.Location = new System.Drawing.Point(6, 37); this.lblKolor.Name = "lblKolor"; - this.lblKolor.Size = new System.Drawing.Size(37, 13); + this.lblKolor.Size = new System.Drawing.Size(35, 13); this.lblKolor.TabIndex = 17; - this.lblKolor.Text = "FULL"; + this.lblKolor.Text = "kolor"; // // txtVertical Index: branches/ReklamaReorganizacja/BazaReklam/OrderDetails.resx =================================================================== --- branches/ReklamaReorganizacja/BazaReklam/OrderDetails.resx (revision 646) +++ branches/ReklamaReorganizacja/BazaReklam/OrderDetails.resx (revision 668) @@ -253,4 +253,7 @@ 17, 54 + + 17, 54 + 17, 91 @@ -273,4 +276,7 @@ 443, 91 + + + 1113, 91 @@ -345,4 +351,10 @@ True + + True + + + 863, 91 + 863, 91