Index: trunk/BazaReklam/ZestawienieZamowienForm.resx =================================================================== --- trunk/BazaReklam/ZestawienieZamowienForm.resx (revision 350) +++ trunk/BazaReklam/ZestawienieZamowienForm.resx (revision 351) @@ -200,45 +200,45 @@ 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 AAAAAElFTkSuQmCC @@ -274,29 +274,29 @@ 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 - v9pi5PnfqiO601y7xZMAAAAASUVORK5CYII= + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABXVJREFUSEuVlQtQ + VFUYx10VG1ptyTRkIIGZdCrLwcnHWIZKbEGhRjAyPkJSUUMzKwxwXS6P4aGggyKBKyvDsggoxMhL1EjF + BEkUCQRZQBCFBSRZXN4s++87O0upLFhn5jd377n3/P/3fPt93+FNGGds23bcSCAwOjJzppFra+uTdqXy + Qf7QUE92enr0H7RsgICe8WTGfhYSkhfa2NgGNrRaoKqqCRzHab29j9Zv2OB3xNl5hx2tfpmYSPD+l0tE + hIwvkVzq0qk/N5hZdfUDndnOncENrq5ex1at8hCSAZ+Y9J+MgoLynW7cqDWkP2ouLCwGLi7btS4unk0O + Dl+F8vl8UzIxGtfI3z89RKXqfqFBXFwidu2KQnExkJb2ECJRKubPt00gcetxTXx8UjP+VaeYGBiDgwNY + t04MP79kLFz4MUpKhlBTAzg4uLeS+Dpixpi7CA3NvMk0BweHodEYNsjMPIctWyIREVEAsViClhbg0SNg + 0aJl1SQsJizHMuDFxOS1Dg8DfX1D6OxU4VSyHMEBAQgKCoBUIkFz80Okp+cPzJo1O2Xp0hUNGzd+i4sX + VVi+PHJYIHhVRsJ7CQuDBufPn+dz3K+a/v5htDS34mRSMoqaWlGhAQqfAGfutOGYVIYUeWo3CSRSlnqb + mZketrS0Tps2zURCcwcJB0Jg0CAx8cLbHHdI29HRhXiZHB0Uqj6ieWAYpY8HkPegD6fuQ5em5ubm0SRi + S7xLfEq4Eh8Rr4+ZsrGxGcLy8ns4ezYL11o6oSJxDSV/ba8GxR19yL7fC3m1GvK73fD02HSLhByJ6cQ0 + /ZXVAyu+ZwarRF01BgfHbbp3T0nxDsZ1NVDXo0GVehDXSbxA2YuMOjVOVqiQWKOFt7e3mpb8oI/36Go+ + dKhyekJCbZJcXnFTLM4Mtbf3mLNjh2hfQ8MjcIGByG0FfmvuxWVlH/KbenC2Xo3kqi7E3FZBrhjGvv1i + 9j+EE28ajHdISHaqWs0iDLS308KYjG4Xlz11lZUtiI46ChmF4XR9D07XdiGNkFWqEHu7E5JbKiQptNi6 + dfMdEj6gNxi9g6ioLJVS2QmlUoX+fkoTGmo1CZ7OR15uAY7KMyCp1uBEeReOk/CRm48RW6ZCQvUguKwC + jY2NTbaltXWw3mBU3Cf4+ycqiooUVIV1qKhoQmNjO1SqHp2RRjMESVwsolOycOx2D6L/pPuKIUjJMCH7 + Cg4EB+Di5d/B+fg8sXvNeJU+LZ/dhZdXmAfHnRnMyCihQqlEYWE1SkvrcfduM+gM0BkVXrmCIE4MX9F+ + +O3ncDA0TJeijMLiy2iTrATWzoCTqWETwZIlTl9v3iy+yhYkJ19Dbm45CgoqaVf1ZKaAl9c+ui/FpUsl + FLpfUFurRlZ2jppl0P3ID4H63UDOWmCDGdzMBV8+vxPWv1lTsp0718bf2Xn7NV9fTiuVFiInpxLh4VKs + WfMNHB03Yu/eGNjZOSE+/hZWrhReNebxZHDkAzJHoOY74JwbsF4Ax/lz3PX18M9/wn6w4rAi7K2s3vIX + Ct2K9uzhtCLRz9SOD1BDy4Ozsyc8PQMRGJgCU1PTJHpXZGY0cT0+mwrEf0Kn0Fa0ST3h4xPYSc/YaccK + 75nBdjOVYL3c3sLCilu2zO6GnZ2D1s/vBMLCsnD48AXahVDJ4/FO0DtfsAKzfGnSCginoCVkNcoUzVjv + 7l5D8z8Rsw3WBk0+bSS0sJgdPm/ee2WLF6/uX7DgfYWxsTE7UETEO8QU9lGzJk+w9fL1/cvNza3MxMRE + SnPfM/OxDEbmR4xYlX5OeBOhxI8Ea2ivECMthoV4iV54N10/0EfjRR6655MJ1nrfIJgZu7JQPl1YzMhY + /9XmI8//BqSPutJw6NKIAAAAAElFTkSuQmCC @@ -405,31 +405,34 @@ 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 + + + + 17, 54 + 310, 54 @@ -506,4 +509,13 @@ 233, 91 + + + True + + + True + + + 451, 54 Index: trunk/BazaReklam/OrdersForm.cs =================================================================== --- trunk/BazaReklam/OrdersForm.cs (revision 340) +++ trunk/BazaReklam/OrdersForm.cs (revision 351) @@ -1266,6 +1266,6 @@ Cursor = Cursors.WaitCursor; - ExcelHandler ex = new ExcelHandler(); - ex.exportToExcel(reklamaDataGridView); + ExcelHelper ex = new ExcelHelper(); + ex.Export(reklamaDataGridView); Cursor = Cursors.Default; Index: trunk/BazaReklam/ZestawienieZamowienForm.cs =================================================================== --- trunk/BazaReklam/ZestawienieZamowienForm.cs (revision 350) +++ trunk/BazaReklam/ZestawienieZamowienForm.cs (revision 351) @@ -203,6 +203,6 @@ Cursor = Cursors.WaitCursor; - ExcelHandler ex = new ExcelHandler(); - ex.exportToExcel(fakturyDataGridView); + ExcelHelper ex = new ExcelHelper(); + ex.Export(fakturyDataGridView); Cursor = Cursors.Default; Index: trunk/BazaReklam/Baza Reklam.csproj =================================================================== --- trunk/BazaReklam/Baza Reklam.csproj (revision 270) +++ trunk/BazaReklam/Baza Reklam.csproj (revision 351) @@ -101,5 +101,5 @@ - + Index: trunk/BazaReklam/InfoForm.Designer.cs =================================================================== --- trunk/BazaReklam/InfoForm.Designer.cs (revision 65) +++ trunk/BazaReklam/InfoForm.Designer.cs (revision 351) @@ -300,4 +300,5 @@ this.bindingNavigatorSeparator11 = new System.Windows.Forms.ToolStripSeparator(); this.modulySaveToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.excelToolStripButton = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.naWydanTab = new System.Windows.Forms.TabPage(); @@ -323,4 +324,5 @@ this.bindingNavigatorSeparator8 = new System.Windows.Forms.ToolStripSeparator(); this.zapiszNrWydToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.btnExportNrWydan = new System.Windows.Forms.ToolStripButton(); this.infoTabControl = new System.Windows.Forms.TabControl(); this.agencjeTabPage = new System.Windows.Forms.TabPage(); @@ -355,4 +357,6 @@ this.agencjeListBox = new System.Windows.Forms.ListBox(); this.ukrytyLabel = new System.Windows.Forms.Label(); + this.btnExportPlan = new System.Windows.Forms.ToolStripButton(); + this.btnExportBudzet = new System.Windows.Forms.ToolStripButton(); rokLabel = new System.Windows.Forms.Label(); miesiacLabel = new System.Windows.Forms.Label(); @@ -972,5 +976,6 @@ this.bindingNavigatorAddNewItem10, this.bindingNavigatorDeleteItem10, - this.zapiszBudzetToolStripButton}); + this.zapiszBudzetToolStripButton, + this.btnExportBudzet}); this.bindingNavigator11.Location = new System.Drawing.Point(0, 0); this.bindingNavigator11.MoveFirstItem = this.bindingNavigatorMoveFirstItem10; @@ -1076,5 +1081,5 @@ this.zapiszBudzetToolStripButton.Name = "zapiszBudzetToolStripButton"; this.zapiszBudzetToolStripButton.Size = new System.Drawing.Size(23, 22); - this.zapiszBudzetToolStripButton.Text = "toolStripButton1"; + this.zapiszBudzetToolStripButton.Text = "Zapisz bud¿et"; this.zapiszBudzetToolStripButton.Click += new System.EventHandler(this.zapiszBudzetToolStripButton_Click); // @@ -1482,8 +1487,8 @@ this.pLANY_PROWIZJIDataGridView.DataSource = this.pLANYPROWIZJIBindingSource; this.pLANY_PROWIZJIDataGridView.Dock = System.Windows.Forms.DockStyle.Fill; - this.pLANY_PROWIZJIDataGridView.Location = new System.Drawing.Point(0, 25); + this.pLANY_PROWIZJIDataGridView.Location = new System.Drawing.Point(0, 0); this.pLANY_PROWIZJIDataGridView.Name = "pLANY_PROWIZJIDataGridView"; this.pLANY_PROWIZJIDataGridView.RowHeadersWidth = 10; - this.pLANY_PROWIZJIDataGridView.Size = new System.Drawing.Size(547, 323); + this.pLANY_PROWIZJIDataGridView.Size = new System.Drawing.Size(547, 348); this.pLANY_PROWIZJIDataGridView.TabIndex = 1; this.pLANY_PROWIZJIDataGridView.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.pLANY_PROWIZJIDataGridView_CellLeave); @@ -1547,5 +1552,6 @@ this.bindingNavigatorAddNewItem8, this.bindingNavigatorDeleteItem8, - this.zapiszPlanProwToolStripButton}); + this.zapiszPlanProwToolStripButton, + this.btnExportPlan}); this.bindingNavigator9.Location = new System.Drawing.Point(0, 0); this.bindingNavigator9.MoveFirstItem = this.bindingNavigatorMoveFirstItem8; @@ -1558,4 +1564,5 @@ this.bindingNavigator9.TabIndex = 0; this.bindingNavigator9.Text = "bindingNavigator9"; + this.bindingNavigator9.Visible = false; // // bindingNavigatorAddNewItem8 @@ -1651,5 +1658,5 @@ this.zapiszPlanProwToolStripButton.Name = "zapiszPlanProwToolStripButton"; this.zapiszPlanProwToolStripButton.Size = new System.Drawing.Size(23, 22); - this.zapiszPlanProwToolStripButton.Text = "toolStripButton1"; + this.zapiszPlanProwToolStripButton.Text = "Zapisz plan prowizji"; this.zapiszPlanProwToolStripButton.Click += new System.EventHandler(this.zapiszPlanProwToolStripButton_Click); // @@ -2580,4 +2587,5 @@ this.bindingNavigatorDeleteItem3, this.modulySaveToolStripButton, + this.excelToolStripButton, this.toolStripSeparator1}); this.bindingNavigator4.Location = new System.Drawing.Point(0, 0); @@ -2686,4 +2694,14 @@ this.modulySaveToolStripButton.Text = "toolStripButton1"; this.modulySaveToolStripButton.Click += new System.EventHandler(this.modulySaveToolStripButton_Click); + // + // excelToolStripButton + // + this.excelToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.excelToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("excelToolStripButton.Image"))); + this.excelToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; + this.excelToolStripButton.Name = "excelToolStripButton"; + this.excelToolStripButton.Size = new System.Drawing.Size(23, 22); + this.excelToolStripButton.Text = "Exportuj do excela"; + this.excelToolStripButton.Click += new System.EventHandler(this.excelToolStripButton_Click); // // toolStripSeparator1 @@ -2825,5 +2843,6 @@ this.bindingNavigatorAddNewItem2, this.bindingNavigatorDeleteItem2, - this.zapiszNrWydToolStripButton}); + this.zapiszNrWydToolStripButton, + this.btnExportNrWydan}); this.bindingNavigator3.Location = new System.Drawing.Point(0, 0); this.bindingNavigator3.MoveFirstItem = this.bindingNavigatorMoveFirstItem2; @@ -2930,6 +2949,16 @@ this.zapiszNrWydToolStripButton.Name = "zapiszNrWydToolStripButton"; this.zapiszNrWydToolStripButton.Size = new System.Drawing.Size(23, 22); - this.zapiszNrWydToolStripButton.Text = "toolStripButton1"; + this.zapiszNrWydToolStripButton.Text = "Zapisz nr wydania"; this.zapiszNrWydToolStripButton.Click += new System.EventHandler(this.saveToolStripButton_Click); + // + // btnExportNrWydan + // + this.btnExportNrWydan.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btnExportNrWydan.Image = ((System.Drawing.Image)(resources.GetObject("btnExportNrWydan.Image"))); + this.btnExportNrWydan.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btnExportNrWydan.Name = "btnExportNrWydan"; + this.btnExportNrWydan.Size = new System.Drawing.Size(23, 22); + this.btnExportNrWydan.Text = "Exportuj do excela"; + this.btnExportNrWydan.Click += new System.EventHandler(this.btnExportNrWydan_Click); // // infoTabControl @@ -3284,4 +3313,24 @@ this.ukrytyLabel.Text = "ukrytyLabel"; this.ukrytyLabel.Visible = false; + // + // btnExportPlan + // + this.btnExportPlan.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btnExportPlan.Image = ((System.Drawing.Image)(resources.GetObject("btnExportPlan.Image"))); + this.btnExportPlan.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btnExportPlan.Name = "btnExportPlan"; + this.btnExportPlan.Size = new System.Drawing.Size(23, 22); + this.btnExportPlan.Text = "Exportuj do excela"; + this.btnExportPlan.Click += new System.EventHandler(this.btnExportPlan_Click); + // + // btnExportBudzet + // + this.btnExportBudzet.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btnExportBudzet.Image = ((System.Drawing.Image)(resources.GetObject("btnExportBudzet.Image"))); + this.btnExportBudzet.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btnExportBudzet.Name = "btnExportBudzet"; + this.btnExportBudzet.Size = new System.Drawing.Size(23, 22); + this.btnExportBudzet.Text = "Exportuj do excela"; + this.btnExportBudzet.Click += new System.EventHandler(this.btnExportBudzet_Click); // // InfoForm @@ -3658,4 +3707,8 @@ private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10; private System.Windows.Forms.DataGridViewTextBoxColumn Kurs_Sredni_Poznan; + private System.Windows.Forms.ToolStripButton excelToolStripButton; + private System.Windows.Forms.ToolStripButton btnExportNrWydan; + private System.Windows.Forms.ToolStripButton btnExportPlan; + private System.Windows.Forms.ToolStripButton btnExportBudzet; } } Index: trunk/BazaReklam/ZestawienieZamowienForm.Designer.cs =================================================================== --- trunk/BazaReklam/ZestawienieZamowienForm.Designer.cs (revision 350) +++ trunk/BazaReklam/ZestawienieZamowienForm.Designer.cs (revision 351) @@ -31,24 +31,24 @@ this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ZestawienieZamowienForm)); - 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(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle(); this.bindingNavigator1 = new System.Windows.Forms.BindingNavigator(this.components); this.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWEBindingSource = new System.Windows.Forms.BindingSource(this.components); @@ -82,4 +82,6 @@ this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel(); this.rokToolStripTextBox = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel(); + this.txtMiesiac = new System.Windows.Forms.ToolStripTextBox(); this.toolStripLabel5 = new System.Windows.Forms.ToolStripLabel(); this.nrZamToolStripTextBox = new System.Windows.Forms.ToolStripTextBox(); @@ -131,6 +133,4 @@ this.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWETableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.VIEW_ZESTAWIENIE_ZAMOWIEN_NOWETableAdapter(); this.reklamyZestawienieTableAdapter = new Baza_Reklam.REKLAMADataSetTableAdapters.ReklamyZestawienieTableAdapter(); - this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel(); - this.txtMiesiac = new System.Windows.Forms.ToolStripTextBox(); ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).BeginInit(); this.bindingNavigator1.SuspendLayout(); @@ -432,4 +432,15 @@ this.rokToolStripTextBox.Size = new System.Drawing.Size(40, 25); // + // toolStripLabel6 + // + this.toolStripLabel6.Name = "toolStripLabel6"; + this.toolStripLabel6.Size = new System.Drawing.Size(45, 22); + this.toolStripLabel6.Text = "miesi¹c:"; + // + // txtMiesiac + // + this.txtMiesiac.Name = "txtMiesiac"; + this.txtMiesiac.Size = new System.Drawing.Size(20, 25); + // // toolStripLabel5 // @@ -514,17 +525,17 @@ this.fakturyDataGridView.AllowUserToAddRows = false; this.fakturyDataGridView.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.MintCream; - this.fakturyDataGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle21.BackColor = System.Drawing.Color.MintCream; + this.fakturyDataGridView.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21; this.fakturyDataGridView.AutoGenerateColumns = false; this.fakturyDataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.DisplayedCells; this.fakturyDataGridView.BackgroundColor = System.Drawing.Color.White; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - 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)(238))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.fakturyDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle22.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.fakturyDataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22; this.fakturyDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.fakturyDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { @@ -557,6 +568,6 @@ // this.agencja.DataPropertyName = "agencja"; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.agencja.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.agencja.DefaultCellStyle = dataGridViewCellStyle23; this.agencja.HeaderText = "Agencja"; this.agencja.Name = "agencja"; @@ -567,6 +578,6 @@ // this.agent.DataPropertyName = "agent"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.agent.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.agent.DefaultCellStyle = dataGridViewCellStyle24; this.agent.HeaderText = "Agent"; this.agent.Name = "agent"; @@ -577,6 +588,6 @@ // this.rokZamowienia.DataPropertyName = "rokZamowienia"; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.rokZamowienia.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle25.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.rokZamowienia.DefaultCellStyle = dataGridViewCellStyle25; this.rokZamowienia.HeaderText = "Rok"; this.rokZamowienia.Name = "rokZamowienia"; @@ -596,6 +607,6 @@ this.iloscReklam.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.iloscReklam.DataPropertyName = "iloscReklam"; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.iloscReklam.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.iloscReklam.DefaultCellStyle = dataGridViewCellStyle26; this.iloscReklam.HeaderText = "# rek"; this.iloscReklam.Name = "iloscReklam"; @@ -607,7 +618,7 @@ this.data_od.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.data_od.DataPropertyName = "data_od"; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle7.Format = "d"; - this.data_od.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle27.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle27.Format = "d"; + this.data_od.DefaultCellStyle = dataGridViewCellStyle27; this.data_od.HeaderText = "Data 1 em"; this.data_od.Name = "data_od"; @@ -619,6 +630,6 @@ this.data_od_bez_FK.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.data_od_bez_FK.DataPropertyName = "data_od_bez_FK"; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.data_od_bez_FK.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.data_od_bez_FK.DefaultCellStyle = dataGridViewCellStyle28; this.data_od_bez_FK.HeaderText = "Data 1 em bez FV"; this.data_od_bez_FK.Name = "data_od_bez_FK"; @@ -630,7 +641,7 @@ this.wartoscNetto.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.wartoscNetto.DataPropertyName = "wartoscNetto"; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle9.Format = "C2"; - this.wartoscNetto.DefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle29.Format = "C2"; + this.wartoscNetto.DefaultCellStyle = dataGridViewCellStyle29; this.wartoscNetto.HeaderText = "Netto"; this.wartoscNetto.Name = "wartoscNetto"; @@ -642,8 +653,8 @@ this.kwotaWalutaBrutto.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.kwotaWalutaBrutto.DataPropertyName = "kwotaWalutaBrutto"; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle10.Format = "N2"; - dataGridViewCellStyle10.NullValue = null; - this.kwotaWalutaBrutto.DefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle30.Format = "N2"; + dataGridViewCellStyle30.NullValue = null; + this.kwotaWalutaBrutto.DefaultCellStyle = dataGridViewCellStyle30; this.kwotaWalutaBrutto.HeaderText = "Waluta - brutto zamówienia"; this.kwotaWalutaBrutto.Name = "kwotaWalutaBrutto"; @@ -655,6 +666,6 @@ this.bruttoEuroMianoDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.bruttoEuroMianoDataGridViewTextBoxColumn.DataPropertyName = "Brutto_Euro_Miano"; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.bruttoEuroMianoDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.bruttoEuroMianoDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle31; this.bruttoEuroMianoDataGridViewTextBoxColumn.HeaderText = "W"; this.bruttoEuroMianoDataGridViewTextBoxColumn.Name = "bruttoEuroMianoDataGridViewTextBoxColumn"; @@ -666,7 +677,7 @@ this.nettoZafakturowane.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.nettoZafakturowane.DataPropertyName = "nettoZafakturowane"; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle12.Format = "C2"; - this.nettoZafakturowane.DefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle32.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle32.Format = "C2"; + this.nettoZafakturowane.DefaultCellStyle = dataGridViewCellStyle32; this.nettoZafakturowane.HeaderText = "Wartoœæ netto FV"; this.nettoZafakturowane.Name = "nettoZafakturowane"; @@ -678,8 +689,8 @@ this.DoZafakturowania.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.DoZafakturowania.DataPropertyName = "DoZafakturowania"; - dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle13.Format = "N2"; - dataGridViewCellStyle13.NullValue = null; - this.DoZafakturowania.DefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle33.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle33.Format = "N2"; + dataGridViewCellStyle33.NullValue = null; + this.DoZafakturowania.DefaultCellStyle = dataGridViewCellStyle33; this.DoZafakturowania.HeaderText = "Wartoœæ niezafakturowana"; this.DoZafakturowania.Name = "DoZafakturowania"; @@ -761,7 +772,7 @@ this.dataGridViewTextBoxColumn8.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.dataGridViewTextBoxColumn8.DataPropertyName = "1emisja"; - dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle14.Format = "d"; - this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle34.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle34.Format = "d"; + this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle34; this.dataGridViewTextBoxColumn8.HeaderText = "1 emisja"; this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8"; @@ -809,7 +820,7 @@ this.dataGridViewTextBoxColumn23.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.dataGridViewTextBoxColumn23.DataPropertyName = "CENA JEDN"; - dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle15.Format = "C2"; - this.dataGridViewTextBoxColumn23.DefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle35.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle35.Format = "C2"; + this.dataGridViewTextBoxColumn23.DefaultCellStyle = dataGridViewCellStyle35; this.dataGridViewTextBoxColumn23.HeaderText = "Cena jedn."; this.dataGridViewTextBoxColumn23.Name = "dataGridViewTextBoxColumn23"; @@ -821,7 +832,7 @@ this.RABAT_WARTOSC.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.RABAT_WARTOSC.DataPropertyName = "RABAT WARTOŒÆ"; - dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle16.Format = "C2"; - this.RABAT_WARTOSC.DefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle36.Format = "C2"; + this.RABAT_WARTOSC.DefaultCellStyle = dataGridViewCellStyle36; this.RABAT_WARTOSC.HeaderText = "Rabat"; this.RABAT_WARTOSC.Name = "RABAT_WARTOSC"; @@ -833,7 +844,7 @@ this.dataGridViewTextBoxColumn24.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.dataGridViewTextBoxColumn24.DataPropertyName = "NETTO"; - dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle17.Format = "C2"; - this.dataGridViewTextBoxColumn24.DefaultCellStyle = dataGridViewCellStyle17; + dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle37.Format = "C2"; + this.dataGridViewTextBoxColumn24.DefaultCellStyle = dataGridViewCellStyle37; this.dataGridViewTextBoxColumn24.HeaderText = "NETTO"; this.dataGridViewTextBoxColumn24.Name = "dataGridViewTextBoxColumn24"; @@ -845,8 +856,8 @@ this.dataGridViewTextBoxColumn25.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.dataGridViewTextBoxColumn25.DataPropertyName = "VAT"; - dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle18.Format = "P"; - dataGridViewCellStyle18.NullValue = null; - this.dataGridViewTextBoxColumn25.DefaultCellStyle = dataGridViewCellStyle18; + dataGridViewCellStyle38.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle38.Format = "P"; + dataGridViewCellStyle38.NullValue = null; + this.dataGridViewTextBoxColumn25.DefaultCellStyle = dataGridViewCellStyle38; this.dataGridViewTextBoxColumn25.HeaderText = "VAT"; this.dataGridViewTextBoxColumn25.Name = "dataGridViewTextBoxColumn25"; @@ -858,7 +869,7 @@ this.dataGridViewTextBoxColumn26.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.dataGridViewTextBoxColumn26.DataPropertyName = "PVAT"; - dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle19.Format = "C2"; - this.dataGridViewTextBoxColumn26.DefaultCellStyle = dataGridViewCellStyle19; + dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle39.Format = "C2"; + this.dataGridViewTextBoxColumn26.DefaultCellStyle = dataGridViewCellStyle39; this.dataGridViewTextBoxColumn26.HeaderText = "PVAT"; this.dataGridViewTextBoxColumn26.Name = "dataGridViewTextBoxColumn26"; @@ -870,7 +881,7 @@ this.dataGridViewTextBoxColumn27.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.dataGridViewTextBoxColumn27.DataPropertyName = "BRUTTO"; - dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle20.Format = "C2"; - this.dataGridViewTextBoxColumn27.DefaultCellStyle = dataGridViewCellStyle20; + dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle40.Format = "C2"; + this.dataGridViewTextBoxColumn27.DefaultCellStyle = dataGridViewCellStyle40; this.dataGridViewTextBoxColumn27.HeaderText = "BRUTTO"; this.dataGridViewTextBoxColumn27.Name = "dataGridViewTextBoxColumn27"; @@ -983,15 +994,4 @@ // this.reklamyZestawienieTableAdapter.ClearBeforeFill = true; - // - // toolStripLabel6 - // - this.toolStripLabel6.Name = "toolStripLabel6"; - this.toolStripLabel6.Size = new System.Drawing.Size(24, 22); - this.toolStripLabel6.Text = "ms:"; - // - // txtMiesiac - // - this.txtMiesiac.Name = "txtMiesiac"; - this.txtMiesiac.Size = new System.Drawing.Size(30, 25); // // ZestawienieZamowienForm Index: trunk/BazaReklam/InfoForm.resx =================================================================== --- trunk/BazaReklam/InfoForm.resx (revision 65) +++ trunk/BazaReklam/InfoForm.resx (revision 351) @@ -390,4 +390,22 @@ + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAplJREFUSEu1VtlK + HEEULfMD+YSQvOQP8pbn5BOSfwj5hrzkA4zbjIrbuOs4rjcGEUQEEZdy33dxY1xxGTTKSZ+qruk4dkBI + 23DpOxfmnLqnTtXtPBU8eX/lUaSwILHfH1UciDS+/PzsIb/04oUicHwsunif9Ber1AdL4hOo72lEEvkZ + q4ZS37x4bQiyrFFKpVS+R/DWEIyPa2j9OFgfHdUYGdEYHtYYGtIYHNQYGNDo79fo69Po7dUQ0ejq0ujo + 0EiltOvgR5bg7g7mERGb+DnrNzdAe7vg8hI4PweamwXpNHBwACQSgq0tYH0dKC8XLC4Cc3PZPQgI7u/D + CVi/vY2AoKdHzOpzg/XOTjEdtLUJWlvFdNDYKKivF9NBdbWgokJMB6WlglhMHkv07B08+x5Qhu5uASVx + wd9OnlRKkEwKWloETU2ChgZBXZ2gpkZQVfUEiTIZ6xYCclMZzFm/voYBp4NOTmD0PzwE9vZg9N/cBNbW + rIsWFoDZ2RAXXV1ZIG4mQRnMWb+4gNnc01Pg+Bhm9bTo7q4loEVXV4GyMsH8PDAzE0LAFdIlucE6wZ00 + zj21tf+Wp7g4xEVnZ/YQEYxvl7NOWag7DxelofY7OzAHjPbk6peWvMsyLkaeqamQDtg6gehxvl3O+tFR + IMv+fnB6NzYswfIyzAmm/6engcnJEALqyvZzg3UeKIaThbpXVj50DldfUiIoKhIUFIRIxJVx4wjEt8tZ + p1t4Yp0sBKdrVlbsxjrnUHvvvvQuzpAO+Ge6gkB8u5z17e3AjnQMZSG4052XG6UpLBRMTABj3vDy54F/ + XX/99SnSccmZ8updIhg4dnZyvHECkZXX7P8EMYjlj0wzmA3JGzsgIgli+UP/4WcLP12iCoP8BxdAjuo0 + CNGlAAAAAElFTkSuQmCC + + 875, 290 @@ -602,4 +620,22 @@ + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAplJREFUSEu1VtlK + HEEULfMD+YSQvOQP8pbn5BOSfwj5hrzkA4zbjIrbuOs4rjcGEUQEEZdy33dxY1xxGTTKSZ+qruk4dkBI + 23DpOxfmnLqnTtXtPBU8eX/lUaSwILHfH1UciDS+/PzsIb/04oUicHwsunif9Ber1AdL4hOo72lEEvkZ + q4ZS37x4bQiyrFFKpVS+R/DWEIyPa2j9OFgfHdUYGdEYHtYYGtIYHNQYGNDo79fo69Po7dUQ0ejq0ujo + 0EiltOvgR5bg7g7mERGb+DnrNzdAe7vg8hI4PweamwXpNHBwACQSgq0tYH0dKC8XLC4Cc3PZPQgI7u/D + CVi/vY2AoKdHzOpzg/XOTjEdtLUJWlvFdNDYKKivF9NBdbWgokJMB6WlglhMHkv07B08+x5Qhu5uASVx + wd9OnlRKkEwKWloETU2ChgZBXZ2gpkZQVfUEiTIZ6xYCclMZzFm/voYBp4NOTmD0PzwE9vZg9N/cBNbW + rIsWFoDZ2RAXXV1ZIG4mQRnMWb+4gNnc01Pg+Bhm9bTo7q4loEVXV4GyMsH8PDAzE0LAFdIlucE6wZ00 + zj21tf+Wp7g4xEVnZ/YQEYxvl7NOWag7DxelofY7OzAHjPbk6peWvMsyLkaeqamQDtg6gehxvl3O+tFR + IMv+fnB6NzYswfIyzAmm/6engcnJEALqyvZzg3UeKIaThbpXVj50DldfUiIoKhIUFIRIxJVx4wjEt8tZ + p1t4Yp0sBKdrVlbsxjrnUHvvvvQuzpAO+Ge6gkB8u5z17e3AjnQMZSG4052XG6UpLBRMTABj3vDy54F/ + XX/99SnSccmZ8updIhg4dnZyvHECkZXX7P8EMYjlj0wzmA3JGzsgIgli+UP/4WcLP12iCoP8BxdAjuo0 + CNGlAAAAAElFTkSuQmCC + + 755, 212 @@ -1038,4 +1074,22 @@ + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAplJREFUSEu1VtlK + HEEULfMD+YSQvOQP8pbn5BOSfwj5hrzkA4zbjIrbuOs4rjcGEUQEEZdy33dxY1xxGTTKSZ+qruk4dkBI + 23DpOxfmnLqnTtXtPBU8eX/lUaSwILHfH1UciDS+/PzsIb/04oUicHwsunif9Ber1AdL4hOo72lEEvkZ + q4ZS37x4bQiyrFFKpVS+R/DWEIyPa2j9OFgfHdUYGdEYHtYYGtIYHNQYGNDo79fo69Po7dUQ0ejq0ujo + 0EiltOvgR5bg7g7mERGb+DnrNzdAe7vg8hI4PweamwXpNHBwACQSgq0tYH0dKC8XLC4Cc3PZPQgI7u/D + CVi/vY2AoKdHzOpzg/XOTjEdtLUJWlvFdNDYKKivF9NBdbWgokJMB6WlglhMHkv07B08+x5Qhu5uASVx + wd9OnlRKkEwKWloETU2ChgZBXZ2gpkZQVfUEiTIZ6xYCclMZzFm/voYBp4NOTmD0PzwE9vZg9N/cBNbW + rIsWFoDZ2RAXXV1ZIG4mQRnMWb+4gNnc01Pg+Bhm9bTo7q4loEVXV4GyMsH8PDAzE0LAFdIlucE6wZ00 + zj21tf+Wp7g4xEVnZ/YQEYxvl7NOWag7DxelofY7OzAHjPbk6peWvMsyLkaeqamQDtg6gehxvl3O+tFR + IMv+fnB6NzYswfIyzAmm/6engcnJEALqyvZzg3UeKIaThbpXVj50DldfUiIoKhIUFIRIxJVx4wjEt8tZ + p1t4Yp0sBKdrVlbsxjrnUHvvvvQuzpAO+Ge6gkB8u5z17e3AjnQMZSG4052XG6UpLBRMTABj3vDy54F/ + XX/99SnSccmZ8updIhg4dnZyvHECkZXX7P8EMYjlj0wzmA3JGzsgIgli+UP/4WcLP12iCoP8BxdAjuo0 + CNGlAAAAAElFTkSuQmCC + + True @@ -1136,4 +1190,22 @@ + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAplJREFUSEu1VtlK + HEEULfMD+YSQvOQP8pbn5BOSfwj5hrzkA4zbjIrbuOs4rjcGEUQEEZdy33dxY1xxGTTKSZ+qruk4dkBI + 23DpOxfmnLqnTtXtPBU8eX/lUaSwILHfH1UciDS+/PzsIb/04oUicHwsunif9Ber1AdL4hOo72lEEvkZ + q4ZS37x4bQiyrFFKpVS+R/DWEIyPa2j9OFgfHdUYGdEYHtYYGtIYHNQYGNDo79fo69Po7dUQ0ejq0ujo + 0EiltOvgR5bg7g7mERGb+DnrNzdAe7vg8hI4PweamwXpNHBwACQSgq0tYH0dKC8XLC4Cc3PZPQgI7u/D + CVi/vY2AoKdHzOpzg/XOTjEdtLUJWlvFdNDYKKivF9NBdbWgokJMB6WlglhMHkv07B08+x5Qhu5uASVx + wd9OnlRKkEwKWloETU2ChgZBXZ2gpkZQVfUEiTIZ6xYCclMZzFm/voYBp4NOTmD0PzwE9vZg9N/cBNbW + rIsWFoDZ2RAXXV1ZIG4mQRnMWb+4gNnc01Pg+Bhm9bTo7q4loEVXV4GyMsH8PDAzE0LAFdIlucE6wZ00 + zj21tf+Wp7g4xEVnZ/YQEYxvl7NOWag7DxelofY7OzAHjPbk6peWvMsyLkaeqamQDtg6gehxvl3O+tFR + IMv+fnB6NzYswfIyzAmm/6engcnJEALqyvZzg3UeKIaThbpXVj50DldfUiIoKhIUFIRIxJVx4wjEt8tZ + p1t4Yp0sBKdrVlbsxjrnUHvvvvQuzpAO+Ge6gkB8u5z17e3AjnQMZSG4052XG6UpLBRMTABj3vDy54F/ + XX/99SnSccmZ8updIhg4dnZyvHECkZXX7P8EMYjlj0wzmA3JGzsgIgli+UP/4WcLP12iCoP8BxdAjuo0 + CNGlAAAAAElFTkSuQmCC + + True Index: trunk/BazaReklam/Classes/ExcelHelper.cs =================================================================== --- trunk/BazaReklam/Classes/ExcelHelper.cs (revision 351) +++ trunk/BazaReklam/Classes/ExcelHelper.cs (revision 351) @@ -0,0 +1,40 @@ +using System.Windows.Forms; + +namespace Baza_Reklam +{ + public class ExcelHelper + { + public void Export(DataGridView source) + { + Excel.ApplicationClass excel = new Excel.ApplicationClass(); + excel.Application.Workbooks.Add(true); + DataGridView table = source; + int cIndex = 0; + foreach (DataGridViewColumn col in table.Columns) + { + if (col.Visible) + { + cIndex++; + excel.Cells[1, cIndex] = col.HeaderText; + } + } + int rIndex = 0; + + foreach (DataGridViewRow row in table.Rows) + { + rIndex++; + cIndex = 0; + foreach (DataGridViewColumn col in table.Columns) + { + if (col.Visible) + { + cIndex++; + excel.Cells[rIndex + 1, cIndex] = row.Cells[col.Name].Value == null ? "" : row.Cells[col.Name].Value.ToString(); + } + } + } + // excel.Save("New.xls"); + excel.Visible = true; + } + } +} Index: trunk/BazaReklam/Classes/ExcelHandler.cs =================================================================== --- trunk/BazaReklam/Classes/ExcelHandler.cs (revision 65) +++ (revision ) @@ -1,43 +1,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Windows.Forms; - -namespace Baza_Reklam -{ - class ExcelHandler - { - public void exportToExcel(DataGridView source) - { - Excel.ApplicationClass excel = new Excel.ApplicationClass(); - excel.Application.Workbooks.Add(true); - DataGridView table = source; - int cIndex = 0; - foreach (DataGridViewColumn col in table.Columns) - { - if (col.Visible) - { - cIndex++; - excel.Cells[1, cIndex] = col.HeaderText; - } - } - int rIndex = 0; - - foreach (DataGridViewRow row in table.Rows) - { - rIndex++; - cIndex = 0; - foreach (DataGridViewColumn col in table.Columns) - { - if (col.Visible) - { - cIndex++; - excel.Cells[rIndex + 1, cIndex] = row.Cells[col.Name].Value == null ? "" : row.Cells[col.Name].Value.ToString(); - } - } - } - // excel.Save("New.xls"); - excel.Visible = true; - } - } -} Index: trunk/BazaReklam/FacturesForm.cs =================================================================== --- trunk/BazaReklam/FacturesForm.cs (revision 338) +++ trunk/BazaReklam/FacturesForm.cs (revision 351) @@ -358,6 +358,6 @@ Cursor = Cursors.WaitCursor; - ExcelHandler ex = new ExcelHandler(); - ex.exportToExcel(fakturyDataGridView); + ExcelHelper ex = new ExcelHelper(); + ex.Export(fakturyDataGridView); Cursor = Cursors.Default; Index: trunk/BazaReklam/KorektyForm.cs =================================================================== --- trunk/BazaReklam/KorektyForm.cs (revision 263) +++ trunk/BazaReklam/KorektyForm.cs (revision 351) @@ -478,6 +478,6 @@ this.Cursor = Cursors.WaitCursor; - ExcelHandler ex = new ExcelHandler(); - ex.exportToExcel(fakturyDataGridView); + ExcelHelper ex = new ExcelHelper(); + ex.Export(fakturyDataGridView); this.Cursor = Cursors.Default; Index: trunk/BazaReklam/FacturesFormNEW.cs =================================================================== --- trunk/BazaReklam/FacturesFormNEW.cs (revision 347) +++ trunk/BazaReklam/FacturesFormNEW.cs (revision 351) @@ -269,6 +269,6 @@ Cursor = Cursors.WaitCursor; - ExcelHandler ex = new ExcelHandler(); - ex.exportToExcel(fakturyDataGridView); + ExcelHelper ex = new ExcelHelper(); + ex.Export(fakturyDataGridView); Cursor = Cursors.Default; Index: trunk/BazaReklam/InfoForm.cs =================================================================== --- trunk/BazaReklam/InfoForm.cs (revision 65) +++ trunk/BazaReklam/InfoForm.cs (revision 351) @@ -1,9 +1,6 @@ using System; -using System.Collections.Generic; using System.ComponentModel; using System.Data; using System.Data.SqlClient; -using System.Drawing; -using System.Text; using System.Windows.Forms; using System.Globalization; @@ -17,5 +14,6 @@ public static InfoForm getInfoForm(MDIBazaReklam parent) { - if (infoform == null) { + if (infoform == null) + { infoform = new InfoForm(parent); } @@ -26,9 +24,9 @@ private int ostMs = DateTime.Today.Month; - private InfoForm(MDIBazaReklam parent) + private InfoForm(Form parent) { InitializeComponent(); - this.MdiParent = parent; + MdiParent = parent; //podmiana connstringa @@ -48,6 +46,6 @@ ImageList imageList = new ImageList(); - imageList.Images.Add(Baza_Reklam.Properties.Resources.bullet_ball_glass_green); - imageList.Images.Add(Baza_Reklam.Properties.Resources.bullet_ball_glass_red); + imageList.Images.Add(Properties.Resources.bullet_ball_glass_green); + imageList.Images.Add(Properties.Resources.bullet_ball_glass_red); datyPubTreeView.ImageList = imageList; datyPubTreeView.ImageIndex = 0; @@ -69,39 +67,39 @@ bindingNavigator9.Visible = true; bindingNavigator10.Visible = true; - bindingNavigator11.Visible = true; - + bindingNavigator11.Visible = true; + } private void InfoForm_Load(object sender, EventArgs e) - { - // this.aGENCJETableAdapter.FillByALL(this.sLOWNIKDataSet.AGENCJE); - - this.agencjeListBox.DataSource = this.aGENCJETableAdapter.GetDataByALL(); - this.agencjeListBox.DisplayMember = "Symbol"; - this.agencjeListBox.ValueMember = "Id_agencji"; - - this.aGENCJETableAdapter.FillByIdAgencji(this.sLOWNIKDataSet.AGENCJE, Convert.ToInt32(agencjeListBox.SelectedValue)); - this.aGENCITableAdapter.FillByIdAgencji(this.sLOWNIKDataSet.AGENCI, Convert.ToInt32(agencjeListBox.SelectedValue)); - - this.nowyAgentComboBox.DataSource = this.aGENCITableAdapter.GetDataByIdAgencjiAktywni(Convert.ToInt32(agencjeListBox.SelectedValue)); - this.nowyAgentComboBox.DisplayMember = "Symbol"; - this.nowyAgentComboBox.ValueMember = "Symbol"; - - this.staryAgentComboBox.DataSource = this.aGENCITableAdapter.GetDataByNieaktywniIDAgencji(Convert.ToInt32(agencjeListBox.SelectedValue)); - this.staryAgentComboBox.DisplayMember = "Symbol"; - this.staryAgentComboBox.ValueMember = "Symbol"; - - - this.iDBIURADataGridViewTextBoxColumn.DataSource = this.aGENCJETableAdapter.GetData(); - this.iDBIURADataGridViewTextBoxColumn.DisplayMember = "Symbol"; - this.iDBIURADataGridViewTextBoxColumn.ValueMember = "Id_agencji"; - - this.WindowState = FormWindowState.Maximized; - - this.nAZWY_MODULOWTableAdapter.FillByAll(this.sLOWNIKDataSet.NAZWY_MODULOW); + { + // this.aGENCJETableAdapter.FillByALL(this.sLOWNIKDataSet.AGENCJE); + + agencjeListBox.DataSource = aGENCJETableAdapter.GetDataByALL(); + agencjeListBox.DisplayMember = "Symbol"; + agencjeListBox.ValueMember = "Id_agencji"; + + aGENCJETableAdapter.FillByIdAgencji(sLOWNIKDataSet.AGENCJE, Convert.ToInt32(agencjeListBox.SelectedValue)); + aGENCITableAdapter.FillByIdAgencji(sLOWNIKDataSet.AGENCI, Convert.ToInt32(agencjeListBox.SelectedValue)); + + nowyAgentComboBox.DataSource = aGENCITableAdapter.GetDataByIdAgencjiAktywni(Convert.ToInt32(agencjeListBox.SelectedValue)); + nowyAgentComboBox.DisplayMember = "Symbol"; + nowyAgentComboBox.ValueMember = "Symbol"; + + staryAgentComboBox.DataSource = aGENCITableAdapter.GetDataByNieaktywniIDAgencji(Convert.ToInt32(agencjeListBox.SelectedValue)); + staryAgentComboBox.DisplayMember = "Symbol"; + staryAgentComboBox.ValueMember = "Symbol"; + + + iDBIURADataGridViewTextBoxColumn.DataSource = aGENCJETableAdapter.GetData(); + iDBIURADataGridViewTextBoxColumn.DisplayMember = "Symbol"; + iDBIURADataGridViewTextBoxColumn.ValueMember = "Id_agencji"; + + WindowState = FormWindowState.Maximized; + + nAZWY_MODULOWTableAdapter.FillByAll(sLOWNIKDataSet.NAZWY_MODULOW); generateNodes(); generujTytuly(); - uprawnienia(); + uprawnienia(); } @@ -110,6 +108,6 @@ if (e.Node != null) { - this.nRBindingSource.Filter = "[tyt]='" + e.Node.Text + "'"; - } + nRBindingSource.Filter = "[tyt]='" + e.Node.Text + "'"; + } } @@ -119,45 +117,45 @@ { case "naWydanTab": - this.sLOWNIKDataSet.NAZWY_MODULOW.Clear(); - this.nRTableAdapter.Fill(this.sLOWNIKDataSet.NR); - // this.nrWydanDataGridView.Sort(dATAWDataGridViewTextBoxColumn, ListSortDirection.Descending); + sLOWNIKDataSet.NAZWY_MODULOW.Clear(); + nRTableAdapter.Fill(sLOWNIKDataSet.NR); treeView1.SelectedNode = treeView1.Nodes["AMTNode"]; - pozycjaAktualnegoWydania("AMT"); uzupelnijKalendarz(); break; case "modulyTab": - this.sLOWNIKDataSet.NR.Clear(); - this.nAZWY_MODULOWTableAdapter.FillByAll(this.sLOWNIKDataSet.NAZWY_MODULOW); + sLOWNIKDataSet.NR.Clear(); + nAZWY_MODULOWTableAdapter.FillByAll(sLOWNIKDataSet.NAZWY_MODULOW); break; case "oddzialyTab": - this.sLOWNIKDataSet.NAZWY_MODULOW.Clear(); - this.sLOWNIKDataSet.NR.Clear(); - this.pLANY_PROWIZJITableAdapter.Fill(this.sLOWNIKDataSet.PLANY_PROWIZJI); - if (aGENCJEBindingSource.Current != null) { + sLOWNIKDataSet.NAZWY_MODULOW.Clear(); + sLOWNIKDataSet.NR.Clear(); + pLANY_PROWIZJITableAdapter.Fill(sLOWNIKDataSet.PLANY_PROWIZJI); + if (aGENCJEBindingSource.Current != null) + { DataRowView row = (DataRowView)aGENCJEBindingSource.Current; int idAgencji = Convert.ToInt32(row["Id_agencji"]); - this.kONTATableAdapter.FillByIdAgencji(this.sLOWNIKDataSet.KONTA,idAgencji); - this.aGENCITableAdapter.FillByIdAgencji(this.sLOWNIKDataSet.AGENCI,idAgencji); + kONTATableAdapter.FillByIdAgencji(sLOWNIKDataSet.KONTA, idAgencji); + aGENCITableAdapter.FillByIdAgencji(sLOWNIKDataSet.AGENCI, idAgencji); } break; case "kursyWalutTabPage": - this.daty_publikacjiTableAdapter.Fill(this.sLOWNIKDataSet.Daty_publikacji); + daty_publikacjiTableAdapter.Fill(sLOWNIKDataSet.Daty_publikacji); TreeNode node; - foreach (DataRowView row in datypublikacjiBindingSource.List) { + foreach (DataRowView row in datypublikacjiBindingSource.List) + { node = new TreeNode(); node.Text = (Convert.ToDateTime(row["Data_Publikacji"])).ToShortDateString(); node.Name = row["Numer_Tabeli"].ToString(); - datyPubTreeView.Nodes.Add(node); + datyPubTreeView.Nodes.Add(node); } uprawnienia(); break; case "grzbietyTabPage": - this.lISTA_TYTULOWTableAdapter.FillAll(this.sLOWNIKDataSet.LISTA_TYTULOW); - this.pROMOCJETableAdapter.Fill(this.sLOWNIKDataSet.PROMOCJE); - this.gRZBIETYTableAdapter.Fill(this.sLOWNIKDataSet.GRZBIETY); + lISTA_TYTULOWTableAdapter.FillAll(sLOWNIKDataSet.LISTA_TYTULOW); + pROMOCJETableAdapter.Fill(sLOWNIKDataSet.PROMOCJE); + gRZBIETYTableAdapter.Fill(sLOWNIKDataSet.GRZBIETY); break; case "planyProwizyjneTabPage": - this.pLANY_PROWIZJITableAdapter.Fill(this.sLOWNIKDataSet.PLANY_PROWIZJI); + pLANY_PROWIZJITableAdapter.Fill(sLOWNIKDataSet.PLANY_PROWIZJI); break; case "kosztyBiurTabPage": @@ -182,8 +180,8 @@ { case "wszystkieNode": - this.nAZWYMODULOWBindingSource.Filter = ""; + nAZWYMODULOWBindingSource.Filter = ""; break; case "TylkoAktywne": - this.nAZWYMODULOWBindingSource.Filter = "St_aktywny=1"; + nAZWYMODULOWBindingSource.Filter = "St_aktywny=1"; break; } @@ -193,13 +191,13 @@ { case "wszystkieNode": - this.nAZWYMODULOWBindingSource.Filter = "[tytul]='" + e.Node.Text + "'"; + nAZWYMODULOWBindingSource.Filter = "[tytul]='" + e.Node.Text + "'"; break; case "TylkoAktywne": - this.nAZWYMODULOWBindingSource.Filter = "St_aktywny=1 AND [tytul]='" + e.Node.Text + "'"; + nAZWYMODULOWBindingSource.Filter = "St_aktywny=1 AND [tytul]='" + e.Node.Text + "'"; break; } break; default: - this.nAZWYMODULOWBindingSource.Filter = ""; + nAZWYMODULOWBindingSource.Filter = ""; break; } @@ -208,15 +206,15 @@ private void InfoForm_Shown(object sender, EventArgs e) { - uzupelnijKalendarz(); + uzupelnijKalendarz(); } private void nRBindingSource_ListChanged(object sender, ListChangedEventArgs e) { - uzupelnijKalendarz(); + uzupelnijKalendarz(); } private void naWydanTab_Enter(object sender, EventArgs e) { - uzupelnijKalendarz(); + uzupelnijKalendarz(); } @@ -246,21 +244,4 @@ MessageBox.Show("Wprowadz poprawne dane"); } - - - private void zapiszAgencjeToolStripButton_Click(object sender, EventArgs e) - { - Validate(); - aGENCJEBindingSource.EndEdit(); - aGENCJETableAdapter.Update(this.sLOWNIKDataSet.AGENCJE); - MessageBox.Show("Zmiany zapisane."); - } - - private void zapiszAgentToolStripButton_Click(object sender, EventArgs e) - { - Validate(); - aGENCIBindingSource.EndEdit(); - aGENCITableAdapter.Update(this.sLOWNIKDataSet.AGENCI); - MessageBox.Show("Zmiany zapisane."); - } private void zapiszGrzbietyToolStripButton_Click(object sender, EventArgs e) @@ -268,5 +249,5 @@ Validate(); gRZBIETYBindingSource.EndEdit(); - gRZBIETYTableAdapter.Update(this.sLOWNIKDataSet.GRZBIETY); + gRZBIETYTableAdapter.Update(sLOWNIKDataSet.GRZBIETY); MessageBox.Show("Zmiany zapisane."); } @@ -276,5 +257,5 @@ Validate(); lISTA_TYTULOWBindingSource.EndEdit(); - lISTA_TYTULOWTableAdapter.Update(this.sLOWNIKDataSet.LISTA_TYTULOW); + lISTA_TYTULOWTableAdapter.Update(sLOWNIKDataSet.LISTA_TYTULOW); MessageBox.Show("Zmiany zapisane."); } @@ -284,5 +265,5 @@ Validate(); pROMOCJEBindingSource.EndEdit(); - pROMOCJETableAdapter.Update(this.sLOWNIKDataSet.PROMOCJE); + pROMOCJETableAdapter.Update(sLOWNIKDataSet.PROMOCJE); MessageBox.Show("Zmiany zapisane."); } @@ -292,5 +273,5 @@ Validate(); pLANYPROWIZJIBindingSource.EndEdit(); - pLANY_PROWIZJITableAdapter.Update(this.sLOWNIKDataSet.PLANY_PROWIZJI); + pLANY_PROWIZJITableAdapter.Update(sLOWNIKDataSet.PLANY_PROWIZJI); MessageBox.Show("Zmiany zapisane."); } @@ -318,10 +299,10 @@ } koszty_BiuraBindingSource.EndEdit(); - koszty_BiuraTableAdapter.Update(this.sLOWNIKDataSet.Koszty_Biura); + koszty_BiuraTableAdapter.Update(sLOWNIKDataSet.Koszty_Biura); MessageBox.Show("Zmiany zapisane."); podsumujKosztyBiura(); } - + private void zapiszBudzetToolStripButton_Click(object sender, EventArgs e) { @@ -329,7 +310,7 @@ Validate(); bUDZETBIURBindingSource.EndEdit(); - bUDZET_BIURTableAdapter.Update(this.sLOWNIKDataSet.BUDZET_BIUR); + bUDZET_BIURTableAdapter.Update(sLOWNIKDataSet.BUDZET_BIUR); MessageBox.Show("Zmiany zapisane."); - + } @@ -348,18 +329,18 @@ MessageBox.Show("Wprowadz poprawne dane."); } - + private void treeView3_AfterSelect(object sender, TreeViewEventArgs e) { if (e.Node != null) { - this.sLOWNIKDataSet.Koszty_Biura.Clear(); - this.koszty_BiuraTableAdapter.FillBy(this.sLOWNIKDataSet.Koszty_Biura, e.Node.Name); - this.koszty_BiuraBindingSource.MoveLast(); + sLOWNIKDataSet.Koszty_Biura.Clear(); + koszty_BiuraTableAdapter.FillBy(sLOWNIKDataSet.Koszty_Biura, e.Node.Name); + koszty_BiuraBindingSource.MoveLast(); if (koszty_BiuraBindingSource.Current != null) { DataRowView row = (DataRowView)koszty_BiuraBindingSource.Current; - this.ostRok = Convert.ToInt32(row["rok"]); - this.ostMs = Convert.ToInt32(row["miesiac"]); + ostRok = Convert.ToInt32(row["rok"]); + ostMs = Convert.ToInt32(row["miesiac"]); } } @@ -370,6 +351,6 @@ if (e.Node != null) { - this.sLOWNIKDataSet.BUDZET_BIUR.Clear(); - this.bUDZET_BIURTableAdapter.FillByIdAgencji(this.sLOWNIKDataSet.BUDZET_BIUR, Convert.ToInt32(e.Node.Name)); + sLOWNIKDataSet.BUDZET_BIUR.Clear(); + bUDZET_BIURTableAdapter.FillByIdAgencji(sLOWNIKDataSet.BUDZET_BIUR, Convert.ToInt32(e.Node.Name)); } } @@ -379,9 +360,9 @@ MessageBox.Show("Wprowadz poprawne dane"); } - + private void modulyDataGridView_Leave(object sender, EventArgs e) { ukrytyLabel.Select(); - // modulyDataGridView.EndEdit(); + // modulyDataGridView.EndEdit(); } @@ -389,5 +370,5 @@ { ukrytyLabel.Select(); - // kursy_WalutDataGridView.EndEdit(); + // kursy_WalutDataGridView.EndEdit(); } @@ -398,16 +379,4 @@ } - private void dataGridView1_Leave(object sender, EventArgs e) - { - ukrytyLabel.Select(); - //dataGridView1.EndEdit(); - } - - private void kONTADataGridView_Leave(object sender, EventArgs e) - { - ukrytyLabel.Select(); - //kONTADataGridView.EndEdit(); - } - private void gRZBIETYDataGridView_Leave(object sender, EventArgs e) { @@ -448,18 +417,18 @@ private void datyPubTreeView_AfterSelect(object sender, TreeViewEventArgs e) { - this.kursy_WalutTableAdapter.ClearBeforeFill = true; + kursy_WalutTableAdapter.ClearBeforeFill = true; if (datyPubTreeView.SelectedNode != null) { - this.kursy_WalutTableAdapter.FillByNrTabeli(this.sLOWNIKDataSet.Kursy_Walut, datyPubTreeView.SelectedNode.Name); + kursy_WalutTableAdapter.FillByNrTabeli(sLOWNIKDataSet.Kursy_Walut, datyPubTreeView.SelectedNode.Name); } kursy_WalutDataGridView.Refresh(); } - private int pozycjaAktualnegoWydania(string tytul) - { - int position = 0; - return position; - } - + //private void pozycjaAktualnegoWydania(string tytul) + //{ + // int position = 0; + // return; + //} + // wpisuje dni tygodnia i nr tygodnia w roku private void uzupelnijKalendarz() @@ -473,5 +442,5 @@ dzien = Convert.ToDateTime(r.Cells["dATAWDataGridViewTextBoxColumn"].Value); r.Cells["dzienTygodniaColumn"].Value = - CultureInfo.CurrentCulture.DateTimeFormat.DayNames[(int)dzien.DayOfWeek]; + CultureInfo.CurrentCulture.DateTimeFormat.DayNames[(int)dzien.DayOfWeek]; r.Cells["nrTygodniaColumn"].Value = myCal.GetWeekOfYear(dzien, CalendarWeekRule.FirstDay, DayOfWeek.Monday).ToString(); } @@ -490,11 +459,10 @@ SqlDataReader reader = command.ExecuteReader(); - TreeNode node; - TreeNode node1; - + // ReSharper disable PossibleNullReferenceException while (reader.Read()) - { - node = new TreeNode(reader.GetValue(1).ToString()); - node1 = new TreeNode(reader.GetValue(1).ToString()); + // ReSharper restore PossibleNullReferenceException + { + TreeNode node = new TreeNode(reader.GetValue(1).ToString()); + TreeNode node1 = new TreeNode(reader.GetValue(1).ToString()); node.Name = reader.GetValue(0).ToString(); node1.Name = reader.GetValue(0).ToString(); @@ -516,6 +484,7 @@ infoTabControl.TabPages.Remove(budzetTabPage); } - - if (!(User.getUser().St_kierownik | User.getUser().St_handlowiec | User.getUser().St_subhandlowiec | User.getUser().St_sekretarka)){ + + if (!(User.getUser().St_kierownik | User.getUser().St_handlowiec | User.getUser().St_subhandlowiec | User.getUser().St_sekretarka)) + { infoTabControl.TabPages.Remove(kursyWalutTabPage); infoTabControl.TabPages.Remove(naWydanTab); @@ -523,5 +492,5 @@ } - + dodajAgencjeButton.Enabled = User.getUser().St_kierownik; @@ -563,27 +532,29 @@ } - + private void koszty_BiuraBindingSource_AddingNew(object sender, AddingNewEventArgs e) - { + { if (treeView3.SelectedNode != null) { DataView dataTableView = koszty_BiuraBindingSource.List as DataView; + // ReSharper disable PossibleNullReferenceException DataRowView rowView = dataTableView.AddNew(); + // ReSharper restore PossibleNullReferenceException rowView["id_Agencji"] = treeView3.SelectedNode.Name; - // rowView["rok"] = DateTime.Today.Year; - // rowView["miesiac"] = DateTime.Today.Month; - - if (this.ostMs == 12) - { - rowView["rok"] = ++this.ostRok; - rowView["miesiac"] = this.ostMs = 1; + // rowView["rok"] = DateTime.Today.Year; + // rowView["miesiac"] = DateTime.Today.Month; + + if (ostMs == 12) + { + rowView["rok"] = ++ostRok; + rowView["miesiac"] = ostMs = 1; } else { - rowView["rok"] = this.ostRok; - rowView["miesiac"] = ++this.ostMs; - } + rowView["rok"] = ostRok; + rowView["miesiac"] = ++ostMs; + } e.NewObject = rowView; @@ -598,11 +569,14 @@ DataView dataTableView = bUDZETBIURBindingSource.List as DataView; - DataRowView rowView = dataTableView.AddNew(); - - rowView["ID_BIURA"] = treeView4.SelectedNode.Name; - rowView["rok"] = DateTime.Today.Year; - rowView["ms"] = DateTime.Today.Month; - - e.NewObject = rowView; + if (dataTableView != null) + { + DataRowView rowView = dataTableView.AddNew(); + + rowView["ID_BIURA"] = treeView4.SelectedNode.Name; + rowView["rok"] = DateTime.Today.Year; + rowView["ms"] = DateTime.Today.Month; + + e.NewObject = rowView; + } bUDZETBIURBindingSource.MoveLast(); @@ -610,10 +584,9 @@ } - private void podsumujKosztyBiura(){ + private void podsumujKosztyBiura() + { if (koszty_BiuraBindingSource.Current != null) { decimal suma = 0; - decimal ksiegowosc = 0 ; - decimal roznica = 0 ; DataRowView r = (DataRowView)koszty_BiuraBindingSource.Current; @@ -628,7 +601,7 @@ suma += r["inne"] == DBNull.Value ? 0 : Convert.ToDecimal(r["inne"]); - ksiegowosc = r["ksiegowosc"] == DBNull.Value ? 0 : Convert.ToDecimal(r["ksiegowosc"]); - - roznica = ksiegowosc - suma; + decimal ksiegowosc = r["ksiegowosc"] == DBNull.Value ? 0 : Convert.ToDecimal(r["ksiegowosc"]); + + decimal roznica = ksiegowosc - suma; razemLabel.Text = String.Format("{0:C}", suma); @@ -648,23 +621,11 @@ { int idAgencji = Convert.ToInt32(agencjeListBox.SelectedValue); - this.aGENCITableAdapter.FillByIdAgencji(this.sLOWNIKDataSet.AGENCI, idAgencji); - this.kONTATableAdapter.FillByIdAgencji(this.sLOWNIKDataSet.KONTA, idAgencji); - this.aGENCJETableAdapter.FillByIdAgencji(this.sLOWNIKDataSet.AGENCJE, idAgencji); - this.nowyAgentComboBox.DataSource = this.aGENCITableAdapter.GetDataByIdAgencjiAktywni(idAgencji); - this.staryAgentComboBox.DataSource = this.aGENCITableAdapter.GetDataByNieaktywniIDAgencji(idAgencji); + aGENCITableAdapter.FillByIdAgencji(sLOWNIKDataSet.AGENCI, idAgencji); + kONTATableAdapter.FillByIdAgencji(sLOWNIKDataSet.KONTA, idAgencji); + aGENCJETableAdapter.FillByIdAgencji(sLOWNIKDataSet.AGENCJE, idAgencji); + nowyAgentComboBox.DataSource = aGENCITableAdapter.GetDataByIdAgencjiAktywni(idAgencji); + staryAgentComboBox.DataSource = aGENCITableAdapter.GetDataByNieaktywniIDAgencji(idAgencji); groupBox1.Enabled = User.getUser().St_kierownik & (idAgencji == User.getUser().IdAgencji); - } - } - - private void button3_Click(object sender, EventArgs e) - { - if ((this.aGENCIBindingSource.Filter==null) || (this.aGENCIBindingSource.Filter == "")) - { - this.aGENCIBindingSource.Filter = "aktywny=1"; - } - else - { - this.aGENCIBindingSource.Filter = ""; } } @@ -698,5 +659,5 @@ if (aaf.ShowDialog() == DialogResult.OK) { - aGENCITableAdapter.FillByIdAgencji(this.sLOWNIKDataSet.AGENCI, Convert.ToInt32(agencjeListBox.SelectedValue)); + aGENCITableAdapter.FillByIdAgencji(sLOWNIKDataSet.AGENCI, Convert.ToInt32(agencjeListBox.SelectedValue)); //agencjeListBox.DataSource = aGENCJETableAdapter.GetDataByALL(); } @@ -713,5 +674,5 @@ if (aaf.ShowDialog() == DialogResult.OK) { - aGENCITableAdapter.FillByIdAgencji(this.sLOWNIKDataSet.AGENCI, Convert.ToInt32(agencjeListBox.SelectedValue)); + aGENCITableAdapter.FillByIdAgencji(sLOWNIKDataSet.AGENCI, Convert.ToInt32(agencjeListBox.SelectedValue)); } } @@ -725,5 +686,5 @@ { - kONTATableAdapter.FillByIdAgencji(this.sLOWNIKDataSet.KONTA, Convert.ToInt32(agencjeListBox.SelectedValue)); + kONTATableAdapter.FillByIdAgencji(sLOWNIKDataSet.KONTA, Convert.ToInt32(agencjeListBox.SelectedValue)); //agencjeListBox.DataSource = aGENCJETableAdapter.GetDataByALL(); } @@ -740,5 +701,5 @@ if (aaf.ShowDialog() == DialogResult.OK) { - kONTATableAdapter.FillByIdAgencji(this.sLOWNIKDataSet.KONTA, Convert.ToInt32(agencjeListBox.SelectedValue)); + kONTATableAdapter.FillByIdAgencji(sLOWNIKDataSet.KONTA, Convert.ToInt32(agencjeListBox.SelectedValue)); } } @@ -753,5 +714,5 @@ } - this.Cursor = Cursors.WaitCursor; + Cursor = Cursors.WaitCursor; SqlCommand command = new SqlCommand(); @@ -791,17 +752,18 @@ command.Connection.Close(); - this.Cursor = Cursors.Default; - - } - - private void generujTytuly(){ - - SLOWNIKDataSet.LISTA_TYTULOWDataTable dt = lISTA_TYTULOWTableAdapter.GetData() - as SLOWNIKDataSet.LISTA_TYTULOWDataTable; - - foreach (SLOWNIKDataSet.LISTA_TYTULOWRow r in dt) { + Cursor = Cursors.Default; + + } + + private void generujTytuly() + { + + SLOWNIKDataSet.LISTA_TYTULOWDataTable dt = lISTA_TYTULOWTableAdapter.GetData(); + + foreach (SLOWNIKDataSet.LISTA_TYTULOWRow r in dt) + { treeView1.Nodes.Add(new TreeNode(r.SYMB)); treeView2.Nodes["wszystkieNode"].Nodes.Add(new TreeNode(r.SYMB)); - treeView2.Nodes["TylkoAktywne"].Nodes.Add(new TreeNode(r.SYMB)); + treeView2.Nodes["TylkoAktywne"].Nodes.Add(new TreeNode(r.SYMB)); } } @@ -823,5 +785,5 @@ kursy_WalutDataGridView.EndEdit(); kursy_WalutBindingSource.EndEdit(); - kursy_WalutTableAdapter.Update(this.sLOWNIKDataSet.Kursy_Walut); + kursy_WalutTableAdapter.Update(sLOWNIKDataSet.Kursy_Walut); } } @@ -830,6 +792,43 @@ } - - - } + private void excelToolStripButton_Click(object sender, EventArgs e) + { + Cursor = Cursors.WaitCursor; + + ExcelHelper ex = new ExcelHelper(); + ex.Export(modulyDataGridView); + + Cursor = Cursors.Default; + } + + private void btnExportNrWydan_Click(object sender, EventArgs e) + { + Cursor = Cursors.WaitCursor; + + ExcelHelper ex = new ExcelHelper(); + ex.Export(nrWydanDataGridView); + + Cursor = Cursors.Default; + } + + private void btnExportPlan_Click(object sender, EventArgs e) + { + Cursor = Cursors.WaitCursor; + + ExcelHelper ex = new ExcelHelper(); + ex.Export(pLANY_PROWIZJIDataGridView); + + Cursor = Cursors.Default; + } + + private void btnExportBudzet_Click(object sender, EventArgs e) + { + Cursor = Cursors.WaitCursor; + + ExcelHelper ex = new ExcelHelper(); + ex.Export(budzetyDataGridView); + + Cursor = Cursors.Default; + } + } } Index: trunk/BazaReklam/ClientsForm.cs =================================================================== --- trunk/BazaReklam/ClientsForm.cs (revision 243) +++ trunk/BazaReklam/ClientsForm.cs (revision 351) @@ -2381,6 +2381,6 @@ Cursor = Cursors.WaitCursor; - ExcelHandler ex = new ExcelHandler(); - ex.exportToExcel(clientsDataGridView); + ExcelHelper ex = new ExcelHelper(); + ex.Export(clientsDataGridView); Cursor = Cursors.Default;