Changes for page Per Year

From version 1.4
edited by Andrea Omicini
on 16/06/2021 11:03
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,6 +1,4 @@
1 -#includeMacros("Main.MacroSheet")
2 -#includeMacros("Theses.MacroSheet")
3 -#includeMacros("Theses.GlobalVars")
1 +#includeMacros("Main.MacroSheet")#includeMacros("Theses.MacroSheet")
4 4  
5 5  #### get parameters
6 6  ## who
... ... @@ -8,7 +8,6 @@
8 8  #set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
9 9  #set( $cosupervisorNamePar = $context.getRequest().getParameter("cosupervisor") )
10 10  #set( $contactNamePar = $context.getRequest().getParameter("contact") )
11 -
12 12  #### set default values
13 13  #set( $userSelected = false )
14 14  #set( $roleSelected = false )
... ... @@ -23,7 +23,7 @@
23 23  #set( $contactName = "" )
24 24  #set( $contactFirstName = "" )
25 25  #set( $contactLastName = "" )
26 -
23 +##
27 27  #### handle who & roles
28 28  ##
29 29  #if ( $userName || $userNamePar ) ## a user is specified for all roles
... ... @@ -74,19 +74,36 @@
74 74   #set( $contactFirstName = $contactdoc.display("first_name") )
75 75   #set( $contactLastName = $contactdoc.display("last_name") )
76 76  #end
77 -
74 +##
78 78  ## $userSelected true means one user for all roles
79 79  ## $userSelected true and $roleSelected true for one user with one specific role
80 80  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
81 81  ## both false means all theses
82 -#if ($userSelected)
83 -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()")
84 -#elseif ( $roleSelected )
85 -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()")
86 -#else
87 - 1 #stringEnIt("Theses","Tesi") #stringEnIt("in the #apice() space","nello spazio #apice()")
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
88 88  #end
89 -
103 +##
90 90  ## hypothesis: $thesisStatus set, default "Completed"
91 91  ## to do: get from parameter
92 92  #if ($thesisStatus == "Available")
... ... @@ -105,9 +105,7 @@
105 105  #else
106 106   #set ( $roleSelectedFieldName = "supervisor" )
107 107  #end
108 -
109 -1.1 #ThesisStatusesString($thesisStatus)
110 -
122 +##
111 111  #if ($userSelected)
112 112   #if ( $roleSelected )
113 113   #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2
... ... @@ -179,6 +179,7 @@
179 179  #set($thesisFound = $xwiki.searchDocuments($sql))
180 180  
181 181  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
182 -* [$thesisDoc.getValue('title') | $thesis] #if ($thesisDoc.getValue('studentUserName') != "" )(#thesisStudentUser($thesis))#end
194 +* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) ~~(#thesisAuthorLink($thesis))~~ #end
195 +
183 183  #end
184 184