Changes for page Per A.Y.

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

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,0 @@
1 -$services.localization.render('peray')
Default language
... ... @@ -1,0 +1,1 @@
1 +en
Content
... ... @@ -1,3 +1,5 @@
1 += {{italiano}}Per A.A.{{/italiano}}{{english}}Per A.Y.{{/english}} =
2 +
1 1  {{include reference="Courses.Environment" excludeFirstHeading="true"/}}{{velocity}}
2 2  #set( $courseMenu = true )
3 3  #set( $currentCourseDoc = "" )
... ... @@ -7,10 +7,6 @@
7 7  #set( $firstYearPar = $context.getRequest().getParameter("from") )
8 8  #set( $lastYearPar = $context.getRequest().getParameter("to") )
9 9  ## who
10 -#set( $oneUser = false )
11 -#set( $oneProfessor = false )
12 -#set( $oneTutor = false )
13 -##
14 14  #set( $userNamePar = $context.getRequest().getParameter("user") )
15 15  #set( $professorNamePar = $context.getRequest().getParameter("professor") )
16 16  #set( $tutorNamePar = $context.getRequest().getParameter("tutor") )
... ... @@ -20,18 +20,16 @@
20 20   #set( $userdoc = $xwiki.getDocument($userName) )
21 21   #set( $userFirstName = $userdoc.display("first_name") )
22 22   #set( $userLastName = $userdoc.display("last_name") )
23 - #set( $oneUser = true )
24 24  #elseif ( $userNamePar )
25 25  ## from the URL, "user=UserName" parameter
26 - #if( $userNamePar.contains("XWiki.") )
27 - #set( $userName = $userNamePar )
28 - #else
29 - #set( $userName = "XWiki.$userNamePar" )
30 - #end
23 + #set( $userName = "XWiki.$userNamePar" )
31 31   #set( $userdoc = $xwiki.getDocument($userName) )
32 32   #set( $userFirstName = $userdoc.display("first_name") )
33 33   #set( $userLastName = $userdoc.display("last_name") )
34 - #set( $oneUser = true )
27 +#else
28 + #set( $userName = "" )
29 + #set( $userFirstName = "" )
30 + #set( $userLastName = "" )
35 35  #end
36 36  #if ( $professorName )
37 37  ## from a personal page, "XWiki.UserName" $professorName form
... ... @@ -38,18 +38,16 @@
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 )
42 42  #elseif ( $professorNamePar )
43 43  ## from the URL, "professor=UserName" parameter
44 - #if( $professorNamePar.contains("XWiki.") )
45 - #set( $professorName = $professorNamePar )
46 - #else
47 - #set( $professorName = "XWiki.$professorNamePar" )
48 - #end
39 + #set( $professorName = "XWiki.$professorNamePar" )
49 49   #set( $professordoc = $xwiki.getDocument($professorName) )
50 50   #set( $professorFirstName = $professordoc.display("first_name") )
51 51   #set( $professorLastName = $professordoc.display("last_name") )
52 - #set( $oneProfessor = true )
43 +#else
44 + #set( $professorName = "" )
45 + #set( $professorFirstName = "" )
46 + #set( $professorLastName = "" )
53 53  #end
54 54  #if ( $tutorName )
55 55  ## from a personal page, "XWiki.UserName" $tutorName form
... ... @@ -58,30 +58,19 @@
58 58   #set( $tutorLastName = $tutordoc.display("last_name") )
59 59  #elseif ( $tutorNamePar )
60 60  ## from the URL, "tutor=UserName" parameter
61 - #if( $tutorNamePar.contains("XWiki.") )
62 - #set( $tutorName = $tutorNamePar )
63 - #else
64 - #set( $tutorName = "XWiki.$tutorNamePar" )
65 - #end
55 + #set( $tutorName = "XWiki.$tutorNamePar" )
66 66   #set( $tutordoc = $xwiki.getDocument($tutorName) )
67 67   #set( $tutorFirstName = $tutordoc.display("first_name") )
68 68   #set( $tutorLastName = $tutordoc.display("last_name") )
69 - #set( $oneTutor = true )
59 +#else
60 + #set( $tutorName = "" )
61 + #set( $tutorFirstName = "" )
62 + #set( $tutorLastName = "" )
70 70  #end
71 -## who, in the end
72 -#if( $oneUser )
73 -## user takes precedence over both professor and tutor and gets them all
74 - #set( $oneProfessor = false )
75 - #set( $oneTutor = false )
76 -#elseif( $oneProfessor )
77 77  ## professor takes precedence over tutor
78 - #set( $oneUser = false )
79 - #set( $oneTutor = false )
80 -#elseif( $oneTutor )
81 -## just tutor
82 - #set( $oneUser = false )
83 - #set( $oneProfessor = false )
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
... ... @@ -134,7 +134,7 @@
134 134  ##
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 '%$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 ")
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 ")
138 138   #set( $courseFound = $xwiki.searchDocuments($sql) )
139 139   #set( $courseYearNo = $courseFound.size() )
140 140   #if( $$courseYearNo >0 )
... ... @@ -145,7 +145,7 @@
145 145  ### output results
146 146  ## page subtitle
147 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 )$year#{else}${firstYear}–${lastYear}#{end}#if( $oneUser ) / $userFirstName $userLastName#{elseif}( $oneProfessor ) / $professorFirstName $professorLastName#{elseif}( $oneTutor ) / $tutorFirstName $tutorLastName (tutor)#{end}(%%)
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}
149 149  ##
150 150  ## stop if no course are found
151 151  #if( $courseNo == 0 || $courseMap.keySet().size() == 0 )
... ... @@ -161,18 +161,14 @@
161 161  #end
162 162  ## courses displayed per academic year
163 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']]
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']]
165 165  (% style="border-style:hidden hidden hidden hidden; font-style:normal" %)
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
149 +#foreach( $course in $courseMap[$yearr] )
150 +* {{courseName}}$course{{/courseName}}
172 172   #end
173 173  (%%)
174 174   #set( $courseYearNo = $courseMap[$yearr].size() )
175 -(% 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"]]
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"]]
176 176  #end
177 177  {{/velocity}}
178 178  {{id name="bottom"/}}