Change palette, Update data 230716

zetagate · Jul 16, 2023 · c0a5e27 · c0a5e27
1 parent ca73349
commit c0a5e27
Show file tree

Hide file tree

Showing 6 changed files with 810 additions and 813 deletions.
diff --git a/dbt/dbt230116.jsd b/dbt/dbt230116.jsd
diff --git a/dbt/dbt230716.jsd b/dbt/dbt230716.jsd
diff --git a/index.html b/index.html
@@ -38,9 +38,9 @@
 	<script type="text/javascript" src="js/envcheck.js?v=5"></script>
 	<script type="text/javascript" src="https://code.jquery.com/jquery-3.1.1.min.js"></script>
 	<script type="text/javascript" src="libs/dhtmlx/codebase/dhtmlxgrid.js"></script>
-	<script type="text/javascript" src="dbt/dbt230116.jsd?v=1"></script>
+	<script type="text/javascript" src="dbt/dbt230716.jsd?v=1"></script>
 	<script type="text/javascript" src="js/util.js?v=4"></script>
-	<script type="text/javascript" src="js/canvas.js?v=1"></script>
+	<script type="text/javascript" src="js/canvas.js?v=2"></script>
 	<script type="text/javascript" src="js/index.js?v=5"></script>
 
 	<script>
@@ -70,7 +70,7 @@
 
 		<div id="header">
 			<img src="png/orange.png" width="140" height="auto">
-			<br/><b>데이터 갱신일 : 2023-01-17 21:59</b>
+			<br/><b>데이터 갱신일 : 2023-07-16 19:40</b>
 			<br/><b><a href="https://www.koreatech.ac.kr/kor/CMS/NoticeMgr/view.do?mCode=MN233&post_seq=1161&board_id=16">[링크] 학사공지 바로가기</a></b>
 		</div>
 

diff --git a/js/canvas.js b/js/canvas.js
@@ -9,8 +9,8 @@ var COLOR_BG2 = "#FFFFFF";
 var COLOR_LINE = "#000000";
 var COLOR_TEXT = "#000000";
 var FONT_TEXT = "13px dotum";
-var COLOR_SET = ["#42BAFF","#00DC6D","#F1BE5B","#FFA6E9","#FFAB6E",
-                "#FFFD66","#A4A4A4","#E191FF","#85E4FF","#FF7F32"];
+var COLOR_SET = ["#7BC4ED","#F77F6F","#AEE68C","#8BD3C8","#FDCCE6",
+                "#BEB9DC","#BD7EBF","#FEB55A","#B8B0B0","#FFF3A5"];
 
 var TIME_NAME = ["01A","01B","02A","02B","03A","03B","04A","04B","05A","05B","06A","06B","07A","07B","08A","08B","09A","09B"];
 var CLOCK_NAME = ["09:00","09:30","10:00","10:30","11:00","11:30","12:00","12:30","13:00","13:30","14:00","14:30","15:00","15:30","16:00","16:30","17:00","17:30"];
@@ -83,7 +83,7 @@ function drawSelection(ctx, times, thickness)
 
     ctx.beginPath();
     ctx.lineWidth = thickness;
-    ctx.strokeStyle="#F72244";
+    ctx.strokeStyle="#EE3355";
 
     if(times.length == 0) return;
     for(var i=0; i<times.length; i++) {
@@ -134,7 +134,7 @@ function drawCartList(ctx, db, list)
             ctx.fillRect(xs, ys, W_C, height);
             ctx.fillStyle="#000000";
             ctx.strokeStyle="#000000";
-            ctx.lineWidth=2;
+            ctx.lineWidth=1.0;
             ctx.strokeRect(xs, ys, W_C, height);
             var text = sbj[D_KOR] + "\n" + sbj[D_CLS];
             if(proFlag) text += " " + sbj[D_PRO];

diff --git a/tools/dbgen5.html b/tools/dbgen5.html
@@ -6,7 +6,7 @@
 		<script src="../libs/jquery-3.1.1.min.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.8.0/jszip.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.8.0/xlsx.js"></script>
-		<script src="dbgen5_excel.js"></script>
+		<script src="dbgen5_excel.js?a=3"></script>
 	</head>
 
 	<body onload="doOnLoad()">

diff --git a/tools/dbgen5_excel.js b/tools/dbgen5_excel.js
@@ -50,14 +50,14 @@
                 "분반",
                 "대상학부(과)",
                 "강의실",
-                // "학\r\n점",
-                // "설\r\n계",
-                "학점",
-                "설계",
+                "학\r\n점",
+                "설\r\n계",
+                // "학점",
+                // "설계",
                 "개설학부(과)",
                 "담당교수",
-                // "수강\r\n정원",
-                "정원",
+                "수정\r\n정원",
+                // "수강정원",
             ]
 
             let subjectInfo = "[";
@@ -73,6 +73,7 @@
                     var unit = str.split(",");
                     let lastDay = "";
                     for(var j=0; j<unit.length; j++) {
+                        unit[j] = unit[j].replaceAll("(온라인)", "");
                         if(unit[j].length == 8) {
                             var startStr = unit[j].substr(1,3);
                             var endStr = unit[j].substr(5,3);
@@ -94,13 +95,19 @@
                                 subjectInfo += k + ",";
                             }
                         }
+                        else if (lastDay != "" && unit[j].length == 3) {
+                            let startStr = unit[j].substr(0,3);
+                            let startTime = DAY_TIME[lastDay] + 2*(parseInt(startStr.substr(0,2))-1) + AB_TIME[startStr.charAt(2)];
+                            subjectInfo += startTime + ",";
+                        }
                         else if(unit[j].length == 4) {
                             var startStr = unit[j].substr(1,3);
                             var startTime = DAY_TIME[unit[j].charAt(0)] + 2*(parseInt(startStr.substr(0,2))-1) + AB_TIME[startStr.charAt(2)];
                             subjectInfo += startTime + ",";
                         }
                         else {
                             console.log(row);
+                            console.log(unit[j]);
                         }
                     }
                     subjectInfo += "]],";