Index: trunk/RaportySQL/OcenaAgenta.rdl
===================================================================
--- trunk/RaportySQL/OcenaAgenta.rdl (revision 900)
+++ trunk/RaportySQL/OcenaAgenta.rdl (revision 906)
@@ -199,7 +199,7 @@
System.Int32
-
- Ocena
- System.Int32
+
+ OCENA
+ System.String
@@ -226,11 +226,18 @@
[PLAN].BUDZET,
[PLAN].W_BUDZET,
-Ocena =
-CASE
- WHEN [PLAN].OCENA=100 THEN 2
- WHEN [PLAN].OCENA=50 THEN 1
- ELSE 0
+OCENA = CASE WHEN (@prawa_agent is null OR [PLAN].SYMBOL=@prawa_agent) THEN
+ CASE
+ WHEN [PLAN].OCENA=100 THEN '2'
+ WHEN [PLAN].OCENA=50 THEN '1'
+ ELSE '0'
+ END
+ELSE
+ '-'
END,
-[PLAN].PR_PROWIZJI
+CASE WHEN (@prawa_agent is null OR [PLAN].SYMBOL=@prawa_agent) THEN
+ [PLAN].PR_PROWIZJI
+ELSE
+ 0
+END AS PR_PROWIZJI
FROM AGENCJE
INNER JOIN AGENCI ON AGENCJE.Id_agencji = AGENCI.ID_AGENCJI
@@ -238,4 +245,7 @@
WHERE ([PLAN].ROK = @rok) AND (AGENCJE.Id_agencji = @agencja) AND (@agent = 'Wszyscy' OR AGENCI.SYMBOL = @agent)
+
+ =Parameters!prawa_agent.Value
+
=Parameters!rok.Value
@@ -307,15 +317,11 @@
FROM AGENCI A
left join Agencje A2 on A.ID_AGENCJI = A2.ID_Agencji
- where aktywny=1 AND (A2.ID_AGENCJI in (@agencja) OR A2.ID_AGENCJI is null) AND (@prawa_agent is null OR A.Symbol=@prawa_agent)
+ where aktywny=1 AND (A2.ID_AGENCJI in (@agencja) OR A2.ID_AGENCJI is null)
union
select NULL,'Wszyscy','costam'
-where @prawa_agent is null
order by A.Symbol;
=Parameters!agencja.Value
-
-
- =Parameters!prawa_agent.Value
@@ -519,5 +525,5 @@
1
true
- =Fields!OCENA.Value
+ =Fields!Ocena.Value
Index: trunk/RaportySQL/IloscOgloszen.rdl
===================================================================
--- trunk/RaportySQL/IloscOgloszen.rdl (revision 906)
+++ trunk/RaportySQL/IloscOgloszen.rdl (revision 906)
@@ -0,0 +1,472 @@
+
+
+
+
+ ce992e3a-ee47-4a43-9ee2-2f96c0fa4b24
+ BAZA_REKLAM
+
+
+ 11in
+
+
+ Integer
+
+
+ Tytuly
+ TYTUŁ_NR
+
+
+ Tytuł
+
+
+ Tytuly
+ TYTUŁ_NR
+ TYTUŁ_TXT
+
+
+
+
+ String
+ Wydanie
+
+
+ true
+ 8.5in
+ 0.25cm
+ true
+ 1.5cm
+ 1.5cm
+ 1.5cm
+ e1bb9641-732d-4c7c-8003-91c70a6052b1
+ 21cm
+
+
+
+
+ DZIAŁ_TXT
+ System.String
+
+
+ ROZDZIAŁ_TXT
+ System.String
+
+
+ sort_dzial
+ System.Int16
+
+
+ sort_rozdzial
+ System.Int16
+
+
+ n
+ System.Int32
+
+
+
+ BAZA_REKLAM
+ SELECT DZIAŁ_TXT, ROZDZIAŁ_TXT, sort_dzial, sort_rozdzial, COUNT(*) AS n
+FROM
+( SELECT dz.DZIAŁ_TXT, rozdz.ROZDZIAŁ_TXT,
+ (case when rozdz.Podzial_Na_Marki = 1 and dz.Podzial_Na_Marki = 1 then dd.Marka else '-' end) AS marka,
+ dz.[Sort_Order] as sort_dzial, rozdz.SORT_ORDER as sort_rozdzial
+ FROM (
+ SELECT * FROM DANE_OGL_SQL..DANE WHERE NR_WYDANIA<=@wydanie AND OGL_TYTUL=@tytul AND (NR_WYDANIA+krotnosc)>@wydanie AND WSTRZYMANE=0 AND DELETED=0
+ ) dd
+ INNER JOIN DANE_OGL_SQL..OGL_DZIAŁ dz ON dd.OGL_TYTUL = dz.TYTUL AND dd.OGL_DZIAL = dz.DZIAŁ_NR
+ INNER JOIN DANE_OGL_SQL..OGL_ROZDZIAŁ rozdz ON dd.OGL_TYTUL = rozdz.TYTUŁ AND dd.OGL_ROZDZ = rozdz.ROZDZIAŁ_NR
+) sel1
+GROUP BY DZIAŁ_TXT, ROZDZIAŁ_TXT, sort_dzial, sort_rozdzial
+ORDER BY sort_dzial, sort_rozdzial;
+
+
+ =Parameters!wydanie.Value
+
+
+ =Parameters!tytul.Value
+
+
+ true
+
+
+
+
+
+ TYTUŁ_NR
+ System.Int16
+
+
+ TYTUŁ_TXT
+ System.String
+
+
+
+ BAZA_REKLAM
+ SELECT TYTUŁ_NR, TYTUŁ_TXT FROM DANE_OGL_SQL..TYTUŁY WHERE Aktywny<>0 ORDER BY TYTUŁ_TXT
+ true
+
+
+
+ 14.75cm
+
+ 1cm
+
+
+ textbox1
+
+ 1
+ true
+ 0.75cm
+ ="Ilość ogłoszeń w wydaniu " + Parameters!tytul.Label + " " + Parameters!wydanie.Value
+
+
+ BAZA_REKLAM
+ 1.25cm
+
+
+
+
+ =Fields!DZIAŁ_TXT.Value
+
+
+
+
+ =Fields!DZIAŁ_TXT.Value
+ Ascending
+
+
+
+
+
+
+
+ 2
+
+
+
+ 7
+ true
+ =Fields!DZIAŁ_TXT.Value
+
+
+
+
+
+
+ textbox10
+
+ 6
+ true
+ =SUM(Fields!n.Value)
+
+
+
+
+ 0.75cm
+
+
+
+
+
+ 12.75001cm
+
+
+
+
+
+
+
+ DZIAŁ_TXT
+ BAZA_REKLAM
+
+ 2
+ true
+
+
+
+
+
+
+
+ ROZDZIAŁ_TXT
+
+ 1
+ true
+ =Fields!ROZDZIAŁ_TXT.Value
+
+
+
+
+
+
+ n
+
+ true
+ =Fields!n.Value
+
+
+
+
+ 0.6cm
+
+
+
+ true
+ DZIAŁ_TXTtextbox
+
+
+
+
+
+
+
+
+
+ textbox2
+
+ 10
+ true
+ Dział
+
+
+
+
+
+
+ textbox3
+
+ 9
+ true
+ Rozdział
+
+
+
+
+
+
+ textbox4
+
+ 8
+ true
+ ilość
+
+
+
+
+ 0.55873cm
+
+
+ true
+
+
+
+ 2.32509cm
+
+
+ 8.68743cm
+
+
+ 1.73749cm
+
+
+
+ 1cm
+
+
+ 3.90873cm
+
+ pl-PL
+ 1.5cm
+ 29.7cm
+
Index: trunk/RaportySQL/RaportySQL.rptproj
===================================================================
--- trunk/RaportySQL/RaportySQL.rptproj (revision 900)
+++ trunk/RaportySQL/RaportySQL.rptproj (revision 906)
@@ -428,4 +428,8 @@
ZmianyEmisjiWgSymbolu.rdl
ZmianyEmisjiWgSymbolu.rdl
+
+
+ IloscOgloszen.rdl
+ IloscOgloszen.rdl
Index: trunk/RaportySQL/RozliczenieProwizjiZaReklame2009.rdl
===================================================================
--- trunk/RaportySQL/RozliczenieProwizjiZaReklame2009.rdl (revision 827)
+++ trunk/RaportySQL/RozliczenieProwizjiZaReklame2009.rdl (revision 906)
@@ -1002,7 +1002,4 @@
LightGrey
-
- Solid
-
0.5pt
@@ -1030,7 +1027,4 @@
LightGrey
-
- Solid
-
0.5pt
@@ -1057,7 +1051,4 @@
LightGrey
-
- Solid
-
0.5pt
Index: trunk/RaportySQL/SprzedazReklam2009.rdl
===================================================================
--- trunk/RaportySQL/SprzedazReklam2009.rdl (revision 900)
+++ trunk/RaportySQL/SprzedazReklam2009.rdl (revision 906)
@@ -13,10 +13,4 @@
true
prawa_agencje
- true
-
-
- String
- true
- prawa_agent
true
@@ -222,5 +216,4 @@
AND (AGENCJE.Id_agencji<>4 OR Korekta.NUMER_ROZ ='KAT') AND (AGENCJE.Id_agencji <>6 OR Korekta.NUMER_ROZ ='POZ')
AND Korekta.SystemKsiegowyId IN (@systemKsiegowy)
- AND (@agent IS NULL OR AGENCI.SYMBOL=@agent)
GROUP BY AGENCJE.Symbol, AGENCI.Nazwisko + ' ' + AGENCI.ImiÄ, Korekta.ID_FAKTURY, Korekta.DATA_SPRZEDAZY,
YEAR(Korekta.DATA_SPRZEDAZY), Korekta.NUMER_ROZ,
@@ -263,5 +256,4 @@
AND (AGENCJE.Id_agencji<>4 OR FAKTURY.NUMER_ROZ ='KAT') AND (AGENCJE.Id_agencji <>6 OR FAKTURY.NUMER_ROZ ='POZ')
AND FAKTURY.KOREKTA=0 AND FAKTURY.SystemKsiegowyId IN (@systemKsiegowy)
- AND (@agent IS NULL OR AGENCI.SYMBOL=@agent)
GROUP BY AGENCJE.Symbol, AGENCI.Nazwisko + ' ' + AGENCI.ImiÄ, FAKTURY.ID_FAKTURY, FAKTURY.DATA_SPRZEDAZY,
YEAR(FAKTURY.DATA_SPRZEDAZY), FAKTURY.NUMER_ROZ, FAKTURY.suma_zaplat, FAKTURY.Korekta
@@ -289,7 +281,4 @@
=Parameters!systemKsiegowy.Value
-
-
- =Parameters!prawa_agent.Value
Index: trunk/BazaReklamSetup/BazaReklamSetup.vdproj
===================================================================
--- trunk/BazaReklamSetup/BazaReklamSetup.vdproj (revision 901)
+++ trunk/BazaReklamSetup/BazaReklamSetup.vdproj (revision 906)
@@ -578,6 +578,6 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:Baza Reklam"
- "ProductCode" = "8:{418E62F2-F128-43CE-B0A6-1E176C29079B}"
- "PackageCode" = "8:{E733A2E9-EA20-4297-B1B3-17196B5CB6AF}"
+ "ProductCode" = "8:{A178AA0E-CDBC-429E-BA23-03838D1F3F14}"
+ "PackageCode" = "8:{4A7576E0-501C-49E8-97DA-FF697A912F75}"
"UpgradeCode" = "8:{4E2DBBA4-3139-4790-8DDB-7AADFC963A7D}"
"RestartWWWService" = "11:FALSE"
@@ -585,5 +585,5 @@
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:TRUE"
- "ProductVersion" = "8:1.2.2"
+ "ProductVersion" = "8:1.2.3"
"Manufacturer" = "8:AACT"
"ARPHELPTELEPHONE" = "8:"
Index: trunk/BazaReklam/OrderDetails.cs
===================================================================
--- trunk/BazaReklam/OrderDetails.cs (revision 900)
+++ trunk/BazaReklam/OrderDetails.cs (revision 906)
@@ -1102,9 +1102,8 @@
rEKLAMATableAdapter.Update(rEKLAMADataSet.REKLAMA);
}
-
}
else
{
- //usuwa zmiany w zleceniu
+ //usuwa zmiany w zleceniu
rEKLAMADataSet.REKLAMA.RejectChanges();
rEKLAMADataSet.UKAZE_SIE_W_NR.RejectChanges();
Index: trunk/BazaReklam/ZamowieniaForm.cs
===================================================================
--- trunk/BazaReklam/ZamowieniaForm.cs (revision 889)
+++ trunk/BazaReklam/ZamowieniaForm.cs (revision 906)
@@ -194,5 +194,9 @@
string s = string.Empty;
- if (!CanAddProductToOrder(product, productsWithOrder, zamowienie, out s))
+
+ List productsInOrder = (List)rEKLAMADataGridView.DataSource;
+
+ //if (!CanAddProductToOrder(product, productsWithOrder, zamowienie, out s))
+ if (!CanAddProductToOrder(product, productsInOrder, zamowienie, out s))
{
MessageBox.Show(s, "Baza Reklam - Zamówienia i faktury", MessageBoxButtons.OK, MessageBoxIcon.Error);
@@ -235,5 +239,6 @@
}
- private bool CanAddProductToOrder(IProduct product, List products, REKLAMADataSet.zamowieniaRow order, out string errorMessage)
+ // private bool CanAddProductToOrder(IProduct product, List products, REKLAMADataSet.zamowieniaRow order, out string errorMessage)
+ private bool CanAddProductToOrder(IProduct product, List productsInOrder, REKLAMADataSet.zamowieniaRow order, out string errorMessage)
{
StringBuilder sb = new StringBuilder();
@@ -246,5 +251,5 @@
}
- if (products.FindAll(delegate(IProduct p) { return p.Currency != product.Currency && p.OrderId == order.idZamowienia; }).Count > 0)
+ if (productsInOrder.FindAll(delegate(IProduct p) { return p.Currency != product.Currency && p.OrderId == order.idZamowienia; }).Count > 0)
{
sb.AppendLine("Produkt jest w innej walucie ni¿ pozosta³e produkty w zamówieniu.");
@@ -252,5 +257,5 @@
}
- if (products.FindAll(delegate(IProduct p) { return p.Vat != product.Vat && p.OrderId == order.idZamowienia; }).Count > 0)
+ if (productsInOrder.FindAll(delegate(IProduct p) { return p.Vat != product.Vat && p.OrderId == order.idZamowienia; }).Count > 0)
{
sb.AppendLine("Produkt ma inn¹ stawkê VAT ni¿ pozosta³e produkty w zamówieniu.");
@@ -269,8 +274,8 @@
//Sprawdz czy reklamy maja takiego samego InvoiceProviders
//TODO: wywala sie przy dodawaniu abonamentu do zamowienia...
- if (canAddProduct && products.Count > 0)
+ if (canAddProduct && productsInOrder.Count > 0)
{
Title title1 = _titles.Find(delegate(Title title) { return title.Id == product.TitleId; });
- Title title2 = _titles.Find(delegate(Title title) { return title.Id == products[0].TitleId; });
+ Title title2 = _titles.Find(delegate(Title title) { return title.Id == productsInOrder[0].TitleId; });
if (title1 == null || title2 == null)
{
Index: trunk/BazaReklam/ProvisionForm.resx
===================================================================
--- trunk/BazaReklam/ProvisionForm.resx (revision 900)
+++ trunk/BazaReklam/ProvisionForm.resx (revision 906)
@@ -314,36 +314,35 @@
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
- YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAABv9JREFUSEt1lglQ
- k3caxr+AdltnRbeObXeqU9fd1qnjTtc6bHc9lu1eMrsVC1VaWOtKi5yCSqEuSE0VOTxoOaRESCKHyBVC
- uAI55JAAQsCCiVwCIWLUoJBwhDPy7PtlhbHT3W/mmX/mm/me3/993+//fOEwdF24cOk9q3VqndU6v3ph
- gbOKYewdaHWwWjmrADjY2y93sLN7YSWtq+zsljvMz/9k1fT02AOTySS3WExylaqq4d49zQRZPSWB9fzB
- lZDAM2ZkiNDU1Im+Pj36+4doNdL6GAMDZvptxp07T9De/gjNzQ/Q0DCE2lo9iorakZQkw4kT2aYjR1LE
- Xl6x/jt3+m8k8xdInCUIn59tHB2dRWfnGDo6gO5uK/T6CQwOmtDTMwqNZgTff2+CWj2KlhYz6utHIJc/
- hEQyiJycTqSltSImRoaQkCx4e18aJuPNpJeWAJcv840zMwsYG5vCyMgkGU+Cy81ZYM2amoahUt2nHeug
- UHSjoqIdItFNZGdXIz29AsnJxYiPL0BsbD7Ons2Fr2+KiYyPkdYvAjgsgHoNi2UOZvMUhocnqCVPqRVq
- Mr5Bu60j42oUFytRUCDD1auVEArLweOVEEBMAJENEBWVi8OHk1nAOdKvlgDxCXzj+BwRnj7FxNg0Hj9m
- AQuoqVFDqaxHZWUdystrqOdK5OXJkJUlhUBQjtTUEpqBGBcvFlKL8qiCPPj42ADnnwFsc+BERfON+65N
- gqcyYXZyBmOjE+jqWqCdN0EqrUNZWQ3t/jrtXo5rOVXIyqiAkF+GtFQJUhKLkHA+HxdjchF7Ogc+h5NY
- wAXSm4uD5vCoAkXXDN6JG8SWqLuoUA/D0AdUy1RQSqshL1dCVqKAtKgSRblSpPHLEX1JipD4ShyKlWNv
- lBJO3GpsOdmAi8JqC2dbYBqZv0NaZqsgmioYMVthfDQO58S7YDya8anQgN3RLfh1+E28HtKCFf5qMN63
- wBxuBxOgBXP0DpjQbjAne8B8Rc981QtvyUMkXtHNMx5tFvLdR3rZBgg/yzf+q9CCitYnsI6YIZAN4a3T
- XWSmxuojLdgYchNbw1V4/9QNfHi2BgfilPA/V4Wwc2U4FSfCuehc5AkrUdmgx4tejWA+aR0nXy7pFzZA
- PFWQqTJjS9w9+GToqT3DGNDMoowGWpJThuLsUkhFchQIxchNL0JWSiGECflIPp+HU1EF8OeKUXLjLl7z
- bwDzzzrqgEL3/JvECT/DN/b2miFrNODnX3ZiTUgH8hUjiPtOiaMX5AhOUuHbkn6EXe3EG6GNWHm8DUzI
- bWoRVRnRC+71EThyqX2fVGPFpwR46dVsAoQtngVOWDjf6FM6A2m9Adq2Ibx7WoOXw6nHXtTvQ+34TKCH
- 85k2nBQ9QILCgG+q9EiVD+CKohfFdX04kUmz+EiO5R718ItInyPjdNJu0k9tLTpNgITKYTh+ex9n8gbQ
- qx5EqsgA/2gpTsZJbBm1zlOCZXtKcCAwBsePh+Bo8DGb9vlGwe5DKRhXBXZ6JdPplkyRZxJpC8n+v0Mm
- QItKj0tFfVh9ogt/jLkD1fWH4MXnI+X8NTQ3avEbTx6Y3UXY4CWDRmdGv3ESmqFJbPSpBrOnAtu/qMFe
- 9wMEqGIB35A2LZ2DsDC+USYbgFzajUxRF5b538Lb0b14JegmvUmtiCx+CN+gMLx3tBbM30T4KK4DgxSO
- 3imdYJyL8aqnArXNWnzseZAApYuAtxYBTFDQ5XsSSTfE4i5IxFqICjX4Q0wXNgTWYmuwAkJpDwKDjqFT
- N441rhJw/lqAyPQO2P+lGHbOZUjNVeHJkzG47/cggPjHABeXY//w9U015eTcpvjV4GpWO0qpXV9HZCHy
- yytQVLUhIOAIpa0F2fL74LyfB8YpB8yfCuAWIadwHMUoxYubmzsB0n8MYKe9devfDwQEJD0WCG6Bz28l
- UA8N8wqCgwWUpK3w8wuktJ2xyTWyCcyubLxG1dzW3sXk5DTBJ+Hi4vY8YCmL2EHbscd68+Y/ex48mPiI
- x2uhSO5GYCCfjNNQWqqmD4kvpqZmMD09h/6hcaykWSRm1NO9Wdv9iQkLPvjABSkpGY/Iiw27pbhmAYuQ
- n23a9Pt9Hh7c+wJBO0VvGry8UiimG3Ho0OdkNI25uXlkZmYtcLkJC1qt1qrT6eYNBsOc0WicdXJyGiOj
- QtIXpHWLxs+vbH6vXr/+7b2urse7nZ0Derdvd6v18wtVhoZG9Lu7fzyxf//+cVdX17Fdu3YNstqxY8eg
- o6Pj4LZt23Rr167NpedjSL8lvfi/ALZzQaJ/FszvSMGkyGc7Ynf1NYn9mLAtYNdoUtQznaH136Q9pDX/
- z3zxPgtZQXqdtOFZuWzJbDqyvWUHyK6/JLH/Ihb1Bv1mI9r2HWCv/wArwcam8/FBswAAAABJRU5ErkJg
- gg==
+ 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
@@ -351,29 +350,29 @@
iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- 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
+ 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
Index: trunk/BazaReklam/Baza Reklam.csproj
===================================================================
--- trunk/BazaReklam/Baza Reklam.csproj (revision 901)
+++ trunk/BazaReklam/Baza Reklam.csproj (revision 906)
@@ -33,5 +33,5 @@
index.htm
false
- 1.2.2.0
+ 1.2.3.0
false
Index: trunk/BazaReklam/ProvisionForm.Designer.cs
===================================================================
--- trunk/BazaReklam/ProvisionForm.Designer.cs (revision 900)
+++ trunk/BazaReklam/ProvisionForm.Designer.cs (revision 906)
@@ -156,5 +156,5 @@
this.panel2.Location = new System.Drawing.Point(0, 551);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(984, 38);
+ this.panel2.Size = new System.Drawing.Size(990, 38);
this.panel2.TabIndex = 18;
//
@@ -242,5 +242,5 @@
this.prowizjeDataGridView.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
this.prowizjeDataGridView.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
- this.prowizjeDataGridView.Size = new System.Drawing.Size(984, 558);
+ this.prowizjeDataGridView.Size = new System.Drawing.Size(990, 558);
this.prowizjeDataGridView.TabIndex = 19;
this.prowizjeDataGridView.CellLeave += new System.Windows.Forms.DataGridViewCellEventHandler(this.prowizjeDataGridView_CellLeave);
@@ -496,5 +496,5 @@
this.bindingNavigator1.Name = "bindingNavigator1";
this.bindingNavigator1.PositionItem = this.bindingNavigatorPositionItem;
- this.bindingNavigator1.Size = new System.Drawing.Size(984, 31);
+ this.bindingNavigator1.Size = new System.Drawing.Size(990, 31);
this.bindingNavigator1.TabIndex = 17;
this.bindingNavigator1.Text = "bindingNavigator1";
@@ -730,5 +730,5 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(984, 589);
+ this.ClientSize = new System.Drawing.Size(990, 589);
this.ControlBox = false;
this.Controls.Add(this.ukrytyLabel);
Index: trunk/BazaReklam/ProvisionForm.cs
===================================================================
--- trunk/BazaReklam/ProvisionForm.cs (revision 900)
+++ trunk/BazaReklam/ProvisionForm.cs (revision 906)
@@ -91,10 +91,4 @@
((ComboBox)agencjaToolStripComboBox.Control).SelectedValue = User.Instance().IdAgencji;
-
- if (!User.Instance().IsKierownik)
- {
- agencjaToolStripComboBox.Enabled = false;
- pLANBindingSource.Filter = "Symbol = '" + User.Instance().Login + "'";
- }
}
@@ -277,4 +271,5 @@
UzupelnijBDsuma();
UzupelnijBudzetWykonanySuma();
+ SetProvisionFilter();
}
@@ -335,5 +330,7 @@
btnBlockProvision.Visible = User.Instance().IsKierownik;
- if (!User.Instance().IsKierownik) return;
+
+ if (!User.Instance().IsKierownik)
+ return;
_isProvisionBlocked =
@@ -384,6 +381,4 @@
private void CorrectBonusPercentage(int column, int row)
{
- if (prowizjeDataGridView.Columns[column].Name != "PR_PROWIZJI") return;
-
if (prowizjeDataGridView.Columns[column].Name == "PR_PROWIZJI")
{
@@ -408,4 +403,7 @@
private void prowizjeDataGridView_CellLeave(object sender, DataGridViewCellEventArgs e)
{
+ if (!User.Instance().IsKierownik)
+ return;
+
if (!Validate())
{
@@ -436,4 +434,7 @@
private void prowizjeDataGridView_Leave(object sender, EventArgs e)
{
+ if (!User.Instance().IsKierownik)
+ return;
+
prowizjeDataGridView.EndEdit();
@@ -456,4 +457,7 @@
private void ProvisionForm_Leave(object sender, EventArgs e)
{
+ if (!User.Instance().IsKierownik)
+ return;
+
prowizjeDataGridView.EndEdit();
@@ -480,7 +484,7 @@
private void btnBlockProvision_Click(object sender, EventArgs e)
{
- if (!User.Instance().IsKierownik) return;
-
- if (!_isProvisionBlocked.HasValue) return;
+ if (!User.Instance().IsKierownik ||
+ !_isProvisionBlocked.HasValue)
+ return;
ProvisionHelper provisionHelper = new ProvisionHelper(ConnString.getConnString().Value);
@@ -520,4 +524,19 @@
emailSender.Send();
}
+
+ private void SetProvisionFilter()
+ {
+ if (User.Instance().IsKierownik)
+ return;
+
+ foreach (DataGridViewRow dgvr1 in prowizjeDataGridView.Rows)
+ {
+ if (dgvr1.Cells["sYMBOLDataGridViewTextBoxColumn"].Value.ToString().ToUpper() != User.Instance().Login.ToUpper())
+ {
+ dgvr1.Cells["oCENADataGridViewTextBoxColumn"].Value = 0;
+ dgvr1.Cells["PR_PROWIZJI"].Value = 0;
+ }
+ }
+ }
}
}
Index: trunk/BazaReklam/ReportsForm.cs
===================================================================
--- trunk/BazaReklam/ReportsForm.cs (revision 900)
+++ trunk/BazaReklam/ReportsForm.cs (revision 906)
@@ -452,6 +452,5 @@
reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/RozliczenieProwizjiZaReklame2009" |
reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/SzacowanieSprzedazy" |
- reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/OcenaAgenta" |
- reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/SprzedazReklam2009" )
+ reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/OcenaAgenta" )
{
if (!User.Instance().IsKierownik)
@@ -477,6 +476,6 @@
reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/WynikAgencji" |
reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/SprzedazReklam" |
- reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/RozliczenieProwizjiZaReklame" /* |
- reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/SprzedazReklam2009" |
+ reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/RozliczenieProwizjiZaReklame" |
+ reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/SprzedazReklam2009" /*|
reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/RozliczenieProwizjiZaReklame2009" |
reportViewer1.ServerReport.ReportPath == "/" + reportsCatalog + "/OcenaAgenta"*/
Index: trunk/BazaReklam/Raporty/ReportsTree.xml
===================================================================
--- trunk/BazaReklam/Raporty/ReportsTree.xml (revision 747)
+++ trunk/BazaReklam/Raporty/ReportsTree.xml (revision 906)
@@ -54,4 +54,5 @@
+
Index: trunk/BazaReklam/Properties/AssemblyInfo.cs
===================================================================
--- trunk/BazaReklam/Properties/AssemblyInfo.cs (revision 901)
+++ trunk/BazaReklam/Properties/AssemblyInfo.cs (revision 906)
@@ -30,3 +30,3 @@
//
[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.2.2")]
+[assembly: AssemblyFileVersion("1.2.3")]
Index: trunk/BazaReklam/Properties/Settings.Designer.cs
===================================================================
--- trunk/BazaReklam/Properties/Settings.Designer.cs (revision 889)
+++ trunk/BazaReklam/Properties/Settings.Designer.cs (revision 906)
@@ -69,5 +69,5 @@
get {
return ((string)(this["Baza_Reklam_pl_admoto_service_ImportOtoMoto"]));
- }
+ }
}
}