DBNT
/
geoinfo_eGov_work
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: DBNT:2026d7580e2f4ca7b3f6f725599be46b4976a203
Branches Tags
DBNT:main
DBNT:jiyoo
DBNT:master
DBNT:cks
..
compare: DBNT:06c078fef8f0d831d5ae1ec8f3e35ac923522f65
Branches Tags
DBNT:main
DBNT:jiyoo
DBNT:master
DBNT:cks

No commits in common. "2026d7580e2f4ca7b3f6f725599be46b4976a203" and "06c078fef8f0d831d5ae1ec8f3e35ac923522f65" have entirely different histories.
2026d7580e ... 06c078fef8

2 changed files with 7 additions and 31 deletions
Show Stats Expand all files Collapse all files

24
src/main/webapp/WEB-INF/views/web/input/sampleInfo.jsp
View File

@ -711,7 +711,6 @@ function fn_grid_refresh(){
fn_isMsg(); fn_isMsg();
fn_onLoad(); fn_onLoad();
fn_MakeDataArray(); fn_MakeDataArray();
fn_ConvertGridData(); // DB에서 값없음(-999); 화면에서 갑없음(-); kendo grid에서 값 없음(null) 처리
fn_kendoGrid(); fn_kendoGrid();
fn_setGridCombo(); fn_setGridCombo();
@ -755,20 +754,7 @@ function fn_grid_refresh(){
}); });
/* 탭 & 엔터키 이동 끝 */ /* 탭 & 엔터키 이동 끝 */
} }
/**
* DB에서 값없음(-999); 화면에서 갑없음(-); kendo grid에서 값 없음(null) 처리
*/
function fn_ConvertGridData() {
if (!Array.isArray(gridData)) return;
gridData.forEach(item => {
if (item.sampleGs == -999) item.sampleGs = null;
if (item.sampleWc == -999) item.sampleWc = null;
if (item.sampleLl == -999) item.sampleLl = null;
if (item.samplePi == -999) item.samplePi = null;
if (item.sampleRd == -999) item.sampleRd = null;
});
}
function fn_kendoGrid() { function fn_kendoGrid() {
var nullTypeString = 'test'; var nullTypeString = 'test';
@ -815,12 +801,12 @@ function fn_grid_refresh(){
sampleDepthTo: { type: "number" }, sampleDepthTo: { type: "number" },
sampleSamplingMethod: { type: "string" }, sampleSamplingMethod: { type: "string" },
sampleShape: { type: "string" }, sampleShape: { type: "string" },
sampleWc: { type: "number", defaultValue: null}, sampleWc: { type: "number", defaultValue: "-"},
sampleGs: { type: "number", defaultValue: null}, sampleGs: { type: "number", defaultValue: "-"},
sampleLl: { type: "number", defaultValue: null }, sampleLl: { type: "number", defaultValue: "-" },
samplePi: { type: "number", defaultValue: null }, samplePi: { type: "number", defaultValue: "-" },
sampleDesc: { type: "string" }, sampleDesc: { type: "string" },
sampleRd: { type: "number", defaultValue: null }, sampleRd: { type: "number", defaultValue: "-" },
sampleUscs: { type: "string" }, sampleUscs: { type: "string" },
sampleCode: { type: "string", editable: false }, sampleCode: { type: "string", editable: false },
} }

14
src/main/webapp/kendo-ui/js/common.js
View File

@ -52,12 +52,8 @@ function numericEditor(container, options, isHyphenAllowed = false) {
function numericEditor2(container, options, isHyphenAllowed = false) { function numericEditor2(container, options, isHyphenAllowed = false) {
let rawVal = options.model[options.field]; var input = kendoJQuery('<input type="test" name="' + options.field + '" class="k-textbox" style="width:100%; text-align:right;" />');
if (rawVal === -999) {
options.model.set(options.field, null);
rawVal = null;
}
var input = kendoJQuery('<input type="text" name="' + options.field + '" data-bind="value:' + options.field + '" class="k-textbox" style="width:100%; text-align:right;" />');
input.appendTo(container) input.appendTo(container)
.val(options.model[options.field]) .val(options.model[options.field])
@ -70,12 +66,6 @@ function numericEditor2(container, options, isHyphenAllowed = false) {
this.value = val.slice(0, -1); this.value = val.slice(0, -1);
} }
}) })
.on("focus", function () {
if (this.value === "") {
this.value = "-";
}
this.select();
})
// 2. ↑ ↓ 키로 값 증가/감소 // 2. ↑ ↓ 키로 값 증가/감소
.on("keydown", function (e) { .on("keydown", function (e) {