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.4
edited by Andrea Omicini
on 18/06/2021 00:17
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,5 +1,4 @@
1 -#includeMacros("Main.MacroSheet")
2 -#includeMacros("Theses.MacroSheet")
1 +#includeMacros("Main.MacroSheet")#includeMacros("Theses.MacroSheet")
3 3  
4 4  #### get parameters
5 5  ## who
... ... @@ -7,7 +7,6 @@
7 7  #set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
8 8  #set( $cosupervisorNamePar = $context.getRequest().getParameter("cosupervisor") )
9 9  #set( $contactNamePar = $context.getRequest().getParameter("contact") )
10 -
11 11  #### set default values
12 12  #set( $userSelected = false )
13 13  #set( $roleSelected = false )
... ... @@ -22,7 +22,7 @@
22 22  #set( $contactName = "" )
23 23  #set( $contactFirstName = "" )
24 24  #set( $contactLastName = "" )
25 -
23 +##
26 26  #### handle who & roles
27 27  ##
28 28  #if ( $userName || $userNamePar ) ## a user is specified for all roles
... ... @@ -73,7 +73,7 @@
73 73   #set( $contactFirstName = $contactdoc.display("first_name") )
74 74   #set( $contactLastName = $contactdoc.display("last_name") )
75 75  #end
76 -
74 +##
77 77  ## $userSelected true means one user for all roles
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
... ... @@ -102,7 +102,7 @@
102 102   #end
103 103   #end
104 104  #end
105 -
103 +##
106 106  ## hypothesis: $thesisStatus set, default "Completed"
107 107  ## to do: get from parameter
108 108  #if ($thesisStatus == "Available")
... ... @@ -121,7 +121,7 @@
121 121  #else
122 122   #set ( $roleSelectedFieldName = "supervisor" )
123 123  #end
124 -
122 +##
125 125  #if ($userSelected)
126 126   #if ( $roleSelected )
127 127   #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2