From b09fd024765d5477002891dc92fcc96d0f9d4080 Mon Sep 17 00:00:00 2001
From: Oliboy50 <oliver.thebault@gmail.com>
Date: Tue, 7 Jun 2022 19:47:56 +0200
Subject: [PATCH] feat: add button to sort cards by value

---
 velonimo.css          |  8 +++++-
 velonimo.js           | 58 +++++++++++++++++++++++++++++++++++++++++++
 velonimo_velonimo.tpl |  5 +++-
 3 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/velonimo.css b/velonimo.css
index 05125ab..7adaced 100644
--- a/velonimo.css
+++ b/velonimo.css
@@ -188,7 +188,13 @@ Current player
 .spectatorMode #my-hand-wrapper {
     display: none;
 }
-
+#my-hand-title {
+    display: inline-block;
+}
+#toggle-sort-button {
+    display: inline-block;
+    margin: 0 0 0 10px;
+}
 #my-hand .stockitem {
     border-radius: 10px;
     margin: 5px;
diff --git a/velonimo.js b/velonimo.js
index a6f8238..b5cdee2 100644
--- a/velonimo.js
+++ b/velonimo.js
@@ -64,6 +64,8 @@ const JERSEY_VALUE = 10;
 const DOM_ID_BOARD = 'board';
 const DOM_ID_BOARD_CARPET = 'board-carpet';
 const DOM_ID_PLAYER_HAND = 'my-hand';
+const DOM_ID_PLAYER_HAND_TOGGLE_SORT_BUTTON = 'toggle-sort-button';
+const DOM_ID_PLAYER_HAND_TOGGLE_SORT_BUTTON_LABEL = 'toggle-sort-button-label';
 const DOM_ID_CURRENT_ROUND = 'current-round';
 const DOM_ID_ACTION_BUTTON_PLAY_CARDS = 'action-button-play-cards';
 const DOM_ID_ACTION_BUTTON_PLAY_CARDS_WITH_JERSEY = 'action-button-play-cards-with-jersey';
@@ -81,6 +83,10 @@ const DOM_CLASS_ACTIVE_PLAYER = 'active'
 const DOM_CLASS_SELECTABLE_PLAYER = 'selectable'
 const DOM_CLASS_NON_SELECTABLE_CARD = 'non-selectable-player-card'
 
+// Player hand sorting modes
+const PLAYER_HAND_SORT_BY_COLOR = 'color';
+const PLAYER_HAND_SORT_BY_VALUE = 'value';
+
 // Style
 const BOARD_CARPET_WIDTH = 740;
 const BOARD_CARPET_HEIGHT = 450;
@@ -123,6 +129,8 @@ const PLAYERS_PLACES_BY_NUMBER_OF_PLAYERS = {
             cardsStyle: CARDS_STYLE_BELOW_TABLE,
         },
     },
