Index: reference/gebo_admin_1.8.1/js/jquery-migrate.min.js =================================================================== diff -u -r9d48c28047e99dacd4362737da9061b7145c018f -r9abdab07a910302e1006b97a7479185657aa9bf0 --- reference/gebo_admin_1.8.1/js/jquery-migrate.min.js (.../jquery-migrate.min.js) (revision 9d48c28047e99dacd4362737da9061b7145c018f) +++ reference/gebo_admin_1.8.1/js/jquery-migrate.min.js (.../jquery-migrate.min.js) (revision 9abdab07a910302e1006b97a7479185657aa9bf0) @@ -26,28 +26,28 @@ ].concat(defaultMiddleware); } }, - proxies: [ - // 선생님용 - { - context: ['/auth-anon', '/auth-user', '/auth-admin', '/auth-check', '/sso', '/dwr', '/logout'], - host: 'www.313.co.kr', - // host: '127.0.0.1', - port: 13131, - https: false, - changeOrigin: true - } - ] - // proxies: [ - // // 주희 용 + // // 선생님용 // { // context: ['/auth-anon', '/auth-user', '/auth-admin', '/auth-check', '/sso', '/dwr', '/logout'], // host: 'www.313.co.kr', - // port: 80, + // // host: '127.0.0.1', + // port: 13131, // https: false, // changeOrigin: true // } // ] + + proxies: [ + // 주희 용 + { + context: ['/auth-anon', '/auth-user', '/auth-admin', '/auth-check', '/sso', '/dwr', '/logout'], + host: 'www.313.co.kr', + port: 80, + https: false, + changeOrigin: true + } + ] }, }, watch: { Index: arms/html/pdServiceVersion/content-container.html =================================================================== diff -u -r166b38d9e489aae66d508388e84dc36657b561ee -r9abdab07a910302e1006b97a7479185657aa9bf0 --- arms/html/pdServiceVersion/content-container.html (.../content-container.html) (revision 166b38d9e489aae66d508388e84dc36657b561ee) +++ arms/html/pdServiceVersion/content-container.html (.../content-container.html) (revision 9abdab07a910302e1006b97a7479185657aa9bf0) @@ -317,7 +317,7 @@ + data-date="2022/11/15"> Index: arms/js/pdServiceVersion.js =================================================================== diff -u -r9d48c28047e99dacd4362737da9061b7145c018f -r9abdab07a910302e1006b97a7479185657aa9bf0 --- arms/js/pdServiceVersion.js (.../pdServiceVersion.js) (revision 9d48c28047e99dacd4362737da9061b7145c018f) +++ arms/js/pdServiceVersion.js (.../pdServiceVersion.js) (revision 9abdab07a910302e1006b97a7479185657aa9bf0) @@ -19,34 +19,49 @@ $(".date-picker").datepicker({ autoclose: true, }); - //datepicker 만들기 - const makeDatePicker = (calender) => { - calender - .datepicker({ - autoclose: true, - }) - .on("changeDate", function (ev) { - const Input = $(this).parent().prev(); - Input.val(calender.data("date")); - if (Input.attr("id") === "input_pdservice_start_date") { - $("#versionStartDate").text(calender.data("date")); - } else if (Input.attr("id") === "input_pdservice_end_date") { - $("#versionEndDate").text(calender.data("date")); - } - calender.datepicker("hide"); - }); - }; - const $btnCalendar = $("#btn-select-calendar"); - const $btnEndCalendar = $("#btn-end-calendar"); - const $btnCalendarPopup = $("#btn-select-calendar-popup"); - const $btnEndCalendarPopup = $("#btn-end-calendar-popup"); - makeDatePicker($btnCalendar); - makeDatePicker($btnEndCalendar); - makeDatePicker($btnCalendarPopup); - makeDatePicker($btnEndCalendarPopup); + + // const makeDatePicker = (calender) => { + + // const Inputs = $(calender).parent().prev(); + // console.log('ㅁㅁㅁㅁㅁㅁㅁㅁㅁㅁㅁㅁㅁㅁㅁㅁ호출', Inputs.val()) + + + // calender + // .datepicker({ + // autoclose: true, + // }) + // .on("changeDate", function (ev) { + // const Input = $(this).parent().prev(); + // Input.val(calender.data("date")); + // if (Input.attr("id") === "input_pdservice_start_date") { + // $("#versionStartDate").text(calender.data("date")); + // } else if (Input.attr("id") === "input_pdservice_end_date") { + // $("#versionEndDate").text(calender.data("date")); + // } + // calender.datepicker("hide"); + // }); + // }; + + // const $btnCalendar = $("#btn-select-calendar"); + // const $btnEndCalendar = $("#btn-end-calendar"); + // const $btnCalendarPopup = $("#btn-select-calendar-popup"); + // const $btnEndCalendarPopup = $("#btn-end-calendar-popup"); + + // makeDatePicker($btnCalendar); + // makeDatePicker($btnEndCalendar); + // makeDatePicker($btnCalendarPopup); + // makeDatePicker($btnEndCalendarPopup); + + makeDatePicker($("#btn-select-calendar")); + makeDatePicker($("#btn-end-calendar")); + makeDatePicker($("#btn-select-calendar-popup")); + makeDatePicker($("#btn-end-calendar-popup")); + + + }); // --- 데이터 테이블 설정 --- // @@ -66,7 +81,30 @@ $("select[name=pdserviceTable_length]").css("width", "50px"); }); +//datepicker 만들기 +function makeDatePicker (calender) { + const Inputs = $(calender).parent().prev().val(); + $(calender).attr('data-date', Inputs) + + calender + .datepicker({ + autoclose: true, + }) + .datepicker("update", Inputs) + .on("changeDate", function (ev) { + const Input = $(this).parent().prev(); + Input.val(calender.data("date")); + if (Input.attr("id") === "input_pdservice_start_date") { + $("#versionStartDate").text(calender.data("date")); + } else if (Input.attr("id") === "input_pdservice_end_date") { + $("#versionEndDate").text(calender.data("date")); + } + calender.datepicker("hide"); + }); +}; + + // --- 팝업 띄울때 사이즈 조정 -- // function modalPopup(popupName) { @@ -284,6 +322,9 @@ + + + //데이터 로드를 사용자에게 알리기 Messenger().post({ message: 'Version Data 조회를 완료하였습니다.', @@ -366,6 +407,11 @@ $("#input_pdservice_end_date").val(json.c_end_date); CKEDITOR.instances.input_pdservice_editor.setData(json.c_contents); + makeDatePicker($("#btn-select-calendar")); + makeDatePicker($("#btn-end-calendar")); + makeDatePicker($("#btn-select-calendar-popup")); + makeDatePicker($("#btn-end-calendar-popup")); + }) // HTTP 요청이 실패하면 오류와 상태에 관한 정보가 fail() 메소드로 전달됨. .fail(function (xhr, status, errorThrown) {