Changes for page Per Year

From version 67.1
edited by Andrea Omicini
on 25/10/2021 22:39
Change comment: There is no comment for this version
To version 77.1
edited by Andrea Omicini
on 29/10/2021 15:36
Change comment: There is no comment for this version

Summary

Details

Page properties
Title
... ... @@ -1,1 +1,1 @@
1 -Theses per Status
1 +#if($xcontext.language=='it')Tesi per anno#{else}Theses per Year#end
Content
... ... @@ -1,14 +1,38 @@
1 1  {{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 2  #set( $thesisMenu = true )
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 )
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 + #set( $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
11 11  #end
31 +$oneYear
32 +$firstYear
33 +$lastYear
34 +$yearList
35 +#stop
12 12  ##check velocity variable, takes precedence
13 13  #if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
14 14   #set( $oneStatus = true )
... ... @@ -64,7 +64,7 @@
64 64  ## if $oneUser is false, $oneRole means nothing -- so all users, all roles / just status
65 65  ##
66 66  ## title
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'/}}
91 +>#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'/}}
68 68  ## index
69 69  #if( !$oneStatus )
70 70  (% 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)))
... ... @@ -86,11 +86,11 @@
86 86   #set( $thesisStatusRoleNo = 0 )
87 87   #if( !$oneRole || $selectedRole == $role )
88 88   #if( $role == "contact" )
89 - #set( $selectedRoleFieldName = "contact" )
113 + #set( $selectedRoleFieldName = "contacts" )
90 90   #elseif( $role == "cosupervisor" )
91 - #set( $selectedRoleFieldName = "coSupervisors" )
115 + #set( $selectedRoleFieldName = "cosupervisors" )
92 92   #else
93 - #set( $selectedRoleFieldName = "supervisor" )
117 + #set( $selectedRoleFieldName = "supervisors" )
94 94   #end
95 95  ## some selected role or all roles / now $role
96 96   #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
... ... @@ -104,7 +104,7 @@
104 104   #foreach( $thesis in $thesisFound )
105 105   #set($thesisDoc = $xwiki.getDocument($thesis))
106 106   #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
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
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
108 108  
109 109   #end
110 110   #if( $thesisFoundNo > 0 && !$oneRole )
... ... @@ -123,7 +123,7 @@
123 123   #foreach( $thesis in $thesisFound )
124 124   #set($thesisDoc = $xwiki.getDocument($thesis))
125 125   #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
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
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
127 127  
128 128   #end
129 129   #end