Changes for page Per Year

From version 6.3
edited by Andrea Omicini
on 18/06/2021 00:16
Change comment: There is no comment for this version
To version 6.1
edited by Andrea Omicini
on 16/06/2021 19:33
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -78,29 +78,12 @@
78 78  ## $userSelected true and $roleSelected true for one user with one specific role
79 79  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
80 80  ## both false means all theses
81 -1 #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi") / #ThesisStatusesString($thesisStatus)
82 -#if( $roleSelected )
83 - #if( $userSelected )
84 - #if( $supervisor )
85 -* #stringEnIt("as a supervisor","come relatore")
86 - #end
87 - #if( $cosupervisor )
88 -* #stringEnIt("as a co-supervisor","come correlatore")
89 - #end
90 - #if( $contact )
91 -* #stringEnIt("as a contact","come contatto")
92 - #end
93 - #else
94 - #if( $supervisorLastName != "" )
95 -* #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
96 - #end
97 - #if( $cosupervisorLastName != "" )
98 -* #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
99 - #end
100 - #if( $contactLastName != "" )
101 -* #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
102 - #end
103 - #end
81 +#if ($userSelected)
82 +1 #stringEnIt("Theses with ","Tesi con") $userFirstName $userLastName #if($supervisor)#stringEnIt("as a supervisor","come relatore")#end#if($cosupervisor)#stringEnIt("as a co-supervisor","come correlatore")#end#if($contact)#stringEnIt("as a contact","come contatto")#end #stringEnIt("in the #apice() space","nello spazio #apice()")
83 +#elseif ( $roleSelected )
84 +1 #stringEnIt("Theses","Tesi") #if($supervisorLastName != "") #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName#if($cosupervisorLastName != "" || $contactLastName != ""), #end#end#if($cosupervisorLastName != "") #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName#if($contactLastName != ""), #end#end #if($contactLastName != "") #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName#end #stringEnIt("in the #apice() space","nello spazio #apice()")
85 +#else
86 + 1 #stringEnIt("Theses","Tesi") #stringEnIt("in the #apice() space","nello spazio #apice()")
104 104  #end
105 105  
106 106  ## hypothesis: $thesisStatus set, default "Completed"
... ... @@ -122,6 +122,8 @@
122 122   #set ( $roleSelectedFieldName = "supervisor" )
123 123  #end
124 124  
108 +1.1 #ThesisStatusesString($thesisStatus)
109 +
125 125  #if ($userSelected)
126 126   #if ( $roleSelected )
127 127   #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2