From d7753ec24612d54e9c8054503129d1bb7ee81a39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=8B=E1=85=A2=E1=84=91=E1=85=B3=E1=86=AF=20=E1=84=82?=
 =?UTF-8?q?=E1=85=A9=E1=84=90=E1=85=B3=E1=84=87=E1=85=AE=E1=86=A8?=
 <jisangs@gmail.com>
Date: Wed, 27 Mar 2019 22:42:38 +0900
Subject: [PATCH] Fix: datepicker, showModal

---
 src/web/maestro/main_menu.html              |   1 +
 src/web/module/maestro_section_help.html    |  19 +-
 src/web/module/maestro_section_main.html    |   8 +
 src/web/module/maestro_section_record.html  | 113 +++++++-----
 src/web/popup/copy_result_to_clipboard.html | 183 ++++++++++++++++++++
 5 files changed, 265 insertions(+), 59 deletions(-)
 create mode 100644 src/web/popup/copy_result_to_clipboard.html

diff --git a/src/web/maestro/main_menu.html b/src/web/maestro/main_menu.html
index c910b0d..2d77989 100644
--- a/src/web/maestro/main_menu.html
+++ b/src/web/maestro/main_menu.html
@@ -44,6 +44,7 @@
 
 	<link href="./../../../resources/bootstrap/datepicker/css/datepicker.css" rel="stylesheet">
 	<script src="./../../../resources/bootstrap/datepicker/js/bootstrap-datepicker.js"></script>
