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.3
edited by Andrea Omicini
on 18/06/2021 00:16
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,7 +71,7 @@
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
... ... @@ -100,7 +100,7 @@
100 100   #end
101 101   #end
102 102  #end
103 -##
105 +
104 104  ## hypothesis: $thesisStatus set, default "Completed"
105 105  ## to do: get from parameter
106 106  #if ($thesisStatus == "Available")
... ... @@ -119,7 +119,7 @@
119 119  #else
120 120   #set ( $roleSelectedFieldName = "supervisor" )
121 121  #end
122 -##
124 +
123 123  #if ($userSelected)
124 124   #if ( $roleSelected )
125 125   #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2