Changes for page Per A.Y.

From version 45.9
edited by Andrea Omicini
on 08/02/2023 00:44
Change comment: There is no comment for this version
To version 45.5
edited by Andrea Omicini
on 08/02/2023 00:15
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -9,10 +9,6 @@
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 -##
16 16  #set( $userNamePar = $context.getRequest().getParameter("user") )
17 17  #set( $professorNamePar = $context.getRequest().getParameter("professor") )
18 18  #set( $tutorNamePar = $context.getRequest().getParameter("tutor") )
... ... @@ -22,18 +22,16 @@
22 22   #set( $userdoc = $xwiki.getDocument($userName) )
23 23   #set( $userFirstName = $userdoc.display("first_name") )
24 24   #set( $userLastName = $userdoc.display("last_name") )
25 - #set( $oneUser = true )
26 26  #elseif ( $userNamePar )
27 27  ## from the URL, "user=UserName" parameter
28 - #if( $userNamePar.contains("XWiki.") )
29 - #set( $userName = $userNamePar )
30 - #else
31 - #set( $userName = "XWiki.$userNamePar" )
32 - #end
23 + #set( $userName = "XWiki.$userNamePar" )
33 33   #set( $userdoc = $xwiki.getDocument($userName) )
34 34   #set( $userFirstName = $userdoc.display("first_name") )
35 35   #set( $userLastName = $userdoc.display("last_name") )
36 - #set( $oneUser = true )
27 +#else
28 + #set( $userName = "" )
29 + #set( $userFirstName = "" )
30 + #set( $userLastName = "" )
37 37  #end
38 38  #if ( $professorName )
39 39  ## from a personal page, "XWiki.UserName" $professorName form
... ... @@ -40,18 +40,16 @@
40 40   #set( $professordoc = $xwiki.getDocument($professorName) )
41 41   #set( $professorFirstName = $professordoc.display("first_name") )
42 42   #set( $professorLastName = $professordoc.display("last_name") )
43 - #set( $oneProfessor = true )
44 44  #elseif ( $professorNamePar )
45 45  ## from the URL, "professor=UserName" parameter
46 - #if( $professorNamePar.contains("XWiki.") )
47 - #set( $professorName = $professorNamePar )
48 - #else
49 - #set( $professorName = "XWiki.$professorNamePar" )
50 - #end
39 + #set( $professorName = "XWiki.$professorNamePar" )
51 51   #set( $professordoc = $xwiki.getDocument($professorName) )
52 52   #set( $professorFirstName = $professordoc.display("first_name") )
53 53   #set( $professorLastName = $professordoc.display("last_name") )
54 - #set( $oneProfessor = true )
43 +#else
44 + #set( $professorName = "" )
45 + #set( $professorFirstName = "" )
46 + #set( $professorLastName = "" )
55 55  #end
56 56  #if ( $tutorName )
57 57  ## from a personal page, "XWiki.UserName" $tutorName form
... ... @@ -60,30 +60,19 @@
60 60   #set( $tutorLastName = $tutordoc.display("last_name") )
61 61  #elseif ( $tutorNamePar )
62 62  ## from the URL, "tutor=UserName" parameter
63 - #if( $tutorNamePar.contains("XWiki.") )
64 - #set( $tutorName = $tutorNamePar )
65 - #else
66 - #set( $tutorName = "XWiki.$tutorNamePar" )
67 - #end
55 + #set( $tutorName = "XWiki.$tutorNamePar" )
68 68   #set( $tutordoc = $xwiki.getDocument($tutorName) )
69 69   #set( $tutorFirstName = $tutordoc.display("first_name") )
70 70   #set( $tutorLastName = $tutordoc.display("last_name") )
71 - #set( $oneTutor = true )
59 +#else
60 + #set( $tutorName = "" )
61 + #set( $tutorFirstName = "" )
62 + #set( $tutorLastName = "" )
72 72  #end
73 -## who, in the end
74 -#if( $oneUser )
75 -## user takes precedence over both professor and tutor and gets them all
76 - #set( $oneProfessor = false )
77 - #set( $oneTutor = false )
78 -#elseif( $oneProfessor )
79 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
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
87 87  ##
88 88  #if( $firstYearCou )#set( $firstYear = $firstYearCou )#end
89 89  #if( $lastYearCou )#set( $lastYear = $lastYearCou )#end
... ... @@ -136,7 +136,7 @@
136 136  ##
137 137  #foreach( $yearr in $yearList)#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 )
138 138   #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, StringProperty as prop4
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 ")
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 ")
140 140   #set( $courseFound = $xwiki.searchDocuments($sql) )
141 141   #set( $courseYearNo = $courseFound.size() )
142 142   #if( $$courseYearNo >0 )
... ... @@ -147,7 +147,7 @@
147 147  ### output results
148 148  ## page subtitle
149 149  {{id name="top"/}}
150 ->(%%)$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}(%%)
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}(%%)
151 151  ##
152 152  ## stop if no course are found
153 153  #if( $courseNo == 0 || $courseMap.keySet().size() == 0 )
... ... @@ -163,7 +163,7 @@
163 163  #end
164 164  ## courses displayed per academic year
165 165  #foreach( $yearr in $courseMap.keySet() )#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 )
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']]
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']]
167 167  (% style="border-style:hidden hidden hidden hidden; font-style:normal" %)
168 168  #foreach( $course in $courseMap[$yearr] )
169 169  * {{courseName}}$course{{/courseName}}