diff --git a/00_DPI_2504B_TEST.xlsx b/00_DPI_2504B_TEST.xlsx new file mode 100644 index 0000000..285f08b Binary files /dev/null and b/00_DPI_2504B_TEST.xlsx differ diff --git a/250502_DIC_2504B_채점결과.xlsx b/250502_DIC_2504B_채점결과.xlsx index 58e4cea..2dab37d 100644 Binary files a/250502_DIC_2504B_채점결과.xlsx and b/250502_DIC_2504B_채점결과.xlsx differ diff --git a/250502_DPI_2504B_채점결과.xlsx b/250502_DPI_2504B_채점결과.xlsx index ee71795..f6f9494 100644 Binary files a/250502_DPI_2504B_채점결과.xlsx and b/250502_DPI_2504B_채점결과.xlsx differ diff --git a/250507_DIC_2504B_채점결과.xlsx b/250507_DIC_2504B_채점결과.xlsx new file mode 100644 index 0000000..e3526a2 Binary files /dev/null and b/250507_DIC_2504B_채점결과.xlsx differ diff --git a/250507_DPI_2504B_채점결과.xlsx b/250507_DPI_2504B_채점결과.xlsx new file mode 100644 index 0000000..f7d5013 Binary files /dev/null and b/250507_DPI_2504B_채점결과.xlsx differ diff --git a/DIC_2504B.json b/DIC_2504B.json index f72dc0d..e0efb43 100644 --- a/DIC_2504B.json +++ b/DIC_2504B.json @@ -459,7 +459,7 @@ }, "4": { "type": "multiValue", - "ele": "//Layer[Name[@value='{layer}']]/Effects/Item", + "ele": "//Layer[Name[@value='{layer}']]/Effects/Item[EffectData/{option}]/Name/@value | //Layer[Name[@value='{layer}']]/Effects/Item/EffectData/{option}/@value", "layer": "Flower", "option": "VibranceValue", "value": [ @@ -492,8 +492,8 @@ "type": "size", "ele": "//Layer//op_points", "value": { - "width": 80, - "height": 80 + "width": 120, + "height": 120 }, "point": 3, "desc": "레이어 쉐이프 X, Y 좌표를 가지고 너비, 높이 계산하여 정답 채점" @@ -633,7 +633,7 @@ "16": { "type": "exists", "ele": "//Layer/Shapes/Shape/shape_type/@value", - "value": "RACTANGLE", + "value": "RECTANGLE", "point": 3 }, "17": { diff --git a/copyFiles.py b/copyFiles.py index b72799f..c3a8002 100644 --- a/copyFiles.py +++ b/copyFiles.py @@ -5,7 +5,7 @@ import unicodedata def copy_dic_subdirs(source_root, target_root_a, target_root_b, target_root_c, target_root_d, target_root_e): for root, dirs, files in os.walk(source_root): for dir_name in dirs: - if dir_name.lower() == 'dic': # DIC 디렉토리 탐색 + if dir_name.lower() == 'dic' or dir_name.lower() == 'dpi': # DIC 디렉토리 탐색 parent_dir = os.path.basename(os.path.dirname(os.path.join(root, dir_name))) target_root = None parent_dir = unicodedata.normalize('NFC', parent_dir) diff --git a/gpdpScoring.js b/gpdpScoring.js index 4c95ee4..dc87b43 100644 --- a/gpdpScoring.js +++ b/gpdpScoring.js @@ -404,7 +404,7 @@ function getGpdpScore(gpdpData, scoringJson, index) { else { const result = xpath.select(ele, gpdpXmlDoc); const result2 = null; - const isCheck = false; + let isCheck = false; if (ele === 'none') { scoringResult[key] = "확인필요"; diff --git a/psdExport_2.js b/psdExport_2.js index 3a511a8..dfa5598 100644 --- a/psdExport_2.js +++ b/psdExport_2.js @@ -12,11 +12,12 @@ const getToday = require('./getToday.js'); const todayDate = getToday(); const examRound = '2504'; -const dic_or_dpi = 'DIC' +// const dic_or_dpi = 'DIC' +const dic_or_dpi = 'DPI' const examTypes = [ - 'A', + // 'A', 'B', - 'C', + // 'C', // 'D' ]; @@ -55,17 +56,20 @@ examTypes.forEach(type => { // 맥에서 한글 디렉토리 이름을 읽어서 엑셀에 저장 할 시 자소 분리가 되어 저장되는 문제 노말라이즈해서 해결 const name = student.normalize('NFC'); const studentDir = path.join(answerFilesDir, student); - const psdFiles = fs.readdirSync(studentDir).filter(file => file.endsWith('.psd')); + // const psdFiles = fs.readdirSync(studentDir).filter(file => file.endsWith('.psd')); + const psdFiles = fs.readdirSync(studentDir).filter(file => file.toLowerCase().endsWith('.psd')); + // DIAT시험 프로젝트로 생성시 gmep확장자로 // 교육용 프로젝프로 생성시 gmdp확장자로 생성됨 // 두 경우 모두 처리 const gmepFile = fs.readdirSync(studentDir).filter( - file => file.endsWith('.gmep') || file.endsWith('.gmdp') + file => file.toLowerCase().endsWith('.gmep') + || file.toLowerCase().endsWith('.gmdp') ); // 곰픽 파일 gpdp 파일 이거나 xml 파일 const gpdpFiles = fs.readdirSync(studentDir).filter( - file => file.endsWith('.xml') + file => file.toLowerCase().endsWith('.xml') ); // 학생 이름을 key로 하는 객체 생성