Changes for page Per Year

From version 1.12
edited by Andrea Omicini
on 16/06/2021 11:09
Change comment: There is no comment for this version
To version 6.2
edited by Andrea Omicini
on 18/06/2021 00:15
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,6 +1,5 @@
1 1  #includeMacros("Main.MacroSheet")
2 2  #includeMacros("Theses.MacroSheet")
3 -#includeMacros("Theses.GlobalVars")
4 4  
5 5  #### get parameters
6 6  ## who
... ... @@ -79,12 +79,29 @@
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()")
81 +1 #if( $userSelected )$userFirstName $userLastName / #end#stringEnIt("Theses ","Tesi") / #ThesisStatusesString($thesisStatus)
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
88 88  #end
89 89  
90 90  ## hypothesis: $thesisStatus set, default "Completed"
... ... @@ -179,7 +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') != "" && $xwiki.exists($thesisDoc.getValue('studentUserName')) )(#thesisStudentUser($thesis))
183 -#end
198 +* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) ~~(#thesisAuthorLink($thesis))~~ #end
199 +
184 184  #end
185 185