Skip to content

Fix K-correction bug and 14 data entry errors #7

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

Open
Khetnen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix K-correction bug and 14 data entry errors #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 14 additions & 14 deletions data/scales.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@
{
"name": "D1",
"title": "Subjective Depression",
"answers": [[2,false],[9,false],[31,true],[38,true],[39,true],[43,false],[46,true],[49,false],[56,true],[73,true],[75,false],[92,true],[95,false],[109,false],[118,false],[127,true],[130,true],[140,false],[146,true],[147,true],[148,false],[170,true],[175,true],[178,false],[188,false],[189,false],[215,true],[223,true],[223,false],[260,false],[267,false],[330,false]],
"answers": [[2,false],[9,false],[31,true],[38,true],[39,true],[43,false],[46,true],[49,false],[56,true],[73,true],[75,false],[92,true],[95,false],[109,false],[118,false],[127,true],[130,true],[140,false],[146,true],[147,true],[148,false],[170,true],[175,true],[178,false],[188,false],[189,false],[215,true],[223,false],[233,true],[260,false],[267,false],[330,false]],
"tScores": {
"male": [32,35,37,40,42,45,48,50,53,56,58,61,64,66,69,71,74,77,79,82,85,87,90,93,95,98,100,103,106,108,111,114,116],
"female": [32,34,37,39,41,44,46,48,51,53,56,58,60,63,65,67,70,72,75,77,79,82,84,86,89,91,94,96,98,101,103,105,108]
Expand Down Expand Up @@ -419,7 +419,7 @@
},
"answers": [[1,false],[4,true],[19,false],[25,true],[26,false],[27,false],[62,true],[63,false],[64,true],[67,true],[68,false],[69,false],[74,true],[76,false],[80,true],[86,false],[103,false],[104,false],[107,false],[112,true],[119,true],[120,false],[121,false],[122,true],[128,true],[132,false],[133,false],[137,true],[163,false],[166,true],[177,true],[184,false],[187,true],[191,true],[193,false],[194,false],[196,true],[197,false],[199,false],[201,false],[205,true],[207,false],[209,true],[219,true],[231,false],[235,false],[236,true],[237,false],[239,false],[251,true],[254,false],[256,true],[257,false],[268,true],[271,true],[272,false]],
"tScores": {
"male": [30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60,62,64,666,68,70,72,72,76,78,79,81,83,85,87,89,91,93,95,97,99,101,103,105,107,109]
"male": [30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60,62,64,66,68,70,72,72,76,78,79,81,83,85,87,89,91,93,95,97,99,101,103,105,107,109]
},
"scoreOffsets": {
"male": 16
Expand Down Expand Up @@ -516,7 +516,7 @@
},
"answers": [[3,false],[9,false],[11,true],[16,true],[23,true],[31,true],[33,false],[38,true],[56,true],[65,true],[73,true],[82,true],[89,true],[94,true],[109,false],[130,true],[140,false],[147,true],[165,false],[170,true],[174,false],[175,true],[196,true],[218,true],[242,true],[273,true],[275,true],[277,true],[285,true],[289,true],[293,false],[301,true],[302,true],[304,true],[308,true],[309,true],[310,true],[313,true],[316,true],[317,true],[320,true],[321,false],[325,true],[326,true],[327,true],[328,true],[329,true],[331,true]],
"tScores": {
"male": [30,31,32,33,34,36,37,39,41,43,44,47,49,51,53,55,57,59,62,64,66,68,70,72,74,77,79,81,93,85,87,89,91,94,96,98,100,102,104,106,109,111,113,115,117,119,120],
"male": [30,31,32,33,34,36,37,39,41,43,44,47,49,51,53,55,57,59,62,64,66,68,70,72,74,77,79,81,83,85,87,89,91,94,96,98,100,102,104,106,109,111,113,115,117,119,120],
"female": [30,31,32,33,35,37,38,40,42,44,47,49,51,53,55,57,59,61,62,64,66,68,70,72,73,75,77,79,81,83,84,86,88,90,92,94,95,97,99,101,103,105,106,108,110,112,114,116,117,119,120]
},
"scoreOffsets": {
Expand All @@ -535,7 +535,7 @@
},
"answers": [[6,false],[9,false],[12,false],[16,true],[17,true],[21,true],[22,true],[23,true],[31,true],[32,true],[34,false],[35,true],[38,true],[42,true],[44,true],[46,true],[48,true],[65,true],[85,true],[90,false],[91,false],[92,true],[106,false],[138,true],[145,true],[147,true],[165,false],[166,true],[168,true],[170,true],[177,false],[179,false],[180,true],[182,true],[190,true],[192,false],[210,false],[218,true],[221,true],[229,true],[233,true],[234,true],[242,true],[247,true],[252,true],[255,false],[256,true],[268,true],[273,true],[274,true],[276,false],[277,true],[278,false],[279,true],[280,false],[281,true],[287,true],[290,false],[291,true],[292,true],[295,false],[296,true],[298,true],[299,true],[303,true],[307,true],[311,true],[316,true],[319,true],[320,true],[322,true],[323,true],[325,true],[329,true],[332,true],[333,true],[343,false],[355,true]],
"tScores": {
"male": [30,31,32,33,34,35,36,37,39,4,42,44,45,47,49,51,53,55,56,58,60,62,63,65,67,69,70,72,74,75,77,79,81,82,84,86,87,89,91,93,94,96,98,99,101,103,105,106,108,110,111,113,115,117,118,120],
"male": [30,31,32,33,34,35,36,37,39,41,42,44,45,47,49,51,53,55,56,58,60,62,63,65,67,69,70,72,74,75,77,79,81,82,84,86,87,89,91,93,94,96,98,99,101,103,105,106,108,110,111,113,115,117,118,120],
"female": [30,31,32,33,34,36,37,39,41,42,44,46,48,50,52,53,55,57,59,60,62,63,65,66,67,69,70,72,73,75,76,78,79,81,82,84,85,87,88,90,91,93,94,96,97,99,100,102,103,105,106,108,109,111,112,114,115,116,118,119,120]
},
"scoreOffsets": {
Expand Down Expand Up @@ -577,7 +577,7 @@
"answers": [[9,false],[31,true],[38,true],[48,true],[65,true],[92,true],[210,false],[233,true],[234,true],[273,true],[290,false],[299,true],[303,true],[325,true]],
"tScores": {
"male": [39,44,49,55,60,65,71,76,82,87,92,98,103,109,114],
"female": [39,44,49,54,59,65,40,75,80,85,90,95,100,106,111]
"female": [39,44,49,54,59,65,70,75,80,85,90,95,100,106,111]
}
},
{
Expand Down Expand Up @@ -610,7 +610,7 @@
},
"answers": [[13,true],[15,true],[21,true],[23,true],[50,true],[55,true],[61,true],[85,true],[87,true],[88,false],[93,false],[98,true],[100,false],[106,false],[107,false],[113,true],[122,true],[131,true],[136,false],[145,true],[154,false],[155,true],[158,false],[167,false],[168,true],[169,true],[182,true],[190,true],[200,true],[205,true],[206,true],[211,true],[212,true],[218,true],[220,true],[227,true],[229,true],[238,true],[242,true],[243,false],[244,true],[248,true],[250,true],[253,true],[263,false],[269,true]],
"tScores": {
"male": [30,31,33,35,36,38,39,41,43,45,47,49,51,53,56,59,62,65,59,72,75,78,81,82,88,91,94,98,101,104,107,110,114,117,120],
"male": [30,31,33,35,36,38,39,41,43,45,47,49,51,53,56,59,62,65,69,72,75,78,81,82,88,91,94,98,101,104,107,110,114,117,120],
"female": [30,31,33,35,37,39,41,43,45,47,49,51,53,56,59,62,65,68,71,74,76,79,82,85,88,91,94,97,100,103,106,109,112,115,118,120]
},
"scoreOffsets": {
Expand Down Expand Up @@ -1051,7 +1051,7 @@
"answers": [[26,true],[35,true],[66,true],[81,true],[84,true],[104,true],[105,true],[110,true],[123,true],[227,true],[240,true],[248,true],[250,true],[254,true],[266,false],[269,true],[283,true],[284,true],[374,true],[412,true],[418,true],[419,true]],
"tScores": {
"male": [30,34,37,40,42,44,46,47,49,51,53,55,58,62,65,69,72,76,79,83,87,90,94],
"female": [33,36,39,42,45,47,49,42,54,56,59,63,66,69,72,75,79,82,85,88,91,94,98]
"female": [33,36,39,42,45,47,49,52,54,56,59,63,66,69,72,75,79,82,85,88,91,94,98]
},
"subScales": [
{
Expand Down Expand Up @@ -1239,15 +1239,15 @@
"answers": [[31,true],[38,true],[56,true],[65,true],[82,true],[127,true],[135,true],[215,true],[233,true],[243,true],[251,true],[273,true],[277,true],[289,true],[301,true],[309,true],[310,true],[311,true],[325,true],[328,true],[338,true],[339,true],[341,true],[347,true],[388,false],[390,true],[391,true],[394,true],[400,true],[408,true],[411,true],[415,true],[421,true],[428,true],[442,true],[448,true],[451,true],[464,true],[469,true]],
"tScores": {
"male": [36,37,39,40,42,43,44,46,47,49,50,51,53,54,56,57,58,60,61,63,64,65,67,68,70,71,73,74,75,77,78,80,81,82,84,85,87,88,89,91],
"female": [35,37,38,39,40,42,43,44,45,47,48,49,50,52,53,54,56,57,58,59,61,62,63,64,66,67,68,69,71,72,73,74,76,77,76,80,81,82,83,85]
"female": [35,37,38,39,40,42,43,44,45,47,48,49,50,52,53,54,56,57,58,59,61,62,63,64,66,67,68,69,71,72,73,74,76,77,78,80,81,82,83,85]
}
},
{
"name": "Mt",
"title": "College Maladjustment",
"answers": [[2,false],[3,false],[9,false],[10,false],[15,true],[16,true],[20,false],[28,true],[31,true],[38,true],[43,false],[71,true],[73,true],[81,true],[82,true],[95,false],[110,true],[130,true],[131,false],[140,false],[148,false],[152,false],[215,true],[218,true],[223,false],[233,true],[269,true],[273,true],[299,true],[302,true],[325,true],[331,true],[339,true],[357,true],[405,false],[408,true],[411,true],[449,true],[464,true],[469,true],[472,true]],
"tScores": {
"male": [32,34,36,37,39,40,42,43,45,46,48,50,51,53,54,56,57,59,60,62,64,65,67,68,70,71,73,74,76,77,79,81,82,84,85,87,88,30,31,93,95,96],
"male": [32,34,36,37,39,40,42,43,45,46,48,50,51,53,54,56,57,59,60,62,64,65,67,68,70,71,73,74,76,77,79,81,82,84,85,87,88,90,91,93,95,96],
"female": [32,34,35,37,38,40,41,42,44,45,47,48,50,51,52,54,55,57,58,60,61,62,64,65,67,68,70,71,72,74,75,77,78,80,81,82,84,85,87,88,90,91]
}
},
Expand All @@ -1257,7 +1257,7 @@
"answers": [[2,false],[3,false],[9,false],[16,true],[17,true],[22,true],[23,true],[30,true],[31,true],[32,true],[37,true],[39,true],[48,true],[49,false],[52,true],[56,true],[59,true],[65,true],[75,false],[82,true],[85,true],[92,true],[94,true],[95,false],[101,true],[125,false],[135,true],[140,false],[150,true],[168,true],[170,true],[196,true],[221,true],[274,true],[277,true],[302,true],[303,true],[305,true],[316,true],[319,true],[327,true],[328,true],[339,true],[347,true],[349,true],[367,true]],
"tScores": {
"male": [37,38,40,42,43,45,47,48,50,52,53,55,57,58,60,62,63,65,67,68,70,72,73,75,77,78,80,82,83,85,87,88,90,92,93,95,97,98,100,102,103,105,107,108,110,112,113],
"female": [37,39,40,42,43,45,46,48,49,51,52,54,55,57,58,60,61,63,64,66,67,69,71,72,74,75,77,78,80,81,83,84,86,87389,90,92,93,95,96,98,99,101,103,104,106,107]
"female": [37,39,40,42,43,45,46,48,49,51,52,54,55,57,58,60,61,63,64,66,67,69,71,72,74,75,77,78,80,81,83,84,86,87,89,90,92,93,95,96,98,99,101,103,104,106,107]
}
},
{
Expand Down Expand Up @@ -1299,7 +1299,7 @@
{
"name": "Es",
"title": "Ego Strength",
"answers": [[2,true],[23,false],[31,false],[32,false],[33,true],[36,false],[39,false],[45,true],[53,false],[60,false],[70,false],[82,false],[87,false],[98,true],[119,false],[128,false],[141,true],[159,true],[169,true],[175,false],[177,true],[179,true],[189,true],[196,false],[199,true],[209,true],[213,true],[215,false],[221,false],[225,false],[229,false],[230,true],[236,false],[245,true],[246,false],[307,false],[310,false],[316,false],[325,true],[328,false],[385,true],[391,false],[394,false],[406,true],[413,true],[425,true],[441,false],[447,false],[458,false],[464,false],[469,false],[471,false]],
"answers": [[2,true],[23,false],[31,false],[32,false],[33,true],[36,false],[39,false],[45,true],[53,false],[60,false],[70,false],[82,false],[87,false],[98,true],[119,false],[128,false],[141,true],[159,true],[169,true],[175,false],[177,true],[179,true],[189,true],[196,false],[199,true],[209,true],[213,true],[215,false],[221,false],[225,false],[229,false],[230,true],[236,false],[245,true],[246,false],[307,false],[310,false],[316,false],[323,true],[328,false],[385,true],[391,false],[394,false],[406,true],[413,true],[425,true],[441,false],[447,false],[458,false],[464,false],[469,false],[471,false]],
"tScores": {
"male": [30,31,34,36,38,40,42,45,47,49,51,54,56,58,60,63,65,67,69,72,74,76,78,81,83],
"female": [30,31,33,35,37,39,41,43,45,47,49,51,53,55,57,59,61,64,66,68,70,72,74,76,78,80,82,84,86]
Expand Down Expand Up @@ -1385,7 +1385,7 @@
"answers": [[172,true],[264,true],[266,false],[288,true],[362,true],[387,true],[429,false],[487,true],[489,true],[501,false],[511,true],[527,true],[544,true]],
"tScores": {
"male": [36,41,46,51,56,60,65,70,75,80,85,90,95,100],
"female": [39,44,50,56,61,67,7,78,84,90,95,101,107,113]
"female": [39,44,50,56,61,67,73,78,84,90,95,101,107,113]
}
},
{
Expand Down Expand Up @@ -1422,7 +1422,7 @@
{
"name": "GF",
"title": "Feminine Gender Role",
"answers": [[1,false],[27,false],[62,true],[63,false],[67,true],[68,false],[79,false],[84,false],[105,false],[119,true],[121,true],[123,false],[128,true],[133,false],[155,false],[197,false],[201,false],[203,false],[220,false],[231,false],[238,false],[239,false],[250,false],[257,false],[263,true],[264,false],[266,true],[272,false],[287,false],[353,true],[384,true],[406,false],[417,false],[426,true],[449,true],[456,true],[465,false],[475,true],[477,false],[487,false],[510,false],[511,false],[537,false],[548,false],[550,false],[552,true]],
"answers": [[1,false],[27,false],[62,true],[63,false],[67,true],[68,false],[79,false],[84,false],[105,false],[119,true],[121,true],[123,false],[128,true],[133,false],[155,false],[197,false],[201,false],[203,false],[220,false],[231,false],[238,false],[239,false],[250,false],[257,false],[263,true],[264,false],[266,true],[272,false],[287,false],[353,true],[384,true],[406,false],[417,false],[426,true],[449,true],[456,true],[465,false],[473,true],[477,false],[487,false],[510,false],[511,false],[537,false],[548,false],[550,false],[552,true]],
"tScores": {
"male": [30,32,34,37,39,41,43,45,47,49,51,54,56,58,60,62,64,66,68,71,73,75,77,79,81,83,85,88,90],
"female": [30,33,35,38,40,43,46,48,51,53,56,59,61,64,66,69,71]
Expand Down Expand Up @@ -1478,7 +1478,7 @@
"answers": [[37,true],[52,true],[63,false],[82,true],[93,true],[116,true],[166,true],[196,true],[213,true],[223,false],[290,true],[301,true],[305,true],[329,true],[372,false],[375,true],[389,true],[390,true],[395,true],[397,true],[405,false],[407,true],[409,true],[415,true],[435,true],[442,true],[444,true],[451,true],[496,false],[513,true],[542,true],[556,true],[564,false]],
"tScores": {
"male": [31,34,36,39,41,43,44,46,48,49,51,52,54,56,57,59,61,64,66,68,70,72,74,76,78,80,82,84,86,89,91,93,95,97],
"female": [30,31,34,36,38,40,42,44,45,46,48,49,50,52,53,55,57,59,61,63,66,68,70,72,75,77,79,81384,86,88,90,93,95]
"female": [30,31,34,36,38,40,42,44,45,46,48,49,50,52,53,55,57,59,61,63,66,68,70,72,75,77,79,81,84,86,88,90,93,95]
}
},
{
Expand Down
4 changes: 3 additions & 1 deletion views/report.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const Report = Vue.component("report-view", {
calculateTScore: function(rawScore, scale) {
var tScores = scale.tScores[this.gender];
if (scale.kCorrection) {
var kScore = this.scores["K"] * scale.kCorrection + rawScore;
var kScore = this.kRawScore * scale.kCorrection + rawScore;
rawScore = Math.floor(kScore + 0.5);
}
if (scale.scoreOffsets) {
Expand All @@ -66,6 +66,8 @@ const Report = Vue.component("report-view", {
if (scale.subScales) {
scale.subScales.forEach(vm.gradeScale)
}
if (scale.name == "K")
vm.kRawScore = rawScore;
if (scale.tScores)
vm.scores[scale.name] = vm.calculateTScore(rawScore, scale);
else
Expand Down