Index: arms/js/reqAdd.js =================================================================== diff -u -r3abc1c9a99e84470d32dc1d7669409486080c084 -r3fd84da7cb4669c0dac0cbe958ef79adc09f1aae --- arms/js/reqAdd.js (.../reqAdd.js) (revision 3abc1c9a99e84470d32dc1d7669409486080c084) +++ arms/js/reqAdd.js (.../reqAdd.js) (revision 3fd84da7cb4669c0dac0cbe958ef79adc09f1aae) @@ -30,6 +30,22 @@ }); //////////////////////////////////////////////////////////////////////////////////////// +//슬림스크롤 +//////////////////////////////////////////////////////////////////////////////////////// +function makeSlimScroll(targetElement) { + $(targetElement).slimScroll({ + height: '200px', + railVisible: true, + railColor: '#222', + railOpacity: 0.3, + wheelStep: 10, + allowPageScroll: false, + disableFadeOut: false + }); +} + + +//////////////////////////////////////////////////////////////////////////////////////// //제품 서비스 셀렉트 박스 //////////////////////////////////////////////////////////////////////////////////////// function makePdServiceSelectBox(){ @@ -55,8 +71,14 @@ }).fail(function(e) { }).always(function() { }); + } // end makePdServiceSelectBox() +$('#country').on("select2:open", function () { + //슬림스크롤 + makeSlimScroll(".select2-results__options"); +}); + // --- select2 ( 제품(서비스) 검색 및 선택 ) 이벤트 --- // $('#country').on('select2:select', function (e) { // 제품( 서비스 ) 선택했으니까 자동으로 버전을 선택할 수 있게 유도 @@ -926,78 +948,83 @@ for(var k in data){ var obj = data[k]; - console.log("jsonIndex[" + k +"]=" + "obj.c_file_id_link => " + obj.c_file_id_link); //t_arms_filerepository + console.log("jsonIndex[" + k +"]=" + "obj.fileIdLink => " + obj.fileIdLink); //t_arms_filerepository console.log("jsonIndex[" + k +"]=" + "obj.c_pdservice_jira_ids => " + obj.c_pdservice_jira_ids); //t_arms_pdserviceconnect console.log("jsonIndex[" + k +"]=" + "obj.c_jira_con_passmode => " + obj.c_jira_con_passmode); //t_arms_pdservicjira console.log("jsonIndex[" + k +"]=" + "obj.c_pdservice_link => " + obj.c_pdservice_link); //t_arms_pdservicversion console.log("jsonIndex[" + k +"]=" + "obj.c_fileid_link => " + obj.c_fileid_link); //t_arms_pdservice console.log("jsonIndex[" + k +"]=" + "obj.c_req_status => " + obj.c_req_status); //t_arms_reqadd - if(!isEmpty(obj.c_file_id_link) && isEmpty(obj.c_pdservice_jira_ids) && isEmpty(obj.c_jira_con_passmode) && isEmpty(obj.c_pdservice_link) && isEmpty(obj.c_fileid_link) && isEmpty(obj.c_req_status)){ + if(!isEmpty(obj.fileIdLink) && isEmpty(obj.c_pdservice_jira_ids) && isEmpty(obj.c_jira_con_passmode) && isEmpty(obj.c_pdservice_link) && isEmpty(obj.c_fileid_link) && isEmpty(obj.c_req_status)){ //t_arms_filerepository if(obj.c_title=="pdService"){ - var addHtmlStr = "
  • \n" + - " \n" + - "
    \n" + - " \n" + - " 09:00 (MON)\n" + - "\n" + - "

    착수 제품(서비스) 등록, 버전 등록

    \n" + - "\n" + - "
    \n" + - " Confluence by 313 DEV GRP\n" + - "
    \n" + - "
    \n" + - " FileName : " + obj.c_file_name + "
    \n" + - " Skill : Negotiation
    \n" + - " Output : Requirements
    \n" + - " System : Atlassian Confluence ( Online Document System )\n" + - "
    \n" + - "
    \n" + - "
    • "; - $('.timeline.timeline-inverse').append(addHtmlStr); + }else{ + var timestamp_t_arms_filerepository = new Date(obj.c_date); + var datetime_t_arms_filerepository = timestamp_t_arms_filerepository.getFullYear()+"/"+(timestamp_t_arms_filerepository.getMonth()+1)+"/"+timestamp_t_arms_filerepository.getDate()+ + " "+timestamp_t_arms_filerepository.getHours()+":"+timestamp_t_arms_filerepository.getMinutes(); - } - - }else if(isEmpty(obj.c_file_id_link) && !isEmpty(obj.c_pdservice_jira_ids) && isEmpty(obj.c_jira_con_passmode) && isEmpty(obj.c_pdservice_link) && isEmpty(obj.c_fileid_link) && isEmpty(obj.c_req_status)){ - //t_arms_pdserviceconnect - - }else if(isEmpty(obj.c_file_id_link) && isEmpty(obj.c_pdservice_jira_ids) && !isEmpty(obj.c_jira_con_passmode) && isEmpty(obj.c_pdservice_link) && isEmpty(obj.c_fileid_link) && isEmpty(obj.c_req_status)){ - //t_arms_pdservicjira - - }else if(isEmpty(obj.c_file_id_link) && isEmpty(obj.c_pdservice_jira_ids) && isEmpty(obj.c_jira_con_passmode) && !isEmpty(obj.c_pdservice_link) && isEmpty(obj.c_fileid_link) && isEmpty(obj.c_req_status)){ - //t_arms_pdservicversion - var timestampStr = new Date(obj.c_date); - var dateTimeStr = timestampStr.getFullYear()+"/"+(timestampStr.getMonth()+1)+"/"+timestampStr.getDate()+ - " "+timestampStr.getHours()+":"+timestampStr.getMinutes(); - - var add_t_arms_pdservicversion = + var add_t_arms_filerepository = "
  • \n" + - " \n" + + " \n" + "
    \n" + " \n" + - " 09:00 (MON)\n" + - "

    착수 제품(서비스) 등록, 버전 등록

    \n" + + " " + datetime_t_arms_filerepository + "\n" + + "

    기획 요구사항 파일 로그

    \n" + "
    \n" + " 로그 자세히 보기\n" + "
    \n" + "
    \n" + " 저장된 액션 : " + obj.c_state + "
    \n" + - " 저장된 버전 명 : " + obj.c_title + "
    \n" + + " 저장된 액션 : " + obj.c_method + "
    \n" + + " 저장된 요구사항 이름 : " + obj.c_title + "
    \n" + " 저장된 제품(서비스) 아이디 : " + obj.c_pdservice_link + "
    \n" + - " 저장된 시간 : " + dateTimeStr + "
    \n" + + " 저장된 요구사항 상태 : " + obj.c_req_status + "
    \n" + "
    \n" + "
    \n" + "
    • "; - $('.timeline.timeline-inverse').append(add_t_arms_pdservicversion); + $('.timeline.timeline-inverse').append(add_t_arms_filerepository); + } - }else if(isEmpty(obj.c_file_id_link) && isEmpty(obj.c_pdservice_jira_ids) && isEmpty(obj.c_jira_con_passmode) && isEmpty(obj.c_pdservice_link) && !isEmpty(obj.c_fileid_link) && isEmpty(obj.c_req_status)){ + }else if(isEmpty(obj.fileIdLink) && !isEmpty(obj.c_pdservice_jira_ids) && isEmpty(obj.c_jira_con_passmode) && isEmpty(obj.c_pdservice_link) && isEmpty(obj.c_fileid_link) && isEmpty(obj.c_req_status)){ + //t_arms_pdserviceconnect + + }else if(isEmpty(obj.fileIdLink) && isEmpty(obj.c_pdservice_jira_ids) && !isEmpty(obj.c_jira_con_passmode) && isEmpty(obj.c_pdservice_link) && isEmpty(obj.c_fileid_link) && isEmpty(obj.c_req_status)){ + //t_arms_pdservicjira + + }else if(isEmpty(obj.fileIdLink) && isEmpty(obj.c_pdservice_jira_ids) && isEmpty(obj.c_jira_con_passmode) && !isEmpty(obj.c_pdservice_link) && isEmpty(obj.c_fileid_link) && isEmpty(obj.c_req_status)){ + //t_arms_pdservicversion + + }else if(isEmpty(obj.fileIdLink) && isEmpty(obj.c_pdservice_jira_ids) && isEmpty(obj.c_jira_con_passmode) && isEmpty(obj.c_pdservice_link) && !isEmpty(obj.c_fileid_link) && isEmpty(obj.c_req_status)){ //t_arms_pdservice - }else if(isEmpty(obj.c_file_id_link) && isEmpty(obj.c_pdservice_jira_ids) && isEmpty(obj.c_jira_con_passmode) && isEmpty(obj.c_pdservice_link) && isEmpty(obj.c_fileid_link) && !isEmpty(obj.c_req_status)){ + }else if(isEmpty(obj.fileIdLink) && isEmpty(obj.c_pdservice_jira_ids) && isEmpty(obj.c_jira_con_passmode) && isEmpty(obj.c_pdservice_link) && isEmpty(obj.c_fileid_link) && !isEmpty(obj.c_req_status)){ //t_arms_reqadd + var timestamp_t_arms_reqadd = new Date(obj.c_date); + var datetime_t_arms_reqadd = timestamp_t_arms_reqadd.getFullYear()+"/"+(timestamp_t_arms_reqadd.getMonth()+1)+"/"+timestamp_t_arms_reqadd.getDate()+ + " "+timestamp_t_arms_reqadd.getHours()+":"+timestamp_t_arms_reqadd.getMinutes(); + var add_t_arms_reqadd = + "
  • \n" + + " \n" + + "
    \n" + + " \n" + + " " + datetime_t_arms_reqadd + "\n" + + "

    기획 요구사항 등록,변경,삭제 로그

    \n" + + "
    \n" + + " 로그 자세히 보기\n" + + "
    \n" + + "
    \n" + + " 저장된 액션 : " + obj.c_state + "
    \n" + + " 저장된 액션 : " + obj.c_method + "
    \n" + + " 저장된 요구사항 이름 : " + obj.c_title + "
    \n" + + " 저장된 제품(서비스) 아이디 : " + obj.c_pdservice_link + "
    \n" + + " 저장된 요구사항 상태 : " + obj.c_req_status + "
    \n" + + "
    \n" + + "
    \n" + + "
    • "; + $('.timeline.timeline-inverse').append(add_t_arms_reqadd); + }else{ console.log("정의되지 않은 타입의 객체 데이터 확인 :: " + obj); }