Changes for page Per A.Y.

From version 38.3
edited by Andrea Omicini
on 21/01/2022 18:56
Change comment: There is no comment for this version
To version 36.1
edited by Andrea Omicini
on 28/11/2021 01:27
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,4 +1,4 @@
1 -{{include reference="Courses.Environment" excludeFirstHeading="true"/}}{{include reference="Environment" excludeFirstHeading="true"/}}{{velocity}}
1 +{{include reference="Courses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 2  #set( $courseMenu = true )
3 3  #set( $currentCourseDoc = "" )
4 4  #### get parameters
... ... @@ -64,9 +64,7 @@
64 64  ## user takes precedence over both professor and tutor and gets them all
65 65  #if( $userName != "" )#set( $professorName = $userName )#set( $tutorName = $userName )#end
66 66  ##
67 -#if( $firstYearCourse )#set( $firstYear = $firstYearCourse )#end
68 68  #if( $firstYearCou )#set( $firstYear = $firstYearCou )#end
69 -#if( $lastYearCourse )#set( $lastYear = $lastYearCourse )#end
70 70  #if( $lastYearCou )#set( $lastYear = $lastYearCou )#end
71 71  #set( $firstYear1 = $firstYear + 1 )#set( $firstAYear = $firstYear + "/" + $firstYear1 )
72 72  #set( $lastYear1 = $lastYear + 1 )#set( $lastAYear = $lastYear + "/" + $lastYear1 )
... ... @@ -114,7 +114,7 @@
114 114  #set( $courseNo = 0 )
115 115  #foreach( $yearr in $yearList)#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 )
116 116   #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, StringProperty as prop4
117 - where obj.name = doc.fullName and obj.className = 'Courses.CourseClass' and obj.name <> 'Courses.CourseTemplate' and prop.id.id = obj.id and prop1.id.id = obj.id and prop2.id.id = obj.id and prop3.id.id = obj.id and prop4.id.id = obj.id and prop.name = 'ay' and prop1.name = 'professor' and prop2.name = 'otherProfessors' and prop3.name = 'tutors' and prop4.name = '$sortField' and prop.value = '$ayearr' and ( prop1.value like '%$professorName%' or prop2.value like '%$professorName%' or prop3.value like '%$tutorName%' ) order by prop4.value asc ")
115 + where obj.name = doc.fullName and obj.className = 'Courses.CourseClass' and obj.name <> 'Courses.CourseTemplate' and prop.id.id = obj.id and prop1.id.id = obj.id and prop2.id.id = obj.id and prop3.id.id = obj.id and prop4.id.id = obj.id and prop.name = 'ay' and prop1.name = 'professor' and prop2.name = 'otherProfessors' and prop3.name = 'tutors' and prop4.name = '$sortField' and prop.value like '%$yearr%' and ( prop1.value like '%$professorName%' or prop2.value like '%$professorName%' or prop3.value like '%$tutorName%' ) order by prop4.value asc ")
118 118   #set( $courseFound = $xwiki.searchDocuments($sql) )
119 119   #set( $courseYearNo = $courseFound.size() )
120 120   #if( $$courseYearNo >0 )