fix #281: standardize category / subcategory / alternate_subcategory …

…format
qbreader · Jul 27, 2024 · 53b1fd8 · 53b1fd8
1 parent afab556
commit 53b1fd8
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/client/database/BonusCard.js b/client/database/BonusCard.js
@@ -93,7 +93,7 @@ export default function BonusCard({
   }, /*#__PURE__*/React.createElement("b", {
     className: "clickable",
     onClick: clickToCopy
-  }, bonus.set.name, " | ", bonus.category, " | ", bonus.subcategory, " ", bonus.alternate_subcategory ? ' (' + bonus.alternate_subcategory + ')' : '', " | ", bonus.difficulty), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("b", {
+  }, bonus.set.name, " | ", bonus.category, " | ", bonus.subcategory, " ", bonus.alternate_subcategory ? ' | ' + bonus.alternate_subcategory : '', " | ", bonus.difficulty), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("b", {
     className: "clickable",
     "data-bs-toggle": "collapse",
     "data-bs-target": `#question-${_id}`

diff --git a/client/database/BonusCard.jsx b/client/database/BonusCard.jsx
@@ -93,7 +93,7 @@ export default function BonusCard ({ bonus, highlightedBonus, hideAnswerlines, s
     <div className='card my-2'>
       <div className='card-header d-flex justify-content-between'>
         <b className='clickable' onClick={clickToCopy}>
-          {bonus.set.name} | {bonus.category} | {bonus.subcategory} {bonus.alternate_subcategory ? ' (' + bonus.alternate_subcategory + ')' : ''} | {bonus.difficulty}
+          {bonus.set.name} | {bonus.category} | {bonus.subcategory} {bonus.alternate_subcategory ? ' | ' + bonus.alternate_subcategory : ''} | {bonus.difficulty}
         </b>
         <span>
           <b className='clickable' data-bs-toggle='collapse' data-bs-target={`#question-${_id}`}>

diff --git a/client/database/TossupCard.js b/client/database/TossupCard.js
@@ -88,7 +88,7 @@ export default function TossupCard({
   }, /*#__PURE__*/React.createElement("b", {
     className: "clickable",
     onClick: clickToCopy
-  }, tossup.set.name, " | ", tossup.category, " | ", tossup.subcategory, " ", tossup.alternate_subcategory ? ' (' + tossup.alternate_subcategory + ')' : '', " | ", tossup.difficulty), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("b", {
+  }, tossup.set.name, " | ", tossup.category, " | ", tossup.subcategory, " ", tossup.alternate_subcategory ? ' | ' + tossup.alternate_subcategory : '', " | ", tossup.difficulty), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("b", {
     className: "clickable",
     "data-bs-toggle": "collapse",
     "data-bs-target": `#question-${_id}`

diff --git a/client/database/TossupCard.jsx b/client/database/TossupCard.jsx
@@ -87,7 +87,7 @@ export default function TossupCard ({ tossup, highlightedTossup, hideAnswerline,
     <div className='card my-2'>
       <div className='card-header d-flex justify-content-between'>
         <b className='clickable' onClick={clickToCopy}>
-          {tossup.set.name} | {tossup.category} | {tossup.subcategory} {tossup.alternate_subcategory ? ' (' + tossup.alternate_subcategory + ')' : ''} | {tossup.difficulty}
+          {tossup.set.name} | {tossup.category} | {tossup.subcategory} {tossup.alternate_subcategory ? ' | ' + tossup.alternate_subcategory : ''} | {tossup.difficulty}
         </b>
         <span>
           <b className='clickable' data-bs-toggle='collapse' data-bs-target={`#question-${_id}`}>

diff --git a/client/database/stringify.js b/client/database/stringify.js
@@ -13,7 +13,7 @@ function stringifyBonus (bonus, includeMetadata = false) {
     textdata += `${getBonusPartLabel(bonus, i)} ${bonus.parts_sanitized[i]}\n`;
     textdata += `ANSWER: ${bonus.answers_sanitized[i]}\n`;
   }
-  textdata += `<${bonus.category} / ${bonus.subcategory}${bonus.alternate_subcategory ? ' (' + bonus.alternate_subcategory + ')' : ''}>\n`;
+  textdata += `<${bonus.category} / ${bonus.subcategory}${bonus.alternate_subcategory ? ' / ' + bonus.alternate_subcategory : ''}>\n`;
   return textdata;
 }
 
@@ -27,7 +27,7 @@ function stringifyTossup (tossup, includeMetadata = false) {
 
   textdata += `${tossup.number}. ${tossup.question_sanitized}\n`;
   textdata += `ANSWER: ${tossup.answer_sanitized}\n`;
-  textdata += `<${tossup.category} / ${tossup.subcategory}${tossup.alternate_subcategory ? ' (' + tossup.alternate_subcategory + ')' : ''}>\n`;
+  textdata += `<${tossup.category} / ${tossup.subcategory}${tossup.alternate_subcategory ? ' / ' + tossup.alternate_subcategory : ''}>\n`;
   return textdata;
 }
 

diff --git a/client/scripts/utilities/index.js b/client/scripts/utilities/index.js
@@ -85,7 +85,7 @@ const createBonusCard = (function () {
                     ${cardBody}
                 </div>
                 <div class="card-footer">
-                    <small class="text-muted">${set.name} / ${category} / ${subcategory} ${alternateSubcategory ? '(' + alternateSubcategory + ')' : ''}</small>
+                    <small class="text-muted">${set.name} / ${category} / ${subcategory}${alternateSubcategory ? ' / ' + alternateSubcategory : ''}</small>
                     <small class="text-muted float-end">Packet ${packet.number} / Question ${number}</small>
                 </div>
             </div>
@@ -158,7 +158,7 @@ const createTossupCard = (function () {
                     <div>ANSWER: ${answer}</div>
                 </div>
                 <div class="card-footer">
-                    <small class="text-muted">${set.name} / ${category} / ${subcategory} ${alternateSubcategory ? '(' + alternateSubcategory + ')' : ''}</small>
+                    <small class="text-muted">${set.name} / ${category} / ${subcategory}${alternateSubcategory ? ' / ' + alternateSubcategory : ''}</small>
                     <small class="text-muted float-end">Packet ${packet.number} / Question ${number}</small>
                 </div>
             </div>