Changes for page Per A.Y.
From version 39.1
edited by Andrea Omicini
on 21/01/2022 18:57
on 21/01/2022 18:57
Change comment:
There is no comment for this version
To version 45.4
edited by Andrea Omicini
on 08/02/2023 00:14
on 08/02/2023 00:14
Change comment:
There is no comment for this version
Summary
-
Page properties (2 modified, 0 added, 0 removed)
Details
- Page properties
-
- Title
-
... ... @@ -1,1 +1,0 @@ 1 -#if($xcontext.language=='it')Corsi per A.A.#{else}Courses per A.Y.#end - Content
-
... ... @@ -1,4 +1,6 @@ 1 -{{include reference="Courses.Environment" excludeFirstHeading="true"/}}{{include reference="Environment" excludeFirstHeading="true"/}}{{velocity}} 1 += {{italiano}}Per A.A.{{/italiano}}{{english}}Per A.Y.{{/english}} = 2 + 3 +{{include reference="Courses.Environment" excludeFirstHeading="true"/}}{{velocity}} 2 2 #set( $courseMenu = true ) 3 3 #set( $currentCourseDoc = "" ) 4 4 #### get parameters ... ... @@ -64,10 +64,10 @@ 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 +#if( $firstYearCourse )#set( $firstYear = $firstYearCourse )#end 72 +#if( $lastYearCourse )#set( $lastYear = $lastYearCourse )#end 71 71 #set( $firstYear1 = $firstYear + 1 )#set( $firstAYear = $firstYear + "/" + $firstYear1 ) 72 72 #set( $lastYear1 = $lastYear + 1 )#set( $lastAYear = $lastYear + "/" + $lastYear1 ) 73 73 #set( $yearRange = [$lastYear..$firstYear] ) ... ... @@ -104,29 +104,52 @@ 104 104 #set($aYear = $year + "/" + $year1 ) 105 105 #end 106 106 #end 107 - >{{stringEngIta eng = "Courses" ita = "Corsi"/}} / **#if( $oneYear )$aYear#else$firstAYear**–**$lastAYear#end**#if($userName != "" ) / $userFirstName $userLastName#elseif($professorName!= "" )/$professorFirstName $professorLastName#elseif( $tutorName != "" ) / $tutorFirstName $tutorLastName (tutor)#end{{id name="top"/}}109 +#### HANDLE PARAMETERS / END 108 108 ## 109 -#if( !$oneYear ) 110 -(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach ($yearr in $yearList)#set($yearr1 = $yearr + 1)#set($ayearr = "$yearr/$yearr1")#if( $velocityCount > 1 ) | #end[[$ayearr>>$doc||anchor=$yearr]]#end))) 111 -#end 112 -## 113 -#if( $xcontext.language== "it" )#set( $sortField = "ita")#else#set( $sortField = "eng")#end 111 +### query to structures 112 +## map & counter initialisation 113 +#set( $courseMap = {} ) 114 114 #set( $courseNo = 0 ) 115 +#if( $services.localization.currentLocale == "it" )#set( $sortField = "ita")#else#set( $sortField = "eng")#end 116 +## 117 +## 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 ")120 + where obj.name = doc.fullName and obj.className = '${objectSpace}.${objectClass}' and obj.name <> '${objectSpace}.${objectTemplate}' 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 ") 118 118 #set( $courseFound = $xwiki.searchDocuments($sql) ) 119 119 #set( $courseYearNo = $courseFound.size() ) 120 120 #if( $$courseYearNo >0 ) 124 + #set( $courseMap[$yearr] = $courseFound ) 121 121 #set( $courseNo = $courseNo + $courseYearNo ) 122 - #if( !$oneYear ) 123 -(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$yearr'/}}[[$ayearr>>$doc||queryString='year=$yearr#if( $userName != "" )&user=$userName#elseif( $professorName != "" )&professor=$professorName#elseif( $tutorName != "" )&tutor=$tutorName#end']] 124 - #end 125 - #foreach( $courseDoc in $courseFound ) 126 -* {{courseName}}$courseDoc{{/courseName}} 127 - #end 128 -(% style="#if( !$oneYear )border-style:hidden solid solid hidden; border-color:$theme.borderColor;#end text-align:right; font-style:oblique; font-size:smaller" %)|($courseYearNo #if( $courseYearNo == 1 ){{stringEngIta eng='course in' ita='corso nel'/}}#else{{stringEngIta eng='courses in' ita='corsi nel'/}}#end $ayearr) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]] 129 129 #end 130 130 #end 131 -#if( !$oneYear )(% style="text-align:right; font-style:oblique; font-size:smaller; border-bottom-style:dotted; border-color:$theme.borderColor" %)|($courseNo #if( $courseNo == 1 ){{stringEngIta eng='course' ita='corso'/}}#else{{stringEngIta eng='courses' ita='corsi'/}}#end)#end 128 +### output results 129 +## page subtitle 130 +{{id name="top"/}} 131 +>(%%)$courseNo #if( $courseNo == 1 ){{stringEngIta eng="$objectEngSingular.toLowerCase()" ita="$objectItaSingular.toLowerCase()"/}}#{else}{{stringEngIta eng="$objectEngPlural.toLowerCase()" ita="$objectItaPlural.toLowerCase()"/}}#{end} / #if( $oneYear )$aYear#else$lastAYear–$firstAYear#end#if( $userName != "" ) / $userFirstName $userLastName#elseif( $professorName != "" ) / $professorFirstName $professorLastName#elseif( $tutorName != "" ) / $tutorFirstName $tutorLastName (tutor)#{end}(%%) 132 +## 133 +## stop if no course are found 134 +#if( $courseNo == 0 || $courseMap.keySet().size() == 0 ) 135 +## redundant double check 136 + #stop 137 +#end 138 +## some course found 139 +## page index 140 +#if( $courseMap.keySet().size() > 1 ) 141 +## found more than one year 142 +{{id name="index"/}} 143 +(% style="font-size:smaller; text-align:right; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $yearr in $courseMap.keySet() )#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 )#if( !$foreach.first ) | #end[[$ayearr>>||anchor="$ayearr"]]#end))) 144 +#end 145 +## courses displayed per academic year 146 +#foreach( $yearr in $courseMap.keySet() )#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 ) 147 +(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$ayearr'/}}[[$ayearr>>$doc||style='text-decoration:none; color:$theme.textPrimaryColor' queryString='year=$yearr#if( $userName != "" )&user=$userName#elseif( $professorName != "" )&professor=$professorName#elseif( $tutorName != "" )&tutor=$tutorName#end']] 148 +(% style="border-style:hidden hidden hidden hidden; font-style:normal" %) 149 +#foreach( $course in $courseMap[$yearr] ) 150 +* {{courseName}}$course{{/courseName}} 151 + #end 152 +(%%) 153 + #set( $courseYearNo = $courseMap[$yearr].size() ) 154 +(% style="border-style:hidden solid solid hidden; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-size:smaller" %)|($courseYearNo #if( $courseYearNo == 1 ){{stringEngIta eng='course in' ita='corso nel'/}}#{else}{{stringEngIta eng='courses in' ita='corsi nel'/}}#end $year) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]] 155 +#end 132 132 {{/velocity}} 157 +{{id name="bottom"/}}