From 4cb210adb608e9d7387807f6302ab540b1796056 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9C=A0=EC=A7=80=EC=9D=B8?= <jiyoo@dbnt.co.kr>
Date: Tue, 9 Dec 2025 13:12:19 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EC=97=85=EB=A1=9C=EA=B7=B8=EC=9D=B8?=
 =?UTF-8?q?=20>=20=EA=B8=B0=EB=B3=B8=ED=98=84=EC=9E=A5=EC=8B=9C=ED=97=98?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4=EC=9E=85=EB=A0=A5=20>=20=EA=B3=B5=EB=82=B4?=
 =?UTF-8?q?=EC=9E=AC=ED=95=98=ED=83=AD=20:=20=EA=B7=B8=EB=A6=AC=EB=93=9C?=
 =?UTF-8?q?=20=E2=80=98=ED=8A=9C=EB=B8=8C=EC=A2=85=EB=A5=98=E2=80=99=20?=
 =?UTF-8?q?=EB=AA=85=EC=B9=AD,=20=ED=98=95=EC=8B=9D=20=EB=B3=80=EA=B2=BD?=
 =?UTF-8?q?=20=EB=AA=85=EC=B9=AD(=E2=80=98=ED=8A=9C=EB=B8=8C=EC=A2=85?=
 =?UTF-8?q?=EB=A5=98=E2=80=99=E2=9E=A1=E2=80=99=EC=8B=9C=ED=97=98=EC=A2=85?=
 =?UTF-8?q?=EB=A5=98=E2=80=99),=20=ED=98=95=EC=8B=9D(text=20=E2=9E=A1=20?=
 =?UTF-8?q?=EC=BD=A4=EB=B3=B4=EB=B0=95=EC=8A=A4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../regi/basicInfo/BasicController.java       |  4 +
 .../input/basic/labInfoFieldPressuremeter.jsp | 77 ++++++++++++++++++-
 2 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/src/main/java/geoinfo/regi/basicInfo/BasicController.java b/src/main/java/geoinfo/regi/basicInfo/BasicController.java
index 63a6713b..070bbe6f 100644
--- a/src/main/java/geoinfo/regi/basicInfo/BasicController.java
+++ b/src/main/java/geoinfo/regi/basicInfo/BasicController.java
@@ -1044,6 +1044,10 @@ public class BasicController {
 		List<EgovMap> commCode = basicService.selectWebCommCode(params);
 		model.put("commCode", commCode);
 
+		params.put("commCode", "CM017");
+		List<EgovMap> commCode2 = basicService.selectWebCommCode(params);
+		model.put("commCode2", commCode2);
+
 		params.put("projectCode", oPROJECT_CODE);
 		params.put("holeCode", oHOLE_CODE);
 		params.put("viewTabArray", oViewTabArray);
diff --git a/src/main/webapp/WEB-INF/views/web/input/basic/labInfoFieldPressuremeter.jsp b/src/main/webapp/WEB-INF/views/web/input/basic/labInfoFieldPressuremeter.jsp
index b4dcfdf0..46c390bf 100644
--- a/src/main/webapp/WEB-INF/views/web/input/basic/labInfoFieldPressuremeter.jsp
+++ b/src/main/webapp/WEB-INF/views/web/input/basic/labInfoFieldPressuremeter.jsp
@@ -18,6 +18,30 @@
 <script type="text/javascript">
 var collection;	// 그리드의 데이타 객체
 
+var arrTestType = new Array();
+function fn_setGridCombo() {
+
+	var num = 0;
+
+	<c:set var="num" value="0"/>
+	<c:forEach var="item" items="${commCode2}" varStatus="status">
+	<c:if test="${item.code == 'CM017'}">
+		<c:if test="${num == 0}">
+			arrTestType["${num}"] = {};
+			arrTestType["${num}"]['code'] = "${item.codeValue}";
+			arrTestType["${num}"]['label'] = "${item.codeText}";
+			<c:set var="num" value="${num + 1}"/>
+		</c:if>
+		<c:if test="${num != 0}">
+			arrTestType["${num}"] = {};
+			arrTestType["${num}"]['code'] = "${item.codeValue}";
+			arrTestType["${num}"]['label'] = "${item.codeText}";
+			<c:set var="num" value="${num + 1}"/>
+		</c:if>
+	</c:if>
+	</c:forEach>
+
+}
 // Data 저장.
 function fn_save(rUrl) {
 
@@ -535,6 +559,7 @@ function fn_grid_refresh(){
 									fn_onLoad();
 									fn_kendoGrid();
 									fn_kendoGridStyle();
+									fn_setGridCombo();
 
 									fn_setHeaderText();		//기준계 조회 해서 SetHeaderText
 
@@ -605,7 +630,15 @@ function fn_grid_refresh(){
 										dataSource: kictDataSource,
 										columns: [
 											{ field: "fieldpresCode", title: "시험코드", attributes: { style:"text-align: left" }, template: "<div class='td-data'>#= (fieldpresCode == null) ? '' : fieldpresCode #</div>" },
-											{ field: "fieldpresTubeType", title: "튜브종류", attributes: { style:"text-align: left" }, template: "<div class='td-data'>#= (fieldpresTubeType == null) ? '' : fieldpresTubeType #</div>" },
+// 											{ field: "fieldpresTubeType", title: "시험종류", attributes: { style:"text-align: left" }, template: "<div class='td-data'>#= (fieldpresTubeType == null) ? '' : fieldpresTubeType #</div>" },
+											{
+												field: "fieldpresTubeType",
+												title: "시험종류",
+												width:105,
+												attributes: { style:"text-align: left" },
+												editor: comboEditor,
+												template: "#=getTeacherName((fieldpresTubeType == null) ? ' ' : fieldpresTubeType)#",
+											},
 											{ field: "fieldpresInspectedBy", title: "조사자", attributes: { style:"text-align: left" }, template: "<div class='td-data'>#= (fieldpresInspectedBy == null) ? '' : fieldpresInspectedBy #</div>" },
 											{ field: "fieldpresCheckedBy", title: "검수자", attributes: { style:"text-align: left" }, template: "<div class='td-data'>#= (fieldpresCheckedBy == null) ? '' : fieldpresCheckedBy #</div>" },
 											{ field: "fieldpresDepth", title: "심도(m)", editor: chooseEditor, attributes: { style:"text-align: right" }, template: "<div class='td-data'>#= (fieldpresDepth == null) ? '0' : fieldpresDepth #</div>" },
@@ -658,6 +691,48 @@ function fn_grid_refresh(){
 									});
 								}
 
+								// 그리드 콤보박스 에디트
+								function comboEditor(container, options) {
+									var data = JSON.parse(JSON.stringify(arrTestType));
+									kendoJQuery('<input required data-text-field="label" data-value-field="code" name="' + options.field + '" />')
+										.appendTo(container)
+										.kendoDropDownList({
+											dataValueField: "code",
+											dataTextField: "label",
+											autoBind: true,
+											suggest: true,
+											//optionLabel: "선택",
+											dataSource:  data,
+											index: 1,
+											change: function(e) {
+												selectedValue = e.sender.value();
+											},
+										});
+								}
+
+								function getTeacherName(value) {
+									var data = JSON.parse(JSON.stringify(arrTestType));
+									var text = "";
+									if (value == "[object Object]"){
+										for (var idx = 0, length = data.length; idx < length; idx++)
+										{
+											if (data[idx].code === selectedValue) {
+												text = data[idx].label;
+												console.log("선택:"+text);
+											}
+										}
+										return text;
+									} else {
+										for (var idx = 0, length = data.length; idx < length; idx++)
+										{
+											if (data[idx].code === value) {
+												text = data[idx].label;
+												console.log("선택:"+text);
+											}
+										}
+										return text;
+									}
+								}
 							</script>
 							<div id="kictGrid" class="kist-grid kist-grid-scroll-400" data-target="grid"></div>