Changes for page Per Year

From version 20.4
edited by Andrea Omicini
on 25/10/2021 17:05
Change comment: There is no comment for this version
To version 20.8
edited by Andrea Omicini
on 25/10/2021 17:10
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -9,7 +9,6 @@
9 9  #else
10 10   #set( $selectedStatus = 'all' )
11 11  #end
12 -$selectedStatus
13 13  ##check velocity variable, takes precedence
14 14  #if( $thesisStatus && $thesisStatus != '' && $allThesisStatuses.contains($thesisStatus.trim().toLowerCase()) )
15 15   #set( $selectedStatus = $thesisStatus.trim().toLowerCase() )
... ... @@ -45,7 +45,8 @@
45 45  ##
46 46  #### handle who & roles
47 47  ##
48 -#if ( $userName || $userNamePar ) ## a user is specified for all roles
47 +#if ( $userName || $userNamePar )
48 +## a user is specified for all roles
49 49   #set( $userSelected = true )
50 50   #if ( !$userName )#set( $userName = "XWiki.$userNamePar" )#end
51 51   #set( $userdoc = $xwiki.getDocument($userName) )
... ... @@ -87,7 +87,7 @@
87 87   #set( $cosupervisorLastName = $cosupervisordoc.display("last_name") )
88 88  #end
89 89  #if( $contact )
90 - #set( $roleSelected = true )
90 + #set( $roleSelected = true )
91 91   #set( $contactName = $userName )
92 92   #set( $contactdoc = $xwiki.getDocument($contactName) )
93 93   #set( $contactFirstName = $contactdoc.display("first_name") )
... ... @@ -117,21 +117,25 @@
117 117  ## $userSelected true and $roleSelected true for one user with one specific role
118 118  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
119 119  ## both false means all theses
120 -#if( $userSelected )
121 - #if( $roleSelected )
122 ->{{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
120 +#if( $selectedStatus == 'all' )
123 123  
124 - #else
125 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName
126 -
127 - #end
128 128  #else
129 - #if( $roleSelected )
130 ->{{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
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
131 131  
127 + #else
128 +>{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{thesisStatus}} / $userFirstName $userLastName
129 +
130 + #end
132 132   #else
133 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}}
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 134  
135 + #else
136 +>{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{thesisStatus}}
137 +
138 + #end
135 135   #end
136 136  #end
137 137  ##