Changes for page Per Year

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

Summary

Details

Page properties
Content
... ... @@ -44,8 +44,7 @@
44 44  ##
45 45  #### handle who & roles
46 46  ##
47 -#if ( $userName || $userNamePar )
48 -## a user is specified for all roles
47 +#if ( $userName || $userNamePar ) ## 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,57 +87,34 @@
87 87   #set( $cosupervisorLastName = $cosupervisordoc.display("last_name") )
88 88  #end
89 89  #if( $contact )
90 - #set( $roleSelected = true )
89 + #set( $roleSelected = true )
91 91   #set( $contactName = $userName )
92 92   #set( $contactdoc = $xwiki.getDocument($contactName) )
93 93   #set( $contactFirstName = $contactdoc.display("first_name") )
94 94   #set( $contactLastName = $contactdoc.display("last_name") )
95 95  #end
96 -$selectedStatus
97 -
98 -$userSelected
99 -
100 -$roleSelected
101 -
102 -$supervisor
103 -
104 -$cosupervisor
105 -
106 -$contact
107 -
108 -$userFirstName $userLastName
109 -
110 -$supervisorFirstName $supervisorLastName
111 -
112 -$cosupervisorFirstName $cosupervisorLastName
113 -
114 -$contactFirstName $contactLastName
115 115  ##
116 116  ## $userSelected true and $roleSelected false means one user for all roles
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( $selectedStatus == 'all' )
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
121 121  
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 -
127 127   #else
128 ->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{thesisStatus}} / $userFirstName $userLastName
105 +>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName
129 129  
130 130   #end
131 131  #else
132 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
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
134 134  
135 135   #else
136 ->{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{thesisStatus}}
113 +>{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}}
137 137  
138 138   #end
139 139  #end
140 -#end
141 141  ##
142 142  #if( $cosupervisor )
143 143   #set( $roleSelectedFieldName = "coSupervisors" )