Changes for page Per Year

From version 98.1
edited by Andrea Omicini
on 30/10/2021 16:44
Change comment: There is no comment for this version
To version 39.1
edited by Andrea Omicini
on 25/10/2021 19:57
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,35 @@
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( $statusSelected = false )
8 +#if( $statusPar != '' && $allThesisStatuses.contains($statusPar) )
9 + #set( $statusSelected = true )
10 + #set( $selectedStatus = $statusPar )
11 +#end
12 +##check velocity variable, takes precedence
13 +#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
14 + #set( $statusSelected = 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: $statusSelected 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 -#set( $oneUser = false )
45 -#set( $oneCycle = false )
32 +#set( $userSelected = false )
46 46  #set( $userFirstName = "" )
47 47  #set( $userLastName = "" )
48 48  #if( $userName || $userNamePar )
... ... @@ -53,7 +53,7 @@
53 53   #set( $selectedUser = $userName )
54 54   #end
55 55   #if( $xwiki.exists($selectedUser) )
56 - #set( $oneUser = true )
43 + #set( $userSelected = true )
57 57   #set( $userdoc = $xwiki.getDocument($selectedUser) )
58 58   #set( $userFirstName = $userdoc.display("first_name") )
59 59   #set( $userLastName = $userdoc.display("last_name") )
... ... @@ -62,70 +62,66 @@
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 )
52 + #set( $rolePar = $request.role.trim().toLowerCase() )
53 + #set( $roleSelected = false )
54 + #set( $selectedRole = '' )
55 + #if( $rolePar != '' && $allThesisRoles.contains($rolePar) )
56 + #set( $roleSelected = 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 +## $userselected and $roleSelected set properly, other related variables set accordingly
61 +## $roleSelected has meaning only if $userSelected
62 +## if $userSelected, $roleSelected false means one user for all roles
63 +## if $userSelected, $roleSelected true means one specific role for one user selected
64 +## if $userSelected is false, $roleSelected 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'/}}
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)))
85 -#end{{id name='index'/}}
86 -## search theses
87 -#set( $thesisNo = 0 )
88 -#foreach( $year in $yearList )
89 - #if( !$oneYear || $selectedYear == $year )
90 - #set( $thesisYearNo = 0 )
91 - #if( !$oneYear )
92 -(% style="border-style:solid hidden hidden solid; border-color:$theme.borderColor; text-align:left; font-style:oblique" %)|{{id name='$year'/}}$year
93 - #end
94 -## some selected year or year list / now $year
95 - #foreach( $cycle in $allThesisCycles )
96 - #set( $thesisYearCycleNo = 0 )
97 - #if( !$oneCycle || $selectedCycle == $cycle )
98 -## some selected cycle or all cycles / now $cycle
99 - #if( $oneUser)
100 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, LargeStringProperty as prop4
101 - 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 prop1.value = '$year' and ( prop2.value like '%$selectedUser%' || prop3.value like '%$selectedUser%' || prop4.value like '%$selectedUser%' ) order by prop2.value desc" )
102 - #else
103 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
104 - 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 prop1.value = '$year' order by prop2.value desc" )
105 - #end
106 - #set( $thesisFound = $xwiki.searchDocuments($sql) )
107 - #set( $thesisFoundNo = $thesisFound.size() )
108 - #set( $thesisYearCycleNo = $thesisYearCycleNo + $thesisFoundNo )
109 - #if( $thesisFoundNo > 0 && !$oneCycle )
110 -(% 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}}
111 - #end
112 - #foreach( $thesis in $thesisFound )
113 - #set( $thesisDoc = $xwiki.getDocument($thesis) )
114 - #set( $thesisObj = $thesisDoc.getObject('Theses.ThesisClass') )
115 -* [[$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
67 +>#if( $statusSelected ){{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}}#else{{stringEngIta eng="Theses" ita="Tesi"/}}#end#if( $userSelected ) / $userFirstName **$userLastName**#if( $roleSelected ) / $selectedRole#end#end
116 116  
69 +## search theses
70 +#foreach( $status in $allThesisStatuses )
71 + #if( !$statusSelected || $selectedStatus == $status )
72 += $status =
73 +## some selected status or all statuses / now $status
74 + #if( $userSelected )
75 +== $selectedUser ==
76 +## some user selected
77 + #foreach( $role in $allThesisRoles )
78 + #if( !$roleSelected || $selectedRole == $role )
79 + #if( $role == "contact" )
80 + #set( $roleSelectedFieldName = "contact" )
81 + #elseif( $role == "cosupervisor" )
82 + #set( $roleSelectedFieldName = "coSupervisors" )
83 + #else
84 + #set( $roleSelectedFieldName = "supervisor" )
117 117   #end
118 - #if( $thesisFoundNo > 0 && !$oneCycle )
119 -(% 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"]]
86 +## some selected role or all roles / now $role
87 +=== $role ===
88 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
89 + 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 lower(prop0.value) = '$status' and prop1.value like '%$selectedUser%' order by prop2.value desc" )
90 + #set( $thesisFound = $xwiki.searchDocuments($sql) )
91 + #foreach( $thesis in $thesisFound )
92 +* $thesis
120 120   #end
121 121   #end
122 - #set( $thesisYearNo = $thesisYearNo + $thesisYearCycleNo )
123 123   #end
96 +## no user selected, no role selected
97 + #else
98 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
99 + 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 lower(prop0.value) = '$status' order by prop1.value desc" )
100 + #set( $thesisFound = $xwiki.searchDocuments($sql) )
101 + #foreach( $thesis in $thesisFound )
102 +* $thesis
103 + #end
124 124   #end
125 - #if( !$oneYear )
126 -(% 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"]]
127 - #end
128 128   #end
106 +##
107 +## #set( $thesisFound = $xwiki.searchDocuments($sql) )
108 +## #set( $thesisFoundNo = $thesisFound.size() )
109 +## #set($thesisDoc = $xwiki.getDocument($thesis))
110 +## #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
111 +##* [[$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
112 +## #end
129 129  #end
130 -{{id name='bottom'/}}
131 131  {{/velocity}}