Index: branches/ReklamaReorganizacja/BazaReklam/OrderDetails.cs =================================================================== --- branches/ReklamaReorganizacja/BazaReklam/OrderDetails.cs (revision 653) +++ branches/ReklamaReorganizacja/BazaReklam/OrderDetails.cs (revision 658) @@ -227,4 +227,7 @@ if (SelectedSection == null) return; + txtHorizontal.Text = 1.ToString(); + txtVertical.Text = 1.ToString(); + ComboBoxHelper.Bind(SelectedSection.Modules, mOD_TYPComboBox); if (SelectedSection.Modules.Count > 1) @@ -607,11 +610,4 @@ private void SprawdzBledy() { - //if (ogl_dzialComboBox.SelectedValue == null) - //{ - // MessageBox.Show("Wybierz dzia³."); - // zATWIERDZONO_DO_DRUKUCheckBox.CheckState = CheckState.Unchecked; - // return; - //} - if (SelectedModule == null) { @@ -1614,5 +1610,5 @@ wYSTextBox.Text = SelectedModule.Height.HasValue ? (SelectedModule.Height.Value * 10).ToString("#0") : 1.ToString(); - bool readOnly = !EnableModuleCount(SelectedModule); + bool readOnly = !AdHelper.EnableModuleCount(SelectedModule); txtHorizontal.ReadOnly = readOnly; txtVertical.ReadOnly = readOnly; @@ -1620,9 +1616,9 @@ txtVertical.BackColor = readOnly ? SystemColors.InactiveCaptionText : Color.White; - //if (readOnly) - //{ - // txtHorizontal.Text = 1.ToString(); - // txtVertical.Text = 1.ToString(); - //} + if (readOnly) + { + txtHorizontal.Text = 1.ToString(); + txtVertical.Text = 1.ToString(); + } //Enable/Disable dzial rozdzial combos... @@ -1644,5 +1640,5 @@ NavigationColumnRepository navigationColumnRepository = new NavigationColumnRepository(ConnString.getConnString().Value); - ComboBoxHelper.Bind(navigationColumnRepository.FindAllActiveByTitle(SelectedTitle), ogl_dzialComboBox); + ComboBoxHelper.Bind(navigationColumnRepository.FindAllActiveByTitle(SelectedTitle), ogl_dzialComboBox, new NavigationColumn(0, "-- nieokreœlony --")); ogl_dzialComboBox.DisplayMember = "Name"; ogl_dzialComboBox.ValueMember = "Id"; @@ -1658,5 +1654,5 @@ ogl_dzialComboBox.SelectedIndex = GetNavigationColumnIndex(Reklama.ogl_dzial); - if (Reklama.ogl_rozdzial > 0) + if (!Reklama.Isogl_rozdzialNull() && Reklama.ogl_rozdzial > 0) ogl_rozdzialComboBox.SelectedIndex = GetNavigationSubColumnIndex(Reklama.ogl_rozdzial); @@ -1677,78 +1673,21 @@ } - private static bool EnableModuleCount(Module module) - { - switch (module.Section.Title.ShortName) - { - case "GS": - return EnableGsModuleCount(module); - case "adMot": - return EnableAdMotoModuleCount(module); - default: - return EnableAmtModuleCount(module); - } - } - - //TODO: get this info from db, IsSplitable...? - private static bool EnableAmtModuleCount(Module module) - { - switch (module.Name) - { - case "AWEB": - case "AWEF": - case "ALAF": - case "AZOF": - return true; - } - - return false; - } - - //TODO: get this info from db, IsSplitable...? - private static bool EnableGsModuleCount(Module module) - { - switch (module.Name) - { - case "GOK1M": - //case "GOK2": - case "GOK3M": - //case "GOK4": - case "GWEW_P": - case "GWEW": - //case "GART_S": - return true; - } - - return false; - } - - //TODO: get this info from db, IsSplitable...? - private static bool EnableAdMotoModuleCount(Module module) - { - switch (module.Name) - { - case "ad-Text": - case "Truck-Text": - return true; - } - - return false; - } - private void txtHorizontal_TextChanged(object sender, EventArgs e) { Debug.WriteLine(string.Format("Event: {0}", "txtHorizontal_TextChanged")); - if (Validate()) + if (Validate() && SelectedModule!=null) { txtTotalModuleAmount.Text = ReCaluculateModuleAmount(txtHorizontal.Text, txtVertical.Text).ToString(); - - AdSize adSize = AdHelper.GetAdSize(int.Parse(txtHorizontal.Text), int.Parse(txtVertical.Text), 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(); + } } } @@ -1758,13 +1697,17 @@ Debug.WriteLine(string.Format("Event: {0}", "txtVertical_TextChanged")); - if (Validate()) + if (Validate() && SelectedModule != null) { txtTotalModuleAmount.Text = ReCaluculateModuleAmount(txtHorizontal.Text, txtVertical.Text).ToString(); - AdSize adSize = AdHelper.GetAdSize(int.Parse(txtHorizontal.Text), int.Parse(txtVertical.Text), 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(); + } } } @@ -1871,5 +1814,6 @@ ComboBoxHelper.Bind( navigationColumnRepository.FindActiveNavigationSubColumnsByNavigationColumn(SelectedNavigationColumn), - ogl_rozdzialComboBox); + ogl_rozdzialComboBox, + new NavigationSubColumn(0, "-- nieokreœlony --")); ogl_rozdzialComboBox.DisplayMember = "Name"; Index: branches/ReklamaReorganizacja/BazaReklam/ListaReklamNaWydanieForm.Designer.cs =================================================================== --- branches/ReklamaReorganizacja/BazaReklam/ListaReklamNaWydanieForm.Designer.cs (revision 561) +++ branches/ReklamaReorganizacja/BazaReklam/ListaReklamNaWydanieForm.Designer.cs (revision 658) @@ -31,15 +31,15 @@ this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ListaReklamNaWydanieForm)); - 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.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + 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 dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle(); this.dataGridView1 = new System.Windows.Forms.DataGridView(); this.rezerwacjeToolStrip = new System.Windows.Forms.ToolStrip(); @@ -183,7 +183,9 @@ // tytToolStripComboBox2 // + this.tytToolStripComboBox2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.tytToolStripComboBox2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); this.tytToolStripComboBox2.Name = "tytToolStripComboBox2"; this.tytToolStripComboBox2.Size = new System.Drawing.Size(75, 31); + this.tytToolStripComboBox2.SelectedIndexChanged += new System.EventHandler(this.tytToolStripComboBox2_SelectedIndexChanged); // // toolStripLabel8 @@ -312,6 +314,6 @@ this.listaReklamDataGridView.AllowUserToAddRows = false; this.listaReklamDataGridView.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.MintCream; - this.listaReklamDataGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle12.BackColor = System.Drawing.Color.MintCream; + this.listaReklamDataGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle12; this.listaReklamDataGridView.AutoGenerateColumns = false; this.listaReklamDataGridView.BackgroundColor = System.Drawing.Color.White; @@ -369,6 +371,6 @@ // this.TYP.DataPropertyName = "TYP"; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.TYP.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.TYP.DefaultCellStyle = dataGridViewCellStyle13; this.TYP.HeaderText = "Typ"; this.TYP.Name = "TYP"; @@ -380,6 +382,6 @@ this.tYTU£DataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.tYTU£DataGridViewTextBoxColumn.DataPropertyName = "TYTU£"; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.tYTU£DataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.tYTU£DataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle14; this.tYTU£DataGridViewTextBoxColumn.HeaderText = "Tytu³"; this.tYTU£DataGridViewTextBoxColumn.Name = "tYTU£DataGridViewTextBoxColumn"; @@ -391,6 +393,6 @@ this.nRDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.nRDataGridViewTextBoxColumn.DataPropertyName = "NR"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.nRDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.nRDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle15; this.nRDataGridViewTextBoxColumn.HeaderText = "Nr"; this.nRDataGridViewTextBoxColumn.Name = "nRDataGridViewTextBoxColumn"; @@ -401,6 +403,6 @@ // this.iDREKLAMYDataGridViewTextBoxColumn.DataPropertyName = "ID REKLAMY"; - dataGridViewCellStyle5.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - this.iDREKLAMYDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle16.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + this.iDREKLAMYDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle16; this.iDREKLAMYDataGridViewTextBoxColumn.HeaderText = "Symbol"; this.iDREKLAMYDataGridViewTextBoxColumn.Name = "iDREKLAMYDataGridViewTextBoxColumn"; @@ -418,6 +420,6 @@ this.sZERDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.sZERDataGridViewTextBoxColumn.DataPropertyName = "SZER"; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.sZERDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.sZERDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle17; this.sZERDataGridViewTextBoxColumn.HeaderText = "S"; this.sZERDataGridViewTextBoxColumn.Name = "sZERDataGridViewTextBoxColumn"; @@ -429,6 +431,6 @@ this.wYSDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.wYSDataGridViewTextBoxColumn.DataPropertyName = "WYS"; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.wYSDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.wYSDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle18; this.wYSDataGridViewTextBoxColumn.HeaderText = "W"; this.wYSDataGridViewTextBoxColumn.Name = "wYSDataGridViewTextBoxColumn"; @@ -481,6 +483,6 @@ this.mODTYPDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.mODTYPDataGridViewTextBoxColumn.DataPropertyName = "MOD_TYP"; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.mODTYPDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.mODTYPDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle19; this.mODTYPDataGridViewTextBoxColumn.HeaderText = "Modu³"; this.mODTYPDataGridViewTextBoxColumn.Name = "mODTYPDataGridViewTextBoxColumn"; @@ -523,7 +525,7 @@ this.rABATDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.rABATDataGridViewTextBoxColumn.DataPropertyName = "RABAT"; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle9.Format = "p"; - this.rABATDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle20.Format = "p"; + this.rABATDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle20; this.rABATDataGridViewTextBoxColumn.HeaderText = "Rabat"; this.rABATDataGridViewTextBoxColumn.Name = "rABATDataGridViewTextBoxColumn"; @@ -535,6 +537,6 @@ this.sTRONADataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.sTRONADataGridViewTextBoxColumn.DataPropertyName = "STRONA"; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.sTRONADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle21.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.sTRONADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle21; this.sTRONADataGridViewTextBoxColumn.HeaderText = "Strona"; this.sTRONADataGridViewTextBoxColumn.Name = "sTRONADataGridViewTextBoxColumn"; @@ -546,6 +548,6 @@ this.nazwaGrzbietuDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.nazwaGrzbietuDataGridViewTextBoxColumn.DataPropertyName = "nazwaGrzbietu"; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.nazwaGrzbietuDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.nazwaGrzbietuDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle22; this.nazwaGrzbietuDataGridViewTextBoxColumn.HeaderText = "Grzbiet"; this.nazwaGrzbietuDataGridViewTextBoxColumn.Name = "nazwaGrzbietuDataGridViewTextBoxColumn"; @@ -648,6 +650,8 @@ // tytulToolStripComboBox // + this.tytulToolStripComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.tytulToolStripComboBox.Name = "tytulToolStripComboBox"; this.tytulToolStripComboBox.Size = new System.Drawing.Size(75, 31); + this.tytulToolStripComboBox.SelectedIndexChanged += new System.EventHandler(this.tytulToolStripComboBox_SelectedIndexChanged); // // toolStripLabel2 Index: branches/ReklamaReorganizacja/BazaReklam/ListaReklamNaWydanieForm.cs =================================================================== --- branches/ReklamaReorganizacja/BazaReklam/ListaReklamNaWydanieForm.cs (revision 649) +++ branches/ReklamaReorganizacja/BazaReklam/ListaReklamNaWydanieForm.cs (revision 658) @@ -1,3 +1,4 @@ using System; +using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -48,10 +49,8 @@ DBBindings.bindujTytuly(tytulToolStripComboBox); DBBindings.bindujTytuly(tytToolStripComboBox2); - DBBindings.bindujGrzbiety2(grzbietToolStripComboBox); + //DBBindings.bindujGrzbiety2(grzbietToolStripComboBox); DBBindings.bindujAgencje(agencjaToolStripComboBox); DBBindings.bindujAgentow(agentToolStripComboBox); - DBBindings.bindujModuly(modToolStripComboBox); - - ((ComboBox)tytToolStripComboBox2.Control).SelectedValueChanged += tytToolStripComboBox2_SelectedIndexChanged; + //DBBindings.BindujModuly(modToolStripComboBox); } @@ -125,10 +124,6 @@ { command.CommandText += " AND (GRZBIET = @grzbiet) "; - command.Parameters.AddWithValue("@grzbiet", ((BoundItem)grzbietToolStripComboBox.SelectedItem).IDEvalue1); - } - - // ((CheckBox)((ToolStripControlHost)bindingNavigator1.Items["DRCheckBox"]).Control).Checked = true; - - + command.Parameters.AddWithValue("@grzbiet", ((ComboItem)grzbietToolStripComboBox.SelectedItem).Value); + } SqlDataAdapter adapter = new SqlDataAdapter(); @@ -138,5 +133,4 @@ Cursor = Cursors.Default; - } @@ -164,25 +158,9 @@ DataRowView row = (DataRowView)listaReklamNaWydanie2BindingSource.Current; int idRek = Convert.ToInt32(row["ReklamaId"]); - // this.reklamaTableAdapter.FillByReklamaId(this.rEKLAMADataSet.REKLAMA, idRek); OrderDetails.getOrderDetails().PokazSzczegolyZamowienia(idRek); OrderDetails.getOrderDetails().ShowDialog(); - /* - OrderDetails od = new OrderDetails(); - od.PokazSzczegolyZamowienia(idRek); - od.ShowDialog(); */ } } - - private void tytToolStripComboBox2_SelectedIndexChanged(object sender, EventArgs e) - { - if (((ComboBox)tytToolStripComboBox2.Control).SelectedItem != null) - { - ((BindingSource)((ComboBox)modToolStripComboBox.Control).DataSource).Filter = "tytul = '" + tytToolStripComboBox2.Control.Text + "'"; - modToolStripComboBox.SelectedIndex = -1; - modToolStripComboBox.SelectedIndex = -1; - } - } - private void wyczyscFiltrToolStripButton_Click(object sender, EventArgs e) @@ -276,5 +254,6 @@ odToolStripTextBox.Clear(); doToolStripTextBox.Clear(); - ((BindingSource)((ComboBox)modToolStripComboBox.Control).DataSource).Filter = ""; + if (modToolStripComboBox.ComboBox != null) + modToolStripComboBox.ComboBox.DataSource = new List(); modToolStripComboBox.SelectedIndex = -1; modToolStripComboBox.SelectedIndex = -1; @@ -287,5 +266,5 @@ private void drukujToolStripButton_Click(object sender, EventArgs e) { - PrintDGV.Print_DataGridView(listaReklamDataGridView,50); + PrintDGV.Print_DataGridView(listaReklamDataGridView, 50); } @@ -364,4 +343,34 @@ _listaReklamNaWydanie = null; } + + private void tytulToolStripComboBox_SelectedIndexChanged(object sender, EventArgs e) + { + + if (grzbietToolStripComboBox.ComboBox == null || tytulToolStripComboBox.ComboBox == null) return; + + grzbietToolStripComboBox.ComboBox.DataSource = new List(); + grzbietToolStripComboBox.ComboBox.Text = string.Empty; + + if (tytulToolStripComboBox.ComboBox.SelectedItem == null || ((ComboItem)tytulToolStripComboBox.ComboBox.SelectedItem).Value == 0) + return; + + DBBindings.BindujGrzbiety(grzbietToolStripComboBox, ((ComboItem)tytulToolStripComboBox.ComboBox.SelectedItem).Value); + } + + + private void tytToolStripComboBox2_SelectedIndexChanged(object sender, EventArgs e) + { + if (modToolStripComboBox.ComboBox == null || tytToolStripComboBox2.ComboBox == null) return; + + modToolStripComboBox.ComboBox.DataSource = new List(); + modToolStripComboBox.ComboBox.Text = string.Empty; + + if (tytToolStripComboBox2.ComboBox.SelectedItem == null || + ((ComboItem) tytToolStripComboBox2.ComboBox.SelectedItem).Value == 0) + return; + + DBBindings.BindujModuly(modToolStripComboBox, + ((ComboItem) tytToolStripComboBox2.ComboBox.SelectedItem).Display); + } } } Index: branches/ReklamaReorganizacja/BazaReklam/Classes/Helpers/AdHelper.cs =================================================================== --- branches/ReklamaReorganizacja/BazaReklam/Classes/Helpers/AdHelper.cs (revision 649) +++ branches/ReklamaReorganizacja/BazaReklam/Classes/Helpers/AdHelper.cs (revision 658) @@ -56,4 +56,13 @@ public static AdSize GetAdSize(int horizontal, int vertical, Module module) { + AdSize adSize = new AdSize(); + + if (!EnableModuleCount(module)) + { + adSize.Width = Convert.ToInt32(module.Width * 10); + adSize.Height = Convert.ToInt32(module.Height * 10); + return adSize; + } + int width = 0; int height = 0; @@ -81,5 +90,5 @@ } - AdSize adSize = new AdSize(); + adSize.Width = width; adSize.Height = height; @@ -87,4 +96,63 @@ } + public static bool EnableModuleCount(Module module) + { + switch (module.Section.Title.ShortName) + { + case "GS": + return EnableGsModuleCount(module); + case "adMot": + return EnableAdMotoModuleCount(module); + default: + return EnableAmtModuleCount(module); + } + } + + //TODO: get this info from db, IsSplitable...? + private static bool EnableAmtModuleCount(Module module) + { + switch (module.Name) + { + case "AWEB": + case "AWEF": + case "ALAF": + case "AZOF": + return true; + } + + return false; + } + + //TODO: get this info from db, IsSplitable...? + private static bool EnableGsModuleCount(Module module) + { + switch (module.Name) + { + case "GOK1M": + //case "GOK2": + case "GOK3M": + //case "GOK4": + case "GWEW_P": + case "GWEW": + //case "GART_S": + return true; + } + + return false; + } + + //TODO: get this info from db, IsSplitable...? + private static bool EnableAdMotoModuleCount(Module module) + { + switch (module.Name) + { + case "ad-Text": + case "Truck-Text": + return true; + } + + return false; + } + } } Index: branches/ReklamaReorganizacja/BazaReklam/Classes/Helpers/ComboBoxHelper.cs =================================================================== --- branches/ReklamaReorganizacja/BazaReklam/Classes/Helpers/ComboBoxHelper.cs (revision 643) +++ branches/ReklamaReorganizacja/BazaReklam/Classes/Helpers/ComboBoxHelper.cs (revision 658) @@ -15,4 +15,11 @@ } + public static void Bind(IEnumerable list, ComboBox comboBox, T defaultItem) + { + Bind(list, comboBox); + + comboBox.Items.Insert(0, defaultItem); + } + //public static int GetItemIndex(T type, int value, ComboBox comboBox) //{ Index: branches/ReklamaReorganizacja/BazaReklam/Classes/DBBindings.cs =================================================================== --- branches/ReklamaReorganizacja/BazaReklam/Classes/DBBindings.cs (revision 539) +++ branches/ReklamaReorganizacja/BazaReklam/Classes/DBBindings.cs (revision 658) @@ -1,4 +1,5 @@ using System; using System.Collections; +using System.Collections.Generic; using System.Data; using System.Data.SqlClient; @@ -33,20 +34,26 @@ public static void bindujTytuly(ToolStripComboBox toolStripComboBox) { - SqlCommand command = new SqlCommand(); - command.Connection = new SqlConnection(ConnString.getConnString().Value); - - command.CommandText = "select SYMB from [LISTA TYTU£ÓW] where st_aktywny=-1"; - command.Connection.Open(); - - SqlDataReader reader = command.ExecuteReader(); - - if (reader.HasRows) - { - while (reader.Read()) - { - toolStripComboBox.Items.Add(reader.GetValue(0).ToString()); - } - } - command.Connection.Close(); + List comboItems = new List(); + + SqlCommand command = new SqlCommand(); + command.Connection = new SqlConnection(ConnString.getConnString().Value); + + command.CommandText = "select Id, SYMB from [LISTA TYTU£ÓW] where st_aktywny=-1"; + command.Connection.Open(); + + SqlDataReader reader = command.ExecuteReader(); + + if (reader.HasRows) + { + while (reader.Read()) + { + comboItems.Add(new ComboItem(reader.GetInt32(0), reader.GetString(1))); + } + } + command.Connection.Close(); + + toolStripComboBox.ComboBox.DataSource = comboItems.ToArray(); + toolStripComboBox.ComboBox.DisplayMember = "Display"; + toolStripComboBox.ComboBox.ValueMember = "Value"; } @@ -74,16 +81,4 @@ public static void bindujTypyReklam(ToolStripComboBox toolStripComboBox) { - /* - SLOWNIKDataSetTableAdapters.LISTA_TYPOW_REKLAMYTableAdapter ta = - new SLOWNIKDataSetTableAdapters.LISTA_TYPOW_REKLAMYTableAdapter(); - - ta.Connection.ConnectionString = ConnString.getConnString().Value; - - ((ComboBox)toolStripComboBox.Control).DataSource = ta.GetData(); - ((ComboBox)toolStripComboBox.Control).DisplayMember = "SYMB"; - ((ComboBox)toolStripComboBox.Control).ValueMember = "SYMB"; - toolStripComboBox.SelectedIndex = -1; - */ - SqlCommand command = new SqlCommand(); command.Connection = new SqlConnection(ConnString.getConnString().Value); @@ -105,5 +100,5 @@ - public static void bindujGrzbiety(ToolStripComboBox toolStripComboBox) + public static void BindujGrzbiety(ToolStripComboBox toolStripComboBox) { SLOWNIKDataSetTableAdapters.GRZBIETYTableAdapter ta = @@ -138,18 +133,31 @@ } + public static void BindujGrzbiety(ToolStripComboBox toolStripComboBox, int tytulId) + { + List comboItems = new List(); + + SqlCommand command = new SqlCommand(); + command.Connection = new SqlConnection(ConnString.getConnString().Value); + + command.CommandText = string.Format("SELECT Id, Nazwa FROM dbo.Grzbiety WHERE TytulId={0} AND Active=1", + tytulId); + command.Connection.Open(); + + SqlDataReader reader = command.ExecuteReader(); + + if (reader != null && reader.HasRows) + { + while (reader.Read()) + comboItems.Add(new ComboItem(reader.GetInt32(0), reader.GetString(1))); + } + command.Connection.Close(); + + toolStripComboBox.ComboBox.DataSource = comboItems.ToArray(); + toolStripComboBox.ComboBox.DisplayMember = "Display"; + toolStripComboBox.ComboBox.ValueMember = "Value"; + } + public static void bindujAgencje(ToolStripComboBox toolStripComboBox) { - /* - SLOWNIKDataSetTableAdapters.AGENCJETableAdapter ta = - new SLOWNIKDataSetTableAdapters.AGENCJETableAdapter(); - - ta.Connection.ConnectionString = ConnString.getConnString().Value; - - ((ComboBox)toolStripComboBox.Control).DataSource = ta.GetData(); - ((ComboBox)toolStripComboBox.Control).DisplayMember = "Symbol"; - ((ComboBox)toolStripComboBox.Control).ValueMember = "Id_agencji"; - toolStripComboBox.SelectedIndex = -1; - * */ - SqlCommand command = new SqlCommand(); command.Connection = new SqlConnection(ConnString.getConnString().Value); @@ -191,8 +199,9 @@ } } + command.Connection.Close(); + toolStripComboBox.ComboBox.DataSource = kontakTypList; toolStripComboBox.ComboBox.DisplayMember = "Display"; toolStripComboBox.ComboBox.ValueMember = "Value"; - command.Connection.Close(); } @@ -232,36 +241,28 @@ } - //Przez BindingSource by bylo filtrowanie - public static void bindujModuly(ToolStripComboBox toolStripComboBox) - { - SLOWNIKDataSetTableAdapters.NAZWY_MODULOWTableAdapter ta = - new SLOWNIKDataSetTableAdapters.NAZWY_MODULOWTableAdapter(); - - ta.Connection.ConnectionString = ConnString.getConnString().Value; - - BindingSource bs2 = new BindingSource(); - bs2.DataSource = ta.GetData(); - ((ComboBox) toolStripComboBox.Control).DataSource = bs2; - ((ComboBox) toolStripComboBox.Control).DisplayMember = "MOD_TYP"; - ((ComboBox) toolStripComboBox.Control).ValueMember = "MOD_TYP"; - toolStripComboBox.SelectedIndex = -1; - - /* - SqlCommand command = new SqlCommand(); - command.Connection = new SqlConnection(ConnString.getConnString().Value); - - command.CommandText = "select Symbol from dbo.AGENCI where aktywny=1 order by Symbol"; - command.Connection.Open(); - - SqlDataReader reader = command.ExecuteReader(); - - if (reader.HasRows) - { - while (reader.Read()) - { - toolStripComboBox.Items.Add(reader.GetValue(0).ToString()); - } - } - command.Connection.Close(); */ + public static void BindujModuly(ToolStripComboBox toolStripComboBox, string title) + { + + List comboItems = new List(); + + SqlCommand command = new SqlCommand(); + command.Connection = new SqlConnection(ConnString.getConnString().Value); + + command.CommandText = string.Format("SELECT Id, MOD_TYP FROM dbo.[Nazwy Modu³ów] WHERE Tytul='{0}' AND Active=1 ORDER BY MOD_TYP", + title); + command.Connection.Open(); + + SqlDataReader reader = command.ExecuteReader(); + + if (reader != null && reader.HasRows) + { + while (reader.Read()) + comboItems.Add(new ComboItem(reader.GetInt32(0), reader.GetString(1))); + } + command.Connection.Close(); + + toolStripComboBox.ComboBox.DataSource = comboItems.ToArray(); + toolStripComboBox.ComboBox.DisplayMember = "Display"; + toolStripComboBox.ComboBox.ValueMember = "Value"; } Index: branches/ReklamaReorganizacja/BazaReklam/app.config =================================================================== --- branches/ReklamaReorganizacja/BazaReklam/app.config (revision 657) +++ branches/ReklamaReorganizacja/BazaReklam/app.config (revision 658) @@ -11,6 +11,4 @@ providerName="System.Data.SqlClient" /> - Index: branches/ReklamaReorganizacja/BazaReklam/ListaReklamNaWydanieForm.resx =================================================================== --- branches/ReklamaReorganizacja/BazaReklam/ListaReklamNaWydanieForm.resx (revision 593) +++ branches/ReklamaReorganizacja/BazaReklam/ListaReklamNaWydanieForm.resx (revision 658) @@ -162,30 +162,30 @@ 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 YII= @@ -337,4 +337,7 @@ 17, 56 + + 17, 56 + @@ -384,23 +387,23 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABA5JREFUSEvtVH1M - W1UcnbLgMBoStwkxAQKWSEdMwIgUQ+g2CixAIWPa0LTQsHTIh0Yjshq1drhBSwi2ItDRbdCWL+lY5DsS - ZAnaAB3UMD4qSiQbAwlZ3HSBMd3I8Xdfim4VMdE//Gc3OXnv3XfvOff8zr13x46H7b9WQCgU7pTL5QcV - CsV+4vIheP1bzkdp4iMMeXl5T0ul0qSMjIzi1NTUMQLS09ORlJQ0FRUVpQ8MDAyhcY+5x2+vRyvclZ2d - fS43N3c1MzNzvqCgwEXvG1qtFgaDAUajEQ0NDTCbzbBYLNDpdEhMTFwJDw9/h5h3E3ZuqyAWiz8mYuTk - 5KC9vR12ux39/f3o6OiAzWZDY2Mj6uvrOREmYLVaObH8/HxERkZeIjcpJPAEgVXgry0hIeEKs9/T0wOn - 0wmHw4GhoSEMDg5yZGzFRUVFoAyQnJyM+Ph4UCZQq9XQaDSQyWT3goODW0noBXdGrMx/tri4uNm0tDS0 - tbWhpqYGo6Oj6OvrQ2FhIcrLyyGRSDhS9iQyToQ5Wltbw2ZzuWaQlSW7fVShqI2IiNj3QD7UURAdHb3h - crnQ2dkJvV7PlWt6evoPApZDllwG1fFiKJVKsJJOTk5iYWEBKyvLMNY1ocrUjYraDpp7dCUsLCyRRJ7c - 3AS+oaGh75OT31QqFZgbJjQxMYGlpUVMTV7GyVNV0JSeQf7rKohpRzF3LKfRkRHY2nthH7+GOxvA3C3A - 1HsZsbGCXiKPcpeM29fP8Hi845THOitFU1MTuru7MDJsh766DRMzS1i8uQHHj4Cy8G0cTk/jgrZ91gpL - 5xjmfgbmbwCOReDC90DKIeEKcR4j+G2Gwbaaf0hIyJsxMTGrZWVlOHvGBIu5GV988xOu/wpcuQkMk4D+ - /DAOCGO5c/GpoRJ1A1fRPw8M/AB8Pgucc95FgujAMvGVEILvz5s58aPdoKRQb3xUUoLK2hZ8eRUYuQZ8 - Rc+uOeCT7m/xPJ8/5u/v3yyTSm6fMPXhtBOou3QPhq/XUdl0Ec/xnh0krhOeAkyMiewJCgrKEYtTf9Fo - q2GeAVoo7+Yp4PQ48EGlFX5+e1tonI4ca+jEr71XPQC1ZQYVDRepfCmr3t7e9fT/NVaVrY4GOzC7Kfhj - bPKHlnHoeq+jtGsZFee/g0gkuuXl5XWWxmQS9vH5/LxDItGsVHLkbozgRZePj4+Z+ksJLxMe30qA9XEi - AoHgDar1+lvqKrx7yoiMw+I7vr6+jfTvJCGCwC6/PYSDhGLmilBE2E94ivDgofNQYyJ7qdZycmMNCAho - Jesm6tMSku8jYOPYng8g8NzPv786PERYJuxCe4nwKuEV9ztbtee1zd3E/7RqD37uk01ipWCWGdj7tta3 - InnY9/9V4HfchCTtVio9tgAAAABJRU5ErkJggg== + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABBBJREFUSEvtVH1M + W1UcnbLgMBoStwkxAQJCpCMmYESKIXQbBRagkDFtaFogjA750GhEVqPWDjdoCcFWBDq6DdpSQDoW+Y4E + WYI2fAxqGB8VJZKNgaRZ3HSBMd3I8Xdfim4VMdE//Gc3OXnv3XfvOff8zr13x46H7b9WQCAQ7JTJZAez + s7P3E5cXwePfcj5KEx9hyM/Pf1oikSSmp6eXpKSkjBOQlpaGxMTE6cjISK2/v38QjXvMNX57PVrhrqys + rHN5eXmrGRkZC4WFhY7c3NwNtVoNnU4HvV6PxsZGGI1GmEwmaDQaJCQkOMPCwt4h5t2EndsqiESij4kY + OTk5aG9vh81mQ39/Pzo6OmC1WtHU1ISGhgZOhAmYzWZOrKCgABEREZfITTIJPEFgFfhri4+Pv8Ls9/T0 + wG63Y2xsDENDQxgcHOTI2IqLi4tBGSApKQlxcXGgTKBUKqFSqSCVSu8FBga2ktALroxYmf9ssbGxc6mp + qWhra0NtbS1GR0fR19eHoqIiVFRUQCwWc6TsSWScCHO0traGzeZwzCIzU3r7aHZ2XXh4+L4H8qGOwqio + qA2Hw4HOzk5otVquXDMzM38QsBwyZVIojpdALpeDlXRqagqLi4twOlegr7eg2tCNyroOmnvUGRoamkAi + T25uAu+QkJD3yclvCoUCzA0TmpycxPLyEqanLuPkqWqoys6g4HUFRLSjmDuW0+jICKztvbBNXMOdDWD+ + FmDovYyYGH4vkUe6Ssbt62eCg4OPUx7rrBQWiwXd3V0YGbZBW9OGydllLN3cwNiPgLzobRxOS+WCtn7W + ClPnOOZ/BhZuAGNLwIXvgeRDAidxHiP4bIbBtppvUFDQm9HR0avl5eU4e8YAk7EZX3zzE67/Cly5CQyT + gPb8MA4IYrhz8amuCvUDV9G/AAz8AHw+B5yz30W88MAK8ZUSAu/Pmznxod0gp1BvfFRaiqq6Fnx5FRi5 + BnxFz6554JPub/E8jzfu6+vbLJWIb58w9OG0Hai/dA+6r9dRZbmI54KfHSSuE+4CTIyJ7AkICMgRiVJ+ + UalrYJwFWijv5mng9ATwQZUZPj57W2ichhyr6MSvvVczAKVpFpWNF6l8yauenp4N9P81VpWtjgY7MLsp + +GNs8oemCWh6r6OsawWV57+DUCi85eHhcZbGZBD28Xi8/ENC4ZxEfORuNP9Fh5eXl5H6ywgvEx7fSoD1 + cSJ8Pv8NqvX6W8pqvHtKj/TDojve3t5N9O8kIZzALr89hIOEEuaKUEzYT3iK8OChc1NjInup1jJyY/bz + 82sl6wbqUxOS7iNg49ie9yMEu55/f3W4ibBM2IX2EuFVwiuud7Zq92ubu4n/adVu/Nwnm8RKwSwzsPdt + rW9F8rDv/6vA75x/JOSsngmYAAAAAElFTkSuQmCC @@ -424,29 +427,29 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABY1JREFUSEuVVWlM - VFcYHVpbMdLUFiyNkDRto5WiMY22FNJUfxBLWBQtVBEtatuURS0oCiqyqCxRLJsR1EBBVkGQbWDsMDBA - IVNkKSJ0HDaBmQFmcRgEBKmcfvd10pqoWF5y8u7Me/ec8333vnONeC++jOZ5hnmePf9Rbm7u9vPnYw5F - R0eHRp49feFMeHjq2TMRBVFnon6NvRArSUhKkiYmJrbRbAvC4gULpKWlVctHNBhSPYBcNwnlxByU08DQ - DNDzCJDR+HR8ytzq1asDiPw9wisLEklISIhUaPUY/wtQEZlyEhh4SMRjQOcDoEMHCDsG4bB58y9EbEcw - XpBARETE1obb7dA9/od8aALoHwe69YCURO6SQAf9PnzQp5GIdxJMFyTg4uJifqO49LGaBBQkwNA8+gTl - shmk/TGJcw16nKgew9a43x5ZHS28sSqo1O98xCmbi3FxX+7bt285iS0izLcxeIuoTS3qOaBVAwQKpxEs - fIiImofwr9TjJ/4YDpWP4QDhxxItHDOU2JPcgJYGMbKzsydDQkLiTE1NV5DIa8+trLGx0T4jI0N2q6oG - lbeqUC6W4GLdMA7ydUhumsYJEjtcQQJlD+BNAt8Xa2GbPIhr9b0YVQyitrYWR44c4RP5qmd2WUtLi0tN - Tc1Ma2vrk4mJCWg1agwr5NAo7qOs5T5cs5W40DCFgAodfEu1+OGmGl43RrG7YBQfx0jRJ72De/fuoays - HK6urnEk8IGhZTwetWWxQCAYmp2dxfj4OLRaLdRqNQYGBiCVSjHQ/SdSqqTYeX0EoSI9uddgf5EKewpG - 4Jk/gg1J/bhY3o6i7MsQCYoRHBysNTY2/m8TZGZmftPV1YWpqSnodDpoNBqMjIxgeHgYnZ2daGtrg+xO - C9zTunD8lo4E1NhL7j1J0D1PCacMObYk3UVT6reYLd+O9KwCrF27NpEqWMNVkZKSkspc6/V6jlylUnHk - Q0ND6O3thUQiwe3fJRDWSmB3aQCBAi12k/MdRO6WrcBWat+a0+2QVGZhumw/qsSN2LRpUwWROxPe5F25 - cuU26ztry+joKEcul8u5FjHQ4qO+vh4tjXXwSGmFd7EKu8j9jutKfJ2jxMarg/gkogkNYhGE1fWoEdfC - w8Ojg8i9Ce/ysrKylGNjY1xblEolRz44OIj+/n709fWhqakJIpEINaIqlAmq8WF0L764LMe6+H4sPyXD - 50ReKRRBUMEHcUEsFsPPz2+UyE9ykZKcnKxj7llrFAoF55qRs/Z0d3ejubkZlZWVHISCCly7KURIei3O - 5dairJyPzNRLOHE8CI6OjrC3t0dgYCCcnZ0lRB5OeJ8XFBQUGhsbi/z8fPT09HAVMOcymYzbeu3t7Sgp - KUFpaSkqyCVzmnb1MkJPHofr1i2wsbHBypUrYW1tDQcHB+YeJiYm6UR+gLCC5+/vb5+TkwM+n4+YmBhQ - RRwpE2HblI2Lioo4gaSkJLi7u8PW1haUqrCysmILCi8vL865j49P//r1668bGRn9TOQbCUt55ubmS729 - vY/SOXCfETGEhYUhKioKdXV1XBWFhYUsDthHxBEz17SQOHbsGHx9fWfc3NxqLCwsWMqmEMIIrtwCGyKd - 5br5kiVLtjg5OaWQkCovLw90AIHaB8oYBAQEcKUTEYsDREZGMuIBEsqneWk0nzk+SNhM+Ijw9r9fMg3Y - xZLwLYL1smXLPLdt25ZOQnrKJlbNHEN8fDwbP/b09BRbWlqmUxuuGhZyF90/JVgSTAivGjifubGoZUlo - RlhnZmb2HQnlh4eH62mdeuzs7AoMblnWHCJ8ZXDL3mdH6LxR/bQae/F11jbCBsJeg1O2r5nbzwxu3zBU - /iLDL/2fCTFn7xBYOrJzeMFuX6piKJ2J/e8WPE36N5Iz1fIHqihRAAAAAElFTkSuQmCC + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABY1JREFUSEuVVXtQ + VFUcXsoSR5osMBphpqlGk9BxGi2CadI/GGN4CBqkiIZaTTzUQFFQkYfKYxTiZYI6EMhTEOTN2rLsAsFs + wEqI0Lq85LELLLsui4Agydfv3HbKGZXiznxzz+695/u+3++c+x0D3osvgwWeYYFnz3+Um5u748KF6MNR + UVEhEefOxJ4NC0s9dza8IPJs5C8xsTGShKQkWWJiYivNNiMsXbRAWlpazdCIGoOqBxjSTkE5OQ/lDDA4 + C3Q/AuQ0Do39aX7t2rX+RP4O4aVFiSQkJEQoNDpM/AmoiEw5BfQ/JOJxoOMB0K4FBO0DsNu69WcitiEY + LkogPDzcuaG5DdrHf5MPTgJ9E0CXDpCRyF0SaKffRw55NxLxLoLxogScnJxMbxSXPh4jAQUJMLSMPkG5 + fBZpv0/hfIMOJ2vG4Rz36yOLY4U31gSW+l4IP211MS7u8/37968ksSWEhTYGbwm1STo2D9xWAwGCGQQJ + HiJc9BB+VTr8UDGOw+XjOEj4vkQD+wwl9iY3QNogRnZ29lRwcHCcsbHxKhJ55bmVNTY22mZkZMhvVYtQ + dasa5WIJLtYN41CFFslNMzhJYkcqSaDsAbxI4NtiDayTB3CtvgejigHU1tbi6NGjFUS+5pldJpVKnUQi + 0Wxzc/OTyclJaNRjGFYMQa24jzLpfbhkKxHbMA3/Si18SjX47uYYPG+MYk/BKD6MlqFXdgf37t1DWVk5 + XFxc4kjgPX3LeDxqy1I+nz84NzeHiYkJaDQajI2Nob+/HzKZDP1dfyClWoZd10cQItSRezUOFKmwt2AE + Hvkj2JTUh4vlbSjKvgwhvxhBQUEaQ0PDfzdBZmbmV52dnZienoZWq4VarcbIyAiGh4fR0dGB1tZWyO9I + 4ZbWiRO3tCQwhn3k3oME3fKUcMgYwraku2hK/Rpz5TuQnlWA9evXJ1IF67gqUlJSUplrnU7HkatUKo58 + cHAQPT09kEgkaP5NAkGtBDaX+hHA12APOd9J5K7ZCjhT+9adaYOkKgszZQdQLW7Eli1bKonckfA678qV + K82s76wto6OjHPnQ0BDXIgZafNTX10PaWAf3lNvwKlZhN7nfeV2JL3OU2Hx1AB+FN6FBLISgph4icS3c + 3d3bidyL8DYvKytLOT4+zrVFqVRy5AMDA+jr60Nvby+ampogFAohElajjF+D96N68NnlIWyI78PK03J8 + SuRVAiH4lRUgLojFYvj6+o4S+SkuUpKTk7XMPWuNQqHgXDNy1p6uri60tLSgqqqKg4BfiWs3BQhOr8X5 + 3FqUlVcgM/USTp4IhL29PWxtbREQEABHR0cJkYcR3uUFBgaGxMTEID8/H93d3VwFzLlcLue2XltbG0pK + SlBaWopKcsmcpl29jJBTJ+DivA1WVlZYvXo1LC0tYWdnx9zDyMgoncgPElbx/Pz8bHNyclBRUYHo6GhQ + RRwpE2HblI2Lioo4gaSkJLi5ucHa2hqUqrCwsGALCk9PT865t7d338aNG68bGBj8SOSbCct5pqamy728 + vI7ROXCfETGEhoYiMjISdXV1XBWFhYUsDthHxBEz17SQOH78OHx8fGZdXV1FZmZmLGVTCKEEF26B9ZHO + ct102bJl2xwcHFJISJWXlwc6gEDtA2UM/P39udKJiMUBIiIiGHE/CeXTvDSazxwfImwlfEB4858vmQbs + Ykn4BsFyxYoVHtu3b08nIR1lE6tmniE+Pp6NH3t4eIjNzc3TqQ1X9Qu5m+4fE8wJRoSX9ZzP3FjUsiQ0 + IWwwMTH5hoTyw8LCdLRO3TY2NgV6tyxrDhO+0Ltl77MjdMGoflqNvfgqaxthE2Gf3inb18ztJ3q3r+kr + f5Hh//yfCTFnbxFYOrJzeNFu/1NFXzoT+98teJr0LxK51eCKmdQ4AAAAAElFTkSuQmCC