Changes for page Per Year

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -6,20 +6,20 @@
6	6	#set( $yearPar = $mathtool.toInteger($request.year) )
7	7	#set( $fromPar = $mathtool.toInteger($request.from) )
8	8	#set( $toPar = $mathtool.toInteger($request.to) )
9		-#set( $firstYear = $mathtool.toInteger($firstYearTh) )$firstYear
10		-#set( $lastYear = $mathtool.toInteger($lastYearTh) )$lastYear
	9	+#set( $firstYear = $mathtool.toInteger($firstYearTh) )
	10	+#set( $lastYear = $mathtool.toInteger($lastYearTh) )
11	11	#set( $yearList = [$lastYear..$firstYear] )
12		-#if( $yearPar > 0 )ONE YEAR
	12	+#if( $yearPar > 0 )
13	13	#set( $oneYear = true )
14	14	#set( $firstYear = $yearPar )
15	15	#set( $lastYear = $toPar )
16		- #set( $yearList = [$lastYear..$firstYear] )
	16	+ #set( $yearList = [$yearPar] )
17	17	#else
18		- #if( $fromPar != '' && $fromPar > $firstYear )
	18	+ #if( $fromPar != '' && ($fromPar > $firstYear) )
19	19	#set( $firstYear = $fromPar )
20	20	#set( $yearList = [$lastYear..$firstYear] )
21	21	#end
22		- #if( $toPar != '' && $toPar > $lastYear)
	22	+ #if( $toPar != '' && ($toPar < $lastYear) )
23	23	#set( $lastYear = $toPar )
24	24	#set( $yearList = [$lastYear..$firstYear] )
25	25	#end
...	...	@@ -26,37 +26,20 @@
26	26	#if( $lastYear <= $firstYear )
27	27	#set( $oneYear = true )
28	28	#set( $selectedYear = $firstYear )
	29	+ #set( $yearList = [$firstYear] )
29	29	#else
30	30	#set( $yearList = [$lastYear..$firstYear] )
31	31	#end
32	32	#end
33	33	$oneYear
34		-$firstYear
35		-$lastYear
36	36	$yearList
37		-#stop
38		-##check velocity variable, takes precedence
39		-#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
40		- #set( $oneStatus = true )
41		- #set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
42		-#end
43		-## set ordering field
44		-#if( $selectedStatus == "available" )
45		- #set( $orderingDateFieldName = "availabilityDate" )
46		-#elseif( $selectedStatus == "ongoing" )
47		- #set( $orderingDateFieldName = "startDate" )
48		-#else
49		-## default for no selected status, too
50		- #set( $orderingDateFieldName = "endDate" )
51		-#end
52		-## invariant: $oneStatus set, $selectedStatus & $orderingDateFieldName set accordingly
53		-### END STATUS
	36	+### END YEAR
54	54	##
55		-### START USER & ROLE
	38	+### START USER & CYCLE
56	56	#set( $userNamePar = $request.user.trim() )
57	57	## default values
58	58	#set( $oneUser = false )
59		-#set( $oneRole = false )
	42	+#set( $oneCycle = false )
60	60	#set( $userFirstName = "" )
61	61	#set( $userLastName = "" )
62	62	#if( $userName || $userNamePar )
...	...	@@ -76,27 +76,29 @@
76	76	#stop
77	77	#end
78	78	##user selected and existing user page
79		- #set( $rolePar = $request.role.trim().toLowerCase() )
80		- #set( $selectedRole = '' )
81		- #if( $rolePar != '' && $allThesisRoles.contains($rolePar) )
82		- #set( $oneRole = true )
83		- #set( $selectedRole = $rolePar )
	62	+ #set( $cyclePar = $request.cycle.trim().toUpperCase() )
	63	+ #set( $selectedCycle = '' )
	64	+ #if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
	65	+ #set( $oneCycle = true )
	66	+ #set( $selectedCycle = $cyclePar )
84	84	#end
85	85	#end
86		-## $oneUser and $oneRole set properly, other related variables set accordingly
87		-## $oneRole has meaning only if $oneUser
88		-## if $oneUser, $oneRole false means one user for all roles
89		-## if $oneUser, $oneRole true means one specific role for one user selected
90		-## if $oneUser is false, $oneRole means nothing -- so all users, all roles / just status
	69	+## $oneUser and $oneCycle set properly
	70	+$oneUser
	71	+$oneCycle
	72	+### END USER & CYCLE
91	91	##
92	92	## title
93		->#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'/}}
	75	+>#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'/}}
94	94	## index
95		-#if( !$oneStatus )
96		-(% 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)))
97		-#elseif( $oneUser && !$oneRole )
98		-(% 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)))
	77	+#if( !$oneYear )
	78	+(% 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)))
	79	+#elseif( $oneUser && !$oneCycle )
	80	+(% 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)))
99	99	#end{{id name='index'/}}
	82	+
	83	+#stop
	84	+
100	100	## search theses
101	101	#set( $thesisNo = 0 )
102	102	#foreach( $status in $allThesisStatuses )