Changes for page Per A.Y.

From version 45.7
edited by Andrea Omicini
on 08/02/2023 00:37
Change comment: There is no comment for this version
To version 45.9
edited by Andrea Omicini
on 08/02/2023 00:44
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,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") )
25 + #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 = "" )
36 + #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") )
43 + #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 = "" )
54 + #set( $oneProfessor = true )
55 55  #end
56 56  #if ( $tutorName )
57 57  ## from a personal page, "XWiki.UserName" $tutorName form
... ... @@ -65,35 +65,24 @@
65 65   #else
66 66   #set( $tutorName = "XWiki.$tutorNamePar" )
67 67   #end
68 - #set( $tutorName = "XWiki.$tutorNamePar" )
69 69   #set( $tutordoc = $xwiki.getDocument($tutorName) )
70 70   #set( $tutorFirstName = $tutordoc.display("first_name") )
71 71   #set( $tutorLastName = $tutordoc.display("last_name") )
72 -#else
73 - #set( $tutorName = "" )
74 - #set( $tutorFirstName = "" )
75 - #set( $tutorLastName = "" )
71 + #set( $oneTutor = true )
76 76  #end
77 77  ## who, in the end
78 -#set( $oneUser = false )
79 -#set( $oneProfessor = false )
80 -#set( $oneTutor = false )
81 -##
82 -#if( $userName != "" )
74 +#if( $oneUser )
83 83  ## user takes precedence over both professor and tutor and gets them all
84 - #set( $professorName = $userName )
85 - #set( $tutorName = $userName )
86 - #set( $oneUser = true )
87 -#elseif( $professorName != "" )
76 + #set( $oneProfessor = false )
77 + #set( $oneTutor = false )
78 +#elseif( $oneProfessor )
88 88  ## professor takes precedence over tutor
89 - #set( $tutorName = "@@" )
90 - #set( $userName = "@@" )
91 - #set( $oneProfessor = true )
92 -#elseif( $tutorName != "" )
80 + #set( $oneUser = false )
81 + #set( $oneTutor = false )
82 +#elseif( $oneTutor )
93 93  ## just tutor
94 - #set( $professorName = "@@" )
95 - #set( $userName = "@@" )
96 - #set( $oneTutor = true )
84 + #set( $oneUser = false )
85 + #set( $oneProfessor = false )
97 97  #end
98 98  ##
99 99  #if( $firstYearCou )#set( $firstYear = $firstYearCou )#end
... ... @@ -147,7 +147,7 @@
147 147  ##
148 148  #foreach( $yearr in $yearList)#set($yearr1 = $yearr + 1)#set($ayearr = $yearr + "/" + $yearr1 )
149 149   #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, StringProperty as prop4
150 - 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 ")
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 ")
151 151   #set( $courseFound = $xwiki.searchDocuments($sql) )
152 152   #set( $courseYearNo = $courseFound.size() )
153 153   #if( $$courseYearNo >0 )