Changes for page Homeopaths

Last modified by Jip-jan Alunkel on March 14, 20:13
From version 10.58
edited by Jip-jan Alunkel
on March 14, 20:01
Change comment: Renamed from xwiki:practices.WebHome
To version 10.47
edited by Jip-jan Alunkel
on March 14, 19:33
Change comment: Renamed from xwiki:practices.WebHome

Summary

Details

Page properties
Content
... ... @@ -9,14 +9,21 @@
9 9  {{html wiki="false" clean="false"}}
10 10  <p>
11 11  All about the page "homeopaths". Where is it for?
12 + #set($aq = $services.query.xwql("from doc.object(homeopaths.Code.homeopathsClass) as homepath where homepath.doc_owner like :usr escape '!'"))
13 + #set($usrName = $xwiki.getDocument($xcontext.getUserReference()).getFullName())
14 + #set($ar = $aq.bindValue('usr',"${usrName}").execute())
15 +
16 +##.anyChars()
17 +$usrName
18 +$ar
19 +
12 12  </p>
13 13  <div id="homeopaths_map"></div>
14 14  #if(!$isGuest)
15 15   #set($hasPractice = $xwiki.getDocument($xcontext.getUserReference()).getObject('XWiki.XWikiUsers').getProperty('practice').value)
16 16   #if($hasPractice)
17 - #set($q = $services.query.xwql("from doc.object(homeopaths.Code.homeopathsClass) as homepath where homepath.doc_owner like :usr"))
18 - #set($usrName = $xwiki.getDocument($xcontext.getUserReference()).getFullName())
19 - #set($r = $q.bindValue('usr',"${usrName}").execute())
25 + #set($q = $services.query.xwql("from doc.object(homeopaths.Code.homeopathsClass) as obj where obj.doc_owner like :usr"))
26 + #set($r = $q.bindValue('usr').literal("${xcontext}.getUserReference().getName()").query().execute())
20 20   #set($practiceExists = $r.size() > 0)
21 21   #if(!$practiceExists)
22 22  <h2 id="add_practice">Add your practice to the map</h2>
XWiki.JavaScriptExtension[0]
Code
... ... @@ -13,19 +13,16 @@
13 13   #foreach($item in $result)
14 14   #set($result_doc = $xwiki.getDocument("${item}"))
15 15   #set($result_obj = $result_doc.getObject("homeopaths.Code.homeopathsClass"))
16 -
17 - #set($addressArray = ['pmStreet','pmHousenumber','pmPostcode','pmCity','pmState','pmCounty','pmCountry'])
18 - #set($x = {})
19 - #foreach($datapart in $addressArray)
20 - #if($result_obj.getProperty($datapart))
21 - #set($datapart4Publish = $result_obj.getProperty($datapart).value)
22 - #if($datapart == 'pmCountry')
23 - #set($datapart4Publish = $datapart4Publish.toUpperCase())
24 - #end
25 - #set($discard = $x.put("$datapart", $datapart4Publish))
16 + #set($addressArray = $result_obj.getProperty("address").value.split(","))
17 + #set($address = "")
18 + #foreach($address_item in $addressArray)
19 + #if($foreach.hasNext)
20 + #set($linebreak = "<br />")
21 + #else
22 + #set($linebreak = "")
26 26   #end
24 + #set($address = "${address}${address_item.trim()}${linebreak}")
27 27   #end
28 - #set($address = "$doc.getTitle()<br />$x['pmStreet'] $x['pmHousenumber']<br />$x['pmPostcode'] $x['pmCity']<br />$x['pmCounty'] $x['pmState']<br />$x['pmCountry']")
29 29   #set($info = "<h4><a href='$xwiki.getURL($result_doc.documentReference)'>${stringtool.capitalize($result_doc.getDisplayTitle())}</a></h4><address>${address}</address>")
30 30   #set($discard = $map.put($info, $result_obj.getProperty("latlong").value))
31 31   #end