Changes between Version 12 and Version 13 of AdvancedReports

Timestamp:

07/10/23 18:25:29 (11 months ago)

Author:

201144

Comment:

--

AdvancedReports

@@ -3 +3 @@
 * Зa сите студенти извештај за тоа колку пати имаат седено во истиот стан и колку имаат платено вкупно во текот на сите договори за еден стан
 {{{
-select stud.studentid, appus.ime, appus.prezime, b.cityname, b.building_adress, 
-apt.apartment_adress, aa.date_signed,apt.apartmentid,aa.date_signed,aa.date_expires, 
+select stud.studentid, appus.ime, appus.prezime, c.cityname, b.buildingaddress, 
+apt.apartmentfloorandroomnumber , aa.datesigned,apt.apartmentid,aa.datesigned,aa.dateexpires, 
 count(apt.apartmentid) as kolku_pati, 
-extract(month from age(aa.date_expires,aa.date_signed)) * sum(aa.apartment_rent)  as vkupno_plateno  from apartment_agreement as aa
+extract(month from age(aa.dateexpires,aa.datesigned)) * sum(aa.apartmentrent)  as vkupno_plateno  from apartment_agreement as aa
 join apartment apt on apt.apartmentid = aa.apartmentid 
-join student_signs ss on ss.agreementid = aa.apartment_agreementid 
+join student_signs ss on ss.agreementid = aa.agreementid 
 join student stud on stud.studentid = ss.studentid
 join appuser appus on appus.userid = stud.studentid 
-join building b on apt.buildingid = b.buildingid 
+join building b on apt.buildingid = b.buildingid
+join city c on c.cityid = b.cityid 
 group by 1,2,3,4,5,6,7,8,9,10
 order by stud.studentid