Mercurial > hg > LGServices

diff src/main/webapp/pages/fullTextSearch.jsp @ 55:95bf4ac726e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Topic synchronization with extraction-interface. new tables in LGService database
author Zoe Hong <zhong@mpiwg-berlin.mpg.de>
date Tue, 16 Feb 2016 15:09:40 +0100
parents a00efd5d9e77
children 5cbe567a9c52
line wrap: on
line diff
--- a/src/main/webapp/pages/fullTextSearch.jsp	Thu Feb 04 11:30:46 2016 +0100
+++ b/src/main/webapp/pages/fullTextSearch.jsp	Tue Feb 16 15:09:40 2016 +0100
@@ -49,10 +49,10 @@
 			var dialogViewSavedResult = $("#dialogViewSavedResult").dialog(
 				{
 					autoOpen: false,
-					position: { my: "left+100px", at: "top", of: $("#viewSavedResult") },
+					//position: { my: "left+100px", at: "top", of: $("#viewSavedResult") },
+					position: { my: "center", at: "top+200px", of: $("#viewSavedResult") },	// TODO
+					width: "850px",
 
-					//position: { my: "center", at: "top+150px", of: $("#viewSavedResult") },	// TODO
-					// width: "600px",
 				}
 		  	);
 			$("#viewSavedResult").button().on( "click", function() {
@@ -177,44 +177,104 @@
 			 	
 			</div>	
 			
-			<div id="dialogViewSavedResult" title="Saved Table">
+			<div id="dialogViewSavedResult" title="Saved Table(s)">
 				
-				<div class="label">Recent</div>		
-				<table class="pageTable">
+				<div class="label">This week:</div>		
+				<table class="savedResultTable">
+				<tr>
+					<% for (LGFullTextSearchFile aFile : sessionBean.getFullTextSearchPage().getWeekFileList() ){%>
+					<td>
+						<div><%= aFile.getFileName() %></div>
+						<button type="button" class="lgButton" onclick="setAction0('loadFile', 'fullTextSearchForm', 'fileId', <%=aFile.getId() %>); document.getElementById('fullTextSearchForm').submit();">load</button>	
+					
+						<!-- getFullTextSearchFileText?fileId= &userId= -->
 				
-					<% for (LGFullTextSearchFile aFile : sessionBean.getFullTextSearchPage().getFileList() ){%>
-					<tr><td>
-						<%= aFile.getFileName() %>
-						
-							<button type="button" class="lgButton" onclick="setAction0('loadFile', 'fullTextSearchForm', 'fileId', <%=aFile.getId() %>); document.getElementById('fullTextSearchForm').submit();">load</button>	
-						
-							<!-- getFullTextSearchFileText?fileId= &userId= -->
+						<!-- click searching result to open it in the same table of full-text-search result -->
+						<a href="<%=sessionBean.getApplicationBean().getRootServer() %>/rest/text/getFullTextSearchHtmlFile?fileId=<%= aFile.getId() %>"
+									target="_blank">
+							<img title="Show text in html" src="<%=sessionBean.getApplicationBean().getShowImage()%>"/>	
+						</a>
+						<!-- view on LGMap -->
+						<a href="<%=sessionBean.getApplicationBean().getLGMapUrl() %>&file=<%=aFile.getUserId().toString()%>_<%=aFile.getFileName()%>.csv&name=<%=aFile.getSearchTerms() %>"
+									target="_blank">
+							<img title="View on LGMap" src="<%=sessionBean.getApplicationBean().getViewOnMap()%>"/>	
+						</a>
+					
+						<input type="image" title="Delete it"
+							onclick="<%=sessionBean.getApplicationBean().getJSConfirmationDelete() %> setAction0('deleteFile', 'fullTextSearchForm', 'fileId','<%=aFile.getId() %>'); document.getElementById('fullTextSearchForm').submit();" 
+							src="<%=sessionBean.getApplicationBean().getDeleteImage()%>"/>
+					
+					</td>
 					
-							<!-- click searching result to open it in the same table of full-text-search result -->
-							<a href="<%=sessionBean.getApplicationBean().getRootServer() %>/rest/text/getFullTextSearchHtmlFile?fileId=<%= aFile.getId() %>"
-										target="_blank">
-								<img title="Show text in html" src="<%=sessionBean.getApplicationBean().getShowImage()%>"/>	
-							</a>
-						
+					<% } %>
+					</tr>
+				</table>
+			
+				<div class="label">This month:</div>		
+				<table class="savedResultTable">
+				<tr>
+					<% for (LGFullTextSearchFile aFile : sessionBean.getFullTextSearchPage().getMonthFileList() ){ %>				
+					<td>
+						<div><%= aFile.getFileName() %></div>
+						<button type="button" class="lgButton" onclick="setAction0('loadFile', 'fullTextSearchForm', 'fileId', <%=aFile.getId() %>); document.getElementById('fullTextSearchForm').submit();">load</button>	
+					
+						<!-- getFullTextSearchFileText?fileId= &userId= -->
 				
-							<!-- view on LGMap -->
-							<a href="<%=sessionBean.getApplicationBean().getLGMapUrl() %>&file=<%=aFile.getUserId().toString()%>_<%=aFile.getFileName()%>.csv&name=<%=aFile.getSearchTerms() %>"
-										target="_blank">
-								<img title="View on LGMap" src="<%=sessionBean.getApplicationBean().getViewOnMap()%>"/>	
-							</a>
+						<!-- click searching result to open it in the same table of full-text-search result -->
+						<a href="<%=sessionBean.getApplicationBean().getRootServer() %>/rest/text/getFullTextSearchHtmlFile?fileId=<%= aFile.getId() %>"
+									target="_blank">
+							<img title="Show text in html" src="<%=sessionBean.getApplicationBean().getShowImage()%>"/>	
+						</a>
+					
+			
+						<!-- view on LGMap -->
+						<a href="<%=sessionBean.getApplicationBean().getLGMapUrl() %>&file=<%=aFile.getUserId().toString()%>_<%=aFile.getFileName()%>.csv&name=<%=aFile.getSearchTerms() %>"
+									target="_blank">
+							<img title="View on LGMap" src="<%=sessionBean.getApplicationBean().getViewOnMap()%>"/>	
+						</a>
+					
+						<input type="image" title="Delete it"
+							onclick="<%=sessionBean.getApplicationBean().getJSConfirmationDelete() %> setAction0('deleteFile', 'fullTextSearchForm', 'fileId','<%=aFile.getId() %>'); document.getElementById('fullTextSearchForm').submit();" 
+							src="<%=sessionBean.getApplicationBean().getDeleteImage()%>"/>
 						
-							<input type="image" title="Delete it"
-								onclick="<%=sessionBean.getApplicationBean().getJSConfirmationDelete() %> setAction0('deleteFile', 'fullTextSearchForm', 'fileId','<%=aFile.getId() %>'); document.getElementById('fullTextSearchForm').submit();" 
-								src="<%=sessionBean.getApplicationBean().getDeleteImage()%>"/>
-						</td>
-					<tr>
+					</td>
+					
 					<% } %>
 					</tr>
 				</table>
 				
-				<div class="label">Last Week</div>				
-				<div class="label">Last Month</div>
 				<div class="label">Older...</div>
+				<table class="savedResultTable">
+				<tr>
+					<% for (LGFullTextSearchFile aFile : sessionBean.getFullTextSearchPage().getOlderFileList() ){%>
+					<td>
+						<div><%= aFile.getFileName() %></div>
+						<button type="button" class="lgButton" onclick="setAction0('loadFile', 'fullTextSearchForm', 'fileId', <%=aFile.getId() %>); document.getElementById('fullTextSearchForm').submit();">load</button>	
+					
+						<!-- getFullTextSearchFileText?fileId= &userId= -->
+				
+						<!-- click searching result to open it in the same table of full-text-search result -->
+						<a href="<%=sessionBean.getApplicationBean().getRootServer() %>/rest/text/getFullTextSearchHtmlFile?fileId=<%= aFile.getId() %>"
+									target="_blank">
+							<img title="Show text in html" src="<%=sessionBean.getApplicationBean().getShowImage()%>"/>	
+						</a>
+					
+			
+						<!-- view on LGMap -->
+						<a href="<%=sessionBean.getApplicationBean().getLGMapUrl() %>&file=<%=aFile.getUserId().toString()%>_<%=aFile.getFileName()%>.csv&name=<%=aFile.getSearchTerms() %>"
+									target="_blank">
+							<img title="View on LGMap" src="<%=sessionBean.getApplicationBean().getViewOnMap()%>"/>	
+						</a>
+					
+						<input type="image" title="Delete it"
+							onclick="<%=sessionBean.getApplicationBean().getJSConfirmationDelete() %> setAction0('deleteFile', 'fullTextSearchForm', 'fileId','<%=aFile.getId() %>'); document.getElementById('fullTextSearchForm').submit();" 
+							src="<%=sessionBean.getApplicationBean().getDeleteImage()%>"/>
+						
+					</td>
+					
+					<% } %>
+					</tr>
+				</table>
 				
 				<!-- 
 				<table class="pageTable">
@@ -263,8 +323,6 @@
 		
 			</div>	
 		<label class="subTitel">Full Text Search</label> 
-
-			
 			<form name="fullTextSearchForm" id="fullTextSearchForm"
 				action="<%=sessionBean.getApplicationBean().getRootServer()%>/proxy.jsp"
 				method="post"
@@ -275,7 +333,6 @@
 				<input id="mouseX" name="mouseX" type="hidden" value="<%=sessionBean.getFullTextSearchPage().getMouseX() %>"/>
 				<input id="mouseY" name="mouseY" type="hidden" value="<%=sessionBean.getFullTextSearchPage().getMouseY() %>"/>
 				
-				
 				<table style="width: 300px; margin-left: auto;margin-right: auto;">
 				<tr>
 					<td>