+	<script type="text/javascript" src="./../../../resources/bootstrap/datepicker/js/locales/bootstrap-datepicker.kr.js" charset="UTF-8"></script>
 
 	<script type="text/javascript">
 		$(document).ready(function() {
diff --git a/src/web/module/maestro_section_help.html b/src/web/module/maestro_section_help.html
index ca1d851..088b0c5 100644
--- a/src/web/module/maestro_section_help.html
+++ b/src/web/module/maestro_section_help.html
@@ -7,23 +7,14 @@ $(document).ready(function() {
 
 
 
-function showModal(contentFileName) {
-	// console.log("showContractModal");
-	$("#popupContent").empty();
-	$("#popupContent").load("./../popup/" + contentFileName + ".html");
-
-	$("#popupModal").modal();
-}
-
-
 
 </script>
 
 
 
-<div class="modal fade" id="popupModal" tabindex="-1" role="dialog" aria-labelledby="contractModalLabel" aria-hidden="true">
+<div class="modal fade" id="helpPopupModal" tabindex="-1" role="dialog" aria-labelledby="contractModalLabel" aria-hidden="true">
 	<div class="modal-dialog modal-dialog-centered" role="document">
-		<div id="popupContent" class="modal-content">
+		<div id="helpPopupContent" class="modal-content">
 
 		</div>	<!-- modal content -->
 	</div>	<!-- modal dialog -->
@@ -73,9 +64,9 @@ function showModal(contentFileName) {
 				</div>
 				<div class="col-9">
 
-					<button type="button" class="btn btn-primary" onClick='showModal("maestro_shortcut_icon");'>바로 가기 아이콘 생성</button>
-					<button type="button" class="btn btn-primary" onClick='showModal("maestro_register_favorite");'>웹브라우저 즐겨찾기 등록</button>
-					<button type="button" class="btn btn-secondary" disabled onClick='showModal("maestro_register_startpage");'>웹브라우저 시작페이지 설정</button>
+					<button type="button" class="btn btn-primary" onClick='showModal("helpPopupModal", "helpPopupContent", "maestro_shortcut_icon");'>바로 가기 아이콘 생성</button>
+					<button type="button" class="btn btn-primary" onClick='showModal("helpPopupModal", "helpPopupContent", "maestro_register_favorite");'>웹브라우저 즐겨찾기 등록</button>
+					<button type="button" class="btn btn-secondary" disabled onClick='showModal("helpPopupModal", "helpPopupContent", "maestro_register_startpage");'>웹브라우저 시작페이지 설정</button>
 
 				</div> <!-- col -->
 			</div> <!-- row -->
diff --git a/src/web/module/maestro_section_main.html b/src/web/module/maestro_section_main.html
index a2cf966..a04af9a 100644
--- a/src/web/module/maestro_section_main.html
+++ b/src/web/module/maestro_section_main.html
@@ -121,6 +121,14 @@ function deactivateApp(appID) {
 	);
 }
 
+function showModal(popupModalID, popupContentID, contentFileName) {
+	$("#" + popupContentID).empty();
+	$("#" + popupContentID).load("./../popup/" + contentFileName + ".html");
+
+	$("#" + popupModalID).modal();
+}
+
+
 </script>
 
 
diff --git a/src/web/module/maestro_section_record.html b/src/web/module/maestro_section_record.html
index 9b1119a..5de676f 100644
--- a/src/web/module/maestro_section_record.html
+++ b/src/web/module/maestro_section_record.html
@@ -10,10 +10,26 @@ $(document).ready(function() {
 	});
 	*/
 
-$('#datepicker').datepicker({
-	format: 'mm-dd-yyyy'
+$('#start_datepicker').datepicker({
+	format: 'yyyy-mm-dd',
+	autoclose: true,
+	language: 'kr'
 });
 
+$('#end_datepicker').datepicker({
+	format: 'yyyy-mm-dd',
+	autoclose: true,
+	language: 'kr'
+});
+
+var today = new Date();
+var yyyy = today.getFullYear();
+var mm = String(today.getMonth() + 1).padStart(2, '0'); //January is 0!
+var dd = String(today.getDate()).padStart(2, '0');
+
+$('#start_datepicker').datepicker('update', yyyy + "-" + mm + "-" + dd);
+$('#end_datepicker').datepicker('update', yyyy + "-" + mm + "-" + dd);
+
 });
 
 
@@ -50,46 +66,64 @@ function selectElementContents(el) {
 
 
 
-<!-- <input type="text" value="02-16-2012" id="datepicker"> -->
+<div class="modal fade" id="recordPopupModal" tabindex="-1" role="dialog" aria-labelledby="contractModalLabel" aria-hidden="true">
+	<div class="modal-dialog modal-dialog-centered" role="document">
+		<div id="recordPopupContent" class="modal-content">
+
+		</div>	<!-- modal content -->
+	</div>	<!-- modal dialog -->
+</div>	<!-- modal -->
+
 
 
 <div class="card border-dark mb-3">
-	<div class="card-header">검색 조건</div>
+	<h5 class="card-header">검색 조건</h5>
 	<div class="card-body text-dark">
 		<form>
-			<div class="form-group row mb-0">
+
+			<!-- 날짜 -->
+			<div class="form-group row">
 				<h5 class="col-sm-2 my-2 text-right">날짜</h5>
 				<div class="col-sm-10">
+
 					<div class="form-row align-items-center">
 						<div class="col-auto">
-							<div class="input-group input-append date" id="datepicker" data-date-format="yyyy-mm-dd">
-								<input type="text" class="form-control" aria-describedby="button-addon2" size="16" readonly>
+							<div class="input-group input-append date" id="start_datepicker">
+								<label class="col-auto col-form-label" for="start_date">검색 시작일</label>
+								<input type="text" id="start_date" class="form-control" aria-describedby="button-date-picker-1" size="16" readonly>
 								<div class="input-group-append">
-									<button class="add-on btn btn-primary" id="button-addon2">
+									<button class="add-on btn btn-primary" id="button-date-picker-1">
 										<span class="oi oi-calendar" title="icon calendar" aria-hidden="true"></span>
 									</button>
 								</div>
 							</div>
 						</div>
-					</div>
-					<div class="form-group form-check">
-						<input type="checkbox" class="form-check-input" id="timeCheck">
-						<label class="form-check-label text-muted" for="timeCheck">날짜 검색 기능 활성화</label>
+
+						<div class="col-auto">
+							<div class="input-group input-append date" id="end_datepicker">
+								<label class="col-auto col-form-label" for="end_date">검색 종료일</label>
+								<input type="text" id="end_date" class="form-control" aria-describedby="button-date-picker-2" size="16" readonly>
+								<div class="input-group-append">
+									<button class="add-on btn btn-primary" id="button-date-picker-2">
+										<span class="oi oi-calendar" title="icon calendar" aria-hidden="true"></span>
+									</button>
+								</div>
+							</div>
+						</div>
+
 					</div>
 				</div>
 			</div>
 
-			<div class="form-group row mb-0">
+			<!-- 학생 이름 -->
+			<div class="form-group row">
 				<h5 class="col-sm-2 my-2 text-right">학생 이름</h5>
 				<div class="col-sm-10">
 					<input type="text" class="form-control" id="formGroupExampleInput" placeholder="Example input">
-					<div class="form-group form-check">
-						<input type="checkbox" class="form-check-input" id="exampleCheck1">
-						<label class="form-check-label text-muted" for="exampleCheck1">학생 이름 검색 기능 활성화</label>
-					</div>
 				</div>
 			</div>
 
+			<!-- 과목 -->
 			<div class="form-group row mb-0">
 				<h5 class="col-sm-2 my-2 text-right">과목</h5>
 				<div class="col-sm-10">
@@ -128,14 +162,10 @@ function selectElementContents(el) {
 							</div>
 						</div>
 					</div>
+					<br/>
 
-					<div class="form-group form-check">
-						<input type="checkbox" class="form-check-input" id="subjectCheck">
-						<label class="form-check-label text-muted" for="subjectCheck">과목 검색 기능 활성화</label>
-					</div>
-
-					<button type="submit" class="btn btn-primary">검색 (30개까지 보기)</button>
-					<button type="submit" class="btn btn-primary">검색 (모든 데이터 보기)</button>
+					<button type="submit" class="btn btn-primary">검색 (50개까지 보기)</button>
+					<button type="submit" class="btn btn-primary" disabled>검색 (모든 데이터 보기)</button>
 				</div>
 			</div>
 
@@ -148,39 +178,32 @@ function selectElementContents(el) {
 <div class="row justify-content-between mb-2">
 	<div class="col-auto">
 		<button type="button" class="btn btn-primary" onClick="selectElementContents( document.getElementById('dataTable') );">표 내용을 클립보드에 복사</button>
+		<span class="badge badge-pill badge-info" onClick='showModal("recordPopupModal", "recordPopupContent", "copy_result_to_clipboard");' style="cursor: pointer;">?</span>
 	</div>
 	<div class="col-auto">
-		<button type="button" class="btn btn-primary">표 내용을 엑셀 파일로 다운로드</button>
+		<button type="button" class="btn btn-primary" disabled>표 내용을 엑셀 파일로 다운로드</button>
 	</div>
 </div>
 
 <table class="table table-striped" id="dataTable">
 	<thead class="thead-dark">
 	<tr>
-		<th scope="col">#</th>
-		<th scope="col">First</th>
-		<th scope="col">Last</th>
-		<th scope="col">Handle</th>
+		<th scope="col">날짜</th>
+		<th scope="col">시간</th>
+		<th scope="col">이름</th>
+		<th scope="col">과목</th>
+		<th scope="col">점수</th>
 	</tr>
 	</thead>
 	<tbody>
+
 	<tr>
-		<th scope="row">1</th>
-		<td>Mark</td>
-		<td>Otto</td>
-		<td>@mdo</td>
-	</tr>
-	<tr>
-		<th scope="row">2</th>
-		<td>Jacob</td>
-		<td>Thornton</td>
-		<td>@fat</td>
-	</tr>
-	<tr>
-		<th scope="row">3</th>
-		<td>Larry</td>
-		<td>the Bird</td>
-		<td>@twitter</td>
+		<th scope="row">2019-03-27</th>
+		<td>17:30</td>
+		<td>박지상</td>
+		<td>한글 타자 연습</td>
+		<td>574</td>
 	</tr>
+
 	</tbody>
 </table>
diff --git a/src/web/popup/copy_result_to_clipboard.html b/src/web/popup/copy_result_to_clipboard.html
new file mode 100644
index 0000000..b8c32e2
--- /dev/null
+++ b/src/web/popup/copy_result_to_clipboard.html
@@ -0,0 +1,183 @@
+<script type="text/javascript">
+
+
+$(document).ready(function() {
+	$('.shortcut_icon_maestro_id').append(maestroInfo.maestroName);
+});
+
+
+</script>
+
+
+<div class="modal-header">
+	<h5 class="modal-title" id="contractModalLabel">바로 가기 아이콘 생성</h5>
+	<button type="button" class="close" data-dismiss="modal" aria-label="Close">
+		<span aria-hidden="true">&times;</span>
+	</button>
+</div>
+
+<div class="modal-body">
+
+	<div class="card">
+		<h5 class="card-header bg-dark text-white">바로 가기 주소</h5>
+		<div class="card-body">
+			<table class="table table-sm table-borderless">
+				<tbody>
+					<tr>
+						<td scope="row">학생 로그인 화면</td>
+						<td>http://www.chocomae.com/<span class="text-danger">login</span>/<span class="shortcut_icon_maestro_id"></span></td>
+					</tr>
+					<tr>
+						<td scope="row">타이머 로그인 화면</td>
+						<td>http://www.chocomae.com/<span class="text-primary">timer</span>/<span class="shortcut_icon_maestro_id"></span></td>
+					</tr>
+				</tbody>
+			</table>
+		</div>
+	</div>
+	<br/>
+
+	<div class="card">
+		<h5 class="card-header bg-success text-white">직접 만들기 (권장)</h5>
+		<div class="card-body">
+			<h5 class="card-title">바탕화면에 아이콘 생성</h5>
+			<p class="card-text">
+				<ol>
+					<li>
+						바탕화면 빈 곳에서 마우스 오른쪽 버튼 클릭
+						<ul>
+							<li>팝업창에서 [새로 만들기(W)] > [바로 가기(S)] 클릭</li>
+						</ul>
+						​<picture>
+							<source srcset="./../../../resources/image/help/make_shortcut_file.png" type="image/svg+xml">
+							<img src="./../../../resources/image/help/make_shortcut_file.png" class="img-fluid img-thumbnail" alt="새로 만들기">
+						</picture>
+					</li>
+					<br/>
+					<li>
+						[바로 가기 만들기] 팝업창 실행
+						<ol>
+							<li>"항목 위치 입력(T)"에 바로 가기 url 입력</li>
+							<li>[다음(N)] 버튼 클릭</li>
+							<li>"바로 가기에 사용할 이름 입력(T)"에 아이콘 이름 입력</li>
+							<li>[마침(F)] 버튼 클릭</li>
+						</ol>
+					</li>
+					<br/>
+					<li>바탕 화면에 바로 가기 아이콘이 생성된 것을 확인</li>
+				</ol>
+			</p>
+		</div>
+	</div>
+	<br/>
+
+	<div class="card">
+		<h5 class="card-header bg-info text-white">바로 가기 파일 다운받고 수정하기</h5>
+		<div class="card-body">
+			<h5 class="card-title">바로 가기 파일 다운받기</h5>
+			<p class="card-text">
+				<ul>
+					<li>아래의 바로 가기 파일 다운로드 받기</li>
+				</ul>
+				<a href="./../../../resources/file/chocomae.url" download>
+					<img src="./../../../resources/image/icon/icon_chocomae.png" class="rounded mx-auto d-block" alt="바로 가기 아이콘 파일">
+					<div class="text-center">초코마에 바로 가기 아이콘 다운로드</div>
+				</a>
+			</p>
+			<br/>
+
+			<h5 class="card-title">내용 수정하기</h5>
+			<p class="card-text">
+				<ul>
+					<li>바로 가기 파일을 마우스 오른쪽 버튼 클릭</li>
+					<li>팝업창에서 [속성(R)] 클릭</li>
+					<li>
+						[웹 문서] 탭에서 "URL(U)"에 수정할 주소 입력
+						​<picture>
+							<source srcset="./../../../resources/image/help/shortcut_icon_url.png" type="image/svg+xml">
+							<img src="./../../../resources/image/help/shortcut_icon_url.png" class="img-fluid img-thumbnail" alt="바로 가기 주소 수정">
+						</picture>
+					</li>
+					<li>[확인] 버튼 클릭</li>
+				</ul>
+			</p>
+		</div>
+	</div>
+	<br/>
+
+	<div class="card">
+		<h5 class="card-header bg-danger text-white">브라우저에서 드래그해서 만들기 (권장하지 않음)</h5>
+		<div class="card-body">
+			<h5 class="card-title">Chrome</h5>
+			<p class="card-text">
+				<ul>
+					<li>
+						<span class="text-primary">생성 가능</span>
+						<ol>
+							<li>주소입력창 왼쪽의 사이트 아이콘을 클릭-드래그 시작</li>
+							<li>바탕화면으로 끌고 와서 드롭</li>
+						</ol>
+						​<picture>
+							<source srcset="./../../../resources/image/help/chrome_shortcut_icon_drag.png" type="image/svg+xml">
+							<img src="./../../../resources/image/help/chrome_shortcut_icon_drag.png" class="img-fluid img-thumbnail" alt="새로 만들기">
+						</picture>
+					</li>
+					<li>
+						<span class="text-primary">주소 변경 가능</span>
+						<ol>
+							<li>바로 가기 아이콘을 마우스 오른쪽 클릭하고 [속성(R)] 클릭</li>
+							<li>팝업창에서 바로 가기 url을 새로 입력</li>
+						</ol>
+					</li>
+				</ul>
+			</p>
+
+			<h5 class="card-title">IE11</h5>
+			<p class="card-text">
+				<ul>
+					<li>
+						<span class="text-primary">생성 가능</span>
+						<ol>
+							<li>주소입력창 왼쪽의 사이트 아이콘을 클릭-드래그 시작</li>
+							<li>바탕화면으로 끌고 와서 드롭</li>
+						</ol>
+						​<picture>
+							<source srcset="./../../../resources/image/help/ie11_shortcut_icon_drag.png" type="image/svg+xml">
+							<img src="./../../../resources/image/help/ie11_shortcut_icon_drag.png" class="img-fluid img-thumbnail" alt="새로 만들기">
+						</picture>
+					</li>
+					<li>
+						<span class="text-danger">주소 변경 불가능</span>
+						<ul>
+							<li>생성된 아이콘 파일이 .url 이 아니라 .website 여서 내용 변경이 안됨
+							</li>
+						</ul>
+					</li>
+				</ul>
+			</p>
+
+			<h5 class="card-title">MS Edge</h5>
+			<p class="card-text">
+				<ul>
+					<li>
+						<span class="text-danger">생성 불가능</span>
+						<ol>
+							<li>주소입력창 왼쪽의 사이트 아이콘을 클릭-드래그 시작</li>
+							<li>바탕화면에 <span class="text-danger">드롭 불가 표시</span>가 나타남</li>
+						</ol>
+						​<picture>
+							<source srcset="./../../../resources/image/help/edge_shortcut_icon_drag.png" type="image/svg+xml">
+							<img src="./../../../resources/image/help/edge_shortcut_icon_drag.png" class="img-fluid img-thumbnail" alt="새로 만들기">
+						</picture>
+					</li>
+					<li>
+						<span class="text-danger">주소 변경 불가능</span>
+					</li>
+				</ul>
+			</p>
+
+		</div>
+	</div>
+	<br/>
+
+</div>	<!-- modal-body -->
\ No newline at end of file