Changes for page Per Year

From version 76.1
edited by Andrea Omicini
on 29/10/2021 15:35
Change comment: There is no comment for this version
To version 67.2
edited by Andrea Omicini
on 26/10/2021 12:54
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,1 @@
1 -#if($xcontext.language=='it')Tesi per anno#{else}Theses per Year#end
1 +Theses per Status
Content
... ... @@ -1,38 +1,14 @@
1 1  {{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 2  #set( $thesisMenu = true )
3 -#set( $oneYear = false )
4 -### START YEAR
5 -## year parameter
6 -#set( $yearPar = $mathtool.toInteger($request.year) )
7 -#set( $fromPar = $mathtool.toInteger($request.from) )
8 -#set( $toPar = $mathtool.toInteger($request.to) )
9 -#set( $firstYear = $mathtool.toInteger($firstYearTh) )
10 -#set( $lastYear = $mathtool.toInteger($lastYearTh) )
11 -#set( $yearList = [$lastYear..$firstYear] )
12 -#if( $yearPar != '' )
13 - #set( $oneYear = true )
14 - $yearList = [$yearPar]
15 -#else
16 - #if( $fromPar != '' && $yearList.contains($fromPar) )
17 - #set( $firstYear = $fromPar )
18 - #set( $yearList = [$lastYear..$firstYear] )
19 - #end
20 - #if( $toPar != '' && $yearList.contains($toPar) )
21 - #set( $lastYear = $toPar )
22 - #set( $yearList = [$lastYear..$firstYear] )
23 - #end
24 - #if( $lastYear <= $firstYear )
25 - #set( $oneYear = true )
26 - #set( $selectedYear = $firstYear )
27 - #else
28 - #set( $yearList = [$lastYear..$firstYear] )
29 - #end
3 +### START STATUS
4 +## hypothesis: $thesisStatus set, default "Completed"
5 +## status parameter
6 +#set( $statusPar = $request.status.trim().toLowerCase() )
7 +#set( $oneStatus = false )
8 +#if( $statusPar != '' && $allThesisStatuses.contains($statusPar) )
9 + #set( $oneStatus = true )
10 + #set( $selectedStatus = $statusPar )
30 30  #end
31 -$oneYear
32 -$firstYear
33 -$lastYear
34 -$yearList
35 -#stop
36 36  ##check velocity variable, takes precedence
37 37  #if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
38 38   #set( $oneStatus = true )
... ... @@ -110,11 +110,11 @@
110 110   #set( $thesisStatusRoleNo = 0 )
111 111   #if( !$oneRole || $selectedRole == $role )
112 112   #if( $role == "contact" )
113 - #set( $selectedRoleFieldName = "contacts" )
89 + #set( $selectedRoleFieldName = "contact" )
114 114   #elseif( $role == "cosupervisor" )
115 - #set( $selectedRoleFieldName = "cosupervisors" )
91 + #set( $selectedRoleFieldName = "coSupervisors" )
116 116   #else
117 - #set( $selectedRoleFieldName = "supervisors" )
93 + #set( $selectedRoleFieldName = "supervisor" )
118 118   #end
119 119  ## some selected role or all roles / now $role
120 120   #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
... ... @@ -128,7 +128,7 @@
128 128   #foreach( $thesis in $thesisFound )
129 129   #set($thesisDoc = $xwiki.getDocument($thesis))
130 130   #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
131 -* [[$thesisObj.title>>$thesisDoc]]#if( $thesisObj.endDate != "" ) //($thesisObj.endDate)//#end#if( $thesisDoc.getValue('studentUserName') != "" ) [[$xwiki.getUserName($thesisDoc.getValue('studentUserName'), false)>>$thesisDoc.getValue('studentUserName')]]#elseif( $thesisObj.studentFirstName != "" && $thesisObj.studentLastName != "" ) $thesisObj.studentFirstName $thesisObj.studentLastName#end
107 +* [[$thesisObj.title>>$thesisDoc]]#if( $thesisObj.endDate != "" ) ($thesisObj.endDate)#end#if( $thesisDoc.getValue('studentUserName') != "" ) $thesisDoc.getValue('studentUserName')#elseif( $thesisObj.studentFirstName != "" && $thesisObj.studentLastName != "" ) $thesisObj.studentFirstName $thesisObj.studentLastName#end
132 132  
133 133   #end
134 134   #if( $thesisFoundNo > 0 && !$oneRole )
... ... @@ -147,7 +147,7 @@
147 147   #foreach( $thesis in $thesisFound )
148 148   #set($thesisDoc = $xwiki.getDocument($thesis))
149 149   #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
150 -* [[$thesisObj.title>>$thesisDoc]]#if( $thesisObj.endDate != "" ) //($thesisObj.endDate)//#end#if( $thesisDoc.getValue('studentUserName') != "" ) [[$xwiki.getUserName($thesisDoc.getValue('studentUserName'), false)>>$thesisDoc.getValue('studentUserName')]]#elseif( $thesisObj.studentFirstName != "" && $thesisObj.studentLastName != "" ) $thesisObj.studentFirstName $thesisObj.studentLastName#end
126 +* [[$thesisObj.title>>$thesisDoc]]#if( $thesisObj.endDate != "" ) ($thesisObj.endDate)#end#if( $thesisDoc.getValue('studentUserName') != "" ) $thesisDoc.getValue('studentUserName')#elseif( $thesisObj.studentFirstName != "" && $thesisObj.studentLastName != "" ) $thesisObj.studentFirstName $thesisObj.studentLastName#end
151 151  
152 152   #end
153 153   #end