Compare commits

..

No commits in common. "a3aade3a033bc9e215f01e305a0f2254f3e496b6" and "cd2a77ff95c22b8c50bd29374048565bd1df1e49" have entirely different histories.

3 changed files with 20 additions and 42 deletions

View File

@ -443,11 +443,11 @@ function fn_add01() {
"graphImage" : "", "graphImage" : "",
"graphLocal" : "", "graphLocal" : "",
"seq" : seq, "seq" : seq,
"fieldperDepthFrom" : "", "fieldperDepthFrom" : "0",
"fieldperDepthTo" : "", "fieldperDepthTo" : "0",
"fieldperCasingDia" : "", "fieldperCasingDia" : "0",
"fieldperCasingHeight" : "", "fieldperCasingHeight" : "0",
"fieldperAvgPermeability" : "", "fieldperAvgPermeability" : "0",
"fieldperInspectedBy" : "", "fieldperInspectedBy" : "",
"fieldperCheckedBy" : "", "fieldperCheckedBy" : "",
"fieldperRemark" : "", "fieldperRemark" : "",
@ -552,11 +552,11 @@ function fn_rowAddInput() {
"graphImage" : "", "graphImage" : "",
"graphLocal" : "", "graphLocal" : "",
"seq" : nowRowLength + 1, "seq" : nowRowLength + 1,
"fieldperDepthFrom" : "", "fieldperDepthFrom" : "0",
"fieldperDepthTo" : "", "fieldperDepthTo" : "0",
"fieldperCasingDia" : "", "fieldperCasingDia" : "0",
"fieldperCasingHeight" : "", "fieldperCasingHeight" : "0",
"fieldperAvgPermeability" : "", "fieldperAvgPermeability" : "0",
"fieldperInspectedBy" : "", "fieldperInspectedBy" : "",
"fieldperCheckedBy" : "", "fieldperCheckedBy" : "",
"fieldperRemark" : "", "fieldperRemark" : "",
@ -602,12 +602,12 @@ function fn_add02() {
"holeCode" : '<c:out value='${params.holeCode}'/>', "holeCode" : '<c:out value='${params.holeCode}'/>',
"seq" : seq, "seq" : seq,
"fieldperOrder" : nowRowCount2 + 1, "fieldperOrder" : nowRowCount2 + 1,
"fieldperSubTime" : "", "fieldperSubTime" : "0",
"fieldperSubTotalHead" : "", "fieldperSubTotalHead" : "0",
"fieldperSubFallingHead" : "", "fieldperSubFallingHead" : "0",
"fieldperSubWaterLoose" : "", "fieldperSubWaterLoose" : "0",
"fieldperSubQuantity" : "", "fieldperSubQuantity" : "0",
"fieldperSubPermeability" : "", "fieldperSubPermeability" : "0",
"newFieldperCode" : newFieldperCode, "newFieldperCode" : newFieldperCode,
"oldFieldperCode" : newFieldperCode "oldFieldperCode" : newFieldperCode
}; };

View File

@ -1660,12 +1660,9 @@ function fn_HoleLoad(){
var kendoJQuery = jQuery.noConflict(); // web/js/tree/lib/jquery.js 와 kendoUI jquery.js의 충돌방지 변수 var kendoJQuery = jQuery.noConflict(); // web/js/tree/lib/jquery.js 와 kendoUI jquery.js의 충돌방지 변수
kendoJQuery("#HOLE_DATE_FROM").kendoDatePicker({ kendoJQuery("#HOLE_DATE_FROM").kendoDatePicker({
culture: "ko-KR", culture: "ko-KR",
format : "yyyyMMdd", format : "yyyyMMdd"
change: function(e) {
onChangeHoleDateFrom(e);
}
}); });
$("#HOLE_DATE_FROM").attr("readonly",false); $("#HOLE_DATE_FROM").attr("readonly",true);
</script> </script>
</td> </td>
<th class="td-head" width="150">시추종료일</th> <th class="td-head" width="150">시추종료일</th>
@ -1677,7 +1674,7 @@ function fn_HoleLoad(){
culture: "ko-KR", culture: "ko-KR",
format : "yyyyMMdd" format : "yyyyMMdd"
}); });
$("#HOLE_DATE_TO").attr("readonly",false); $("#HOLE_DATE_TO").attr("readonly",true);
</script> </script>
</td> </td>
</tr> </tr>
@ -1882,24 +1879,6 @@ function fn_HoleLoad(){
<div id="calenderDiv" class="trViewOff" style="position:absolute;"></div> <div id="calenderDiv" class="trViewOff" style="position:absolute;"></div>
<script> <script>
document.addEventListener('DOMContentLoaded', function() {
const holeDateFrom = document.getElementById('HOLE_DATE_FROM');
// Add an event listener to the 'HOLE_DATE_FROM' input
holeDateFrom.addEventListener('change', onChangeHoleDateFrom);
});
function onChangeHoleDateFrom(e) {
const holeDateFrom = document.getElementById('HOLE_DATE_FROM');
const holeDateTo = document.getElementById('HOLE_DATE_TO');
// Check if 'HOLE_DATE_TO' is empty
if (holeDateTo.value === '') {
// If it's empty, set its value to the value of 'HOLE_DATE_FROM'
holeDateTo.value = holeDateFrom.value;
shakeAndHighlight(holeDateTo, '시추종료일이 자동입력되었습니다. 수정해주세요.');
}
}
shortcut.add("ctrl+1",function() { shortcut.add("ctrl+1",function() {
fn_checkMapConfirm(); fn_checkMapConfirm();
}); });

View File

@ -586,8 +586,7 @@ function fn_grid_refresh(){
change: function(e) { change: function(e) {
selectedValue = this.value(); selectedValue = this.value();
fn_selectedValue(selectedValue); fn_selectedValue(selectedValue);
}, }
height: 300
}); });
} }