Changes for page Per Year
From version 17.4
edited by Andrea Omicini
on 25/10/2021 16:33
on 25/10/2021 16:33
Change comment:
There is no comment for this version
To version 12.19
edited by Andrea Omicini
on 23/06/2021 01:55
on 23/06/2021 01:55
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") ) ... ... @@ -99,41 +99,45 @@ 99 99 ## both false means all theses 100 100 #if( $userSelected ) 101 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 - 90 +> #FullThesisStatusesString($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 104 104 #else 105 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName 106 - 92 +> #FullThesisStatusesString($thesisStatus) / $userFirstName $userLastName 107 107 #end 108 108 #else 109 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 111 - 96 +> #FullThesisStatusesString($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 112 112 #else 113 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} 114 - 98 +> #FullThesisStatusesString($thesisStatus) 115 115 #end 116 116 #end 117 117 ## 118 -#if( $cosupervisor ) 119 - #set( $roleSelectedFieldName = "coSupervisors" ) 120 -#elseif( $contact ) 121 - #set( $roleSelectedFieldName = "contact" ) 102 +#if ( $cosupervisor ) 103 + #set ( $roleSelectedFieldName = "coSupervisors" ) 104 +#elseif ( $contact ) 105 + #set ( $roleSelectedFieldName = "contact" ) 122 122 #else 123 - #set( $roleSelectedFieldName = "supervisor" ) 107 + #set ( $roleSelectedFieldName = "supervisor" ) 124 124 #end 125 125 ## 126 -#if( $selectedStatus == 'all' ) 127 - ALL STATUSES 128 -#else 129 - #if( $userSelected ) 130 - #if( $roleSelected ) 131 - #set ($sql = ", BaseObject as obj, StringProperty as prop0, LargeStringProperty as prop1, DateProperty as prop2 132 - 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" ) 110 +#if ($userSelected) 111 + #if ( $roleSelected ) 112 + #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2 113 + where obj.name=doc.fullName and 114 + obj.className='Theses.ThesisClass' and 115 + obj.name<>'Theses.ThesisClassTemplate' and 116 + prop.id.id=obj.id and 117 + prop1.id.id=obj.id and 118 + prop2.id.id=obj.id and 119 + prop.name='status' and 120 + prop.value='$thesisStatus' and 121 + prop1.name='$roleSelectedFieldName' and 122 + prop2.name='$orderingDateFieldName' and 123 + prop1.value like '%$userName%' 124 + order by prop2.value desc") 133 133 #else 134 134 #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, LargeStringProperty as prop2, LargeStringProperty as prop3, DateProperty as prop4 135 135 where obj.name=doc.fullName and 136 - obj.className='Theses.ThesisClass' and 128 + obj.className='Theses.ThesisClass' and 137 137 obj.name<>'Theses.ThesisClassTemplate' and 138 138 prop.id.id=obj.id and 139 139 prop1.id.id=obj.id and ... ... @@ -186,7 +186,7 @@ 186 186 #set($thesisFound = $xwiki.searchDocuments($sql)) 187 187 ## 188 188 #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis)) 189 -* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" || ( $thesisDoc.getValue("studentFirstName")!= "" && $thesisDoc.getValue("studentLastName") != "" ) )//(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end181 +* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis)#if( $thesisDoc.display("endDate") != "" ), #thesisYear($thesis)#end)//#end 190 190 191 191 #end 192 -{{/velocity}} 184 +{{/html}}{{/velocity}}