From dcfa3839a39a5c932eaf8cab34c48650c87e6451 Mon Sep 17 00:00:00 2001 From: Vercin-G <97210222+Vercin-G@users.noreply.github.com> Date: Tue, 28 Nov 2023 17:21:24 -0700 Subject: [PATCH 1/6] Billet Bank Update 28 Nov --- client/src/modules/Generic/BilletBank.js | 55 +------------------ ...tListJul2023.txt => BilletListNov2023.txt} | 4 +- 2 files changed, 5 insertions(+), 54 deletions(-) rename client/src/modules/Generic/{BilletListJul2023.txt => BilletListNov2023.txt} (99%) diff --git a/client/src/modules/Generic/BilletBank.js b/client/src/modules/Generic/BilletBank.js index 4b9a2bc..19838fa 100644 --- a/client/src/modules/Generic/BilletBank.js +++ b/client/src/modules/Generic/BilletBank.js @@ -465,65 +465,16 @@ const charlie3 = [ "671", "672", ]; -const delta3 = [ - "538", - "698", - "699", - "700", - "701", - "702", - "704", - "705", - "706", - "712", - "713", - "714", - "715", - "716", - "717", - "718", - "719", - "720", - "707", - "708", - "709", - "710", - "711", - "721", - "722", - "723", - "724", - "725", - "726", - "727", - "728", - "729", - "739", - "740", - "741", -]; -const echo3 = []; const starterPlatoon = ["759"]; const futureC = ["753"]; const acd = { - positionIds: [ - acdCommand, - alpha3, - bravo3, - charlie3, - delta3, - echo3, - starterPlatoon, - futureC, - ], + positionIds: [acdCommand, alpha3, bravo3, charlie3, starterPlatoon, futureC], positionTitles: [ "ACD Headquarters", "Alpha Company", "Bravo Company", "Charlie Company", - "Delta Company", - "Echo Company", "Star Citizen Starter Platoon", "Future Concepts Center", ], @@ -624,7 +575,7 @@ const roo = { const secOpsCommand = ["2", "62"]; //Interesting case for Kleinmen, will need to be renamed to a new billetID if he ever leaves const jag = ["584"]; const mp = ["168", "169", "170", "171", "172", "173"]; -const s2 = ["161", "162", "163", "164", "165", "166"]; +const s2 = ["161", "162", "163", "164", "165", "166", "771"]; const secOps = { positionIds: [secOpsCommand, jag, mp, s2], @@ -778,8 +729,6 @@ const billetBank = { alpha3, bravo3, charlie3, - delta3, - echo3, starterPlatoon, }; diff --git a/client/src/modules/Generic/BilletListJul2023.txt b/client/src/modules/Generic/BilletListNov2023.txt similarity index 99% rename from client/src/modules/Generic/BilletListJul2023.txt rename to client/src/modules/Generic/BilletListNov2023.txt index d1a9511..d562a35 100644 --- a/client/src/modules/Generic/BilletListJul2023.txt +++ b/client/src/modules/Generic/BilletListNov2023.txt @@ -3,7 +3,7 @@ As such, if there are new billets added to the website, this document should be ********************************** CHANGE LOG ********************************************************* Strider.R - 07-26-23 - Added S3 DCS, S3 SQUAD, S7 SQUAD, D/ACD, 2/A/ACD, S5 SOCIAL MEDIA - +Vercin.G - 11-19-23 - Added S2 Assistant ********************************** END CHANGE LOG ********************************************************* @@ -389,6 +389,8 @@ Strider.R - 07-26-23 - Added S3 DCS, S3 SQUAD, S7 SQUAD, D/ACD, 2/A/ACD, S5 SOCI /166/edit">S2 Investigator IT +771 = S2 Assistant + /167/edit">----------MP DEPARTMENT---------- /168/edit">MP 1IC From 2675e2c311b12651a5687b0570916a01c345edb7 Mon Sep 17 00:00:00 2001 From: "Will C aka \"Big Bercin" <97210222+Vercin-G@users.noreply.github.com> Date: Wed, 13 Dec 2023 21:10:01 -0700 Subject: [PATCH 2/6] BilletBank update Dec 2023 --- client/src/modules/Generic/BilletBank.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/src/modules/Generic/BilletBank.js b/client/src/modules/Generic/BilletBank.js index 19838fa..a8cdc2c 100644 --- a/client/src/modules/Generic/BilletBank.js +++ b/client/src/modules/Generic/BilletBank.js @@ -466,16 +466,18 @@ const charlie3 = [ "672", ]; const starterPlatoon = ["759"]; +const starterPlatoon2 = ["780", "781", "782"]; const futureC = ["753"]; const acd = { - positionIds: [acdCommand, alpha3, bravo3, charlie3, starterPlatoon, futureC], + positionIds: [acdCommand, alpha3, bravo3, charlie3, starterPlatoon, starterPlatoon2, futureC], positionTitles: [ "ACD Headquarters", "Alpha Company", "Bravo Company", "Charlie Company", "Star Citizen Starter Platoon", + "Star Wars RPG Starter Platoon", "Future Concepts Center", ], collapsibleTitle: "Auxillary Combat Division", From 02a7f57c5e8a58d44a5dbff94a93d0afd6bf5fc2 Mon Sep 17 00:00:00 2001 From: "Will C aka \"Big Bercin" <97210222+Vercin-G@users.noreply.github.com> Date: Wed, 13 Dec 2023 21:13:51 -0700 Subject: [PATCH 3/6] Update Billet List --- client/src/modules/Generic/BilletListNov2023.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/src/modules/Generic/BilletListNov2023.txt b/client/src/modules/Generic/BilletListNov2023.txt index d562a35..8901a98 100644 --- a/client/src/modules/Generic/BilletListNov2023.txt +++ b/client/src/modules/Generic/BilletListNov2023.txt @@ -4,7 +4,7 @@ As such, if there are new billets added to the website, this document should be ********************************** CHANGE LOG ********************************************************* Strider.R - 07-26-23 - Added S3 DCS, S3 SQUAD, S7 SQUAD, D/ACD, 2/A/ACD, S5 SOCIAL MEDIA Vercin.G - 11-19-23 - Added S2 Assistant - +Vercin.G - 12-13-23 - Added SWRPG SP Billets ********************************** END CHANGE LOG ********************************************************* @@ -1306,7 +1306,9 @@ Vercin.G - 11-19-23 - Added S2 Assistant 759/edit">Star Citizen Start-Up - +780 Start Citizen SL +781 Start Citizen ASL +782 SWRPG Start up /193/edit">New Recruit From 8415f7c5acc7c876aa85b030e6ca9ec97b3cfa2a Mon Sep 17 00:00:00 2001 From: "Will C aka \"Big Bercin" <97210222+Vercin-G@users.noreply.github.com> Date: Wed, 13 Dec 2023 21:14:21 -0700 Subject: [PATCH 4/6] Rename BilletListNov2023.txt to BilletListDec2023.txt --- .../Generic/{BilletListNov2023.txt => BilletListDec2023.txt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename client/src/modules/Generic/{BilletListNov2023.txt => BilletListDec2023.txt} (100%) diff --git a/client/src/modules/Generic/BilletListNov2023.txt b/client/src/modules/Generic/BilletListDec2023.txt similarity index 100% rename from client/src/modules/Generic/BilletListNov2023.txt rename to client/src/modules/Generic/BilletListDec2023.txt From 68fbc3b897cb86fc0c8af3879d7276e2b2c479ea Mon Sep 17 00:00:00 2001 From: Vercin-G <97210222+Vercin-G@users.noreply.github.com> Date: Wed, 13 Dec 2023 21:22:20 -0700 Subject: [PATCH 5/6] and here i thought i could trick prettier --- client/src/modules/Generic/BilletBank.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/client/src/modules/Generic/BilletBank.js b/client/src/modules/Generic/BilletBank.js index a8cdc2c..527fee3 100644 --- a/client/src/modules/Generic/BilletBank.js +++ b/client/src/modules/Generic/BilletBank.js @@ -470,7 +470,15 @@ const starterPlatoon2 = ["780", "781", "782"]; const futureC = ["753"]; const acd = { - positionIds: [acdCommand, alpha3, bravo3, charlie3, starterPlatoon, starterPlatoon2, futureC], + positionIds: [ + acdCommand, + alpha3, + bravo3, + charlie3, + starterPlatoon, + starterPlatoon2, + futureC, + ], positionTitles: [ "ACD Headquarters", "Alpha Company", From c80ea76fafd9b94424e64ce4c752342cc2d19be0 Mon Sep 17 00:00:00 2001 From: Vercin-G <97210222+Vercin-G@users.noreply.github.com> Date: Tue, 2 Jan 2024 13:43:56 -0700 Subject: [PATCH 6/6] Update BilletBank.js --- client/src/modules/Generic/BilletBank.js | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/client/src/modules/Generic/BilletBank.js b/client/src/modules/Generic/BilletBank.js index 527fee3..29fa4c3 100644 --- a/client/src/modules/Generic/BilletBank.js +++ b/client/src/modules/Generic/BilletBank.js @@ -519,7 +519,24 @@ const s1 = [ "36", "37", ]; -const s6 = ["50", "51", "52", "53", "54", "55", "56", "57", "58", "59"]; +const s6 = [ + "50", + "51", + "52", + "53", + "54", + "55", + "56", + "57", + "58", + "59", + "774", + "775", + "776", + "777", + "778", + "779", +]; const wag = ["39", "40", "41", "42", "43", "44", "45", "46", "47", "48"]; const imo = {