Modifications pour le document RatingWidget

Résumé

• Propriétés de la Page (1 modifications, 0 ajouts, 0 suppressions)

Détails

Propriétés de la Page

Contenu

...	...	@@ -1,38 +1,43 @@
1	1	{{velocity}}
2		-#set($currentDoc = $doc.fullName)
	2	+#if(!$ratingTarget)
	3	+ #set($ratingTarget = $doc.fullName)
	4	+#end
	5	+{{/velocity}}
3	3
4		-#set($storeDoc = $xwiki.getDocument("Flora.RatingStore3"))
5		-#set($objects = $storeDoc.getObjects("Flora.RatingVoteClass3"))
	7	+{{groovy}}
	8	+def currentDoc = "$ratingTarget"
6	6
7		-#set($total = 0)
8		-#set($count = 0)
	10	+def store = xwiki.getDocument("Flora.RatingStore3")
	11	+def objects = store.getObjects("Flora.RatingVoteClass3")
9	9
10		-#foreach($obj in $objects)
11		- #if($obj && $obj.getValue("document") == $currentDoc)
12		- #set($note = $obj.getValue("note"))
13		- #if($note)
14		- #set($total = $total + $note)
15		- #set($count = $count + 1)
16		- #end
17		- #end
18		-#end
	13	+def total = 0
	14	+def count = 0
19	19
20		-#if($count > 0)
21		- #set($avg = $total / $count)
22		-#else
23		- #set($avg = 0)
24		-#end
	16	+if (objects != null) {
	17	+ for (o in objects) {
	18	+ if (o != null) {
	19	+ def docValue = o.getValue("document")
	20	+ def noteValue = o.getValue("note")
25	25
26		-#set($stars = "")
27		-#foreach($i in [1..5])
28		- #if($i <= $avg.round())
29		- #set($stars = "$stars★")
30		- #else
31		- #set($stars = "$stars☆")
32		- #end
33		-#end
34		-{{/velocity}}
	22	+ if (docValue != null && docValue.toString() == currentDoc && noteValue != null) {
	23	+ total += Integer.parseInt(noteValue.toString())
	24	+ count += 1
	25	+ }
	26	+ }
	27	+ }
	28	+}
35	35
	30	+def avg = count > 0 ? total / count : 0
	31	+def stars = ""
	32	+for (int i = 1; i <= 5; i++) {
	33	+ stars += (i <= Math.round(avg)) ? "★" : "☆"
	34	+}
	35	+
	36	+xcontext.put("floraRatingDoc", currentDoc)
	37	+xcontext.put("floraRatingStars", stars)
	38	+xcontext.put("floraRatingCount", count)
	39	+{{/groovy}}
	40	+
36	36	{{html clean="false"}}
37	37	<style>
38	38	.flora-rating-wrap {
...	...	@@ -43,11 +43,16 @@
43	43	align-items: center;
44	44	gap: 14px;
45	45	flex-wrap: wrap;
	51	+ font-size: 14px;
46	46	}
47	47	.flora-rating-label {
48	48	font-weight: 600;
49	49	color: #2A2B69;
50	50	}
	57	+.flora-stars {
	58	+ display: inline-flex;
	59	+ gap: 4px;
	60	+}
51	51	.flora-stars button {
52	52	background: none;
53	53	border: none;
...	...	@@ -54,27 +54,29 @@
54	54	font-size: 22px;
55	55	cursor: pointer;
56	56	color: #d4af37;
	67	+ padding: 0;
	68	+ margin: 0;
57	57	}
58		-.flora-stars button:hover {
	70	+.flora-stars button:hover,
	71	+.flora-stars button.hovered {
59	59	color: #f2c94c;
60	60	}
	74	+.flora-rating-result {
	75	+ color: #2F2F2F;
	76	+}
61	61	</style>
62	62
63		-<div class="flora-rating-wrap" data-doc="$doc.fullName">
64		-
	79	+<div class="flora-rating-wrap" data-doc="$escapetool.xml($floraRatingDoc)">
65	65	<span class="flora-rating-label">Noter cette page</span>
66	66
67	67	<div class="flora-stars">
68		- <button class="flora-star" data-note="1">★</button>
69		- <button class="flora-star" data-note="2">★</button>
70		- <button class="flora-star" data-note="3">★</button>
71		- <button class="flora-star" data-note="4">★</button>
72		- <button class="flora-star" data-note="5">★</button>
	83	+ <button class="flora-star" data-note="1" type="button">★</button>
	84	+ <button class="flora-star" data-note="2" type="button">★</button>
	85	+ <button class="flora-star" data-note="3" type="button">★</button>
	86	+ <button class="flora-star" data-note="4" type="button">★</button>
	87	+ <button class="flora-star" data-note="5" type="button">★</button>
73	73	</div>
74	74
75		- <span>
76		- {{velocity}}$stars ($count votes){{/velocity}}
77		- </span>
78		-
	90	+ <span class="flora-rating-result">$floraRatingStars ($floraRatingCount votes)</span>
79	79	</div>
80	80	{{/html}}