Changes for page Per Year
From version 20.6
edited by Andrea Omicini
on 25/10/2021 17:06
on 25/10/2021 17:06
Change comment:
There is no comment for this version
To version 20.7
edited by Andrea Omicini
on 25/10/2021 17:08
on 25/10/2021 17:08
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -117,23 +117,27 @@ 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 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 + 124 124 #else 125 ->{{thesisStatus plural='yes' uppercase='yes'}}$t hesisStatus{{thesisStatus}} / $userFirstName $userLastName128 +>{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{thesisStatus}} / $userFirstName $userLastName 126 126 127 127 #end 128 128 #else 129 129 #if( $roleSelected ) 130 ->{{thesisStatus plural='yes' uppercase='yes'}}$t hesisStatus{{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"/}})//#end133 +>{{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 131 131 132 132 #else 133 ->{{thesisStatus plural='yes' uppercase='yes'}}$t hesisStatus{{thesisStatus}}136 +>{{thesisStatus plural='yes' uppercase='yes'}}$selectedStatus{{thesisStatus}} 134 134 135 135 #end 136 136 #end 140 +#end 137 137 ## 138 138 #if( $cosupervisor ) 139 139 #set( $roleSelectedFieldName = "coSupervisors" )