Index: /trunk/BazaReklamSetup/BazaReklamSetup.vdproj =================================================================== --- /trunk/BazaReklamSetup/BazaReklamSetup.vdproj (revision 921) +++ /trunk/BazaReklamSetup/BazaReklamSetup.vdproj (revision 924) @@ -578,6 +578,6 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Baza Reklam" - "ProductCode" = "8:{472FCB63-8CD9-419F-BF16-567753CD1F0D}" - "PackageCode" = "8:{F20C1D27-49F1-48FB-9F19-678E844E9F6F}" + "ProductCode" = "8:{C1C574BC-ED7C-4CEA-B487-ADC2A164F25D}" + "PackageCode" = "8:{251D93B0-039F-4CC7-9ED8-3F5EF4F936B2}" "UpgradeCode" = "8:{4E2DBBA4-3139-4790-8DDB-7AADFC963A7D}" "RestartWWWService" = "11:FALSE" @@ -585,5 +585,5 @@ "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:1.2.4" + "ProductVersion" = "8:1.2.7" "Manufacturer" = "8:AACT" "ARPHELPTELEPHONE" = "8:" Index: /trunk/BazaReklam/ProvisionForm.resx =================================================================== --- /trunk/BazaReklam/ProvisionForm.resx (revision 920) +++ /trunk/BazaReklam/ProvisionForm.resx (revision 924) @@ -124,6 +124,12 @@ 445, 17 + + 445, 17 + 297, 17 + + + 17, 17 @@ -315,34 +321,34 @@ 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 gg== @@ -352,28 +358,28 @@ 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 @@ -415,4 +421,31 @@ + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABNdJREFUSEudVglQ + lWUUPU8EcZzScKOcQkctp6khxVKSzJ0USXTEtMQFFZAoMOyhIT2XcgEJsHB5LPokWUVFURRFIJRUCsEd + JsRoGkdzoikrC3yne+U1zYQyyj9z5v/ne/93zv3uvf+5z4A2rvo4dOu3BL8GuMFuuAemGawYdteK2oNl + 2LP3HH6WrXcFbIvjgb/d2IP+Z5Pt7xxZi9ytQajZGQrmfgTmrwL3r8a1jfMQum42vHsDXYSkwyOLuLnB + vizO4fTF9IEsXAvmLAN3LwezI8DUd8FtAWDyYtB/POYJeY/2iBgiZ2Bk8UbH37812/HoenBPJPjlEtAc + CG5dhOaAscgRYqPgBYHDI59CNnTZvsQu/eQm8NgGcN8KcIdEb5yEil6PY4f8Hi+YJXiqPSdAVdWRLs23 + MhprcgfxxOYnrMdinXhqhxszM02FQrhOMN5Gbt+e6GEymTo0Xgq/crfO12qtHUnWjmJTw5ym3DT/o0IY + JnAR2LWLXDcVrYFLSQz+qNs7gD/k9+W1vJ6sSjUw24hbL7ogUl7p167UKHldEnoXx+B0/YFRbDg0kXqv + 3e3K82nOrNhm4L4oNIb5INTWQY92ippUTDq1pdONHwunsrE8hL98LShfwBtF3qzfN5jnLU48swU8uBrW + hAUwOzriGRF6uDpcTsboCrPTXzdL/PhbRQSbL8aR9Ym0JIQyesXbrMyayKq0AdTW1e4qWAPGz8d+Bwc8 + KyKd2qxHti/sSjbhSsPBsbxVtoh/X4gmr1roN9uPJmOQCMyj+6gZzIp+hdWp9jyRABZFg3lR0rpTsUXI + +ws6PlBEIvKpMHenCvwkAs2XYnjucCw9xkzmnxcSRMxIy4YpPJI4WIr9n4DaR/pS3O7TDXOEvKfAcF+R + E3HYVW3pwat57rx+fBZvfxPBpouxDPCfySHunpzpO4WJJk/W5fRjZZIdy+LBwnXiTSYwywh6ueELIXZ9 + YD3K41FfldKJlzOf4/d6itJ3WH8siA1FIbxZOp8ZsRM43GMcQ+a4stoMlsSChz+VL1xSlPkhGP4mDgi5 + t6BrqxMUz4VjYTSaTiWCVdu7siZ7EK8XjGBUmBdHjvFiVeYYfpf7Ej3HedBn4hBWShepfUgn3XPZ9HAw + bgEqhXiRQEz2f5eYWdeCT2DVwp3eDFamdGZNhjM3Gl/lssAR9JwwmkOHvc6FvoN4aL0Dy+Jaos/7uMVh + 08LEYYNRJ7QRgqdbCUgHOexfiTvHY8CvZHP55+AZEapOAa9YJMdrnGhe1oNnt4KlkhrN/YGVLRau0W8P + ATcvRK0Qm2xfeKtCGwpWofKQ9LVuVqHSz1rEtJja8xq1tqUMoXuF1dRkLAUt74NJQWDkNJQIeZSg7/26 + yLAzHMv3iiVrZP8K6RxQqKimRFtSi6qRK7lOOh08SYthdet/z8KDBWrfra9hvdA7ORQndbMOFyXSHOtd + hTVinWzaMbs+aIk8JbiFPPgN5Aujtqmn4LH7CshiR2cnPO8/Dgkr3sLx5dNRHDgB+TNeQ47XUOwa74qd + Cm95nu6OrFkeyJ38MjJcesIse+MFfrYCt2l+jvLSQIGP7bjvyT1QMFcwU+Brg04yJdSvV9c8BH0ED2V6 + +lI3wZO2fDrLXS2gu8DJBn3WYa/rutZZ0OrfxT8fHoIKF1ZvFwAAAABJRU5ErkJggg== + + 900, 17 Index: /trunk/BazaReklam/MDIBazaReklam.cs =================================================================== --- /trunk/BazaReklam/MDIBazaReklam.cs (revision 920) +++ /trunk/BazaReklam/MDIBazaReklam.cs (revision 924) @@ -385,6 +385,6 @@ private void testToolStripButton_Click(object sender, EventArgs e) { - ProvisionEditForm frm = new ProvisionEditForm(); - frm.ShowDialog(); + //ProvisionEditForm frm = new ProvisionEditForm(); + //frm.ShowDialog(); } } Index: /trunk/BazaReklam/Baza Reklam.csproj =================================================================== --- /trunk/BazaReklam/Baza Reklam.csproj (revision 923) +++ /trunk/BazaReklam/Baza Reklam.csproj (revision 924) @@ -33,5 +33,5 @@ index.htm false - 1.2.5.0 + 1.2.7.0 false Index: /trunk/BazaReklam/ProvisionForm.Designer.cs =================================================================== --- /trunk/BazaReklam/ProvisionForm.Designer.cs (revision 906) +++ /trunk/BazaReklam/ProvisionForm.Designer.cs (revision 924) @@ -30,17 +30,17 @@ { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - 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 dataGridViewCellStyle26 = 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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProvisionForm)); this.aGENCIBindingSource = new System.Windows.Forms.BindingSource(this.components); @@ -107,4 +107,6 @@ this.agencjeTableAdapter1 = new Baza_Reklam.SLOWNIKDataSetTableAdapters.AGENCJETableAdapter(); this.ukrytyLabel = new System.Windows.Forms.Label(); + this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripBtnEditProvision = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.aGENCIBindingSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.sLOWNIKDataSet)).BeginInit(); @@ -156,5 +158,5 @@ this.panel2.Location = new System.Drawing.Point(0, 551); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(990, 38); + this.panel2.Size = new System.Drawing.Size(1150, 38); this.panel2.TabIndex = 18; // @@ -227,12 +229,12 @@ this.wREKLAMYDataGridViewTextBoxColumn}); this.prowizjeDataGridView.DataSource = this.pLANBindingSource; - dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle13.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle13.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle13.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle13.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle13.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.prowizjeDataGridView.DefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle26.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.prowizjeDataGridView.DefaultCellStyle = dataGridViewCellStyle26; this.prowizjeDataGridView.Dock = System.Windows.Forms.DockStyle.Fill; this.prowizjeDataGridView.Location = new System.Drawing.Point(0, 31); @@ -242,5 +244,5 @@ this.prowizjeDataGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; this.prowizjeDataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect; - this.prowizjeDataGridView.Size = new System.Drawing.Size(990, 558); + this.prowizjeDataGridView.Size = new System.Drawing.Size(1150, 558); this.prowizjeDataGridView.TabIndex = 19; this.prowizjeDataGridView.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.prowizjeDataGridView_CellLeave); @@ -281,7 +283,7 @@ // this.bUDZETDataGridViewTextBoxColumn.DataPropertyName = "BUDZET"; - dataGridViewCellStyle1.Format = "N0"; - dataGridViewCellStyle1.NullValue = null; - this.bUDZETDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle14.Format = "N0"; + dataGridViewCellStyle14.NullValue = null; + this.bUDZETDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle14; this.bUDZETDataGridViewTextBoxColumn.HeaderText = "Plan"; this.bUDZETDataGridViewTextBoxColumn.Name = "bUDZETDataGridViewTextBoxColumn"; @@ -332,6 +334,6 @@ // this.oCENADataGridViewTextBoxColumn.DataPropertyName = "OCENA"; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.oCENADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle15.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.oCENADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle15; this.oCENADataGridViewTextBoxColumn.HeaderText = "Ocena"; this.oCENADataGridViewTextBoxColumn.Name = "oCENADataGridViewTextBoxColumn"; @@ -352,9 +354,9 @@ // this.PR_PROWIZJI.DataPropertyName = "PR_PROWIZJI"; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - dataGridViewCellStyle3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); - dataGridViewCellStyle3.Format = "P"; - dataGridViewCellStyle3.NullValue = null; - this.PR_PROWIZJI.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + dataGridViewCellStyle16.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238))); + dataGridViewCellStyle16.Format = "P"; + dataGridViewCellStyle16.NullValue = null; + this.PR_PROWIZJI.DefaultCellStyle = dataGridViewCellStyle16; this.PR_PROWIZJI.HeaderText = "Prowizja"; this.PR_PROWIZJI.Name = "PR_PROWIZJI"; @@ -366,7 +368,7 @@ this.wBUDZETDataGridViewTextBoxColumn.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; this.wBUDZETDataGridViewTextBoxColumn.DataPropertyName = "W_BUDZET"; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - dataGridViewCellStyle4.Format = "N0"; - this.wBUDZETDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle17.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + dataGridViewCellStyle17.Format = "N0"; + this.wBUDZETDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle17; this.wBUDZETDataGridViewTextBoxColumn.HeaderText = "Sprzeda¿"; this.wBUDZETDataGridViewTextBoxColumn.Name = "wBUDZETDataGridViewTextBoxColumn"; @@ -377,6 +379,6 @@ // this.wSPOTKANIADataGridViewTextBoxColumn.DataPropertyName = "W_SPOTKANIA"; - dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.wSPOTKANIADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle18.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.wSPOTKANIADataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle18; this.wSPOTKANIADataGridViewTextBoxColumn.HeaderText = "Spotk."; this.wSPOTKANIADataGridViewTextBoxColumn.Name = "wSPOTKANIADataGridViewTextBoxColumn"; @@ -387,6 +389,6 @@ // this.wTELDataGridViewTextBoxColumn.DataPropertyName = "W_TEL"; - dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.wTELDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle19.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.wTELDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle19; this.wTELDataGridViewTextBoxColumn.HeaderText = "Tel."; this.wTELDataGridViewTextBoxColumn.Name = "wTELDataGridViewTextBoxColumn"; @@ -397,6 +399,6 @@ // this.wEMAILDataGridViewTextBoxColumn.DataPropertyName = "W_EMAIL"; - dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.wEMAILDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle20.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.wEMAILDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle20; this.wEMAILDataGridViewTextBoxColumn.HeaderText = "Email"; this.wEMAILDataGridViewTextBoxColumn.Name = "wEMAILDataGridViewTextBoxColumn"; @@ -407,6 +409,6 @@ // this.wLISTDataGridViewTextBoxColumn.DataPropertyName = "W_LIST"; - dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.wLISTDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle21.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.wLISTDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle21; this.wLISTDataGridViewTextBoxColumn.HeaderText = "List"; this.wLISTDataGridViewTextBoxColumn.Name = "wLISTDataGridViewTextBoxColumn"; @@ -417,6 +419,6 @@ // this.wFAXDataGridViewTextBoxColumn.DataPropertyName = "W_FAX"; - dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.wFAXDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle22.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.wFAXDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle22; this.wFAXDataGridViewTextBoxColumn.HeaderText = "Fax"; this.wFAXDataGridViewTextBoxColumn.Name = "wFAXDataGridViewTextBoxColumn"; @@ -427,6 +429,6 @@ // this.wNKLIENCIDataGridViewTextBoxColumn.DataPropertyName = "W_N_KLIENCI"; - dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.wNKLIENCIDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle23.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.wNKLIENCIDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle23; this.wNKLIENCIDataGridViewTextBoxColumn.HeaderText = "N. Klien."; this.wNKLIENCIDataGridViewTextBoxColumn.Name = "wNKLIENCIDataGridViewTextBoxColumn"; @@ -437,6 +439,6 @@ // this.wKLIENCIDataGridViewTextBoxColumn.DataPropertyName = "W_KLIENCI"; - dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.wKLIENCIDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle24.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.wKLIENCIDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle24; this.wKLIENCIDataGridViewTextBoxColumn.HeaderText = "Klien."; this.wKLIENCIDataGridViewTextBoxColumn.Name = "wKLIENCIDataGridViewTextBoxColumn"; @@ -447,6 +449,6 @@ // this.wREKLAMYDataGridViewTextBoxColumn.DataPropertyName = "W_REKLAMY"; - dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.wREKLAMYDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle25.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.wREKLAMYDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle25; this.wREKLAMYDataGridViewTextBoxColumn.HeaderText = "Rekl"; this.wREKLAMYDataGridViewTextBoxColumn.Name = "wREKLAMYDataGridViewTextBoxColumn"; @@ -488,5 +490,7 @@ this.agencjaToolStripComboBox, this.szukajToolStripButton, - this.btnBlockProvision}); + this.btnBlockProvision, + this.toolStripSeparator4, + this.toolStripBtnEditProvision}); this.bindingNavigator1.Location = new System.Drawing.Point(0, 0); this.bindingNavigator1.MoveFirstItem = this.bindingNavigatorMoveFirstItem; @@ -496,5 +500,5 @@ this.bindingNavigator1.Name = "bindingNavigator1"; this.bindingNavigator1.PositionItem = this.bindingNavigatorPositionItem; - this.bindingNavigator1.Size = new System.Drawing.Size(990, 31); + this.bindingNavigator1.Size = new System.Drawing.Size(1150, 31); this.bindingNavigator1.TabIndex = 17; this.bindingNavigator1.Text = "bindingNavigator1"; @@ -726,9 +730,24 @@ this.ukrytyLabel.Visible = false; // + // toolStripSeparator4 + // + this.toolStripSeparator4.Name = "toolStripSeparator4"; + this.toolStripSeparator4.Size = new System.Drawing.Size(6, 31); + // + // toolStripBtnEditProvision + // + this.toolStripBtnEditProvision.Image = ((System.Drawing.Image)(resources.GetObject("toolStripBtnEditProvision.Image"))); + this.toolStripBtnEditProvision.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripBtnEditProvision.Name = "toolStripBtnEditProvision"; + this.toolStripBtnEditProvision.Size = new System.Drawing.Size(79, 28); + this.toolStripBtnEditProvision.Text = "prowizje"; + this.toolStripBtnEditProvision.Visible = false; + this.toolStripBtnEditProvision.Click += new System.EventHandler(this.toolStripBtnEditProvision_Click); + // // ProvisionForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(990, 589); + this.ClientSize = new System.Drawing.Size(1150, 589); this.ControlBox = false; this.Controls.Add(this.ukrytyLabel); @@ -820,4 +839,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn wREKLAMYDataGridViewTextBoxColumn; private System.Windows.Forms.ToolStripButton btnBlockProvision; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator4; + private System.Windows.Forms.ToolStripButton toolStripBtnEditProvision; } Index: /trunk/BazaReklam/ProvisionForm.cs =================================================================== --- /trunk/BazaReklam/ProvisionForm.cs (revision 906) +++ /trunk/BazaReklam/ProvisionForm.cs (revision 924) @@ -91,4 +91,6 @@ ((ComboBox)agencjaToolStripComboBox.Control).SelectedValue = User.Instance().IdAgencji; + + toolStripBtnEditProvision.Visible = User.Instance().IsKierownik; } @@ -539,4 +541,20 @@ } } + + private void toolStripBtnEditProvision_Click(object sender, EventArgs e) + { + int y, m; + + Int32.TryParse(rokToolStripTextBox.Text, out y); + Int32.TryParse(msToolStripTextBox.Text, out m); + + ProvisionEditForm frm; + if (y > 0 && m > 0) + frm = new ProvisionEditForm(y, m); + else + frm = new ProvisionEditForm(); + + frm.ShowDialog(); + } } } Index: /trunk/BazaReklam/Classes/Repositories/AgentRepository.cs =================================================================== --- /trunk/BazaReklam/Classes/Repositories/AgentRepository.cs (revision 921) +++ /trunk/BazaReklam/Classes/Repositories/AgentRepository.cs (revision 924) @@ -134,4 +134,83 @@ return null; } + + public List FindAllProvision() + { + const string query = "SELECT DISTINCT Agent FROM PROWIZJE ORDER BY Agent"; + + List agents = new List(); + + SqlConnection conn = null; + SqlCommand cmd = null; + SqlDataReader reader = null; + try + { + conn = new SqlConnection(ConnString.getConnString().Value); + conn.Open(); + cmd = new SqlCommand(query, conn); + + reader = cmd.ExecuteReader(); + if (reader != null) + { + while (reader.Read()) + agents.Add(reader[0].ToString().Trim()); + } + } + finally + { + if (reader != null) + { + reader.Close(); + reader.Dispose(); + } + if (cmd != null) cmd.Dispose(); + if (conn != null) + { + conn.Close(); + conn.Dispose(); + } + + } + return agents; + } + + public List FindOdzialProvision() + { + const string query = "SELECT DISTINCT Agencja FROM PROWIZJE ORDER BY Agencja"; + + List agencja = new List(); + + SqlConnection conn = null; + SqlCommand cmd = null; + SqlDataReader reader = null; + try + { + conn = new SqlConnection(ConnString.getConnString().Value); + conn.Open(); + cmd = new SqlCommand(query, conn); + reader = cmd.ExecuteReader(); + if (reader != null) + { + while (reader.Read()) + agencja.Add(reader[0].ToString().Trim()); + } + } + finally + { + if (reader != null) + { + reader.Close(); + reader.Dispose(); + } + if (cmd != null) cmd.Dispose(); + if (conn != null) + { + conn.Close(); + conn.Dispose(); + } + + } + return agencja; + } } } Index: /trunk/BazaReklam/Properties/AssemblyInfo.cs =================================================================== --- /trunk/BazaReklam/Properties/AssemblyInfo.cs (revision 923) +++ /trunk/BazaReklam/Properties/AssemblyInfo.cs (revision 924) @@ -30,3 +30,3 @@ // [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.2.5")] +[assembly: AssemblyFileVersion("1.2.7")]