Changes for page Per Year

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

Summary

Details

Page properties
Content
... ... @@ -44,7 +44,8 @@
44 44  ##
45 45  #### handle who & roles
46 46  ##
47 -#if ( $userName || $userNamePar ) ## a user is specified for all roles
47 +#if ( $userName || $userNamePar )
48 +## a user is specified for all roles
48 48   #set( $userSelected = true )
49 49   #if ( !$userName )#set( $userName = "XWiki.$userNamePar" )#end
50 50   #set( $userdoc = $xwiki.getDocument($userName) )
... ... @@ -86,7 +86,7 @@
86 86   #set( $cosupervisorLastName = $cosupervisordoc.display("last_name") )
87 87  #end
88 88  #if( $contact )
89 - #set( $roleSelected = true )
90 + #set( $roleSelected = true )
90 90   #set( $contactName = $userName )
91 91   #set( $contactdoc = $xwiki.getDocument($contactName) )
92 92   #set( $contactFirstName = $contactdoc.display("first_name") )
... ... @@ -116,23 +116,27 @@
116 116  ## $userSelected true and $roleSelected true for one user with one specific role
117 117  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
118 118  ## both false means all theses
119 -#if( $userSelected )
120 - #if( $roleSelected )
121 ->{{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' )
122 122  
122 +#else
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
126 +
123 123   #else
124 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName
128 +>{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{thesisStatus}} / $userFirstName $userLastName
125 125  
126 126   #end
127 127  #else
128 128   #if( $roleSelected )
129 ->{{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
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
130 130  
131 131   #else
132 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}}
136 +>{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{thesisStatus}}
133 133  
134 134   #end
135 135  #end
140 +#end
136 136  ##
137 137  #if( $cosupervisor )
138 138   #set( $roleSelectedFieldName = "coSupervisors" )