fixed view in Zaliczka

SE/se-lib/Route/UrlAction/UserProNetMediaZaliczka.php

@@ -382,7 +382,8 @@ class Route_UrlAction_UserProNetMediaZaliczka extends RouteBase {// TODO: UrlAct
 							, sum(COALESCE(p.kwota, 0)) as rozliczona_kwota
 					from ZALICZKA t
 						left join `{$refTablePozycja}` refPoz on(refPoz.PRIMARY_KEY = t.ID and refPoz.A_STATUS != 'DELETED')
-						left join ZALICZKA_POZYCJA p on(p.ID = refPoz.REMOTE_PRIMARY_KEY and (p.A_STATUS is null or p.A_STATUS != 'DELETED'))
+						left join ZALICZKA_POZYCJA p on(p.ID = refPoz.REMOTE_PRIMARY_KEY and (p.A_STATUS not in ('DELETED')))
+					where t.A_STATUS not in ('DELETED')
 					group by t.ID
 				");
 				DB::getPDO()->execSql("
@@ -397,7 +398,7 @@ class Route_UrlAction_UserProNetMediaZaliczka extends RouteBase {// TODO: UrlAct
 						, sum(t.KWOTA) as suma_zaliczek
 					from ZALICZKA t
 						join ADMIN_USERS u on(u.ADM_ACCOUNT = t.L_APPOITMENT_USER)
-					where t.A_STATUS != 'DELETED'
+					where t.A_STATUS not in ('DELETED')
 					group by u.ADM_ACCOUNT
 				");
 
@@ -410,14 +411,14 @@ class Route_UrlAction_UserProNetMediaZaliczka extends RouteBase {// TODO: UrlAct
 					'rows' => DB::getPDO()->fetchAll(" select * from `ZALICZKA_INFO_VIEW` ")
 				]);
 				UI::table([
-					'caption' => "Table `ZALICZKA_INFO_VIEW` - debug",
+					'caption' => "Table `ZALICZKA_INFO_VIEW` - debug (with deleted)",
 					'rows' => DB::getPDO()->fetchAll("
 						select t.ID
 								, t.A_STATUS
 								, t.L_APPOITMENT_USER
 								, t.KWOTA
 								, t.NIEROZLICZONA_KWOTA
-								, p.ID as p__ID
+								, IF(p.ID is null, 'NULL', p.ID) as p__ID
 								, p.A_STATUS as p__A_STATUS
 								, p.L_APPOITMENT_USER as p__L_APPOITMENT_USER
 								, p.nr_faktury as p__nr_faktury
@@ -426,8 +427,8 @@ class Route_UrlAction_UserProNetMediaZaliczka extends RouteBase {// TODO: UrlAct
 								, p.vat as p__vat
 								, p.kategoria_kosztu as p__kategoria_kosztu
 						from ZALICZKA t
-							left join `{$refTablePozycja}` refPoz on(refPoz.PRIMARY_KEY = t.ID and refPoz.A_STATUS != 'DELETED')
-							left join ZALICZKA_POZYCJA p on(p.ID = refPoz.REMOTE_PRIMARY_KEY and (p.A_STATUS is null or p.A_STATUS != 'DELETED'))
+							left join `{$refTablePozycja}` refPoz on(refPoz.PRIMARY_KEY = t.ID)
+							left join ZALICZKA_POZYCJA p on(p.ID = refPoz.REMOTE_PRIMARY_KEY)
 					")
 				]);
 			}