Changes for page Per Year

From version 7.2
edited by Andrea Omicini
on 18/06/2021 00:21
Change comment: There is no comment for this version
To version 6.1
edited by Andrea Omicini
on 16/06/2021 19:33
Change comment: There is no comment for this version

Summary

Details

Page properties
Syntax
... ... @@ -1,1 +1,1 @@
1 -XWiki 2.1
1 +XWiki 1.0
Content
... ... @@ -1,4 +1,6 @@
1 -{{include document="Main.MacroSheet"/}}{{include document="Theses.MacroSheet"/}}{{velocity filter="none"}}
1 +#includeMacros("Main.MacroSheet")
2 +#includeMacros("Theses.MacroSheet")
3 +
2 2  #### get parameters
3 3  ## who
4 4  #set( $userNamePar = $context.getRequest().getParameter("user") )
... ... @@ -5,6 +5,7 @@
5 5  #set( $supervisorNamePar = $context.getRequest().getParameter("supervisor") )
6 6  #set( $cosupervisorNamePar = $context.getRequest().getParameter("cosupervisor") )
7 7  #set( $contactNamePar = $context.getRequest().getParameter("contact") )
10 +
8 8  #### set default values
9 9  #set( $userSelected = false )
10 10  #set( $roleSelected = false )
... ... @@ -19,7 +19,7 @@
19 19  #set( $contactName = "" )
20 20  #set( $contactFirstName = "" )
21 21  #set( $contactLastName = "" )
22 -##
25 +
23 23  #### handle who & roles
24 24  ##
25 25  #if ( $userName || $userNamePar ) ## a user is specified for all roles
... ... @@ -70,40 +70,19 @@
70 70   #set( $contactFirstName = $contactdoc.display("first_name") )
71 71   #set( $contactLastName = $contactdoc.display("last_name") )
72 72  #end
73 -##
76 +
74 74  ## $userSelected true means one user for all roles
75 75  ## $userSelected true and $roleSelected true for one user with one specific role
76 76  ## if $userSelected false and $roleSelected true mean at least one role with an assigned user
77 77  ## both false means all theses
78 -
79 -
80 -== #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 -<p/>
103 - #end
104 - #end
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()")
105 105  #end
106 -##
88 +
107 107  ## hypothesis: $thesisStatus set, default "Completed"
108 108  ## to do: get from parameter
109 109  #if ($thesisStatus == "Available")
... ... @@ -122,7 +122,9 @@
122 122  #else
123 123   #set ( $roleSelectedFieldName = "supervisor" )
124 124  #end
125 -##
107 +
108 +1.1 #ThesisStatusesString($thesisStatus)
109 +
126 126  #if ($userSelected)
127 127   #if ( $roleSelected )
128 128   #set ($sql = ", BaseObject as obj, StringProperty as prop, LargeStringProperty as prop1, DateProperty as prop2
... ... @@ -194,7 +194,7 @@
194 194  #set($thesisFound = $xwiki.searchDocuments($sql))
195 195  
196 196  #foreach ($thesis in $thesisFound)#set($thesisDoc = $xwiki.getDocument($thesis))
197 -* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) //(#thesisAuthorLink($thesis))// #end
181 +* #thesisTitleLink($thesis)#if( $thesisDoc.getValue("studentUserName") != "" || $thesisDoc.getValue("studentName") != "" ) ~~(#thesisAuthorLink($thesis))~~ #end
198 198  
199 199  #end
200 -{{/velocity}}
184 +