diff --git a/00_DIC_2522A_TEST.xlsx b/00_DIC_2522A_TEST.xlsx deleted file mode 100644 index 331e81e..0000000 Binary files a/00_DIC_2522A_TEST.xlsx and /dev/null differ diff --git a/00_DIC_2522B_TEST.xlsx b/00_DIC_2522B_TEST.xlsx deleted file mode 100644 index 367b283..0000000 Binary files a/00_DIC_2522B_TEST.xlsx and /dev/null differ diff --git a/00_DPI_2508B_TEST.xlsx b/00_DPI_2508B_TEST.xlsx deleted file mode 100644 index 2fb6bc9..0000000 Binary files a/00_DPI_2508B_TEST.xlsx and /dev/null differ diff --git a/DPI_2508B.json b/DPI_2508B.json index 7163f92..ebcb25a 100644 --- a/DPI_2508B.json +++ b/DPI_2508B.json @@ -599,7 +599,11 @@ "type": "exists", "ele": "//Layer//shape_type/@value", "value": "ROUNDED_RECTANGLE", - "point": 3 + "point": 3, + "desc": { + "사각형": "RECTANGLE", + "모서리가 둥근 사각형": "ROUNDED_RECTANGLE" + } }, "6": { "type": "shape.size", @@ -666,7 +670,7 @@ "point": 3 }, "15": { - "type": "hasClippingMask.exists", + "type": "clippingMask.exists", "ele": "//Layer/MaskOpType/@value", "value": "Clipping", "point": 6, @@ -678,7 +682,8 @@ "value": "RECTANGLE", "point": 3, "desc": { - "사각형": "RECTANGLE" + "사각형": "RECTANGLE", + "모서리가 둥근 사각형": "ROUNDED_RECTANGLE" } }, "17": { diff --git a/DPI_2508C.json b/DPI_2508C.json index 6190da3..aa2cb51 100644 --- a/DPI_2508C.json +++ b/DPI_2508C.json @@ -670,7 +670,7 @@ "point": 3 }, "15": { - "type": "exists", + "type": "clippingMask.exists", "ele": "//Layer/MaskOpType/@value", "value": "Clipping", "point": 6, diff --git a/gpdpScoring.js b/gpdpScoring.js index 76c18d0..9504e18 100644 --- a/gpdpScoring.js +++ b/gpdpScoring.js @@ -347,7 +347,7 @@ function getGpdpScore(gpdpData, scoringJson, index) { totalScore += compareAndScore(userAnswer, rightAnswer, point, key, scoringResult); } - if ( type.includes('hasClippingMask') && scoringResult[key] > 0 ) { + if ( type.includes('clippingMask') && scoringResult[key] > 0 ) { hasClippingMask = true; } } diff --git a/회차별채점자료/2508/DIC_2508A.json b/회차별채점자료/2508/DIC_2508A.json index beecca0..6453541 100644 --- a/회차별채점자료/2508/DIC_2508A.json +++ b/회차별채점자료/2508/DIC_2508A.json @@ -666,7 +666,7 @@ "point": 3 }, "15": { - "type": "exists", + "type": "clippingMask.exists", "ele": "//Layer/MaskOpType/@value", "value": "Clipping", "point": 6, diff --git a/회차별채점자료/2508/DIC_2508C.json b/회차별채점자료/2508/DIC_2508C.json index e37e08e..3674767 100644 --- a/회차별채점자료/2508/DIC_2508C.json +++ b/회차별채점자료/2508/DIC_2508C.json @@ -667,7 +667,7 @@ "point": 3 }, "15": { - "type": "exists", + "type": "clippingMask.exists", "ele": "//Layer/MaskOpType/@value", "value": "Clipping", "point": 6, diff --git a/회차별채점자료/2508/DPI_2508B.json b/회차별채점자료/2508/DPI_2508B.json index 6beaa76..ebcb25a 100644 --- a/회차별채점자료/2508/DPI_2508B.json +++ b/회차별채점자료/2508/DPI_2508B.json @@ -599,7 +599,11 @@ "type": "exists", "ele": "//Layer//shape_type/@value", "value": "ROUNDED_RECTANGLE", - "point": 3 + "point": 3, + "desc": { + "사각형": "RECTANGLE", + "모서리가 둥근 사각형": "ROUNDED_RECTANGLE" + } }, "6": { "type": "shape.size", @@ -666,7 +670,7 @@ "point": 3 }, "15": { - "type": "exists", + "type": "clippingMask.exists", "ele": "//Layer/MaskOpType/@value", "value": "Clipping", "point": 6, @@ -678,7 +682,8 @@ "value": "RECTANGLE", "point": 3, "desc": { - "사각형": "RECTANGLE" + "사각형": "RECTANGLE", + "모서리가 둥근 사각형": "ROUNDED_RECTANGLE" } }, "17": { diff --git a/회차별채점자료/2508/DPI_2508C.json b/회차별채점자료/2508/DPI_2508C.json index 6190da3..aa2cb51 100644 --- a/회차별채점자료/2508/DPI_2508C.json +++ b/회차별채점자료/2508/DPI_2508C.json @@ -670,7 +670,7 @@ "point": 3 }, "15": { - "type": "exists", + "type": "clippingMask.exists", "ele": "//Layer/MaskOpType/@value", "value": "Clipping", "point": 6, diff --git a/회차별채점자료/2508/JSON/DIC_2508A.json b/회차별채점자료/2508/JSON/DIC_2508A.json index 95d8df9..6453541 100644 --- a/회차별채점자료/2508/JSON/DIC_2508A.json +++ b/회차별채점자료/2508/JSON/DIC_2508A.json @@ -456,7 +456,7 @@ "media": "음악.mp3", "value": { "ID": "1", - "Duration": "90" + "Duration": "30" }, "point": 2, "desc": "ID속성-페이드인:0 / 페이드아웃: 1" @@ -666,7 +666,7 @@ "point": 3 }, "15": { - "type": "exists", + "type": "clippingMask.exists", "ele": "//Layer/MaskOpType/@value", "value": "Clipping", "point": 6, diff --git a/회차별채점자료/2508/JSON/DIC_2508C.json b/회차별채점자료/2508/JSON/DIC_2508C.json index e37e08e..3674767 100644 --- a/회차별채점자료/2508/JSON/DIC_2508C.json +++ b/회차별채점자료/2508/JSON/DIC_2508C.json @@ -667,7 +667,7 @@ "point": 3 }, "15": { - "type": "exists", + "type": "clippingMask.exists", "ele": "//Layer/MaskOpType/@value", "value": "Clipping", "point": 6, diff --git a/회차별채점자료/2508/JSON/DPI_2508B.json b/회차별채점자료/2508/JSON/DPI_2508B.json index 6beaa76..ebcb25a 100644 --- a/회차별채점자료/2508/JSON/DPI_2508B.json +++ b/회차별채점자료/2508/JSON/DPI_2508B.json @@ -599,7 +599,11 @@ "type": "exists", "ele": "//Layer//shape_type/@value", "value": "ROUNDED_RECTANGLE", - "point": 3 + "point": 3, + "desc": { + "사각형": "RECTANGLE", + "모서리가 둥근 사각형": "ROUNDED_RECTANGLE" + } }, "6": { "type": "shape.size", @@ -666,7 +670,7 @@ "point": 3 }, "15": { - "type": "exists", + "type": "clippingMask.exists", "ele": "//Layer/MaskOpType/@value", "value": "Clipping", "point": 6, @@ -678,7 +682,8 @@ "value": "RECTANGLE", "point": 3, "desc": { - "사각형": "RECTANGLE" + "사각형": "RECTANGLE", + "모서리가 둥근 사각형": "ROUNDED_RECTANGLE" } }, "17": { diff --git a/회차별채점자료/2508/JSON/DPI_2508C.json b/회차별채점자료/2508/JSON/DPI_2508C.json index 6190da3..aa2cb51 100644 --- a/회차별채점자료/2508/JSON/DPI_2508C.json +++ b/회차별채점자료/2508/JSON/DPI_2508C.json @@ -670,7 +670,7 @@ "point": 3 }, "15": { - "type": "exists", + "type": "clippingMask.exists", "ele": "//Layer/MaskOpType/@value", "value": "Clipping", "point": 6, diff --git a/250829_DIC_2508A_채점결과.xlsx b/회차별채점자료/2508/채점결과/250829_DIC_2508A_채점결과.xlsx similarity index 100% rename from 250829_DIC_2508A_채점결과.xlsx rename to 회차별채점자료/2508/채점결과/250829_DIC_2508A_채점결과.xlsx diff --git a/250829_DIC_2508C_채점결과.xlsx b/회차별채점자료/2508/채점결과/250829_DIC_2508C_채점결과.xlsx similarity index 100% rename from 250829_DIC_2508C_채점결과.xlsx rename to 회차별채점자료/2508/채점결과/250829_DIC_2508C_채점결과.xlsx diff --git a/250829_DPI_2508B_채점결과.xlsx b/회차별채점자료/2508/채점결과/250829_DPI_2508B_채점결과.xlsx similarity index 100% rename from 250829_DPI_2508B_채점결과.xlsx rename to 회차별채점자료/2508/채점결과/250829_DPI_2508B_채점결과.xlsx diff --git a/250829_DPI_2508C_채점결과.xlsx b/회차별채점자료/2508/채점결과/250829_DPI_2508C_채점결과.xlsx similarity index 100% rename from 250829_DPI_2508C_채점결과.xlsx rename to 회차별채점자료/2508/채점결과/250829_DPI_2508C_채점결과.xlsx diff --git a/250915_DPI_2508B_채점결과.xlsx b/회차별채점자료/2508/채점결과/250915_DPI_2508B_채점결과.xlsx similarity index 100% rename from 250915_DPI_2508B_채점결과.xlsx rename to 회차별채점자료/2508/채점결과/250915_DPI_2508B_채점결과.xlsx diff --git a/250905_DIC_2522A_채점결과.xlsx b/회차별채점자료/2522/채점결과/250905_DIC_2522A_채점결과.xlsx similarity index 100% rename from 250905_DIC_2522A_채점결과.xlsx rename to 회차별채점자료/2522/채점결과/250905_DIC_2522A_채점결과.xlsx diff --git a/250905_DIC_2522B_채점결과.xlsx b/회차별채점자료/2522/채점결과/250905_DIC_2522B_채점결과.xlsx similarity index 100% rename from 250905_DIC_2522B_채점결과.xlsx rename to 회차별채점자료/2522/채점결과/250905_DIC_2522B_채점결과.xlsx