-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'hotfix#20' into develop
# Conflicts: # build/classes/.gitignore # build/classes/controller/makeStory/DoUploadImage.class
- Loading branch information
Showing
4 changed files
with
666 additions
and
571 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,102 +1,132 @@ | ||
| <%@ page language="java" contentType="text/html; charset=UTF-8" | ||
| pageEncoding="UTF-8"%> | ||
| <%@page import="java.util.*" %> | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <title>업로드 이미지 확인</title> | ||
|
|
||
| </head> | ||
| <%@ include file="header.jsp" %> | ||
| <body> | ||
| <script> | ||
| $(function() { | ||
| //radio 값 유지 | ||
| method = $("#processing_method").val(); | ||
| $("input:radio[name='processing-type']").each(function(index, element) { | ||
| //console.log($(element).val()); | ||
| if(method == $(element).val()) { | ||
| console.log(method); | ||
| $(element).attr('checked', true); | ||
| } | ||
| //pageIndex[index] = element.value; | ||
| //console.log($(element).children('input:eq(1)').val()); | ||
| //$(element).children('input:eq(1)').val(index+1); | ||
| //console.log(pageIndex); | ||
| }); | ||
| //method = $("#processing_method").val(); | ||
| //$('input:radio[name="processing-type"][value=method]').prop('checked', true); | ||
| //console.log(method); | ||
| //$('#myform input:radio[name=myradio]:input[value=myvalue1]').attr('checked',true); | ||
| // radio 값 변경 | ||
| $("input[name='processing-type']").change(function() { | ||
| $('.processingTextSubmit-btn').click(); | ||
| setTimeout(function() { | ||
| location.reload(); }, 300); | ||
| }); | ||
| //텍스트 변경 | ||
| $("#pageText").change(function() { | ||
| $('.processingTextSubmit-btn').click(); | ||
| setTimeout(function() { | ||
| location.reload(); }, 300); | ||
| }); | ||
| }); | ||
| </script> | ||
| <% | ||
| session = request.getSession(); | ||
| String processingMethod = (String) session.getAttribute("processingMethod"); | ||
| String describeMethod = (String) session.getAttribute("describeMethod"); | ||
| //이미지 경로 받기 | ||
| String uploadFilePath = ""; | ||
| if(session.getAttribute("uploadFilePath") != null) uploadFilePath = (String) session.getAttribute("uploadFilePath"); | ||
| //이미지 속 텍스트 받기 | ||
| String pageText = (String)session.getAttribute("pageText"); | ||
| //세션에 저장해둔 가공 텍스트 가져오기 | ||
| ArrayList<String> sentence_list = (ArrayList<String>)session.getAttribute("sentence_list"); | ||
| %> | ||
| <iframe id="iframe1" name="iframe1" style="display:none"></iframe> | ||
| <form> | ||
| <div class="w3-row-padding w3-margin-top"> | ||
| <div class="w3-container w3-half w3-padding-large w3-mobile" style="text-align:center;"> | ||
| <div style="background-color:#C4C4C4;width:100%;"> | ||
| <img name="input-img" style="max-width:100%; max-height:60vh;object-fit: contain;"src="<%=uploadFilePath %>"> | ||
| <input type="hidden" name="pageImgUrl" value="<%=uploadFilePath %>" > | ||
| </div> | ||
| </div> | ||
| <div name="input-text" class="w3-container w3-half w3-mobile w3-margin-top" style="text-align:center;"> | ||
| <textarea id="pageText" class = "w3-round-large " name="pageText" cols="50" rows="10" style="width:90%;"><%=pageText%></textarea> | ||
| </div> | ||
| <div class="w3-center"> | ||
| <img src="./IMG/down-arrow.png" > | ||
| </div> | ||
| <div class="w3-container w3-half w3-padding-large w3-large"> | ||
| <input type="hidden" id="processing_method" value="<%=processingMethod %>"> | ||
| <input type="radio" class="w3-margin-left processing-type" name="processing-type" value="byEnter">줄 바꿈 분리 | ||
| <input type="radio" class="w3-margin-left processing-type" name="processing-type" value="bySpeaker"> 화자 별 분리 | ||
| <input type="radio" class="w3-margin-left processing-type" name="processing-type" value="byMark"> 문장 별 분리 | ||
| </div> | ||
| <div> | ||
| <span id="describe-type" class="w3-padding-large w3-margin-left"><%=describeMethod%></span> | ||
| </div> | ||
| <div name="processed-text" class="w3-container w3-half w3-padding-large" style="text-align:center;"> | ||
| <%for(int i=0; i<sentence_list.size(); i++) { %> | ||
| <div id="processedText<%=i%>" class = "w3-panel w3-border w3-round-large w3-padding-16" name="processedText<%=i%>"><%=sentence_list.get(i) %></div> | ||
| <%} %> | ||
| </div> | ||
| </div> | ||
| <div class="w3-center"> | ||
| <button type="SUBMIT" formmethod="post" formaction="doProcessText" formtarget="iframe1" class="processingTextSubmit-btn" style="display:none;"></button> | ||
| <button type="submit" formmethod="post" formaction="doPrepareSetting" class="w3-button w3-padding-large" style="width:50%; background-color: #927D71;"> 다음 </button> | ||
| </div> | ||
| </form> | ||
| </body> | ||
| <%@ page language="java" contentType="text/html; charset=UTF-8" | ||
| pageEncoding="UTF-8"%> | ||
| <%@page import="java.util.*" %> | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <title>업로드 이미지 확인</title> | ||
|
|
||
| </head> | ||
| <%@ include file="header.jsp" %> | ||
| <body> | ||
| <script> | ||
| $(function() { | ||
| //줄바꿈 텍스트로 변환 | ||
| $('#fake_textarea').html($('#fake_textarea').html().replace(/(\n|\r\n)/g, '<br>')); | ||
| var checkLargeQuo = <%=session.getAttribute("checkLargeQuo") %>; | ||
| var checkSmallQuo = <%=session.getAttribute("checkSmallQuo") %>; | ||
| if(checkLargeQuo == 1) { | ||
| //span 태그 추가 | ||
| $('#fake_textarea').html($('#fake_textarea').html().replace(/\"/g, "<span style='background-color:#fac9c9; border-radius:10%; display: inline-block; margin: 0 0.3% 0 0.3%; padding: 0 0.3% 0 0.3%;'>\"</span>")); | ||
| } | ||
| if(checkSmallQuo == 1) { | ||
| $('#fake_textarea').html($('#fake_textarea').html().replace(/\'/g, "<span style='background-color:#abdafd; border-radius:10%; display: inline-block; margin: 0 0.3% 0 0.3%; padding: 0 0.3% 0 0.3%;'>\'</span>")); | ||
| } | ||
| //radio 값 유지 | ||
| method = $("#processing_method").val(); | ||
| $("input:radio[name='processing-type']").each(function(index, element) { | ||
| if(method == $(element).val()) { | ||
| console.log(method); | ||
| $(element).attr('checked', true); | ||
| } | ||
| }); | ||
| // radio 값 변경 | ||
| $("input[name='processing-type']").change(function() { | ||
| //span 태그만 제거 | ||
| $('#fake_textarea').find("span").each(function(index) { | ||
| var text = $(this).text();//get span content | ||
| $(this).replaceWith(text);//replace all span with just content | ||
| }); | ||
| $('#fake_textarea').html($('#fake_textarea').html().replace(/(<br>|<br\/>|<br \/>)/g, '\r\n')); | ||
| $('#pageText').val($('#fake_textarea').text()); | ||
| console.log($('#pageText').val()); | ||
| $('.processingTextSubmit-btn').click(); | ||
| setTimeout(function() { | ||
| location.reload(); }, 300); | ||
| }); | ||
| //텍스트 변경 | ||
| $("#fake_textarea").on('blur', () => { | ||
| let item = $(this); | ||
| if (item.data('html') !== item.html()) { | ||
| //span 태그만 제거 | ||
| $('#fake_textarea').find("span").each(function(index) { | ||
| var text = $(this).text();//get span content | ||
| $(this).replaceWith(text);//replace all span with just content | ||
| }); | ||
| } | ||
| console.log($('#fake_textarea').html()); | ||
| $('#fake_textarea').html($('#fake_textarea').html().replace(/(<br>|<br\/>|<br \/>)/g, '\r\n')); | ||
| $('#pageText').val($('#fake_textarea').text()); | ||
| console.log($('#pageText').val()); | ||
| $('.processingTextSubmit-btn').click(); | ||
| setTimeout(function() { | ||
| location.reload(); }, 300); | ||
| }); | ||
| }); | ||
| </script> | ||
| <% | ||
| session = request.getSession(); | ||
| String processingMethod = (String) session.getAttribute("processingMethod"); | ||
| String describeMethod = (String) session.getAttribute("describeMethod"); | ||
| String checkQuoMsg = (String) session.getAttribute("checkQuoMsg"); | ||
| //이미지 경로 받기 | ||
| String uploadFilePath = ""; | ||
| if(session.getAttribute("uploadFilePath") != null) uploadFilePath = (String) session.getAttribute("uploadFilePath"); | ||
| //이미지 속 텍스트 받기 | ||
| String pageText = (String)session.getAttribute("pageText"); | ||
| //세션에 저장해둔 가공 텍스트 가져오기 | ||
| ArrayList<String> sentence_list = (ArrayList<String>)session.getAttribute("sentence_list"); | ||
| %> | ||
| <iframe id="iframe1" name="iframe1" style="display:none"></iframe> | ||
| <form> | ||
| <div class="w3-row-padding w3-margin-top"> | ||
| <div class="w3-container w3-half w3-padding-large w3-mobile" style="text-align:center;"> | ||
| <div style="background-color:#C4C4C4;width:100%;"> | ||
| <img name="input-img" style="max-width:100%; max-height:60vh;object-fit: contain;"src="<%=uploadFilePath %>"> | ||
| <input type="hidden" name="pageImgUrl" value="<%=uploadFilePath %>" > | ||
| </div> | ||
| </div> | ||
| <div name="input-text" class="w3-container w3-half w3-mobile w3-margin-top" > | ||
| <pre class="w3-input w3-border w3-round-large w3-padding-large" id='fake_textarea' contenteditable="true" style="font-family: Noto Sans KR; word-wrap: break-word; white-space:pre-wrap; display:inline-block;"><%=pageText%></pre> | ||
| <input type='hidden' id='pageText' name='pageText'/> | ||
| </div> | ||
| <div style='background-color:#fcec9f; border-radius:2px; display: inline-block; margin: 0 0.3% 2% 0.3%; padding: 0 0.3% 0 0.3%;''><%=checkQuoMsg%></div> | ||
| <div class="w3-center"> | ||
| <img src="./IMG/down-arrow.png" > | ||
| </div> | ||
| <div class="w3-container w3-half w3-padding-large w3-large"> | ||
| <input type="hidden" id="processing_method" value="<%=processingMethod %>"> | ||
| <input type="radio" class="w3-margin-left processing-type" name="processing-type" value="byEnter">줄 바꿈 분리 | ||
| <input type="radio" class="w3-margin-left processing-type" name="processing-type" value="bySpeaker"> 화자 별 분리 | ||
| <input type="radio" class="w3-margin-left processing-type" name="processing-type" value="byMark"> 문장 별 분리 | ||
| </div> | ||
| <div> | ||
| <span id="describe-type" class="w3-padding-large w3-margin-left"><%=describeMethod%></span> | ||
| </div> | ||
| <div name="processed-text" class="w3-container w3-half w3-padding-large" style="text-align:center;"> | ||
| <%for(int i=0; i<sentence_list.size(); i++) { %> | ||
| <div id="processedText<%=i%>" class = "w3-panel w3-border w3-round-large w3-padding-16" name="processedText<%=i%>" ><%=sentence_list.get(i) %></div> | ||
| <%} %> | ||
| </div> | ||
| </div> | ||
| <div class="w3-center"> | ||
| <button type="SUBMIT" formmethod="post" formaction="doProcessText" formtarget="iframe1" class="processingTextSubmit-btn" style="display:none;"></button> | ||
| <button type="submit" formmethod="post" formaction="doPrepareSetting" class="w3-button w3-padding-large" style="width:50%; background-color: #927D71;"> 다음 </button> | ||
| </div> | ||
| </form> | ||
| </body> | ||
| </html> |
Oops, something went wrong.