Changes for page Per A.Y.

From version 45.6
edited by Andrea Omicini
on 08/02/2023 00:33
Change comment: There is no comment for this version
To version 43.1
edited by Andrea Omicini
on 06/10/2022 01:27
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -61,27 +61,10 @@
61 61   #set( $tutorFirstName = "" )
62 62   #set( $tutorLastName = "" )
63 63  #end
64 -## who, in the end
65 -#set( $oneUser = false )
66 -#set( $oneProfessor = false )
67 -#set( $oneTutor = false )
68 -##
69 -#if( $userName != "" )
70 -## user takes precedence over both professor and tutor and gets them all
71 - #set( $professorName = $userName )
72 - #set( $tutorName = $userName )
73 - #set( $oneUser = true )
74 -#elseif( $professorName != "" )
75 75  ## professor takes precedence over tutor
76 - #set( $tutorName = "@@" )
77 - #set( $userName = "@@" )
78 - #set( $oneProfessor = true )
79 -#elseif( $tutorName != "" )
80 -## just tutor
81 - #set( $professorName = "@@" )
82 - #set( $userName = "@@" )
83 - #set( $oneTutor = true )
84 -#end
65 +#if( $professorName != "" )#set( $tutorName = "" )#end
66 +## user takes precedence over both professor and tutor and gets them all
67 +#if( $userName != "" )#set( $professorName = $userName )#set( $tutorName = $userName )#end
85 85  ##
86 86  #if( $firstYearCou )#set( $firstYear = $firstYearCou )#end
87 87  #if( $lastYearCou )#set( $lastYear = $lastYearCou )#end
... ... @@ -123,52 +123,29 @@
123 123   #set($aYear = $year + "/" + $year1 )
124 124   #end
125 125  #end
126 -#### HANDLE PARAMETERS / END
109 +>{{stringEngIta eng = "Courses" ita = "Corsi"/}} / **#if( $oneYear )$aYear#else$lastAYear**–**$firstAYear#end**#if( $userName != "" ) / $userFirstName $userLastName#elseif( $professorName != "" ) / $professorFirstName $professorLastName#elseif( $tutorName != "" ) / $tutorFirstName $tutorLastName (tutor)#end{{id name="top"/}}
127 127  ##
128 -### query to structures
129 -## map & counter initialisation
130 -#set( $courseMap = {} )
131 -#set( $courseNo = 0 )
132 -#if( $services.localization.currentLocale == "it" )#set( $sortField = "ita")#else#set( $sortField = "eng")#end
111 +#if( !$oneYear )
112 +(% 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( $foreach.index > 0 ) | #end[[$ayearr>>$doc||anchor=$yearr]]#end)))
113 +#end
133 133  ##
134 -##
115 +#if( $services.localization.currentLocale == "it" )#set( $sortField = "ita")#else#set( $sortField = "eng")#end
116 +#set( $courseNo = 0 )
135 135  #foreach( $yearr in $yearList)#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 )
136 136   #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, StringProperty as prop4
137 - 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' #if( $oneUser )and ( prop1.value like '%$professorName%' or prop2.value like '%$professorName%' or prop3.value like '%$tutorName%' )#end#if( $oneProfessor )and ( prop1.value like '%$professorName%' or prop2.value like '%$professorName%' )#end#if( $oneTutor )and prop3.value like '%$tutorName%'#end order by prop4.value asc ")
119 + 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 ")
138 138   #set( $courseFound = $xwiki.searchDocuments($sql) )
139 139   #set( $courseYearNo = $courseFound.size() )
140 140   #if( $$courseYearNo >0 )
141 - #set( $courseMap[$yearr] = $courseFound )
142 142   #set( $courseNo = $courseNo + $courseYearNo )
124 + #if( !$oneYear )
125 +(% 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']]
126 + #end
127 + #foreach( $courseDoc in $courseFound )
128 +* {{courseName}}$courseDoc{{/courseName}}
129 + #end
130 +(% 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"]]
143 143   #end
144 144  #end
145 -### output results
146 -## page subtitle
147 -{{id name="top"/}}
148 ->(%%)$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( $oneUser ) / $userFirstName $userLastName#elseif( $oneProfessor ) / $professorFirstName $professorLastName#elseif( $oneTutor ) / $tutorFirstName $tutorLastName (tutor)#{end}(%%)
149 -##
150 -## stop if no course are found
151 -#if( $courseNo == 0 || $courseMap.keySet().size() == 0 )
152 -## redundant double check
153 - #stop
154 -#end
155 -## some course found
156 -## page index
157 -#if( $courseMap.keySet().size() > 1 )
158 -## found more than one year
159 -{{id name="index"/}}
160 -(% 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)))
161 -#end
162 -## courses displayed per academic year
163 -#foreach( $yearr in $courseMap.keySet() )#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 )
164 -(% 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( $oneUser )&user=$userName#elseif( $oneProfessor )&professor=$professorName#elseif( $oneTutor )&tutor=$tutorName#end']]
165 -(% style="border-style:hidden hidden hidden hidden; font-style:normal" %)
166 -#foreach( $course in $courseMap[$yearr] )
167 -* {{courseName}}$course{{/courseName}}
168 - #end
169 -(%%)
170 - #set( $courseYearNo = $courseMap[$yearr].size() )
171 -(% 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 $yearr) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
172 -#end
133 +#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
173 173  {{/velocity}}
174 -{{id name="bottom"/}}