Changes for page Per Year

From version 20.3
edited by Andrea Omicini
on 25/10/2021 17:04
Change comment: There is no comment for this version
To version 20.10
edited by Andrea Omicini
on 25/10/2021 17:12
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") )
... ... @@ -94,14 +94,23 @@
94 94   #set( $contactLastName = $contactdoc.display("last_name") )
95 95  #end
96 96  $selectedStatus
97 +
97 97  $userSelected
99 +
98 98  $roleSelected
101 +
99 99  $supervisor
103 +
100 100  $cosupervisor
105 +
101 101  $contact
107 +
102 102  $userFirstName $userLastName
109 +
103 103  $supervisorFirstName $supervisorLastName
111 +
104 104  $cosupervisorFirstName $cosupervisorLastName
113 +
105 105  $contactFirstName $contactLastName
106 106  ##
107 107  ## $userSelected true and $roleSelected false means one user for all roles
... ... @@ -108,21 +108,25 @@
108 108  ## $userSelected true and $roleSelected true for one user with one specific role
109 109  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
110 110  ## both false means all theses
111 -#if( $userSelected )
112 - #if( $roleSelected )
113 ->{{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
114 -
115 - #else
116 ->{{thesisStatus plural='yes' uppercase='yes'}}$thesisStatus{{thesisStatus}} / $userFirstName $userLastName
117 -
118 - #end
120 +#if( $selectedStatus == 'all' )
121 +ALLL
119 119  #else
120 - #if( $roleSelected )
121 ->{{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 ) user sel
124 + #if( $roleSelected ) role sel
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
122 122  
127 + #else no role sel
128 +>{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}} / $userFirstName $userLastName
129 +
130 + #end
123 123   #else
124 ->{{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
125 125  
135 + #else
136 +>{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{/thesisStatus}}
137 +
138 + #end
126 126   #end
127 127  #end
128 128  ##