Changes for page Per Year

Summary

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

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,182 +1,162 @@
1	1	{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2	2	#set( $thesisMenu = true )
3		-#### get parameters
4		-## hypothesis: $thesisStatus set, default "Completed"
5		-## status parameter
6		-#set( $statusPar = $request.status.trim().toLowerCase() )
7		-#if( $statusPar != '' && $allThesisStatuses.contains($statusPar) )
8		- #set( $selectedStatus = $statusPar )
9		-#else
10		- #set( $selectedStatus = 'all' )
	3	+## get environment variables & derived
	4	+#set( $firstYear = $mathtool.toInteger($firstYearTh) )
	5	+#set( $lastYear = $mathtool.toInteger($lastYearTh) )
	6	+#set( $yearList = [$lastYear..$firstYear] )
	7	+### START YEAR
	8	+## defaults
	9	+#set( $oneYear = false )
	10	+#set( $selectedYear = '' )
	11	+## year parameters
	12	+#if( $request.year )
	13	+ #set( $yearPar = $mathtool.toInteger($request.year) )
11	11	#end
12		-##check velocity variable, takes precedence
13		-#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
14		- #set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
	15	+#if( $request.from )
	16	+ #set( $fromPar = $mathtool.toInteger($request.from) )
15	15	#end
16		-## set ordering field
17		-#if( $selectedStatus == "available" )
18		- #set( $orderingDateFieldName = "availabilityDate" )
19		-#elseif( $selectedStatus == "ongoing" )
20		- #set( $orderingDateFieldName = "startDate" )
	18	+#if( $request.to )
	19	+ #set( $toPar = $mathtool.toInteger($request.to) )
	20	+#end
	21	+##set years
	22	+#if( $yearPar > 0 )
	23	+ #set( $oneYear = true )
	24	+ #set( $firstYear = $yearPar )
	25	+ #set( $lastYear = $yearPar )
	26	+ #set( $selectedYear = $yearPar )
	27	+ #set( $yearList = [$yearPar] )
21	21	#else
22		- #set( $orderingDateFieldName = "endDate" )
	29	+ #if( $fromPar != '' && ($fromPar > $firstYear) )
	30	+ #set( $firstYear = $fromPar )
	31	+ #set( $yearList = [$lastYear..$firstYear] )
	32	+ #end
	33	+ #if( $toPar != '' && ($toPar < $lastYear) )
	34	+ #set( $lastYear = $toPar )
	35	+ #set( $yearList = [$lastYear..$firstYear] )
	36	+ #end
	37	+ #if( $lastYear <= $firstYear )
	38	+ #set( $oneYear = true )
	39	+ #set( $lastYear = $firstYear )
	40	+ #set( $selectedYear = $firstYear )
	41	+ #set( $yearList = [$firstYear] )
	42	+ #else
	43	+ #set( $yearList = [$lastYear..$firstYear] )
	44	+ #end
23	23	#end
24		-## invariant: $thesisStatus set, $orderingDateFieldName set correspondingly
25		-## who
26		-#set( $userNamePar = $request.user )
27		-#set( $supervisorNamePar = $request.supervisor )
28		-#set( $cosupervisorNamePar = $request.cosupervisor )
29		-#set( $contactNamePar = $request.contact )
30		-#### set default values
31		-#set( $userSelected = false )
32		-#set( $roleSelected = false )
	46	+## $selectedYear, $yearList and $oneYear set properly
	47	+### END YEAR
	48	+##
	49	+### START USER
	50	+## default values
	51	+#set( $oneUser = false )
	52	+#set( $selectedUser = '' )
33	33	#set( $userFirstName = "" )
34	34	#set( $userLastName = "" )
35		-#set( $supervisorName = "" )
36		-#set( $supervisorFirstName = "" )
37		-#set( $supervisorLastName = "" )
38		-#set( $cosupervisorName = "" )
39		-#set( $cosupervisorFirstName = "" )
40		-#set( $cosupervisorLastName = "" )
41		-#set( $contactName = "" )
42		-#set( $contactFirstName = "" )
43		-#set( $contactLastName = "" )
44		-##
45		-#### handle who & roles
46		-##
47		-#if ( $userName || $userNamePar )
48		-## a user is specified for all roles
49		- #set( $userSelected = true )
50		- #if ( !$userName )#set( $userName = "XWiki.$userNamePar" )#end
51		- #set( $userdoc = $xwiki.getDocument($userName) )
52		- #set( $userFirstName = $userdoc.display("first_name") )
53		- #set( $userLastName = $userdoc.display("last_name") )
54		-#elseif ( $supervisorNamePar || $cosupervisorNamePar || $contactNamePar )
55		- #set( $roleSelected = true )
56		- #if ( $supervisorNamePar )
57		- #set( $supervisorName = "XWiki.$supervisorNamePar" )
58		- #set( $supervisordoc = $xwiki.getDocument($supervisorName) )
59		- #set( $supervisorFirstName = $supervisordoc.display("first_name") )
60		- #set( $supervisorLastName = $supervisordoc.display("last_name") )
	55	+## user parameter
	56	+#if( $request.user )
	57	+ #set( $userNamePar = $request.user.trim() )
	58	+#end
	59	+#if( $userName || $userNamePar )
	60	+## try to specify a user
	61	+ #if( !$userName )
	62	+ #set( $selectedUser = "XWiki.$userNamePar" )
	63	+ #else
	64	+ #set( $selectedUser = $userName )
61	61	#end
62		- #if ( $cosupervisorNamePar )
63		- #set( $cosupervisorName = "XWiki.$cosupervisorNamePar" )
64		- #set( $cosupervisordoc = $xwiki.getDocument($cosupervisorName) )
65		- #set( $cosupervisorFirstName = $cosupervisordoc.display("first_name") )
66		- #set( $cosupervisorLastName = $cosupervisordoc.display("last_name") )
	66	+ #if( $xwiki.exists($selectedUser) )
	67	+ #set( $oneUser = true )
	68	+ #set( $userdoc = $xwiki.getDocument($selectedUser) )
	69	+ #set( $userFirstName = $userdoc.display("first_name") )
	70	+ #set( $userLastName = $userdoc.display("last_name") )
	71	+ #else
	72	+{{warning}} $selectedUser is not an {{apice/}} user{{/warning}}
	73	+ #stop
67	67	#end
68		- #if ( $contactNamePar )
69		- #set( $contactName = "XWiki.$contactNamePar" )
70		- #set( $contactdoc = $xwiki.getDocument($contactName) )
71		- #set( $contactFirstName = $contactdoc.display("first_name") )
72		- #set( $contactLastName = $contactdoc.display("last_name") )
73		- #end
74	74	#end
75		-#if( $supervisor )
76		- #set( $roleSelected = true )
77		- #set( $supervisorName = $userName )
78		- #set( $supervisordoc = $xwiki.getDocument($supervisorName) )
79		- #set( $supervisorFirstName = $supervisordoc.display("first_name") )
80		- #set( $supervisorLastName = $supervisordoc.display("last_name") )
	76	+## $selectedUser and $oneUser set properly
	77	+### END USER
	78	+##
	79	+### START CYCLE
	80	+#set( $oneCycle = false )
	81	+#set( $selectedCycle = '' )
	82	+## cycle parameter
	83	+#if( $request.cycle )
	84	+ #set( $cyclePar = $request.cycle.trim().toUpperCase() )
81	81	#end
82		-#if( $cosupervisor )
83		- #set( $roleSelected = true )
84		- #set( $cosupervisorName = $userName )
85		- #set( $cosupervisordoc = $xwiki.getDocument($cosupervisorName) )
86		- #set( $cosupervisorFirstName = $cosupervisordoc.display("first_name") )
87		- #set( $cosupervisorLastName = $cosupervisordoc.display("last_name") )
	86	+## set cycle
	87	+#if( $cyclePar != '' && $allThesisCycles.contains($cyclePar) )
	88	+ #set( $oneCycle = true )
	89	+ #set( $selectedCycle = $cyclePar )
88	88	#end
89		-#if( $contact )
90		- #set( $roleSelected = true )
91		- #set( $contactName = $userName )
92		- #set( $contactdoc = $xwiki.getDocument($contactName) )
93		- #set( $contactFirstName = $contactdoc.display("first_name") )
94		- #set( $contactLastName = $contactdoc.display("last_name") )
	91	+## $selectedCycle and $oneCycle set properly
	92	+### END CYCLE
	93	+$yearList
	94	+#if( $oneYear )
	95	+ $selectedYear
	96	+#else
	97	+ ALL YEARS
95	95	#end
96		-$selectedStatus
97		-
98		-$userSelected
99		-
100		-$roleSelected
101		-
102		-$supervisor
103		-
104		-$cosupervisor
105		-
106		-$contact
107		-
108		-$userFirstName $userLastName
109		-
110		-$supervisorFirstName $supervisorLastName
111		-
112		-$cosupervisorFirstName $cosupervisorLastName
113		-
114		-$contactFirstName $contactLastName
115		-##
116		-## $userSelected true and $roleSelected false means one user for all roles
117		-## $userSelected true and $roleSelected true for one user with one specific role
118		-## if $userSelected false and $roleSelected true mean at least one role with an assigned user
119		-## both false means all theses
120		-#if( $selectedStatus == 'all' )
121		-ALLL
	99	+#if( $oneUser )
	100	+ $selectedUser
122	122	#else
123		- #if( $userSelected )
124		- #if( $roleSelected )
125		->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}} / $userFirstName $userLastName / #if( $supervisor ){{stringEngIta eng="Supervisor" ita="Relatore"/}}#end#if( $cosupervisor ){{stringEngIta eng="Co-supervisor" ita="Correlatore"/}}#end#if( $contact ){{stringEngIta eng="Contact" ita="Contatto"/}}#end
126		-
127		- #else
128		->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}} / $userFirstName $userLastName
129		-
130		- #end
131		- #else
132		- #if( $roleSelected )
133		->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}}#if( $supervisorLastName != "" ) / $supervisorFirstName $supervisorLastName //({{stringEngIta eng="supervisor" ita="relatore"/}})//#end#if( $cosupervisorLastName != "" ) / $cosupervisorFirstName $cosupervisorLastName //({{stringEngIta eng="co-supervisor" ita="correlatore"/}})//#end#if( $contactLastName != "" ) / $contactFirstName $contactLastName //({{stringEngIta eng="Contact" ita="Contatto"/}})//#end
134		-
135		- #else
136		->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}}
137		-
138		- #end
139		- #end
	102	+ ALL USERS
