Changes for page Per Year

Summary

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

Details

Page properties

Content

...	...	@@ -3,21 +3,23 @@
3	3	#set( $oneYear = false )
4	4	### START YEAR
5	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 )
	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	11	#set( $yearList = [$lastYear..$firstYear] )
12		-#if( $yearPar != '' )
	12	+#if( $yearPar > 0 )
13	13	#set( $oneYear = true )
14		- #set( $selectedYear = $yearPar )
	14	+ #set( $firstYear = $yearPar )
	15	+ #set( $lastYear = $toPar )
	16	+ #set( $yearList = [$yearPar] )
15	15	#else
16		- #if( $fromPar != '' && $yearList.contains($fromPar) )
	18	+ #if( $fromPar != '' && ($fromPar > $firstYear) )
17	17	#set( $firstYear = $fromPar )
18	18	#set( $yearList = [$lastYear..$firstYear] )
19	19	#end
20		- #if( $toPar != '' && $yearList.contains($toPar) )
	22	+ #if( $toPar != '' && ($toPar < $lastYear) )
21	21	#set( $lastYear = $toPar )
22	22	#set( $yearList = [$lastYear..$firstYear] )
23	23	#end
...	...	@@ -24,40 +24,20 @@
24	24	#if( $lastYear <= $firstYear )
25	25	#set( $oneYear = true )
26	26	#set( $selectedYear = $firstYear )
	29	+ #set( $yearList = [$firstYear] )
27	27	#else
28	28	#set( $yearList = [$lastYear..$firstYear] )
29	29	#end
30	30	#end
31	31	$oneYear
32		-$selectedYear
33		-$firstYear
34		-$lastYear
35	35	$yearList
36		-#stop
37		-
38		-STOP
39		-##check velocity variable, takes precedence
40		-#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
41		- #set( $oneStatus = true )
42		- #set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
43		-#end
44		-## set ordering field
45		-#if( $selectedStatus == "available" )
46		- #set( $orderingDateFieldName = "availabilityDate" )
47		-#elseif( $selectedStatus == "ongoing" )
48		- #set( $orderingDateFieldName = "startDate" )
49		-#else
50		-## default for no selected status, too
51		- #set( $orderingDateFieldName = "endDate" )
52		-#end
53		-## invariant: $oneStatus set, $selectedStatus & $orderingDateFieldName set accordingly
54		-### END STATUS
	36	+### END YEAR
55	55	##
56		-### START USER & ROLE
	38	+### START USER & CYCLE
57	57	#set( $userNamePar = $request.user.trim() )
58	58	## default values
59	59	#set( $oneUser = false )
60		-#set( $oneRole = false )
	42	+#set( $oneCycle = false )
61	61	#set( $userFirstName = "" )
62	62	#set( $userLastName = "" )
63	63	#if( $userName || $userNamePar )
...	...	@@ -77,18 +77,20 @@
77	77	#stop
78	78	#end
79	79	##user selected and existing user page
80		- #set( $rolePar = $request.role.trim().toLowerCase() )
81		- #set( $selectedRole = '' )
82		- #if( $rolePar != '' && $allThesisRoles.contains($rolePar) )
83		- #set( $oneRole = true )
84		- #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 )
85	85	#end
86	86	#end
87		-## $oneUser and $oneRole set properly, other related variables set accordingly
88		-## $oneRole has meaning only if $oneUser
89		-## if $oneUser, $oneRole false means one user for all roles
90		-## if $oneUser, $oneRole true means one specific role for one user selected
91		-## 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
	73	+#stop
	74	+
	75	+
92	92	##
93	93	## title
94	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'/}}