Changes between Version 16 and Version 17 of AdvancedReports

Timestamp:

07/10/23 18:30:30 (18 months ago)

Author:

201144

Comment:

--

AdvancedReports

@@ -60 +60 @@
 * Извештај за станови во системот кои не се моментално издадени и нивните газди соодветно, и доколку биле издадени порано да се покаже кој седел во нив
 {{{
-select distinct apart.apartmentid,apart.adresa as adresa, apart.ime, apart.prezime, apart.phone_number, au.ime,au.prezime,aa2.date_signed,aa2.date_expires from student s 
+select distinct apart.apartmentid,apart.adresa as adresa, apart.ime, apart.prezime, apart.phone_number, au.ime,au.prezime,aa2.datesigned,aa2.dateexpires from student s 
 join student_signs ss on ss.studentid = s.studentid 
 join appuser au on au.userid = s.studentid 
-join apartment_agreement aa2 on aa2.apartment_agreementid = ss.agreementid 
+join apartment_agreement aa2 on aa2.agreementid = ss.agreementid 
 right join 
 (
-select distinct apt.apartmentid,concat(b.cityname,', ',b.building_adress,' ',apt.apartment_adress) as adresa, a.ime, a.prezime, a.phone_number from apartment as apt
+select distinct apt.apartmentid,concat(c.cityname,', ',b.buildingaddress,' ',apt.apartmentfloorandroomnumber) as adresa, a.ime, a.prezime, a.phone_number from apartment as apt
 left join apartment_agreement aa on aa.apartmentid = apt.apartmentid 
 join apartment_owner ao on ao.ownerid = apt.ownerid
 join appuser as a on ao.ownerid = a.userid
 join building b on apt.buildingid = b.buildingid
+join city c on c.cityid = b.cityid 
 ) apart on apart.apartmentid=aa2.apartmentid 
-where now()>aa2.date_expires or aa2.date_expires isnull 
+where now()>aa2.dateexpires or aa2.dateexpires isnull 
 }}}