ADR Updates March 2024

7Cav · Mar 20, 2024 · 7d493c3 · 7d493c3
1 parent 121d084
commit 7d493c3
Show file tree

Hide file tree

Showing 5 changed files with 306 additions and 32 deletions.
diff --git a/client/src/modules/Generic/ArrayBuilder.js b/client/src/modules/Generic/ArrayBuilder.js
@@ -1,8 +1,8 @@
 //This is included to generate arrays for large ammounts of billets. This is otherwise unused in the final product
 
 let countString = "";
-let i = 629;
-let stopper = 644;
+let i = 480;
+let stopper = 524;
 
 do {
   countString = `${countString},'${i}'`;

diff --git a/client/src/modules/Generic/BilletBank.js b/client/src/modules/Generic/BilletBank.js
@@ -341,22 +341,226 @@ const charlie2 = [
   "478",
   "479",
 ];
+const echo2 = [
+  "480",
+  "481",
+  "482",
+  "483",
+  "484",
+  "485",
+  "486",
+  "487",
+  "488",
+  "489",
+  "490",
+  "491",
+  "492",
+  "493",
+  "494",
+  "495",
+  "496",
+  "497",
+  "498",
+  "499",
+  "500",
+  "501",
+  "502",
+  "503",
+  "504",
+  "505",
+  "506",
+  "507",
+  "508",
+  "509",
+  "510",
+  "511",
+  "512",
+  "513",
+  "514",
+  "515",
+  "516",
+  "517",
+  "518",
+  "519",
+  "520",
+  "521",
+  "522",
+  "523",
+  "524",
+];
 
 const twoSeven = {
-  positionIds: [twoSevenCommand, alpha2, bravo2, charlie2],
+  positionIds: [twoSevenCommand, alpha2, bravo2, charlie2, echo2],
   positionTitles: [
     "2-7 Headquarters",
+    "Able Company",
+    "Baker Company",
+    "Charlie Company",
+    "Easy Company",
+  ],
+  collapsibleTitle: "Second Battalion",
+};
+
+//3-7
+
+const threeSevenCommand = ["796", "797", "798"];
+const alpha3 = [
+  "799",
+  "800",
+  "801",
+  "802",
+  "803",
+  "804",
+  "805",
+  "806",
+  "807",
+  "808",
+  "809",
+  "810",
+  "811",
+  "812",
+  "813",
+  "814",
+  "815",
+  "816",
+  "817",
+  "818",
+  "819",
+  "820",
+  "821",
+  "822",
+  "823",
+  "824",
+  "825",
+  "826",
+  "827",
+  "828",
+  "829",
+  "830",
+  "831",
+  "832",
+  "833",
+  "834",
+  "835",
+  "836",
+  "837",
+  "838",
+  "839",
+  "840",
+  "841",
+  "842",
+  "843",
+];
+const bravo3 = [
+  "844",
+  "845",
+  "846",
+  "847",
+  "848",
+  "849",
+  "850",
+  "851",
+  "852",
+  "853",
+  "854",
+  "855",
+  "856",
+  "857",
+  "858",
+  "859",
+  "860",
+  "861",
+  "862",
+  "863",
+  "864",
+  "865",
+  "866",
+  "867",
+  "868",
+  "869",
+  "870",
+  "871",
+  "872",
+  "873",
+  "874",
+  "875",
+  "876",
+  "877",
+  "878",
+  "879",
+  "880",
+  "881",
+  "882",
+  "883",
+  "884",
+  "885",
+  "886",
+  "887",
+  "888",
+];
+const charlie3 = [
+  "889",
+  "890",
+  "891",
+  "892",
+  "893",
+  "894",
+  "895",
+  "896",
+  "897",
+  "898",
+  "899",
+  "900",
+  "901",
+  "902",
+  "903",
+  "904",
+  "905",
+  "906",
+  "907",
+  "908",
+  "909",
+  "910",
+  "911",
+  "912",
+  "913",
+  "914",
+  "915",
+  "916",
+  "917",
+  "918",
+  "919",
+  "920",
+  "921",
+  "922",
+  "923",
+  "924",
+  "925",
+  "926",
+  "927",
+  "928",
+  "929",
+  "930",
+  "931",
+  "932",
+  "933",
+];
+
+const threeSeven = {
+  positionIds: [threeSevenCommand, alpha3, bravo3, charlie3],
+  positionTitles: [
+    "3-7 Headquarters",
     "Alpha Company",
     "Bravo Company",
     "Charlie Company",
   ],
-  collapsibleTitle: "Second Battalion",
+  collapsibleTitle: "Third Battalion",
 };
 
 //ACD
 
 const acdCommand = ["552", "627", "645", "11"];
-const alpha3 = [
+const alpha4 = [
   "555",
   "556",
   "557",
@@ -407,7 +611,7 @@ const alpha3 = [
   "769",
   "770",
 ];
-const bravo3 = [
+const bravo4 = [
   "590",
   "591",
   "592",
@@ -446,7 +650,7 @@ const bravo3 = [
   "625",
   "626",
 ];
-const charlie3 = [
+const charlie4 = [
   "656",
   "657",
   "658",
@@ -467,16 +671,18 @@ const charlie3 = [
 ];
 const starterPlatoon = ["780", "781", "759"];
 const starterPlatoon2 = ["782", "786", "787"];
+const starterPlatoon3 = ["790"];
 const futureC = ["753"];
 
 const acd = {
   positionIds: [
     acdCommand,
-    alpha3,
-    bravo3,
-    charlie3,
+    alpha4,
+    bravo4,
+    charlie4,
     starterPlatoon,
     starterPlatoon2,
+    starterPlatoon3,
     futureC,
   ],
   positionTitles: [
@@ -486,6 +692,7 @@ const acd = {
     "Charlie Company",
     "Star Citizen Starter Platoon",
     "Star Wars RPG Starter Platoon",
+    "Counter Strike Starter Platoon",
     "Future Concepts Center",
   ],
   collapsibleTitle: "Auxillary Combat Division",
@@ -711,6 +918,10 @@ const s7 = [
   "642",
   "643",
   "644",
+  "677",
+  "678",
+  "679",
+  "680",
 ];
 const ld = ["126", "127", "128", "129", "130", "131", "132", "539"];
 const spd = ["175", "176"];
@@ -732,6 +943,7 @@ const billetBankObject = {
   regi: regi,
   oneSeven: oneSeven,
   twoSeven: twoSeven,
+  threeSeven: threeSeven,
   acd: acd,
   imo: imo,
   secOps: secOps,
@@ -752,11 +964,18 @@ const billetBank = {
   alpha2,
   bravo2,
   charlie2,
-  acdCommand,
+  echo2,
+  threeSevenCommand,
   alpha3,
   bravo3,
   charlie3,
+  acdCommand,
+  alpha4,
+  bravo4,
+  charlie4,
   starterPlatoon,
+  starterPlatoon2,
+  starterPlatoon3,
 };
 
 export default billetBank;
diff --git a/client/src/modules/Generic/Statistics.js b/client/src/modules/Generic/Statistics.js
@@ -49,7 +49,15 @@ class Statistics extends Component {
             colors: ["#222222"],
             width: 1.5,
           },
-          colors: ["#109640", "#b61217", "#2a487c", "#ebc729", "#e68c08"],
+          colors: [
+            "#109640",
+            "#b61217",
+            "#2a487c",
+            "#ebc729",
+            "#e68c08",
+            "#d62466",
+            "#8924d6",
+          ],
           plotOptions: {
             pie: {
               donut: {
@@ -100,20 +108,27 @@ class Statistics extends Component {
             width: 1.5,
           },
           colors: [
-            "#109640",
-            "#b61217",
-            "#b61217",
-            "#b61217",
-            "#b61217",
-            "#2a487c",
-            "#2a487c",
-            "#2a487c",
-            "#2a487c",
-            "#ebc729",
-            "#ebc729",
-            "#ebc729",
-            "#ebc729",
-            "#ebc729",
+            "#109640", // Genstaff
+            "#b61217", // 1-7 Command
+            "#b61217", // A/1-7
+            "#b61217", // B/1-7
+            "#b61217", // C/1-7
+            "#2a487c", // 2-7 Command
+            "#2a487c", // A/2-7
+            "#2a487c", // B/2-7
+            "#2a487c", // C/2-7
+            "#2a487c", // E/2-7
+            "#ebc729", // 3-7 Command
+            "#ebc729", // A/2-7
+            "#ebc729", // B/2-7
+            "#ebc729", // C/2-7
+            "#d62466", // ACD Command
+            "#d62466", // A/ACD
+            "#d62466", // B/ACD
+            "#d62466", // C/ACD
+            "#d62466", // Star Citizen SP
+            "#d62466", // Star Wars RPG SP
+            "#d62466", // Counter Strike SP
           ],
           plotOptions: {
             pie: {

diff --git a/client/src/pages/Activedutyroster.js b/client/src/pages/Activedutyroster.js
@@ -143,6 +143,7 @@ function ActiveDutyRoster(props) {
             <AdrListEntry bBGroup={"regi"} milpacArray={milpacArray} />
             <AdrListEntry bBGroup={"oneSeven"} milpacArray={milpacArray} />
             <AdrListEntry bBGroup={"twoSeven"} milpacArray={milpacArray} />
+            <AdrListEntry bBGroup={"threeSeven"} milpacArray={milpacArray} />
             <AdrListEntry bBGroup={"acd"} milpacArray={milpacArray} />
             <AdrListEntry bBGroup={"imo"} milpacArray={milpacArray} />
             <AdrListEntry bBGroup={"secOps"} milpacArray={milpacArray} />