[#31] Annapurna/Shubham - Fix the bug with continue button.

What changes have you made? * Why do we need this change? * What can this change impact?
STEP-tw · Feb 26, 2019 · febd9ea · febd9ea
1 parent 5d43c7c
commit febd9ea
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 26 deletions.
diff --git a/public/scripts/board.js b/public/scripts/board.js
@@ -122,13 +122,13 @@ const declineCharity = function() {
   fetch("/declineCharity");
 };
 
-const getCardTitle = function() {
-  let card = getElementById("card");
-  return card.children[0] && card.children[0].children[0].innerText;
-};
-
-const isSameCard = function(cardTitle) {
-  return cardTitle == getCardTitle();
+const isSameCard = function(card) {
+  const {title, message} = card;
+  const cardTitleDiv = getElementById("card-title");
+  const cardMessageDiv = getElementById("card-message");
+  const cardTitle = cardTitleDiv && cardTitleDiv.innerText;
+  const cardMessage = cardMessageDiv && cardMessageDiv.innerText;
+  return cardTitle == title && cardMessage == message;
 };
 
 const showPlainCard = function(title, expenseAmount, type, msg) {
@@ -138,9 +138,9 @@ const showPlainCard = function(title, expenseAmount, type, msg) {
   cardDiv.classList = [];
   cardDiv.classList.add("plain-card");
   cardDiv.classList.add(type);
-  const titleDiv = createTextDiv(title);
+  const titleDiv = createTextDiv(title, "card-title");
   titleDiv.classList.add("card-title");
-  const expenseDiv = createTextDiv("Pay $ " + expenseAmount);
+  const expenseDiv = createTextDiv("Pay $ " + expenseAmount, "card-message");
   expenseDiv.classList.add("card-expense");
   cardDiv.appendChild(titleDiv);
   cardDiv.appendChild(expenseDiv);
@@ -265,6 +265,7 @@ const polling = function(game) {
 };
 
 const showCard = function(card, isMyTurn, player) {
+  if (isSameCard(card.data)) return;
   const bigDealactions = [acceptBigDeal, declineBigDeal];
 
   const cardHandlers = {

diff --git a/public/scripts/deals.js b/public/scripts/deals.js
@@ -10,7 +10,6 @@ const getCardDiv = function(type) {
 
 const acceptSmallDeal = function(event) {
   let parent = event.target.parentElement;
-  console.log(parent);
   fetch("/acceptSmallDeal")
     .then(data => data.json())
     .then(({isSuccessful}) => {
@@ -99,8 +98,8 @@ const createCardButtons = function(actions) {
 const createRealEstateDealCard = function(actions, card, isMyTurn) {
   const {title, message, cost, mortgage, downPayment, cashflow} = card;
   const cardDiv = getCardDiv("smallDeal");
-  const titleDiv = createTextDiv(title);
-  const messageDiv = createTextDiv(message);
+  const titleDiv = createTextDiv(title, "card-title");
+  const messageDiv = createTextDiv(message, "card-message");
   const mortgageDiv = createTextDiv(`Mortgage : ${mortgage}`);
   const costDiv = createTextDiv(`Cost : ${cost}`);
   const downPaymentDiv = createTextDiv(`Down Payment : ${downPayment}`);
@@ -118,8 +117,8 @@ const createRealEstateDealCard = function(actions, card, isMyTurn) {
 const createGoldSmallDeal = function(actions, card, isMyTurn) {
   const {title, message, numberOfCoins, cost} = card;
   const cardDiv = getCardDiv("smallDeal");
-  const titleDiv = createTextDiv(title);
-  const messageDiv = createTextDiv(message);
+  const titleDiv = createTextDiv(title, "card-title");
+  const messageDiv = createTextDiv(message, "card-message");
   const numberDiv = createTextDiv(`Coins : ${numberOfCoins}`);
   const costDiv = createTextDiv(`Cost : ${cost}`);
   const bottomDiv = createElement("div");
@@ -132,8 +131,8 @@ const createGoldSmallDeal = function(actions, card, isMyTurn) {
 const createCard = function(card) {
   const {title, message, symbol, historicTradingRange, currentPrice} = card;
   const cardDiv = getCardDiv("smallDeal");
-  const titleDiv = createTextDiv(title);
-  const messageDiv = createTextDiv(message);
+  const titleDiv = createTextDiv(title, "card-title");
+  const messageDiv = createTextDiv(message, "card-message");
   const symbolDiv = createTextDiv(`Company Name : ${symbol}`);
   const rangeDiv = createTextDiv(`Range : ${historicTradingRange}`);
   const currentPriceDiv = createTextDiv(`current price : ${currentPrice}`);
@@ -214,7 +213,6 @@ const showBuyAndSellOptions = function(card) {
 
 const showBuyOption = function(card) {
   const cardDiv = createCard(card);
-  console.log("in show buy option");
   const buttons = createElement("div", "buttons-container");
   buttons.classList.add("buttons-div");
   const accept = createAcceptButton(showOptions.bind(null, false));
@@ -251,7 +249,6 @@ const getSmallDealHandler = function(card, isMyTurn) {
     goldCoins: createGoldSmallDeal.bind(null, smallDealactions),
     realEstate: createRealEstateDealCard.bind(null, smallDealactions)
   };
-  // if (card.dealDone) return nothing;
   return (
     dealCardTypes[card.data.relatedTo] &&
     dealCardTypes[card.data.relatedTo].bind(null, card.data, isMyTurn)

diff --git a/public/scripts/market.js b/public/scripts/market.js
@@ -7,7 +7,7 @@ const getCommon = function(list1, list2) {
   }, []);
 };
 
-const handleRealEstate = function(player, { relatedRealEstates }) {
+const handleRealEstate = function(player, {relatedRealEstates}) {
   const playerRealEstates = player.liabilities.realEstate;
   const commonEstates = getCommon(relatedRealEstates, playerRealEstates);
   const cardDiv = getElementById("card");
@@ -23,7 +23,7 @@ const handleRealEstate = function(player, { relatedRealEstates }) {
 
 const handleGoldCoin = function() {};
 const handleMarketCard = function(player, card) {
-  const { relatedTo } = card;
+  const {relatedTo} = card;
   const marketHandlers = {
     realEstate: handleRealEstate,
     goldCoin: handleGoldCoin
@@ -33,10 +33,10 @@ const handleMarketCard = function(player, card) {
 };
 
 const showMarketCard = function(card, player) {
-  const { title, message } = card.data;
+  const {title, message} = card.data;
   const cardDiv = getElementById("card");
-  const titleDiv = createTextDiv(title);
-  const messageDiv = createTextDiv(message);
+  const titleDiv = createTextDiv(title, "card-title");
+  const messageDiv = createTextDiv(message, "card-message");
   cardDiv.className = "plain-card market-card";
   titleDiv.className = "card-title";
   messageDiv.className = "card-message";
@@ -55,7 +55,7 @@ const completeTurn = function() {
 const sellEstate = function(estate) {
   fetch("/sellestate", {
     method: "POST",
-    headers: { "Content-Type": "application/json" },
+    headers: {"Content-Type": "application/json"},
     body: JSON.stringify(estate)
   });
   showCommonEstates();

diff --git a/public/scripts/professions.js b/public/scripts/professions.js
@@ -34,7 +34,7 @@ const getProfessions = function() {
   fetch("/getgame")
     .then(data => data.json())
     .then(({players}) => {
-      let container = document.getElementById("container");
+      let container = document.getElementById("profession-container");
       players.map(getProfessionsDiv).join("");
       let button = createPopupButton("continue", createFinancialStatement);
       container.appendChild(button);

diff --git a/public/scripts/utils.js b/public/scripts/utils.js
@@ -127,10 +127,11 @@ const showOverlay = function(id) {
   element.style.visibility = "visible";
 };
 
-const createTextDiv = function(text) {
+const createTextDiv = function(text, id) {
   const textDiv = document.createElement("div");
   const textPara = document.createElement("p");
   textPara.innerText = text;
+  textPara.id = id;
   textDiv.appendChild(textPara);
   return textDiv;
 };