Changes for page Per A.Y.

From version 45.3
edited by Andrea Omicini
on 08/02/2023 00:13
Change comment: There is no comment for this version
To version 45.21
edited by Andrea Omicini
on 08/02/2023 04:37
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -9,6 +9,10 @@
9 9  #set( $firstYearPar = $context.getRequest().getParameter("from") )
10 10  #set( $lastYearPar = $context.getRequest().getParameter("to") )
11 11  ## who
12 +#set( $oneUser = false )
13 +#set( $oneProfessor = false )
14 +#set( $oneTutor = false )
15 +##
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,16 +18,18 @@
18 18   #set( $userdoc = $xwiki.getDocument($userName) )
19 19   #set( $userFirstName = $userdoc.display("first_name") )
20 20   #set( $userLastName = $userdoc.display("last_name") )
25 + #set( $oneUser = true )
21 21  #elseif ( $userNamePar )
22 22  ## from the URL, "user=UserName" parameter
23 - #set( $userName = "XWiki.$userNamePar" )
28 + #if( $userNamePar.contains("XWiki.") )
29 + #set( $userName = $userNamePar )
30 + #else
31 + #set( $userName = "XWiki.$userNamePar" )
32 + #end
24 24   #set( $userdoc = $xwiki.getDocument($userName) )
25 25   #set( $userFirstName = $userdoc.display("first_name") )
26 26   #set( $userLastName = $userdoc.display("last_name") )
27 -#else
28 - #set( $userName = "" )
29 - #set( $userFirstName = "" )
30 - #set( $userLastName = "" )
36 + #set( $oneUser = true )
31 31  #end
32 32  #if ( $professorName )
33 33  ## from a personal page, "XWiki.UserName" $professorName form
... ... @@ -34,16 +34,18 @@
34 34   #set( $professordoc = $xwiki.getDocument($professorName) )
35 35   #set( $professorFirstName = $professordoc.display("first_name") )
36 36   #set( $professorLastName = $professordoc.display("last_name") )
43 + #set( $oneProfessor = true )
37 37  #elseif ( $professorNamePar )
38 38  ## from the URL, "professor=UserName" parameter
39 - #set( $professorName = "XWiki.$professorNamePar" )
46 + #if( $professorNamePar.contains("XWiki.") )
47 + #set( $professorName = $professorNamePar )
48 + #else
49 + #set( $professorName = "XWiki.$professorNamePar" )
50 + #end
40 40   #set( $professordoc = $xwiki.getDocument($professorName) )
41 41   #set( $professorFirstName = $professordoc.display("first_name") )
42 42   #set( $professorLastName = $professordoc.display("last_name") )
43 -#else
44 - #set( $professorName = "" )
45 - #set( $professorFirstName = "" )
46 - #set( $professorLastName = "" )
54 + #set( $oneProfessor = true )
47 47  #end
48 48  #if ( $tutorName )
49 49  ## from a personal page, "XWiki.UserName" $tutorName form
... ... @@ -52,19 +52,30 @@
52 52   #set( $tutorLastName = $tutordoc.display("last_name") )
53 53  #elseif ( $tutorNamePar )
54 54  ## from the URL, "tutor=UserName" parameter
55 - #set( $tutorName = "XWiki.$tutorNamePar" )
63 + #if( $tutorNamePar.contains("XWiki.") )
64 + #set( $tutorName = $tutorNamePar )
65 + #else
66 + #set( $tutorName = "XWiki.$tutorNamePar" )
67 + #end
56 56   #set( $tutordoc = $xwiki.getDocument($tutorName) )
57 57   #set( $tutorFirstName = $tutordoc.display("first_name") )
58 58   #set( $tutorLastName = $tutordoc.display("last_name") )
59 -#else
60 - #set( $tutorName = "" )
61 - #set( $tutorFirstName = "" )
62 - #set( $tutorLastName = "" )
71 + #set( $oneTutor = true )
63 63  #end
64 -## professor takes precedence over tutor
65 -#if( $professorName != "" )#set( $tutorName = "" )#end
73 +## who, in the end
74 +#if( $oneUser )
66 66  ## user takes precedence over both professor and tutor and gets them all
67 -#if( $userName != "" )#set( $professorName = $userName )#set( $tutorName = $userName )#end
76 + #set( $oneProfessor = false )
77 + #set( $oneTutor = false )
78 +#elseif( $oneProfessor )
79 +## professor takes precedence over tutor
80 + #set( $oneUser = false )
81 + #set( $oneTutor = false )
82 +#elseif( $oneTutor )
83 +## just tutor
84 + #set( $oneUser = false )
85 + #set( $oneProfessor = false )
86 +#end
68 68  ##
69 69  #if( $firstYearCou )#set( $firstYear = $firstYearCou )#end
70 70  #if( $lastYearCou )#set( $lastYear = $lastYearCou )#end
... ... @@ -117,7 +117,7 @@
117 117  ##
118 118  #foreach( $yearr in $yearList)#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 )
119 119   #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, StringProperty as prop4
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 ")
139 + 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 ")
121 121   #set( $courseFound = $xwiki.searchDocuments($sql) )
122 122   #set( $courseYearNo = $courseFound.size() )
123 123   #if( $$courseYearNo >0 )
... ... @@ -128,7 +128,7 @@
128 128  ### output results
129 129  ## page subtitle
130 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}
150 +>(%%)$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}(%%)
132 132  ##
133 133  ## stop if no course are found
134 134  #if( $courseNo == 0 || $courseMap.keySet().size() == 0 )
... ... @@ -144,14 +144,18 @@
144 144  #end
145 145  ## courses displayed per academic year
146 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']]
166 +(% 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']]
148 148  (% style="border-style:hidden hidden hidden hidden; font-style:normal" %)
149 -#foreach( $course in $courseMap[$yearr] )
150 -* {{courseName}}$course{{/courseName}}
168 + #foreach( $course in $courseMap[$yearr] )
169 + #if( $oneUser || $oneProfessor || $oneTutor )
170 +* {{courseName}}$course{{/courseName}} (% style="font-style:normal; font-size:normal; color:$theme.textSecondaryColor" %)({{courseCycle}}$course{{/courseCycle}}, {{courseAY}}$course{{/courseAY}})(%%)
171 + #else
172 +* {{course linked="title"}}$course{{/course}}
173 + #end
151 151   #end
152 152  (%%)
153 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"]]
177 +(% 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"]]
155 155  #end
156 156  {{/velocity}}
157 157  {{id name="bottom"/}}