Skip to content

A
abook_check
Commit 60cd4c8a by Yujin Seo
Options

Merge branch 'feature/contract/sato/1.0.300_51898_look' into 'contract/sato/1.0.300' 

定期点検の報告時にアプリが落ちる不具合の修正他

See merge request !279
parents 3224b543 1954256b
Showing with 1 additions and 179 deletions
ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/TaskReportDao.java
...@@ -245,7 +245,7 @@ public class TaskReportDao extends AbstractDao { ...@@ -245,7 +245,7 @@ public class TaskReportDao extends AbstractDao {
sql.append(" report_lock_time=? "); sql.append(" report_lock_time=? ");
sql.append(" WHERE task_key=? "); sql.append(" WHERE task_key=? ");
if (reportStartDate != null) { if (reportStartDate != null) {
sql.append("AND datetime(report_start_date)=datetime(?);"); sql.append("AND datetime(report_start_date)=datetime(?) ");
} }
if (loginId != null) { if (loginId != null) {
sql.append(" AND report_lock_user_id <> ? "); //自分以外のロックを変更しないため sql.append(" AND report_lock_user_id <> ? "); //自分以外のロックを変更しないため
......
ABVJE_Res_Default_Android/res/values-ko/strings.xml deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
ABVJE_UI_Android/res/values-ko-large-port/menu_values.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="menu_name_content"/>
<string name="menu_name_group"/>
<string name="menu_name_category"/>
<string name="menu_name_myfolder"/>
<string name="menu_name_mydata"/>
<string name="menu_name_publisher"/>
<string name="menu_name_dashboard"/>
<string name="menu_name_setting"/>
<string name="menu_name_meetingroom"/>
<string name="last_update_time"/>
<string name="last_update_time_default"/>
<string name="menu_name_device"/>
<string name="menu_name_search"/>
<string name="menu_name_sort"/>
<string name="menu_name_favorite"/>
</resources>
ABVJE_UI_Android/res/values-ko/arrays.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="sort_names">
        <item>콘텐츠명(가나다)순</item>
        <item>콘텐츠 번호가 작은 순서</item>
        <item>공개일이 최근인 순서</item>
        <item>콘텐츠 용량이 큰 순서</item>
        <item>다운로드 날짜가 최근인 순서</item>
        <item>많이 본 순서</item>
        <item>최근에 본 순서</item>
</string-array>
<string-array name="sort_names_cloud">
<item>콘텐츠명(가나다)순</item>
<item>콘텐츠 번호가 작은 순서</item>
<item>공개일이 최근인 순서</item>
<item>콘텐츠 용량이 큰 순서</item>
</string-array>
<string-array name="content_submenu_names">
<item>콘텐츠 상세</item>
<item>콘텐츠 열람</item>
<item>콘텐츠 열람 by Web</item>
<item>콘텐츠 다운로드</item>
<item>콘텐츠 다운로드 취소</item>
<item>콘텐츠 업데이트</item>
<item>콘텐츠 삭제</item>
<item>메모/마킹/북마크 복사</item>
<item>메모/마킹/북마크 붙여 넣기</item>
<item>폴더에 이동</item>
<item>즐겨 찾기에 추가</item>
<item>즐겨 찾기 제거</item>
<item>콘텐츠 공유</item>
</string-array>
<string-array name="image_change_effect">
<item>Slide</item>
<item>Fade</item>
<item>Reveal&amp;Move In</item>
</string-array>
<string-array name="toolbar_submenu">
<item>인쇄</item>
<item>즐겨찾기</item>
<item>본문 추출</item>
</string-array>
<string-array name="avaliable_share_app">
<item>facebook</item>
<item>line</item>
<item>mail</item>
<item>mms</item><!-- SMS -->
<item>message</item><!-- SMS:Sharp端末 -->
<item>conversation</item><!-- SMS:sony端末 -->
<item>daum.android.air</item><!-- mypeople -->
<item>android.gm</item>
<item>kakao.talk</item>
<item>twitter</item>
</string-array>
<string-array name="tap_action_on_update">
<item>매번 선택</item>
<item>열람</item>
<item>자동 업데이트</item>
</string-array>
<string-array name="tap_action_on_delivery_select">
<item>다운로드</item>
<item>Web으로 보기</item>
<item>매번 선택</item>
</string-array>
<string-array name="fix_orientation">
<item>미설정</item>
<item>가로</item>
<item>세로</item>
<item>세로(역방향)</item>
</string-array>
<string-array name="category_types">
<item>전체</item>
<item>분류</item>
</string-array>
</resources>
ABVJE_UI_Android/res/values-ko/popup_menu_values.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="sort_title">정렬</string>
<string name="contenttype_title">콘텐츠형식</string>
<string name="print">인쇄</string>
<string name="add_favorite_content">즐겨찾기추가</string>
<string name="remove_favorite_content">즐겨찾기해제</string>
<string name="text_copy">본문 추출</string>
<string name="content_share">콘텐츠 공유</string>
</resources>
\ No newline at end of file
xwalk_core_library/src/main/res/values-ko/android_content_strings.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<string name="actionbar_share">"공유"</string>
<string name="actionbar_web_search">"웹 검색"</string>
<string name="actionbar_textselection_title">"텍스트 선택"</string>
<string name="media_player_error_title">"동영상 재생 안됨"</string>
<string name="media_player_error_text_invalid_progressive_playback">"죄송합니다. 이 동영상은 이 기기로 스트리밍할 수 없습니다."</string>
<string name="media_player_error_text_unknown">"동영상을 재생할 수 없습니다."</string>
<string name="media_player_error_button">"확인"</string>
<string name="media_player_loading_video">"동영상 로드 중"</string>
<string name="profiler_started_toast">"프로파일러가 시작되었습니다."</string>
<string name="profiler_stopped_toast">"프로파일러가 완료되었습니다. 결과는 %1$s에 있습니다."</string>
<string name="profiler_no_storage_toast">"외부 저장소가 준비되지 않아 프로파일러를 시작할 수 없습니다."</string>
<string name="profiler_error_toast">"프로파일러를 시작하지 못했습니다."</string>
</resources>
xwalk_core_library/src/main/res/values-ko/android_ui_strings.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<string name="low_memory_error">"메모리가 부족하여 이전 작업을 완료할 수 없습니다."</string>
<string name="opening_file_error">"선택한 파일을 열지 못했습니다."</string>
<string name="color_picker_button_more">"더보기"</string>
<string name="color_picker_hue">"색조"</string>
<string name="color_picker_saturation">"채도"</string>
<string name="color_picker_value">"값"</string>
<string name="color_picker_button_set">"설정"</string>
<string name="color_picker_button_cancel">"취소"</string>
<string name="color_picker_dialog_title">"색상 선택"</string>
<string name="color_picker_button_red">"빨간색"</string>
<string name="color_picker_button_cyan">"청록색"</string>
<string name="color_picker_button_blue">"파란색"</string>
<string name="color_picker_button_green">"녹색"</string>
<string name="color_picker_button_magenta">"자홍색"</string>
<string name="color_picker_button_yellow">"노란색"</string>
<string name="color_picker_button_black">"검정색"</string>
<string name="color_picker_button_white">"흰색"</string>
<string name="copy_to_clipboard_failure_message">"클립보드로 복사하지 못했습니다."</string>
<string name="accessibility_date_picker_month">"월"</string>
<string name="accessibility_date_picker_year">"연도"</string>
<string name="date_picker_dialog_set">"설정"</string>
<string name="month_picker_dialog_title">"월 설정"</string>
<string name="accessibility_date_picker_week">"주"</string>
<string name="week_picker_dialog_title">"주 설정"</string>
<string name="time_picker_dialog_am">"오전"</string>
<string name="time_picker_dialog_pm">"오후"</string>
<string name="time_picker_dialog_title">"시간 설정"</string>
<string name="accessibility_time_picker_hour">"시"</string>
<string name="accessibility_time_picker_minute">"분"</string>
<string name="accessibility_time_picker_second">"초"</string>
<string name="accessibility_time_picker_milli">"밀리초"</string>
<string name="accessibility_time_picker_ampm">"오전/오후"</string>
<string name="time_picker_dialog_hour_minute_separator">":"</string>
<string name="time_picker_dialog_minute_second_separator">":"</string>
<string name="time_picker_dialog_second_subsecond_separator">"."</string>
<string name="date_time_picker_dialog_title">"날짜 및 시간 설정"</string>
<string name="accessibility_datetime_picker_date">"날짜"</string>
<string name="accessibility_datetime_picker_time">"시간"</string>
<string name="date_picker_dialog_other_button_label">"기타"</string>
<string name="date_picker_dialog_title">"날짜 설정"</string>
<string name="date_picker_dialog_clear">"삭제"</string>
<string name="autofill_popup_content_description">"자동완성 팝업 표시"</string>
<string name="password_generation_popup_content_description">"비밀번호 생성 팝업 표시"</string>
<string name="autofill_keyboard_accessory_content_description">"제안 사용 가능"</string>
<string name="updating_chrome">"Chrome 업데이트 중..."</string>
</resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment