From 4ef06abd435651d88115edd65377e5c2a3a54a67 Mon Sep 17 00:00:00 2001
From: Evan Bradley <36498248+abusivemilk@users.noreply.github.com>
Date: Mon, 17 Jul 2023 14:33:27 -0400
Subject: [PATCH 01/22] Remove ZJX from Ally List (#49)
---
src/views/partial/Footer.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/partial/Footer.vue b/src/views/partial/Footer.vue
index 95e025a7..c1271d17 100644
--- a/src/views/partial/Footer.vue
+++ b/src/views/partial/Footer.vue
@@ -38,7 +38,7 @@
We stand with the LGBTQIA+ community on VATSIM
Albuquerque ARTCC displays the rainbow, transgender, bisexual, and pansexual flags as a show of solidarity with the LGBTQIA+ community on VATSIM. You are welcome here, and you have our support.
As an organization with LGBTQIA+ members, we recognize the importance of creating a welcoming environment to all members. Everyone is welcome here, regardless of their race, nationality, national origin, ethnicity, ethnic origin, socioeconomic status, religion, age, disability, sexual orientation, gender, or gender identity.
- We recognize CZQO, CZWG, ZJX, ZMA, ZNY, ZOA, ZOB and ZSE for displaying similar statements on their websites.
+ We recognize CZQO, CZWG, ZMA, ZNY, ZOA, ZOB and ZSE for displaying similar statements on their websites.
From 24de4b3915be6893a5e5d2e6f574f9b87edcec9b Mon Sep 17 00:00:00 2001
From: Cole Connelly <30357632+cdconn00@users.noreply.github.com>
Date: Sun, 23 Jul 2023 11:04:39 -0500
Subject: [PATCH 02/22] [Improvement] Fix PR Template (#51)
---
.github/pull_request_template.md | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index c1dcd266..0bc110cf 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -8,12 +8,10 @@ What does this PR do?
---
-### DB Changes (if any)
-
-- [] What is the change?
+### What it Looks Like
```
-changes here
+Photos or GIFs of the changes here.
```
---
From 4920440b8b15adaf22cc504ac7ba10360bd9db5f Mon Sep 17 00:00:00 2001
From: Cole Connelly <30357632+cdconn00@users.noreply.github.com>
Date: Tue, 28 Nov 2023 21:56:32 -0600
Subject: [PATCH 03/22] [Bug] Update Discord Invite Link (#53)
---
src/views/dashboard/Index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/dashboard/Index.vue b/src/views/dashboard/Index.vue
index ae5af133..7816cddf 100644
--- a/src/views/dashboard/Index.vue
+++ b/src/views/dashboard/Index.vue
@@ -33,7 +33,7 @@
- Join Discord
+ Join Discord
From b1f71ef324ec4bee27a4863867dd815a353cd175 Mon Sep 17 00:00:00 2001
From: Cole Connelly <30357632+cdconn00@users.noreply.github.com>
Date: Tue, 23 Jan 2024 16:30:16 -0600
Subject: [PATCH 04/22] Update Discord Link (#56)
---
src/views/dashboard/Index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/dashboard/Index.vue b/src/views/dashboard/Index.vue
index 7816cddf..7af6e7c6 100644
--- a/src/views/dashboard/Index.vue
+++ b/src/views/dashboard/Index.vue
@@ -33,7 +33,7 @@
- Join Discord
+ Join Discord
From c259568c4ace410746e783dc98b3eb78f45fc5b0 Mon Sep 17 00:00:00 2001
From: Cole Connelly <30357632+cdconn00@users.noreply.github.com>
Date: Wed, 21 Feb 2024 16:55:19 -0600
Subject: [PATCH 05/22] [#59] - Fix Discord Links (#60)
---
src/views/dashboard/Index.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/dashboard/Index.vue b/src/views/dashboard/Index.vue
index 7af6e7c6..b23035f6 100644
--- a/src/views/dashboard/Index.vue
+++ b/src/views/dashboard/Index.vue
@@ -29,11 +29,11 @@
@@ -79,6 +79,7 @@ export default {
token: '',
discordConnected: false,
controllingSessions: null,
+ discordLink: import.meta.env.VITE_DISCORD_LINK,
};
},
async mounted() {
From d734901f8d1ab54f0cb16575ee97ad4bc38a8374 Mon Sep 17 00:00:00 2001
From: Cole Connelly <30357632+cdconn00@users.noreply.github.com>
Date: Wed, 21 Feb 2024 19:28:18 -0600
Subject: [PATCH 06/22] Revert "[#59] - Fix Discord Links" (#62)
---
src/views/dashboard/Index.vue | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/views/dashboard/Index.vue b/src/views/dashboard/Index.vue
index b23035f6..7af6e7c6 100644
--- a/src/views/dashboard/Index.vue
+++ b/src/views/dashboard/Index.vue
@@ -29,11 +29,11 @@
@@ -79,7 +79,6 @@ export default {
token: '',
discordConnected: false,
controllingSessions: null,
- discordLink: import.meta.env.VITE_DISCORD_LINK,
};
},
async mounted() {
From 4cb265bf673b1069352e7e1fd42b05e3c2ace105 Mon Sep 17 00:00:00 2001
From: Cole Connelly <30357632+cdconn00@users.noreply.github.com>
Date: Thu, 22 Feb 2024 06:49:39 -0600
Subject: [PATCH 07/22] Remove API key reference (never populated). (#63)
---
src/helpers/axios.js | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/helpers/axios.js b/src/helpers/axios.js
index 20fb1498..4c16cd2f 100644
--- a/src/helpers/axios.js
+++ b/src/helpers/axios.js
@@ -6,10 +6,7 @@ export const zabApi = axios.create({
});
export const vatusaApi = axios.create({
- baseURL: "https://api.vatusa.net/v2",
- params: {
- apikey: import.meta.env.VITE_VATUSA_API_KEY,
- },
+ baseURL: "https://api.vatusa.net/v2"
});
export const vatusaApiAuth = axios.create({
From a5ac83b1f0a4b347e0d6ca29f2d385d696b5b597 Mon Sep 17 00:00:00 2001
From: Cole Connelly <30357632+cdconn00@users.noreply.github.com>
Date: Fri, 23 Feb 2024 10:48:47 -0600
Subject: [PATCH 08/22] Revert "Update Discord Link" (#65)
---
src/views/dashboard/Index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/dashboard/Index.vue b/src/views/dashboard/Index.vue
index 7af6e7c6..7816cddf 100644
--- a/src/views/dashboard/Index.vue
+++ b/src/views/dashboard/Index.vue
@@ -33,7 +33,7 @@
- Join Discord
+ Join Discord
From ace1acc228abbdda98fe2b995e454688f100f4d8 Mon Sep 17 00:00:00 2001
From: Cole Connelly <30357632+cdconn00@users.noreply.github.com>
Date: Wed, 28 Feb 2024 13:59:04 -0600
Subject: [PATCH 09/22] Change Controller Profile Certifications/Endorsements
(#68)
---
src/views/admin/controllers/Activity.vue | 17 ++--
src/views/admin/controllers/Edit.vue | 96 ++++++++++++++---------
src/views/controllers/Profile.vue | 20 ++---
src/views/controllers/Roster.vue | 33 +++-----
src/views/dashboard/training/Request.vue | 32 ++++----
src/views/instructor/controllers/Edit.vue | 92 +++++++++++++---------
6 files changed, 152 insertions(+), 138 deletions(-)
diff --git a/src/views/admin/controllers/Activity.vue b/src/views/admin/controllers/Activity.vue
index b4c15104..4b05bcc4 100644
--- a/src/views/admin/controllers/Activity.vue
+++ b/src/views/admin/controllers/Activity.vue
@@ -175,15 +175,12 @@ export default {
const hasCerts = certs.map(cert => cert.code);
let certsToShow = [];
certs.forEach(cert => {
- if(cert.class === "major" || cert.class === "center") {
+ if(cert.class === "tier-one" || cert.class === "tier-two") {
certsToShow.push(cert);
- } else {
- const certPos = cert.code.slice(-3);
- if(!hasCerts.includes(`p50${certPos}`)) {
- certsToShow.push(cert);
- }
}
});
+
+ certsToShow = certsToShow.sort((a, b) => a.class.localeCompare(b.class, 'en', { numeric: true }) || a.order - b.order)
return certsToShow;
},
sort(p) {
@@ -342,15 +339,11 @@ export default {
background: $cert_training;
}
- &.cert_center {
+ &.cert_tier-one {
background-color: $secondary-color-dark;
}
- &.cert_major {
- background: $secondary-color;
- }
-
- &.cert_minor {
+ &.cert_tier-two {
background: $secondary-color-light;
}
}
diff --git a/src/views/admin/controllers/Edit.vue b/src/views/admin/controllers/Edit.vue
index c780a384..0f922e80 100644
--- a/src/views/admin/controllers/Edit.vue
+++ b/src/views/admin/controllers/Edit.vue
@@ -35,44 +35,60 @@
remove_circle
-
-
Certifications
+
+
@@ -116,13 +132,6 @@ export default {
oi: '',
vis: false,
certs: {
- zab: false,
- p50app: false,
- p50twr: false,
- p50gnd: false,
- app: false,
- twr: false,
- gnd: false
},
roles: {
atm: false,
@@ -256,4 +265,13 @@ export default {
#certs_container, #roles_container {
margin-top: 5px;
}
+
+.endorsement_category_explainer {
+ text-style: italic;
+ font-size: 10px;
+}
+
+.tier_two_button {
+ margin: 0 5px;
+}
\ No newline at end of file
diff --git a/src/views/controllers/Profile.vue b/src/views/controllers/Profile.vue
index 41acf62c..f676208f 100644
--- a/src/views/controllers/Profile.vue
+++ b/src/views/controllers/Profile.vue
@@ -131,15 +131,13 @@ export default {
if(!certs) return [];
const hasCerts = certs.map((cert) => cert.code);
let certsToShow = [];
- certs.forEach((cert) => {
- if(cert.class === "major" || cert.class === "center") certsToShow.push(cert);
- else {
- const certPos = cert.code.slice(-3);
- if(!hasCerts.includes(`p50${certPos}`)) {
- certsToShow.push(cert);
- }
+ certs.forEach(cert => {
+ if(cert.class === "tier-one" || cert.class === "tier-two") {
+ certsToShow.push(cert);
}
});
+
+ certsToShow = certsToShow.sort((a, b) => a.class.localeCompare(b.class, 'en', { numeric: true }) || a.order - b.order)
return certsToShow;
},
sec2hm(secs) {
@@ -215,15 +213,11 @@ export default {
background: $cert_training;
}
- &.cert_center {
+ &.cert_tier-one {
background-color: $secondary-color-dark;
}
- &.cert_major {
- background: $secondary-color;
- }
-
- &.cert_minor {
+ &.cert_tier-two {
background: $secondary-color-light;
}
}
diff --git a/src/views/controllers/Roster.vue b/src/views/controllers/Roster.vue
index 9019a1b1..84e0f94e 100644
--- a/src/views/controllers/Roster.vue
+++ b/src/views/controllers/Roster.vue
@@ -182,16 +182,13 @@ export default {
if (!certs) return [];
const hasCerts = certs.map((cert) => cert.code);
let certsToShow = [];
- certs.forEach((cert) => {
- if (cert.class === "major" || cert.class === "center")
- certsToShow.push(cert);
- else {
- const certPos = cert.code.slice(-3);
- if (!hasCerts.includes(`p50${certPos}`)) {
- certsToShow.push(cert);
- }
- }
- });
+ certs.forEach(cert => {
+ if(cert.class === "tier-one" || cert.class === "tier-two") {
+ certsToShow.push(cert);
+ }
+ });
+
+ certsToShow = certsToShow.sort((a, b) => a.class.localeCompare(b.class, 'en', { numeric: true }) || a.order - b.order)
return certsToShow;
},
},
@@ -272,17 +269,13 @@ td {
background: $cert_training;
}
- &.cert_center {
- background-color: $secondary-color-dark;
- }
+ &.cert_tier-one {
+ background-color: $secondary-color-dark;
+ }
- &.cert_major {
- background: $secondary-color;
- }
-
- &.cert_minor {
- background: $secondary-color-light;
- }
+ &.cert_tier-two {
+ background: $secondary-color-light;
+ }
}
.tooltipped {
diff --git a/src/views/dashboard/training/Request.vue b/src/views/dashboard/training/Request.vue
index 24074a0a..ee3b84a8 100644
--- a/src/views/dashboard/training/Request.vue
+++ b/src/views/dashboard/training/Request.vue
@@ -127,27 +127,29 @@ export default {
},
computed: {
filteredMilestones() {
- const certs = this.user.data.certCodes;
+ const userCerts = this.user.data.certCodes;
const rating = this.user.data.rating;
if(this.milestones) {
- const minorPrerequisites = ["obs", "gnd", "twr", "app"];
- const majorPrerequisites = ["obs", "gnd", "p50gnd", "p50twr", "p50app"];
+ const minorPrerequisites = ["obs"];
+ const majorPrerequisites = ["obs", "kabq", "kphxground", "kphxtower", "p50"];
let milestonesShowed = this.milestones.filter((milestone) => {
- if(this.user.data.vis) return (milestone.certCode.substring(0, 3) === "vis" && milestone.rating <= rating) || milestone.code === "GT1";
- else {
- return ( // This is still slightly hard to understand. It returns the milestones that haven't been completed yet for the rating, or the P50 equivelant (if no major cert has been attained yet) and next rating's milestones, or center milestones if all other certs have been attained.
- !certs.includes(milestone.certCode) &&
- (
- milestone.code === "GT1" ||
- (milestone.certCode.substring(0, 3) === "p50" && certs.includes(milestone.certCode.slice(-3)) && certs.includes(majorPrerequisites[milestone.rating - 1])) ||
- (milestone.certCode.substring(0, 3) !== "p50" && (certs.includes(minorPrerequisites[milestone.rating - 1]) || (milestone.rating === "1" && certs.length === 0)) && milestone.certCode !== "zab") ||
- (milestone.certCode === "zab" && certs.includes("p50app"))
- ) &&
- milestone.certCode.substring(0, 3) !== "vis"
- );
+ const milestoneAvailableAtRating = milestone.availableAtRatings.includes(rating); // Milestones available for rating.
+ let userHasTierOneForCurrentRating = false;
+
+ // See if the user has a tier one cert for their current rating.
+ if (rating == 2) {
+ userHasTierOneForCurrentRating = userCerts.includes('kphxground');
+ } else if (rating == 3) {
+ userHasTierOneForCurrentRating = userCerts.includes('kphxtower');
+ }
+ else if (rating == 4) {
+ userHasTierOneForCurrentRating = userCerts.includes('p50');
}
+
+ // Return milestones available to user (hide tier one if they have the cert already).
+ return milestoneAvailableAtRating && !(milestone.hiddenWhenControllerHasTierOne && userHasTierOneForCurrentRating)
});
return milestonesShowed;
diff --git a/src/views/instructor/controllers/Edit.vue b/src/views/instructor/controllers/Edit.vue
index 5ace68e7..80572700 100644
--- a/src/views/instructor/controllers/Edit.vue
+++ b/src/views/instructor/controllers/Edit.vue
@@ -31,44 +31,60 @@
Operating Initials
-
- Controller has made {{controller.totalRequests}} training request(s) in the last 60 days
+ Controller has made {{controller.totalRequests}} training request(s) in the last 90 days
@@ -126,7 +126,7 @@ export default {
methods: {
async getActivity() {
const d = new Date();
- this.chkDate = new Date(Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate() - 61));
+ this.chkDate = new Date(Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), d.getUTCDate() - 91));
const {data: reportData} = await zabApi.get('/stats/activity');
this.report = reportData.data;
},
From bcd7abfdc242fcb27ce2229615df47d7e65cc906 Mon Sep 17 00:00:00 2001
From: jonahkleinman <97543307+jonahkleinman@users.noreply.github.com>
Date: Fri, 26 Apr 2024 17:08:17 -0400
Subject: [PATCH 13/22] Fix blank month for training requests (#75)
---
src/assets/css/styles.scss | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/assets/css/styles.scss b/src/assets/css/styles.scss
index 2251f665..40846fa3 100644
--- a/src/assets/css/styles.scss
+++ b/src/assets/css/styles.scss
@@ -177,4 +177,8 @@ select:not(.materialize-select):not(.browser-default) {
.table_wrapper {
overflow: auto;
-}
\ No newline at end of file
+}
+
+.flatpickr-monthDropdown-months {
+ opacity: 1;
+}
From a5fe5455397b36cb8493d731d7044c6eca522768 Mon Sep 17 00:00:00 2001
From: Cole Connelly <30357632+cdconn00@users.noreply.github.com>
Date: Thu, 5 Sep 2024 07:11:01 -0500
Subject: [PATCH 14/22] Update Training Links (#77)
---
src/views/dashboard/DashSidebar.vue | 2 +-
src/views/dashboard/training/Index.vue | 2 +-
src/views/instructor/InstructorSidebar.vue | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/dashboard/DashSidebar.vue b/src/views/dashboard/DashSidebar.vue
index 445005e2..fd619696 100644
--- a/src/views/dashboard/DashSidebar.vue
+++ b/src/views/dashboard/DashSidebar.vue
@@ -13,7 +13,7 @@
IDS
computer
-
+
Training Sessions
insert_invitation
diff --git a/src/views/dashboard/training/Index.vue b/src/views/dashboard/training/Index.vue
index 52b9fa39..5ccff403 100644
--- a/src/views/dashboard/training/Index.vue
+++ b/src/views/dashboard/training/Index.vue
@@ -3,7 +3,7 @@
Training Requests
-
Request
+
Request
diff --git a/src/views/instructor/InstructorSidebar.vue b/src/views/instructor/InstructorSidebar.vue
index 6fd7255c..86ebe224 100644
--- a/src/views/instructor/InstructorSidebar.vue
+++ b/src/views/instructor/InstructorSidebar.vue
@@ -13,11 +13,11 @@
Solo Certifications
streetview
-
+
Training Requests
event
-
+
Training Sessions
event_note
From 13e1b6662a3054c1624334d095d572bacc91cefb Mon Sep 17 00:00:00 2001
From: Cole Connelly <30357632+cdconn00@users.noreply.github.com>
Date: Fri, 6 Sep 2024 13:03:01 -0500
Subject: [PATCH 15/22] Fix redirects (#79)
---
src/views/dashboard/DashSidebar.vue | 4 ++--
src/views/dashboard/training/Index.vue | 2 +-
src/views/instructor/InstructorSidebar.vue | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/views/dashboard/DashSidebar.vue b/src/views/dashboard/DashSidebar.vue
index fd619696..eaca4389 100644
--- a/src/views/dashboard/DashSidebar.vue
+++ b/src/views/dashboard/DashSidebar.vue
@@ -13,10 +13,10 @@
IDS
computer
-
+
Training Sessions
insert_invitation
-
+
Feedback
feedback
diff --git a/src/views/dashboard/training/Index.vue b/src/views/dashboard/training/Index.vue
index 5ccff403..645dcbbb 100644
--- a/src/views/dashboard/training/Index.vue
+++ b/src/views/dashboard/training/Index.vue
@@ -3,7 +3,7 @@
Training Requests
-
Request
+
diff --git a/src/views/instructor/InstructorSidebar.vue b/src/views/instructor/InstructorSidebar.vue
index 86ebe224..fab6208c 100644
--- a/src/views/instructor/InstructorSidebar.vue
+++ b/src/views/instructor/InstructorSidebar.vue
@@ -13,14 +13,14 @@
Solo Certifications
streetview
-
+
Training Requests
event
-
-
+
+
Training Sessions
event_note
-
+
Vacant
- email {{ staffItem.code }}@zabartcc.orgemail {{ staffItem.email ? staffItem.email : staffItem.code }}@vatusa.net
- You have controlled for {{ hoursCalc }} in the past 60 days.
+ You have controlled for {{ hoursCalc }} in the past quarter.
You will need to control again by {{ calcControlDate }} to prevent removal from the roster.
@@ -126,7 +126,7 @@ export default {
hoursCalc() {
let seconds = 0;
for(const session of this.controllingSessions) {
- if((Math.abs(new Date().getTime() - new Date(session.timeEnd).getTime()) / (1000 * 60 * 60 * 24) < 61)) {
+ if((Math.abs(new Date().getTime() - new Date(session.timeEnd).getTime()) / (1000 * 60 * 60 * 24) < 91)) { // Update from 61 to 91 days
const newSeconds = (new Date(session.timeEnd) - new Date(session.timeStart)) / 1000;
seconds += newSeconds;
}
@@ -135,21 +135,18 @@ export default {
},
calcControlDate() {
let date = new Date(this.user.data.joinDate ?? Date.now());
-
if(this.controllingSessions.length > 0 ) {
let seconds = 0;
for (const session of this.controllingSessions) {
- if(seconds < 7200 && this.approvedAirports.includes(session.position.slice(0, 3))) {
+ if(seconds < 10800 && this.approvedAirports.includes(session.position.slice(0, 3))) { // Ensure 3 hours (10800 seconds)
const newSeconds = (new Date(session.timeEnd) - new Date(session.timeStart)) / 1000;
seconds += newSeconds;
date = new Date(session.timeEnd);
}
-
- if(seconds >= 7200) break;
+ if(seconds >= 10800) break;
}
}
-
- date.setUTCDate(date.getUTCDate() + 61);
+ date.setUTCDate(date.getUTCDate() + 91); // Update from 61 to 91 days
return this.formatDate(date);
}
}
From d936fc2a348e01a87ab71daeb9ccdd3a330aa6a2 Mon Sep 17 00:00:00 2001
From: XDerpingxGruntX <41699998+XDerpingxGruntX@users.noreply.github.com>
Date: Mon, 14 Oct 2024 21:56:42 -0600
Subject: [PATCH 17/22] HOTFIX 90d to quarter UI
---
src/views/dashboard/Index.vue | 23 ++++++++---------------
1 file changed, 8 insertions(+), 15 deletions(-)
diff --git a/src/views/dashboard/Index.vue b/src/views/dashboard/Index.vue
index ca235d08..db40186f 100644
--- a/src/views/dashboard/Index.vue
+++ b/src/views/dashboard/Index.vue
@@ -70,6 +70,8 @@
\ No newline at end of file
+
From 100c2bb24f93a074d5be48b9f54652a1dee1d406 Mon Sep 17 00:00:00 2001
From: Cole Connelly <30357632+cdconn00@users.noreply.github.com>
Date: Thu, 4 Sep 2025 06:33:13 -0500
Subject: [PATCH 22/22] Change discord link. (#96)
---
src/views/dashboard/Index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/dashboard/Index.vue b/src/views/dashboard/Index.vue
index 087856c5..17b6daf8 100644
--- a/src/views/dashboard/Index.vue
+++ b/src/views/dashboard/Index.vue
@@ -44,7 +44,7 @@
Join Discord 