Changes between Version 9 and Version 10 of AdvancedReports

Timestamp:

01/26/23 15:30:52 (20 months ago)

Author:

201081

Comment:

--

AdvancedReports

@@ -93 +93 @@
 
 select k.ime ,
-coalesce(prv.zbir_1,0) as prv_kavrtal, coalesce(vtor.zbir_2,0) as vtor_kvartal,
+coalesce(prv.zbir_1,0) as prv_kvartal, coalesce(vtor.zbir_2,0) as vtor_kvartal,
 coalesce(tret.zbir_3,0) as tret_kvartal, coalesce(cetvrt.zbir_4,0) as cetvrt_kvartal
 from kompanija k 
@@ -101 +101 @@
 join naracki as n on n.id_naracka =pedon.id_parce 
 left join (
-select k.ime ,p.ime_proizvod , p.kolicina  as zbir_1
+select k.ime ,p.ime_proizvod , count(pedon.id_parce)  as zbir_1
 from kompanija k
 join proizvodi p on p.ime = k.ime
 join parce as par on par.id_proizvod =p.id_proizvod 
 join parce_e_del_od_naracki pedon on pedon.id_parce =par.id_parce 
-join naracki as n on n.id_naracka =pedon.id_parce  and n.data_na_naracka between to_date(concat('01-01-',extract(year from now())),'dd-mm-yyyy') and to_date(concat('31-03-',extract(year from now())),'dd-mm-yyyy') 
+join naracki as n on n.id_naracka =pedon.id_naracka and n.data_na_naracka between to_date(concat('01-01-',extract(year from now())),'dd-mm-yyyy') and to_date(concat('31-03-',extract(year from now())),'dd-mm-yyyy') 
+group by k.ime,p.ime_proizvod 
 ) as prv on  k.ime = prv.ime
 left join (
-select k.ime ,p.ime_proizvod , p.kolicina  as zbir_2
+select k.ime ,p.ime_proizvod ,count(pedon.id_parce)   as zbir_2
 from kompanija k
 join proizvodi p on p.ime = k.ime
 join parce as par on par.id_proizvod =p.id_proizvod 
 join parce_e_del_od_naracki pedon on pedon.id_parce =par.id_parce 
-join naracki as n on n.id_naracka =pedon.id_parce  and n.data_na_naracka between to_date(concat('01-04-',extract(year from now())),'dd-mm-yyyy') and to_date(concat('30-06-',extract(year from now())),'dd-mm-yyyy') 
+join naracki as n on n.id_naracka =pedon.id_naracka and n.data_na_naracka between to_date(concat('01-04-',extract(year from now())),'dd-mm-yyyy') and to_date(concat('30-06-',extract(year from now())),'dd-mm-yyyy') 
+group by k.ime,p.ime_proizvod 
 ) as vtor on k.ime = vtor.ime
 left join (
-select k.ime ,p.ime_proizvod , p.kolicina  as zbir_3
+select k.ime ,p.ime_proizvod , count(pedon.id_parce)  as zbir_3
 from kompanija k
 join proizvodi p on p.ime = k.ime
 join parce as par on par.id_proizvod =p.id_proizvod 
 join parce_e_del_od_naracki pedon on pedon.id_parce =par.id_parce 
-join naracki as n on n.id_naracka =pedon.id_parce  and  n.data_na_naracka between to_date(concat('01-07-',extract(year from now())),'dd-mm-yyyy') and to_date(concat('30-09-',extract(year from now())),'dd-mm-yyyy')
+join naracki as n on n.id_naracka =pedon.id_naracka  and  n.data_na_naracka between to_date(concat('01-07-',extract(year from now())),'dd-mm-yyyy') and to_date(concat('30-09-',extract(year from now())),'dd-mm-yyyy')
+group by k.ime,p.ime_proizvod 
 ) as tret on k.ime=tret.ime
 left join (
-select k.ime ,p.ime_proizvod, p.kolicina  as zbir_4
+select k.ime ,p.ime_proizvod, count(pedon.id_parce)   as zbir_4
 from kompanija k
 join proizvodi p on p.ime = k.ime
 join parce as par on par.id_proizvod =p.id_proizvod 
 join parce_e_del_od_naracki pedon on pedon.id_parce =par.id_parce 
-join naracki as n on n.id_naracka =pedon.id_parce  and  n.data_na_naracka between to_date(concat('01-10-',extract(year from now())),'dd-mm-yyyy') and to_date(concat('31-12-',extract(year from now())),'dd-mm-yyyy')
+join naracki as n on n.id_naracka =pedon.id_naracka and  n.data_na_naracka between to_date(concat('01-10-',extract(year from now())),'dd-mm-yyyy') and to_date(concat('31-12-',extract(year from now())),'dd-mm-yyyy')
+group by k.ime,p.ime_proizvod 
  
 ) as cetvrt on k.ime=cetvrt.ime
@@ -136 +140 @@
 
 
-
-
-
 }}}