Changes for page Per Year

From version 96.3
edited by Andrea Omicini
on 30/10/2021 16:14
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,48 +1,36 @@
1 1  {{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 2  #set( $thesisMenu = true )
3 -#set( $oneYear = false )
4 -#set( $selectedYear = '' )
5 -### START YEAR
6 -## year parameter
7 -#set( $yearPar = $mathtool.toInteger($request.year) )
8 -#set( $fromPar = $mathtool.toInteger($request.from) )
9 -#set( $toPar = $mathtool.toInteger($request.to) )
10 -#set( $firstYear = $mathtool.toInteger($firstYearTh) )
11 -#set( $lastYear = $mathtool.toInteger($lastYearTh) )
12 -#set( $yearList = [$lastYear..$firstYear] )
13 -#if( $yearPar > 0 )
14 - #set( $oneYear = true )
15 - #set( $firstYear = $yearPar )
16 - #set( $lastYear = $yearPar )
17 - #set( $selectedYear = $yearPar )
18 - #set( $yearList = [$yearPar] )
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 )
11 +#end
12 +##check velocity variable, takes precedence
13 +#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
14 + #set( $oneStatus = true )
15 + #set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
16 +#end
17 +## set ordering field
18 +#if( $selectedStatus == "available" )
19 + #set( $orderingDateFieldName = "availabilityDate" )
20 +#elseif( $selectedStatus == "ongoing" )
21 + #set( $orderingDateFieldName = "startDate" )
19 19  #else
20 - #if( $fromPar != '' && ($fromPar > $firstYear) )
21 - #set( $firstYear = $fromPar )
22 - #set( $yearList = [$lastYear..$firstYear] )
23 - #end
24 - #if( $toPar != '' && ($toPar < $lastYear) )
25 - #set( $lastYear = $toPar )
26 - #set( $yearList = [$lastYear..$firstYear] )
27 - #end
28 - #if( $lastYear <= $firstYear )
29 - #set( $oneYear = true )
30 - #set( $lastYear = $firstYear )
31 - #set( $selectedYear = $firstYear )
32 - #set( $yearList = [$firstYear] )
33 - #else
34 - #set( $yearList = [$lastYear..$firstYear] )
35 - #end
23 +## default for no selected status, too
24 + #set( $orderingDateFieldName = "endDate" )
36 36  #end
37 -$oneYear
38 -$yearList
39 -### END YEAR
26 +## invariant: $oneStatus set, $selectedStatus & $orderingDateFieldName set accordingly
27 +### END STATUS
40 40  ##
41 -### START USER & CYCLE
29 +### START USER & ROLE
42 42  #set( $userNamePar = $request.user.trim() )
43 43  ## default values
44 44  #set( $oneUser = false )
45 -#set( $oneCycle = false )
33 +#set( $oneRole = false )
46 46  #set( $userFirstName = "" )
47 47  #set( $userLastName = "" )
48 48  #if( $userName || $userNamePar )
... ... @@ -62,48 +62,47 @@
62 62   #stop
63 63   #end
64 64  ##user selected and existing user page
65 - #set( $cyclePar = $request.cycle.trim().toUpperCase() )
66 - #set( $selectedCycle = '' )
67 - #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
68 - #set( $oneCycle = true )
69 - #set( $selectedCycle = $cyclePar )
53 + #set( $rolePar = $request.role.trim().toLowerCase() )
54 + #set( $selectedRole = '' )
55 + #if( $rolePar != '' && $allThesisRoles.contains($rolePar) )
56 + #set( $oneRole = true )
57 + #set( $selectedRole = $rolePar )
70 70   #end
71 71  #end
72 -## $oneUser and $oneCycle set properly
73 -$oneUser
74 -$oneCycle
75 -### END USER & CYCLE
60 +## $oneUser and $oneRole set properly, other related variables set accordingly
61 +## $oneRole has meaning only if $oneUser
62 +## if $oneUser, $oneRole false means one user for all roles
63 +## if $oneUser, $oneRole true means one specific role for one user selected
64 +## if $oneUser is false, $oneRole means nothing -- so all users, all roles / just status
76 76  ##
77 77  ## title
78 ->#if( $oneRole ){{thesisCycle short='no'}}$selecteCycle{{/thesisCycle}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end / #if( $oneYear )$selectedYear#else$firstYear–$lastYear#end#if( $oneUser ) / $userFirstName **$userLastName**#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 ) / {{thesisRole short='yes'}}$selectedRole{{/thesisRole}}#end{{id name='top'/}}
79 79  ## index
80 -#if( !$oneYear )
81 -(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $year in $yearList )#if ($velocityCount > 1) | #end[[$year>>||anchor="$year"]]#end)))
82 -###elseif( $oneUser && !$oneCycle )
83 -#elseif( !$oneCycle )
84 -(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $cycle in $allThesisCycles )#if ($velocityCount > 1) | #end [[{{thesisCycle}}$cycle{{/thesisCycle}}>>||anchor="$cycle"]]#end)))
69 +#if( !$oneStatus )
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)))
71 +#elseif( $oneUser && !$oneRole )
72 +(% style="font-size: smaller; padding:1em 1.5em 0.25em 1.5em; background-color:$theme.highlightColor" %)(((#foreach( $role in $allThesisRoles )#if ($velocityCount > 1) | #end [[{{thesisRole}}$role{{/thesisRole}}>>||anchor="$role"]]#end)))
85 85  #end{{id name='index'/}}
86 -
87 -#stop
88 -
89 89  ## search theses
90 90  #set( $thesisNo = 0 )
91 -#foreach( $year in $yearList )
92 - #if( !$oneYear || $selectedYear == $year )
93 - #set( $thesisYearNo = 0 )
94 - #if( !$oneYear )
95 -(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year
76 +#foreach( $status in $allThesisStatuses )
77 + #if( !$oneStatus || $selectedStatus == $status )
78 + #set( $thesisStatusNo = 0 )
79 + #if( !$oneStatus )
80 +(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$status'/}}{{thesisStatus plural='true' uppercase='true' short='true'}}$status{{/thesisStatus}}
96 96   #end
97 -## some selected year or year list / now $year
98 - #foreach( $cycle in $allThesisCycles )
99 - #set( $thesisYearCycleNo = 0 )
100 - #if( !$oneCycle || $selectedCycle == $cycle )
82 +## some selected status or all statuses / now $status
83 + #if( $oneUser )
84 +## some user selected
85 + #foreach( $role in $allThesisRoles )
86 + #set( $thesisStatusRoleNo = 0 )
87 + #if( !$oneRole || $selectedRole == $role )
101 101   #if( $role == "contact" )
102 - #set( $selectedRoleFieldName = "contacts" )
89 + #set( $selectedRoleFieldName = "contact" )
103 103   #elseif( $role == "cosupervisor" )
104 - #set( $selectedRoleFieldName = "cosupervisors" )
91 + #set( $selectedRoleFieldName = "coSupervisors" )
105 105   #else
106 - #set( $selectedRoleFieldName = "supervisors" )
93 + #set( $selectedRoleFieldName = "supervisor" )
107 107   #end
108 108  ## some selected role or all roles / now $role
109 109   #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
... ... @@ -117,7 +117,7 @@
117 117   #foreach( $thesis in $thesisFound )
118 118   #set($thesisDoc = $xwiki.getDocument($thesis))
119 119   #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
120 -* [[$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
121 121  
122 122   #end
123 123   #if( $thesisFoundNo > 0 && !$oneRole )
... ... @@ -136,7 +136,7 @@
136 136   #foreach( $thesis in $thesisFound )
137 137   #set($thesisDoc = $xwiki.getDocument($thesis))
138 138   #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
139 -* [[$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
140 140  
141 141   #end
142 142   #end