Changes for page Per Year

From version 82.1
edited by Andrea Omicini
on 29/10/2021 15:44
Change comment: There is no comment for this version
To version 23.1
edited by Andrea Omicini
on 25/10/2021 17:49
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,43 +1,16 @@
1 1  {{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}}
2 2  #set( $thesisMenu = true )
3 -#set( $oneYear = false )
4 -### START YEAR
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 = $mathtool.toInteger($firstYearTh) )$firstYear
10 -#set( $lastYear = $mathtool.toInteger($lastYearTh) )$lastYear
11 -#set( $yearList = [$lastYear..$firstYear] )
12 -#if( $yearPar > 0 )??
13 - #set( $oneYear = true )
14 - #set( $firstYear = $yearPar )
15 - #set( $lastYear = $toPar )
16 - #set( $yearList = [$lastYear..$firstYear] )
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 )
17 17  #else
18 - #if( $fromPar != '' && $fromPar > $firstYear )
19 - #set( $firstYear = $fromPar )
20 - #set( $yearList = [$lastYear..$firstYear] )
21 - #end
22 - #if( $toPar != '' && $toPar > $lastYear)
23 - #set( $lastYear = $toPar )
24 - #set( $yearList = [$lastYear..$firstYear] )
25 - #end
26 - #if( $lastYear <= $firstYear )
27 - #set( $oneYear = true )
28 - #set( $selectedYear = $firstYear )
29 - #else
30 - #set( $yearList = [$lastYear..$firstYear] )
31 - #end
10 + #set( $selectedStatus = 'all' )
32 32  #end
33 -$oneYear
34 -$firstYear
35 -$lastYear
36 -$yearList
37 -#stop
38 38  ##check velocity variable, takes precedence
39 39  #if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
40 - #set( $oneStatus = true )
41 41   #set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
42 42  #end
43 43  ## set ordering field
... ... @@ -46,117 +46,122 @@
46 46  #elseif( $selectedStatus == "ongoing" )
47 47   #set( $orderingDateFieldName = "startDate" )
48 48  #else
49 -## default for no selected status, too
50 50   #set( $orderingDateFieldName = "endDate" )
51 51  #end
52 -## invariant: $oneStatus set, $selectedStatus & $orderingDateFieldName set accordingly
53 -### END STATUS
54 -##
55 -### START USER & ROLE
56 -#set( $userNamePar = $request.user.trim() )
57 -## default values
58 -#set( $oneUser = false )
59 -#set( $oneRole = false )
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 )
60 60  #set( $userFirstName = "" )
61 61  #set( $userLastName = "" )
62 -#if( $userName || $userNamePar )
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 )
63 63  ## a user is specified for all roles
64 - #if( !$userName )
65 - #set( $selectedUser = "XWiki.$userNamePar" )
66 - #else
67 - #set( $selectedUser = $userName )
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") )
68 68   #end
69 - #if( $xwiki.exists($selectedUser) )
70 - #set( $oneUser = true )
71 - #set( $userdoc = $xwiki.getDocument($selectedUser) )
72 - #set( $userFirstName = $userdoc.display("first_name") )
73 - #set( $userLastName = $userdoc.display("last_name") )
74 - #else
75 -{{warning}} $selectedUser is not an {{apice/}} user{{/warning}}
76 - #stop
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") )
77 77   #end
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 )
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") )
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
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") )
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") )
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") )
95 +#end
91 91  ##
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'/}}
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)))
99 -#end{{id name='index'/}}
100 -## search theses
101 -#set( $thesisNo = 0 )
97 +#if( $cosupervisor )
98 + #set( $roleSelectedFieldName = "coSupervisors" )
99 +#elseif( $contact )
100 + #set( $roleSelectedFieldName = "contact" )
101 +#else
102 + #set( $roleSelectedFieldName = "supervisor" )
103 +#end
104 +##
105 +## $roleSelected has meaning only if $userSelected
106 +## if $userSelected, $roleSelected false means one user for all roles
107 +## if $userSelected, $roleSelected true means one specific role for one user selected
108 +## if $userSelected is false, $roleSelected means nothing -- so all users, all roles / just status
102 102  #foreach( $status in $allThesisStatuses )
103 - #if( !$oneStatus || $selectedStatus == $status )
104 - #set( $thesisStatusNo = 0 )
105 - #if( !$oneStatus )
106 -(% 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}}
107 - #end
110 + #if( $selectedStatus == 'all' || $selectedStatus == $status )
111 += $status =
108 108  ## some selected status or all statuses / now $status
109 - #if( $oneUser )
113 + #if( $userSelected )
114 +== $userName ==
110 110  ## some user selected
111 - #foreach( $role in $allThesisRoles )
112 - #set( $thesisStatusRoleNo = 0 )
113 - #if( !$oneRole || $selectedRole == $role )
114 - #if( $role == "contact" )
115 - #set( $selectedRoleFieldName = "contacts" )
116 - #elseif( $role == "cosupervisor" )
117 - #set( $selectedRoleFieldName = "cosupervisors" )
118 - #else
119 - #set( $selectedRoleFieldName = "supervisors" )
120 - #end
121 -## some selected role or all roles / now $role
122 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
123 - 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 = '$selectedRoleFieldName' and prop2.name = '$orderingDateFieldName' and lower(prop0.value) = '$status' and prop1.value like '%$selectedUser%' order by prop2.value desc" )
124 - #set( $thesisFound = $xwiki.searchDocuments($sql) )
125 - #set( $thesisFoundNo = $thesisFound.size() )
126 - #set( $thesisStatusRoleNo = $thesisStatusRoleNo + $thesisFoundNo )
127 - #if( $thesisFoundNo > 0 && !$oneRole )
128 -(% style="border-style:#if( $oneStatus )solid hidden hidden solid#{else}hidden hidden hidden dotted#end; border-color:$theme.borderColor; text-align:left; font-style:oblique; font-size:smaller" %)|#if( $oneStatus ){{id name='$role'/}}#else{{id name='$status-$role'/}}#end{{thesisRole plural='no' uppercase='yes' short='yes'}}$role{{/thesisRole}}
129 - #end
130 - #foreach( $thesis in $thesisFound )
131 - #set($thesisDoc = $xwiki.getDocument($thesis))
132 - #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
133 -* [[$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
134 -
135 - #end
136 - #if( $thesisFoundNo > 0 && !$oneRole )
137 -(% style="border-style:#if( $oneStatus )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( $oneStatus ){{id name='$role-bottom'/}}#else{{id name='$role-$status-bottom'/}}#end($thesisStatusRoleNo #if( $thesisStatusRoleNo == 1 ){{thesisStatus plural='no' uppercase='no' short='no'}}$status{{/thesisStatus}}#else{{thesisStatus plural='yes' uppercase='no' short='no'}}$status{{/thesisStatus}}#end {{stringEngIta eng='as' ita='come'/}} {{thesisRole short='yes'}}$role{{/thesisRole}}) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
138 - #end
139 - #end
140 - #set( $thesisStatusNo = $thesisStatusNo + $thesisStatusRoleNo )
116 + #if( $roleSelected )
117 +## some specific role selected
118 +=== $roleSelectedFieldName ===
119 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2
120 + 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 = '$status' and prop1.value like '%$userName%' order by prop2.value desc" )
121 + #else
122 +## no specific role selected
123 + #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4
124 + 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 lower(prop0.value) = '$status' and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' ) order by prop4.value desc" )
141 141   #end
142 -## no user selected, no role selected
143 143   #else
127 +## no user selected, no role selected
144 144   #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1
145 - 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" )
146 - #set( $thesisFound = $xwiki.searchDocuments($sql) )
147 - #set( $thesisFoundNo = $thesisFound.size() )
148 - #set( $thesisStatusNo = $thesisStatusNo + $thesisFoundNo )
149 - #foreach( $thesis in $thesisFound )
150 - #set($thesisDoc = $xwiki.getDocument($thesis))
151 - #set($thesisObj = $thesisDoc.getObject('Theses.ThesisClass'))
152 -* [[$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
153 -
154 - #end
129 + 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 = '$status' order by prop1.value desc" )
155 155   #end
156 - #if( !$oneStatus )
157 -(% 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" %)|($thesisStatusNo #if($thesisStatusNo == 1){{thesisStatus plural='false' uppercase='false' short='no'}}$status{{/thesisStatus}}#else{{thesisStatus plural='true' uppercase='false' short='no'}}$status{{/thesisStatus}}#end{{id name='$status-bottom'/}}) [[[{{stringEngIta eng='top' ita='in cima'/}}]>>||anchor="top"]] [[[{{stringEngIta eng='bottom' ita='in fondo'/}}]>>||anchor="bottom"]]
158 - #end
159 159   #end
132 + #set( $thesisFound = $xwiki.searchDocuments($sql) )
133 + #set( $thesisFoundNo = $thesisFound.size() )
134 +##
135 + #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
136 +* [[$thesisDoc.getValue("title")>>$thesisDoc]]#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
137 +
138 + #end
160 160  #end
161 -{{id name='bottom'/}}
162 162  {{/velocity}}