+    // @TODO: place player 1 and player 3 at the center left and the center right
+    //        and move their played cards to the right and the left respectively
     4: {
         0: {
             tableStyle: `${TABLE_STYLE_VERTICAL_BOTTOM} ${TABLE_STYLE_HORIZONTAL_CENTER}`,
@@ -141,6 +149,9 @@ const PLAYERS_PLACES_BY_NUMBER_OF_PLAYERS = {
             cardsStyle: CARDS_STYLE_BELOW_TABLE,
         },
     },
+    // @TODO: place player 1 and player 4 at the center left and the center right
+    //        and move their played cards to the right and the left respectively
+    //        + place player 2 and 3 at the top middle-left and top middle-right respectively
     5: {
         0: {
             tableStyle: `${TABLE_STYLE_VERTICAL_BOTTOM} ${TABLE_STYLE_HORIZONTAL_LEFT}`,
@@ -165,6 +176,10 @@ const PLAYERS_PLACES_BY_NUMBER_OF_PLAYERS = {
     },
 };
 
+// @TODO: improve current round display
+// @TODO: show cards in logs (especially the cards picked/gave for the impacted players)
+// @TODO: color player names (logs, action messages)
+// @TODO: support 2 players game
 define([
     'dojo','dojo/_base/declare',
     'ebg/core/gamegui',
@@ -272,6 +287,10 @@ function (dojo, declare) {
                     cardPositionInSprite // position in sprite
                 );
             });
+            // sort cards
+            this.onClickOnTogglePlayerHandSortButton();
+            dojo.connect($(DOM_ID_PLAYER_HAND_TOGGLE_SORT_BUTTON), 'onclick', this, 'onClickOnTogglePlayerHandSortButton');
+
 
             // Setup currentPlayer cards
             dojo.connect(this.playerHand, 'onChangeSelection', this, 'onPlayerHandSelectionChanged');
@@ -682,6 +701,33 @@ function (dojo, declare) {
                     return 55;
             }
         },
+        sortPlayerCardsByColor: function () {
+            const cards = this.getAllPlayerCards();
+            const cardsWeightByPosition = {};
+            cards.forEach((card) => {
+                const cardPositionAndWeight = this.getCardPositionInSpriteByColorAndValue(card.color, card.value);
+                cardsWeightByPosition[cardPositionAndWeight] = cardPositionAndWeight;
+            });
+
+            this.playerHand.changeItemsWeight(cardsWeightByPosition);
+        },
+        /**
+         * @param {number} color
+         * @param {number} value
+         * @returns {number}
+         */
+        getCardWeightForColorAndValueToSortThemByValue: function (color, value) {
+            return (value * 100) + color;
+        },
+        sortPlayerCardsByValue: function () {
+            const cards = this.getAllPlayerCards();
+            const cardsWeightByPosition = {};
+            cards.forEach((card) => {
+                cardsWeightByPosition[this.getCardPositionInSpriteByColorAndValue(card.color, card.value)] = this.getCardWeightForColorAndValueToSortThemByValue(card.color, card.value);
+            });
+
+            this.playerHand.changeItemsWeight(cardsWeightByPosition);
+        },
         /**
          * @param {number} position
          * @returns {number}
@@ -1362,6 +1408,18 @@ function (dojo, declare) {
 
             this.unselectAllCards();
         },
+        onClickOnTogglePlayerHandSortButton: function () {
+            const currentSortingMode = dojo.attr(DOM_ID_PLAYER_HAND_TOGGLE_SORT_BUTTON, 'data-current-sort');
+            if (currentSortingMode === PLAYER_HAND_SORT_BY_COLOR) {
+                $(DOM_ID_PLAYER_HAND_TOGGLE_SORT_BUTTON_LABEL).innerHTML = _('Sort by color');
+                dojo.attr(DOM_ID_PLAYER_HAND_TOGGLE_SORT_BUTTON, 'data-current-sort', PLAYER_HAND_SORT_BY_VALUE);
+                this.sortPlayerCardsByValue();
+            } else {
+                $(DOM_ID_PLAYER_HAND_TOGGLE_SORT_BUTTON_LABEL).innerHTML = _('Sort by value');
+                dojo.attr(DOM_ID_PLAYER_HAND_TOGGLE_SORT_BUTTON, 'data-current-sort', PLAYER_HAND_SORT_BY_COLOR);
+                this.sortPlayerCardsByColor();
+            }
+        },
 
         ///////////////////////////////////////////////////
         //// Reaction to cometD notifications
diff --git a/velonimo_velonimo.tpl b/velonimo_velonimo.tpl
index 95d0b20..513d7f4 100644
--- a/velonimo_velonimo.tpl
+++ b/velonimo_velonimo.tpl
@@ -3,7 +3,10 @@
 <div id="board"></div>
 
 <div id="my-hand-wrapper" class="whiteblock">
-    <h3>{MY_HAND}</h3>
+    <div id="my-hand-title-wrapper">
+        <h3 id="my-hand-title">{MY_HAND}</h3>
+        <a href="javascript:void(0)" id="toggle-sort-button" class="bgabutton bgabutton_gray"><span id="toggle-sort-button-label"></span></a>
+    </div>
     <div id="my-hand"></div>
 </div>