Changes for page Per Year

From version 1.18
edited by Andrea Omicini
on 16/06/2021 16:56
Change comment: There is no comment for this version
To version 6.6
edited by Andrea Omicini
on 18/06/2021 00:18
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,19 +73,38 @@
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
80 80  ## both false means all theses
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()")
87 -#end
88 88  
80 +1 #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi") / #ThesisStatusesString($thesisStatus)
81 +
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
104 +#end
105 +##
89 89  ## hypothesis: $thesisStatus set, default "Completed"
90 90  ## to do: get from parameter
91 91  #if ($thesisStatus == "Available")
... ... @@ -104,9 +104,7 @@
104 104  #else
105 105   #set ( $roleSelectedFieldName = "supervisor" )
106 106  #end
107 -
108 -1.1 #ThesisStatusesString($thesisStatus)
109 -
124 +##
110 110  #if ($userSelected)
111 111   #if ( $roleSelected )
112 112   #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2
... ... @@ -178,7 +178,7 @@
178 178  #set($thesisFound = $xwiki.searchDocuments($sql))
179 179  
180 180  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
181 -* [$thesisDoc.getValue('title') | $thesis] #if( $thesisDoc.getValue('studentUserName') != "" && $xwiki.exists($thesisDoc.getValue('studentUserName')) ) ~~(#thesisStudentUser($thesis))~~ #elseif ( $thesisDoc.getValue('studentName') != "" ) ~~($thesisDoc.getValue('studentName'))~~ #end
196 +* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) ~~(#thesisAuthorLink($thesis))~~ #end
182 182  
183 183  #end
184 184