Working on vclaim

lorserker · Oct 8, 2023 · 2852e27 · 2852e27
1 parent 9403b2f
commit 2852e27
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/src/frontend/bridge.html b/src/frontend/bridge.html
@@ -144,11 +144,15 @@
                     if (deal.hand.isPlayable(card, deal.currentTrick)) {
                         ws.send(card.symbol)
                         deal.expectCardInput = false
+                    } else {
+                        alert("Card not valid")
                     }
                 } else if (deal.turn == 0) {
                     if (deal.public.isPlayable(card, deal.currentTrick)) {
                         ws.send(card.symbol)
                         deal.expectCardInput = false
+                    } else {
+                        alert("Card not valid")
                     }
                 }
             }
@@ -206,9 +210,10 @@
         function claimClick(event) {
 
             let claim = event.target.getAttribute("tricks")
-            console.log("Claimed "+claim+ "tricks")
-
-            ws.send(claim)
+            console.log("Claimed "+claim+ " tricks")
+            alert("Claim not implemented")
+            //ws.send(claim)
+            deal.expectCardInput = true
         }
 
         document.querySelector('body').addEventListener('click', function() {

diff --git a/src/frontend/bridge.js b/src/frontend/bridge.js
@@ -277,7 +277,7 @@ class Deal {
     renderClaim(element) {
         element.textContent = ''
         let html = ''
-        if ((this.tricksCount[0] + this.tricksCount[1]) > 12) {
+        if ((this.tricksCount[0] + this.tricksCount[1]) > 13) {
             html += 'Claim: '
             html += '<div id="claim-tricks">'
             html += '<div tricks="0">0</div>'

diff --git a/src/frontend/viz.html b/src/frontend/viz.html
@@ -97,6 +97,7 @@
 
   </div>
 
+  <div id="rebid"></div>
   <div id="replay"></div>
   <div id="solver"></div>
 
@@ -144,9 +145,16 @@
                                 }
 
                                 let dealer = 'NESW'.charAt(deal.data.dealer)
-                                const replayContent = '<a href="http://127.0.0.1:8080/app/bridge.html?deal=' +
+                                const rebidContent = '<a href="http://127.0.0.1:8080/app/bridge.html?deal=' +
                                     '(\'' + deal.data.hands + '\', \'' + dealer + ' ' + vul + '\')' +
-                                    '&P=5&board_no='+deal.board_number()+'"> Play it again </a><br>';
+                                    '&P=5&board_no=' + deal.board_number() + '"> Bid and play it again </a><br>';
+
+                                document.querySelector('#rebid').innerHTML = rebidContent;
+
+                                console.log(auction.auctionString)
+                                const replayContent = '<a href="http://127.0.0.1:8080/app/bridge.html?deal=' +
+                                    '(\'' + deal.data.hands + '\', \'' + dealer + ' ' + vul + ' ' + auction.auctionString +'\')' +
+                                    '&P=5&board_no=' + deal.board_number() + '"> Play it again </a><br>';
 
                                 document.querySelector('#replay').innerHTML = replayContent;
 

diff --git a/src/frontend/viz.js b/src/frontend/viz.js
@@ -372,6 +372,10 @@ class Auction {
         for (var i = 0; i < bids.length; i++) {
             this.paddedBids.push(bids[i]['bid'])
         }
+        this.auctionString = ''
+        for (var i = 0; i < bids.length; i++) {
+            this.auctionString += bids[i]['bid'].replace("PASS","P") + " "
+        }
     }
 
     render(element) {