Skip to content

Commit

Permalink
Merge remote-tracking branch 'scorecard-gridsome-internal/dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
alexsmithRTI committed May 6, 2024
2 parents a43b023 + 90f96ab commit bb050a5
Show file tree
Hide file tree
Showing 13 changed files with 133 additions and 81 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "college-scorecard",
"private": true,
"version": "3.1.3",
"version": "3.2.0",
"scripts": {
"build": "gridsome build",
"develop": "set NODE_OPTIONS=--openssl-legacy-provider && npm run develop_ssl",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Tooltip.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</v-btn>
<v-dialog max-width="500px" v-model="showDialog">
<v-card>
<v-btn @click="showDialog = false" icon class="float-right mt-3 mr-3"
<v-btn @click="showDialog = false" alt="Close More Information tooltip" aria-required="true" icon class="float-right mt-3 mr-3"
><v-icon>fas fa-times-circle</v-icon></v-btn
>
<v-card-title>{{ title }}</v-card-title>
Expand Down
4 changes: 2 additions & 2 deletions src/components/USABanner.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ oRwKGFw8Ulzc3IC64CIhKa1hES4uLQCkqxtECUS6FgAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAyMC0w
OC0xM1QwMzo0MToxNCswMzowMGPS+9cAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMjAtMDgtMTNUMDM6
NDE6MTQrMDM6MDASj0NrAAAAAElFTkSuQmCC"></image></svg>

<span v-if="$vuetify.breakpoint.mdAndUp"> An official website of the United States government <button @click="toggleInfo"><span tabindex="2" class="usx-banner-toggle"> Here’s how you know <i class="fas " :class="showInfo ? 'fa-chevron-up' : 'fa-chevron-down'"></i></span></button></span>
<span v-if="$vuetify.breakpoint.mdAndUp"> An official website of the United States government <button @click="toggleInfo" alt="Here's how you know" aria-required="true"><span tabindex="2" class="usx-banner-toggle"> Here’s how you know <i class="fas " :class="showInfo ? 'fa-chevron-up' : 'fa-chevron-down'"></i></span></button></span>

<button @click="toggleInfo"><span v-if="$vuetify.breakpoint.smAndDown"><span tabindex="2" class="">&nbsp;An official website of the United States government <i class="fas " :class="showInfo ? 'fa-chevron-up' : 'fa-chevron-down'"></i></span></span></button>
<button @click="toggleInfo" alt="Here's how you know" aria-required="true"><span v-if="$vuetify.breakpoint.smAndDown"><span tabindex="2" class="">&nbsp;An official website of the United States government <i class="fas " :class="showInfo ? 'fa-chevron-up' : 'fa-chevron-down'"></i></span></span></button>

</p>

Expand Down
33 changes: 16 additions & 17 deletions src/data/glossary.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/js/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ export const fields = {

// AID_PERCENTAGE: 'latest.aid.ftft_federal_loan_rate',
// PELL_PERCENTAGE: 'latest.aid.ftft_pell_grant_rate',
AID_PERCENTAGE: 'latest.aid.ftft_federal_loan_rate_pooled',
PELL_PERCENTAGE: 'latest.aid.ftft_pell_grant_rate_pooled',
AID_PERCENTAGE: 'latest.aid.dcs_federal_loan_rate_pooled',
PELL_PERCENTAGE: 'latest.aid.dcs_pell_grant_rate_pooled',

MEDIAN_EARNINGS: 'latest.earnings.10_yrs_after_entry.median',

Expand Down
103 changes: 54 additions & 49 deletions src/js/mixins/ComplexFields.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export default {
return fields;
},
id() {
console.log(this.school)
//console.log(this.school)
if (!this.school) return null;
return _.get(this.school, this.fields['ID']);
},
Expand Down Expand Up @@ -173,7 +173,7 @@ export default {
staff_value: re_staff[faculty_item]
});
}
console.log(output)
//console.log(output)
return _.sortBy(output, ["label"]);
},
retentionRate() {
Expand Down Expand Up @@ -672,61 +672,66 @@ export default {
if (!this.school) return null;
let programs = _.get(this.school, this.fields.FIELD_OF_STUDY);
let programLevels = []
programLevels = programs.map(p => p.credential.level).filter((x, i, a) => a.indexOf(x) == i)

var degreeLevels = programLevels.filter((x, i, a) => [2,3,5,6,7].includes(x))
var certLevels = programLevels.filter((x, i, a) => [4,8].includes(x))
var ugCertLevels = programLevels.filter((x, i, a) => [1].includes(x))

var degreesList = ""
var certList = ""
var ugCertList = ""

for (var level of degreeLevels)
{
var label = formMappings['fosDegrees'].find(e => e.value === level.toString())['label'].replace(" Degree", "");
if (level == degreeLevels[degreeLevels.length - 1]) {
if (degreeLevels.length > 1)
degreesList += " and " + label + " Degrees"
else
degreesList += label + " Degrees"
if (programs) {
programLevels = programs.map(p => p.credential.level).filter((x, i, a) => a.indexOf(x) == i)

var degreeLevels = programLevels.filter((x, i, a) => [2,3,5,6,7].includes(x))
var certLevels = programLevels.filter((x, i, a) => [4,8].includes(x))
var ugCertLevels = programLevels.filter((x, i, a) => [1].includes(x))

var degreesList = ""
var certList = ""
var ugCertList = ""

for (var level of degreeLevels)
{
var label = formMappings['fosDegrees'].find(e => e.value === level.toString())['label'].replace(" Degree", "");
if (level == degreeLevels[degreeLevels.length - 1]) {
if (degreeLevels.length > 1)
degreesList += " and " + label + " Degrees"
else
degreesList += label + " Degrees"
}
else if (level == degreeLevels[degreeLevels.length - 2])
degreesList += label
else
degreesList += label + ", "
}
else if (level == degreeLevels[degreeLevels.length - 2])
degreesList += label
else
degreesList += label + ", "
}

for (var level of certLevels)
{
var label = formMappings['fosDegrees'].find(e => e.value === level.toString())['label'].replace(" Certificate", "")

if (level == certLevels[certLevels.length - 1]) {
for (var level of certLevels)
{
var label = formMappings['fosDegrees'].find(e => e.value === level.toString())['label'].replace(" Certificate", "")

if (certLevels.length > 1)
certList += " and " + label + " Certificates"
else
certList += label + " Certificates"
if (level == certLevels[certLevels.length - 1]) {

if (certLevels.length > 1)
certList += " and " + label + " Certificates"
else
certList += label + " Certificates"
}
else if (level == certLevels[certLevels.length - 2])
certList += label
else
certList += label + ", "
}
else if (level == certLevels[certLevels.length - 2])
certList += label
else
certList += label + ", "
}

for (var level of ugCertLevels)
{
var label = formMappings['fosDegrees'].find(e => e.value === level.toString())['label']

ugCertList = label
}
for (var level of ugCertLevels)
{
var label = formMappings['fosDegrees'].find(e => e.value === level.toString())['label']
ugCertList = label
}

var ret = degreesList + ((degreesList && certList) ? " as well as " + certList : certList) + (((certList || degreesList) && ugCertList) ? ", and " + ugCertList : ugCertList)
var ret = degreesList + ((degreesList && certList) ? " as well as " + certList : certList) + (((certList || degreesList) && ugCertList) ? ", and " + ugCertList : ugCertList)

if (certLevels.length == 0 && degreeLevels.length == 0)
ret = "no Degrees or Certificates"
if (certLevels.length == 0 && degreeLevels.length == 0)
ret = "no Degrees or Certificates"

return ret;
return ret;
}
else {
return "no Degrees or Certificates";
}
}
},
methods: {
Expand Down
4 changes: 2 additions & 2 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,10 @@ export default function (Vue, { router, head, isClient, appOptions }) {
//Twitter and OpenGraph


head.meta.push({
/*head.meta.push({
'http-equiv':'Content-Security-Policy',
content: "default-src 'self' https://www.gstatic.com https//*.typekit.net https://dap.digitalgov.gov https://static.hotjar.com https://www.google-analytics.com https://www.gstatic.com https://www.googletagmanager.com https://script.hotjar.com; img-src 'self' *.googletagmanager.com data: https://*.basemaps.cartocdn.com/ *.cloud.gov *.googleapis.com *.google-analytics.com; child-src 'none'; script-src-elem * 'unsafe-hashes' 'sha256-gPjlli1HEdLlR0AZTY971/wQVOdSkl9mEinLnxrPpJw=' 'sha256-6egcWvmQP5hRCmW3iDq1X7sXo3/AY4zjQJNgqpm0rAg=' 'sha256-1e5RR2OpHhuX2h0Bat19DsNTmqbo4M3T1pqfeTXCHaA=' https://www.gstatic.com https://*.typekit.net/ https://fonts.googleapis.com 'self'; connect-src https://api.data.gov https://www.google-analytics.com https://analytics.google.com *.hotjar.com https://dap.digitalgov.gov https://stats.g.doubleclick.net *.hotjar.io 'self' ws:; font-src https://fonts.gstatic.com https://use.typekit.net 'self'; style-src 'unsafe-hashes' 'sha256-IQtfqzo2VPwYVfG45njd1UW4FZvVifJwM9V5cBNhx04=' 'sha256-yQomDylAVvpeRdlKgfqevQZtrtkp244GCzedeISNu5s=' 'sha256-vil6rwz9/3551namkTsVzfkGNkmRnO56lPD53U/pJbE=' 'sha256-cgjVz+andACCIsfeXoiI1/ChFQDlCC4y99sX5rrYseM=' 'sha256-TbrjG17MSiO8IKSlX/5IHYPweVR4+mHPUuUwZ7a5a2Y=' 'sha256-plI3P8SbP3ivQ+UUtO9JmesuN+PeYliWE+cQeiYVmiI=' 'sha256-uaE1UV3pZxXpavOfm/lrrxDNgEh6v+6g5hNCCp9X1bM=' 'sha256-lNOe1Kn+4LzGOr+ToMkETF58zM5uGP6/a0dq4hZYPYw=' 'sha256-xC8juOyOcGVG0BdxV2vy4LlzWOZfFlsV82FV45f1hTY=' 'sha256-hEgUMy467OqNfeKl/LTfR4/dPK2As3gne31r1nSBOEM=' 'sha256-jc9UupO4BKq2JkHD2Z57pylYRnr6PtjiI4FCyFavP+Q=' 'sha256-kwpt3lQZ21rs4cld7/uEm9qI5yAbjYzx+9FGm/XmwNU=' 'sha256-EjeKg7oj5a8SODh/FWP9+TlJK7I4FTcPMbwoz64kK2A=' 'sha256-uKAvZ8WKcIoeRdQwRKBztHzKuBMA3Z138XKPaddC+7w=' 'sha256-0EZqoz+oBhx7gF4nvY2bSqoGyy4zLjNF+SDQXGp/ZrY=' 'sha256-Q+nAeb6+lO7Hw/QTTOowxLK49HpHGB7ZfnCD6jX0qa4=' 'sha256-nr9cKw4ONTUDSB2DE0zh2RD8sdBaUN6T1YZ/cCE2H4M=' 'sha256-dkBZru08USynRApV+V+jfqq9MJtvAq+jnaGQA7L9XxU=' 'sha256-QdHgpwEEnPxZV6ByLX5uZCPOGKmc+SzQikh79cDYreg=' 'sha256-As+VZ5inwpJRs+3gKDhNonRoXR+TkIipyQpjbvYBHrU=' 'sha256-SaalYbFZ07L4qDYZ96HObgI4Re7qfskD24gbLnk5sMs=' 'sha256-jJoo4DNMwMVg4I4IDlg1ChLFJH7BV/MvNBPv6+rWzTc=' 'sha256-ANvVUHrEavvwj4x+omctWvh0ZmreLn18DtrkbfDSiLU=' 'sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=' 'sha256-OwlOqbP3VnAzYedGO5K7BbLR2YOoHw96wRy+VxYn414=' 'sha256-SpI+QgQY6BCOYLFeTgU/Z7MZ/KACrNlP5nvudg2afjE=' 'sha256-5V9YVuxHIjG6QvEev93hYF1xNxaSY04UZuv2unPU6kI=' 'sha256-3N6czMg79KEwU27zoGyFZ+9tN6u4DjdWchvldaQGfJg=' 'sha256-mJdZhsxUcmqovcijgBWHajUhLFcxaAMgcl8+L3OoSBc=' 'sha256-UqwRKPEI+M9fzyKB+sUpqCjV2m04VhNFznxxOdPnNT0=' 'sha256-Qg5cxQYRx6S39U3W73DTaX6sJi/EsyRIdLpsrCGLU+Y=' 'sha256-45sUMOo34Q00977ekWUyBSJgpDN5q6k0Zj7t5hj2wSU=' 'sha256-712poVmdpVhla4ux+2hRbDwP5Pe8WghkleNxUA/pOOI=' 'sha256-GmQ3CN0FgcQUhYDj7WflBm5F5bTOZ+ULCAWm4lzmk/0=' 'sha256-pntav9oY700kXoHF80b4HDlnZ5BpaA2uhAVk4sV0gKc=' 'sha256-mJdZhsxUcmqovcijgBWHajUhLFcxaAMgcl8+L3OoSBc=' 'sha256-3N6czMg79KEwU27zoGyFZ+9tN6u4DjdWchvldaQGfJg=' 'sha256-UqwRKPEI+M9fzyKB+sUpqCjV2m04VhNFznxxOdPnNT0=' 'sha256-t24ZWXIZFGl0/9Pe+IsJCrOrxTlInar7Shy6lp8vK/A=' 'sha256-45sUMOo34Q00977ekWUyBSJgpDN5q6k0Zj7t5hj2wSU=' 'sha256-d5ZKJjeIRcwBXYLpyLytbE9ZOCaAXeS9GhHav4SwUaU=' 'sha256-EIQncaP5/cVFiCS/xPbpuNkEJ/oPQTms5c7x5rcHMw0=' 'sha256-JjdrXkXswLCxrOYd0x4YdkxIuxCSPyGd9r5+DkA8vjc=' 'sha256-nMxMqdZhkHxz5vAuW/PAoLvECzzsmeAxD/BNwG15HuA=' 'sha256-QMltachGXHWCMp4EqKjbNSh/DzUnnPauieGP1P/ICT8=' 'sha256-o8w/COZUxxk1YqNUesAyJl/MqdlJowzATI/JvM+1xFk=' 'sha256-TiLJM9i1j8TxGJWqhQ/W4PgcKojXXPTDyXe6cvzQeOM=' 'sha256-Cr/3tmZj9QqHn7Cas7RcSIajNiixeOsU+YyOXkNEsN8=' 'sha256-BG0pkMG9Kpet9txBspjL8nYPdJ1wuUo2pO5rkvKWg7A=' 'sha256-0NPSZcnPqpUsOZ1b5gOxuNJNbwzkNo5EoXYbyDVXJ4k=' 'sha256-5CuYvLl5DHQZ7RV1xUDWvP7bDc31+XoHROQ+GZkkyS4=' 'sha256-zFt+GYCSqXznoLwaqrFWKiM2IGeNifFvtoWhDH2+liU=' 'sha256-rrV3jwThzJUINGMpSjRKdVi6IhPrqn0QWdQ+u96+7ag=' https://fonts.googleapis.com https://www.gstatic.com https://p.typekit.net https://use.typekit.net 'self'; frame-src https://vars.hotjar.com https://www.google.com"
})
})*/

head.meta.push({
name: 'viewport',
Expand Down
50 changes: 49 additions & 1 deletion src/pages/data/Changelog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,54 @@
</v-col>
</v-row>
<v-expansion-panels multiple v-model="panels">
<v-expansion-panel>
<v-expansion-panel-header
>May 6, 2024</v-expansion-panel-header
>
<v-expansion-panel-content>
<p>
On May 6, 2024, the Department updated the College Scorecard website with more recent data for
metrics from the Integrated Postsecondary Education Data System (IPEDS) and from Federal Student
Aid sources. To reduce file sizes, some text values have also been abbreviated in all data files.
Also, the data documentation reports have been updated to include an appendix describing what changes
were made to the report when compared to the prior version.
</p>
<p>
Specific data updates in this release include:
</p>
<ul>
<li>
Updates to all data metrics derived from IPEDS with more recent data values from a new data collection year.
</li>
<li>
Added percentages of degree/certificate-seeking undergraduate students awarded Pell Grants and Federal Student Loans.
</li>
<li>
Added median (50th percentile) SAT and ACT scores.
</li>
<li>
Updated data derived from Federal Student Aid sources to more recent values for the following data metrics:
<ul>
<li>Currently Operating Status Flag</li>
<li>Heightened Cash Monitoring Flag</li>
<li>Accrediting Agency Name and Code</li>
<li>Title IV Approval Date</li>
<li>Federal School Code</li>
<li>Cohort Default Rate</li>
<li>Minority-serving institution indicators</li>
<li>Institutional control (Postsecondary Education Participants System version)</li>
</ul>
<li>
When values for a metric have been suppressed in accordance with the privacy protocol,
the text string has been changed from “PrivacySuppressed” to “PS”.
</li>
<li>
When values for a metric are not available, the associated text string has been changed from “NULL” to “NA”.
</li>
</li>
</ul>
</v-expansion-panel-content>
</v-expansion-panel>
<v-expansion-panel>
<v-expansion-panel-header
>October 10, 2023</v-expansion-panel-header
Expand Down Expand Up @@ -1686,7 +1734,7 @@ export default {
},
methods: {
all() {
this.panels = [...Array(29).keys()].map((k, i) => i)
this.panels = [...Array(31).keys()].map((k, i) => i)
},
// Reset the panel
none() {
Expand Down
8 changes: 4 additions & 4 deletions src/pages/data/Index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@
</p>
<p class="pb-4">
This data was
<strong>last updated October 10, 2023</strong>.
<strong>last updated May 6, 2024</strong>.
</p>

<h2 class="my-5">
All Data Files
<v-btn
class="ml-2"
color="secondary"
href="https://ed-public-download.app.cloud.gov/downloads/CollegeScorecard_Raw_Data_09262023.zip"
href="https://ed-public-download.app.cloud.gov/downloads/College_Scorecard_Raw_Data_04082024.zip"
>Download (.zip, 436 MB)
<v-icon right dark x-small>
fas fa-download
Expand Down Expand Up @@ -59,7 +59,7 @@
small
color="secondary"
class="ml-0 ml-sm-2"
href="https://ed-public-download.app.cloud.gov/downloads/Most-Recent-Cohorts-Institution_09262023.zip"
href="https://ed-public-download.app.cloud.gov/downloads/Most-Recent-Cohorts-Institution_04082024.zip"
>Download (.zip, 23 MB)
<v-icon right dark x-small>
fas fa-download
Expand All @@ -73,7 +73,7 @@
small
class="ml-0 ml-sm-2"
color="secondary"
href=" https://ed-public-download.app.cloud.gov/downloads/Most-Recent-Cohorts-Field-of-Study_09262023.zip"
href=" https://ed-public-download.app.cloud.gov/downloads/Most-Recent-Cohorts-Field-of-Study_04082024.zip"
>Download (.zip, 17 MB)
<v-icon right dark x-small>
fas fa-download
Expand Down
4 changes: 2 additions & 2 deletions src/pages/school/Index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2599,8 +2599,8 @@ export default {
// Find the index
// let findIndex = _.findIndex(this.allFieldsOfStudy)
},
fieldOfStudySelectItems() {
if (!this.school || !this.allFieldsOfStudy) return {}
fieldOfStudySelectItems() {
if (!this.school || !this.allFieldsOfStudy) return []
return this.organizeFieldsOfStudy(this.allFieldsOfStudy, this.CIP2)
},
Expand Down
Binary file modified static/assets/CollegeScorecardDataDictionary.xlsx
Binary file not shown.
Binary file modified static/assets/FieldOfStudyDataDocumentation.pdf
Binary file not shown.
Binary file modified static/assets/InstitutionDataDocumentation.pdf
Binary file not shown.

0 comments on commit bb050a5

Please sign in to comment.