Changes for page Per Year

From version 6.5
edited by Andrea Omicini
on 18/06/2021 00:18
Change comment: There is no comment for this version
To version 1.2
edited by Andrea Omicini
on 16/06/2021 11:02
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,4 +1,6 @@
1 -#includeMacros("Main.MacroSheet")#includeMacros("Theses.MacroSheet")
1 +#includeMacros("Main.MacroSheet")
2 +#includeMacros("Theses.MacroSheet")
3 +#includeMacros("Theses.GlobalVars")
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") )
11 +
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 -##
26 +
24 24  #### handle who & roles
25 25  ##
26 26  #if ( $userName || $userNamePar ) ## a user is specified for all roles
... ... @@ -71,37 +71,19 @@
71 71   #set( $contactFirstName = $contactdoc.display("first_name") )
72 72   #set( $contactLastName = $contactdoc.display("last_name") )
73 73  #end
74 -##
77 +
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 -
81 -#if( $roleSelected )
82 - #if( $userSelected )
83 - #if( $supervisor )
84 -* #stringEnIt("as a supervisor","come relatore")
85 - #end
86 - #if( $cosupervisor )
87 -* #stringEnIt("as a co-supervisor","come correlatore")
88 - #end
89 - #if( $contact )
90 -* #stringEnIt("as a contact","come contatto")
91 - #end
92 - #else
93 - #if( $supervisorLastName != "" )
94 -* #stringEnIt("supervised by","con relatore") $supervisorFirstName $supervisorLastName
95 - #end
96 - #if( $cosupervisorLastName != "" )
97 -* #stringEnIt("co-supervised by","con correlatore") $cosupervisorFirstName $cosupervisorLastName
98 - #end
99 - #if( $contactLastName != "" )
100 -* #stringEnIt("with contact","con contatto") $contactFirstName $contactLastName
101 - #end
102 - #end
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()")
103 103  #end
104 -##
89 +
105 105  ## hypothesis: $thesisStatus set, default "Completed"
106 106  ## to do: get from parameter
107 107  #if ($thesisStatus == "Available")
... ... @@ -120,7 +120,9 @@
120 120  #else
121 121   #set ( $roleSelectedFieldName = "supervisor" )
122 122  #end
123 -##
108 +
109 +1.1 #ThesisStatusesString($thesisStatus)
110 +
124 124  #if ($userSelected)
125 125   #if ( $roleSelected )
126 126   #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2
... ... @@ -192,7 +192,6 @@
192 192  #set($thesisFound = $xwiki.searchDocuments($sql))
193 193  
194 194  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
195 -* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) ~~(#thesisAuthorLink($thesis))~~ #end
196 -
182 +* [$thesisDoc.getValue('title') | $thesis] #if ($thesisDoc.getValue('studentUserName') != "" )(#thesisStudentUser($thesisDoc))#end
197 197  #end
198 198