Changes for page Per Year
From version 17.5
edited by Andrea Omicini
on 25/10/2021 16:48
on 25/10/2021 16:48
Change comment:
There is no comment for this version
To version 12.15
edited by Andrea Omicini
on 23/06/2021 01:38
on 23/06/2021 01:38
Change comment:
There is no comment for this version
Summary
-
Page properties (2 modified, 0 added, 0 removed)
Details
- Page properties
-
- Title
-
... ... @@ -1,1 +1,0 @@ 1 -Theses per Status - Content
-
... ... @@ -1,35 +1,23 @@ 1 -{{include reference="Theses.Environment"/}}{{include reference="Environment"/}}{{velocity}} 2 -#set( $thesisMenu = true ) 3 -#### get parameters 1 +{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}{{html clean="false" wiki="true"}}#### get parameters 4 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' ) 11 -#end 12 -##check velocity variable, takes precedence 13 -#if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) ) 14 - #set( $selectedStatus = $thesisStatus.trim().toLowerCase() ) 15 -#end 16 -## set ordering field 17 -#if( $selectedStatus == "available" ) 3 +## to do: get from parameter 4 +#if( $thesisStatus == "Available" ) 18 18 #set( $orderingDateFieldName = "availabilityDate" ) 19 -#elseif( $ selectedStatus == "ongoing" )6 +#elseif( $thesisStatus == "Ongoing" ) 20 20 #set( $orderingDateFieldName = "startDate" ) 21 21 #else 9 + #set( $thesisStatus = "Completed" ) 22 22 #set( $orderingDateFieldName = "endDate" ) 23 23 #end 24 24 ## invariant: $thesisStatus set, $orderingDateFieldName set correspondingly 25 25 ## who 26 -#set( $userNamePar = $ request.user )27 -#set( $supervisorNamePar = $ request.supervisor )28 -#set( $cosupervisorNamePar = $ request.cosupervisor )29 -#set( $contactNamePar = $ request.contact )14 +#set( $userNamePar = $context.getRequest().getParameter("user") ) 15 +#set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") ) 16 +#set( $cosupervisorNamePar = $context.getRequest().getParameter("cosupervisor") ) 17 +#set( $contactNamePar = $context.getRequest().getParameter("contact") ) 30 30 #### set default values 31 31 #set( $userSelected = false ) 32 -#set( $roleSelected = false ) 20 +#set( $roleSelected = false ) 33 33 #set( $userFirstName = "" ) 34 34 #set( $userLastName = "" ) 35 35 #set( $supervisorName = "" ) ... ... @@ -72,7 +72,7 @@ 72 72 #end 73 73 #end 74 74 #if( $supervisor ) 75 - #set( $roleSelected = true ) 63 + #set( $roleSelected = true ) 76 76 #set( $supervisorName = $userName ) 77 77 #set( $supervisordoc = $xwiki.getDocument($supervisorName) ) 78 78 #set( $supervisorFirstName = $supervisordoc.display("first_name") ) ... ... @@ -93,64 +93,123 @@ 93 93 #set( $contactLastName = $contactdoc.display("last_name") ) 94 94 #end 95 95 ## 96 -## $userSelected true and $roleSelected falsemeans one user for all roles84 +## $userSelected true means one user for all roles 97 97 ## $userSelected true and $roleSelected true for one user with one specific role 98 98 ## if $userSelected false and $roleSelected true mean at least one role with an assigned user 99 99 ## both false means all theses 100 -#if( $userSelected ) 101 - #if( $roleSelected ) 102 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{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 103 103 104 - #else 105 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName 89 +> #FullThesisStatusesString($thesisStatus) #if( $userSelected ) / $userFirstName $userLastName#end // // 106 106 107 - #end 108 -#else 109 - #if( $roleSelected ) 110 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{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 91 +#if( $roleSelected ) 92 + #if( $userSelected ) 93 + #if( $supervisor ) 111 111 95 +>> {{stringEngIta eng="as a supervisor" ita="come relatore"/}} 96 + #end 97 + #if( $cosupervisor ) 98 + 99 +>> {{stringEngIta eng="as a co-supervisor" ita="come correlatore"/}} 100 + #end 101 + #if( $contact ) 102 + 103 +>> {{stringEngIta eng="as a contact" ita="come contatto"/}} 104 + #end 112 112 #else 113 - >{{thesisStatusplural='yes'uppercase='yes'}}$thesisStatus{{thesisStatus}}106 + #if( $supervisorLastName != "" ) 114 114 108 +>> #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName 109 + #end 110 + #if( $cosupervisorLastName != "" ) 111 + 112 +>> #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName 113 + #end 114 + #if( $contactLastName != "" ) 115 + 116 +>> #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName 117 + #end 115 115 #end 116 116 #end 117 117 ## 118 -#if( $cosupervisor ) 119 - #set( $roleSelectedFieldName = "coSupervisors" ) 120 -#elseif( $contact ) 121 - #set( $roleSelectedFieldName = "contact" ) 121 +#if ( $cosupervisor ) 122 + #set ( $roleSelectedFieldName = "coSupervisors" ) 123 +#elseif ( $contact ) 124 + #set ( $roleSelectedFieldName = "contact" ) 122 122 #else 123 - #set( $roleSelectedFieldName = "supervisor" ) 126 + #set ( $roleSelectedFieldName = "supervisor" ) 124 124 #end 125 125 ## 126 -#if( $selectedStatus == 'all' ) 127 - ALL STATUSES 128 -#else 129 -## some selected status 130 - #if( $userSelected ) 131 -## some user selected 132 - #if( $roleSelected ) 133 -## some specific role selected 134 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2 135 - 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 = '$thesisStatus' and prop1.value like '%$userName%' order by prop2.value desc" ) 136 - #else 137 -## no specific role selected 138 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4 139 - 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 = '$thesisStatus' and ( prop1.value like '%$userName%' or prop2.value like '%$userName%' or prop3.value like '%$userName%' ) order by prop4.value desc" ) 140 - #end 141 - #elseif( $roleSelected ) 142 -## no user selected, some role selected 143 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4 144 - 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") 129 +#if ($userSelected) 130 + #if ( $roleSelected ) 131 + #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2 132 + where obj.name=doc.fullName and 133 + obj.className='Theses.ThesisClass' and 134 + obj.name<>'Theses.ThesisClassTemplate' and 135 + prop.id.id=obj.id and 136 + prop1.id.id=obj.id and 137 + prop2.id.id=obj.id and 138 + prop.name='status' and 139 + prop.value='$thesisStatus' and 140 + prop1.name='$roleSelectedFieldName' and 141 + prop2.name='$orderingDateFieldName' and 142 + prop1.value like '%$userName%' 143 + order by prop2.value desc") 145 145 #else 146 -## no user selected, some role selected 147 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, DateProperty as prop1 148 - 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 = '$thesisStatus' order by prop1.value desc" ) 145 + #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4 146 + where obj.name=doc.fullName and 147 + obj.className='Theses.ThesisClass' and 148 + obj.name<>'Theses.ThesisClassTemplate' and 149 + prop.id.id=obj.id and 150 + prop1.id.id=obj.id and 151 + prop2.id.id=obj.id and 152 + prop3.id.id=obj.id and 153 + prop4.id.id=obj.id and 154 + prop.name='status' and 155 + prop.value = '$thesisStatus' and 156 + prop1.name='supervisor' and 157 + prop2.name='coSupervisors' and 158 + prop3.name='contact' and 159 + prop4.name='$orderingDateFieldName' and 160 + ( prop1.value like '%$userName%' or 161 + prop2.value like '%$userName%' or 162 + prop3.value like '%$userName%') 163 + order by prop4.value desc") 164 + #end 165 +#elseif ( $roleSelected ) 166 + #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4 167 + where obj.name=doc.fullName and 168 + obj.className='Theses.ThesisClass' and 169 + obj.name<>'Theses.ThesisClassTemplate' and 170 + prop.id.id=obj.id and 171 + prop1.id.id=obj.id and 172 + prop2.id.id=obj.id and 173 + prop3.id.id=obj.id and 174 + prop4.id.id=obj.id and 175 + prop.name='status' and 176 + prop.value = '$thesisStatus' and 177 + prop1.name='supervisor' and 178 + prop2.name='coSupervisors' and 179 + prop3.name='contact' and 180 + prop4.name='$orderingDateFieldName' and 181 + prop1.value like '%$supervisorName%' and 182 + prop2.value like '%$cosupervisorName%' and 183 + prop3.value like '%$contactName%' 184 + order by prop4.value desc") 185 +#else 186 + #set ($sql = ", BaseObject as obj, StringProperty as prop, DateProperty as prop1 187 + where obj.name=doc.fullName and 188 + obj.className='Theses.ThesisClass' and 189 + obj.name<>'Theses.ThesisClassTemplate' and 190 + prop.id.id=obj.id and 191 + prop1.id.id=obj.id and 192 + prop.name='status' and 193 + prop.value = '$thesisStatus' and 194 + prop1.name='$orderingDateFieldName' 195 + order by prop1.value desc") 149 149 #end 150 150 #set($thesisFound = $xwiki.searchDocuments($sql)) 151 151 ## 152 152 #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis)) 153 -* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" || ( $thesisDoc.getValue("studentFirstName")!= "" && $thesisDoc.getValue("studentLastName") != "" ) )//(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end200 +* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end 154 154 155 155 #end 156 -{{/velocity}} 203 +{{/html}}{{/velocity}}