Changes for page Per Year

From version 6.4
edited by Andrea Omicini
on 18/06/2021 00:17
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
... ... @@ -1,4 +1,5 @@
1 -#includeMacros("Main.MacroSheet")#includeMacros("Theses.MacroSheet")
1 +#includeMacros("Main.MacroSheet")
2 +#includeMacros("Theses.MacroSheet")
2 2  
3 3  #### get parameters
4 4  ## who
... ... @@ -6,6 +6,7 @@
6 6  #set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
7 7  #set( $cosupervisorNamePar = $context.getRequest().getParameter("cosupervisor") )
8 8  #set( $contactNamePar = $context.getRequest().getParameter("contact") )
10 +
9 9  #### set default values
10 10  #set( $userSelected = false )
11 11  #set( $roleSelected = false )
... ... @@ -20,7 +20,7 @@
20 20  #set( $contactName = "" )
21 21  #set( $contactFirstName = "" )
22 22  #set( $contactLastName = "" )
23 -##
25 +
24 24  #### handle who & roles
25 25  ##
26 26  #if ( $userName || $userNamePar ) ## a user is specified for all roles
... ... @@ -71,36 +71,19 @@
71 71   #set( $contactFirstName = $contactdoc.display("first_name") )
72 72   #set( $contactLastName = $contactdoc.display("last_name") )
73 73  #end
74 -##
76 +
75 75  ## $userSelected true means one user for all roles
76 76  ## $userSelected true and $roleSelected true for one user with one specific role
77 77  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
78 78  ## both false means all theses
79 -1 #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi") / #ThesisStatusesString($thesisStatus)
80 -#if( $roleSelected )
81 - #if( $userSelected )
82 - #if( $supervisor )
83 -* #stringEnIt("as a supervisor","come relatore")
84 - #end
85 - #if( $cosupervisor )
86 -* #stringEnIt("as a co-supervisor","come correlatore")
87 - #end
88 - #if( $contact )
89 -* #stringEnIt("as a contact","come contatto")
90 - #end
91 - #else
92 - #if( $supervisorLastName != "" )
93 -* #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
94 - #end
95 - #if( $cosupervisorLastName != "" )
96 -* #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
97 - #end
98 - #if( $contactLastName != "" )
99 -* #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
100 - #end
101 - #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()")
102 102  #end
103 -##
88 +
104 104  ## hypothesis: $thesisStatus set, default "Completed"
105 105  ## to do: get from parameter
106 106  #if ($thesisStatus == "Available")
... ... @@ -119,7 +119,9 @@
119 119  #else
120 120   #set ( $roleSelectedFieldName = "supervisor" )
121 121  #end
122 -##
107 +
108 +1.1 #ThesisStatusesString($thesisStatus)
109 +
123 123  #if ($userSelected)
124 124   #if ( $roleSelected )
125 125   #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2