Changes for page Per A.Y.

From version 45.8
edited by Andrea Omicini
on 08/02/2023 00:37
Change comment: There is no comment for this version
To version 45.25
edited by Andrea Omicini
on 20/07/2023 09:17
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,0 +1,1 @@
1 +$services.localization.render('peray')
Default language
... ... @@ -1,1 +1,0 @@
1 -en
Content
... ... @@ -1,5 +3,3 @@
1 -= {{italiano}}Per A.A.{{/italiano}}{{english}}Per A.Y.{{/english}} =
2 -
3 3  {{include reference="Courses.Environment" excludeFirstHeading="true"/}}{{velocity}}
4 4  #set( $courseMenu = true )
5 5  #set( $currentCourseDoc = "" )
... ... @@ -9,6 +9,10 @@
9 9  #set( $firstYearPar = $context.getRequest().getParameter("from") )
10 10  #set( $lastYearPar = $context.getRequest().getParameter("to") )
11 11  ## who
10 +#set( $oneUser = false )
11 +#set( $oneProfessor = false )
12 +#set( $oneTutor = false )
13 +##
12 12  #set( $userNamePar = $context.getRequest().getParameter("user") )
13 13  #set( $professorNamePar = $context.getRequest().getParameter("professor") )
14 14  #set( $tutorNamePar = $context.getRequest().getParameter("tutor") )
... ... @@ -18,6 +18,7 @@
18 18   #set( $userdoc = $xwiki.getDocument($userName) )
19 19   #set( $userFirstName = $userdoc.display("first_name") )
20 20   #set( $userLastName = $userdoc.display("last_name") )
23 + #set( $oneUser = true )
21 21  #elseif ( $userNamePar )
22 22  ## from the URL, "user=UserName" parameter
23 23   #if( $userNamePar.contains("XWiki.") )
... ... @@ -28,10 +28,7 @@
28 28   #set( $userdoc = $xwiki.getDocument($userName) )
29 29   #set( $userFirstName = $userdoc.display("first_name") )
30 30   #set( $userLastName = $userdoc.display("last_name") )
31 -#else
32 - #set( $userName = "" )
33 - #set( $userFirstName = "" )
34 - #set( $userLastName = "" )
34 + #set( $oneUser = true )
35 35  #end
36 36  #if ( $professorName )
37 37  ## from a personal page, "XWiki.UserName" $professorName form
... ... @@ -38,6 +38,7 @@
38 38   #set( $professordoc = $xwiki.getDocument($professorName) )
39 39   #set( $professorFirstName = $professordoc.display("first_name") )
40 40   #set( $professorLastName = $professordoc.display("last_name") )
41 + #set( $oneProfessor = true )
41 41  #elseif ( $professorNamePar )
42 42  ## from the URL, "professor=UserName" parameter
43 43   #if( $professorNamePar.contains("XWiki.") )
... ... @@ -48,10 +48,7 @@
48 48   #set( $professordoc = $xwiki.getDocument($professorName) )
49 49   #set( $professorFirstName = $professordoc.display("first_name") )
50 50   #set( $professorLastName = $professordoc.display("last_name") )
51 -#else
52 - #set( $professorName = "" )
53 - #set( $professorFirstName = "" )
54 - #set( $professorLastName = "" )
52 + #set( $oneProfessor = true )
55 55  #end
56 56  #if ( $tutorName )
57 57  ## from a personal page, "XWiki.UserName" $tutorName form
... ... @@ -68,31 +68,21 @@
68 68   #set( $tutordoc = $xwiki.getDocument($tutorName) )
69 69   #set( $tutorFirstName = $tutordoc.display("first_name") )
70 70   #set( $tutorLastName = $tutordoc.display("last_name") )
71 -#else
72 - #set( $tutorName = "" )
73 - #set( $tutorFirstName = "" )
74 - #set( $tutorLastName = "" )
69 + #set( $oneTutor = true )
75 75  #end
76 76  ## who, in the end
77 -#set( $oneUser = false )
78 -#set( $oneProfessor = false )
79 -#set( $oneTutor = false )
80 -##
81 -#if( $userName != "" )
72 +#if( $oneUser )
82 82  ## user takes precedence over both professor and tutor and gets them all
83 - #set( $professorName = $userName )
84 - #set( $tutorName = $userName )
85 - #set( $oneUser = true )
86 -#elseif( $professorName != "" )
74 + #set( $oneProfessor = false )
75 + #set( $oneTutor = false )
76 +#elseif( $oneProfessor )
87 87  ## professor takes precedence over tutor
88 - #set( $tutorName = "@@" )
89 - #set( $userName = "@@" )
90 - #set( $oneProfessor = true )
91 -#elseif( $tutorName != "" )
78 + #set( $oneUser = false )
79 + #set( $oneTutor = false )
80 +#elseif( $oneTutor )
92 92  ## just tutor
93 - #set( $professorName = "@@" )
94 - #set( $userName = "@@" )
95 - #set( $oneTutor = true )
82 + #set( $oneUser = false )
83 + #set( $oneProfessor = false )
96 96  #end
97 97  ##
98 98  #if( $firstYearCou )#set( $firstYear = $firstYearCou )#end
... ... @@ -146,7 +146,7 @@
146 146  ##
147 147  #foreach( $yearr in $yearList)#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 )
148 148   #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, StringProperty as prop4
149 - 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 ")
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 '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' )#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 ")
150 150   #set( $courseFound = $xwiki.searchDocuments($sql) )
151 151   #set( $courseYearNo = $courseFound.size() )
152 152   #if( $$courseYearNo >0 )
... ... @@ -157,7 +157,7 @@
157 157  ### output results
158 158  ## page subtitle
159 159  {{id name="top"/}}
160 ->(%%)$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}(%%)
148 +>(%%)$courseNo #if( $courseNo == 1 ){{stringEngIta eng=$objectEngSingular.toLowerCase() ita=$objectItaSingular.toLowerCase()/}}#{else}{{stringEngIta eng=$objectEngPlural.toLowerCase() ita=$objectItaPlural.toLowerCase()/}}#{end} / #if( $oneYear )$year#{else}${firstYear}–${lastYear}#{end}#if( $oneUser ) / $userFirstName $userLastName#{elseif}( $oneProfessor ) / $professorFirstName $professorLastName#{elseif}( $oneTutor ) / $tutorFirstName $tutorLastName (tutor)#{end}(%%)
161 161  ##
162 162  ## stop if no course are found
163 163  #if( $courseNo == 0 || $courseMap.keySet().size() == 0 )
... ... @@ -175,8 +175,12 @@
175 175  #foreach( $yearr in $courseMap.keySet() )#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 )
176 176  (% 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']]
177 177  (% style="border-style:hidden hidden hidden hidden; font-style:normal" %)
178 -#foreach( $course in $courseMap[$yearr] )
179 -* {{courseName}}$course{{/courseName}}
166 + #foreach( $course in $courseMap[$yearr] )
167 + #if( $oneUser || $oneProfessor || $oneTutor )
168 +* {{courseName}}$course{{/courseName}} (% style="font-style:normal; font-size:normal; color:$theme.textSecondaryColor" %)({{courseCycle}}$course{{/courseCycle}})(%%)
169 + #else
170 +* {{course linked="title"}}$course{{/course}}
171 + #end
180 180   #end
181 181  (%%)
182 182   #set( $courseYearNo = $courseMap[$yearr].size() )