Changes for page Per Year

From version 70.1
edited by Andrea Omicini
on 29/10/2021 15:21
Change comment: There is no comment for this version
To version 65.1
edited by Andrea Omicini
on 25/10/2021 22:36
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,41 +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 = $firstYearTh )
10 -#set( $lastYear = $lastYearTh )
11 -#set( $yearList = [$lastYear..$firstYear] )
12 -#if( $yearPar != '' )
13 - #set( $oneYear = true )
14 - #set( $selectedYear = $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 -$selectedYear
33 -$firstYear
34 -$lastYear
35 -$yearList
36 -#stop
37 -
38 -STOP
39 39  ##check velocity variable, takes precedence
40 40  #if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
41 41   #set( $oneStatus = true )
... ... @@ -91,7 +91,7 @@
91 91  ## if $oneUser is false, $oneRole means nothing -- so all users, all roles / just status
92 92  ##
93 93  ## title
94 ->#if( $oneStatus ){{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end#if( $oneUser ) / $userFirstName **$userLastName**#end#if( $oneRole ) / {{thesisRole short='yes'}}$selectedRole{{/thesisRole}}#end{{id name='top'/}}
67 +>#if( $oneStatus ){{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end#if( $oneUser ) / $userFirstName **$userLastName**#end#if( $oneRole ) / $selectedRole#end{{id name='top'/}}
95 95  ## index
96 96  #if( !$oneStatus )
97 97  (% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $status in $allThesisStatuses )#if ($velocityCount > 1) | #end[[{{thesisStatus plural="true" uppercase="false"}}$status{{/thesisStatus}}>>||anchor="$status"]]#end)))
... ... @@ -113,11 +113,11 @@
113 113   #set( $thesisStatusRoleNo = 0 )
114 114   #if( !$oneRole || $selectedRole == $role )
115 115   #if( $role == "contact" )
116 - #set( $selectedRoleFieldName = "contacts" )
89 + #set( $selectedRoleFieldName = "contact" )
117 117   #elseif( $role == "cosupervisor" )
118 - #set( $selectedRoleFieldName = "cosupervisors" )
91 + #set( $selectedRoleFieldName = "coSupervisors" )
119 119   #else
120 - #set( $selectedRoleFieldName = "supervisors" )
93 + #set( $selectedRoleFieldName = "supervisor" )
121 121   #end
122 122  ## some selected role or all roles / now $role
123 123   #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
... ... @@ -131,7 +131,7 @@
131 131   #foreach( $thesis in $thesisFound )
132 132   #set($thesisDoc = $xwiki.getDocument($thesis))
133 133   #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
134 -* [[$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( $thesisDoc.getValue('studentUserName') != "" )//$thesisDoc.getValue('studentUserName')//#elseif( $thesisObj.studentFirstName != "" && $thesisObj.studentLastName != "" )//$thesisObj.studentFirstName $thesisObj.studentLastName//#end#if( $thesisObj.endDate != "" ) ($thesisObj.endDate)#end
135 135  
136 136   #end
137 137   #if( $thesisFoundNo > 0 && !$oneRole )
... ... @@ -150,7 +150,7 @@
150 150   #foreach( $thesis in $thesisFound )
151 151   #set($thesisDoc = $xwiki.getDocument($thesis))
152 152   #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
153 -* [[$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( $thesisDoc.getValue('studentUserName') != "" )//$thesisDoc.getValue('studentUserName')//#elseif( $thesisObj.studentFirstName != "" && $thesisObj.studentLastName != "" )//$thesisObj.studentFirstName $thesisObj.studentLastName//#end#if( $thesisObj.endDate != "" ) ($thesisObj.endDate)#end
154 154  
155 155   #end
156 156   #end