Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IMO Reorg #68

Merged
merged 2 commits into from
May 13, 2024
Merged

IMO Reorg #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
007065d
IMO Reorg
Vercin-G May 8, 2024
0af05d6
2 letters
Vercin-G May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 67 additions & 61 deletions client/src/modules/Generic/BilletBank.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const regiCommand = [
"62",
"676",
"743",
"772",
];

const regi = {
Expand Down Expand Up @@ -698,64 +699,18 @@ const acd = {
collapsibleTitle: "Auxillary Combat Division",
};

//IMO
//IMO - OLD CODE KEPT HERE FOR POSTERITY SAKE

const imoCommand = ["5", "9"];
const s1 = [
"7",
"8",
"17",
"18",
"19",
"20",
"21",
"22",
"23",
"24",
"25",
"26",
"27",
"28",
"29",
"30",
"31",
"32",
"33",
"34",
"35",
"36",
"37",
];
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 = {
positionIds: [imoCommand, s1, s6, wag],
positionTitles: [
"Information Management Command",
"S1 - Administration",
"S6 - Information Management",
"Wiki Administration Group",
],
collapsibleTitle: "Information Management Office",
};
// const imo = {
// positionIds: [imoCommand, s1, s6, wag],
// positionTitles: [
// "Information Management Command",
// "S1 - Administration",
// "S6 - Information Management",
// "Wiki Administration Group",
// ],
// collapsibleTitle: "Information Management Office",
// };

//ROO

Expand Down Expand Up @@ -824,6 +779,34 @@ const secOps = {

//Support

const spd = ["175", "176"];

const s1 = [
"7",
"8",
"17",
"18",
"19",
"20",
"21",
"22",
"23",
"24",
"25",
"26",
"27",
"28",
"29",
"30",
"31",
"32",
"33",
"34",
"35",
"36",
"37",
];

const s3 = [
"134",
"135",
Expand Down Expand Up @@ -865,6 +848,26 @@ const s3 = [
"648",
];

const s6 = [
"50",
"51",
"52",
"53",
"54",
"55",
"56",
"57",
"58",
"59",
"773",
"774",
"775",
"776",
"777",
"778",
"779",
];

const s7 = [
"105",
"106",
Expand Down Expand Up @@ -924,15 +927,18 @@ const s7 = [
"680",
];
const ld = ["126", "127", "128", "129", "130", "131", "132", "539"];
const spd = ["175", "176"];
const wag = ["39", "40", "41", "42", "43", "44", "45", "46", "47", "48"];

const support = {
positionIds: [spd, s3, s7, ld],
positionIds: [s1, s3, s6, s7, ld, spd, wag],
positionTitles: [
"Special Projects Division",
"S1 - Administration",
"S3 - Operations",
"S6 - Information Management",
"S7 - Training",
"Leadership Development",
"Special Projects Division",
"Wiki Administration Group",
],
collapsibleTitle: "Support Departments",
};
Expand All @@ -945,7 +951,7 @@ const billetBankObject = {
twoSeven: twoSeven,
threeSeven: threeSeven,
acd: acd,
imo: imo,
// imo: imo,
secOps: secOps,
roo: roo,
support: support,
Expand Down
1 change: 0 additions & 1 deletion client/src/pages/Activedutyroster.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ function ActiveDutyRoster(props) {
<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} />
<AdrListEntry bBGroup={"roo"} milpacArray={milpacArray} />
<AdrListEntry bBGroup={"support"} milpacArray={milpacArray} />
Expand Down
Loading