Index: trunk/SQL/StoredProcedures/PROC_WYLICZ_I_ZAPISZ_DANE_O_KONTAKTACH_I_BUDZECIE.txt
===================================================================
--- trunk/SQL/StoredProcedures/PROC_WYLICZ_I_ZAPISZ_DANE_O_KONTAKTACH_I_BUDZECIE.txt (revision 472)
+++ trunk/SQL/StoredProcedures/PROC_WYLICZ_I_ZAPISZ_DANE_O_KONTAKTACH_I_BUDZECIE.txt (revision 473)
@@ -178,81 +178,9 @@
 ) P_T
 ON T_AGENT=AGENT AND ROK=T_ROK AND MS=T_MS
-
-union all
---dodajemy SAMPRESS
-SELECT  ROK, MS, AGENT, IL_KONTKTOW, IL_KLIENTOW, SPOTKANIE, FAX, EMAIL, LIST, TEL ,
-ISNULL(IL_REKLAM,0) AS IL_REKLAM,  ROUND(ISNULL(BUDZET,0) ,0) AS wk_BUDZET, ISNULL(NKL,0) AS NKL, HANDEL, PRODUKT, RYNEK, FIRMA
-FROM 
-(
-SELECT ROK , MS, AGENT,  COUNT(Id_kontaktu) AS IL_KONTKTOW, COUNT(DISTINCT customerId) AS IL_KLIENTOW, 
-  
-  SUM( CASE WHEN RODZAJ='TEL' THEN 1 ELSE 0 END) AS TEL,  
-  SUM( CASE WHEN RODZAJ='FAX' THEN 1 ELSE 0 END) AS FAX,  
-  SUM( CASE WHEN RODZAJ='LIST' THEN 1 ELSE 0 END) AS LIST,  
-  SUM( CASE WHEN RODZAJ='E-MAIL' THEN 1 ELSE 0 END) AS EMAIL,  
-  SUM( CASE WHEN RODZAJ='SPOTKANIE' THEN 1 ELSE 0 END) AS SPOTKANIE  
-FROM 
-(
-SELECT truck_expo.dbo.KONTAKTY.Id_kontaktu, truck_expo.dbo.KONTAKTY.rodzaj as RODZAJ, 
-  symbol_agenta  AS AGENT, truck_expo.dbo.KONTAKTY.customerId, 
-  DATEPART(YEAR, truck_expo.dbo.KONTAKTY.data) AS ROK,  
-  DATEPART(Month, truck_expo.dbo.kontakty.data) As MS  
-  FROM truck_expo.dbo.KONTAKTY 
-  WHERE DATEPART(YEAR, truck_expo.dbo.KONTAKTY.data) = @ROK and DATEPART(Month, truck_expo.dbo.kontakty.data) = @MS
-) KO  
-GROUP BY ROK, MS , AGENT
-)  P_K 
---WYLICZENIE ILOSCI REKLAM
-FULL OUTER JOIN
-(
-SELECT [SYMBOL AKWIZYTORA] AS R_AGENT, COUNT(*) AS IL_REKLAM_1,  
- DATEPART(YEAR,[DATA ZAMÓWIENIA]) AS R_ROK, 
- DATEPART(MONTH,[DATA ZAMÓWIENIA]) AS R_MS 
- FROM truck_expo.dbo.REKLAMA 
- WHERE 
-  DATEPART(YEAR,[DATA ZAMÓWIENIA])=@ROK  AND 
-  DATEPART(MONTH,[DATA ZAMÓWIENIA])=@MS   AND 
- [ZATWIERDZONO DO DRUKU]=1 
-GROUP BY [SYMBOL AKWIZYTORA] , DATEPART(YEAR,[DATA ZAMÓWIENIA]), DATEPART(MONTH,[DATA ZAMÓWIENIA])
-) P_R 
-ON R_AGENT=AGENT AND ROK=R_ROK AND MS=R_MS
-FULL OUTER JOIN
-(
-SELECT USERNAME,  DATEPART(YEAR,DATA) AS K_ROK,  DATEPART(MONTH,DATA) AS K_MS, COUNT(*) AS NKL FROM truck_expo.dbo.KLIENCI
- WHERE DATEPART(YEAR,DATA)=@ROK  AND  DATEPART(MONTH,DATA)=@MS
- GROUP BY USERNAME,  DATEPART(YEAR,DATA),  DATEPART(MONTH,DATA)
-) AS P_NK
-ON USERNAME=AGENT AND ROK=K_ROK AND MS=K_MS
---WYLICZENIE BUD¯ETU
-FULL OUTER JOIN
-(
-SELECT [SYMBOL AKWIZYTORA] AS B_AGENT, SUM(NETTO) AS BUDZET, COUNT(*) AS IL_REKLAM, 
- DATEPART(YEAR,[FAKTURA DATA WYSTAWIENIA]) AS B_ROK, 
- DATEPART(MONTH,[FAKTURA DATA WYSTAWIENIA]) AS B_MS 
- FROM truck_expo.dbo.REKLAMA 
- WHERE 
-  DATEPART(YEAR,[FAKTURA DATA WYSTAWIENIA])=@ROK  AND 
-  DATEPART(MONTH,[FAKTURA DATA WYSTAWIENIA])=@MS   AND 
- [ZATWIERDZONO DO DRUKU]=1 and
-[FAKTURA WYSTAWIONO]=1 
-GROUP BY [SYMBOL AKWIZYTORA] , DATEPART(YEAR,[FAKTURA DATA WYSTAWIENIA]), DATEPART(MONTH,[FAKTURA DATA WYSTAWIENIA])
-) P_B 
-ON B_AGENT=AGENT AND ROK=B_ROK AND MS=B_MS
--- WYLICZENIE DANYCH DO TESTU WIEDZY
-FULL OUTER JOIN
-(
-SELECT user_name AS T_AGENT, DATEPART(YEAR,[DATA]) AS T_ROK, DATEPART(MONTH,[DATA]) AS T_MS, 
-            SUM(HANDEL) AS HANDEL, SUM(PRODUKT) AS PRODUKT, SUM(RYNEK) AS RYNEK, SUM(FIRMA) AS FIRMA
-FROM truck_expo.dbo.VIEW_ZESTAWIENIE_TEST_WIEDZY
- WHERE 
-  DATEPART(YEAR,[DATA])=@ROK AND 
-  DATEPART(MONTH,[DATA])=@MS   
-GROUP BY user_name, DATEPART(YEAR,[DATA]) , DATEPART(MONTH,[DATA]) 
-) P_T
-ON T_AGENT=AGENT AND ROK=T_ROK AND MS=T_MS
 ) CT_PLUS_SAMPRESS
 group by rok, ms, agent) wl
 --Koñcówka instrukcji Update
 inner join [plan] on wl.agent=[PLAN].symbol and wl.rok=[PLAN].rok and wl.ms=[PLAN].ms
+
 GO