Changes for page Per Year

From version 17.4
edited by Andrea Omicini
on 25/10/2021 16:33
Change comment: There is no comment for this version
To version 12.11
edited by Andrea Omicini
on 23/06/2021 01:26
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,0 @@
1 -Theses per Status
Content
... ... @@ -1,35 +1,12 @@
1 -{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 -#set( $thesisMenu = true )
3 -#### get parameters
4 -## hypothesis: $thesisStatus set, default "Completed"
5 -## status parameter
6 -#set( $statusPar = $request.status.trim().toLowerCase() )
7 -#if( $statusPar != '' && $allThesisStatuses.contains($statusPar) )
8 - #set( $selectedStatus = $statusPar )
9 -#else
10 - #set( $selectedStatus = 'all' )
11 -#end
12 -##check velocity variable, takes precedence
13 -#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
14 - #set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
15 -#end
16 -## set ordering field
17 -#if( $selectedStatus == "available" )
18 - #set( $orderingDateFieldName = "availabilityDate" )
19 -#elseif( $selectedStatus == "ongoing" )
20 - #set( $orderingDateFieldName = "startDate" )
21 -#else
22 - #set( $orderingDateFieldName = "endDate" )
23 -#end
24 -## invariant: $thesisStatus set, $orderingDateFieldName set correspondingly
1 +{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}{{html clean="false" wiki="true"}}#### get parameters
25 25  ## who
26 -#set( $userNamePar = $request.user )
27 -#set( $supervisorNamePar = $request.supervisor )
28 -#set( $cosupervisorNamePar = $request.cosupervisor )
29 -#set( $contactNamePar = $request.contact )
3 +#set( $userNamePar = $context.getRequest().getParameter("user") )
4 +#set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
5 +#set( $cosupervisorNamePar = $context.getRequest().getParameter("cosupervisor") )
6 +#set( $contactNamePar = $context.getRequest().getParameter("contact") )
30 30  #### set default values
31 31  #set( $userSelected = false )
32 -#set( $roleSelected = false )
9 +#set( $roleSelected = false )
33 33  #set( $userFirstName = "" )
34 34  #set( $userLastName = "" )
35 35  #set( $supervisorName = "" )
... ... @@ -72,7 +72,7 @@
72 72   #end
73 73  #end
74 74  #if( $supervisor )
75 - #set( $roleSelected = true )
52 + #set( $roleSelected = true )
76 76   #set( $supervisorName = $userName )
77 77   #set( $supervisordoc = $xwiki.getDocument($supervisorName) )
78 78   #set( $supervisorFirstName = $supervisordoc.display("first_name") )
... ... @@ -93,47 +93,81 @@
93 93   #set( $contactLastName = $contactdoc.display("last_name") )
94 94  #end
95 95  ##
96 -## $userSelected true and $roleSelected false means one user for all roles
73 +## $userSelected true means one user for all roles
97 97  ## $userSelected true and $roleSelected true for one user with one specific role
98 98  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
99 99  ## both false means all theses
100 -#if( $userSelected )
101 - #if( $roleSelected )
102 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName / #if( $supervisor ){{stringEngIta eng="Supervisor" ita="Relatore"/}}#end#if( $cosupervisor ){{stringEngIta eng="Co-supervisor" ita="Correlatore"/}}#end#if( $contact ){{stringEngIta eng="Contact" ita="Contatto"/}}#end
77 +##
78 +== #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi")#if( $thesisStatus ) / #ThesisStatusesString($thesisStatus)#end ==
79 +##
80 +#if( $roleSelected )
81 + #if( $userSelected )
82 + #if( $supervisor )
103 103  
84 +> {{stringEngIta eng="as a supervisor" ita="come relatore"/}}
85 + #end
86 + #if( $cosupervisor )
87 +
88 +> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}}
89 + #end
90 + #if( $contact )
91 +
92 +> {{stringEngIta eng="as a contact" ita="come contatto"/}}
93 + #end
104 104   #else
105 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName
95 + #if( $supervisorLastName != "" )
106 106  
107 - #end
108 -#else
109 - #if( $roleSelected )
110 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}}#if( $supervisorLastName != "" ) / $supervisorFirstName $supervisorLastName //({{stringEngIta eng="supervisor" ita="relatore"/}})//#end#if( $cosupervisorLastName != "" ) / $cosupervisorFirstName $cosupervisorLastName //({{stringEngIta eng="co-supervisor" ita="correlatore"/}})//#end#if( $contactLastName != "" ) / $contactFirstName $contactLastName //({{stringEngIta eng="Contact" ita="Contatto"/}})//#end
97 +> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
98 + #end
99 + #if( $cosupervisorLastName != "" )
111 111  
112 - #else
113 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}}
101 +> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
102 + #end
103 + #if( $contactLastName != "" )
114 114  
105 +> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
106 + #end
115 115   #end
116 116  #end
117 117  ##
118 -#if( $cosupervisor )
119 - #set( $roleSelectedFieldName = "coSupervisors" )
120 -#elseif( $contact )
121 - #set( $roleSelectedFieldName = "contact" )
110 +## hypothesis: $thesisStatus set, default "Completed"
111 +## to do: get from parameter
112 +#if ($thesisStatus == "Available")
113 + #set ($orderingDateFieldName = "availabilityDate")
114 +#elseif ($thesisStatus == "Ongoing")
115 + #set ($orderingDateFieldName = "startDate")
122 122  #else
123 - #set( $roleSelectedFieldName = "supervisor" )
117 + #set ($thesisStatus = "Completed")
118 + #set ($orderingDateFieldName = "endDate")
124 124  #end
125 -##
126 -#if( $selectedStatus == 'all' )
127 - ALL STATUSES
120 +##
121 +#if ( $cosupervisor )
122 + #set ( $roleSelectedFieldName = "coSupervisors" )
123 +#elseif ( $contact )
124 + #set ( $roleSelectedFieldName = "contact" )
128 128  #else
129 - #if( $userSelected )
130 - #if( $roleSelected )
131 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
132 - where obj.name = doc.fullName and obj.className='Theses.ThesisClass' and obj.name<>'Theses.ThesisClassTemplate' and obj.name <> 'Theses.ThesisTemplate' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop2.id.id = obj.id and prop0.name = 'status' and prop1.name = '$roleSelectedFieldName' and prop2.name = '$orderingDateFieldName' and prop0.value = '$thesisStatus' and prop1.value like '%$userName%' order by prop2.value desc" )
126 + #set ( $roleSelectedFieldName = "supervisor" )
127 +#end
128 +##
129 +#if ($userSelected)
130 + #if ( $roleSelected )
131 + #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2
132 + where obj.name=doc.fullName and
133 + obj.className='Theses.ThesisClass' and
134 + obj.name<>'Theses.ThesisClassTemplate' and
135 + prop.id.id=obj.id and
136 + prop1.id.id=obj.id and
137 + prop2.id.id=obj.id and
138 + prop.name='status' and
139 + prop.value='$thesisStatus' and
140 + prop1.name='$roleSelectedFieldName' and
141 + prop2.name='$orderingDateFieldName' and
142 + prop1.value like '%$userName%'
143 + order by prop2.value desc")
133 133   #else
134 134   #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
135 135   where obj.name=doc.fullName and
136 - obj.className='Theses.ThesisClass' and
147 + obj.className='Theses.ThesisClass' and
137 137   obj.name<>'Theses.ThesisClassTemplate' and
138 138   prop.id.id=obj.id and
139 139   prop1.id.id=obj.id and
... ... @@ -186,7 +186,7 @@
186 186  #set($thesisFound = $xwiki.searchDocuments($sql))
187 187  ##
188 188  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
189 -* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" || ( $thesisDoc.getValue("studentFirstName") != "" && $thesisDoc.getValue("studentLastName") != "" ) ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
200 +* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
190 190  
191 191  #end
192 -{{/velocity}}
203 +{{/html}}{{/velocity}}