140	140	#end
141		-##
142		-#if( $cosupervisor )
143		- #set( $roleSelectedFieldName = "coSupervisors" )
144		-#elseif( $contact )
145		- #set( $roleSelectedFieldName = "contact" )
	104	+#if( $oneCycle )
	105	+ $selectedCycle
146	146	#else
147		- #set( $roleSelectedFieldName = "supervisor" )
	107	+ ALL USERS
148	148	#end
	109	+### END USER & CYCLE
149	149	##
150		-#if( $selectedStatus == 'all' )
151		- ALL STATUSES
152		-#else
153		-## some selected status
154		- #if( $userSelected )
155		-## some user selected
156		- #if( $roleSelected )
157		-## some specific role selected
158		- #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
159		- where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisClassTemplate' and obj.name <> 'Theses.ThesisTemplate' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop2.id.id = obj.id and prop0.name = 'status' and prop1.name = '$roleSelectedFieldName' and prop2.name = '$orderingDateFieldName' and prop0.value = '$selectedStatus' and prop1.value like '%$userName%' order by prop2.value desc" )
160		- #else
161		-## no specific role selected
162		- #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
163		- where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisClassTemplate' and obj.name <> 'Theses.ThesisTemplate' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop2.id.id = obj.id and prop3.id.id = obj.id and prop4.id.id = obj.id and prop0.name = 'status' and prop1.name = 'supervisor' and prop2.name = 'coSupervisors' and prop3.name = 'contact' and prop4.name = '$orderingDateFieldName' and prop0.value = '$selectedStatus' and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' ) order by prop4.value desc" )
	111	+## title
	112	+>#if( $oneCycle ){{thesisCycle short='no'}}$selectedCycle{{/thesisCycle}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end / #if( $oneYear )$selectedYear#else$firstYear–$lastYear#end#if( $oneUser ) / $userFirstName **$userLastName**#end{{id name='top'/}}
	113	+## index
	114	+#if( !$oneYear )
	115	+(% 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)))
	116	+###elseif( $oneUser && !$oneCycle )
	117	+#elseif( !$oneCycle )
	118	+(% 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)))
	119	+#end{{id name='index'/}}
	120	+## search theses
	121	+#set( $thesisNo = 0 )
	122	+#foreach( $year in $yearList )
	123	+ #set( $thesisYearNo = 0 )
	124	+ #if( !$oneYear )
	125	+(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year
	126	+ #end
	127	+## some selected year or year list / now $year
	128	+ #foreach( $cycle in $allThesisCycles )
	129	+ #set( $thesisYearCycleNo = 0 )
	130	+ #if( !$oneCycle || $selectedCycle == $cycle )
	131	+## some selected cycle or all cycles / now $cycle
	132	+ #if( $oneUser)
	133	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
	134	+ where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisClassTemplate' and obj.name <> 'Theses.ThesisTemplate' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop2.id.id = obj.id and prop3.id.id = obj.id and prop4.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'year' and prop2.name = 'supervisors' and prop3.name = 'cosupervisors' and prop4.name = 'contacts' and prop0.value = '$cycle' and year(prop1.value) = '$year' and ( prop2.value like '%$selectedUser%' or prop3.value like '%$selectedUser%' or prop4.value like '%$selectedUser%' ) order by prop1.value desc" )
	135	+ #else
	136	+ #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
	137	+ where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisClassTemplate' and obj.name <> 'Theses.ThesisTemplate' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop0.name = 'cycle' and prop1.name = 'year' and prop0.value = '$cycle' and year(prop1.value) = '$year' order by prop1.value desc" )
	138	+ #end
	139	+ #set( $thesisFound = $xwiki.searchDocuments($sql) )
	140	+ #set( $thesisFoundNo = $thesisFound.size() )
	141	+ #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
	142	+ #if( $thesisFoundNo > 0 && !$oneCycle )
	143	+(% style="border-style:#if( $oneYear )solid hidden hidden solid#{else}hidden hidden hidden dotted#end; border-color:$theme.borderColor; text-align:left; font-style:oblique; font-size:smaller" %)|#if( $oneYear ){{id name='$cycle'/}}#else{{id name='$year-$cycle'/}}#end{{thesisCycle plural='no' uppercase='yes' short='yes'}}$cycle{{/thesisCycle}}
	144	+ #end
	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	+
	150	+ #end
	151	+ #if( $thesisFoundNo > 0 && !$oneCycle )
	152	+(% style="border-style:#if( $oneYear )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( $oneYear ){{id name='$cycle-bottom'/}}#else{{id name='$cycle-$year-bottom'/}}#end($thesisYearCycleNo #if( $thesisYearCycleNo == 1 ){{thesisCycle plural='no' uppercase='no' short='no'}}$cycle{{/thesisCycle}}#else{{thesisCycle plural='yes' uppercase='no' short='no'}}$cycle{{/thesisCycle}}#end {{stringEngIta eng='in' ita='nel'/}} $year [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
	153	+ #end
164	164	#end
165		- #elseif( $roleSelected )
166		-## no user selected, some role selected
167		- #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
168		- where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisClassTemplate' and obj.name <> 'Theses.ThesisTemplate' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop2.id.id = obj.id and prop3.id.id = obj.id and prop4.id.id = obj.id and prop0.name = 'status' and prop1.name = 'supervisor' and prop2.name = 'coSupervisors' and prop3.name = 'contact' and prop4.name = '$orderingDateFieldName' and prop1.value like '%$supervisorName%' and prop2.value like '%$cosupervisorName%' and prop3.value like '%$contactName%' order by prop4.value desc")
169		- #else
170		-## no user selected, some role selected
171		- #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
172		- where obj.name = doc.fullName and obj.className = 'Theses.ThesisClass' and obj.name <> 'Theses.ThesisClassTemplate' and obj.name <> 'Theses.ThesisTemplate' and prop0.id.id = obj.id and prop1.id.id = obj.id and prop0.name = 'status' and prop1.name = '$orderingDateFieldName' and prop0.value = '$selectedStatus' order by prop1.value desc" )
	155	+ #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
173	173	#end
	157	+ #if( !$oneYear )
	158	+(% 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" %)|($thesisYearNo #if($thesisYearNo == 1){{stringEngIta eng='thesis in' ita='tesi nel'/}}#else{{stringEngIta eng='theses in' ita='tesi nel'/}}#end$year{{id name='$year-bottom'/}}) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
	159	+ #end
174	174	#end
175		-$sql
176		-#set( $thesisFound = $xwiki.searchDocuments($sql) )
177		-##
178		-#foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
179		-##* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" || ( $thesisDoc.getValue("studentFirstName") != "" && $thesisDoc.getValue("studentLastName") != "" ) ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end
180		-* $thesis
181		-#end
	161	+{{id name='bottom'/}}
182	182	{{/velocity}}