1.1.4 Changes

Author: ckalgos

app/function-overrides/popup-override.js

@@ -46,6 +46,9 @@ export const popupOverride = () => {
         case atob("UGF5cGFs"):
         case atob("WW91dHViZSBTdWJzY3JpcHRpb24="):
         case atob("UGF0cmVvbg=="):
+        case atob("RGlzY29yZCAoQ29tbXVuaXR5KQ=="):
+        case atob("VHdpdHRlciAoRmFzdCBSZXNwb25zZSk="):
+        case atob("R2l0aHVi"):
           return e;
       }
       return services.Localization.localize(t);

app/function-overrides/sbcview-override.js

@@ -17,14 +17,16 @@ import {
 } from "../app.constants";
 import { showPopUp } from "./popup-override";
 import { addFutbinCachePrice } from "../utils/futbinUtil";
-import { getValue } from "../services/repository";
+import { getValue, setValue } from "../services/repository";
 import { getSellBidPrice, roundOffPrice } from "../utils/priceUtil";
 
 export const sbcViewOverride = () => {
   const squladDetailPanelView = UTSBCSquadDetailPanelView.prototype.render;
 
   UTSBCSquadDetailPanelView.prototype.render = function (...params) {
     squladDetailPanelView.call(this, ...params);
+    const sbcId = params.length ? params[0].id : "";
+    setValue("squadId", sbcId);
     setTimeout(() => {
       if (!$(".futBinFill").length) {
         $(".challenge-content").append(
@@ -33,9 +35,9 @@ export const sbcViewOverride = () => {
               <input id="squadId" type="text" class="ut-text-input-control futBinId" placeholder="FutBin Id" />
               ${generateButton(
                 idFillSBC,
-                " Auto Fill",
+                "Auto Fill",
                 async () => {
-                  await fillSquad();
+                  await fillSquad(getValue("squadId"));
                 },
                 "call-to-action"
               )}
@@ -52,6 +54,9 @@ export const sbcViewOverride = () => {
           )
         );
       }
+      if (getValue(sbcId)) {
+        appendSquadTotal(getValue(sbcId).value);
+      }
     });
   };
 };
@@ -213,7 +218,7 @@ const buyPlayer = (player, buyPrice) => {
   });
 };
 
-const fillSquad = async () => {
+const fillSquad = async (sbcId) => {
   const squadId = $("#squadId").val();
   if (!squadId) {
     sendUINotification("Squad Id is missing !!!", UINotificationType.NEGATIVE);
@@ -277,13 +282,25 @@ const fillSquad = async () => {
 
   hideLoader();
 
-  $(
-    `<div class="rating">
+  setValue(sbcId, {
+    expiryTimeStamp: new Date(Date.now() + 15 * 60 * 1000),
+    value: squadTotal.toLocaleString(),
+  });
+  appendSquadTotal(squadTotal.toLocaleString());
+};
+
+const appendSquadTotal = (total) => {
+  if ($(".squadTotal").length) {
+    $(".squadTotal").text(total);
+  } else {
+    $(
+      `<div class="rating">
         <span class="ut-squad-summary-label">FUTBIN Squad Price</span>
         <div>
-          <span class="ratingValue currency-coins">${squadTotal.toLocaleString()}</span>
+          <span class="ratingValue squadTotal currency-coins">${total}</span>
         </div> 
       </div>
       `
-  ).insertAfter($(".chemistry"));
+    ).insertAfter($(".chemistry"));
+  }
 };

app/services/club.js

@@ -87,16 +87,19 @@ const downloadClub = async () => {
 
   let csvContent = "";
   const headers =
-    "Player Name,Rating,Rare,Position,Nation,League,Club,Price Range,FUTBIN Price,Bought For,Discard Value,Contract Left,IsUntradable,IsLoaned";
+    "Player Name,Rating,Quality,Rarity,Position,Nation,League,Club,Price Range,FUTBIN Price,Bought For,Discard Value,Contract Left,IsUntradable,IsLoaned";
   csvContent += headers + "\r\n";
   for (const squadMember of squadMembers) {
     let rowRecord = "";
     rowRecord += squadMember._staticData.name + ",";
     rowRecord += squadMember.rating + ",";
+    rowRecord += getCardQuality(squadMember) + ",";
     if (ItemRarity[squadMember.rareflag]) {
       rowRecord += !squadMember.rareflag
         ? "COMMON,"
         : ItemRarity[squadMember.rareflag] + ",";
+    } else if (squadMember.isSpecial()) {
+      rowRecord += "SPECIAL,";
     } else {
       rowRecord += ",";
     }
@@ -150,6 +153,17 @@ const downloadClub = async () => {
   hideLoader();
 };
 
+const getCardQuality = (card) => {
+  if (card.isGoldRating()) {
+    return "Gold";
+  } else if (card.isSilverRating()) {
+    return "Silver";
+  } else if (card.isBronzeRating()) {
+    return "Bronze";
+  }
+  return "";
+};
+
 addBtnListner("#downloadClub", async function () {
   await downloadClub();
 });

app/utils/ratingFilterUtil.js

@@ -4,23 +4,33 @@ import { deletePlayers, insertPlayers } from "./dbUtil";
 import { sendUINotification } from "./notificationUtil";
 
 export const savePlayersWithInRatingRange = async (rating) => {
-  const res = await $.getJSON(
-    `${fut_resourceRoot}${fut_resourceBase}${fut_guid}/${fut_year}/fut/items/web/players.json`
-  );
-
   const playerFilteredIds = [];
   setValue("PlayersRatingRange", []);
   await deletePlayers();
 
+  if (!rating) {
+    return;
+  }
+  const [minRating, maxRating] = rating.split("-").map((a) => a && parseInt(a));
+  const res = await $.getJSON(
+    `${fut_resourceRoot}${fut_resourceBase}${fut_guid}/${fut_year}/fut/items/web/players.json`
+  );
+
   res.LegendsPlayers.reduce(function (filtered, option) {
-    if (rating && option.r === rating) {
+    if (
+      (minRating && option.r >= rating) ||
+      (maxRating && option.r <= maxRating)
+    ) {
       filtered.push(option.id);
     }
     return filtered;
   }, playerFilteredIds);
 
   res.Players.reduce(function (filtered, option) {
-    if (rating && option.r === rating) {
+    if (
+      (minRating && option.r >= rating) ||
+      (maxRating && option.r <= maxRating)
+    ) {
       filtered.push(option.id);
     }
     return filtered;

app/utils/uiUtils/generateTextInput.js

@@ -14,7 +14,6 @@ export const generateTextInput = (
   id,
   info,
   value = null,
-  customCallBack = null,
   type = "number",
   additionalClasses = "settings-field"
 ) => {

app/view/EnhancerSettingsView.js

@@ -77,15 +77,15 @@ EnhancerSettingsView.prototype._generate = function _generate() {
             "",
             { idMinRating },
             "Will only show players with rating as this value in searches",
-            enhancerSetting["idMinRating"]
+            enhancerSetting["idMinRating"],
+            "text"
           )}
           ${generateTextInput(
             "FUTBIN List Duration",
             "1H",
             { idFutBinDuration },
             "List Duration when listing using Re-list FUTBIN",
             enhancerSetting["idFutBinDuration"],
-            null,
             "text"
           )}
           ${generateToggleInput(

tampermonkey-header.js

@@ -2,7 +2,7 @@ module.exports = {
   headers: {
     name: "FUT Trade Enhancer",
     namespace: "http://tampermonkey.net/",
-    version: "1.1.4",
+    version: "1.1.5",
     description: "FUT Trade Enhancer",
     author: "CK Algos",
     match: [