Changes for page Per Year

From version 84.1
edited by Andrea Omicini
on 29/10/2021 15:47
Change comment: There is no comment for this version
To version 64.1
edited by Andrea Omicini
on 25/10/2021 22:34
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,36 +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) )$firstYear
10 -#set( $lastYear = $mathtool.toInteger($lastYearTh) )$lastYear
11 -#set( $yearList = [$lastYear..$firstYear] )
12 -#if( $yearPar > 0 )ONE YEAR
13 - #set( $oneYear = true )
14 - #set( $firstYear = $yearPar )
15 - #set( $lastYear = $toPar )
16 - #set( $yearList = [$lastYear..$firstYear] )$yearList
17 -#else
18 - #if( $fromPar != '' && $fromPar > $firstYear )
19 - #set( $firstYear = $fromPar )
20 - #set( $yearList = [$lastYear..$firstYear] )
21 - #end
22 - #if( $toPar != '' && $toPar > $lastYear)
23 - #set( $lastYear = $toPar )
24 - #set( $yearList = [$lastYear..$firstYear] )
25 - #end
26 - #if( $lastYear <= $firstYear )
27 - #set( $oneYear = true )
28 - #set( $selectedYear = $firstYear )
29 - #else
30 - #set( $yearList = [$lastYear..$firstYear] )
31 - #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 )
32 32  #end
33 -#stop
34 34  ##check velocity variable, takes precedence
35 35  #if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
36 36   #set( $oneStatus = true )
... ... @@ -86,7 +86,7 @@
86 86  ## if $oneUser is false, $oneRole means nothing -- so all users, all roles / just status
87 87  ##
88 88  ## title
89 ->#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'/}}
90 90  ## index
91 91  #if( !$oneStatus )
92 92  (% 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)))
... ... @@ -108,11 +108,11 @@
108 108   #set( $thesisStatusRoleNo = 0 )
109 109   #if( !$oneRole || $selectedRole == $role )
110 110   #if( $role == "contact" )
111 - #set( $selectedRoleFieldName = "contacts" )
89 + #set( $selectedRoleFieldName = "contact" )
112 112   #elseif( $role == "cosupervisor" )
113 - #set( $selectedRoleFieldName = "cosupervisors" )
91 + #set( $selectedRoleFieldName = "coSupervisors" )
114 114   #else
115 - #set( $selectedRoleFieldName = "supervisors" )
93 + #set( $selectedRoleFieldName = "supervisor" )
116 116   #end
117 117  ## some selected role or all roles / now $role
118 118   #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
... ... @@ -124,10 +124,7 @@
124 124  (% style="border-style:#if( $oneStatus )solid hidden hidden solid#{else}hidden hidden hidden dotted#end; border-color:$theme.borderColor; text-align:left; font-style:oblique; font-size:smaller" %)|#if( $oneStatus ){{id name='$role'/}}#else{{id name='$status-$role'/}}#end{{thesisRole plural='no' uppercase='yes' short='yes'}}$role{{/thesisRole}}
125 125   #end
126 126   #foreach( $thesis in $thesisFound )
127 - #set($thesisDoc = $xwiki.getDocument($thesis))
128 - #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
129 -* [[$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
130 -
105 +* $thesis
131 131   #end
132 132   #if( $thesisFoundNo > 0 && !$oneRole )
133 133  (% style="border-style:#if( $oneStatus )hidden solid solid hidden#{else}hidden dotted hidden hidden#end; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-weight:normal; font-size:smaller; color:$theme.textSecondaryColor" %)|#if( $oneStatus ){{id name='$role-bottom'/}}#else{{id name='$role-$status-bottom'/}}#end($thesisStatusRoleNo #if( $thesisStatusRoleNo == 1 ){{thesisStatus plural='no' uppercase='no' short='no'}}$status{{/thesisStatus}}#else{{thesisStatus plural='yes' uppercase='no' short='no'}}$status{{/thesisStatus}}#end {{stringEngIta eng='as' ita='come'/}} {{thesisRole short='yes'}}$role{{/thesisRole}}) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
... ... @@ -143,10 +143,7 @@
143 143   #set( $thesisFoundNo = $thesisFound.size() )
144 144   #set( $thesisStatusNo = $thesisStatusNo + $thesisFoundNo )
145 145   #foreach( $thesis in $thesisFound )
146 - #set($thesisDoc = $xwiki.getDocument($thesis))
147 - #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
148 -* [[$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
149 -
121 +* $thesis
150 150   #end
151 151   #end
152 152   #if( !$oneStatus )
... ... @@ -153,6 +153,12 @@
153 153  (% style="border-style:hidden solid solid hidden; border-color:$theme.borderColor; text-align:right; font-style:oblique; font-weight:normal; font-size:smaller; color:$theme.textSecondaryColor" %)|($thesisStatusNo #if($thesisStatusNo == 1){{thesisStatus plural='false' uppercase='false' short='no'}}$status{{/thesisStatus}}#else{{thesisStatus plural='true' uppercase='false' short='no'}}$status{{/thesisStatus}}#end{{id name='$status-bottom'/}}) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
154 154   #end
155 155   #end
128 +##
129 +## #set( $thesisFound = $xwiki.searchDocuments($sql) )
130 +## #set($thesisDoc = $xwiki.getDocument($thesis))
131 +## #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
132 +##* [[$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
133 +## #end
156 156  #end
157 157  {{id name='bottom'/}}
158 158  {{/velocity}}