diff --git a/WebContent/WEB-INF/spring-webmvc-servlet.xml b/WebContent/WEB-INF/spring-webmvc-servlet.xml
index a8222e2ed..358b9c34d 100644
--- a/WebContent/WEB-INF/spring-webmvc-servlet.xml
+++ b/WebContent/WEB-INF/spring-webmvc-servlet.xml
@@ -9,7 +9,7 @@
        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
        http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
-    <context:component-scan base-package="edu.gmu.csiss.earthcube.cyberconnector.web"/>
+    <context:component-scan base-package="gw.web"/>
 
     <mvc:annotation-driven/>
 
diff --git a/WebContent/WEB-INF/spring-websocket-servlet.xml b/WebContent/WEB-INF/spring-websocket-servlet.xml
index 0a0b48c5c..331b55d6f 100644
--- a/WebContent/WEB-INF/spring-websocket-servlet.xml
+++ b/WebContent/WEB-INF/spring-websocket-servlet.xml
@@ -16,13 +16,13 @@
 			</websocket:handshake-interceptors>
 		</websocket:handlers>
 		
-		<bean id="jupyterhandler" class="edu.gmu.csiss.earthcube.cyberconnector.ws.JupyterHandler"/> -->
+		<bean id="jupyterhandler" class="gw.ws.JupyterHandler"/> -->
 		
-        <bean id="shellsocket" class="edu.gmu.csiss.earthcube.cyberconnector.ssh.ShellSocket"/>
+        <bean id="shellsocket" class="gw.ssh.ShellSocket"/>
         
-        <bean id="tasksocket" class="edu.gmu.csiss.earthcube.cyberconnector.tasks.TaskSocket"/>
+        <bean id="tasksocket" class="gw.tasks.TaskSocket"/>
         
-        <!-- <bean id="jupytersocket" class="edu.gmu.csiss.earthcube.cyberconnector.web.JupyterSocket"/> -->
+        <!-- <bean id="jupytersocket" class="gw.web.JupyterSocket"/> -->
 		
         <websocket:handlers>
             
diff --git a/WebContent/WEB-INF/views/geoweaver-ssh.html b/WebContent/WEB-INF/views/geoweaver-ssh.html
index 7fb5dc234..20eff9d33 100644
--- a/WebContent/WEB-INF/views/geoweaver-ssh.html
+++ b/WebContent/WEB-INF/views/geoweaver-ssh.html
@@ -10,7 +10,8 @@
     
     
     <script src="../geoweaver/ssh/sockjs.js"  th:src="@{../geoweaver/ssh/sockjs.js}"></script>
-    <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
+    <!-- <script src="https://code.jquery.com/jquery-3.2.1.min.js"></script> -->
+    <script src="../geoweaver/js/jquery-3.2.1.min.js"></script>
     
     <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/1.23.2/js/jquery.terminal.min.js"></script>
 	<link href="https://cdnjs.cloudflare.com/ajax/libs/jquery.terminal/1.23.2/css/jquery.terminal.min.css" rel="stylesheet"/> -->
@@ -76,7 +77,7 @@ <h1 id="title">Geoweaver Web-based SSH</h1>
       
     /*]]>*/
     </script> 
-    <script src="../geoweaver/js/edu.gmu.csiss.geoweaver.sshterm.js" ></script>
+    <script src="../geoweaver/js/gw.sshterm.js" ></script>
     
     
 </body>
diff --git a/WebContent/WEB-INF/views/geoweaver.html b/WebContent/WEB-INF/views/geoweaver.html
index 75081a725..8f1995a20 100644
--- a/WebContent/WEB-INF/views/geoweaver.html
+++ b/WebContent/WEB-INF/views/geoweaver.html
@@ -11,7 +11,8 @@
 		
 		<link href="../css/bootstrap-dialog.min.css" rel="stylesheet"/>
 		
-   		<link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-colorpicker/2.5.3/css/bootstrap-colorpicker.min.css" rel="stylesheet" />
+   		<!-- <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-colorpicker/2.5.3/css/bootstrap-colorpicker.min.css" rel="stylesheet" /> -->
+   		<link href="../geoweaver/css/bootstrap-colorpicker.min.css" rel="stylesheet" />
 		
 		<link href="../css/font-awesome.css" rel="stylesheet" />
 		
@@ -29,9 +30,11 @@
 		<link rel="stylesheet" href="../geoweaver/codemirror/theme/yonce.css">
 		<link rel="stylesheet" href="../geoweaver/codemirror/theme/zenburn.css">
 		
-		<link href="https://danielmg.org/assets/demo/uploader/css/jquery.dm-uploader.min.css?v=v10" rel="stylesheet" />
+		<!-- <link href="https://danielmg.org/assets/demo/uploader/css/jquery.dm-uploader.min.css?v=v10" rel="stylesheet" /> -->
+    	<link rel="stylesheet" href="../geoweaver/css/jquery.dm-uploader.min.css" />
     	
-   		<link href="https://danielmg.org/assets/demo/uploader/css/main.css?v=v10" rel="stylesheet" />
+   		<!-- <link href="https://danielmg.org/assets/demo/uploader/css/main.css?v=v10" rel="stylesheet" /> -->
+   		<link rel="stylesheet" href="../geoweaver/css/main.css" />
    	
    		<link rel="stylesheet" href="../geoweaver/css/prism.css" />
     	
@@ -41,6 +44,8 @@
         
         <link rel="stylesheet" href="../css/imageviewer.css" />
         
+        <link rel="stylesheet" href="../geoweaver/css/Chart.min.css" />
+        
         <style type="text/css">
         	/* Style the tab */
 			.tab {
@@ -78,6 +83,13 @@
 			  /* border: 1px solid #ccc; */
 			  border-top: none;
 			}
+			
+			#process-history-chart-container {
+			
+				width: 200px;
+				height: 100px;
+			
+			}
         
         </style>
         
@@ -91,13 +103,21 @@
 		
 		<script type="text/javascript" src="../js/imageviewer.min.js"></script>
 		
-		<script src="https://danielmg.org/assets/demo/uploader/js/jquery.dm-uploader.min.js?v=v10"></script>
+		<!-- <script src="https://danielmg.org/assets/demo/uploader/js/jquery.dm-uploader.min.js?v=v10"></script>
 	    
 	    <script src="https://danielmg.org/assets/demo/uploader/js/ui-main.js?v=v10"></script>
 		    
 	    <script src="https://danielmg.org/assets/demo/uploader/js/ui-multiple.js?v=v10"></script>
 	  	
-	    <script src="https://danielmg.org/assets/demo/uploader/js/configs/no-queue.js?v=v10"></script>
+	    <script src="https://danielmg.org/assets/demo/uploader/js/configs/no-queue.js?v=v10"></script> -->
+	    
+	    <script type="text/javascript" src="../geoweaver/js/jquery.dm-uploader.min.js"></script>
+	    
+	    <script type="text/javascript" src="../geoweaver/js/ui-main.js"></script>
+	    
+	    <script type="text/javascript" src="../geoweaver/js/ui-multiple.js"></script>
+	    
+	    <script type="text/javascript" src="../geoweaver/js/no-queue.js"></script>
 		
 		<script type="text/javascript" src="../geoweaver/codemirror/lib/codemirror.js"></script>
 		
@@ -113,6 +133,7 @@
    	
    		<script type="text/javascript" src="../geoweaver/js/jsframe.js" ></script>
     	
+    	<script type="text/javascript" src="../geoweaver/js/Chart.min.js"></script>
     	
 	</head>
 	
@@ -165,10 +186,10 @@
 				  </a>
 				  <a  
 				  data-toggle="tooltip" title="Information"
-				  style="float: right; width: 100px;text-align: center;margin-top: 9px;padding-top: 5px;transition: all 0.3s ease;color: white;font-size: 16px;" href="javascript:edu.gmu.csiss.geoweaver.tutorial.showDialog()">
+				  style="float: right; width: 100px;text-align: center;margin-top: 9px;padding-top: 5px;transition: all 0.3s ease;color: white;font-size: 16px;" href="javascript:gw.tutorial.showDialog()">
                   	<i class="fa fa-book" alt="tutorial" > Tutorial</i> 
                   </a>
-				  <a style="float: right; width: 80px;text-align: center;margin-top: 9px;padding-top: 5px;transition: all 0.3s ease;color: white;font-size: 16px;" href="javascript:edu.gmu.csiss.geoweaver.about.showDialog()">
+				  <a style="float: right; width: 80px;text-align: center;margin-top: 9px;padding-top: 5px;transition: all 0.3s ease;color: white;font-size: 16px;" href="javascript:gw.about.showDialog()">
 				  	<i class="fa fa-info" alt="info" id="toolbar-info"> Info</i>
 				  </a>
 				</div>
@@ -250,17 +271,18 @@ <h2>Please select a process on the right panel!</h2>
 						</div>
 						
 						<div id="main-workflow-info" class="tabcontent" style="height:100%; left:0; margin:0; padding: 0;">
-							  <div id="main-workflow-content" style="overflow-y: scroll;  padding: 5px; ">
+							  <div id="main-workflow-content" style="height:100%; overflow-y: scroll;  padding-bottom: 5px; ">
 							  	<h2>Please select a workflow on the right panel!</h2>
 							  </div>
 						</div>
 							
 						<div id="main-console" class="tabcontent" style="height:100%; left:0; margin:0;">
+							<div id="main-console-content" style="height:100%; overflow-y: scroll; padding: 0; margin-bottom: 5px;">
 							  <h2>logging information and errors</h2>
 							  <div id="log-window">
 							  	
 							  </div>
-							  
+							</div>
 						</div>
 				
 			    		<div id="workspace" class="tabcontent" style="height:100%; margin: 0;padding: 0;">
@@ -386,13 +408,13 @@ <h2>logging information and errors</h2>
 					                </li> -->
 					
 									<li>
-					                  <a href="javascript:edu.gmu.csiss.geoweaver.tutorial.showDialog()">
+					                  <a href="javascript:gw.tutorial.showDialog()">
 					                  <i class="fa fa-book fa-lg"></i> Tutorial
 					                  </a>
 					                </li>
 						
 					                <li>
-					                  <a href="javascript:edu.gmu.csiss.geoweaver.about.showDialog()">
+					                  <a href="javascript:gw.about.showDialog()">
 					                  <i class="fa fa-info fa-lg"></i> About
 					                  </a>
 					                </li>
@@ -427,24 +449,25 @@ <h2>logging information and errors</h2>
         <script src="../geoweaver/js/prism.min.js"></script>
 		<script src="../geoweaver/js/notebook.js" ></script>
     	<script src="../geoweaver/js/d3.min.js"></script>
-	    <script src="../geoweaver/js/edu.gmu.csiss.geoweaver.js"></script>
-	    <script src="../geoweaver/js/edu.gmu.csiss.geoweaver.tutorial.js"></script>
-	    <script src="../geoweaver/js/edu.gmu.csiss.geoweaver.about.js"></script>
-	    <script src="../geoweaver/js/edu.gmu.csiss.geoweaver.workspace.js"></script>
-	    <script src="../geoweaver/js/edu.gmu.csiss.geoweaver.ssh.js"></script>
-	    <script src="../geoweaver/js/edu.gmu.csiss.geoweaver.fileupload.js"></script>
-	    <script src="../geoweaver/js/edu.gmu.csiss.geoweaver.filebrowser.js"></script>
-	    <script src="../geoweaver/js/edu.gmu.csiss.geoweaver.host.js"></script>
-	    <script src="../geoweaver/js/edu.gmu.csiss.geoweaver.result.js"></script>
-	    <script src="../geoweaver/js/edu.gmu.csiss.geoweaver.process.js"></script>
-	    <script src="../geoweaver/js/edu.gmu.csiss.geoweaver.workflow.js"></script>
-	    <script src="../geoweaver/js/edu.gmu.csiss.geoweaver.monitor.js"></script>
-	    <script src="../geoweaver/js/edu.gmu.csiss.geoweaver.search.js"></script>
-	    <script src="../geoweaver/js/edu.gmu.csiss.geoweaver.settings.js"></script>
-	    <script src="../geoweaver/js/edu.gmu.csiss.geoweaver.toolbar.js"></script>
-	    <script src="../geoweaver/js/edu.gmu.csiss.geoweaver.menu.js"></script>
-	    <script src="../geoweaver/js/edu.gmu.csiss.geoweaver.general.js"></script>
-	    <script src="../geoweaver/js/edu.gmu.csiss.geoweaver.main.js"></script>
+	    <script src="../geoweaver/js/gw.js"></script>
+	    <script src="../geoweaver/js/gw.general.js"></script>
+	    <script src="../geoweaver/js/gw.tutorial.js"></script>
+	    <script src="../geoweaver/js/gw.about.js"></script>
+	    <script src="../geoweaver/js/gw.chart.js"></script>
+	    <script src="../geoweaver/js/gw.workspace.js"></script>
+	    <script src="../geoweaver/js/gw.ssh.js"></script>
+	    <script src="../geoweaver/js/gw.fileupload.js"></script>
+	    <script src="../geoweaver/js/gw.filebrowser.js"></script>
+	    <script src="../geoweaver/js/gw.host.js"></script>
+	    <script src="../geoweaver/js/gw.result.js"></script>
+	    <script src="../geoweaver/js/gw.process.js"></script>
+	    <script src="../geoweaver/js/gw.workflow.js"></script>
+	    <script src="../geoweaver/js/gw.monitor.js"></script>
+	    <script src="../geoweaver/js/gw.search.js"></script>
+	    <script src="../geoweaver/js/gw.settings.js"></script>
+	    <script src="../geoweaver/js/gw.toolbar.js"></script>
+	    <script src="../geoweaver/js/gw.menu.js"></script>
+	    <script src="../geoweaver/js/gw.main.js"></script>
 	    
 	    <script>
 	    
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 381f12240..d38c94d50 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -5,7 +5,7 @@
   <!-- 
 	  <servlet>
 	    <servlet-name>GetInputDetailsServlet</servlet-name>
-	    <servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.GetInputDetailsServlet</servlet-class>
+	    <servlet-class>gw.servlet.GetInputDetailsServlet</servlet-class>
 	  </servlet>
 	  <servlet-mapping>
 	    <servlet-name>GetInputDetailsServlet</servlet-name>
@@ -13,7 +13,7 @@
 	  </servlet-mapping>
 	  <servlet>
 	    <servlet-name>FetchProductListServlet</servlet-name>
-	    <servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.FetchProductListServlet</servlet-class>
+	    <servlet-class>gw.servlet.FetchProductListServlet</servlet-class>
 	  </servlet>
 	  <servlet-mapping>
 	    <servlet-name>FetchProductListServlet</servlet-name>
@@ -21,7 +21,7 @@
 	  </servlet-mapping>
 	  <servlet>
 	    <servlet-name>OrderCheckingServlet</servlet-name>
-	    <servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.OrderCheckingServlet</servlet-class>
+	    <servlet-class>gw.servlet.OrderCheckingServlet</servlet-class>
 	  </servlet>
 	  <servlet-mapping>
 	    <servlet-name>OrderCheckingServlet</servlet-name>
@@ -29,7 +29,7 @@
 	  </servlet-mapping>
 	  <servlet>
 	    <servlet-name>ServiceUnregistrationServlet</servlet-name>
-	    <servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.ServiceUnregistrationServlet</servlet-class>
+	    <servlet-class>gw.servlet.ServiceUnregistrationServlet</servlet-class>
 	  </servlet>
 	  <servlet-mapping>
 	    <servlet-name>ServiceUnregistrationServlet</servlet-name>
@@ -37,7 +37,7 @@
 	  </servlet-mapping>
 	  <servlet>
 	    <servlet-name>ServiceRegisterServlet</servlet-name>
-	    <servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.ServiceRegisterServlet</servlet-class>
+	    <servlet-class>gw.servlet.ServiceRegisterServlet</servlet-class>
 	  </servlet>
 	  <servlet-mapping>
 	    <servlet-name>ServiceRegisterServlet</servlet-name>
@@ -45,7 +45,7 @@
 	  </servlet-mapping>
 	  <servlet>
 	    <servlet-name>MetadataQueryServlet</servlet-name>
-	    <servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.MetadataQueryServlet</servlet-class>
+	    <servlet-class>gw.servlet.MetadataQueryServlet</servlet-class>
 	  </servlet>
 	  <servlet-mapping>
 	    <servlet-name>MetadataQueryServlet</servlet-name>
@@ -53,7 +53,7 @@
 	  </servlet-mapping> 
 	  <servlet>
 	    <servlet-name>VirtualProductQueryServlet</servlet-name>
-	    <servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.VirtualProductQueryServlet</servlet-class>
+	    <servlet-class>gw.servlet.VirtualProductQueryServlet</servlet-class>
 	  </servlet>
 	  <servlet-mapping>
 	    <servlet-name>VirtualProductQueryServlet</servlet-name>
@@ -62,7 +62,7 @@
   -->
   <servlet>
     <servlet-name>FileUploadServlet</servlet-name>
-    <servlet-class>edu.gmu.csiss.earthcube.cyberconnector.servlet.FileUploadServlet</servlet-class>
+    <servlet-class>gw.servlet.FileUploadServlet</servlet-class>
     <init-param>
       <param-name>filepath</param-name>
       <param-value>uploadFile</param-value>
diff --git a/WebContent/geoweaver/css/Chart.min.css b/WebContent/geoweaver/css/Chart.min.css
new file mode 100644
index 000000000..9dc5ac2e5
--- /dev/null
+++ b/WebContent/geoweaver/css/Chart.min.css
@@ -0,0 +1 @@
+@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}
\ No newline at end of file
diff --git a/WebContent/geoweaver/css/bootstrap-colorpicker.min.css b/WebContent/geoweaver/css/bootstrap-colorpicker.min.css
new file mode 100644
index 000000000..589b84ab2
--- /dev/null
+++ b/WebContent/geoweaver/css/bootstrap-colorpicker.min.css
@@ -0,0 +1,10 @@
+/*!
+ * Bootstrap Colorpicker v2.5.2
+ * https://itsjavi.com/bootstrap-colorpicker/
+ *
+ * Originally written by (c) 2012 Stefan Petre
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0.txt
+ *
+ */.colorpicker-saturation{width:100px;height:100px;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAQAAADa613fAAAP9klEQVR4XnRWC47rNgwcKjlA0bv2VL1Qi/YELRav7203iS1ppqZoiXCAhuBHVLI74xFtG3/Hz2joIOjRGuR5eMYuRn9YA1fds859KX8ZvczLr9/pImiR3Rqky9/wlajRIdVE/1Rufeu/0No3/ASgBZAJUkwgi0iCaEatekJJoEqiTQncd67/gyOfRCZshTed0Nl8LbLj8D6qxtoq9/7kJz/aH/3Xfu8VwI5+AUH8DxE7gUyiIpZ5LwiGzUqE3CScJsCDQHAsvBnxWpkbC0QMHmBp6latWS0bnvrCN/x1+xPfce+Ij0GAyeAGGz15sOiax2UylPhKrFaMPnVWClwepKh07hdhkVDsK2uoyEIySergjdbY2VBtV8VLr8Mf9mF/4wMb7kR8FOhzFWZZe7HIZD9JRIbee28eJKBweTB6TwjYkAgWaUmtDveGw1Wx3zZ76YlPPfQd/+gTTUFkiGiJ+NQAszU1EPT/QJEgufolAMPkNU4CVOyUIBLg4xglEZHGQnTFOFV0VaulYddBhA986ge/7N/yQi/3flFgwfQq2ibLnTDBRl9TmUHyJASPV/eoN0UISIr+ICQKIFV4EpljSjV1uFVUq9hRtet5e9gXvuyHPW0zMhQxWaoBBa9Tg8vsCEhww23Smd0CKjIkmPIoxWrUBDgJqFCyESF43ctQxLUoHN7Q1KyVhqrNNm3cy2vMyQNPVKjc29Rh5SSU+giWdRJHkLnQG71FQEuNyNGBTDdBQQAKCuGiEUS/jcyGbkMPq931OIzb/dUPGuVlG7f+slqkO5NAAlzTMdcq0NkzmsEBmAQkbI+pSHbiqnuWIA6lijhvqwIxMyWxMGZiPU669XJE1tADDTs2HWpwKxuqdnTpOiOR42xlzLtm3pXGel3xd8/oTs8Xy0MV8GM1RlsC2Y3Wy3wut3M+2mEVux0Gt9fhzTWyLvGiiJYaqY5DWRFIwAiQ5r6gB9GpQihJw4I9j5Mkscj3BnzGjBhv8xna5P1Jo428o6IOPY5KFZtVOkEKqUjqQY9Gi+jrIOFwJUDzRtA9xyoIrGGmkNRmxVAnZoK+TkUIeUYni5wEzgOG5iZX5HCr2JyQNqdk++G0rgb1ochSIGutTj4P7F0PuRUAolmh5sCzAHn1BYyaADh6bgFeoBx6vst091CEvcSLWBBpqGq384jZ5llVHSwEShLx+D4d0mU3D5eEAJQ9KEhOZUYnDENV2qKgmIlQhWfdvcoXYaegPp/n1oKIOgYFqxrzQSciqNhv/5FqPpy6b0UcX2vf13DfWySRSEgkEYlEJJGQSyKJSEQSCYlEEpHexIVO3XOevffze2a+PfPv9x1rne1c3b3Mmlmz9mE++zuzngfnw/E+Dlc4LL4NwHdFy7u3KGPVmZ6/4eeMoDyre3i/KHADIHYO04w9zO0mAotuKnrc7XaPjvu66bNe5cDT7RlPepEnfS2X8dF1/utDvD+OwGDBxEgQywLCvIMYWBY+DShwAAORAdv9PswhDAqOUCi5+71AbFcDMR4xBDNfhySKXPXZ1+Vub+Q1Ltf5z7eC0AjVldHI26rIFdKIAyYBJCFVUhVDwttAnM52B3Ect1TFQXzJ0z33lOuib/QO8g+CuO0gKBRU80A8hkeJ0b1KRQWmFQVSh8mf3lpUpNaRulzN5NArrmKKGMijXgzk7w5ijdFVgT8f1IdFNjVWjDWicUYWEEMmSFDtILdzHW5XueHp7p+yuS54ep5/c5BE2Gw/gWPNYU4/PZaak2VGEsFjSbOf8irea6KQgojGCk0KxZY31tWWgzwayF8N5KYyo3VADVicWWrhwzr3ZqIOa5xW5zbqMPPMiyDURHDIHQTeWq7KFXcQPOqzPOL5Ov/iIDEDy7DHEwx0PTgjO8SS0fOEHcZNMt+XKEFMj8Q4QUSvPu6HPuvd4N9/x12RPwcIVRCAakSOUzHgsUSMFWYzDQ+PiOJqAOuYc9jh5TecnA+xHfFyOYhebeTH89P80wrCJzUjlsx7euIV0g4zQFUSiBPioIWBACFC7GgDj8P91ZSJOQmQP74MAnQo8H5RIe8kZ0kBcQCMAlEpRDiKROBxbR0ksdhWFq0gR9q9uQzkDzuIFQSPqAgRCAsCaVNF2ZAAhxvtzcqcnDk6tpXxSsayqXLIgSOb6zqeH+fvO0i9XEu5EVV+OZehRZJ6BGTeaRhCkTzVIZeAzaWGAFfErIPogQI5CuR3HQQx7DzBB16R3s7e0MBUPedjWutgG/JUTPqMeAQNEiytJRnJearWUgdwFNxN7rtBoECuj/O3BMHaTIxQ0a4GctireElTJHJvLTaalih5kvBCGMvkdESUMAdCFaI4yG8SpDfRWAptqkAJUwCG6B7lOREFSZBqKs57MEHqVJEBwHa2lp0OiKtiQ18gx9P89QrSXyc0vObBM4vPmBADqJZLAo/yzK7qPSZstCy+fDSZlhrm+Zkyjsf5q2otdC14zkLjHLf0me9wjNqQo0B1a6wBJRaIEgC2Qw9oby/cRHA+xHCQy/xlB1HVSV3Y/5yVhsc7dBi2UoIWCMcbELZWgxNCGUZ5y4ceBaLlE8dAfrEosrYT+z8ya3sxXndFBxuQivNGEHFCbLGBlBLKGYHZoeoQpcjtMn/uICPefcxecpuDOEemg9S/44cflZPIlWolyHkLrEpgbS9IQRlAgZgi0WDjsEiPh+PN/Fkogq4GdzPtarlRGW2tJwEK1RMTEvdVdmhAKHO1pdUuGQsVcX+rSfGzDbwGyE8NRPQc83HCaOkTZwPqABZBdFq8zAN1gue0FPO8wYUFBE1WkMwVzM1iQ4BItFh+H36Qy/yJg0DRQICmBl+tbKUC5cCj3yXI+SUFBS78ZAcBtHt+e9lBuiqpTNh9zTvIjzuIWxVYGQJpAZY+VWS3QKh84iSZbwuIdiDpc4KztQa/sjhMaDJEJDSZ8mZ+kCBdC0JpKVNQzZdKu+EsOeFCosrngVAkDS/uy6iGnW7UxmMpkB8FyFKo6iQW8z1HuBdMu1pdkZdB8jWTjlFtNaiJRYniIDcD+eECMqFLS9ED6DgxzCMKnRD3HYYA2uMCJUh70OK8G0EUnJV8lqe8nj84QdqLhdoJskNlEw1ivajM8LtPBhIeN99LESXI9xcQIHFQudHngZjUhXOQeGlUYmAddh5pxMhzV0M1vMAtMFIVmfp6fq+DgEWefjQVenstaqUy3bJQAiVlEihDghCDINFQg8oUhoQPkO8SBEM7SFQ72VYBwPuE7k8uYF5LNwg/TEd2zkuKjIIhTiJRlYrDfNS1QL7DYUcbcCyKJNwOwucVCVSwBBj/DwghXA2hQtACgCBBPprfXkAIFIYRXhONQARFU00Tsh6LEmmQUbkTImMi9me5qaHDIeBgHeRbdxAIqAJBCDSoCNVQglrciqX/ZCD9RRP6rgpBvhmKAFhg2ForBLXBYPtUjj7vCHPe8SXbYAY47gHB9mKeqjjIg/53fmMD0fR9Bug7SFcHI6EA1OC/E8QTL4NgBSGiCiyTChnI1zcQxmyfRZGM6w701KRybDvsIK3LWDx6mxGkcglEZQLkawnCdppZ6sgCh8trWWBUQaUWCEOlOs7HAenFE45QSu9RQQDAqchXNxDq4orQR44qRIFUQvM+mRJuB6GDEixgCbSBQGXghEEbdn1P/zO/QhAWCsWsmRhLa2VFkSZIgSVKmgEQhvk6K8YKMRZl7Dwg4amOUYvFBfLlE4RasOCB5S9PXKq0AqGDMiYIReXF0mYctITWBmqR5F38X5Y7yJfeCtKBzNbWYm5XpsMpf3dRZD3jPDesvdVCOs6KYQXIFw1E4fcE8dHWOepZBXpLJcACWUZVMRZbfvgXR4Ak8A7VVSKSVuu9p6/mFxyE7cOWavtLp952O8huK83+gmHzHaAsVXLgAvl8gPCvHzAFsM8GNXGKPH5cmN02sXTLa8QdKRXMzHv67/k5A9k1UIx36UH/VlWWtuKssNiRapB6BaLXl6MA+ayDcNS3v/sYXgCL620F1kk8QhKAEOvKu4DvajDO5zkHc4fBg76anyEIIcamBPex5EK8AoVHhMW7QAqWrYD1204CJB1hCfOAV/PTBPH0zBmJmsZZKCEaAmdqm4zMcYxYLN0JuHThIAjirAnp3px7TRgD+ZSD/K92M1CNIgbC8Ex7FkSEIlQEEUQEQQQBRBABEUQQEQTx3X0Evap9AhP39jL5OvuzAWuvbDaTTDIzX2aypUCJ0i7nAigoQAk9gUIUSxXEoCFyyVIuL9ZQcMZoArnwr4D0OLS8jGNGTgGnsZQWMYrcOARoIReAALBeWhf+RUCAIEsECFQHLkwR5zj4JW3t5WOUU5djvgQIawD53EDsctmYz8xGaZGPBUR3qNkiGwqDICUYIFpqBgRaayCfFiAWR2wWvoobmzxdF8N5kyxXmvap/sgGcLF/aoBosbG+lE395R8zCA4BqUYgOgYq+HtvBrT0LK15X8lZwx5f9klCX0rdgXzIIGbdhXMqZtHzJhuptEjmsFc4KzmN5IFPtfM7gWw2kPczSIqQSPUDYKYBMamsBCpKphW0iA5H8AbMDPJOQYjLZg1Vk4G49GlCYNYAkdOd0kwRQ8FCyAHydgLZ6Z2AqrVtjDUQ7hCEmrkEooDAsB2YnBCvkBpZ6yBvJpCd7Mn5zJ6C4QF2BUQPgHEIGUrGnHzQ8rlMekBeTyAzwDJksxwM4+w3BY02B8mIl0CmFRm+ZscxAuSnvwqQsECTIGSV6FEoJFTygVuzB5xAsKqBvAQE3+nkVoJDI1BJIaPBWik7ZSu5NIp5A3mRQaTFvLgkO9fVgEgMqqeVfb+p55tijWH+Kea71ubq4v8Sl8089sZKbKEZNq+VUfISJJF7j79WrbYgS994ZEf+nIz0pNFRWqapSmK6P45i3OQuItIiPDyg6RnxZ4D0g+CFPxAzluoRsWsaA6I6JOqVWCisDvJ0BgHTzMSRgMi0vmi8R+sR6tg/XUh7kCc7kMRqSNkTBDx0OkAUegFcMazciBXNpm798R6klXap/WZz49TQwBHqEcj4oCToUPjUuP9lfxcbyKMAwT6bTf1qqIIQDl3i5oCERNmVm0wgW4A8BGRxMX3hWh8bEV5Rvfp4DS5F3djWH2ztDNWKW7OBjgjIwsDWaKRknJjqMsh9QCa1p608lLovFkBE969DYtYelSzwSRcg535vAsFeNU9SzRCYZb4LDmxmFQKkwYGM+5y/G7b1uxMIylLdyE5yxIyYsoXWhQIpzQhYPi3JkJoKkB9+BxD0OMuyOEBe36DgyPSrxscmATldgKj8PxrkA/kA5PYMgkrocwIQ6GSRGmF0VaNqBKQZ5FYDEZSDzFTzq9mBQjAayE1A+ryDTzcQZe0Ibbxj7EwpAmTrJwEimZR9CCPtODhzxuNtY19Zd2Lf/fjCTnEiDAOg62j1utb/dv9mZ/aHCj4AyOHbsW3/As0BTzIgeJU7AAAAAElFTkSuQmCC);cursor:crosshair;float:left}.colorpicker-saturation i{display:block;height:5px;width:5px;border:1px solid #000;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;position:absolute;top:0;left:0;margin:-4px 0 0 -4px}.colorpicker-saturation i b{display:block;height:5px;width:5px;border:1px solid #fff;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.colorpicker-alpha,.colorpicker-hue{width:15px;height:100px;float:left;cursor:row-resize;margin-left:4px;margin-bottom:4px}.colorpicker-alpha i,.colorpicker-hue i{display:block;height:1px;background:#000;border-top:1px solid #fff;position:absolute;top:0;left:0;width:100%;margin-top:-1px}.colorpicker-hue{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAABkCAMAAABw8qpSAAABLFBMVEXqFBb/ABH/ACL/ADH/AEH/AFD/AGD/AG7/AH7/AI3/AJ3/AKz/ALz/AMr/ANv/AOr/APr2AP/mAP/XAP/HAP+4AP+oAP+aAP+JAP97AP9rAP9cAP9MAP8+AP8tAP8fAP8PAP8BAv8AEP8AH/8AL/8APv8ATv8AXP8Abf8Ae/8Ai/8Amv8Aqv8AuP8Ayf8A1/8A5/8A9/8A//gA/+kA/9kA/8oA/7oA/6wA/5sA/40A/30A/24A/14A/1AA/z8A/zEA/yEA/xEB/wMN/wAd/wAs/wA8/wBK/wBb/wBp/wB5/wCI/wCY/wCm/wC3/wDF/wDV/wDk/wD1/wD/+gD/7AD/3AD/zAD/vgD/rQD/nwD/jgD/gAD/cAD/YgD/UQD/QwD/MgD/JAD/FAD4Eg42qAedAAAAh0lEQVR4XgXAg3EDAAAAwI9to7Zt27a1/w49BASFhEVExcQlJKWkZWTl5BUUlZRVVNXUNTS1tHXo1KVbj159+g0YNGTYiFFjxk2YNGXajFlz5i1YtGTZilVr1m3YtGXbjl179h04dOTYiVNnzl24dOXajVt37j149OTZi1dv3n349OXbj19//wOxE1dQ8reGAAAAAElFTkSuQmCC)}.colorpicker-alpha{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAABkCAQAAAAVxWkcAAABr0lEQVR4Xo2VwU0DQQxF7dmRuNIFlzlSAR3QAaXQQdIBJVABFXDcOVAAd67cjJLR07dkhcSrkZKfb/t7bG88rFo3B5gZPMNycItu2xloGV7MWHzM9zuzFWCkmA0nK6AszCUJDW6+mG6R03ncw5v8EMTEvZ2O3AliYjpslblc0RF9LmZYWxURU6aKytWZYsoWCAe+xwOZp1GsEukGiIkYxcQCHck99+gRgB7JncyIB5SGEhP3Yh5P6JwX+u6AnYot104d8DJT7uH7M9JH6OZbimj0vfMVaYnJIZFJDBW9kHlerL2C6JV4mSt7uuo2N57RxnZ+usQjn0R1jwBJBrNO3evJpVYUWsJ/E3UiXRlv24/7YZ04xmEdWlzcKS+B/eapeyMvFd2k0+hRk/T0AmTW8h69s2sjYMsdPntECiILhAeIMZAeH4QvUwfn6ijC0tTV+fT9ky8jM9nK2g7Ly1VjSpKYq6IvsAm7MtNu1orEqa/K3KNvgMFdhfquPfJmp2dbh0/8Gzb6Y22ViaNr6n5410zXdngVhbu6XqdOtWOuin5hjABGp4a2uotZ71MVCfwDBt2/v37yo6AAAAAASUVORK5CYII=);display:none}.colorpicker-alpha,.colorpicker-hue,.colorpicker-saturation{background-size:contain}.colorpicker{padding:4px;min-width:130px;margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;z-index:2500}.colorpicker:after,.colorpicker:before{display:table;content:"";line-height:0}.colorpicker:after{clear:both}.colorpicker:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0,0,0,.2);position:absolute;top:-7px;left:6px}.colorpicker:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #fff;position:absolute;top:-6px;left:7px}.colorpicker div{position:relative}.colorpicker.colorpicker-with-alpha{min-width:140px}.colorpicker.colorpicker-with-alpha .colorpicker-alpha{display:block}.colorpicker-color{height:10px;margin-top:5px;clear:both;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAABkCAQAAAAVxWkcAAABr0lEQVR4Xo2VwU0DQQxF7dmRuNIFlzlSAR3QAaXQQdIBJVABFXDcOVAAd67cjJLR07dkhcSrkZKfb/t7bG88rFo3B5gZPMNycItu2xloGV7MWHzM9zuzFWCkmA0nK6AszCUJDW6+mG6R03ncw5v8EMTEvZ2O3AliYjpslblc0RF9LmZYWxURU6aKytWZYsoWCAe+xwOZp1GsEukGiIkYxcQCHck99+gRgB7JncyIB5SGEhP3Yh5P6JwX+u6AnYot104d8DJT7uH7M9JH6OZbimj0vfMVaYnJIZFJDBW9kHlerL2C6JV4mSt7uuo2N57RxnZ+usQjn0R1jwBJBrNO3evJpVYUWsJ/E3UiXRlv24/7YZ04xmEdWlzcKS+B/eapeyMvFd2k0+hRk/T0AmTW8h69s2sjYMsdPntECiILhAeIMZAeH4QvUwfn6ijC0tTV+fT9ky8jM9nK2g7Ly1VjSpKYq6IvsAm7MtNu1orEqa/K3KNvgMFdhfquPfJmp2dbh0/8Gzb6Y22ViaNr6n5410zXdngVhbu6XqdOtWOuin5hjABGp4a2uotZ71MVCfwDBt2/v37yo6AAAAAASUVORK5CYII=);background-position:0 100%}.colorpicker-color div{height:10px}.colorpicker-selectors{display:none;height:10px;margin-top:5px;clear:both}.colorpicker-selectors i{cursor:pointer;float:left;height:10px;width:10px}.colorpicker-selectors i+i{margin-left:3px}.colorpicker-element .add-on i,.colorpicker-element .input-group-addon i{display:inline-block;cursor:pointer;height:16px;vertical-align:text-top;width:16px}.colorpicker.colorpicker-inline{position:relative;display:inline-block;float:none;z-index:auto}.colorpicker.colorpicker-horizontal{width:110px;min-width:110px;height:auto}.colorpicker.colorpicker-horizontal .colorpicker-saturation{margin-bottom:4px}.colorpicker.colorpicker-horizontal .colorpicker-color{width:100px}.colorpicker.colorpicker-horizontal .colorpicker-alpha,.colorpicker.colorpicker-horizontal .colorpicker-hue{width:100px;height:15px;float:left;cursor:col-resize;margin-left:0;margin-bottom:4px}.colorpicker.colorpicker-horizontal .colorpicker-alpha i,.colorpicker.colorpicker-horizontal .colorpicker-hue i{display:block;height:15px;background:#fff;position:absolute;top:0;left:0;width:1px;border:none;margin-top:0}.colorpicker.colorpicker-horizontal .colorpicker-hue{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAABCAMAAAAfBfuPAAABLFBMVEXqFBb/ABH/ACL/ADH/AEH/AFD/AGD/AG7/AH7/AI3/AJ3/AKz/ALz/AMr/ANv/AOr/APr2AP/mAP/XAP/HAP+4AP+oAP+aAP+JAP97AP9rAP9cAP9MAP8+AP8tAP8fAP8PAP8BAv8AEP8AH/8AL/8APv8ATv8AXP8Abf8Ae/8Ai/8Amv8Aqv8AuP8Ayf8A1/8A5/8A9/8A//gA/+kA/9kA/8oA/7oA/6wA/5sA/40A/30A/24A/14A/1AA/z8A/zEA/yEA/xEB/wMN/wAd/wAs/wA8/wBK/wBb/wBp/wB5/wCI/wCY/wCm/wC3/wDF/wDV/wDk/wD1/wD/+gD/7AD/3AD/zAD/vgD/rQD/nwD/jgD/gAD/cAD/YgD/UQD/QwD/MgD/JAD/FAD4Eg42qAedAAAAbUlEQVR4XgXAghEDsbxtlrZt27ax/w49ACAYQTGcICmaYTleECVZUTXdMC1Wm93hdLk9Xp8/EAyFI9FYPJFMpTPZXL5QLJUr1Vq90Wy1O91efzAcjSfT2XyxXK03293+cDydL9fb/fF8vT/f3x+LfRNXARMbCAAAAABJRU5ErkJggg==)}.colorpicker.colorpicker-horizontal .colorpicker-alpha{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAAAKCAQAAADoFTP1AAAB9ElEQVR4XoWTQW4VMRBEu9qWEimL7DhEMp8NF+ASnJJLcAQgE1bcgBUSkYKUuHCrZ9pjeqSU5Yn9LPu7umJQBIIv+k7vIOrtK66L4lmr3pVOrOv3otp619KZ0/KjdNI79L52Uo09FBQWrU0vfe5trezU+hLsoUKd3Repovte+0vbq/7Lj5XbaHECKasR9G4MPlbp+gzZxd6koPEJCkAYC5SjcOTAIIOK90Dja1IfIZ8Z+zAY9jm3b5Ia+MT5sFcqRJrR2AYYA8Kua5BzYRrFPNmD4PQMegGJMOffJJUsWiI3nCHZZjInNdffLWOufzbc3JaboCAVxwmnRHbhLSPwRJ4wU0BRSc6HkECYYVw95nMKgJOcylxrJttE5Ibzf9Xq9GPvP+WX3MiV/MGHfRu/SentRQrfG1GzsIrytdNXucSRKxQNIGHM9YhGFQJcdjNcBZvfJayuYe4Sia1CzwW+19mWOhe37HsxJWKwbu/jluEU15QzAQjAqCEbhMJc78GYV2E0kooHDubUImWkTOhGpgv8PoT8DJG/bzxna4BZ0eOFSOaLADGeSpFsg5AzeaDZIDQQXjZ4y/8ryfzUXBwdELRjTjCNvOeT0rNlrJz90vwy6N9pXXQEluX0inElpPWokSdiLCfiNJJjMKQ8Qsh8GEKQKMo/eiHrNbI9UksAAAAASUVORK5CYII=)}.colorpicker-right:before{left:auto;right:6px}.colorpicker-right:after{left:auto;right:7px}.colorpicker-no-arrow:before{border-right:0;border-left:0}.colorpicker-no-arrow:after{border-right:0;border-left:0}.colorpicker-alpha.colorpicker-visible,.colorpicker-hue.colorpicker-visible,.colorpicker-saturation.colorpicker-visible,.colorpicker-selectors.colorpicker-visible,.colorpicker.colorpicker-visible{display:block}.colorpicker-alpha.colorpicker-hidden,.colorpicker-hue.colorpicker-hidden,.colorpicker-saturation.colorpicker-hidden,.colorpicker-selectors.colorpicker-hidden,.colorpicker.colorpicker-hidden{display:none}.colorpicker-inline.colorpicker-visible{display:inline-block}
+/*# sourceMappingURL=bootstrap-colorpicker.min.css.map */
\ No newline at end of file
diff --git a/WebContent/geoweaver/css/main.css b/WebContent/geoweaver/css/main.css
new file mode 100644
index 000000000..23a237093
--- /dev/null
+++ b/WebContent/geoweaver/css/main.css
@@ -0,0 +1,74 @@
+/* 
+	First: A couple styles to make the demo page look good
+ */
+body {
+	padding-bottom: 2rem;
+}
+
+nav {
+	border-top: 4px solid #28a745;
+}
+
+nav li.active {
+	border-bottom: 4px solid #28a745;	
+}
+
+.row {
+	margin-bottom: 1rem;
+}
+[class*="col-"] {
+	padding-top: 1rem;
+	padding-bottom: 1rem;
+}
+hr {
+	margin-top: 2rem;
+	margin-bottom: 2rem;
+}
+
+.progress {
+	height: 1.5rem;
+}
+
+#files {
+    overflow-y: scroll !important;
+    min-height: 320px;
+}
+@media (min-width: 768px) {
+	#files {
+		min-height: 0;
+	}
+}
+
+#debug {
+	overflow-y: scroll !important;
+	height: 180px;	
+}
+
+
+/* These are for the single examle */
+.preview-img {
+	width: 64px;
+	height: 64px;
+}
+
+form {
+	border: solid #f7f7f9 !important;
+	padding: 1.5rem
+}
+
+form.active {
+	border-color: red !important;
+}
+
+form .progress {
+	height: 38px;
+}
+
+.dm-uploader {
+	border: 0.25rem dashed #A5A5C7;
+}
+.dm-uploader.active {
+	border-color: red;
+
+	border-style: solid;
+}
diff --git a/WebContent/geoweaver/js/Chart.min.js b/WebContent/geoweaver/js/Chart.min.js
new file mode 100644
index 000000000..7c16b0d12
--- /dev/null
+++ b/WebContent/geoweaver/js/Chart.min.js
@@ -0,0 +1,7 @@
+/*!
+ * Chart.js v2.9.3
+ * https://www.chartjs.org
+ * (c) 2019 Chart.js Contributors
+ * Released under the MIT License
+ */
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(function(){try{return require("moment")}catch(t){}}()):"function"==typeof define&&define.amd?define(["require"],(function(t){return e(function(){try{return t("moment")}catch(t){}}())})):(t=t||self).Chart=e(t.moment)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var e={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},n=function(t,e){return t(e={exports:{}},e.exports),e.exports}((function(t){var n={};for(var i in e)e.hasOwnProperty(i)&&(n[e[i]]=i);var a=t.exports={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};for(var r in a)if(a.hasOwnProperty(r)){if(!("channels"in a[r]))throw new Error("missing channels property: "+r);if(!("labels"in a[r]))throw new Error("missing channel labels property: "+r);if(a[r].labels.length!==a[r].channels)throw new Error("channel and label counts mismatch: "+r);var o=a[r].channels,s=a[r].labels;delete a[r].channels,delete a[r].labels,Object.defineProperty(a[r],"channels",{value:o}),Object.defineProperty(a[r],"labels",{value:s})}a.rgb.hsl=function(t){var e,n,i=t[0]/255,a=t[1]/255,r=t[2]/255,o=Math.min(i,a,r),s=Math.max(i,a,r),l=s-o;return s===o?e=0:i===s?e=(a-r)/l:a===s?e=2+(r-i)/l:r===s&&(e=4+(i-a)/l),(e=Math.min(60*e,360))<0&&(e+=360),n=(o+s)/2,[e,100*(s===o?0:n<=.5?l/(s+o):l/(2-s-o)),100*n]},a.rgb.hsv=function(t){var e,n,i,a,r,o=t[0]/255,s=t[1]/255,l=t[2]/255,u=Math.max(o,s,l),d=u-Math.min(o,s,l),h=function(t){return(u-t)/6/d+.5};return 0===d?a=r=0:(r=d/u,e=h(o),n=h(s),i=h(l),o===u?a=i-n:s===u?a=1/3+e-i:l===u&&(a=2/3+n-e),a<0?a+=1:a>1&&(a-=1)),[360*a,100*r,100*u]},a.rgb.hwb=function(t){var e=t[0],n=t[1],i=t[2];return[a.rgb.hsl(t)[0],100*(1/255*Math.min(e,Math.min(n,i))),100*(i=1-1/255*Math.max(e,Math.max(n,i)))]},a.rgb.cmyk=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255;return[100*((1-n-(e=Math.min(1-n,1-i,1-a)))/(1-e)||0),100*((1-i-e)/(1-e)||0),100*((1-a-e)/(1-e)||0),100*e]},a.rgb.keyword=function(t){var i=n[t];if(i)return i;var a,r,o,s=1/0;for(var l in e)if(e.hasOwnProperty(l)){var u=e[l],d=(r=t,o=u,Math.pow(r[0]-o[0],2)+Math.pow(r[1]-o[1],2)+Math.pow(r[2]-o[2],2));d<s&&(s=d,a=l)}return a},a.keyword.rgb=function(t){return e[t]},a.rgb.xyz=function(t){var e=t[0]/255,n=t[1]/255,i=t[2]/255;return[100*(.4124*(e=e>.04045?Math.pow((e+.055)/1.055,2.4):e/12.92)+.3576*(n=n>.04045?Math.pow((n+.055)/1.055,2.4):n/12.92)+.1805*(i=i>.04045?Math.pow((i+.055)/1.055,2.4):i/12.92)),100*(.2126*e+.7152*n+.0722*i),100*(.0193*e+.1192*n+.9505*i)]},a.rgb.lab=function(t){var e=a.rgb.xyz(t),n=e[0],i=e[1],r=e[2];return i/=100,r/=108.883,n=(n/=95.047)>.008856?Math.pow(n,1/3):7.787*n+16/116,[116*(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116)-16,500*(n-i),200*(i-(r=r>.008856?Math.pow(r,1/3):7.787*r+16/116))]},a.hsl.rgb=function(t){var e,n,i,a,r,o=t[0]/360,s=t[1]/100,l=t[2]/100;if(0===s)return[r=255*l,r,r];e=2*l-(n=l<.5?l*(1+s):l+s-l*s),a=[0,0,0];for(var u=0;u<3;u++)(i=o+1/3*-(u-1))<0&&i++,i>1&&i--,r=6*i<1?e+6*(n-e)*i:2*i<1?n:3*i<2?e+(n-e)*(2/3-i)*6:e,a[u]=255*r;return a},a.hsl.hsv=function(t){var e=t[0],n=t[1]/100,i=t[2]/100,a=n,r=Math.max(i,.01);return n*=(i*=2)<=1?i:2-i,a*=r<=1?r:2-r,[e,100*(0===i?2*a/(r+a):2*n/(i+n)),100*((i+n)/2)]},a.hsv.rgb=function(t){var e=t[0]/60,n=t[1]/100,i=t[2]/100,a=Math.floor(e)%6,r=e-Math.floor(e),o=255*i*(1-n),s=255*i*(1-n*r),l=255*i*(1-n*(1-r));switch(i*=255,a){case 0:return[i,l,o];case 1:return[s,i,o];case 2:return[o,i,l];case 3:return[o,s,i];case 4:return[l,o,i];case 5:return[i,o,s]}},a.hsv.hsl=function(t){var e,n,i,a=t[0],r=t[1]/100,o=t[2]/100,s=Math.max(o,.01);return i=(2-r)*o,n=r*s,[a,100*(n=(n/=(e=(2-r)*s)<=1?e:2-e)||0),100*(i/=2)]},a.hwb.rgb=function(t){var e,n,i,a,r,o,s,l=t[0]/360,u=t[1]/100,d=t[2]/100,h=u+d;switch(h>1&&(u/=h,d/=h),i=6*l-(e=Math.floor(6*l)),0!=(1&e)&&(i=1-i),a=u+i*((n=1-d)-u),e){default:case 6:case 0:r=n,o=a,s=u;break;case 1:r=a,o=n,s=u;break;case 2:r=u,o=n,s=a;break;case 3:r=u,o=a,s=n;break;case 4:r=a,o=u,s=n;break;case 5:r=n,o=u,s=a}return[255*r,255*o,255*s]},a.cmyk.rgb=function(t){var e=t[0]/100,n=t[1]/100,i=t[2]/100,a=t[3]/100;return[255*(1-Math.min(1,e*(1-a)+a)),255*(1-Math.min(1,n*(1-a)+a)),255*(1-Math.min(1,i*(1-a)+a))]},a.xyz.rgb=function(t){var e,n,i,a=t[0]/100,r=t[1]/100,o=t[2]/100;return n=-.9689*a+1.8758*r+.0415*o,i=.0557*a+-.204*r+1.057*o,e=(e=3.2406*a+-1.5372*r+-.4986*o)>.0031308?1.055*Math.pow(e,1/2.4)-.055:12.92*e,n=n>.0031308?1.055*Math.pow(n,1/2.4)-.055:12.92*n,i=i>.0031308?1.055*Math.pow(i,1/2.4)-.055:12.92*i,[255*(e=Math.min(Math.max(0,e),1)),255*(n=Math.min(Math.max(0,n),1)),255*(i=Math.min(Math.max(0,i),1))]},a.xyz.lab=function(t){var e=t[0],n=t[1],i=t[2];return n/=100,i/=108.883,e=(e/=95.047)>.008856?Math.pow(e,1/3):7.787*e+16/116,[116*(n=n>.008856?Math.pow(n,1/3):7.787*n+16/116)-16,500*(e-n),200*(n-(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116))]},a.lab.xyz=function(t){var e,n,i,a=t[0];e=t[1]/500+(n=(a+16)/116),i=n-t[2]/200;var r=Math.pow(n,3),o=Math.pow(e,3),s=Math.pow(i,3);return n=r>.008856?r:(n-16/116)/7.787,e=o>.008856?o:(e-16/116)/7.787,i=s>.008856?s:(i-16/116)/7.787,[e*=95.047,n*=100,i*=108.883]},a.lab.lch=function(t){var e,n=t[0],i=t[1],a=t[2];return(e=360*Math.atan2(a,i)/2/Math.PI)<0&&(e+=360),[n,Math.sqrt(i*i+a*a),e]},a.lch.lab=function(t){var e,n=t[0],i=t[1];return e=t[2]/360*2*Math.PI,[n,i*Math.cos(e),i*Math.sin(e)]},a.rgb.ansi16=function(t){var e=t[0],n=t[1],i=t[2],r=1 in arguments?arguments[1]:a.rgb.hsv(t)[2];if(0===(r=Math.round(r/50)))return 30;var o=30+(Math.round(i/255)<<2|Math.round(n/255)<<1|Math.round(e/255));return 2===r&&(o+=60),o},a.hsv.ansi16=function(t){return a.rgb.ansi16(a.hsv.rgb(t),t[2])},a.rgb.ansi256=function(t){var e=t[0],n=t[1],i=t[2];return e===n&&n===i?e<8?16:e>248?231:Math.round((e-8)/247*24)+232:16+36*Math.round(e/255*5)+6*Math.round(n/255*5)+Math.round(i/255*5)},a.ansi16.rgb=function(t){var e=t%10;if(0===e||7===e)return t>50&&(e+=3.5),[e=e/10.5*255,e,e];var n=.5*(1+~~(t>50));return[(1&e)*n*255,(e>>1&1)*n*255,(e>>2&1)*n*255]},a.ansi256.rgb=function(t){if(t>=232){var e=10*(t-232)+8;return[e,e,e]}var n;return t-=16,[Math.floor(t/36)/5*255,Math.floor((n=t%36)/6)/5*255,n%6/5*255]},a.rgb.hex=function(t){var e=(((255&Math.round(t[0]))<<16)+((255&Math.round(t[1]))<<8)+(255&Math.round(t[2]))).toString(16).toUpperCase();return"000000".substring(e.length)+e},a.hex.rgb=function(t){var e=t.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!e)return[0,0,0];var n=e[0];3===e[0].length&&(n=n.split("").map((function(t){return t+t})).join(""));var i=parseInt(n,16);return[i>>16&255,i>>8&255,255&i]},a.rgb.hcg=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255,r=Math.max(Math.max(n,i),a),o=Math.min(Math.min(n,i),a),s=r-o;return e=s<=0?0:r===n?(i-a)/s%6:r===i?2+(a-n)/s:4+(n-i)/s+4,e/=6,[360*(e%=1),100*s,100*(s<1?o/(1-s):0)]},a.hsl.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=1,a=0;return(i=n<.5?2*e*n:2*e*(1-n))<1&&(a=(n-.5*i)/(1-i)),[t[0],100*i,100*a]},a.hsv.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=e*n,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.hcg.rgb=function(t){var e=t[0]/360,n=t[1]/100,i=t[2]/100;if(0===n)return[255*i,255*i,255*i];var a,r=[0,0,0],o=e%1*6,s=o%1,l=1-s;switch(Math.floor(o)){case 0:r[0]=1,r[1]=s,r[2]=0;break;case 1:r[0]=l,r[1]=1,r[2]=0;break;case 2:r[0]=0,r[1]=1,r[2]=s;break;case 3:r[0]=0,r[1]=l,r[2]=1;break;case 4:r[0]=s,r[1]=0,r[2]=1;break;default:r[0]=1,r[1]=0,r[2]=l}return a=(1-n)*i,[255*(n*r[0]+a),255*(n*r[1]+a),255*(n*r[2]+a)]},a.hcg.hsv=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e),i=0;return n>0&&(i=e/n),[t[0],100*i,100*n]},a.hcg.hsl=function(t){var e=t[1]/100,n=t[2]/100*(1-e)+.5*e,i=0;return n>0&&n<.5?i=e/(2*n):n>=.5&&n<1&&(i=e/(2*(1-n))),[t[0],100*i,100*n]},a.hcg.hwb=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e);return[t[0],100*(n-e),100*(1-n)]},a.hwb.hcg=function(t){var e=t[1]/100,n=1-t[2]/100,i=n-e,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.apple.rgb=function(t){return[t[0]/65535*255,t[1]/65535*255,t[2]/65535*255]},a.rgb.apple=function(t){return[t[0]/255*65535,t[1]/255*65535,t[2]/255*65535]},a.gray.rgb=function(t){return[t[0]/100*255,t[0]/100*255,t[0]/100*255]},a.gray.hsl=a.gray.hsv=function(t){return[0,0,t[0]]},a.gray.hwb=function(t){return[0,100,t[0]]},a.gray.cmyk=function(t){return[0,0,0,t[0]]},a.gray.lab=function(t){return[t[0],0,0]},a.gray.hex=function(t){var e=255&Math.round(t[0]/100*255),n=((e<<16)+(e<<8)+e).toString(16).toUpperCase();return"000000".substring(n.length)+n},a.rgb.gray=function(t){return[(t[0]+t[1]+t[2])/3/255*100]}}));n.rgb,n.hsl,n.hsv,n.hwb,n.cmyk,n.xyz,n.lab,n.lch,n.hex,n.keyword,n.ansi16,n.ansi256,n.hcg,n.apple,n.gray;function i(t){var e=function(){for(var t={},e=Object.keys(n),i=e.length,a=0;a<i;a++)t[e[a]]={distance:-1,parent:null};return t}(),i=[t];for(e[t].distance=0;i.length;)for(var a=i.pop(),r=Object.keys(n[a]),o=r.length,s=0;s<o;s++){var l=r[s],u=e[l];-1===u.distance&&(u.distance=e[a].distance+1,u.parent=a,i.unshift(l))}return e}function a(t,e){return function(n){return e(t(n))}}function r(t,e){for(var i=[e[t].parent,t],r=n[e[t].parent][t],o=e[t].parent;e[o].parent;)i.unshift(e[o].parent),r=a(n[e[o].parent][o],r),o=e[o].parent;return r.conversion=i,r}var o={};Object.keys(n).forEach((function(t){o[t]={},Object.defineProperty(o[t],"channels",{value:n[t].channels}),Object.defineProperty(o[t],"labels",{value:n[t].labels});var e=function(t){for(var e=i(t),n={},a=Object.keys(e),o=a.length,s=0;s<o;s++){var l=a[s];null!==e[l].parent&&(n[l]=r(l,e))}return n}(t);Object.keys(e).forEach((function(n){var i=e[n];o[t][n]=function(t){var e=function(e){if(null==e)return e;arguments.length>1&&(e=Array.prototype.slice.call(arguments));var n=t(e);if("object"==typeof n)for(var i=n.length,a=0;a<i;a++)n[a]=Math.round(n[a]);return n};return"conversion"in t&&(e.conversion=t.conversion),e}(i),o[t][n].raw=function(t){var e=function(e){return null==e?e:(arguments.length>1&&(e=Array.prototype.slice.call(arguments)),t(e))};return"conversion"in t&&(e.conversion=t.conversion),e}(i)}))}));var s=o,l={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},u={getRgba:d,getHsla:h,getRgb:function(t){var e=d(t);return e&&e.slice(0,3)},getHsl:function(t){var e=h(t);return e&&e.slice(0,3)},getHwb:c,getAlpha:function(t){var e=d(t);if(e)return e[3];if(e=h(t))return e[3];if(e=c(t))return e[3]},hexString:function(t,e){e=void 0!==e&&3===t.length?e:t[3];return"#"+v(t[0])+v(t[1])+v(t[2])+(e>=0&&e<1?v(Math.round(255*e)):"")},rgbString:function(t,e){if(e<1||t[3]&&t[3]<1)return f(t,e);return"rgb("+t[0]+", "+t[1]+", "+t[2]+")"},rgbaString:f,percentString:function(t,e){if(e<1||t[3]&&t[3]<1)return g(t,e);var n=Math.round(t[0]/255*100),i=Math.round(t[1]/255*100),a=Math.round(t[2]/255*100);return"rgb("+n+"%, "+i+"%, "+a+"%)"},percentaString:g,hslString:function(t,e){if(e<1||t[3]&&t[3]<1)return p(t,e);return"hsl("+t[0]+", "+t[1]+"%, "+t[2]+"%)"},hslaString:p,hwbString:function(t,e){void 0===e&&(e=void 0!==t[3]?t[3]:1);return"hwb("+t[0]+", "+t[1]+"%, "+t[2]+"%"+(void 0!==e&&1!==e?", "+e:"")+")"},keyword:function(t){return b[t.slice(0,3)]}};function d(t){if(t){var e=[0,0,0],n=1,i=t.match(/^#([a-fA-F0-9]{3,4})$/i),a="";if(i){a=(i=i[1])[3];for(var r=0;r<e.length;r++)e[r]=parseInt(i[r]+i[r],16);a&&(n=Math.round(parseInt(a+a,16)/255*100)/100)}else if(i=t.match(/^#([a-fA-F0-9]{6}([a-fA-F0-9]{2})?)$/i)){a=i[2],i=i[1];for(r=0;r<e.length;r++)e[r]=parseInt(i.slice(2*r,2*r+2),16);a&&(n=Math.round(parseInt(a,16)/255*100)/100)}else if(i=t.match(/^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=parseInt(i[r+1]);n=parseFloat(i[4])}else if(i=t.match(/^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=Math.round(2.55*parseFloat(i[r+1]));n=parseFloat(i[4])}else if(i=t.match(/(\w+)/)){if("transparent"==i[1])return[0,0,0,0];if(!(e=l[i[1]]))return}for(r=0;r<e.length;r++)e[r]=m(e[r],0,255);return n=n||0==n?m(n,0,1):1,e[3]=n,e}}function h(t){if(t){var e=t.match(/^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[m(parseInt(e[1]),0,360),m(parseFloat(e[2]),0,100),m(parseFloat(e[3]),0,100),m(isNaN(n)?1:n,0,1)]}}}function c(t){if(t){var e=t.match(/^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[m(parseInt(e[1]),0,360),m(parseFloat(e[2]),0,100),m(parseFloat(e[3]),0,100),m(isNaN(n)?1:n,0,1)]}}}function f(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"rgba("+t[0]+", "+t[1]+", "+t[2]+", "+e+")"}function g(t,e){return"rgba("+Math.round(t[0]/255*100)+"%, "+Math.round(t[1]/255*100)+"%, "+Math.round(t[2]/255*100)+"%, "+(e||t[3]||1)+")"}function p(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hsla("+t[0]+", "+t[1]+"%, "+t[2]+"%, "+e+")"}function m(t,e,n){return Math.min(Math.max(e,t),n)}function v(t){var e=t.toString(16).toUpperCase();return e.length<2?"0"+e:e}var b={};for(var x in l)b[l[x]]=x;var y=function(t){return t instanceof y?t:this instanceof y?(this.valid=!1,this.values={rgb:[0,0,0],hsl:[0,0,0],hsv:[0,0,0],hwb:[0,0,0],cmyk:[0,0,0,0],alpha:1},void("string"==typeof t?(e=u.getRgba(t))?this.setValues("rgb",e):(e=u.getHsla(t))?this.setValues("hsl",e):(e=u.getHwb(t))&&this.setValues("hwb",e):"object"==typeof t&&(void 0!==(e=t).r||void 0!==e.red?this.setValues("rgb",e):void 0!==e.l||void 0!==e.lightness?this.setValues("hsl",e):void 0!==e.v||void 0!==e.value?this.setValues("hsv",e):void 0!==e.w||void 0!==e.whiteness?this.setValues("hwb",e):void 0===e.c&&void 0===e.cyan||this.setValues("cmyk",e)))):new y(t);var e};y.prototype={isValid:function(){return this.valid},rgb:function(){return this.setSpace("rgb",arguments)},hsl:function(){return this.setSpace("hsl",arguments)},hsv:function(){return this.setSpace("hsv",arguments)},hwb:function(){return this.setSpace("hwb",arguments)},cmyk:function(){return this.setSpace("cmyk",arguments)},rgbArray:function(){return this.values.rgb},hslArray:function(){return this.values.hsl},hsvArray:function(){return this.values.hsv},hwbArray:function(){var t=this.values;return 1!==t.alpha?t.hwb.concat([t.alpha]):t.hwb},cmykArray:function(){return this.values.cmyk},rgbaArray:function(){var t=this.values;return t.rgb.concat([t.alpha])},hslaArray:function(){var t=this.values;return t.hsl.concat([t.alpha])},alpha:function(t){return void 0===t?this.values.alpha:(this.setValues("alpha",t),this)},red:function(t){return this.setChannel("rgb",0,t)},green:function(t){return this.setChannel("rgb",1,t)},blue:function(t){return this.setChannel("rgb",2,t)},hue:function(t){return t&&(t=(t%=360)<0?360+t:t),this.setChannel("hsl",0,t)},saturation:function(t){return this.setChannel("hsl",1,t)},lightness:function(t){return this.setChannel("hsl",2,t)},saturationv:function(t){return this.setChannel("hsv",1,t)},whiteness:function(t){return this.setChannel("hwb",1,t)},blackness:function(t){return this.setChannel("hwb",2,t)},value:function(t){return this.setChannel("hsv",2,t)},cyan:function(t){return this.setChannel("cmyk",0,t)},magenta:function(t){return this.setChannel("cmyk",1,t)},yellow:function(t){return this.setChannel("cmyk",2,t)},black:function(t){return this.setChannel("cmyk",3,t)},hexString:function(){return u.hexString(this.values.rgb)},rgbString:function(){return u.rgbString(this.values.rgb,this.values.alpha)},rgbaString:function(){return u.rgbaString(this.values.rgb,this.values.alpha)},percentString:function(){return u.percentString(this.values.rgb,this.values.alpha)},hslString:function(){return u.hslString(this.values.hsl,this.values.alpha)},hslaString:function(){return u.hslaString(this.values.hsl,this.values.alpha)},hwbString:function(){return u.hwbString(this.values.hwb,this.values.alpha)},keyword:function(){return u.keyword(this.values.rgb,this.values.alpha)},rgbNumber:function(){var t=this.values.rgb;return t[0]<<16|t[1]<<8|t[2]},luminosity:function(){for(var t=this.values.rgb,e=[],n=0;n<t.length;n++){var i=t[n]/255;e[n]=i<=.03928?i/12.92:Math.pow((i+.055)/1.055,2.4)}return.2126*e[0]+.7152*e[1]+.0722*e[2]},contrast:function(t){var e=this.luminosity(),n=t.luminosity();return e>n?(e+.05)/(n+.05):(n+.05)/(e+.05)},level:function(t){var e=this.contrast(t);return e>=7.1?"AAA":e>=4.5?"AA":""},dark:function(){var t=this.values.rgb;return(299*t[0]+587*t[1]+114*t[2])/1e3<128},light:function(){return!this.dark()},negate:function(){for(var t=[],e=0;e<3;e++)t[e]=255-this.values.rgb[e];return this.setValues("rgb",t),this},lighten:function(t){var e=this.values.hsl;return e[2]+=e[2]*t,this.setValues("hsl",e),this},darken:function(t){var e=this.values.hsl;return e[2]-=e[2]*t,this.setValues("hsl",e),this},saturate:function(t){var e=this.values.hsl;return e[1]+=e[1]*t,this.setValues("hsl",e),this},desaturate:function(t){var e=this.values.hsl;return e[1]-=e[1]*t,this.setValues("hsl",e),this},whiten:function(t){var e=this.values.hwb;return e[1]+=e[1]*t,this.setValues("hwb",e),this},blacken:function(t){var e=this.values.hwb;return e[2]+=e[2]*t,this.setValues("hwb",e),this},greyscale:function(){var t=this.values.rgb,e=.3*t[0]+.59*t[1]+.11*t[2];return this.setValues("rgb",[e,e,e]),this},clearer:function(t){var e=this.values.alpha;return this.setValues("alpha",e-e*t),this},opaquer:function(t){var e=this.values.alpha;return this.setValues("alpha",e+e*t),this},rotate:function(t){var e=this.values.hsl,n=(e[0]+t)%360;return e[0]=n<0?360+n:n,this.setValues("hsl",e),this},mix:function(t,e){var n=t,i=void 0===e?.5:e,a=2*i-1,r=this.alpha()-n.alpha(),o=((a*r==-1?a:(a+r)/(1+a*r))+1)/2,s=1-o;return this.rgb(o*this.red()+s*n.red(),o*this.green()+s*n.green(),o*this.blue()+s*n.blue()).alpha(this.alpha()*i+n.alpha()*(1-i))},toJSON:function(){return this.rgb()},clone:function(){var t,e,n=new y,i=this.values,a=n.values;for(var r in i)i.hasOwnProperty(r)&&(t=i[r],"[object Array]"===(e={}.toString.call(t))?a[r]=t.slice(0):"[object Number]"===e?a[r]=t:console.error("unexpected color value:",t));return n}},y.prototype.spaces={rgb:["red","green","blue"],hsl:["hue","saturation","lightness"],hsv:["hue","saturation","value"],hwb:["hue","whiteness","blackness"],cmyk:["cyan","magenta","yellow","black"]},y.prototype.maxes={rgb:[255,255,255],hsl:[360,100,100],hsv:[360,100,100],hwb:[360,100,100],cmyk:[100,100,100,100]},y.prototype.getValues=function(t){for(var e=this.values,n={},i=0;i<t.length;i++)n[t.charAt(i)]=e[t][i];return 1!==e.alpha&&(n.a=e.alpha),n},y.prototype.setValues=function(t,e){var n,i,a=this.values,r=this.spaces,o=this.maxes,l=1;if(this.valid=!0,"alpha"===t)l=e;else if(e.length)a[t]=e.slice(0,t.length),l=e[t.length];else if(void 0!==e[t.charAt(0)]){for(n=0;n<t.length;n++)a[t][n]=e[t.charAt(n)];l=e.a}else if(void 0!==e[r[t][0]]){var u=r[t];for(n=0;n<t.length;n++)a[t][n]=e[u[n]];l=e.alpha}if(a.alpha=Math.max(0,Math.min(1,void 0===l?a.alpha:l)),"alpha"===t)return!1;for(n=0;n<t.length;n++)i=Math.max(0,Math.min(o[t][n],a[t][n])),a[t][n]=Math.round(i);for(var d in r)d!==t&&(a[d]=s[t][d](a[t]));return!0},y.prototype.setSpace=function(t,e){var n=e[0];return void 0===n?this.getValues(t):("number"==typeof n&&(n=Array.prototype.slice.call(e)),this.setValues(t,n),this)},y.prototype.setChannel=function(t,e,n){var i=this.values[t];return void 0===n?i[e]:n===i[e]?this:(i[e]=n,this.setValues(t,i),this)},"undefined"!=typeof window&&(window.Color=y);var _,k=y,w={noop:function(){},uid:(_=0,function(){return _++}),isNullOrUndef:function(t){return null==t},isArray:function(t){if(Array.isArray&&Array.isArray(t))return!0;var e=Object.prototype.toString.call(t);return"[object"===e.substr(0,7)&&"Array]"===e.substr(-6)},isObject:function(t){return null!==t&&"[object Object]"===Object.prototype.toString.call(t)},isFinite:function(t){return("number"==typeof t||t instanceof Number)&&isFinite(t)},valueOrDefault:function(t,e){return void 0===t?e:t},valueAtIndexOrDefault:function(t,e,n){return w.valueOrDefault(w.isArray(t)?t[e]:t,n)},callback:function(t,e,n){if(t&&"function"==typeof t.call)return t.apply(n,e)},each:function(t,e,n,i){var a,r,o;if(w.isArray(t))if(r=t.length,i)for(a=r-1;a>=0;a--)e.call(n,t[a],a);else for(a=0;a<r;a++)e.call(n,t[a],a);else if(w.isObject(t))for(r=(o=Object.keys(t)).length,a=0;a<r;a++)e.call(n,t[o[a]],o[a])},arrayEquals:function(t,e){var n,i,a,r;if(!t||!e||t.length!==e.length)return!1;for(n=0,i=t.length;n<i;++n)if(a=t[n],r=e[n],a instanceof Array&&r instanceof Array){if(!w.arrayEquals(a,r))return!1}else if(a!==r)return!1;return!0},clone:function(t){if(w.isArray(t))return t.map(w.clone);if(w.isObject(t)){for(var e={},n=Object.keys(t),i=n.length,a=0;a<i;++a)e[n[a]]=w.clone(t[n[a]]);return e}return t},_merger:function(t,e,n,i){var a=e[t],r=n[t];w.isObject(a)&&w.isObject(r)?w.merge(a,r,i):e[t]=w.clone(r)},_mergerIf:function(t,e,n){var i=e[t],a=n[t];w.isObject(i)&&w.isObject(a)?w.mergeIf(i,a):e.hasOwnProperty(t)||(e[t]=w.clone(a))},merge:function(t,e,n){var i,a,r,o,s,l=w.isArray(e)?e:[e],u=l.length;if(!w.isObject(t))return t;for(i=(n=n||{}).merger||w._merger,a=0;a<u;++a)if(e=l[a],w.isObject(e))for(s=0,o=(r=Object.keys(e)).length;s<o;++s)i(r[s],t,e,n);return t},mergeIf:function(t,e){return w.merge(t,e,{merger:w._mergerIf})},extend:Object.assign||function(t){return w.merge(t,[].slice.call(arguments,1),{merger:function(t,e,n){e[t]=n[t]}})},inherits:function(t){var e=this,n=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},i=function(){this.constructor=n};return i.prototype=e.prototype,n.prototype=new i,n.extend=w.inherits,t&&w.extend(n.prototype,t),n.__super__=e.prototype,n},_deprecated:function(t,e,n,i){void 0!==e&&console.warn(t+': "'+n+'" is deprecated. Please use "'+i+'" instead')}},M=w;w.callCallback=w.callback,w.indexOf=function(t,e,n){return Array.prototype.indexOf.call(t,e,n)},w.getValueOrDefault=w.valueOrDefault,w.getValueAtIndexOrDefault=w.valueAtIndexOrDefault;var S={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return(t-=1)*t*t+1},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-((t-=1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return t*t*t*t*t},easeOutQuint:function(t){return(t-=1)*t*t*t*t+1},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return 1-Math.cos(t*(Math.PI/2))},easeOutSine:function(t){return Math.sin(t*(Math.PI/2))},easeInOutSine:function(t){return-.5*(Math.cos(Math.PI*t)-1)},easeInExpo:function(t){return 0===t?0:Math.pow(2,10*(t-1))},easeOutExpo:function(t){return 1===t?1:1-Math.pow(2,-10*t)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(2-Math.pow(2,-10*--t))},easeInCirc:function(t){return t>=1?t:-(Math.sqrt(1-t*t)-1)},easeOutCirc:function(t){return Math.sqrt(1-(t-=1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),-i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n))},easeOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),i*Math.pow(2,-10*t)*Math.sin((t-e)*(2*Math.PI)/n)+1)},easeInOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:2==(t/=.5)?1:(n||(n=.45),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),t<1?i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*-.5:i*Math.pow(2,-10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*.5+1)},easeInBack:function(t){var e=1.70158;return t*t*((e+1)*t-e)},easeOutBack:function(t){var e=1.70158;return(t-=1)*t*((e+1)*t+e)+1},easeInOutBack:function(t){var e=1.70158;return(t/=.5)<1?t*t*((1+(e*=1.525))*t-e)*.5:.5*((t-=2)*t*((1+(e*=1.525))*t+e)+2)},easeInBounce:function(t){return 1-S.easeOutBounce(1-t)},easeOutBounce:function(t){return t<1/2.75?7.5625*t*t:t<2/2.75?7.5625*(t-=1.5/2.75)*t+.75:t<2.5/2.75?7.5625*(t-=2.25/2.75)*t+.9375:7.5625*(t-=2.625/2.75)*t+.984375},easeInOutBounce:function(t){return t<.5?.5*S.easeInBounce(2*t):.5*S.easeOutBounce(2*t-1)+.5}},C={effects:S};M.easingEffects=S;var P=Math.PI,A=P/180,D=2*P,T=P/2,I=P/4,F=2*P/3,L={clear:function(t){t.ctx.clearRect(0,0,t.width,t.height)},roundedRect:function(t,e,n,i,a,r){if(r){var o=Math.min(r,a/2,i/2),s=e+o,l=n+o,u=e+i-o,d=n+a-o;t.moveTo(e,l),s<u&&l<d?(t.arc(s,l,o,-P,-T),t.arc(u,l,o,-T,0),t.arc(u,d,o,0,T),t.arc(s,d,o,T,P)):s<u?(t.moveTo(s,n),t.arc(u,l,o,-T,T),t.arc(s,l,o,T,P+T)):l<d?(t.arc(s,l,o,-P,0),t.arc(s,d,o,0,P)):t.arc(s,l,o,-P,P),t.closePath(),t.moveTo(e,n)}else t.rect(e,n,i,a)},drawPoint:function(t,e,n,i,a,r){var o,s,l,u,d,h=(r||0)*A;if(e&&"object"==typeof e&&("[object HTMLImageElement]"===(o=e.toString())||"[object HTMLCanvasElement]"===o))return t.save(),t.translate(i,a),t.rotate(h),t.drawImage(e,-e.width/2,-e.height/2,e.width,e.height),void t.restore();if(!(isNaN(n)||n<=0)){switch(t.beginPath(),e){default:t.arc(i,a,n,0,D),t.closePath();break;case"triangle":t.moveTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=F,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=F,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),t.closePath();break;case"rectRounded":u=n-(d=.516*n),s=Math.cos(h+I)*u,l=Math.sin(h+I)*u,t.arc(i-s,a-l,d,h-P,h-T),t.arc(i+l,a-s,d,h-T,h),t.arc(i+s,a+l,d,h,h+T),t.arc(i-l,a+s,d,h+T,h+P),t.closePath();break;case"rect":if(!r){u=Math.SQRT1_2*n,t.rect(i-u,a-u,2*u,2*u);break}h+=I;case"rectRot":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+l,a-s),t.lineTo(i+s,a+l),t.lineTo(i-l,a+s),t.closePath();break;case"crossRot":h+=I;case"cross":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"star":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s),h+=I,s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"line":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l);break;case"dash":t.moveTo(i,a),t.lineTo(i+Math.cos(h)*n,a+Math.sin(h)*n)}t.fill(),t.stroke()}},_isPointInArea:function(t,e){return t.x>e.left-1e-6&&t.x<e.right+1e-6&&t.y>e.top-1e-6&&t.y<e.bottom+1e-6},clipArea:function(t,e){t.save(),t.beginPath(),t.rect(e.left,e.top,e.right-e.left,e.bottom-e.top),t.clip()},unclipArea:function(t){t.restore()},lineTo:function(t,e,n,i){var a=n.steppedLine;if(a){if("middle"===a){var r=(e.x+n.x)/2;t.lineTo(r,i?n.y:e.y),t.lineTo(r,i?e.y:n.y)}else"after"===a&&!i||"after"!==a&&i?t.lineTo(e.x,n.y):t.lineTo(n.x,e.y);t.lineTo(n.x,n.y)}else n.tension?t.bezierCurveTo(i?e.controlPointPreviousX:e.controlPointNextX,i?e.controlPointPreviousY:e.controlPointNextY,i?n.controlPointNextX:n.controlPointPreviousX,i?n.controlPointNextY:n.controlPointPreviousY,n.x,n.y):t.lineTo(n.x,n.y)}},O=L;M.clear=L.clear,M.drawRoundedRectangle=function(t){t.beginPath(),L.roundedRect.apply(L,arguments)};var R={_set:function(t,e){return M.merge(this[t]||(this[t]={}),e)}};R._set("global",{defaultColor:"rgba(0,0,0,0.1)",defaultFontColor:"#666",defaultFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",defaultFontSize:12,defaultFontStyle:"normal",defaultLineHeight:1.2,showLines:!0});var z=R,N=M.valueOrDefault;var B={toLineHeight:function(t,e){var n=(""+t).match(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/);if(!n||"normal"===n[1])return 1.2*e;switch(t=+n[2],n[3]){case"px":return t;case"%":t/=100}return e*t},toPadding:function(t){var e,n,i,a;return M.isObject(t)?(e=+t.top||0,n=+t.right||0,i=+t.bottom||0,a=+t.left||0):e=n=i=a=+t||0,{top:e,right:n,bottom:i,left:a,height:e+i,width:a+n}},_parseFont:function(t){var e=z.global,n=N(t.fontSize,e.defaultFontSize),i={family:N(t.fontFamily,e.defaultFontFamily),lineHeight:M.options.toLineHeight(N(t.lineHeight,e.defaultLineHeight),n),size:n,style:N(t.fontStyle,e.defaultFontStyle),weight:null,string:""};return i.string=function(t){return!t||M.isNullOrUndef(t.size)||M.isNullOrUndef(t.family)?null:(t.style?t.style+" ":"")+(t.weight?t.weight+" ":"")+t.size+"px "+t.family}(i),i},resolve:function(t,e,n,i){var a,r,o,s=!0;for(a=0,r=t.length;a<r;++a)if(void 0!==(o=t[a])&&(void 0!==e&&"function"==typeof o&&(o=o(e),s=!1),void 0!==n&&M.isArray(o)&&(o=o[n],s=!1),void 0!==o))return i&&!s&&(i.cacheable=!1),o}},E={_factorize:function(t){var e,n=[],i=Math.sqrt(t);for(e=1;e<i;e++)t%e==0&&(n.push(e),n.push(t/e));return i===(0|i)&&n.push(i),n.sort((function(t,e){return t-e})).pop(),n},log10:Math.log10||function(t){var e=Math.log(t)*Math.LOG10E,n=Math.round(e);return t===Math.pow(10,n)?n:e}},W=E;M.log10=E.log10;var V=M,H=C,j=O,q=B,U=W,Y={getRtlAdapter:function(t,e,n){return t?function(t,e){return{x:function(n){return t+t+e-n},setWidth:function(t){e=t},textAlign:function(t){return"center"===t?t:"right"===t?"left":"right"},xPlus:function(t,e){return t-e},leftForLtr:function(t,e){return t-e}}}(e,n):{x:function(t){return t},setWidth:function(t){},textAlign:function(t){return t},xPlus:function(t,e){return t+e},leftForLtr:function(t,e){return t}}},overrideTextDirection:function(t,e){var n,i;"ltr"!==e&&"rtl"!==e||(i=[(n=t.canvas.style).getPropertyValue("direction"),n.getPropertyPriority("direction")],n.setProperty("direction",e,"important"),t.prevTextDirection=i)},restoreTextDirection:function(t){var e=t.prevTextDirection;void 0!==e&&(delete t.prevTextDirection,t.canvas.style.setProperty("direction",e[0],e[1]))}};V.easing=H,V.canvas=j,V.options=q,V.math=U,V.rtl=Y;var G=function(t){V.extend(this,t),this.initialize.apply(this,arguments)};V.extend(G.prototype,{_type:void 0,initialize:function(){this.hidden=!1},pivot:function(){var t=this;return t._view||(t._view=V.extend({},t._model)),t._start={},t},transition:function(t){var e=this,n=e._model,i=e._start,a=e._view;return n&&1!==t?(a||(a=e._view={}),i||(i=e._start={}),function(t,e,n,i){var a,r,o,s,l,u,d,h,c,f=Object.keys(n);for(a=0,r=f.length;a<r;++a)if(u=n[o=f[a]],e.hasOwnProperty(o)||(e[o]=u),(s=e[o])!==u&&"_"!==o[0]){if(t.hasOwnProperty(o)||(t[o]=s),(d=typeof u)===typeof(l=t[o]))if("string"===d){if((h=k(l)).valid&&(c=k(u)).valid){e[o]=c.mix(h,i).rgbString();continue}}else if(V.isFinite(l)&&V.isFinite(u)){e[o]=l+(u-l)*i;continue}e[o]=u}}(i,a,n,t),e):(e._view=V.extend({},n),e._start=null,e)},tooltipPosition:function(){return{x:this._model.x,y:this._model.y}},hasValue:function(){return V.isNumber(this._model.x)&&V.isNumber(this._model.y)}}),G.extend=V.inherits;var X=G,K=X.extend({chart:null,currentStep:0,numSteps:60,easing:"",render:null,onAnimationProgress:null,onAnimationComplete:null}),Z=K;Object.defineProperty(K.prototype,"animationObject",{get:function(){return this}}),Object.defineProperty(K.prototype,"chartInstance",{get:function(){return this.chart},set:function(t){this.chart=t}}),z._set("global",{animation:{duration:1e3,easing:"easeOutQuart",onProgress:V.noop,onComplete:V.noop}});var $={animations:[],request:null,addAnimation:function(t,e,n,i){var a,r,o=this.animations;for(e.chart=t,e.startTime=Date.now(),e.duration=n,i||(t.animating=!0),a=0,r=o.length;a<r;++a)if(o[a].chart===t)return void(o[a]=e);o.push(e),1===o.length&&this.requestAnimationFrame()},cancelAnimation:function(t){var e=V.findIndex(this.animations,(function(e){return e.chart===t}));-1!==e&&(this.animations.splice(e,1),t.animating=!1)},requestAnimationFrame:function(){var t=this;null===t.request&&(t.request=V.requestAnimFrame.call(window,(function(){t.request=null,t.startDigest()})))},startDigest:function(){this.advance(),this.animations.length>0&&this.requestAnimationFrame()},advance:function(){for(var t,e,n,i,a=this.animations,r=0;r<a.length;)e=(t=a[r]).chart,n=t.numSteps,i=Math.floor((Date.now()-t.startTime)/t.duration*n)+1,t.currentStep=Math.min(i,n),V.callback(t.render,[e,t],e),V.callback(t.onAnimationProgress,[t],e),t.currentStep>=n?(V.callback(t.onAnimationComplete,[t],e),e.animating=!1,a.splice(r,1)):++r}},J=V.options.resolve,Q=["push","pop","shift","splice","unshift"];function tt(t,e){var n=t._chartjs;if(n){var i=n.listeners,a=i.indexOf(e);-1!==a&&i.splice(a,1),i.length>0||(Q.forEach((function(e){delete t[e]})),delete t._chartjs)}}var et=function(t,e){this.initialize(t,e)};V.extend(et.prototype,{datasetElementType:null,dataElementType:null,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth"],_dataElementOptions:["backgroundColor","borderColor","borderWidth","pointStyle"],initialize:function(t,e){var n=this;n.chart=t,n.index=e,n.linkScales(),n.addElements(),n._type=n.getMeta().type},updateIndex:function(t){this.index=t},linkScales:function(){var t=this.getMeta(),e=this.chart,n=e.scales,i=this.getDataset(),a=e.options.scales;null!==t.xAxisID&&t.xAxisID in n&&!i.xAxisID||(t.xAxisID=i.xAxisID||a.xAxes[0].id),null!==t.yAxisID&&t.yAxisID in n&&!i.yAxisID||(t.yAxisID=i.yAxisID||a.yAxes[0].id)},getDataset:function(){return this.chart.data.datasets[this.index]},getMeta:function(){return this.chart.getDatasetMeta(this.index)},getScaleForId:function(t){return this.chart.scales[t]},_getValueScaleId:function(){return this.getMeta().yAxisID},_getIndexScaleId:function(){return this.getMeta().xAxisID},_getValueScale:function(){return this.getScaleForId(this._getValueScaleId())},_getIndexScale:function(){return this.getScaleForId(this._getIndexScaleId())},reset:function(){this._update(!0)},destroy:function(){this._data&&tt(this._data,this)},createMetaDataset:function(){var t=this.datasetElementType;return t&&new t({_chart:this.chart,_datasetIndex:this.index})},createMetaData:function(t){var e=this.dataElementType;return e&&new e({_chart:this.chart,_datasetIndex:this.index,_index:t})},addElements:function(){var t,e,n=this.getMeta(),i=this.getDataset().data||[],a=n.data;for(t=0,e=i.length;t<e;++t)a[t]=a[t]||this.createMetaData(t);n.dataset=n.dataset||this.createMetaDataset()},addElementAndReset:function(t){var e=this.createMetaData(t);this.getMeta().data.splice(t,0,e),this.updateElement(e,t,!0)},buildOrUpdateElements:function(){var t,e,n=this,i=n.getDataset(),a=i.data||(i.data=[]);n._data!==a&&(n._data&&tt(n._data,n),a&&Object.isExtensible(a)&&(e=n,(t=a)._chartjs?t._chartjs.listeners.push(e):(Object.defineProperty(t,"_chartjs",{configurable:!0,enumerable:!1,value:{listeners:[e]}}),Q.forEach((function(e){var n="onData"+e.charAt(0).toUpperCase()+e.slice(1),i=t[e];Object.defineProperty(t,e,{configurable:!0,enumerable:!1,value:function(){var e=Array.prototype.slice.call(arguments),a=i.apply(this,e);return V.each(t._chartjs.listeners,(function(t){"function"==typeof t[n]&&t[n].apply(t,e)})),a}})})))),n._data=a),n.resyncElements()},_configure:function(){this._config=V.merge({},[this.chart.options.datasets[this._type],this.getDataset()],{merger:function(t,e,n){"_meta"!==t&&"data"!==t&&V._merger(t,e,n)}})},_update:function(t){this._configure(),this._cachedDataOpts=null,this.update(t)},update:V.noop,transition:function(t){for(var e=this.getMeta(),n=e.data||[],i=n.length,a=0;a<i;++a)n[a].transition(t);e.dataset&&e.dataset.transition(t)},draw:function(){var t=this.getMeta(),e=t.data||[],n=e.length,i=0;for(t.dataset&&t.dataset.draw();i<n;++i)e[i].draw()},getStyle:function(t){var e,n=this.getMeta(),i=n.dataset;return this._configure(),i&&void 0===t?e=this._resolveDatasetElementOptions(i||{}):(t=t||0,e=this._resolveDataElementOptions(n.data[t]||{},t)),!1!==e.fill&&null!==e.fill||(e.backgroundColor=e.borderColor),e},_resolveDatasetElementOptions:function(t,e){var n,i,a,r,o=this,s=o.chart,l=o._config,u=t.custom||{},d=s.options.elements[o.datasetElementType.prototype._type]||{},h=o._datasetElementOptions,c={},f={chart:s,dataset:o.getDataset(),datasetIndex:o.index,hover:e};for(n=0,i=h.length;n<i;++n)a=h[n],r=e?"hover"+a.charAt(0).toUpperCase()+a.slice(1):a,c[a]=J([u[r],l[r],d[r]],f);return c},_resolveDataElementOptions:function(t,e){var n=this,i=t&&t.custom,a=n._cachedDataOpts;if(a&&!i)return a;var r,o,s,l,u=n.chart,d=n._config,h=u.options.elements[n.dataElementType.prototype._type]||{},c=n._dataElementOptions,f={},g={chart:u,dataIndex:e,dataset:n.getDataset(),datasetIndex:n.index},p={cacheable:!i};if(i=i||{},V.isArray(c))for(o=0,s=c.length;o<s;++o)f[l=c[o]]=J([i[l],d[l],h[l]],g,e,p);else for(o=0,s=(r=Object.keys(c)).length;o<s;++o)f[l=r[o]]=J([i[l],d[c[l]],d[l],h[l]],g,e,p);return p.cacheable&&(n._cachedDataOpts=Object.freeze(f)),f},removeHoverStyle:function(t){V.merge(t._model,t.$previousStyle||{}),delete t.$previousStyle},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],n=t._index,i=t.custom||{},a=t._model,r=V.getHoverColor;t.$previousStyle={backgroundColor:a.backgroundColor,borderColor:a.borderColor,borderWidth:a.borderWidth},a.backgroundColor=J([i.hoverBackgroundColor,e.hoverBackgroundColor,r(a.backgroundColor)],void 0,n),a.borderColor=J([i.hoverBorderColor,e.hoverBorderColor,r(a.borderColor)],void 0,n),a.borderWidth=J([i.hoverBorderWidth,e.hoverBorderWidth,a.borderWidth],void 0,n)},_removeDatasetHoverStyle:function(){var t=this.getMeta().dataset;t&&this.removeHoverStyle(t)},_setDatasetHoverStyle:function(){var t,e,n,i,a,r,o=this.getMeta().dataset,s={};if(o){for(r=o._model,a=this._resolveDatasetElementOptions(o,!0),t=0,e=(i=Object.keys(a)).length;t<e;++t)s[n=i[t]]=r[n],r[n]=a[n];o.$previousStyle=s}},resyncElements:function(){var t=this.getMeta(),e=this.getDataset().data,n=t.data.length,i=e.length;i<n?t.data.splice(i,n-i):i>n&&this.insertElements(n,i-n)},insertElements:function(t,e){for(var n=0;n<e;++n)this.addElementAndReset(t+n)},onDataPush:function(){var t=arguments.length;this.insertElements(this.getDataset().data.length-t,t)},onDataPop:function(){this.getMeta().data.pop()},onDataShift:function(){this.getMeta().data.shift()},onDataSplice:function(t,e){this.getMeta().data.splice(t,e),this.insertElements(t,arguments.length-2)},onDataUnshift:function(){this.insertElements(0,arguments.length)}}),et.extend=V.inherits;var nt=et,it=2*Math.PI;function at(t,e){var n=e.startAngle,i=e.endAngle,a=e.pixelMargin,r=a/e.outerRadius,o=e.x,s=e.y;t.beginPath(),t.arc(o,s,e.outerRadius,n-r,i+r),e.innerRadius>a?(r=a/e.innerRadius,t.arc(o,s,e.innerRadius-a,i+r,n-r,!0)):t.arc(o,s,a,i+Math.PI/2,n-Math.PI/2),t.closePath(),t.clip()}function rt(t,e,n){var i="inner"===e.borderAlign;i?(t.lineWidth=2*e.borderWidth,t.lineJoin="round"):(t.lineWidth=e.borderWidth,t.lineJoin="bevel"),n.fullCircles&&function(t,e,n,i){var a,r=n.endAngle;for(i&&(n.endAngle=n.startAngle+it,at(t,n),n.endAngle=r,n.endAngle===n.startAngle&&n.fullCircles&&(n.endAngle+=it,n.fullCircles--)),t.beginPath(),t.arc(n.x,n.y,n.innerRadius,n.startAngle+it,n.startAngle,!0),a=0;a<n.fullCircles;++a)t.stroke();for(t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.startAngle+it),a=0;a<n.fullCircles;++a)t.stroke()}(t,e,n,i),i&&at(t,n),t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.endAngle),t.arc(n.x,n.y,n.innerRadius,n.endAngle,n.startAngle,!0),t.closePath(),t.stroke()}z._set("global",{elements:{arc:{backgroundColor:z.global.defaultColor,borderColor:"#fff",borderWidth:2,borderAlign:"center"}}});var ot=X.extend({_type:"arc",inLabelRange:function(t){var e=this._view;return!!e&&Math.pow(t-e.x,2)<Math.pow(e.radius+e.hoverRadius,2)},inRange:function(t,e){var n=this._view;if(n){for(var i=V.getAngleFromPoint(n,{x:t,y:e}),a=i.angle,r=i.distance,o=n.startAngle,s=n.endAngle;s<o;)s+=it;for(;a>s;)a-=it;for(;a<o;)a+=it;var l=a>=o&&a<=s,u=r>=n.innerRadius&&r<=n.outerRadius;return l&&u}return!1},getCenterPoint:function(){var t=this._view,e=(t.startAngle+t.endAngle)/2,n=(t.innerRadius+t.outerRadius)/2;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},getArea:function(){var t=this._view;return Math.PI*((t.endAngle-t.startAngle)/(2*Math.PI))*(Math.pow(t.outerRadius,2)-Math.pow(t.innerRadius,2))},tooltipPosition:function(){var t=this._view,e=t.startAngle+(t.endAngle-t.startAngle)/2,n=(t.outerRadius-t.innerRadius)/2+t.innerRadius;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},draw:function(){var t,e=this._chart.ctx,n=this._view,i="inner"===n.borderAlign?.33:0,a={x:n.x,y:n.y,innerRadius:n.innerRadius,outerRadius:Math.max(n.outerRadius-i,0),pixelMargin:i,startAngle:n.startAngle,endAngle:n.endAngle,fullCircles:Math.floor(n.circumference/it)};if(e.save(),e.fillStyle=n.backgroundColor,e.strokeStyle=n.borderColor,a.fullCircles){for(a.endAngle=a.startAngle+it,e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),t=0;t<a.fullCircles;++t)e.fill();a.endAngle=a.startAngle+n.circumference%it}e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),e.fill(),n.borderWidth&&rt(e,n,a),e.restore()}}),st=V.valueOrDefault,lt=z.global.defaultColor;z._set("global",{elements:{line:{tension:.4,backgroundColor:lt,borderWidth:3,borderColor:lt,borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",capBezierPoints:!0,fill:!0}}});var ut=X.extend({_type:"line",draw:function(){var t,e,n,i=this,a=i._view,r=i._chart.ctx,o=a.spanGaps,s=i._children.slice(),l=z.global,u=l.elements.line,d=-1,h=i._loop;if(s.length){if(i._loop){for(t=0;t<s.length;++t)if(e=V.previousItem(s,t),!s[t]._view.skip&&e._view.skip){s=s.slice(t).concat(s.slice(0,t)),h=o;break}h&&s.push(s[0])}for(r.save(),r.lineCap=a.borderCapStyle||u.borderCapStyle,r.setLineDash&&r.setLineDash(a.borderDash||u.borderDash),r.lineDashOffset=st(a.borderDashOffset,u.borderDashOffset),r.lineJoin=a.borderJoinStyle||u.borderJoinStyle,r.lineWidth=st(a.borderWidth,u.borderWidth),r.strokeStyle=a.borderColor||l.defaultColor,r.beginPath(),(n=s[0]._view).skip||(r.moveTo(n.x,n.y),d=0),t=1;t<s.length;++t)n=s[t]._view,e=-1===d?V.previousItem(s,t):s[d],n.skip||(d!==t-1&&!o||-1===d?r.moveTo(n.x,n.y):V.canvas.lineTo(r,e._view,n),d=t);h&&r.closePath(),r.stroke(),r.restore()}}}),dt=V.valueOrDefault,ht=z.global.defaultColor;function ct(t){var e=this._view;return!!e&&Math.abs(t-e.x)<e.radius+e.hitRadius}z._set("global",{elements:{point:{radius:3,pointStyle:"circle",backgroundColor:ht,borderColor:ht,borderWidth:1,hitRadius:1,hoverRadius:4,hoverBorderWidth:1}}});var ft=X.extend({_type:"point",inRange:function(t,e){var n=this._view;return!!n&&Math.pow(t-n.x,2)+Math.pow(e-n.y,2)<Math.pow(n.hitRadius+n.radius,2)},inLabelRange:ct,inXRange:ct,inYRange:function(t){var e=this._view;return!!e&&Math.abs(t-e.y)<e.radius+e.hitRadius},getCenterPoint:function(){var t=this._view;return{x:t.x,y:t.y}},getArea:function(){return Math.PI*Math.pow(this._view.radius,2)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y,padding:t.radius+t.borderWidth}},draw:function(t){var e=this._view,n=this._chart.ctx,i=e.pointStyle,a=e.rotation,r=e.radius,o=e.x,s=e.y,l=z.global,u=l.defaultColor;e.skip||(void 0===t||V.canvas._isPointInArea(e,t))&&(n.strokeStyle=e.borderColor||u,n.lineWidth=dt(e.borderWidth,l.elements.point.borderWidth),n.fillStyle=e.backgroundColor||u,V.canvas.drawPoint(n,i,r,o,s,a))}}),gt=z.global.defaultColor;function pt(t){return t&&void 0!==t.width}function mt(t){var e,n,i,a,r;return pt(t)?(r=t.width/2,e=t.x-r,n=t.x+r,i=Math.min(t.y,t.base),a=Math.max(t.y,t.base)):(r=t.height/2,e=Math.min(t.x,t.base),n=Math.max(t.x,t.base),i=t.y-r,a=t.y+r),{left:e,top:i,right:n,bottom:a}}function vt(t,e,n){return t===e?n:t===n?e:t}function bt(t,e,n){var i,a,r,o,s=t.borderWidth,l=function(t){var e=t.borderSkipped,n={};return e?(t.horizontal?t.base>t.x&&(e=vt(e,"left","right")):t.base<t.y&&(e=vt(e,"bottom","top")),n[e]=!0,n):n}(t);return V.isObject(s)?(i=+s.top||0,a=+s.right||0,r=+s.bottom||0,o=+s.left||0):i=a=r=o=+s||0,{t:l.top||i<0?0:i>n?n:i,r:l.right||a<0?0:a>e?e:a,b:l.bottom||r<0?0:r>n?n:r,l:l.left||o<0?0:o>e?e:o}}function xt(t,e,n){var i=null===e,a=null===n,r=!(!t||i&&a)&&mt(t);return r&&(i||e>=r.left&&e<=r.right)&&(a||n>=r.top&&n<=r.bottom)}z._set("global",{elements:{rectangle:{backgroundColor:gt,borderColor:gt,borderSkipped:"bottom",borderWidth:0}}});var yt=X.extend({_type:"rectangle",draw:function(){var t=this._chart.ctx,e=this._view,n=function(t){var e=mt(t),n=e.right-e.left,i=e.bottom-e.top,a=bt(t,n/2,i/2);return{outer:{x:e.left,y:e.top,w:n,h:i},inner:{x:e.left+a.l,y:e.top+a.t,w:n-a.l-a.r,h:i-a.t-a.b}}}(e),i=n.outer,a=n.inner;t.fillStyle=e.backgroundColor,t.fillRect(i.x,i.y,i.w,i.h),i.w===a.w&&i.h===a.h||(t.save(),t.beginPath(),t.rect(i.x,i.y,i.w,i.h),t.clip(),t.fillStyle=e.borderColor,t.rect(a.x,a.y,a.w,a.h),t.fill("evenodd"),t.restore())},height:function(){var t=this._view;return t.base-t.y},inRange:function(t,e){return xt(this._view,t,e)},inLabelRange:function(t,e){var n=this._view;return pt(n)?xt(n,t,null):xt(n,null,e)},inXRange:function(t){return xt(this._view,t,null)},inYRange:function(t){return xt(this._view,null,t)},getCenterPoint:function(){var t,e,n=this._view;return pt(n)?(t=n.x,e=(n.y+n.base)/2):(t=(n.x+n.base)/2,e=n.y),{x:t,y:e}},getArea:function(){var t=this._view;return pt(t)?t.width*Math.abs(t.y-t.base):t.height*Math.abs(t.x-t.base)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y}}}),_t={},kt=ot,wt=ut,Mt=ft,St=yt;_t.Arc=kt,_t.Line=wt,_t.Point=Mt,_t.Rectangle=St;var Ct=V._deprecated,Pt=V.valueOrDefault;function At(t,e,n){var i,a,r=n.barThickness,o=e.stackCount,s=e.pixels[t],l=V.isNullOrUndef(r)?function(t,e){var n,i,a,r,o=t._length;for(a=1,r=e.length;a<r;++a)o=Math.min(o,Math.abs(e[a]-e[a-1]));for(a=0,r=t.getTicks().length;a<r;++a)i=t.getPixelForTick(a),o=a>0?Math.min(o,Math.abs(i-n)):o,n=i;return o}(e.scale,e.pixels):-1;return V.isNullOrUndef(r)?(i=l*n.categoryPercentage,a=n.barPercentage):(i=r*o,a=1),{chunk:i/o,ratio:a,start:s-i/2}}z._set("bar",{hover:{mode:"label"},scales:{xAxes:[{type:"category",offset:!0,gridLines:{offsetGridLines:!0}}],yAxes:[{type:"linear"}]}}),z._set("global",{datasets:{bar:{categoryPercentage:.8,barPercentage:.9}}});var Dt=nt.extend({dataElementType:_t.Rectangle,_dataElementOptions:["backgroundColor","borderColor","borderSkipped","borderWidth","barPercentage","barThickness","categoryPercentage","maxBarThickness","minBarLength"],initialize:function(){var t,e,n=this;nt.prototype.initialize.apply(n,arguments),(t=n.getMeta()).stack=n.getDataset().stack,t.bar=!0,e=n._getIndexScale().options,Ct("bar chart",e.barPercentage,"scales.[x/y]Axes.barPercentage","dataset.barPercentage"),Ct("bar chart",e.barThickness,"scales.[x/y]Axes.barThickness","dataset.barThickness"),Ct("bar chart",e.categoryPercentage,"scales.[x/y]Axes.categoryPercentage","dataset.categoryPercentage"),Ct("bar chart",n._getValueScale().options.minBarLength,"scales.[x/y]Axes.minBarLength","dataset.minBarLength"),Ct("bar chart",e.maxBarThickness,"scales.[x/y]Axes.maxBarThickness","dataset.maxBarThickness")},update:function(t){var e,n,i=this.getMeta().data;for(this._ruler=this.getRuler(),e=0,n=i.length;e<n;++e)this.updateElement(i[e],e,t)},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=i.getDataset(),o=i._resolveDataElementOptions(t,e);t._xScale=i.getScaleForId(a.xAxisID),t._yScale=i.getScaleForId(a.yAxisID),t._datasetIndex=i.index,t._index=e,t._model={backgroundColor:o.backgroundColor,borderColor:o.borderColor,borderSkipped:o.borderSkipped,borderWidth:o.borderWidth,datasetLabel:r.label,label:i.chart.data.labels[e]},V.isArray(r.data[e])&&(t._model.borderSkipped=null),i._updateElementGeometry(t,e,n,o),t.pivot()},_updateElementGeometry:function(t,e,n,i){var a=this,r=t._model,o=a._getValueScale(),s=o.getBasePixel(),l=o.isHorizontal(),u=a._ruler||a.getRuler(),d=a.calculateBarValuePixels(a.index,e,i),h=a.calculateBarIndexPixels(a.index,e,u,i);r.horizontal=l,r.base=n?s:d.base,r.x=l?n?s:d.head:h.center,r.y=l?h.center:n?s:d.head,r.height=l?h.size:void 0,r.width=l?void 0:h.size},_getStacks:function(t){var e,n,i=this._getIndexScale(),a=i._getMatchingVisibleMetas(this._type),r=i.options.stacked,o=a.length,s=[];for(e=0;e<o&&(n=a[e],(!1===r||-1===s.indexOf(n.stack)||void 0===r&&void 0===n.stack)&&s.push(n.stack),n.index!==t);++e);return s},getStackCount:function(){return this._getStacks().length},getStackIndex:function(t,e){var n=this._getStacks(t),i=void 0!==e?n.indexOf(e):-1;return-1===i?n.length-1:i},getRuler:function(){var t,e,n=this._getIndexScale(),i=[];for(t=0,e=this.getMeta().data.length;t<e;++t)i.push(n.getPixelForValue(null,t,this.index));return{pixels:i,start:n._startPixel,end:n._endPixel,stackCount:this.getStackCount(),scale:n}},calculateBarValuePixels:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._getValueScale(),c=h.isHorizontal(),f=d.data.datasets,g=h._getMatchingVisibleMetas(this._type),p=h._parseValue(f[t].data[e]),m=n.minBarLength,v=h.options.stacked,b=this.getMeta().stack,x=void 0===p.start?0:p.max>=0&&p.min>=0?p.min:p.max,y=void 0===p.start?p.end:p.max>=0&&p.min>=0?p.max-p.min:p.min-p.max,_=g.length;if(v||void 0===v&&void 0!==b)for(i=0;i<_&&(a=g[i]).index!==t;++i)a.stack===b&&(r=void 0===(u=h._parseValue(f[a.index].data[e])).start?u.end:u.min>=0&&u.max>=0?u.max:u.min,(p.min<0&&r<0||p.max>=0&&r>0)&&(x+=r));return o=h.getPixelForValue(x),l=(s=h.getPixelForValue(x+y))-o,void 0!==m&&Math.abs(l)<m&&(l=m,s=y>=0&&!c||y<0&&c?o-m:o+m),{size:l,base:o,head:s,center:s+l/2}},calculateBarIndexPixels:function(t,e,n,i){var a="flex"===i.barThickness?function(t,e,n){var i,a=e.pixels,r=a[t],o=t>0?a[t-1]:null,s=t<a.length-1?a[t+1]:null,l=n.categoryPercentage;return null===o&&(o=r-(null===s?e.end-e.start:s-r)),null===s&&(s=r+r-o),i=r-(r-Math.min(o,s))/2*l,{chunk:Math.abs(s-o)/2*l/e.stackCount,ratio:n.barPercentage,start:i}}(e,n,i):At(e,n,i),r=this.getStackIndex(t,this.getMeta().stack),o=a.start+a.chunk*r+a.chunk/2,s=Math.min(Pt(i.maxBarThickness,1/0),a.chunk*a.ratio);return{base:o-s/2,head:o+s/2,center:o,size:s}},draw:function(){var t=this.chart,e=this._getValueScale(),n=this.getMeta().data,i=this.getDataset(),a=n.length,r=0;for(V.canvas.clipArea(t.ctx,t.chartArea);r<a;++r){var o=e._parseValue(i.data[r]);isNaN(o.min)||isNaN(o.max)||n[r].draw()}V.canvas.unclipArea(t.ctx)},_resolveDataElementOptions:function(){var t=this,e=V.extend({},nt.prototype._resolveDataElementOptions.apply(t,arguments)),n=t._getIndexScale().options,i=t._getValueScale().options;return e.barPercentage=Pt(n.barPercentage,e.barPercentage),e.barThickness=Pt(n.barThickness,e.barThickness),e.categoryPercentage=Pt(n.categoryPercentage,e.categoryPercentage),e.maxBarThickness=Pt(n.maxBarThickness,e.maxBarThickness),e.minBarLength=Pt(i.minBarLength,e.minBarLength),e}}),Tt=V.valueOrDefault,It=V.options.resolve;z._set("bubble",{hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-0"}],yAxes:[{type:"linear",position:"left",id:"y-axis-0"}]},tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.datasets[t.datasetIndex].label||"",i=e.datasets[t.datasetIndex].data[t.index];return n+": ("+t.xLabel+", "+t.yLabel+", "+i.r+")"}}}});var Ft=nt.extend({dataElementType:_t.Point,_dataElementOptions:["backgroundColor","borderColor","borderWidth","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth","hoverRadius","hitRadius","pointStyle","rotation"],update:function(t){var e=this,n=e.getMeta().data;V.each(n,(function(n,i){e.updateElement(n,i,t)}))},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=t.custom||{},o=i.getScaleForId(a.xAxisID),s=i.getScaleForId(a.yAxisID),l=i._resolveDataElementOptions(t,e),u=i.getDataset().data[e],d=i.index,h=n?o.getPixelForDecimal(.5):o.getPixelForValue("object"==typeof u?u:NaN,e,d),c=n?s.getBasePixel():s.getPixelForValue(u,e,d);t._xScale=o,t._yScale=s,t._options=l,t._datasetIndex=d,t._index=e,t._model={backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,hitRadius:l.hitRadius,pointStyle:l.pointStyle,rotation:l.rotation,radius:n?0:l.radius,skip:r.skip||isNaN(h)||isNaN(c),x:h,y:c},t.pivot()},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Tt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Tt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Tt(n.hoverBorderWidth,n.borderWidth),e.radius=n.radius+n.hoverRadius},_resolveDataElementOptions:function(t,e){var n=this,i=n.chart,a=n.getDataset(),r=t.custom||{},o=a.data[e]||{},s=nt.prototype._resolveDataElementOptions.apply(n,arguments),l={chart:i,dataIndex:e,dataset:a,datasetIndex:n.index};return n._cachedDataOpts===s&&(s=V.extend({},s)),s.radius=It([r.radius,o.r,n._config.radius,i.options.elements.point.radius],l,e),s}}),Lt=V.valueOrDefault,Ot=Math.PI,Rt=2*Ot,zt=Ot/2;z._set("doughnut",{animation:{animateRotate:!0,animateScale:!1},hover:{mode:"single"},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r]&&(a.data[r].hidden=!a.data[r].hidden);o.update()}},cutoutPercentage:50,rotation:-zt,circumference:Rt,tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.labels[t.index],i=": "+e.datasets[t.datasetIndex].data[t.index];return V.isArray(n)?(n=n.slice())[0]+=i:n+=i,n}}}});var Nt=nt.extend({dataElementType:_t.Arc,linkScales:V.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],getRingIndex:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&++e;return e},update:function(t){var e,n,i,a,r=this,o=r.chart,s=o.chartArea,l=o.options,u=1,d=1,h=0,c=0,f=r.getMeta(),g=f.data,p=l.cutoutPercentage/100||0,m=l.circumference,v=r._getRingWeight(r.index);if(m<Rt){var b=l.rotation%Rt,x=(b+=b>=Ot?-Rt:b<-Ot?Rt:0)+m,y=Math.cos(b),_=Math.sin(b),k=Math.cos(x),w=Math.sin(x),M=b<=0&&x>=0||x>=Rt,S=b<=zt&&x>=zt||x>=Rt+zt,C=b<=-zt&&x>=-zt||x>=Ot+zt,P=b===-Ot||x>=Ot?-1:Math.min(y,y*p,k,k*p),A=C?-1:Math.min(_,_*p,w,w*p),D=M?1:Math.max(y,y*p,k,k*p),T=S?1:Math.max(_,_*p,w,w*p);u=(D-P)/2,d=(T-A)/2,h=-(D+P)/2,c=-(T+A)/2}for(i=0,a=g.length;i<a;++i)g[i]._options=r._resolveDataElementOptions(g[i],i);for(o.borderWidth=r.getMaxBorderWidth(),e=(s.right-s.left-o.borderWidth)/u,n=(s.bottom-s.top-o.borderWidth)/d,o.outerRadius=Math.max(Math.min(e,n)/2,0),o.innerRadius=Math.max(o.outerRadius*p,0),o.radiusLength=(o.outerRadius-o.innerRadius)/(r._getVisibleDatasetWeightTotal()||1),o.offsetX=h*o.outerRadius,o.offsetY=c*o.outerRadius,f.total=r.calculateTotal(),r.outerRadius=o.outerRadius-o.radiusLength*r._getRingWeightOffset(r.index),r.innerRadius=Math.max(r.outerRadius-o.radiusLength*v,0),i=0,a=g.length;i<a;++i)r.updateElement(g[i],i,t)},updateElement:function(t,e,n){var i=this,a=i.chart,r=a.chartArea,o=a.options,s=o.animation,l=(r.left+r.right)/2,u=(r.top+r.bottom)/2,d=o.rotation,h=o.rotation,c=i.getDataset(),f=n&&s.animateRotate?0:t.hidden?0:i.calculateCircumference(c.data[e])*(o.circumference/Rt),g=n&&s.animateScale?0:i.innerRadius,p=n&&s.animateScale?0:i.outerRadius,m=t._options||{};V.extend(t,{_datasetIndex:i.index,_index:e,_model:{backgroundColor:m.backgroundColor,borderColor:m.borderColor,borderWidth:m.borderWidth,borderAlign:m.borderAlign,x:l+a.offsetX,y:u+a.offsetY,startAngle:d,endAngle:h,circumference:f,outerRadius:p,innerRadius:g,label:V.valueAtIndexOrDefault(c.label,e,a.data.labels[e])}});var v=t._model;n&&s.animateRotate||(v.startAngle=0===e?o.rotation:i.getMeta().data[e-1]._model.endAngle,v.endAngle=v.startAngle+v.circumference),t.pivot()},calculateTotal:function(){var t,e=this.getDataset(),n=this.getMeta(),i=0;return V.each(n.data,(function(n,a){t=e.data[a],isNaN(t)||n.hidden||(i+=Math.abs(t))})),i},calculateCircumference:function(t){var e=this.getMeta().total;return e>0&&!isNaN(t)?Rt*(Math.abs(t)/e):0},getMaxBorderWidth:function(t){var e,n,i,a,r,o,s,l,u=0,d=this.chart;if(!t)for(e=0,n=d.data.datasets.length;e<n;++e)if(d.isDatasetVisible(e)){t=(i=d.getDatasetMeta(e)).data,e!==this.index&&(r=i.controller);break}if(!t)return 0;for(e=0,n=t.length;e<n;++e)a=t[e],r?(r._configure(),o=r._resolveDataElementOptions(a,e)):o=a._options,"inner"!==o.borderAlign&&(s=o.borderWidth,u=(l=o.hoverBorderWidth)>(u=s>u?s:u)?l:u);return u},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=Lt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Lt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Lt(n.hoverBorderWidth,n.borderWidth)},_getRingWeightOffset:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&(e+=this._getRingWeight(n));return e},_getRingWeight:function(t){return Math.max(Lt(this.chart.data.datasets[t].weight,1),0)},_getVisibleDatasetWeightTotal:function(){return this._getRingWeightOffset(this.chart.data.datasets.length)}});z._set("horizontalBar",{hover:{mode:"index",axis:"y"},scales:{xAxes:[{type:"linear",position:"bottom"}],yAxes:[{type:"category",position:"left",offset:!0,gridLines:{offsetGridLines:!0}}]},elements:{rectangle:{borderSkipped:"left"}},tooltips:{mode:"index",axis:"y"}}),z._set("global",{datasets:{horizontalBar:{categoryPercentage:.8,barPercentage:.9}}});var Bt=Dt.extend({_getValueScaleId:function(){return this.getMeta().xAxisID},_getIndexScaleId:function(){return this.getMeta().yAxisID}}),Et=V.valueOrDefault,Wt=V.options.resolve,Vt=V.canvas._isPointInArea;function Ht(t,e){var n=t&&t.options.ticks||{},i=n.reverse,a=void 0===n.min?e:0,r=void 0===n.max?e:0;return{start:i?r:a,end:i?a:r}}function jt(t,e,n){var i=n/2,a=Ht(t,i),r=Ht(e,i);return{top:r.end,right:a.end,bottom:r.start,left:a.start}}function qt(t){var e,n,i,a;return V.isObject(t)?(e=t.top,n=t.right,i=t.bottom,a=t.left):e=n=i=a=t,{top:e,right:n,bottom:i,left:a}}z._set("line",{showLines:!0,spanGaps:!1,hover:{mode:"label"},scales:{xAxes:[{type:"category",id:"x-axis-0"}],yAxes:[{type:"linear",id:"y-axis-0"}]}});var Ut=nt.extend({datasetElementType:_t.Line,dataElementType:_t.Point,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth","cubicInterpolationMode","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.options,l=i._config,u=i._showLine=Et(l.showLine,s.showLines);for(i._xScale=i.getScaleForId(a.xAxisID),i._yScale=i.getScaleForId(a.yAxisID),u&&(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=i._yScale,r._datasetIndex=i.index,r._children=o,r._model=i._resolveDatasetElementOptions(r),r.pivot()),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(u&&0!==r._model.tension&&i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i,a,r=this,o=r.getMeta(),s=t.custom||{},l=r.getDataset(),u=r.index,d=l.data[e],h=r._xScale,c=r._yScale,f=o.dataset._model,g=r._resolveDataElementOptions(t,e);i=h.getPixelForValue("object"==typeof d?d:NaN,e,u),a=n?c.getBasePixel():r.calculatePointY(d,e,u),t._xScale=h,t._yScale=c,t._options=g,t._datasetIndex=u,t._index=e,t._model={x:i,y:a,skip:s.skip||isNaN(i)||isNaN(a),radius:g.radius,pointStyle:g.pointStyle,rotation:g.rotation,backgroundColor:g.backgroundColor,borderColor:g.borderColor,borderWidth:g.borderWidth,tension:Et(s.tension,f?f.tension:0),steppedLine:!!f&&f.steppedLine,hitRadius:g.hitRadius}},_resolveDatasetElementOptions:function(t){var e=this,n=e._config,i=t.custom||{},a=e.chart.options,r=a.elements.line,o=nt.prototype._resolveDatasetElementOptions.apply(e,arguments);return o.spanGaps=Et(n.spanGaps,a.spanGaps),o.tension=Et(n.lineTension,r.tension),o.steppedLine=Wt([i.steppedLine,n.steppedLine,r.stepped]),o.clip=qt(Et(n.clip,jt(e._xScale,e._yScale,o.borderWidth))),o},calculatePointY:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._yScale,c=0,f=0;if(h.options.stacked){for(s=+h.getRightValue(t),u=(l=d._getSortedVisibleDatasetMetas()).length,i=0;i<u&&(r=l[i]).index!==n;++i)a=d.data.datasets[r.index],"line"===r.type&&r.yAxisID===h.id&&((o=+h.getRightValue(a.data[e]))<0?f+=o||0:c+=o||0);return s<0?h.getPixelForValue(f+s):h.getPixelForValue(c+s)}return h.getPixelForValue(t)},updateBezierControlPoints:function(){var t,e,n,i,a=this.chart,r=this.getMeta(),o=r.dataset._model,s=a.chartArea,l=r.data||[];function u(t,e,n){return Math.max(Math.min(t,n),e)}if(o.spanGaps&&(l=l.filter((function(t){return!t._model.skip}))),"monotone"===o.cubicInterpolationMode)V.splineCurveMonotone(l);else for(t=0,e=l.length;t<e;++t)n=l[t]._model,i=V.splineCurve(V.previousItem(l,t)._model,n,V.nextItem(l,t)._model,o.tension),n.controlPointPreviousX=i.previous.x,n.controlPointPreviousY=i.previous.y,n.controlPointNextX=i.next.x,n.controlPointNextY=i.next.y;if(a.options.elements.line.capBezierPoints)for(t=0,e=l.length;t<e;++t)n=l[t]._model,Vt(n,s)&&(t>0&&Vt(l[t-1]._model,s)&&(n.controlPointPreviousX=u(n.controlPointPreviousX,s.left,s.right),n.controlPointPreviousY=u(n.controlPointPreviousY,s.top,s.bottom)),t<l.length-1&&Vt(l[t+1]._model,s)&&(n.controlPointNextX=u(n.controlPointNextX,s.left,s.right),n.controlPointNextY=u(n.controlPointNextY,s.top,s.bottom)))},draw:function(){var t,e=this.chart,n=this.getMeta(),i=n.data||[],a=e.chartArea,r=e.canvas,o=0,s=i.length;for(this._showLine&&(t=n.dataset._model.clip,V.canvas.clipArea(e.ctx,{left:!1===t.left?0:a.left-t.left,right:!1===t.right?r.width:a.right+t.right,top:!1===t.top?0:a.top-t.top,bottom:!1===t.bottom?r.height:a.bottom+t.bottom}),n.dataset.draw(),V.canvas.unclipArea(e.ctx));o<s;++o)i[o].draw(a)},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Et(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Et(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Et(n.hoverBorderWidth,n.borderWidth),e.radius=Et(n.hoverRadius,n.radius)}}),Yt=V.options.resolve;z._set("polarArea",{scale:{type:"radialLinear",angleLines:{display:!1},gridLines:{circular:!0},pointLabels:{display:!1},ticks:{beginAtZero:!0}},animation:{animateRotate:!0,animateScale:!0},startAngle:-.5*Math.PI,legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r].hidden=!a.data[r].hidden;o.update()}},tooltips:{callbacks:{title:function(){return""},label:function(t,e){return e.labels[t.index]+": "+t.yLabel}}}});var Gt=nt.extend({dataElementType:_t.Arc,linkScales:V.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i,a=this,r=a.getDataset(),o=a.getMeta(),s=a.chart.options.startAngle||0,l=a._starts=[],u=a._angles=[],d=o.data;for(a._updateRadius(),o.count=a.countVisibleElements(),e=0,n=r.data.length;e<n;e++)l[e]=s,i=a._computeAngle(e),u[e]=i,s+=i;for(e=0,n=d.length;e<n;++e)d[e]._options=a._resolveDataElementOptions(d[e],e),a.updateElement(d[e],e,t)},_updateRadius:function(){var t=this,e=t.chart,n=e.chartArea,i=e.options,a=Math.min(n.right-n.left,n.bottom-n.top);e.outerRadius=Math.max(a/2,0),e.innerRadius=Math.max(i.cutoutPercentage?e.outerRadius/100*i.cutoutPercentage:1,0),e.radiusLength=(e.outerRadius-e.innerRadius)/e.getVisibleDatasetCount(),t.outerRadius=e.outerRadius-e.radiusLength*t.index,t.innerRadius=t.outerRadius-e.radiusLength},updateElement:function(t,e,n){var i=this,a=i.chart,r=i.getDataset(),o=a.options,s=o.animation,l=a.scale,u=a.data.labels,d=l.xCenter,h=l.yCenter,c=o.startAngle,f=t.hidden?0:l.getDistanceFromCenterForValue(r.data[e]),g=i._starts[e],p=g+(t.hidden?0:i._angles[e]),m=s.animateScale?0:l.getDistanceFromCenterForValue(r.data[e]),v=t._options||{};V.extend(t,{_datasetIndex:i.index,_index:e,_scale:l,_model:{backgroundColor:v.backgroundColor,borderColor:v.borderColor,borderWidth:v.borderWidth,borderAlign:v.borderAlign,x:d,y:h,innerRadius:0,outerRadius:n?m:f,startAngle:n&&s.animateRotate?c:g,endAngle:n&&s.animateRotate?c:p,label:V.valueAtIndexOrDefault(u,e,u[e])}}),t.pivot()},countVisibleElements:function(){var t=this.getDataset(),e=this.getMeta(),n=0;return V.each(e.data,(function(e,i){isNaN(t.data[i])||e.hidden||n++})),n},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor,a=V.valueOrDefault;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=a(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=a(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=a(n.hoverBorderWidth,n.borderWidth)},_computeAngle:function(t){var e=this,n=this.getMeta().count,i=e.getDataset(),a=e.getMeta();if(isNaN(i.data[t])||a.data[t].hidden)return 0;var r={chart:e.chart,dataIndex:t,dataset:i,datasetIndex:e.index};return Yt([e.chart.options.elements.arc.angle,2*Math.PI/n],r,t)}});z._set("pie",V.clone(z.doughnut)),z._set("pie",{cutoutPercentage:0});var Xt=Nt,Kt=V.valueOrDefault;z._set("radar",{spanGaps:!1,scale:{type:"radialLinear"},elements:{line:{fill:"start",tension:0}}});var Zt=nt.extend({datasetElementType:_t.Line,dataElementType:_t.Point,linkScales:V.noop,_datasetElementOptions:["backgroundColor","borderWidth","borderColor","borderCapStyle","borderDash","borderDashOffset","borderJoinStyle","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.scale,l=i._config;for(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=s,r._datasetIndex=i.index,r._children=o,r._loop=!0,r._model=i._resolveDatasetElementOptions(r),r.pivot(),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i=this,a=t.custom||{},r=i.getDataset(),o=i.chart.scale,s=o.getPointPositionForValue(e,r.data[e]),l=i._resolveDataElementOptions(t,e),u=i.getMeta().dataset._model,d=n?o.xCenter:s.x,h=n?o.yCenter:s.y;t._scale=o,t._options=l,t._datasetIndex=i.index,t._index=e,t._model={x:d,y:h,skip:a.skip||isNaN(d)||isNaN(h),radius:l.radius,pointStyle:l.pointStyle,rotation:l.rotation,backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,tension:Kt(a.tension,u?u.tension:0),hitRadius:l.hitRadius}},_resolveDatasetElementOptions:function(){var t=this,e=t._config,n=t.chart.options,i=nt.prototype._resolveDatasetElementOptions.apply(t,arguments);return i.spanGaps=Kt(e.spanGaps,n.spanGaps),i.tension=Kt(e.lineTension,n.elements.line.tension),i},updateBezierControlPoints:function(){var t,e,n,i,a=this.getMeta(),r=this.chart.chartArea,o=a.data||[];function s(t,e,n){return Math.max(Math.min(t,n),e)}for(a.dataset._model.spanGaps&&(o=o.filter((function(t){return!t._model.skip}))),t=0,e=o.length;t<e;++t)n=o[t]._model,i=V.splineCurve(V.previousItem(o,t,!0)._model,n,V.nextItem(o,t,!0)._model,n.tension),n.controlPointPreviousX=s(i.previous.x,r.left,r.right),n.controlPointPreviousY=s(i.previous.y,r.top,r.bottom),n.controlPointNextX=s(i.next.x,r.left,r.right),n.controlPointNextY=s(i.next.y,r.top,r.bottom)},setHoverStyle:function(t){var e=t._model,n=t._options,i=V.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Kt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Kt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Kt(n.hoverBorderWidth,n.borderWidth),e.radius=Kt(n.hoverRadius,n.radius)}});z._set("scatter",{hover:{mode:"single"},scales:{xAxes:[{id:"x-axis-1",type:"linear",position:"bottom"}],yAxes:[{id:"y-axis-1",type:"linear",position:"left"}]},tooltips:{callbacks:{title:function(){return""},label:function(t){return"("+t.xLabel+", "+t.yLabel+")"}}}}),z._set("global",{datasets:{scatter:{showLine:!1}}});var $t={bar:Dt,bubble:Ft,doughnut:Nt,horizontalBar:Bt,line:Ut,polarArea:Gt,pie:Xt,radar:Zt,scatter:Ut};function Jt(t,e){return t.native?{x:t.x,y:t.y}:V.getRelativePosition(t,e)}function Qt(t,e){var n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas();for(i=0,r=l.length;i<r;++i)for(a=0,o=(n=l[i].data).length;a<o;++a)(s=n[a])._view.skip||e(s)}function te(t,e){var n=[];return Qt(t,(function(t){t.inRange(e.x,e.y)&&n.push(t)})),n}function ee(t,e,n,i){var a=Number.POSITIVE_INFINITY,r=[];return Qt(t,(function(t){if(!n||t.inRange(e.x,e.y)){var o=t.getCenterPoint(),s=i(e,o);s<a?(r=[t],a=s):s===a&&r.push(t)}})),r}function ne(t){var e=-1!==t.indexOf("x"),n=-1!==t.indexOf("y");return function(t,i){var a=e?Math.abs(t.x-i.x):0,r=n?Math.abs(t.y-i.y):0;return Math.sqrt(Math.pow(a,2)+Math.pow(r,2))}}function ie(t,e,n){var i=Jt(e,t);n.axis=n.axis||"x";var a=ne(n.axis),r=n.intersect?te(t,i):ee(t,i,!1,a),o=[];return r.length?(t._getSortedVisibleDatasetMetas().forEach((function(t){var e=t.data[r[0]._index];e&&!e._view.skip&&o.push(e)})),o):[]}var ae={modes:{single:function(t,e){var n=Jt(e,t),i=[];return Qt(t,(function(t){if(t.inRange(n.x,n.y))return i.push(t),i})),i.slice(0,1)},label:ie,index:ie,dataset:function(t,e,n){var i=Jt(e,t);n.axis=n.axis||"xy";var a=ne(n.axis),r=n.intersect?te(t,i):ee(t,i,!1,a);return r.length>0&&(r=t.getDatasetMeta(r[0]._datasetIndex).data),r},"x-axis":function(t,e){return ie(t,e,{intersect:!1})},point:function(t,e){return te(t,Jt(e,t))},nearest:function(t,e,n){var i=Jt(e,t);n.axis=n.axis||"xy";var a=ne(n.axis);return ee(t,i,n.intersect,a)},x:function(t,e,n){var i=Jt(e,t),a=[],r=!1;return Qt(t,(function(t){t.inXRange(i.x)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a},y:function(t,e,n){var i=Jt(e,t),a=[],r=!1;return Qt(t,(function(t){t.inYRange(i.y)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a}}},re=V.extend;function oe(t,e){return V.where(t,(function(t){return t.pos===e}))}function se(t,e){return t.sort((function(t,n){var i=e?n:t,a=e?t:n;return i.weight===a.weight?i.index-a.index:i.weight-a.weight}))}function le(t,e,n,i){return Math.max(t[n],e[n])+Math.max(t[i],e[i])}function ue(t,e,n){var i,a,r=n.box,o=t.maxPadding;if(n.size&&(t[n.pos]-=n.size),n.size=n.horizontal?r.height:r.width,t[n.pos]+=n.size,r.getPadding){var s=r.getPadding();o.top=Math.max(o.top,s.top),o.left=Math.max(o.left,s.left),o.bottom=Math.max(o.bottom,s.bottom),o.right=Math.max(o.right,s.right)}if(i=e.outerWidth-le(o,t,"left","right"),a=e.outerHeight-le(o,t,"top","bottom"),i!==t.w||a!==t.h)return t.w=i,t.h=a,n.horizontal?i!==t.w:a!==t.h}function de(t,e){var n=e.maxPadding;function i(t){var i={left:0,top:0,right:0,bottom:0};return t.forEach((function(t){i[t]=Math.max(e[t],n[t])})),i}return i(t?["left","right"]:["top","bottom"])}function he(t,e,n){var i,a,r,o,s,l,u=[];for(i=0,a=t.length;i<a;++i)(o=(r=t[i]).box).update(r.width||e.w,r.height||e.h,de(r.horizontal,e)),ue(e,n,r)&&(l=!0,u.length&&(s=!0)),o.fullWidth||u.push(r);return s&&he(u,e,n)||l}function ce(t,e,n){var i,a,r,o,s=n.padding,l=e.x,u=e.y;for(i=0,a=t.length;i<a;++i)o=(r=t[i]).box,r.horizontal?(o.left=o.fullWidth?s.left:e.left,o.right=o.fullWidth?n.outerWidth-s.right:e.left+e.w,o.top=u,o.bottom=u+o.height,o.width=o.right-o.left,u=o.bottom):(o.left=l,o.right=l+o.width,o.top=e.top,o.bottom=e.top+e.h,o.height=o.bottom-o.top,l=o.right);e.x=l,e.y=u}z._set("global",{layout:{padding:{top:0,right:0,bottom:0,left:0}}});var fe,ge={defaults:{},addBox:function(t,e){t.boxes||(t.boxes=[]),e.fullWidth=e.fullWidth||!1,e.position=e.position||"top",e.weight=e.weight||0,e._layers=e._layers||function(){return[{z:0,draw:function(){e.draw.apply(e,arguments)}}]},t.boxes.push(e)},removeBox:function(t,e){var n=t.boxes?t.boxes.indexOf(e):-1;-1!==n&&t.boxes.splice(n,1)},configure:function(t,e,n){for(var i,a=["fullWidth","position","weight"],r=a.length,o=0;o<r;++o)i=a[o],n.hasOwnProperty(i)&&(e[i]=n[i])},update:function(t,e,n){if(t){var i=t.options.layout||{},a=V.options.toPadding(i.padding),r=e-a.width,o=n-a.height,s=function(t){var e=function(t){var e,n,i,a=[];for(e=0,n=(t||[]).length;e<n;++e)i=t[e],a.push({index:e,box:i,pos:i.position,horizontal:i.isHorizontal(),weight:i.weight});return a}(t),n=se(oe(e,"left"),!0),i=se(oe(e,"right")),a=se(oe(e,"top"),!0),r=se(oe(e,"bottom"));return{leftAndTop:n.concat(a),rightAndBottom:i.concat(r),chartArea:oe(e,"chartArea"),vertical:n.concat(i),horizontal:a.concat(r)}}(t.boxes),l=s.vertical,u=s.horizontal,d=Object.freeze({outerWidth:e,outerHeight:n,padding:a,availableWidth:r,vBoxMaxWidth:r/2/l.length,hBoxMaxHeight:o/2}),h=re({maxPadding:re({},a),w:r,h:o,x:a.left,y:a.top},a);!function(t,e){var n,i,a;for(n=0,i=t.length;n<i;++n)(a=t[n]).width=a.horizontal?a.box.fullWidth&&e.availableWidth:e.vBoxMaxWidth,a.height=a.horizontal&&e.hBoxMaxHeight}(l.concat(u),d),he(l,h,d),he(u,h,d)&&he(l,h,d),function(t){var e=t.maxPadding;function n(n){var i=Math.max(e[n]-t[n],0);return t[n]+=i,i}t.y+=n("top"),t.x+=n("left"),n("right"),n("bottom")}(h),ce(s.leftAndTop,h,d),h.x+=h.w,h.y+=h.h,ce(s.rightAndBottom,h,d),t.chartArea={left:h.left,top:h.top,right:h.left+h.w,bottom:h.top+h.h},V.each(s.chartArea,(function(e){var n=e.box;re(n,t.chartArea),n.update(h.w,h.h)}))}}},pe=(fe=Object.freeze({__proto__:null,default:"@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}"}))&&fe.default||fe,me="$chartjs",ve="chartjs-size-monitor",be="chartjs-render-monitor",xe="chartjs-render-animation",ye=["animationstart","webkitAnimationStart"],_e={touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup",pointerenter:"mouseenter",pointerdown:"mousedown",pointermove:"mousemove",pointerup:"mouseup",pointerleave:"mouseout",pointerout:"mouseout"};function ke(t,e){var n=V.getStyle(t,e),i=n&&n.match(/^(\d+)(\.\d+)?px$/);return i?Number(i[1]):void 0}var we=!!function(){var t=!1;try{var e=Object.defineProperty({},"passive",{get:function(){t=!0}});window.addEventListener("e",null,e)}catch(t){}return t}()&&{passive:!0};function Me(t,e,n){t.addEventListener(e,n,we)}function Se(t,e,n){t.removeEventListener(e,n,we)}function Ce(t,e,n,i,a){return{type:t,chart:e,native:a||null,x:void 0!==n?n:null,y:void 0!==i?i:null}}function Pe(t){var e=document.createElement("div");return e.className=t||"",e}function Ae(t,e,n){var i,a,r,o,s=t[me]||(t[me]={}),l=s.resizer=function(t){var e=Pe(ve),n=Pe(ve+"-expand"),i=Pe(ve+"-shrink");n.appendChild(Pe()),i.appendChild(Pe()),e.appendChild(n),e.appendChild(i),e._reset=function(){n.scrollLeft=1e6,n.scrollTop=1e6,i.scrollLeft=1e6,i.scrollTop=1e6};var a=function(){e._reset(),t()};return Me(n,"scroll",a.bind(n,"expand")),Me(i,"scroll",a.bind(i,"shrink")),e}((i=function(){if(s.resizer){var i=n.options.maintainAspectRatio&&t.parentNode,a=i?i.clientWidth:0;e(Ce("resize",n)),i&&i.clientWidth<a&&n.canvas&&e(Ce("resize",n))}},r=!1,o=[],function(){o=Array.prototype.slice.call(arguments),a=a||this,r||(r=!0,V.requestAnimFrame.call(window,(function(){r=!1,i.apply(a,o)})))}));!function(t,e){var n=t[me]||(t[me]={}),i=n.renderProxy=function(t){t.animationName===xe&&e()};V.each(ye,(function(e){Me(t,e,i)})),n.reflow=!!t.offsetParent,t.classList.add(be)}(t,(function(){if(s.resizer){var e=t.parentNode;e&&e!==l.parentNode&&e.insertBefore(l,e.firstChild),l._reset()}}))}function De(t){var e=t[me]||{},n=e.resizer;delete e.resizer,function(t){var e=t[me]||{},n=e.renderProxy;n&&(V.each(ye,(function(e){Se(t,e,n)})),delete e.renderProxy),t.classList.remove(be)}(t),n&&n.parentNode&&n.parentNode.removeChild(n)}var Te={disableCSSInjection:!1,_enabled:"undefined"!=typeof window&&"undefined"!=typeof document,_ensureLoaded:function(t){if(!this.disableCSSInjection){var e=t.getRootNode?t.getRootNode():document;!function(t,e){var n=t[me]||(t[me]={});if(!n.containsStyles){n.containsStyles=!0,e="/* Chart.js */\n"+e;var i=document.createElement("style");i.setAttribute("type","text/css"),i.appendChild(document.createTextNode(e)),t.appendChild(i)}}(e.host?e:document.head,pe)}},acquireContext:function(t,e){"string"==typeof t?t=document.getElementById(t):t.length&&(t=t[0]),t&&t.canvas&&(t=t.canvas);var n=t&&t.getContext&&t.getContext("2d");return n&&n.canvas===t?(this._ensureLoaded(t),function(t,e){var n=t.style,i=t.getAttribute("height"),a=t.getAttribute("width");if(t[me]={initial:{height:i,width:a,style:{display:n.display,height:n.height,width:n.width}}},n.display=n.display||"block",null===a||""===a){var r=ke(t,"width");void 0!==r&&(t.width=r)}if(null===i||""===i)if(""===t.style.height)t.height=t.width/(e.options.aspectRatio||2);else{var o=ke(t,"height");void 0!==r&&(t.height=o)}}(t,e),n):null},releaseContext:function(t){var e=t.canvas;if(e[me]){var n=e[me].initial;["height","width"].forEach((function(t){var i=n[t];V.isNullOrUndef(i)?e.removeAttribute(t):e.setAttribute(t,i)})),V.each(n.style||{},(function(t,n){e.style[n]=t})),e.width=e.width,delete e[me]}},addEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=n[me]||(n[me]={});Me(i,e,(a.proxies||(a.proxies={}))[t.id+"_"+e]=function(e){n(function(t,e){var n=_e[t.type]||t.type,i=V.getRelativePosition(t,e);return Ce(n,e,i.x,i.y,t)}(e,t))})}else Ae(i,n,t)},removeEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=((n[me]||{}).proxies||{})[t.id+"_"+e];a&&Se(i,e,a)}else De(i)}};V.addEvent=Me,V.removeEvent=Se;var Ie=Te._enabled?Te:{acquireContext:function(t){return t&&t.canvas&&(t=t.canvas),t&&t.getContext("2d")||null}},Fe=V.extend({initialize:function(){},acquireContext:function(){},releaseContext:function(){},addEventListener:function(){},removeEventListener:function(){}},Ie);z._set("global",{plugins:{}});var Le={_plugins:[],_cacheId:0,register:function(t){var e=this._plugins;[].concat(t).forEach((function(t){-1===e.indexOf(t)&&e.push(t)})),this._cacheId++},unregister:function(t){var e=this._plugins;[].concat(t).forEach((function(t){var n=e.indexOf(t);-1!==n&&e.splice(n,1)})),this._cacheId++},clear:function(){this._plugins=[],this._cacheId++},count:function(){return this._plugins.length},getAll:function(){return this._plugins},notify:function(t,e,n){var i,a,r,o,s,l=this.descriptors(t),u=l.length;for(i=0;i<u;++i)if("function"==typeof(s=(r=(a=l[i]).plugin)[e])&&((o=[t].concat(n||[])).push(a.options),!1===s.apply(r,o)))return!1;return!0},descriptors:function(t){var e=t.$plugins||(t.$plugins={});if(e.id===this._cacheId)return e.descriptors;var n=[],i=[],a=t&&t.config||{},r=a.options&&a.options.plugins||{};return this._plugins.concat(a.plugins||[]).forEach((function(t){if(-1===n.indexOf(t)){var e=t.id,a=r[e];!1!==a&&(!0===a&&(a=V.clone(z.global.plugins[e])),n.push(t),i.push({plugin:t,options:a||{}}))}})),e.descriptors=i,e.id=this._cacheId,i},_invalidate:function(t){delete t.$plugins}},Oe={constructors:{},defaults:{},registerScaleType:function(t,e,n){this.constructors[t]=e,this.defaults[t]=V.clone(n)},getScaleConstructor:function(t){return this.constructors.hasOwnProperty(t)?this.constructors[t]:void 0},getScaleDefaults:function(t){return this.defaults.hasOwnProperty(t)?V.merge({},[z.scale,this.defaults[t]]):{}},updateScaleDefaults:function(t,e){this.defaults.hasOwnProperty(t)&&(this.defaults[t]=V.extend(this.defaults[t],e))},addScalesToLayout:function(t){V.each(t.scales,(function(e){e.fullWidth=e.options.fullWidth,e.position=e.options.position,e.weight=e.options.weight,ge.addBox(t,e)}))}},Re=V.valueOrDefault,ze=V.rtl.getRtlAdapter;z._set("global",{tooltips:{enabled:!0,custom:null,mode:"nearest",position:"average",intersect:!0,backgroundColor:"rgba(0,0,0,0.8)",titleFontStyle:"bold",titleSpacing:2,titleMarginBottom:6,titleFontColor:"#fff",titleAlign:"left",bodySpacing:2,bodyFontColor:"#fff",bodyAlign:"left",footerFontStyle:"bold",footerSpacing:2,footerMarginTop:6,footerFontColor:"#fff",footerAlign:"left",yPadding:6,xPadding:6,caretPadding:2,caretSize:5,cornerRadius:6,multiKeyBackground:"#fff",displayColors:!0,borderColor:"rgba(0,0,0,0)",borderWidth:0,callbacks:{beforeTitle:V.noop,title:function(t,e){var n="",i=e.labels,a=i?i.length:0;if(t.length>0){var r=t[0];r.label?n=r.label:r.xLabel?n=r.xLabel:a>0&&r.index<a&&(n=i[r.index])}return n},afterTitle:V.noop,beforeBody:V.noop,beforeLabel:V.noop,label:function(t,e){var n=e.datasets[t.datasetIndex].label||"";return n&&(n+=": "),V.isNullOrUndef(t.value)?n+=t.yLabel:n+=t.value,n},labelColor:function(t,e){var n=e.getDatasetMeta(t.datasetIndex).data[t.index]._view;return{borderColor:n.borderColor,backgroundColor:n.backgroundColor}},labelTextColor:function(){return this._options.bodyFontColor},afterLabel:V.noop,afterBody:V.noop,beforeFooter:V.noop,footer:V.noop,afterFooter:V.noop}}});var Ne={average:function(t){if(!t.length)return!1;var e,n,i=0,a=0,r=0;for(e=0,n=t.length;e<n;++e){var o=t[e];if(o&&o.hasValue()){var s=o.tooltipPosition();i+=s.x,a+=s.y,++r}}return{x:i/r,y:a/r}},nearest:function(t,e){var n,i,a,r=e.x,o=e.y,s=Number.POSITIVE_INFINITY;for(n=0,i=t.length;n<i;++n){var l=t[n];if(l&&l.hasValue()){var u=l.getCenterPoint(),d=V.distanceBetweenPoints(e,u);d<s&&(s=d,a=l)}}if(a){var h=a.tooltipPosition();r=h.x,o=h.y}return{x:r,y:o}}};function Be(t,e){return e&&(V.isArray(e)?Array.prototype.push.apply(t,e):t.push(e)),t}function Ee(t){return("string"==typeof t||t instanceof String)&&t.indexOf("\n")>-1?t.split("\n"):t}function We(t){var e=z.global;return{xPadding:t.xPadding,yPadding:t.yPadding,xAlign:t.xAlign,yAlign:t.yAlign,rtl:t.rtl,textDirection:t.textDirection,bodyFontColor:t.bodyFontColor,_bodyFontFamily:Re(t.bodyFontFamily,e.defaultFontFamily),_bodyFontStyle:Re(t.bodyFontStyle,e.defaultFontStyle),_bodyAlign:t.bodyAlign,bodyFontSize:Re(t.bodyFontSize,e.defaultFontSize),bodySpacing:t.bodySpacing,titleFontColor:t.titleFontColor,_titleFontFamily:Re(t.titleFontFamily,e.defaultFontFamily),_titleFontStyle:Re(t.titleFontStyle,e.defaultFontStyle),titleFontSize:Re(t.titleFontSize,e.defaultFontSize),_titleAlign:t.titleAlign,titleSpacing:t.titleSpacing,titleMarginBottom:t.titleMarginBottom,footerFontColor:t.footerFontColor,_footerFontFamily:Re(t.footerFontFamily,e.defaultFontFamily),_footerFontStyle:Re(t.footerFontStyle,e.defaultFontStyle),footerFontSize:Re(t.footerFontSize,e.defaultFontSize),_footerAlign:t.footerAlign,footerSpacing:t.footerSpacing,footerMarginTop:t.footerMarginTop,caretSize:t.caretSize,cornerRadius:t.cornerRadius,backgroundColor:t.backgroundColor,opacity:0,legendColorBackground:t.multiKeyBackground,displayColors:t.displayColors,borderColor:t.borderColor,borderWidth:t.borderWidth}}function Ve(t,e){return"center"===e?t.x+t.width/2:"right"===e?t.x+t.width-t.xPadding:t.x+t.xPadding}function He(t){return Be([],Ee(t))}var je=X.extend({initialize:function(){this._model=We(this._options),this._lastActive=[]},getTitle:function(){var t=this,e=t._options,n=e.callbacks,i=n.beforeTitle.apply(t,arguments),a=n.title.apply(t,arguments),r=n.afterTitle.apply(t,arguments),o=[];return o=Be(o,Ee(i)),o=Be(o,Ee(a)),o=Be(o,Ee(r))},getBeforeBody:function(){return He(this._options.callbacks.beforeBody.apply(this,arguments))},getBody:function(t,e){var n=this,i=n._options.callbacks,a=[];return V.each(t,(function(t){var r={before:[],lines:[],after:[]};Be(r.before,Ee(i.beforeLabel.call(n,t,e))),Be(r.lines,i.label.call(n,t,e)),Be(r.after,Ee(i.afterLabel.call(n,t,e))),a.push(r)})),a},getAfterBody:function(){return He(this._options.callbacks.afterBody.apply(this,arguments))},getFooter:function(){var t=this,e=t._options.callbacks,n=e.beforeFooter.apply(t,arguments),i=e.footer.apply(t,arguments),a=e.afterFooter.apply(t,arguments),r=[];return r=Be(r,Ee(n)),r=Be(r,Ee(i)),r=Be(r,Ee(a))},update:function(t){var e,n,i,a,r,o,s,l,u,d,h=this,c=h._options,f=h._model,g=h._model=We(c),p=h._active,m=h._data,v={xAlign:f.xAlign,yAlign:f.yAlign},b={x:f.x,y:f.y},x={width:f.width,height:f.height},y={x:f.caretX,y:f.caretY};if(p.length){g.opacity=1;var _=[],k=[];y=Ne[c.position].call(h,p,h._eventPosition);var w=[];for(e=0,n=p.length;e<n;++e)w.push((i=p[e],a=void 0,r=void 0,o=void 0,s=void 0,l=void 0,u=void 0,d=void 0,a=i._xScale,r=i._yScale||i._scale,o=i._index,s=i._datasetIndex,l=i._chart.getDatasetMeta(s).controller,u=l._getIndexScale(),d=l._getValueScale(),{xLabel:a?a.getLabelForIndex(o,s):"",yLabel:r?r.getLabelForIndex(o,s):"",label:u?""+u.getLabelForIndex(o,s):"",value:d?""+d.getLabelForIndex(o,s):"",index:o,datasetIndex:s,x:i._model.x,y:i._model.y}));c.filter&&(w=w.filter((function(t){return c.filter(t,m)}))),c.itemSort&&(w=w.sort((function(t,e){return c.itemSort(t,e,m)}))),V.each(w,(function(t){_.push(c.callbacks.labelColor.call(h,t,h._chart)),k.push(c.callbacks.labelTextColor.call(h,t,h._chart))})),g.title=h.getTitle(w,m),g.beforeBody=h.getBeforeBody(w,m),g.body=h.getBody(w,m),g.afterBody=h.getAfterBody(w,m),g.footer=h.getFooter(w,m),g.x=y.x,g.y=y.y,g.caretPadding=c.caretPadding,g.labelColors=_,g.labelTextColors=k,g.dataPoints=w,x=function(t,e){var n=t._chart.ctx,i=2*e.yPadding,a=0,r=e.body,o=r.reduce((function(t,e){return t+e.before.length+e.lines.length+e.after.length}),0);o+=e.beforeBody.length+e.afterBody.length;var s=e.title.length,l=e.footer.length,u=e.titleFontSize,d=e.bodyFontSize,h=e.footerFontSize;i+=s*u,i+=s?(s-1)*e.titleSpacing:0,i+=s?e.titleMarginBottom:0,i+=o*d,i+=o?(o-1)*e.bodySpacing:0,i+=l?e.footerMarginTop:0,i+=l*h,i+=l?(l-1)*e.footerSpacing:0;var c=0,f=function(t){a=Math.max(a,n.measureText(t).width+c)};return n.font=V.fontString(u,e._titleFontStyle,e._titleFontFamily),V.each(e.title,f),n.font=V.fontString(d,e._bodyFontStyle,e._bodyFontFamily),V.each(e.beforeBody.concat(e.afterBody),f),c=e.displayColors?d+2:0,V.each(r,(function(t){V.each(t.before,f),V.each(t.lines,f),V.each(t.after,f)})),c=0,n.font=V.fontString(h,e._footerFontStyle,e._footerFontFamily),V.each(e.footer,f),{width:a+=2*e.xPadding,height:i}}(this,g),b=function(t,e,n,i){var a=t.x,r=t.y,o=t.caretSize,s=t.caretPadding,l=t.cornerRadius,u=n.xAlign,d=n.yAlign,h=o+s,c=l+s;return"right"===u?a-=e.width:"center"===u&&((a-=e.width/2)+e.width>i.width&&(a=i.width-e.width),a<0&&(a=0)),"top"===d?r+=h:r-="bottom"===d?e.height+h:e.height/2,"center"===d?"left"===u?a+=h:"right"===u&&(a-=h):"left"===u?a-=c:"right"===u&&(a+=c),{x:a,y:r}}(g,x,v=function(t,e){var n,i,a,r,o,s=t._model,l=t._chart,u=t._chart.chartArea,d="center",h="center";s.y<e.height?h="top":s.y>l.height-e.height&&(h="bottom");var c=(u.left+u.right)/2,f=(u.top+u.bottom)/2;"center"===h?(n=function(t){return t<=c},i=function(t){return t>c}):(n=function(t){return t<=e.width/2},i=function(t){return t>=l.width-e.width/2}),a=function(t){return t+e.width+s.caretSize+s.caretPadding>l.width},r=function(t){return t-e.width-s.caretSize-s.caretPadding<0},o=function(t){return t<=f?"top":"bottom"},n(s.x)?(d="left",a(s.x)&&(d="center",h=o(s.y))):i(s.x)&&(d="right",r(s.x)&&(d="center",h=o(s.y)));var g=t._options;return{xAlign:g.xAlign?g.xAlign:d,yAlign:g.yAlign?g.yAlign:h}}(this,x),h._chart)}else g.opacity=0;return g.xAlign=v.xAlign,g.yAlign=v.yAlign,g.x=b.x,g.y=b.y,g.width=x.width,g.height=x.height,g.caretX=y.x,g.caretY=y.y,h._model=g,t&&c.custom&&c.custom.call(h,g),h},drawCaret:function(t,e){var n=this._chart.ctx,i=this._view,a=this.getCaretPosition(t,e,i);n.lineTo(a.x1,a.y1),n.lineTo(a.x2,a.y2),n.lineTo(a.x3,a.y3)},getCaretPosition:function(t,e,n){var i,a,r,o,s,l,u=n.caretSize,d=n.cornerRadius,h=n.xAlign,c=n.yAlign,f=t.x,g=t.y,p=e.width,m=e.height;if("center"===c)s=g+m/2,"left"===h?(a=(i=f)-u,r=i,o=s+u,l=s-u):(a=(i=f+p)+u,r=i,o=s-u,l=s+u);else if("left"===h?(i=(a=f+d+u)-u,r=a+u):"right"===h?(i=(a=f+p-d-u)-u,r=a+u):(i=(a=n.caretX)-u,r=a+u),"top"===c)s=(o=g)-u,l=o;else{s=(o=g+m)+u,l=o;var v=r;r=i,i=v}return{x1:i,x2:a,x3:r,y1:o,y2:s,y3:l}},drawTitle:function(t,e,n){var i,a,r,o=e.title,s=o.length;if(s){var l=ze(e.rtl,e.x,e.width);for(t.x=Ve(e,e._titleAlign),n.textAlign=l.textAlign(e._titleAlign),n.textBaseline="middle",i=e.titleFontSize,a=e.titleSpacing,n.fillStyle=e.titleFontColor,n.font=V.fontString(i,e._titleFontStyle,e._titleFontFamily),r=0;r<s;++r)n.fillText(o[r],l.x(t.x),t.y+i/2),t.y+=i+a,r+1===s&&(t.y+=e.titleMarginBottom-a)}},drawBody:function(t,e,n){var i,a,r,o,s,l,u,d,h=e.bodyFontSize,c=e.bodySpacing,f=e._bodyAlign,g=e.body,p=e.displayColors,m=0,v=p?Ve(e,"left"):0,b=ze(e.rtl,e.x,e.width),x=function(e){n.fillText(e,b.x(t.x+m),t.y+h/2),t.y+=h+c},y=b.textAlign(f);for(n.textAlign=f,n.textBaseline="middle",n.font=V.fontString(h,e._bodyFontStyle,e._bodyFontFamily),t.x=Ve(e,y),n.fillStyle=e.bodyFontColor,V.each(e.beforeBody,x),m=p&&"right"!==y?"center"===f?h/2+1:h+2:0,s=0,u=g.length;s<u;++s){for(i=g[s],a=e.labelTextColors[s],r=e.labelColors[s],n.fillStyle=a,V.each(i.before,x),l=0,d=(o=i.lines).length;l<d;++l){if(p){var _=b.x(v);n.fillStyle=e.legendColorBackground,n.fillRect(b.leftForLtr(_,h),t.y,h,h),n.lineWidth=1,n.strokeStyle=r.borderColor,n.strokeRect(b.leftForLtr(_,h),t.y,h,h),n.fillStyle=r.backgroundColor,n.fillRect(b.leftForLtr(b.xPlus(_,1),h-2),t.y+1,h-2,h-2),n.fillStyle=a}x(o[l])}V.each(i.after,x)}m=0,V.each(e.afterBody,x),t.y-=c},drawFooter:function(t,e,n){var i,a,r=e.footer,o=r.length;if(o){var s=ze(e.rtl,e.x,e.width);for(t.x=Ve(e,e._footerAlign),t.y+=e.footerMarginTop,n.textAlign=s.textAlign(e._footerAlign),n.textBaseline="middle",i=e.footerFontSize,n.fillStyle=e.footerFontColor,n.font=V.fontString(i,e._footerFontStyle,e._footerFontFamily),a=0;a<o;++a)n.fillText(r[a],s.x(t.x),t.y+i/2),t.y+=i+e.footerSpacing}},drawBackground:function(t,e,n,i){n.fillStyle=e.backgroundColor,n.strokeStyle=e.borderColor,n.lineWidth=e.borderWidth;var a=e.xAlign,r=e.yAlign,o=t.x,s=t.y,l=i.width,u=i.height,d=e.cornerRadius;n.beginPath(),n.moveTo(o+d,s),"top"===r&&this.drawCaret(t,i),n.lineTo(o+l-d,s),n.quadraticCurveTo(o+l,s,o+l,s+d),"center"===r&&"right"===a&&this.drawCaret(t,i),n.lineTo(o+l,s+u-d),n.quadraticCurveTo(o+l,s+u,o+l-d,s+u),"bottom"===r&&this.drawCaret(t,i),n.lineTo(o+d,s+u),n.quadraticCurveTo(o,s+u,o,s+u-d),"center"===r&&"left"===a&&this.drawCaret(t,i),n.lineTo(o,s+d),n.quadraticCurveTo(o,s,o+d,s),n.closePath(),n.fill(),e.borderWidth>0&&n.stroke()},draw:function(){var t=this._chart.ctx,e=this._view;if(0!==e.opacity){var n={width:e.width,height:e.height},i={x:e.x,y:e.y},a=Math.abs(e.opacity<.001)?0:e.opacity,r=e.title.length||e.beforeBody.length||e.body.length||e.afterBody.length||e.footer.length;this._options.enabled&&r&&(t.save(),t.globalAlpha=a,this.drawBackground(i,e,t,n),i.y+=e.yPadding,V.rtl.overrideTextDirection(t,e.textDirection),this.drawTitle(i,e,t),this.drawBody(i,e,t),this.drawFooter(i,e,t),V.rtl.restoreTextDirection(t,e.textDirection),t.restore())}},handleEvent:function(t){var e,n=this,i=n._options;return n._lastActive=n._lastActive||[],"mouseout"===t.type?n._active=[]:(n._active=n._chart.getElementsAtEventForMode(t,i.mode,i),i.reverse&&n._active.reverse()),(e=!V.arrayEquals(n._active,n._lastActive))&&(n._lastActive=n._active,(i.enabled||i.custom)&&(n._eventPosition={x:t.x,y:t.y},n.update(!0),n.pivot())),e}}),qe=Ne,Ue=je;Ue.positioners=qe;var Ye=V.valueOrDefault;function Ge(){return V.merge({},[].slice.call(arguments),{merger:function(t,e,n,i){if("xAxes"===t||"yAxes"===t){var a,r,o,s=n[t].length;for(e[t]||(e[t]=[]),a=0;a<s;++a)o=n[t][a],r=Ye(o.type,"xAxes"===t?"category":"linear"),a>=e[t].length&&e[t].push({}),!e[t][a].type||o.type&&o.type!==e[t][a].type?V.merge(e[t][a],[Oe.getScaleDefaults(r),o]):V.merge(e[t][a],o)}else V._merger(t,e,n,i)}})}function Xe(){return V.merge({},[].slice.call(arguments),{merger:function(t,e,n,i){var a=e[t]||{},r=n[t];"scales"===t?e[t]=Ge(a,r):"scale"===t?e[t]=V.merge(a,[Oe.getScaleDefaults(r.type),r]):V._merger(t,e,n,i)}})}function Ke(t){var e=t.options;V.each(t.scales,(function(e){ge.removeBox(t,e)})),e=Xe(z.global,z[t.config.type],e),t.options=t.config.options=e,t.ensureScalesHaveIDs(),t.buildOrUpdateScales(),t.tooltip._options=e.tooltips,t.tooltip.initialize()}function Ze(t,e,n){var i,a=function(t){return t.id===i};do{i=e+n++}while(V.findIndex(t,a)>=0);return i}function $e(t){return"top"===t||"bottom"===t}function Je(t,e){return function(n,i){return n[t]===i[t]?n[e]-i[e]:n[t]-i[t]}}z._set("global",{elements:{},events:["mousemove","mouseout","click","touchstart","touchmove"],hover:{onHover:null,mode:"nearest",intersect:!0,animationDuration:400},onClick:null,maintainAspectRatio:!0,responsive:!0,responsiveAnimationDuration:0});var Qe=function(t,e){return this.construct(t,e),this};V.extend(Qe.prototype,{construct:function(t,e){var n=this;e=function(t){var e=(t=t||{}).data=t.data||{};return e.datasets=e.datasets||[],e.labels=e.labels||[],t.options=Xe(z.global,z[t.type],t.options||{}),t}(e);var i=Fe.acquireContext(t,e),a=i&&i.canvas,r=a&&a.height,o=a&&a.width;n.id=V.uid(),n.ctx=i,n.canvas=a,n.config=e,n.width=o,n.height=r,n.aspectRatio=r?o/r:null,n.options=e.options,n._bufferedRender=!1,n._layers=[],n.chart=n,n.controller=n,Qe.instances[n.id]=n,Object.defineProperty(n,"data",{get:function(){return n.config.data},set:function(t){n.config.data=t}}),i&&a?(n.initialize(),n.update()):console.error("Failed to create chart: can't acquire context from the given item")},initialize:function(){var t=this;return Le.notify(t,"beforeInit"),V.retinaScale(t,t.options.devicePixelRatio),t.bindEvents(),t.options.responsive&&t.resize(!0),t.initToolTip(),Le.notify(t,"afterInit"),t},clear:function(){return V.canvas.clear(this),this},stop:function(){return $.cancelAnimation(this),this},resize:function(t){var e=this,n=e.options,i=e.canvas,a=n.maintainAspectRatio&&e.aspectRatio||null,r=Math.max(0,Math.floor(V.getMaximumWidth(i))),o=Math.max(0,Math.floor(a?r/a:V.getMaximumHeight(i)));if((e.width!==r||e.height!==o)&&(i.width=e.width=r,i.height=e.height=o,i.style.width=r+"px",i.style.height=o+"px",V.retinaScale(e,n.devicePixelRatio),!t)){var s={width:r,height:o};Le.notify(e,"resize",[s]),n.onResize&&n.onResize(e,s),e.stop(),e.update({duration:n.responsiveAnimationDuration})}},ensureScalesHaveIDs:function(){var t=this.options,e=t.scales||{},n=t.scale;V.each(e.xAxes,(function(t,n){t.id||(t.id=Ze(e.xAxes,"x-axis-",n))})),V.each(e.yAxes,(function(t,n){t.id||(t.id=Ze(e.yAxes,"y-axis-",n))})),n&&(n.id=n.id||"scale")},buildOrUpdateScales:function(){var t=this,e=t.options,n=t.scales||{},i=[],a=Object.keys(n).reduce((function(t,e){return t[e]=!1,t}),{});e.scales&&(i=i.concat((e.scales.xAxes||[]).map((function(t){return{options:t,dtype:"category",dposition:"bottom"}})),(e.scales.yAxes||[]).map((function(t){return{options:t,dtype:"linear",dposition:"left"}})))),e.scale&&i.push({options:e.scale,dtype:"radialLinear",isDefault:!0,dposition:"chartArea"}),V.each(i,(function(e){var i=e.options,r=i.id,o=Ye(i.type,e.dtype);$e(i.position)!==$e(e.dposition)&&(i.position=e.dposition),a[r]=!0;var s=null;if(r in n&&n[r].type===o)(s=n[r]).options=i,s.ctx=t.ctx,s.chart=t;else{var l=Oe.getScaleConstructor(o);if(!l)return;s=new l({id:r,type:o,options:i,ctx:t.ctx,chart:t}),n[s.id]=s}s.mergeTicksOptions(),e.isDefault&&(t.scale=s)})),V.each(a,(function(t,e){t||delete n[e]})),t.scales=n,Oe.addScalesToLayout(this)},buildOrUpdateControllers:function(){var t,e,n=this,i=[],a=n.data.datasets;for(t=0,e=a.length;t<e;t++){var r=a[t],o=n.getDatasetMeta(t),s=r.type||n.config.type;if(o.type&&o.type!==s&&(n.destroyDatasetMeta(t),o=n.getDatasetMeta(t)),o.type=s,o.order=r.order||0,o.index=t,o.controller)o.controller.updateIndex(t),o.controller.linkScales();else{var l=$t[o.type];if(void 0===l)throw new Error('"'+o.type+'" is not a chart type.');o.controller=new l(n,t),i.push(o.controller)}}return i},resetElements:function(){var t=this;V.each(t.data.datasets,(function(e,n){t.getDatasetMeta(n).controller.reset()}),t)},reset:function(){this.resetElements(),this.tooltip.initialize()},update:function(t){var e,n,i=this;if(t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]}),Ke(i),Le._invalidate(i),!1!==Le.notify(i,"beforeUpdate")){i.tooltip._data=i.data;var a=i.buildOrUpdateControllers();for(e=0,n=i.data.datasets.length;e<n;e++)i.getDatasetMeta(e).controller.buildOrUpdateElements();i.updateLayout(),i.options.animation&&i.options.animation.duration&&V.each(a,(function(t){t.reset()})),i.updateDatasets(),i.tooltip.initialize(),i.lastActive=[],Le.notify(i,"afterUpdate"),i._layers.sort(Je("z","_idx")),i._bufferedRender?i._bufferedRequest={duration:t.duration,easing:t.easing,lazy:t.lazy}:i.render(t)}},updateLayout:function(){var t=this;!1!==Le.notify(t,"beforeLayout")&&(ge.update(this,this.width,this.height),t._layers=[],V.each(t.boxes,(function(e){e._configure&&e._configure(),t._layers.push.apply(t._layers,e._layers())}),t),t._layers.forEach((function(t,e){t._idx=e})),Le.notify(t,"afterScaleUpdate"),Le.notify(t,"afterLayout"))},updateDatasets:function(){if(!1!==Le.notify(this,"beforeDatasetsUpdate")){for(var t=0,e=this.data.datasets.length;t<e;++t)this.updateDataset(t);Le.notify(this,"afterDatasetsUpdate")}},updateDataset:function(t){var e=this.getDatasetMeta(t),n={meta:e,index:t};!1!==Le.notify(this,"beforeDatasetUpdate",[n])&&(e.controller._update(),Le.notify(this,"afterDatasetUpdate",[n]))},render:function(t){var e=this;t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]});var n=e.options.animation,i=Ye(t.duration,n&&n.duration),a=t.lazy;if(!1!==Le.notify(e,"beforeRender")){var r=function(t){Le.notify(e,"afterRender"),V.callback(n&&n.onComplete,[t],e)};if(n&&i){var o=new Z({numSteps:i/16.66,easing:t.easing||n.easing,render:function(t,e){var n=V.easing.effects[e.easing],i=e.currentStep,a=i/e.numSteps;t.draw(n(a),a,i)},onAnimationProgress:n.onProgress,onAnimationComplete:r});$.addAnimation(e,o,i,a)}else e.draw(),r(new Z({numSteps:0,chart:e}));return e}},draw:function(t){var e,n,i=this;if(i.clear(),V.isNullOrUndef(t)&&(t=1),i.transition(t),!(i.width<=0||i.height<=0)&&!1!==Le.notify(i,"beforeDraw",[t])){for(n=i._layers,e=0;e<n.length&&n[e].z<=0;++e)n[e].draw(i.chartArea);for(i.drawDatasets(t);e<n.length;++e)n[e].draw(i.chartArea);i._drawTooltip(t),Le.notify(i,"afterDraw",[t])}},transition:function(t){for(var e=0,n=(this.data.datasets||[]).length;e<n;++e)this.isDatasetVisible(e)&&this.getDatasetMeta(e).controller.transition(t);this.tooltip.transition(t)},_getSortedDatasetMetas:function(t){var e,n,i=[];for(e=0,n=(this.data.datasets||[]).length;e<n;++e)t&&!this.isDatasetVisible(e)||i.push(this.getDatasetMeta(e));return i.sort(Je("order","index")),i},_getSortedVisibleDatasetMetas:function(){return this._getSortedDatasetMetas(!0)},drawDatasets:function(t){var e,n;if(!1!==Le.notify(this,"beforeDatasetsDraw",[t])){for(n=(e=this._getSortedVisibleDatasetMetas()).length-1;n>=0;--n)this.drawDataset(e[n],t);Le.notify(this,"afterDatasetsDraw",[t])}},drawDataset:function(t,e){var n={meta:t,index:t.index,easingValue:e};!1!==Le.notify(this,"beforeDatasetDraw",[n])&&(t.controller.draw(e),Le.notify(this,"afterDatasetDraw",[n]))},_drawTooltip:function(t){var e=this.tooltip,n={tooltip:e,easingValue:t};!1!==Le.notify(this,"beforeTooltipDraw",[n])&&(e.draw(),Le.notify(this,"afterTooltipDraw",[n]))},getElementAtEvent:function(t){return ae.modes.single(this,t)},getElementsAtEvent:function(t){return ae.modes.label(this,t,{intersect:!0})},getElementsAtXAxis:function(t){return ae.modes["x-axis"](this,t,{intersect:!0})},getElementsAtEventForMode:function(t,e,n){var i=ae.modes[e];return"function"==typeof i?i(this,t,n):[]},getDatasetAtEvent:function(t){return ae.modes.dataset(this,t,{intersect:!0})},getDatasetMeta:function(t){var e=this.data.datasets[t];e._meta||(e._meta={});var n=e._meta[this.id];return n||(n=e._meta[this.id]={type:null,data:[],dataset:null,controller:null,hidden:null,xAxisID:null,yAxisID:null,order:e.order||0,index:t}),n},getVisibleDatasetCount:function(){for(var t=0,e=0,n=this.data.datasets.length;e<n;++e)this.isDatasetVisible(e)&&t++;return t},isDatasetVisible:function(t){var e=this.getDatasetMeta(t);return"boolean"==typeof e.hidden?!e.hidden:!this.data.datasets[t].hidden},generateLegend:function(){return this.options.legendCallback(this)},destroyDatasetMeta:function(t){var e=this.id,n=this.data.datasets[t],i=n._meta&&n._meta[e];i&&(i.controller.destroy(),delete n._meta[e])},destroy:function(){var t,e,n=this,i=n.canvas;for(n.stop(),t=0,e=n.data.datasets.length;t<e;++t)n.destroyDatasetMeta(t);i&&(n.unbindEvents(),V.canvas.clear(n),Fe.releaseContext(n.ctx),n.canvas=null,n.ctx=null),Le.notify(n,"destroy"),delete Qe.instances[n.id]},toBase64Image:function(){return this.canvas.toDataURL.apply(this.canvas,arguments)},initToolTip:function(){var t=this;t.tooltip=new Ue({_chart:t,_chartInstance:t,_data:t.data,_options:t.options.tooltips},t)},bindEvents:function(){var t=this,e=t._listeners={},n=function(){t.eventHandler.apply(t,arguments)};V.each(t.options.events,(function(i){Fe.addEventListener(t,i,n),e[i]=n})),t.options.responsive&&(n=function(){t.resize()},Fe.addEventListener(t,"resize",n),e.resize=n)},unbindEvents:function(){var t=this,e=t._listeners;e&&(delete t._listeners,V.each(e,(function(e,n){Fe.removeEventListener(t,n,e)})))},updateHoverStyle:function(t,e,n){var i,a,r,o=n?"set":"remove";for(a=0,r=t.length;a<r;++a)(i=t[a])&&this.getDatasetMeta(i._datasetIndex).controller[o+"HoverStyle"](i);"dataset"===e&&this.getDatasetMeta(t[0]._datasetIndex).controller["_"+o+"DatasetHoverStyle"]()},eventHandler:function(t){var e=this,n=e.tooltip;if(!1!==Le.notify(e,"beforeEvent",[t])){e._bufferedRender=!0,e._bufferedRequest=null;var i=e.handleEvent(t);n&&(i=n._start?n.handleEvent(t):i|n.handleEvent(t)),Le.notify(e,"afterEvent",[t]);var a=e._bufferedRequest;return a?e.render(a):i&&!e.animating&&(e.stop(),e.render({duration:e.options.hover.animationDuration,lazy:!0})),e._bufferedRender=!1,e._bufferedRequest=null,e}},handleEvent:function(t){var e,n=this,i=n.options||{},a=i.hover;return n.lastActive=n.lastActive||[],"mouseout"===t.type?n.active=[]:n.active=n.getElementsAtEventForMode(t,a.mode,a),V.callback(i.onHover||i.hover.onHover,[t.native,n.active],n),"mouseup"!==t.type&&"click"!==t.type||i.onClick&&i.onClick.call(n,t.native,n.active),n.lastActive.length&&n.updateHoverStyle(n.lastActive,a.mode,!1),n.active.length&&a.mode&&n.updateHoverStyle(n.active,a.mode,!0),e=!V.arrayEquals(n.active,n.lastActive),n.lastActive=n.active,e}}),Qe.instances={};var tn=Qe;Qe.Controller=Qe,Qe.types={},V.configMerge=Xe,V.scaleMerge=Ge;function en(){throw new Error("This method is not implemented: either no adapter can be found or an incomplete integration was provided.")}function nn(t){this.options=t||{}}V.extend(nn.prototype,{formats:en,parse:en,format:en,add:en,diff:en,startOf:en,endOf:en,_create:function(t){return t}}),nn.override=function(t){V.extend(nn.prototype,t)};var an={_date:nn},rn={formatters:{values:function(t){return V.isArray(t)?t:""+t},linear:function(t,e,n){var i=n.length>3?n[2]-n[1]:n[1]-n[0];Math.abs(i)>1&&t!==Math.floor(t)&&(i=t-Math.floor(t));var a=V.log10(Math.abs(i)),r="";if(0!==t)if(Math.max(Math.abs(n[0]),Math.abs(n[n.length-1]))<1e-4){var o=V.log10(Math.abs(t)),s=Math.floor(o)-Math.floor(a);s=Math.max(Math.min(s,20),0),r=t.toExponential(s)}else{var l=-1*Math.floor(a);l=Math.max(Math.min(l,20),0),r=t.toFixed(l)}else r="0";return r},logarithmic:function(t,e,n){var i=t/Math.pow(10,Math.floor(V.log10(t)));return 0===t?"0":1===i||2===i||5===i||0===e||e===n.length-1?t.toExponential():""}}},on=V.isArray,sn=V.isNullOrUndef,ln=V.valueOrDefault,un=V.valueAtIndexOrDefault;function dn(t,e,n){var i,a=t.getTicks().length,r=Math.min(e,a-1),o=t.getPixelForTick(r),s=t._startPixel,l=t._endPixel;if(!(n&&(i=1===a?Math.max(o-s,l-o):0===e?(t.getPixelForTick(1)-o)/2:(o-t.getPixelForTick(r-1))/2,(o+=r<e?i:-i)<s-1e-6||o>l+1e-6)))return o}function hn(t,e,n,i){var a,r,o,s,l,u,d,h,c,f,g,p,m,v=n.length,b=[],x=[],y=[];for(a=0;a<v;++a){if(s=n[a].label,l=n[a].major?e.major:e.minor,t.font=u=l.string,d=i[u]=i[u]||{data:{},gc:[]},h=l.lineHeight,c=f=0,sn(s)||on(s)){if(on(s))for(r=0,o=s.length;r<o;++r)g=s[r],sn(g)||on(g)||(c=V.measureText(t,d.data,d.gc,c,g),f+=h)}else c=V.measureText(t,d.data,d.gc,c,s),f=h;b.push(c),x.push(f),y.push(h/2)}function _(t){return{width:b[t]||0,height:x[t]||0,offset:y[t]||0}}return function(t,e){V.each(t,(function(t){var n,i=t.gc,a=i.length/2;if(a>e){for(n=0;n<a;++n)delete t.data[i[n]];i.splice(0,a)}}))}(i,v),p=b.indexOf(Math.max.apply(null,b)),m=x.indexOf(Math.max.apply(null,x)),{first:_(0),last:_(v-1),widest:_(p),highest:_(m)}}function cn(t){return t.drawTicks?t.tickMarkLength:0}function fn(t){var e,n;return t.display?(e=V.options._parseFont(t),n=V.options.toPadding(t.padding),e.lineHeight+n.height):0}function gn(t,e){return V.extend(V.options._parseFont({fontFamily:ln(e.fontFamily,t.fontFamily),fontSize:ln(e.fontSize,t.fontSize),fontStyle:ln(e.fontStyle,t.fontStyle),lineHeight:ln(e.lineHeight,t.lineHeight)}),{color:V.options.resolve([e.fontColor,t.fontColor,z.global.defaultFontColor])})}function pn(t){var e=gn(t,t.minor);return{minor:e,major:t.major.enabled?gn(t,t.major):e}}function mn(t){var e,n,i,a=[];for(n=0,i=t.length;n<i;++n)void 0!==(e=t[n])._index&&a.push(e);return a}function vn(t,e,n,i){var a,r,o,s,l=ln(n,0),u=Math.min(ln(i,t.length),t.length),d=0;for(e=Math.ceil(e),i&&(e=(a=i-n)/Math.floor(a/e)),s=l;s<0;)d++,s=Math.round(l+d*e);for(r=Math.max(l,0);r<u;r++)o=t[r],r===s?(o._index=r,d++,s=Math.round(l+d*e)):delete o.label}z._set("scale",{display:!0,position:"left",offset:!1,gridLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,drawBorder:!0,drawOnChartArea:!0,drawTicks:!0,tickMarkLength:10,zeroLineWidth:1,zeroLineColor:"rgba(0,0,0,0.25)",zeroLineBorderDash:[],zeroLineBorderDashOffset:0,offsetGridLines:!1,borderDash:[],borderDashOffset:0},scaleLabel:{display:!1,labelString:"",padding:{top:4,bottom:4}},ticks:{beginAtZero:!1,minRotation:0,maxRotation:50,mirror:!1,padding:0,reverse:!1,display:!0,autoSkip:!0,autoSkipPadding:0,labelOffset:0,callback:rn.formatters.values,minor:{},major:{}}});var bn=X.extend({zeroLineIndex:0,getPadding:function(){return{left:this.paddingLeft||0,top:this.paddingTop||0,right:this.paddingRight||0,bottom:this.paddingBottom||0}},getTicks:function(){return this._ticks},_getLabels:function(){var t=this.chart.data;return this.options.labels||(this.isHorizontal()?t.xLabels:t.yLabels)||t.labels||[]},mergeTicksOptions:function(){},beforeUpdate:function(){V.callback(this.options.beforeUpdate,[this])},update:function(t,e,n){var i,a,r,o,s,l=this,u=l.options.ticks,d=u.sampleSize;if(l.beforeUpdate(),l.maxWidth=t,l.maxHeight=e,l.margins=V.extend({left:0,right:0,top:0,bottom:0},n),l._ticks=null,l.ticks=null,l._labelSizes=null,l._maxLabelLines=0,l.longestLabelWidth=0,l.longestTextCache=l.longestTextCache||{},l._gridLineItems=null,l._labelItems=null,l.beforeSetDimensions(),l.setDimensions(),l.afterSetDimensions(),l.beforeDataLimits(),l.determineDataLimits(),l.afterDataLimits(),l.beforeBuildTicks(),o=l.buildTicks()||[],(!(o=l.afterBuildTicks(o)||o)||!o.length)&&l.ticks)for(o=[],i=0,a=l.ticks.length;i<a;++i)o.push({value:l.ticks[i],major:!1});return l._ticks=o,s=d<o.length,r=l._convertTicksToLabels(s?function(t,e){for(var n=[],i=t.length/e,a=0,r=t.length;a<r;a+=i)n.push(t[Math.floor(a)]);return n}(o,d):o),l._configure(),l.beforeCalculateTickRotation(),l.calculateTickRotation(),l.afterCalculateTickRotation(),l.beforeFit(),l.fit(),l.afterFit(),l._ticksToDraw=u.display&&(u.autoSkip||"auto"===u.source)?l._autoSkip(o):o,s&&(r=l._convertTicksToLabels(l._ticksToDraw)),l.ticks=r,l.afterUpdate(),l.minSize},_configure:function(){var t,e,n=this,i=n.options.ticks.reverse;n.isHorizontal()?(t=n.left,e=n.right):(t=n.top,e=n.bottom,i=!i),n._startPixel=t,n._endPixel=e,n._reversePixels=i,n._length=e-t},afterUpdate:function(){V.callback(this.options.afterUpdate,[this])},beforeSetDimensions:function(){V.callback(this.options.beforeSetDimensions,[this])},setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0},afterSetDimensions:function(){V.callback(this.options.afterSetDimensions,[this])},beforeDataLimits:function(){V.callback(this.options.beforeDataLimits,[this])},determineDataLimits:V.noop,afterDataLimits:function(){V.callback(this.options.afterDataLimits,[this])},beforeBuildTicks:function(){V.callback(this.options.beforeBuildTicks,[this])},buildTicks:V.noop,afterBuildTicks:function(t){var e=this;return on(t)&&t.length?V.callback(e.options.afterBuildTicks,[e,t]):(e.ticks=V.callback(e.options.afterBuildTicks,[e,e.ticks])||e.ticks,t)},beforeTickToLabelConversion:function(){V.callback(this.options.beforeTickToLabelConversion,[this])},convertTicksToLabels:function(){var t=this.options.ticks;this.ticks=this.ticks.map(t.userCallback||t.callback,this)},afterTickToLabelConversion:function(){V.callback(this.options.afterTickToLabelConversion,[this])},beforeCalculateTickRotation:function(){V.callback(this.options.beforeCalculateTickRotation,[this])},calculateTickRotation:function(){var t,e,n,i,a,r,o,s=this,l=s.options,u=l.ticks,d=s.getTicks().length,h=u.minRotation||0,c=u.maxRotation,f=h;!s._isVisible()||!u.display||h>=c||d<=1||!s.isHorizontal()?s.labelRotation=h:(e=(t=s._getLabelSizes()).widest.width,n=t.highest.height-t.highest.offset,i=Math.min(s.maxWidth,s.chart.width-e),e+6>(a=l.offset?s.maxWidth/d:i/(d-1))&&(a=i/(d-(l.offset?.5:1)),r=s.maxHeight-cn(l.gridLines)-u.padding-fn(l.scaleLabel),o=Math.sqrt(e*e+n*n),f=V.toDegrees(Math.min(Math.asin(Math.min((t.highest.height+6)/a,1)),Math.asin(Math.min(r/o,1))-Math.asin(n/o))),f=Math.max(h,Math.min(c,f))),s.labelRotation=f)},afterCalculateTickRotation:function(){V.callback(this.options.afterCalculateTickRotation,[this])},beforeFit:function(){V.callback(this.options.beforeFit,[this])},fit:function(){var t=this,e=t.minSize={width:0,height:0},n=t.chart,i=t.options,a=i.ticks,r=i.scaleLabel,o=i.gridLines,s=t._isVisible(),l="bottom"===i.position,u=t.isHorizontal();if(u?e.width=t.maxWidth:s&&(e.width=cn(o)+fn(r)),u?s&&(e.height=cn(o)+fn(r)):e.height=t.maxHeight,a.display&&s){var d=pn(a),h=t._getLabelSizes(),c=h.first,f=h.last,g=h.widest,p=h.highest,m=.4*d.minor.lineHeight,v=a.padding;if(u){var b=0!==t.labelRotation,x=V.toRadians(t.labelRotation),y=Math.cos(x),_=Math.sin(x),k=_*g.width+y*(p.height-(b?p.offset:0))+(b?0:m);e.height=Math.min(t.maxHeight,e.height+k+v);var w,M,S=t.getPixelForTick(0)-t.left,C=t.right-t.getPixelForTick(t.getTicks().length-1);b?(w=l?y*c.width+_*c.offset:_*(c.height-c.offset),M=l?_*(f.height-f.offset):y*f.width+_*f.offset):(w=c.width/2,M=f.width/2),t.paddingLeft=Math.max((w-S)*t.width/(t.width-S),0)+3,t.paddingRight=Math.max((M-C)*t.width/(t.width-C),0)+3}else{var P=a.mirror?0:g.width+v+m;e.width=Math.min(t.maxWidth,e.width+P),t.paddingTop=c.height/2,t.paddingBottom=f.height/2}}t.handleMargins(),u?(t.width=t._length=n.width-t.margins.left-t.margins.right,t.height=e.height):(t.width=e.width,t.height=t._length=n.height-t.margins.top-t.margins.bottom)},handleMargins:function(){var t=this;t.margins&&(t.margins.left=Math.max(t.paddingLeft,t.margins.left),t.margins.top=Math.max(t.paddingTop,t.margins.top),t.margins.right=Math.max(t.paddingRight,t.margins.right),t.margins.bottom=Math.max(t.paddingBottom,t.margins.bottom))},afterFit:function(){V.callback(this.options.afterFit,[this])},isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},isFullWidth:function(){return this.options.fullWidth},getRightValue:function(t){if(sn(t))return NaN;if(("number"==typeof t||t instanceof Number)&&!isFinite(t))return NaN;if(t)if(this.isHorizontal()){if(void 0!==t.x)return this.getRightValue(t.x)}else if(void 0!==t.y)return this.getRightValue(t.y);return t},_convertTicksToLabels:function(t){var e,n,i,a=this;for(a.ticks=t.map((function(t){return t.value})),a.beforeTickToLabelConversion(),e=a.convertTicksToLabels(t)||a.ticks,a.afterTickToLabelConversion(),n=0,i=t.length;n<i;++n)t[n].label=e[n];return e},_getLabelSizes:function(){var t=this,e=t._labelSizes;return e||(t._labelSizes=e=hn(t.ctx,pn(t.options.ticks),t.getTicks(),t.longestTextCache),t.longestLabelWidth=e.widest.width),e},_parseValue:function(t){var e,n,i,a;return on(t)?(e=+this.getRightValue(t[0]),n=+this.getRightValue(t[1]),i=Math.min(e,n),a=Math.max(e,n)):(e=void 0,n=t=+this.getRightValue(t),i=t,a=t),{min:i,max:a,start:e,end:n}},_getScaleLabel:function(t){var e=this._parseValue(t);return void 0!==e.start?"["+e.start+", "+e.end+"]":+this.getRightValue(t)},getLabelForIndex:V.noop,getPixelForValue:V.noop,getValueForPixel:V.noop,getPixelForTick:function(t){var e=this.options.offset,n=this._ticks.length,i=1/Math.max(n-(e?0:1),1);return t<0||t>n-1?null:this.getPixelForDecimal(t*i+(e?i/2:0))},getPixelForDecimal:function(t){return this._reversePixels&&(t=1-t),this._startPixel+t*this._length},getDecimalForPixel:function(t){var e=(t-this._startPixel)/this._length;return this._reversePixels?1-e:e},getBasePixel:function(){return this.getPixelForValue(this.getBaseValue())},getBaseValue:function(){var t=this.min,e=this.max;return this.beginAtZero?0:t<0&&e<0?e:t>0&&e>0?t:0},_autoSkip:function(t){var e,n,i,a,r=this.options.ticks,o=this._length,s=r.maxTicksLimit||o/this._tickSize()+1,l=r.major.enabled?function(t){var e,n,i=[];for(e=0,n=t.length;e<n;e++)t[e].major&&i.push(e);return i}(t):[],u=l.length,d=l[0],h=l[u-1];if(u>s)return function(t,e,n){var i,a,r=0,o=e[0];for(n=Math.ceil(n),i=0;i<t.length;i++)a=t[i],i===o?(a._index=i,o=e[++r*n]):delete a.label}(t,l,u/s),mn(t);if(i=function(t,e,n,i){var a,r,o,s,l=function(t){var e,n,i=t.length;if(i<2)return!1;for(n=t[0],e=1;e<i;++e)if(t[e]-t[e-1]!==n)return!1;return n}(t),u=(e.length-1)/i;if(!l)return Math.max(u,1);for(o=0,s=(a=V.math._factorize(l)).length-1;o<s;o++)if((r=a[o])>u)return r;return Math.max(u,1)}(l,t,0,s),u>0){for(e=0,n=u-1;e<n;e++)vn(t,i,l[e],l[e+1]);return a=u>1?(h-d)/(u-1):null,vn(t,i,V.isNullOrUndef(a)?0:d-a,d),vn(t,i,h,V.isNullOrUndef(a)?t.length:h+a),mn(t)}return vn(t,i),mn(t)},_tickSize:function(){var t=this.options.ticks,e=V.toRadians(this.labelRotation),n=Math.abs(Math.cos(e)),i=Math.abs(Math.sin(e)),a=this._getLabelSizes(),r=t.autoSkipPadding||0,o=a?a.widest.width+r:0,s=a?a.highest.height+r:0;return this.isHorizontal()?s*n>o*i?o/n:s/i:s*i<o*n?s/n:o/i},_isVisible:function(){var t,e,n,i=this.chart,a=this.options.display;if("auto"!==a)return!!a;for(t=0,e=i.data.datasets.length;t<e;++t)if(i.isDatasetVisible(t)&&((n=i.getDatasetMeta(t)).xAxisID===this.id||n.yAxisID===this.id))return!0;return!1},_computeGridLineItems:function(t){var e,n,i,a,r,o,s,l,u,d,h,c,f,g,p,m,v,b=this,x=b.chart,y=b.options,_=y.gridLines,k=y.position,w=_.offsetGridLines,M=b.isHorizontal(),S=b._ticksToDraw,C=S.length+(w?1:0),P=cn(_),A=[],D=_.drawBorder?un(_.lineWidth,0,0):0,T=D/2,I=V._alignPixel,F=function(t){return I(x,t,D)};for("top"===k?(e=F(b.bottom),s=b.bottom-P,u=e-T,h=F(t.top)+T,f=t.bottom):"bottom"===k?(e=F(b.top),h=t.top,f=F(t.bottom)-T,s=e+T,u=b.top+P):"left"===k?(e=F(b.right),o=b.right-P,l=e-T,d=F(t.left)+T,c=t.right):(e=F(b.left),d=t.left,c=F(t.right)-T,o=e+T,l=b.left+P),n=0;n<C;++n)i=S[n]||{},sn(i.label)&&n<S.length||(n===b.zeroLineIndex&&y.offset===w?(g=_.zeroLineWidth,p=_.zeroLineColor,m=_.zeroLineBorderDash||[],v=_.zeroLineBorderDashOffset||0):(g=un(_.lineWidth,n,1),p=un(_.color,n,"rgba(0,0,0,0.1)"),m=_.borderDash||[],v=_.borderDashOffset||0),void 0!==(a=dn(b,i._index||n,w))&&(r=I(x,a,g),M?o=l=d=c=r:s=u=h=f=r,A.push({tx1:o,ty1:s,tx2:l,ty2:u,x1:d,y1:h,x2:c,y2:f,width:g,color:p,borderDash:m,borderDashOffset:v})));return A.ticksLength=C,A.borderValue=e,A},_computeLabelItems:function(){var t,e,n,i,a,r,o,s,l,u,d,h,c=this,f=c.options,g=f.ticks,p=f.position,m=g.mirror,v=c.isHorizontal(),b=c._ticksToDraw,x=pn(g),y=g.padding,_=cn(f.gridLines),k=-V.toRadians(c.labelRotation),w=[];for("top"===p?(r=c.bottom-_-y,o=k?"left":"center"):"bottom"===p?(r=c.top+_+y,o=k?"right":"center"):"left"===p?(a=c.right-(m?0:_)-y,o=m?"left":"right"):(a=c.left+(m?0:_)+y,o=m?"right":"left"),t=0,e=b.length;t<e;++t)i=(n=b[t]).label,sn(i)||(s=c.getPixelForTick(n._index||t)+g.labelOffset,u=(l=n.major?x.major:x.minor).lineHeight,d=on(i)?i.length:1,v?(a=s,h="top"===p?((k?1:.5)-d)*u:(k?0:.5)*u):(r=s,h=(1-d)*u/2),w.push({x:a,y:r,rotation:k,label:i,font:l,textOffset:h,textAlign:o}));return w},_drawGrid:function(t){var e=this,n=e.options.gridLines;if(n.display){var i,a,r,o,s,l=e.ctx,u=e.chart,d=V._alignPixel,h=n.drawBorder?un(n.lineWidth,0,0):0,c=e._gridLineItems||(e._gridLineItems=e._computeGridLineItems(t));for(r=0,o=c.length;r<o;++r)i=(s=c[r]).width,a=s.color,i&&a&&(l.save(),l.lineWidth=i,l.strokeStyle=a,l.setLineDash&&(l.setLineDash(s.borderDash),l.lineDashOffset=s.borderDashOffset),l.beginPath(),n.drawTicks&&(l.moveTo(s.tx1,s.ty1),l.lineTo(s.tx2,s.ty2)),n.drawOnChartArea&&(l.moveTo(s.x1,s.y1),l.lineTo(s.x2,s.y2)),l.stroke(),l.restore());if(h){var f,g,p,m,v=h,b=un(n.lineWidth,c.ticksLength-1,1),x=c.borderValue;e.isHorizontal()?(f=d(u,e.left,v)-v/2,g=d(u,e.right,b)+b/2,p=m=x):(p=d(u,e.top,v)-v/2,m=d(u,e.bottom,b)+b/2,f=g=x),l.lineWidth=h,l.strokeStyle=un(n.color,0),l.beginPath(),l.moveTo(f,p),l.lineTo(g,m),l.stroke()}}},_drawLabels:function(){var t=this;if(t.options.ticks.display){var e,n,i,a,r,o,s,l,u=t.ctx,d=t._labelItems||(t._labelItems=t._computeLabelItems());for(e=0,i=d.length;e<i;++e){if(o=(r=d[e]).font,u.save(),u.translate(r.x,r.y),u.rotate(r.rotation),u.font=o.string,u.fillStyle=o.color,u.textBaseline="middle",u.textAlign=r.textAlign,s=r.label,l=r.textOffset,on(s))for(n=0,a=s.length;n<a;++n)u.fillText(""+s[n],0,l),l+=o.lineHeight;else u.fillText(s,0,l);u.restore()}}},_drawTitle:function(){var t=this,e=t.ctx,n=t.options,i=n.scaleLabel;if(i.display){var a,r,o=ln(i.fontColor,z.global.defaultFontColor),s=V.options._parseFont(i),l=V.options.toPadding(i.padding),u=s.lineHeight/2,d=n.position,h=0;if(t.isHorizontal())a=t.left+t.width/2,r="bottom"===d?t.bottom-u-l.bottom:t.top+u+l.top;else{var c="left"===d;a=c?t.left+u+l.top:t.right-u-l.top,r=t.top+t.height/2,h=c?-.5*Math.PI:.5*Math.PI}e.save(),e.translate(a,r),e.rotate(h),e.textAlign="center",e.textBaseline="middle",e.fillStyle=o,e.font=s.string,e.fillText(i.labelString,0,0),e.restore()}},draw:function(t){this._isVisible()&&(this._drawGrid(t),this._drawTitle(),this._drawLabels())},_layers:function(){var t=this,e=t.options,n=e.ticks&&e.ticks.z||0,i=e.gridLines&&e.gridLines.z||0;return t._isVisible()&&n!==i&&t.draw===t._draw?[{z:i,draw:function(){t._drawGrid.apply(t,arguments),t._drawTitle.apply(t,arguments)}},{z:n,draw:function(){t._drawLabels.apply(t,arguments)}}]:[{z:n,draw:function(){t.draw.apply(t,arguments)}}]},_getMatchingVisibleMetas:function(t){var e=this,n=e.isHorizontal();return e.chart._getSortedVisibleDatasetMetas().filter((function(i){return(!t||i.type===t)&&(n?i.xAxisID===e.id:i.yAxisID===e.id)}))}});bn.prototype._draw=bn.prototype.draw;var xn=bn,yn=V.isNullOrUndef,_n=xn.extend({determineDataLimits:function(){var t,e=this,n=e._getLabels(),i=e.options.ticks,a=i.min,r=i.max,o=0,s=n.length-1;void 0!==a&&(t=n.indexOf(a))>=0&&(o=t),void 0!==r&&(t=n.indexOf(r))>=0&&(s=t),e.minIndex=o,e.maxIndex=s,e.min=n[o],e.max=n[s]},buildTicks:function(){var t=this._getLabels(),e=this.minIndex,n=this.maxIndex;this.ticks=0===e&&n===t.length-1?t:t.slice(e,n+1)},getLabelForIndex:function(t,e){var n=this.chart;return n.getDatasetMeta(e).controller._getValueScaleId()===this.id?this.getRightValue(n.data.datasets[e].data[t]):this._getLabels()[t]},_configure:function(){var t=this,e=t.options.offset,n=t.ticks;xn.prototype._configure.call(t),t.isHorizontal()||(t._reversePixels=!t._reversePixels),n&&(t._startValue=t.minIndex-(e?.5:0),t._valueRange=Math.max(n.length-(e?0:1),1))},getPixelForValue:function(t,e,n){var i,a,r,o=this;return yn(e)||yn(n)||(t=o.chart.data.datasets[n].data[e]),yn(t)||(i=o.isHorizontal()?t.x:t.y),(void 0!==i||void 0!==t&&isNaN(e))&&(a=o._getLabels(),t=V.valueOrDefault(i,t),e=-1!==(r=a.indexOf(t))?r:e,isNaN(e)&&(e=t)),o.getPixelForDecimal((e-o._startValue)/o._valueRange)},getPixelForTick:function(t){var e=this.ticks;return t<0||t>e.length-1?null:this.getPixelForValue(e[t],t+this.minIndex)},getValueForPixel:function(t){var e=Math.round(this._startValue+this.getDecimalForPixel(t)*this._valueRange);return Math.min(Math.max(e,0),this.ticks.length-1)},getBasePixel:function(){return this.bottom}}),kn={position:"bottom"};_n._defaults=kn;var wn=V.noop,Mn=V.isNullOrUndef;var Sn=xn.extend({getRightValue:function(t){return"string"==typeof t?+t:xn.prototype.getRightValue.call(this,t)},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;if(e.beginAtZero){var n=V.sign(t.min),i=V.sign(t.max);n<0&&i<0?t.max=0:n>0&&i>0&&(t.min=0)}var a=void 0!==e.min||void 0!==e.suggestedMin,r=void 0!==e.max||void 0!==e.suggestedMax;void 0!==e.min?t.min=e.min:void 0!==e.suggestedMin&&(null===t.min?t.min=e.suggestedMin:t.min=Math.min(t.min,e.suggestedMin)),void 0!==e.max?t.max=e.max:void 0!==e.suggestedMax&&(null===t.max?t.max=e.suggestedMax:t.max=Math.max(t.max,e.suggestedMax)),a!==r&&t.min>=t.max&&(a?t.max=t.min+1:t.min=t.max-1),t.min===t.max&&(t.max++,e.beginAtZero||t.min--)},getTickLimit:function(){var t,e=this.options.ticks,n=e.stepSize,i=e.maxTicksLimit;return n?t=Math.ceil(this.max/n)-Math.floor(this.min/n)+1:(t=this._computeTickLimit(),i=i||11),i&&(t=Math.min(i,t)),t},_computeTickLimit:function(){return Number.POSITIVE_INFINITY},handleDirectionalChanges:wn,buildTicks:function(){var t=this,e=t.options.ticks,n=t.getTickLimit(),i={maxTicks:n=Math.max(2,n),min:e.min,max:e.max,precision:e.precision,stepSize:V.valueOrDefault(e.fixedStepSize,e.stepSize)},a=t.ticks=function(t,e){var n,i,a,r,o=[],s=t.stepSize,l=s||1,u=t.maxTicks-1,d=t.min,h=t.max,c=t.precision,f=e.min,g=e.max,p=V.niceNum((g-f)/u/l)*l;if(p<1e-14&&Mn(d)&&Mn(h))return[f,g];(r=Math.ceil(g/p)-Math.floor(f/p))>u&&(p=V.niceNum(r*p/u/l)*l),s||Mn(c)?n=Math.pow(10,V._decimalPlaces(p)):(n=Math.pow(10,c),p=Math.ceil(p*n)/n),i=Math.floor(f/p)*p,a=Math.ceil(g/p)*p,s&&(!Mn(d)&&V.almostWhole(d/p,p/1e3)&&(i=d),!Mn(h)&&V.almostWhole(h/p,p/1e3)&&(a=h)),r=(a-i)/p,r=V.almostEquals(r,Math.round(r),p/1e3)?Math.round(r):Math.ceil(r),i=Math.round(i*n)/n,a=Math.round(a*n)/n,o.push(Mn(d)?i:d);for(var m=1;m<r;++m)o.push(Math.round((i+m*p)*n)/n);return o.push(Mn(h)?a:h),o}(i,t);t.handleDirectionalChanges(),t.max=V.max(a),t.min=V.min(a),e.reverse?(a.reverse(),t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max)},convertTicksToLabels:function(){var t=this;t.ticksAsNumbers=t.ticks.slice(),t.zeroLineIndex=t.ticks.indexOf(0),xn.prototype.convertTicksToLabels.call(t)},_configure:function(){var t,e=this,n=e.getTicks(),i=e.min,a=e.max;xn.prototype._configure.call(e),e.options.offset&&n.length&&(i-=t=(a-i)/Math.max(n.length-1,1)/2,a+=t),e._startValue=i,e._endValue=a,e._valueRange=a-i}}),Cn={position:"left",ticks:{callback:rn.formatters.linear}};function Pn(t,e,n,i){var a,r,o=t.options,s=function(t,e,n){var i=[n.type,void 0===e&&void 0===n.stack?n.index:"",n.stack].join(".");return void 0===t[i]&&(t[i]={pos:[],neg:[]}),t[i]}(e,o.stacked,n),l=s.pos,u=s.neg,d=i.length;for(a=0;a<d;++a)r=t._parseValue(i[a]),isNaN(r.min)||isNaN(r.max)||n.data[a].hidden||(l[a]=l[a]||0,u[a]=u[a]||0,o.relativePoints?l[a]=100:r.min<0||r.max<0?u[a]+=r.min:l[a]+=r.max)}function An(t,e,n){var i,a,r=n.length;for(i=0;i<r;++i)a=t._parseValue(n[i]),isNaN(a.min)||isNaN(a.max)||e.data[i].hidden||(t.min=Math.min(t.min,a.min),t.max=Math.max(t.max,a.max))}var Dn=Sn.extend({determineDataLimits:function(){var t,e,n,i,a=this,r=a.options,o=a.chart.data.datasets,s=a._getMatchingVisibleMetas(),l=r.stacked,u={},d=s.length;if(a.min=Number.POSITIVE_INFINITY,a.max=Number.NEGATIVE_INFINITY,void 0===l)for(t=0;!l&&t<d;++t)l=void 0!==(e=s[t]).stack;for(t=0;t<d;++t)n=o[(e=s[t]).index].data,l?Pn(a,u,e,n):An(a,e,n);V.each(u,(function(t){i=t.pos.concat(t.neg),a.min=Math.min(a.min,V.min(i)),a.max=Math.max(a.max,V.max(i))})),a.min=V.isFinite(a.min)&&!isNaN(a.min)?a.min:0,a.max=V.isFinite(a.max)&&!isNaN(a.max)?a.max:1,a.handleTickRangeOptions()},_computeTickLimit:function(){var t;return this.isHorizontal()?Math.ceil(this.width/40):(t=V.options._parseFont(this.options.ticks),Math.ceil(this.height/t.lineHeight))},handleDirectionalChanges:function(){this.isHorizontal()||this.ticks.reverse()},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForValue:function(t){return this.getPixelForDecimal((+this.getRightValue(t)-this._startValue)/this._valueRange)},getValueForPixel:function(t){return this._startValue+this.getDecimalForPixel(t)*this._valueRange},getPixelForTick:function(t){var e=this.ticksAsNumbers;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])}}),Tn=Cn;Dn._defaults=Tn;var In=V.valueOrDefault,Fn=V.math.log10;var Ln={position:"left",ticks:{callback:rn.formatters.logarithmic}};function On(t,e){return V.isFinite(t)&&t>=0?t:e}var Rn=xn.extend({determineDataLimits:function(){var t,e,n,i,a,r,o=this,s=o.options,l=o.chart,u=l.data.datasets,d=o.isHorizontal();function h(t){return d?t.xAxisID===o.id:t.yAxisID===o.id}o.min=Number.POSITIVE_INFINITY,o.max=Number.NEGATIVE_INFINITY,o.minNotZero=Number.POSITIVE_INFINITY;var c=s.stacked;if(void 0===c)for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e)&&void 0!==e.stack){c=!0;break}if(s.stacked||c){var f={};for(t=0;t<u.length;t++){var g=[(e=l.getDatasetMeta(t)).type,void 0===s.stacked&&void 0===e.stack?t:"",e.stack].join(".");if(l.isDatasetVisible(t)&&h(e))for(void 0===f[g]&&(f[g]=[]),a=0,r=(i=u[t].data).length;a<r;a++){var p=f[g];n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(p[a]=p[a]||0,p[a]+=n.max)}}V.each(f,(function(t){if(t.length>0){var e=V.min(t),n=V.max(t);o.min=Math.min(o.min,e),o.max=Math.max(o.max,n)}}))}else for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e))for(a=0,r=(i=u[t].data).length;a<r;a++)n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(o.min=Math.min(n.min,o.min),o.max=Math.max(n.max,o.max),0!==n.min&&(o.minNotZero=Math.min(n.min,o.minNotZero)));o.min=V.isFinite(o.min)?o.min:null,o.max=V.isFinite(o.max)?o.max:null,o.minNotZero=V.isFinite(o.minNotZero)?o.minNotZero:null,this.handleTickRangeOptions()},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;t.min=On(e.min,t.min),t.max=On(e.max,t.max),t.min===t.max&&(0!==t.min&&null!==t.min?(t.min=Math.pow(10,Math.floor(Fn(t.min))-1),t.max=Math.pow(10,Math.floor(Fn(t.max))+1)):(t.min=1,t.max=10)),null===t.min&&(t.min=Math.pow(10,Math.floor(Fn(t.max))-1)),null===t.max&&(t.max=0!==t.min?Math.pow(10,Math.floor(Fn(t.min))+1):10),null===t.minNotZero&&(t.min>0?t.minNotZero=t.min:t.max<1?t.minNotZero=Math.pow(10,Math.floor(Fn(t.max))):t.minNotZero=1)},buildTicks:function(){var t=this,e=t.options.ticks,n=!t.isHorizontal(),i={min:On(e.min),max:On(e.max)},a=t.ticks=function(t,e){var n,i,a=[],r=In(t.min,Math.pow(10,Math.floor(Fn(e.min)))),o=Math.floor(Fn(e.max)),s=Math.ceil(e.max/Math.pow(10,o));0===r?(n=Math.floor(Fn(e.minNotZero)),i=Math.floor(e.minNotZero/Math.pow(10,n)),a.push(r),r=i*Math.pow(10,n)):(n=Math.floor(Fn(r)),i=Math.floor(r/Math.pow(10,n)));var l=n<0?Math.pow(10,Math.abs(n)):1;do{a.push(r),10===++i&&(i=1,l=++n>=0?1:l),r=Math.round(i*Math.pow(10,n)*l)/l}while(n<o||n===o&&i<s);var u=In(t.max,r);return a.push(u),a}(i,t);t.max=V.max(a),t.min=V.min(a),e.reverse?(n=!n,t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max),n&&a.reverse()},convertTicksToLabels:function(){this.tickValues=this.ticks.slice(),xn.prototype.convertTicksToLabels.call(this)},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForTick:function(t){var e=this.tickValues;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])},_getFirstTickValue:function(t){var e=Math.floor(Fn(t));return Math.floor(t/Math.pow(10,e))*Math.pow(10,e)},_configure:function(){var t=this,e=t.min,n=0;xn.prototype._configure.call(t),0===e&&(e=t._getFirstTickValue(t.minNotZero),n=In(t.options.ticks.fontSize,z.global.defaultFontSize)/t._length),t._startValue=Fn(e),t._valueOffset=n,t._valueRange=(Fn(t.max)-Fn(e))/(1-n)},getPixelForValue:function(t){var e=this,n=0;return(t=+e.getRightValue(t))>e.min&&t>0&&(n=(Fn(t)-e._startValue)/e._valueRange+e._valueOffset),e.getPixelForDecimal(n)},getValueForPixel:function(t){var e=this,n=e.getDecimalForPixel(t);return 0===n&&0===e.min?0:Math.pow(10,e._startValue+(n-e._valueOffset)*e._valueRange)}}),zn=Ln;Rn._defaults=zn;var Nn=V.valueOrDefault,Bn=V.valueAtIndexOrDefault,En=V.options.resolve,Wn={display:!0,animate:!0,position:"chartArea",angleLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,borderDash:[],borderDashOffset:0},gridLines:{circular:!1},ticks:{showLabelBackdrop:!0,backdropColor:"rgba(255,255,255,0.75)",backdropPaddingY:2,backdropPaddingX:2,callback:rn.formatters.linear},pointLabels:{display:!0,fontSize:10,callback:function(t){return t}}};function Vn(t){var e=t.ticks;return e.display&&t.display?Nn(e.fontSize,z.global.defaultFontSize)+2*e.backdropPaddingY:0}function Hn(t,e,n,i,a){return t===i||t===a?{start:e-n/2,end:e+n/2}:t<i||t>a?{start:e-n,end:e}:{start:e,end:e+n}}function jn(t){return 0===t||180===t?"center":t<180?"left":"right"}function qn(t,e,n,i){var a,r,o=n.y+i/2;if(V.isArray(e))for(a=0,r=e.length;a<r;++a)t.fillText(e[a],n.x,o),o+=i;else t.fillText(e,n.x,o)}function Un(t,e,n){90===t||270===t?n.y-=e.h/2:(t>270||t<90)&&(n.y-=e.h)}function Yn(t){return V.isNumber(t)?t:0}var Gn=Sn.extend({setDimensions:function(){var t=this;t.width=t.maxWidth,t.height=t.maxHeight,t.paddingTop=Vn(t.options)/2,t.xCenter=Math.floor(t.width/2),t.yCenter=Math.floor((t.height-t.paddingTop)/2),t.drawingArea=Math.min(t.height-t.paddingTop,t.width)/2},determineDataLimits:function(){var t=this,e=t.chart,n=Number.POSITIVE_INFINITY,i=Number.NEGATIVE_INFINITY;V.each(e.data.datasets,(function(a,r){if(e.isDatasetVisible(r)){var o=e.getDatasetMeta(r);V.each(a.data,(function(e,a){var r=+t.getRightValue(e);isNaN(r)||o.data[a].hidden||(n=Math.min(r,n),i=Math.max(r,i))}))}})),t.min=n===Number.POSITIVE_INFINITY?0:n,t.max=i===Number.NEGATIVE_INFINITY?0:i,t.handleTickRangeOptions()},_computeTickLimit:function(){return Math.ceil(this.drawingArea/Vn(this.options))},convertTicksToLabels:function(){var t=this;Sn.prototype.convertTicksToLabels.call(t),t.pointLabels=t.chart.data.labels.map((function(){var e=V.callback(t.options.pointLabels.callback,arguments,t);return e||0===e?e:""}))},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},fit:function(){var t=this.options;t.display&&t.pointLabels.display?function(t){var e,n,i,a=V.options._parseFont(t.options.pointLabels),r={l:0,r:t.width,t:0,b:t.height-t.paddingTop},o={};t.ctx.font=a.string,t._pointLabelSizes=[];var s,l,u,d=t.chart.data.labels.length;for(e=0;e<d;e++){i=t.getPointPosition(e,t.drawingArea+5),s=t.ctx,l=a.lineHeight,u=t.pointLabels[e],n=V.isArray(u)?{w:V.longestText(s,s.font,u),h:u.length*l}:{w:s.measureText(u).width,h:l},t._pointLabelSizes[e]=n;var h=t.getIndexAngle(e),c=V.toDegrees(h)%360,f=Hn(c,i.x,n.w,0,180),g=Hn(c,i.y,n.h,90,270);f.start<r.l&&(r.l=f.start,o.l=h),f.end>r.r&&(r.r=f.end,o.r=h),g.start<r.t&&(r.t=g.start,o.t=h),g.end>r.b&&(r.b=g.end,o.b=h)}t.setReductions(t.drawingArea,r,o)}(this):this.setCenterPoint(0,0,0,0)},setReductions:function(t,e,n){var i=this,a=e.l/Math.sin(n.l),r=Math.max(e.r-i.width,0)/Math.sin(n.r),o=-e.t/Math.cos(n.t),s=-Math.max(e.b-(i.height-i.paddingTop),0)/Math.cos(n.b);a=Yn(a),r=Yn(r),o=Yn(o),s=Yn(s),i.drawingArea=Math.min(Math.floor(t-(a+r)/2),Math.floor(t-(o+s)/2)),i.setCenterPoint(a,r,o,s)},setCenterPoint:function(t,e,n,i){var a=this,r=a.width-e-a.drawingArea,o=t+a.drawingArea,s=n+a.drawingArea,l=a.height-a.paddingTop-i-a.drawingArea;a.xCenter=Math.floor((o+r)/2+a.left),a.yCenter=Math.floor((s+l)/2+a.top+a.paddingTop)},getIndexAngle:function(t){var e=this.chart,n=(t*(360/e.data.labels.length)+((e.options||{}).startAngle||0))%360;return(n<0?n+360:n)*Math.PI*2/360},getDistanceFromCenterForValue:function(t){var e=this;if(V.isNullOrUndef(t))return NaN;var n=e.drawingArea/(e.max-e.min);return e.options.ticks.reverse?(e.max-t)*n:(t-e.min)*n},getPointPosition:function(t,e){var n=this.getIndexAngle(t)-Math.PI/2;return{x:Math.cos(n)*e+this.xCenter,y:Math.sin(n)*e+this.yCenter}},getPointPositionForValue:function(t,e){return this.getPointPosition(t,this.getDistanceFromCenterForValue(e))},getBasePosition:function(t){var e=this.min,n=this.max;return this.getPointPositionForValue(t||0,this.beginAtZero?0:e<0&&n<0?n:e>0&&n>0?e:0)},_drawGrid:function(){var t,e,n,i=this,a=i.ctx,r=i.options,o=r.gridLines,s=r.angleLines,l=Nn(s.lineWidth,o.lineWidth),u=Nn(s.color,o.color);if(r.pointLabels.display&&function(t){var e=t.ctx,n=t.options,i=n.pointLabels,a=Vn(n),r=t.getDistanceFromCenterForValue(n.ticks.reverse?t.min:t.max),o=V.options._parseFont(i);e.save(),e.font=o.string,e.textBaseline="middle";for(var s=t.chart.data.labels.length-1;s>=0;s--){var l=0===s?a/2:0,u=t.getPointPosition(s,r+l+5),d=Bn(i.fontColor,s,z.global.defaultFontColor);e.fillStyle=d;var h=t.getIndexAngle(s),c=V.toDegrees(h);e.textAlign=jn(c),Un(c,t._pointLabelSizes[s],u),qn(e,t.pointLabels[s],u,o.lineHeight)}e.restore()}(i),o.display&&V.each(i.ticks,(function(t,n){0!==n&&(e=i.getDistanceFromCenterForValue(i.ticksAsNumbers[n]),function(t,e,n,i){var a,r=t.ctx,o=e.circular,s=t.chart.data.labels.length,l=Bn(e.color,i-1),u=Bn(e.lineWidth,i-1);if((o||s)&&l&&u){if(r.save(),r.strokeStyle=l,r.lineWidth=u,r.setLineDash&&(r.setLineDash(e.borderDash||[]),r.lineDashOffset=e.borderDashOffset||0),r.beginPath(),o)r.arc(t.xCenter,t.yCenter,n,0,2*Math.PI);else{a=t.getPointPosition(0,n),r.moveTo(a.x,a.y);for(var d=1;d<s;d++)a=t.getPointPosition(d,n),r.lineTo(a.x,a.y)}r.closePath(),r.stroke(),r.restore()}}(i,o,e,n))})),s.display&&l&&u){for(a.save(),a.lineWidth=l,a.strokeStyle=u,a.setLineDash&&(a.setLineDash(En([s.borderDash,o.borderDash,[]])),a.lineDashOffset=En([s.borderDashOffset,o.borderDashOffset,0])),t=i.chart.data.labels.length-1;t>=0;t--)e=i.getDistanceFromCenterForValue(r.ticks.reverse?i.min:i.max),n=i.getPointPosition(t,e),a.beginPath(),a.moveTo(i.xCenter,i.yCenter),a.lineTo(n.x,n.y),a.stroke();a.restore()}},_drawLabels:function(){var t=this,e=t.ctx,n=t.options.ticks;if(n.display){var i,a,r=t.getIndexAngle(0),o=V.options._parseFont(n),s=Nn(n.fontColor,z.global.defaultFontColor);e.save(),e.font=o.string,e.translate(t.xCenter,t.yCenter),e.rotate(r),e.textAlign="center",e.textBaseline="middle",V.each(t.ticks,(function(r,l){(0!==l||n.reverse)&&(i=t.getDistanceFromCenterForValue(t.ticksAsNumbers[l]),n.showLabelBackdrop&&(a=e.measureText(r).width,e.fillStyle=n.backdropColor,e.fillRect(-a/2-n.backdropPaddingX,-i-o.size/2-n.backdropPaddingY,a+2*n.backdropPaddingX,o.size+2*n.backdropPaddingY)),e.fillStyle=s,e.fillText(r,0,-i))})),e.restore()}},_drawTitle:V.noop}),Xn=Wn;Gn._defaults=Xn;var Kn=V._deprecated,Zn=V.options.resolve,$n=V.valueOrDefault,Jn=Number.MIN_SAFE_INTEGER||-9007199254740991,Qn=Number.MAX_SAFE_INTEGER||9007199254740991,ti={millisecond:{common:!0,size:1,steps:1e3},second:{common:!0,size:1e3,steps:60},minute:{common:!0,size:6e4,steps:60},hour:{common:!0,size:36e5,steps:24},day:{common:!0,size:864e5,steps:30},week:{common:!1,size:6048e5,steps:4},month:{common:!0,size:2628e6,steps:12},quarter:{common:!1,size:7884e6,steps:4},year:{common:!0,size:3154e7}},ei=Object.keys(ti);function ni(t,e){return t-e}function ii(t){return V.valueOrDefault(t.time.min,t.ticks.min)}function ai(t){return V.valueOrDefault(t.time.max,t.ticks.max)}function ri(t,e,n,i){var a=function(t,e,n){for(var i,a,r,o=0,s=t.length-1;o>=0&&o<=s;){if(a=t[(i=o+s>>1)-1]||null,r=t[i],!a)return{lo:null,hi:r};if(r[e]<n)o=i+1;else{if(!(a[e]>n))return{lo:a,hi:r};s=i-1}}return{lo:r,hi:null}}(t,e,n),r=a.lo?a.hi?a.lo:t[t.length-2]:t[0],o=a.lo?a.hi?a.hi:t[t.length-1]:t[1],s=o[e]-r[e],l=s?(n-r[e])/s:0,u=(o[i]-r[i])*l;return r[i]+u}function oi(t,e){var n=t._adapter,i=t.options.time,a=i.parser,r=a||i.format,o=e;return"function"==typeof a&&(o=a(o)),V.isFinite(o)||(o="string"==typeof r?n.parse(o,r):n.parse(o)),null!==o?+o:(a||"function"!=typeof r||(o=r(e),V.isFinite(o)||(o=n.parse(o))),o)}function si(t,e){if(V.isNullOrUndef(e))return null;var n=t.options.time,i=oi(t,t.getRightValue(e));return null===i?i:(n.round&&(i=+t._adapter.startOf(i,n.round)),i)}function li(t,e,n,i){var a,r,o,s=ei.length;for(a=ei.indexOf(t);a<s-1;++a)if(o=(r=ti[ei[a]]).steps?r.steps:Qn,r.common&&Math.ceil((n-e)/(o*r.size))<=i)return ei[a];return ei[s-1]}function ui(t,e,n){var i,a,r=[],o={},s=e.length;for(i=0;i<s;++i)o[a=e[i]]=i,r.push({value:a,major:!1});return 0!==s&&n?function(t,e,n,i){var a,r,o=t._adapter,s=+o.startOf(e[0].value,i),l=e[e.length-1].value;for(a=s;a<=l;a=+o.add(a,1,i))(r=n[a])>=0&&(e[r].major=!0);return e}(t,r,o,n):r}var di=xn.extend({initialize:function(){this.mergeTicksOptions(),xn.prototype.initialize.call(this)},update:function(){var t=this,e=t.options,n=e.time||(e.time={}),i=t._adapter=new an._date(e.adapters.date);return Kn("time scale",n.format,"time.format","time.parser"),Kn("time scale",n.min,"time.min","ticks.min"),Kn("time scale",n.max,"time.max","ticks.max"),V.mergeIf(n.displayFormats,i.formats()),xn.prototype.update.apply(t,arguments)},getRightValue:function(t){return t&&void 0!==t.t&&(t=t.t),xn.prototype.getRightValue.call(this,t)},determineDataLimits:function(){var t,e,n,i,a,r,o,s=this,l=s.chart,u=s._adapter,d=s.options,h=d.time.unit||"day",c=Qn,f=Jn,g=[],p=[],m=[],v=s._getLabels();for(t=0,n=v.length;t<n;++t)m.push(si(s,v[t]));for(t=0,n=(l.data.datasets||[]).length;t<n;++t)if(l.isDatasetVisible(t))if(a=l.data.datasets[t].data,V.isObject(a[0]))for(p[t]=[],e=0,i=a.length;e<i;++e)r=si(s,a[e]),g.push(r),p[t][e]=r;else p[t]=m.slice(0),o||(g=g.concat(m),o=!0);else p[t]=[];m.length&&(c=Math.min(c,m[0]),f=Math.max(f,m[m.length-1])),g.length&&(g=n>1?function(t){var e,n,i,a={},r=[];for(e=0,n=t.length;e<n;++e)a[i=t[e]]||(a[i]=!0,r.push(i));return r}(g).sort(ni):g.sort(ni),c=Math.min(c,g[0]),f=Math.max(f,g[g.length-1])),c=si(s,ii(d))||c,f=si(s,ai(d))||f,c=c===Qn?+u.startOf(Date.now(),h):c,f=f===Jn?+u.endOf(Date.now(),h)+1:f,s.min=Math.min(c,f),s.max=Math.max(c+1,f),s._table=[],s._timestamps={data:g,datasets:p,labels:m}},buildTicks:function(){var t,e,n,i=this,a=i.min,r=i.max,o=i.options,s=o.ticks,l=o.time,u=i._timestamps,d=[],h=i.getLabelCapacity(a),c=s.source,f=o.distribution;for(u="data"===c||"auto"===c&&"series"===f?u.data:"labels"===c?u.labels:function(t,e,n,i){var a,r=t._adapter,o=t.options,s=o.time,l=s.unit||li(s.minUnit,e,n,i),u=Zn([s.stepSize,s.unitStepSize,1]),d="week"===l&&s.isoWeekday,h=e,c=[];if(d&&(h=+r.startOf(h,"isoWeek",d)),h=+r.startOf(h,d?"day":l),r.diff(n,e,l)>1e5*u)throw e+" and "+n+" are too far apart with stepSize of "+u+" "+l;for(a=h;a<n;a=+r.add(a,u,l))c.push(a);return a!==n&&"ticks"!==o.bounds||c.push(a),c}(i,a,r,h),"ticks"===o.bounds&&u.length&&(a=u[0],r=u[u.length-1]),a=si(i,ii(o))||a,r=si(i,ai(o))||r,t=0,e=u.length;t<e;++t)(n=u[t])>=a&&n<=r&&d.push(n);return i.min=a,i.max=r,i._unit=l.unit||(s.autoSkip?li(l.minUnit,i.min,i.max,h):function(t,e,n,i,a){var r,o;for(r=ei.length-1;r>=ei.indexOf(n);r--)if(o=ei[r],ti[o].common&&t._adapter.diff(a,i,o)>=e-1)return o;return ei[n?ei.indexOf(n):0]}(i,d.length,l.minUnit,i.min,i.max)),i._majorUnit=s.major.enabled&&"year"!==i._unit?function(t){for(var e=ei.indexOf(t)+1,n=ei.length;e<n;++e)if(ti[ei[e]].common)return ei[e]}(i._unit):void 0,i._table=function(t,e,n,i){if("linear"===i||!t.length)return[{time:e,pos:0},{time:n,pos:1}];var a,r,o,s,l,u=[],d=[e];for(a=0,r=t.length;a<r;++a)(s=t[a])>e&&s<n&&d.push(s);for(d.push(n),a=0,r=d.length;a<r;++a)l=d[a+1],o=d[a-1],s=d[a],void 0!==o&&void 0!==l&&Math.round((l+o)/2)===s||u.push({time:s,pos:a/(r-1)});return u}(i._timestamps.data,a,r,f),i._offsets=function(t,e,n,i,a){var r,o,s=0,l=0;return a.offset&&e.length&&(r=ri(t,"time",e[0],"pos"),s=1===e.length?1-r:(ri(t,"time",e[1],"pos")-r)/2,o=ri(t,"time",e[e.length-1],"pos"),l=1===e.length?o:(o-ri(t,"time",e[e.length-2],"pos"))/2),{start:s,end:l,factor:1/(s+1+l)}}(i._table,d,0,0,o),s.reverse&&d.reverse(),ui(i,d,i._majorUnit)},getLabelForIndex:function(t,e){var n=this,i=n._adapter,a=n.chart.data,r=n.options.time,o=a.labels&&t<a.labels.length?a.labels[t]:"",s=a.datasets[e].data[t];return V.isObject(s)&&(o=n.getRightValue(s)),r.tooltipFormat?i.format(oi(n,o),r.tooltipFormat):"string"==typeof o?o:i.format(oi(n,o),r.displayFormats.datetime)},tickFormatFunction:function(t,e,n,i){var a=this._adapter,r=this.options,o=r.time.displayFormats,s=o[this._unit],l=this._majorUnit,u=o[l],d=n[e],h=r.ticks,c=l&&u&&d&&d.major,f=a.format(t,i||(c?u:s)),g=c?h.major:h.minor,p=Zn([g.callback,g.userCallback,h.callback,h.userCallback]);return p?p(f,e,n):f},convertTicksToLabels:function(t){var e,n,i=[];for(e=0,n=t.length;e<n;++e)i.push(this.tickFormatFunction(t[e].value,e,t));return i},getPixelForOffset:function(t){var e=this._offsets,n=ri(this._table,"time",t,"pos");return this.getPixelForDecimal((e.start+n)*e.factor)},getPixelForValue:function(t,e,n){var i=null;if(void 0!==e&&void 0!==n&&(i=this._timestamps.datasets[n][e]),null===i&&(i=si(this,t)),null!==i)return this.getPixelForOffset(i)},getPixelForTick:function(t){var e=this.getTicks();return t>=0&&t<e.length?this.getPixelForOffset(e[t].value):null},getValueForPixel:function(t){var e=this._offsets,n=this.getDecimalForPixel(t)/e.factor-e.end,i=ri(this._table,"pos",n,"time");return this._adapter._create(i)},_getLabelSize:function(t){var e=this.options.ticks,n=this.ctx.measureText(t).width,i=V.toRadians(this.isHorizontal()?e.maxRotation:e.minRotation),a=Math.cos(i),r=Math.sin(i),o=$n(e.fontSize,z.global.defaultFontSize);return{w:n*a+o*r,h:n*r+o*a}},getLabelWidth:function(t){return this._getLabelSize(t).w},getLabelCapacity:function(t){var e=this,n=e.options.time,i=n.displayFormats,a=i[n.unit]||i.millisecond,r=e.tickFormatFunction(t,0,ui(e,[t],e._majorUnit),a),o=e._getLabelSize(r),s=Math.floor(e.isHorizontal()?e.width/o.w:e.height/o.h);return e.options.offset&&s--,s>0?s:1}}),hi={position:"bottom",distribution:"linear",bounds:"data",adapters:{},time:{parser:!1,unit:!1,round:!1,displayFormat:!1,isoWeekday:!1,minUnit:"millisecond",displayFormats:{}},ticks:{autoSkip:!1,source:"auto",major:{enabled:!1}}};di._defaults=hi;var ci={category:_n,linear:Dn,logarithmic:Rn,radialLinear:Gn,time:di},fi={datetime:"MMM D, YYYY, h:mm:ss a",millisecond:"h:mm:ss.SSS a",second:"h:mm:ss a",minute:"h:mm a",hour:"hA",day:"MMM D",week:"ll",month:"MMM YYYY",quarter:"[Q]Q - YYYY",year:"YYYY"};an._date.override("function"==typeof t?{_id:"moment",formats:function(){return fi},parse:function(e,n){return"string"==typeof e&&"string"==typeof n?e=t(e,n):e instanceof t||(e=t(e)),e.isValid()?e.valueOf():null},format:function(e,n){return t(e).format(n)},add:function(e,n,i){return t(e).add(n,i).valueOf()},diff:function(e,n,i){return t(e).diff(t(n),i)},startOf:function(e,n,i){return e=t(e),"isoWeek"===n?e.isoWeekday(i).valueOf():e.startOf(n).valueOf()},endOf:function(e,n){return t(e).endOf(n).valueOf()},_create:function(e){return t(e)}}:{}),z._set("global",{plugins:{filler:{propagate:!0}}});var gi={dataset:function(t){var e=t.fill,n=t.chart,i=n.getDatasetMeta(e),a=i&&n.isDatasetVisible(e)&&i.dataset._children||[],r=a.length||0;return r?function(t,e){return e<r&&a[e]._view||null}:null},boundary:function(t){var e=t.boundary,n=e?e.x:null,i=e?e.y:null;return V.isArray(e)?function(t,n){return e[n]}:function(t){return{x:null===n?t.x:n,y:null===i?t.y:i}}}};function pi(t,e,n){var i,a=t._model||{},r=a.fill;if(void 0===r&&(r=!!a.backgroundColor),!1===r||null===r)return!1;if(!0===r)return"origin";if(i=parseFloat(r,10),isFinite(i)&&Math.floor(i)===i)return"-"!==r[0]&&"+"!==r[0]||(i=e+i),!(i===e||i<0||i>=n)&&i;switch(r){case"bottom":return"start";case"top":return"end";case"zero":return"origin";case"origin":case"start":case"end":return r;default:return!1}}function mi(t){return(t.el._scale||{}).getPointPositionForValue?function(t){var e,n,i,a,r,o=t.el._scale,s=o.options,l=o.chart.data.labels.length,u=t.fill,d=[];if(!l)return null;for(e=s.ticks.reverse?o.max:o.min,n=s.ticks.reverse?o.min:o.max,i=o.getPointPositionForValue(0,e),a=0;a<l;++a)r="start"===u||"end"===u?o.getPointPositionForValue(a,"start"===u?e:n):o.getBasePosition(a),s.gridLines.circular&&(r.cx=i.x,r.cy=i.y,r.angle=o.getIndexAngle(a)-Math.PI/2),d.push(r);return d}(t):function(t){var e,n=t.el._model||{},i=t.el._scale||{},a=t.fill,r=null;if(isFinite(a))return null;if("start"===a?r=void 0===n.scaleBottom?i.bottom:n.scaleBottom:"end"===a?r=void 0===n.scaleTop?i.top:n.scaleTop:void 0!==n.scaleZero?r=n.scaleZero:i.getBasePixel&&(r=i.getBasePixel()),null!=r){if(void 0!==r.x&&void 0!==r.y)return r;if(V.isFinite(r))return{x:(e=i.isHorizontal())?r:null,y:e?null:r}}return null}(t)}function vi(t,e,n){var i,a=t[e].fill,r=[e];if(!n)return a;for(;!1!==a&&-1===r.indexOf(a);){if(!isFinite(a))return a;if(!(i=t[a]))return!1;if(i.visible)return a;r.push(a),a=i.fill}return!1}function bi(t){var e=t.fill,n="dataset";return!1===e?null:(isFinite(e)||(n="boundary"),gi[n](t))}function xi(t){return t&&!t.skip}function yi(t,e,n,i,a){var r,o,s,l;if(i&&a){for(t.moveTo(e[0].x,e[0].y),r=1;r<i;++r)V.canvas.lineTo(t,e[r-1],e[r]);if(void 0===n[0].angle)for(t.lineTo(n[a-1].x,n[a-1].y),r=a-1;r>0;--r)V.canvas.lineTo(t,n[r],n[r-1],!0);else for(o=n[0].cx,s=n[0].cy,l=Math.sqrt(Math.pow(n[0].x-o,2)+Math.pow(n[0].y-s,2)),r=a-1;r>0;--r)t.arc(o,s,l,n[r].angle,n[r-1].angle,!0)}}function _i(t,e,n,i,a,r){var o,s,l,u,d,h,c,f,g=e.length,p=i.spanGaps,m=[],v=[],b=0,x=0;for(t.beginPath(),o=0,s=g;o<s;++o)d=n(u=e[l=o%g]._view,l,i),h=xi(u),c=xi(d),r&&void 0===f&&h&&(s=g+(f=o+1)),h&&c?(b=m.push(u),x=v.push(d)):b&&x&&(p?(h&&m.push(u),c&&v.push(d)):(yi(t,m,v,b,x),b=x=0,m=[],v=[]));yi(t,m,v,b,x),t.closePath(),t.fillStyle=a,t.fill()}var ki={id:"filler",afterDatasetsUpdate:function(t,e){var n,i,a,r,o=(t.data.datasets||[]).length,s=e.propagate,l=[];for(i=0;i<o;++i)r=null,(a=(n=t.getDatasetMeta(i)).dataset)&&a._model&&a instanceof _t.Line&&(r={visible:t.isDatasetVisible(i),fill:pi(a,i,o),chart:t,el:a}),n.$filler=r,l.push(r);for(i=0;i<o;++i)(r=l[i])&&(r.fill=vi(l,i,s),r.boundary=mi(r),r.mapper=bi(r))},beforeDatasetsDraw:function(t){var e,n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas(),u=t.ctx;for(n=l.length-1;n>=0;--n)(e=l[n].$filler)&&e.visible&&(a=(i=e.el)._view,r=i._children||[],o=e.mapper,s=a.backgroundColor||z.global.defaultColor,o&&s&&r.length&&(V.canvas.clipArea(u,t.chartArea),_i(u,r,o,a,s,i._loop),V.canvas.unclipArea(u)))}},wi=V.rtl.getRtlAdapter,Mi=V.noop,Si=V.valueOrDefault;function Ci(t,e){return t.usePointStyle&&t.boxWidth>e?e:t.boxWidth}z._set("global",{legend:{display:!0,position:"top",align:"center",fullWidth:!0,reverse:!1,weight:1e3,onClick:function(t,e){var n=e.datasetIndex,i=this.chart,a=i.getDatasetMeta(n);a.hidden=null===a.hidden?!i.data.datasets[n].hidden:null,i.update()},onHover:null,onLeave:null,labels:{boxWidth:40,padding:10,generateLabels:function(t){var e=t.data.datasets,n=t.options.legend||{},i=n.labels&&n.labels.usePointStyle;return t._getSortedDatasetMetas().map((function(n){var a=n.controller.getStyle(i?0:void 0);return{text:e[n.index].label,fillStyle:a.backgroundColor,hidden:!t.isDatasetVisible(n.index),lineCap:a.borderCapStyle,lineDash:a.borderDash,lineDashOffset:a.borderDashOffset,lineJoin:a.borderJoinStyle,lineWidth:a.borderWidth,strokeStyle:a.borderColor,pointStyle:a.pointStyle,rotation:a.rotation,datasetIndex:n.index}}),this)}}},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data.datasets;for(a.setAttribute("class",t.id+"-legend"),e=0,n=r.length;e<n;e++)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=r[e].backgroundColor,r[e].label&&i.appendChild(document.createTextNode(r[e].label));return a.outerHTML}});var Pi=X.extend({initialize:function(t){V.extend(this,t),this.legendHitBoxes=[],this._hoveredItem=null,this.doughnutMode=!1},beforeUpdate:Mi,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Mi,beforeSetDimensions:Mi,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Mi,beforeBuildLabels:Mi,buildLabels:function(){var t=this,e=t.options.labels||{},n=V.callback(e.generateLabels,[t.chart],t)||[];e.filter&&(n=n.filter((function(n){return e.filter(n,t.chart.data)}))),t.options.reverse&&n.reverse(),t.legendItems=n},afterBuildLabels:Mi,beforeFit:Mi,fit:function(){var t=this,e=t.options,n=e.labels,i=e.display,a=t.ctx,r=V.options._parseFont(n),o=r.size,s=t.legendHitBoxes=[],l=t.minSize,u=t.isHorizontal();if(u?(l.width=t.maxWidth,l.height=i?10:0):(l.width=i?10:0,l.height=t.maxHeight),i){if(a.font=r.string,u){var d=t.lineWidths=[0],h=0;a.textAlign="left",a.textBaseline="middle",V.each(t.legendItems,(function(t,e){var i=Ci(n,o)+o/2+a.measureText(t.text).width;(0===e||d[d.length-1]+i+2*n.padding>l.width)&&(h+=o+n.padding,d[d.length-(e>0?0:1)]=0),s[e]={left:0,top:0,width:i,height:o},d[d.length-1]+=i+n.padding})),l.height+=h}else{var c=n.padding,f=t.columnWidths=[],g=t.columnHeights=[],p=n.padding,m=0,v=0;V.each(t.legendItems,(function(t,e){var i=Ci(n,o)+o/2+a.measureText(t.text).width;e>0&&v+o+2*c>l.height&&(p+=m+n.padding,f.push(m),g.push(v),m=0,v=0),m=Math.max(m,i),v+=o+c,s[e]={left:0,top:0,width:i,height:o}})),p+=m,f.push(m),g.push(v),l.width+=p}t.width=l.width,t.height=l.height}else t.width=l.width=t.height=l.height=0},afterFit:Mi,isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},draw:function(){var t=this,e=t.options,n=e.labels,i=z.global,a=i.defaultColor,r=i.elements.line,o=t.height,s=t.columnHeights,l=t.width,u=t.lineWidths;if(e.display){var d,h=wi(e.rtl,t.left,t.minSize.width),c=t.ctx,f=Si(n.fontColor,i.defaultFontColor),g=V.options._parseFont(n),p=g.size;c.textAlign=h.textAlign("left"),c.textBaseline="middle",c.lineWidth=.5,c.strokeStyle=f,c.fillStyle=f,c.font=g.string;var m=Ci(n,p),v=t.legendHitBoxes,b=function(t,i){switch(e.align){case"start":return n.padding;case"end":return t-i;default:return(t-i+n.padding)/2}},x=t.isHorizontal();d=x?{x:t.left+b(l,u[0]),y:t.top+n.padding,line:0}:{x:t.left+n.padding,y:t.top+b(o,s[0]),line:0},V.rtl.overrideTextDirection(t.ctx,e.textDirection);var y=p+n.padding;V.each(t.legendItems,(function(e,i){var f=c.measureText(e.text).width,g=m+p/2+f,_=d.x,k=d.y;h.setWidth(t.minSize.width),x?i>0&&_+g+n.padding>t.left+t.minSize.width&&(k=d.y+=y,d.line++,_=d.x=t.left+b(l,u[d.line])):i>0&&k+y>t.top+t.minSize.height&&(_=d.x=_+t.columnWidths[d.line]+n.padding,d.line++,k=d.y=t.top+b(o,s[d.line]));var w=h.x(_);!function(t,e,i){if(!(isNaN(m)||m<=0)){c.save();var o=Si(i.lineWidth,r.borderWidth);if(c.fillStyle=Si(i.fillStyle,a),c.lineCap=Si(i.lineCap,r.borderCapStyle),c.lineDashOffset=Si(i.lineDashOffset,r.borderDashOffset),c.lineJoin=Si(i.lineJoin,r.borderJoinStyle),c.lineWidth=o,c.strokeStyle=Si(i.strokeStyle,a),c.setLineDash&&c.setLineDash(Si(i.lineDash,r.borderDash)),n&&n.usePointStyle){var s=m*Math.SQRT2/2,l=h.xPlus(t,m/2),u=e+p/2;V.canvas.drawPoint(c,i.pointStyle,s,l,u,i.rotation)}else c.fillRect(h.leftForLtr(t,m),e,m,p),0!==o&&c.strokeRect(h.leftForLtr(t,m),e,m,p);c.restore()}}(w,k,e),v[i].left=h.leftForLtr(w,v[i].width),v[i].top=k,function(t,e,n,i){var a=p/2,r=h.xPlus(t,m+a),o=e+a;c.fillText(n.text,r,o),n.hidden&&(c.beginPath(),c.lineWidth=2,c.moveTo(r,o),c.lineTo(h.xPlus(r,i),o),c.stroke())}(w,k,e,f),x?d.x+=g+n.padding:d.y+=y})),V.rtl.restoreTextDirection(t.ctx,e.textDirection)}},_getLegendItemAt:function(t,e){var n,i,a,r=this;if(t>=r.left&&t<=r.right&&e>=r.top&&e<=r.bottom)for(a=r.legendHitBoxes,n=0;n<a.length;++n)if(t>=(i=a[n]).left&&t<=i.left+i.width&&e>=i.top&&e<=i.top+i.height)return r.legendItems[n];return null},handleEvent:function(t){var e,n=this,i=n.options,a="mouseup"===t.type?"click":t.type;if("mousemove"===a){if(!i.onHover&&!i.onLeave)return}else{if("click"!==a)return;if(!i.onClick)return}e=n._getLegendItemAt(t.x,t.y),"click"===a?e&&i.onClick&&i.onClick.call(n,t.native,e):(i.onLeave&&e!==n._hoveredItem&&(n._hoveredItem&&i.onLeave.call(n,t.native,n._hoveredItem),n._hoveredItem=e),i.onHover&&e&&i.onHover.call(n,t.native,e))}});function Ai(t,e){var n=new Pi({ctx:t.ctx,options:e,chart:t});ge.configure(t,n,e),ge.addBox(t,n),t.legend=n}var Di={id:"legend",_element:Pi,beforeInit:function(t){var e=t.options.legend;e&&Ai(t,e)},beforeUpdate:function(t){var e=t.options.legend,n=t.legend;e?(V.mergeIf(e,z.global.legend),n?(ge.configure(t,n,e),n.options=e):Ai(t,e)):n&&(ge.removeBox(t,n),delete t.legend)},afterEvent:function(t,e){var n=t.legend;n&&n.handleEvent(e)}},Ti=V.noop;z._set("global",{title:{display:!1,fontStyle:"bold",fullWidth:!0,padding:10,position:"top",text:"",weight:2e3}});var Ii=X.extend({initialize:function(t){V.extend(this,t),this.legendHitBoxes=[]},beforeUpdate:Ti,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Ti,beforeSetDimensions:Ti,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Ti,beforeBuildLabels:Ti,buildLabels:Ti,afterBuildLabels:Ti,beforeFit:Ti,fit:function(){var t,e=this,n=e.options,i=e.minSize={},a=e.isHorizontal();n.display?(t=(V.isArray(n.text)?n.text.length:1)*V.options._parseFont(n).lineHeight+2*n.padding,e.width=i.width=a?e.maxWidth:t,e.height=i.height=a?t:e.maxHeight):e.width=i.width=e.height=i.height=0},afterFit:Ti,isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},draw:function(){var t=this,e=t.ctx,n=t.options;if(n.display){var i,a,r,o=V.options._parseFont(n),s=o.lineHeight,l=s/2+n.padding,u=0,d=t.top,h=t.left,c=t.bottom,f=t.right;e.fillStyle=V.valueOrDefault(n.fontColor,z.global.defaultFontColor),e.font=o.string,t.isHorizontal()?(a=h+(f-h)/2,r=d+l,i=f-h):(a="left"===n.position?h+l:f-l,r=d+(c-d)/2,i=c-d,u=Math.PI*("left"===n.position?-.5:.5)),e.save(),e.translate(a,r),e.rotate(u),e.textAlign="center",e.textBaseline="middle";var g=n.text;if(V.isArray(g))for(var p=0,m=0;m<g.length;++m)e.fillText(g[m],0,p,i),p+=s;else e.fillText(g,0,0,i);e.restore()}}});function Fi(t,e){var n=new Ii({ctx:t.ctx,options:e,chart:t});ge.configure(t,n,e),ge.addBox(t,n),t.titleBlock=n}var Li={},Oi=ki,Ri=Di,zi={id:"title",_element:Ii,beforeInit:function(t){var e=t.options.title;e&&Fi(t,e)},beforeUpdate:function(t){var e=t.options.title,n=t.titleBlock;e?(V.mergeIf(e,z.global.title),n?(ge.configure(t,n,e),n.options=e):Fi(t,e)):n&&(ge.removeBox(t,n),delete t.titleBlock)}};for(var Ni in Li.filler=Oi,Li.legend=Ri,Li.title=zi,tn.helpers=V,function(){function t(t,e,n){var i;return"string"==typeof t?(i=parseInt(t,10),-1!==t.indexOf("%")&&(i=i/100*e.parentNode[n])):i=t,i}function e(t){return null!=t&&"none"!==t}function n(n,i,a){var r=document.defaultView,o=V._getParentNode(n),s=r.getComputedStyle(n)[i],l=r.getComputedStyle(o)[i],u=e(s),d=e(l),h=Number.POSITIVE_INFINITY;return u||d?Math.min(u?t(s,n,a):h,d?t(l,o,a):h):"none"}V.where=function(t,e){if(V.isArray(t)&&Array.prototype.filter)return t.filter(e);var n=[];return V.each(t,(function(t){e(t)&&n.push(t)})),n},V.findIndex=Array.prototype.findIndex?function(t,e,n){return t.findIndex(e,n)}:function(t,e,n){n=void 0===n?t:n;for(var i=0,a=t.length;i<a;++i)if(e.call(n,t[i],i,t))return i;return-1},V.findNextWhere=function(t,e,n){V.isNullOrUndef(n)&&(n=-1);for(var i=n+1;i<t.length;i++){var a=t[i];if(e(a))return a}},V.findPreviousWhere=function(t,e,n){V.isNullOrUndef(n)&&(n=t.length);for(var i=n-1;i>=0;i--){var a=t[i];if(e(a))return a}},V.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},V.almostEquals=function(t,e,n){return Math.abs(t-e)<n},V.almostWhole=function(t,e){var n=Math.round(t);return n-e<=t&&n+e>=t},V.max=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.max(t,e)}),Number.NEGATIVE_INFINITY)},V.min=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.min(t,e)}),Number.POSITIVE_INFINITY)},V.sign=Math.sign?function(t){return Math.sign(t)}:function(t){return 0===(t=+t)||isNaN(t)?t:t>0?1:-1},V.toRadians=function(t){return t*(Math.PI/180)},V.toDegrees=function(t){return t*(180/Math.PI)},V._decimalPlaces=function(t){if(V.isFinite(t)){for(var e=1,n=0;Math.round(t*e)/e!==t;)e*=10,n++;return n}},V.getAngleFromPoint=function(t,e){var n=e.x-t.x,i=e.y-t.y,a=Math.sqrt(n*n+i*i),r=Math.atan2(i,n);return r<-.5*Math.PI&&(r+=2*Math.PI),{angle:r,distance:a}},V.distanceBetweenPoints=function(t,e){return Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))},V.aliasPixel=function(t){return t%2==0?0:.5},V._alignPixel=function(t,e,n){var i=t.currentDevicePixelRatio,a=n/2;return Math.round((e-a)*i)/i+a},V.splineCurve=function(t,e,n,i){var a=t.skip?e:t,r=e,o=n.skip?e:n,s=Math.sqrt(Math.pow(r.x-a.x,2)+Math.pow(r.y-a.y,2)),l=Math.sqrt(Math.pow(o.x-r.x,2)+Math.pow(o.y-r.y,2)),u=s/(s+l),d=l/(s+l),h=i*(u=isNaN(u)?0:u),c=i*(d=isNaN(d)?0:d);return{previous:{x:r.x-h*(o.x-a.x),y:r.y-h*(o.y-a.y)},next:{x:r.x+c*(o.x-a.x),y:r.y+c*(o.y-a.y)}}},V.EPSILON=Number.EPSILON||1e-14,V.splineCurveMonotone=function(t){var e,n,i,a,r,o,s,l,u,d=(t||[]).map((function(t){return{model:t._model,deltaK:0,mK:0}})),h=d.length;for(e=0;e<h;++e)if(!(i=d[e]).model.skip){if(n=e>0?d[e-1]:null,(a=e<h-1?d[e+1]:null)&&!a.model.skip){var c=a.model.x-i.model.x;i.deltaK=0!==c?(a.model.y-i.model.y)/c:0}!n||n.model.skip?i.mK=i.deltaK:!a||a.model.skip?i.mK=n.deltaK:this.sign(n.deltaK)!==this.sign(i.deltaK)?i.mK=0:i.mK=(n.deltaK+i.deltaK)/2}for(e=0;e<h-1;++e)i=d[e],a=d[e+1],i.model.skip||a.model.skip||(V.almostEquals(i.deltaK,0,this.EPSILON)?i.mK=a.mK=0:(r=i.mK/i.deltaK,o=a.mK/i.deltaK,(l=Math.pow(r,2)+Math.pow(o,2))<=9||(s=3/Math.sqrt(l),i.mK=r*s*i.deltaK,a.mK=o*s*i.deltaK)));for(e=0;e<h;++e)(i=d[e]).model.skip||(n=e>0?d[e-1]:null,a=e<h-1?d[e+1]:null,n&&!n.model.skip&&(u=(i.model.x-n.model.x)/3,i.model.controlPointPreviousX=i.model.x-u,i.model.controlPointPreviousY=i.model.y-u*i.mK),a&&!a.model.skip&&(u=(a.model.x-i.model.x)/3,i.model.controlPointNextX=i.model.x+u,i.model.controlPointNextY=i.model.y+u*i.mK))},V.nextItem=function(t,e,n){return n?e>=t.length-1?t[0]:t[e+1]:e>=t.length-1?t[t.length-1]:t[e+1]},V.previousItem=function(t,e,n){return n?e<=0?t[t.length-1]:t[e-1]:e<=0?t[0]:t[e-1]},V.niceNum=function(t,e){var n=Math.floor(V.log10(t)),i=t/Math.pow(10,n);return(e?i<1.5?1:i<3?2:i<7?5:10:i<=1?1:i<=2?2:i<=5?5:10)*Math.pow(10,n)},V.requestAnimFrame="undefined"==typeof window?function(t){t()}:window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)},V.getRelativePosition=function(t,e){var n,i,a=t.originalEvent||t,r=t.target||t.srcElement,o=r.getBoundingClientRect(),s=a.touches;s&&s.length>0?(n=s[0].clientX,i=s[0].clientY):(n=a.clientX,i=a.clientY);var l=parseFloat(V.getStyle(r,"padding-left")),u=parseFloat(V.getStyle(r,"padding-top")),d=parseFloat(V.getStyle(r,"padding-right")),h=parseFloat(V.getStyle(r,"padding-bottom")),c=o.right-o.left-l-d,f=o.bottom-o.top-u-h;return{x:n=Math.round((n-o.left-l)/c*r.width/e.currentDevicePixelRatio),y:i=Math.round((i-o.top-u)/f*r.height/e.currentDevicePixelRatio)}},V.getConstraintWidth=function(t){return n(t,"max-width","clientWidth")},V.getConstraintHeight=function(t){return n(t,"max-height","clientHeight")},V._calculatePadding=function(t,e,n){return(e=V.getStyle(t,e)).indexOf("%")>-1?n*parseInt(e,10)/100:parseInt(e,10)},V._getParentNode=function(t){var e=t.parentNode;return e&&"[object ShadowRoot]"===e.toString()&&(e=e.host),e},V.getMaximumWidth=function(t){var e=V._getParentNode(t);if(!e)return t.clientWidth;var n=e.clientWidth,i=n-V._calculatePadding(e,"padding-left",n)-V._calculatePadding(e,"padding-right",n),a=V.getConstraintWidth(t);return isNaN(a)?i:Math.min(i,a)},V.getMaximumHeight=function(t){var e=V._getParentNode(t);if(!e)return t.clientHeight;var n=e.clientHeight,i=n-V._calculatePadding(e,"padding-top",n)-V._calculatePadding(e,"padding-bottom",n),a=V.getConstraintHeight(t);return isNaN(a)?i:Math.min(i,a)},V.getStyle=function(t,e){return t.currentStyle?t.currentStyle[e]:document.defaultView.getComputedStyle(t,null).getPropertyValue(e)},V.retinaScale=function(t,e){var n=t.currentDevicePixelRatio=e||"undefined"!=typeof window&&window.devicePixelRatio||1;if(1!==n){var i=t.canvas,a=t.height,r=t.width;i.height=a*n,i.width=r*n,t.ctx.scale(n,n),i.style.height||i.style.width||(i.style.height=a+"px",i.style.width=r+"px")}},V.fontString=function(t,e,n){return e+" "+t+"px "+n},V.longestText=function(t,e,n,i){var a=(i=i||{}).data=i.data||{},r=i.garbageCollect=i.garbageCollect||[];i.font!==e&&(a=i.data={},r=i.garbageCollect=[],i.font=e),t.font=e;var o,s,l,u,d,h=0,c=n.length;for(o=0;o<c;o++)if(null!=(u=n[o])&&!0!==V.isArray(u))h=V.measureText(t,a,r,h,u);else if(V.isArray(u))for(s=0,l=u.length;s<l;s++)null==(d=u[s])||V.isArray(d)||(h=V.measureText(t,a,r,h,d));var f=r.length/2;if(f>n.length){for(o=0;o<f;o++)delete a[r[o]];r.splice(0,f)}return h},V.measureText=function(t,e,n,i,a){var r=e[a];return r||(r=e[a]=t.measureText(a).width,n.push(a)),r>i&&(i=r),i},V.numberOfLabelLines=function(t){var e=1;return V.each(t,(function(t){V.isArray(t)&&t.length>e&&(e=t.length)})),e},V.color=k?function(t){return t instanceof CanvasGradient&&(t=z.global.defaultColor),k(t)}:function(t){return console.error("Color.js not found!"),t},V.getHoverColor=function(t){return t instanceof CanvasPattern||t instanceof CanvasGradient?t:V.color(t).saturate(.5).darken(.1).rgbString()}}(),tn._adapters=an,tn.Animation=Z,tn.animationService=$,tn.controllers=$t,tn.DatasetController=nt,tn.defaults=z,tn.Element=X,tn.elements=_t,tn.Interaction=ae,tn.layouts=ge,tn.platform=Fe,tn.plugins=Le,tn.Scale=xn,tn.scaleService=Oe,tn.Ticks=rn,tn.Tooltip=Ue,tn.helpers.each(ci,(function(t,e){tn.scaleService.registerScaleType(e,t,t._defaults)})),Li)Li.hasOwnProperty(Ni)&&tn.plugins.register(Li[Ni]);tn.platform.initialize();var Bi=tn;return"undefined"!=typeof window&&(window.Chart=tn),tn.Chart=tn,tn.Legend=Li.legend._element,tn.Title=Li.title._element,tn.pluginService=tn.plugins,tn.PluginBase=tn.Element.extend({}),tn.canvasHelpers=tn.helpers.canvas,tn.layoutService=tn.layouts,tn.LinearScaleBase=Sn,tn.helpers.each(["Bar","Bubble","Doughnut","Line","PolarArea","Radar","Scatter"],(function(t){tn[t]=function(e,n){return new tn(e,tn.helpers.merge(n||{},{type:t.charAt(0).toLowerCase()+t.slice(1)}))}})),Bi}));
diff --git a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.general.js b/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.general.js
deleted file mode 100644
index c4aecdbcd..000000000
--- a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.general.js
+++ /dev/null
@@ -1,63 +0,0 @@
-
-/**
- * 
- * Show welcome page
- * 
- * @author Ziheng Sun
- * 
- */
-
-GW.general = {
-		
-		process_code_editor: null, 
-		
-		init: function(){
-			
-			
-			
-		},
-		
-		displayObject: function(type, msg){
-			
-			if(type=="process"){
-				
-				this.displayProcess(msg);
-				
-			}else if(type="host"){
-				
-				this.displayHost(msg);
-				
-			}else if(type=="workflow"){
-				
-				this.displayWorkflow(msg);
-				
-			}
-			
-		},
-		
-		getCodeStyleByLang: function(lang){
-			
-			var codestyle = "text/x-shell";
-			
-			if(lang == "shell"){
-				
-				codestyle = "";
-				
-			}else if(lang == "python"){
-				
-				codestyle = "";
-				
-			}
-			
-			return codestyle;
-			
-		}
-		
-		
-		
-		
-		
-		
-		
-		
-}
\ No newline at end of file
diff --git a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.main.js b/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.main.js
deleted file mode 100644
index 46780f320..000000000
--- a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.main.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
-*
-* Geoweaver main function
-* 
-* @author Ziheng Sun
-* 
-* @date 20 Aug 2018
-* 
-*/
-
-GW.main = {
-	
-	init: function(){
-		
-		$("#menuheader").val("Geoweaver v" + GW.version);
-		
-		GW.workspace.init();
-		
-		GW.toolbar.init();
-		
-		GW.general.init();
-		
-		GW.menu.init();
-		
-		GW.ssh.startLogSocket();
-		
-	}
-		
-};
-
-GW.main.init();
\ No newline at end of file
diff --git a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.about.js b/WebContent/geoweaver/js/gw.about.js
similarity index 100%
rename from WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.about.js
rename to WebContent/geoweaver/js/gw.about.js
diff --git a/WebContent/geoweaver/js/gw.chart.js b/WebContent/geoweaver/js/gw.chart.js
new file mode 100644
index 000000000..07bd82cce
--- /dev/null
+++ b/WebContent/geoweaver/js/gw.chart.js
@@ -0,0 +1,431 @@
+
+
+GW.chart = {
+		
+		history_chart: {},
+		
+		chartColors : {
+				red: 'rgb(255, 99, 132)',
+				orange: 'rgb(255, 159, 64)',
+				yellow: 'rgb(255, 205, 86)',
+				green: 'rgb(75, 192, 192)',
+				blue: 'rgb(54, 162, 235)',
+				purple: 'rgb(153, 102, 255)',
+				grey: 'rgb(201, 203, 207)'
+			},
+			
+		MONTHS : [
+				'January',
+				'February',
+				'March',
+				'April',
+				'May',
+				'June',
+				'July',
+				'August',
+				'September',
+				'October',
+				'November',
+				'December'
+			],
+
+		COLORS : [
+				'#4dc9f6',
+				'#f67019',
+				'#f53794',
+				'#537bc4',
+				'#acc236',
+				'#166a8f',
+				'#00a950',
+				'#58595b',
+				'#8549ba'
+			],
+
+		utils : {
+			// Adapted from http://indiegamr.com/generate-repeatable-random-numbers-in-js/
+			srand: function(seed) {
+				this._seed = seed;
+			},
+
+			rand: function(min, max) {
+				var seed = this._seed;
+				min = min === undefined ? 0 : min;
+				max = max === undefined ? 1 : max;
+				this._seed = (seed * 9301 + 49297) % 233280;
+				var res =  min + (this._seed / 233280) * (max - min);
+				return res;
+			},
+
+			numbers: function(config) {
+				var cfg = config || {};
+				var min = cfg.min || 0;
+				var max = cfg.max || 1;
+				var from = cfg.from || [];
+				var count = cfg.count || 8;
+				var decimals = cfg.decimals || 8;
+				var continuity = cfg.continuity || 1;
+				var dfactor = Math.pow(10, decimals) || 0;
+				var data = [];
+				var i, value;
+
+				for (i = 0; i < count; ++i) {
+					value = (from[i] || 0) + this.rand(min, max);
+					if (this.rand() <= continuity) {
+						data.push(Math.round(dfactor * value) / dfactor);
+					} else {
+						data.push(null);
+					}
+				}
+
+				return data;
+			},
+
+			labels: function(config) {
+				var cfg = config || {};
+				var min = cfg.min || 0;
+				var max = cfg.max || 100;
+				var count = cfg.count || 8;
+				var step = (max - min) / count;
+				var decimals = cfg.decimals || 8;
+				var dfactor = Math.pow(10, decimals) || 0;
+				var prefix = cfg.prefix || '';
+				var values = [];
+				var i;
+
+				for (i = min; i < max; i += step) {
+					values.push(prefix + Math.round(dfactor * i) / dfactor);
+				}
+
+				return values;
+			},
+
+			months: function(config) {
+				var cfg = config || {};
+				var count = cfg.count || 12;
+				var section = cfg.section;
+				var values = [];
+				var i, value;
+
+				for (i = 0; i < count; ++i) {
+					value = MONTHS[Math.ceil(i) % 12];
+					values.push(value.substring(0, section));
+				}
+
+				return values;
+			},
+
+			color: function(index) {
+				return COLORS[index % COLORS.length];
+			},
+
+			transparentize: function(color, opacity) {
+				var alpha = opacity === undefined ? 0.5 : 1 - opacity;
+				return Color(color).alpha(alpha).rgbString();
+			}
+		},
+
+		randomScalingFactor : function() {
+				var num =  Math.round(this.utils.rand(-100, 100));
+//				console.log("numbers: " + num)
+				return num
+		},
+		
+		getYYYYMMDD: function(date){
+			
+			var yyyy = date.getFullYear();
+			
+			var mm = date.getMonth() + 1;
+			
+			var mm = (mm>9 ? '' : '0') + mm;
+			
+			var dd = date.getDate();
+			
+			var dd = (dd>9 ? '' : '0') + dd;
+			
+			return yyyy + mm + dd;
+			
+		},
+		
+		isInSameDay: function(date1, date2){
+			
+			var day1 = this.getYYYYMMDD(date1);
+			
+			var day2 = this.getYYYYMMDD(date2);
+			
+			var isin = false;
+			
+			if(day1==day2){
+				
+				isin  =true;
+				
+			}
+			
+			return isin;
+			
+		},
+		
+		renderUtil: function(type, msg){
+			
+			this.utils.srand(Date.now());
+			
+			var labels = [], succeed = [], failed = [], running = [], unknown = [];
+			
+//			2019-12-05 15:27:13
+			
+//			{
+//				"id": "ek10vz3vx4hw",
+//				"begin_time": "2019-12-05 15:27:13",
+//				"end_time": "2019-12-05 15:27:14",
+//				"output": "start to prepare landsat into training dataset<br/>./geoweaver-e2hwnqorms4j.sh: line 5: cd: /home/zsun/dl-cdl/bin/: No such file or directory<br/>test ctrl+s<br/>mkdir: cannot create directory â??../data/cdl-projected/â??: No such file or directory<br/>../data/cdl-raw//*cdls.img<br/> gdalwarp -overwrite -t_srs EPSG:32614 -of GTiff ../data/cdl-raw//*cdls.img ../data/cdl-projected/*cdls.img_32614.tif<br/>ERROR 4: ../data/cdl-raw//*cdls.img: No such file or directory<br/>mkdir: cannot create directory â??../data/landsat-unzip/â??: No such file or directory<br/>mkdir: cannot create directory â??../data/tileindex/â??: No such file or directory<br/>mkdir: cannot create directory â??../data/cdl-cut/â??: No such file or directory<br/>../data/landsat//*<br/>get file name: *<br/>current date is: <br/>found band1 image: ../data/landsat-unzip//**band1*<br/>already unzipped<br/>../data/landsat-unzip//*band1*<br/>get band name: *band1*<br/>current date is: <br/>found band1 image: ../data/cdl-cut//**band1*<br/>./geoweaver-e2hwnqorms4j.sh: line 95: [: -lt: unary operator expected<br/>there is no CDL fro this year or the scene has already been cutted, skipping<br/>end the data preparation<br/>",
+//				"status": "Done",
+//				"host": "kps1gf"
+//			}
+			
+			//sort the array ascending from early to later
+			
+			for(var i=0;i<msg.length;i+=1){
+				
+				var current_time = new Date(msg[i].begin_time);
+				
+				for(var j=i+1;j<msg.length;j+=1){
+					
+					var next_time = new Date(msg[j].begin_time);
+					
+					if(current_time.getTime() > next_time.getTime()){
+						
+						var swap = msg[i];
+						msg[i] = msg[j];
+						msg[j] = swap;
+						current_time = new Date(msg[i].begin_time);
+						
+					}
+					
+				}
+				
+			}
+
+			console.log("Sorted Array: ", msg);
+			
+			//count how many runs on each day
+			
+			var previous = null;
+			
+			var suc_times = 0, fail_times = 0, running_times = 0, unknown_times = 0;
+			
+			for(var i=0;i<msg.length;i+=1){
+				
+				var current = new Date(msg[i].begin_time);
+				
+				if(previous==null){
+					
+					previous = current;
+					
+					labels.push(this.getYYYYMMDD(current));
+					
+					if(msg[i].status=="Done"){
+						
+						suc_times += 1
+						
+					}else if(msg[i].status == "Failed"){
+						
+						fail_times += 1
+						
+					}else if(msg[i].status == "Running"){
+						
+						running_times += 1
+						
+					}else{
+						
+						unknown_times += 1
+						
+					}
+					
+					if(msg.length==1){
+						
+						succeed.push(suc_times);
+						
+						failed.push(fail_times);
+						
+						running.push(running_times);
+						
+						unknown.push(unknown_times);
+						
+					}
+					
+				}else if(this.isInSameDay(current, previous)){
+					
+					if(msg[i].status=="Done"){
+						
+						suc_times += 1
+						
+					}else if(msg[i].status == "Failed"){
+						
+						fail_times += 1
+						
+					}else if(msg[i].status == "Running"){
+						
+						running_times += 1
+						
+					}else{
+						
+						unknown_times += 1
+						
+					}
+					
+					if(i==(msg.length-1)){
+						
+						succeed.push(suc_times);
+						
+						failed.push(fail_times);
+						
+						running.push(running_times);
+						
+						unknown.push(unknown_times);
+						
+					}
+					
+				}else if(!this.isInSameDay(current, previous)){
+					
+					previous = current;
+					
+					succeed.push(suc_times);
+					
+					failed.push(fail_times);
+					
+					running.push(running_times);
+					
+					unknown.push(unknown_times);
+					
+					labels.push(this.getYYYYMMDD(current));
+					
+					suc_times = 0, fail_times = 0, running_times = 0, unknown_times = 0;
+					
+					if(msg[i].status=="Done"){
+						
+						suc_times += 1
+						
+					}else if(msg[i].status == "Failed"){
+						
+						fail_times += 1
+						
+					}else if(msg[i].status == "Running"){
+						
+						running_times += 1
+						
+					}else{
+						
+						unknown_times += 1
+						
+					}
+						
+					if(i==(msg.length-1)){
+						
+						succeed.push(suc_times);
+						
+						failed.push(fail_times);
+						
+						running.push(running_times);
+						
+						unknown.push(unknown_times);
+						
+					}
+					
+				}
+				
+			}
+			
+			console.log(labels)
+			
+			console.log(succeed);
+			
+			
+			var ctx = document.getElementById(type + '-history-chart').getContext('2d');
+			var config = {
+				type: 'line',
+				data: {
+					labels: labels,
+					datasets: [{
+						label: 'Running',
+						fill: false,
+						backgroundColor: this.chartColors.blue,
+						borderColor: this.chartColors.blue,
+						borderDash: [5, 5],
+						data: running,
+					}, {
+						label: 'Done',
+						fill: false,
+						backgroundColor: this.chartColors.green,
+						borderColor: this.chartColors.green,
+						borderDash: [5, 5],
+						data: succeed,
+					}, {
+						label: 'Failed',
+						backgroundColor: this.chartColors.red,
+						borderColor: this.chartColors.red,
+						borderDash: [5, 5],
+						data: failed
+					}, {
+						label: 'Unknown',
+						backgroundColor: this.chartColors.grey,
+						borderColor: this.chartColors.grey,
+						borderDash: [5, 5],
+						data: unknown
+					}]
+				},
+				options: {
+					responsive: true,
+					title: {
+						display: true,
+						text: type + ' Execution History Chart'
+					},
+					tooltips: {
+						mode: 'index',
+						intersect: false,
+					},
+					hover: {
+						mode: 'nearest',
+						intersect: true
+					},
+					scales: {
+						xAxes: [{
+							display: true,
+							scaleLabel: {
+								display: true,
+								labelString: 'Date'
+							}
+						}],
+						yAxes: [{
+							display: true,
+							scaleLabel: {
+								display: true,
+								labelString: 'Number of Runs'
+							}
+						}]
+					}
+				}
+			};
+
+			this.history_chart[type] = new Chart(ctx, config);
+			
+		},
+
+		
+		renderProcessHistoryChart: function(msg){
+			
+			this.renderUtil("process", msg);
+			
+		},
+		
+		renderWorkflowHistoryChart: function(msg){
+			
+			this.renderUtil("workflow", msg);
+			
+		},
+		
+		renderHostHistoryChart: function(msg){
+			
+			this.renderUtil("host", msg);
+			
+		}
+		
+}
diff --git a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.filebrowser.js b/WebContent/geoweaver/js/gw.filebrowser.js
similarity index 56%
rename from WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.filebrowser.js
rename to WebContent/geoweaver/js/gw.filebrowser.js
index c606c7bb1..e8e6d7455 100644
--- a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.filebrowser.js
+++ b/WebContent/geoweaver/js/gw.filebrowser.js
@@ -40,41 +40,7 @@ GW.filebrowser = {
 					'</div>'
 					
 					var frame = GW.process.createJSFrameDialog(800, 640, content, 'File Editor')
-
-//					var width = 800; var height = 640;
-//					
-//					const frame = GW.workspace.jsFrame.create({
-//				    		title: 'File Editor',
-//				    	    left: 0, 
-//				    	    top: 0, 
-//				    	    width: width, 
-//				    	    height: height,
-//				    	    appearanceName: 'yosemite',
-//				    	    style: {
-//			                    backgroundColor: 'rgb(255,255,255)',
-//					    	    fontSize: 12,
-//			                    overflow:'auto'
-//			                },
-//				    	    html: 
-//				    	    
-//			    	});
-//			    	
-//					frame.setControl({
-//			            styleDisplay:'inline',
-//			            maximizeButton: 'zoomButton',
-//			            demaximizeButton: 'dezoomButton',
-//			            minimizeButton: 'minimizeButton',
-//			            deminimizeButton: 'deminimizeButton',
-//			            hideButton: 'closeButton',
-//			            animation: true,
-//			            animationDuration: 150,
-//			
-//			        });
-//			    	
-//			    	frame.show();
-//			    	
-//			    	frame.setPosition((window.innerWidth - width) / 2, (window.innerHeight -height) / 2, 'LEFT_TOP');
-			    	
+					
 					$("#codearea").append('<textarea id="code_editor" placeholder=""></textarea>');
 	            	
 					GW.filebrowser.editor = CodeMirror.fromTextArea(document.getElementById("code_editor"), {
@@ -220,192 +186,6 @@ GW.filebrowser = {
 					});
 					
 					
-					
-//					BootstrapDialog.closeAll();
-//					
-//					BootstrapDialog.show({
-//						
-//						title: "File Editor",
-//						
-//						closable: false,
-//						
-//						size: BootstrapDialog.SIZE_WIDE,
-//						
-//						message: "<div id=\"codearea\" class=\"form-group row required\" ></div>"+
-//						
-//						"<button id=\"loading_btn\" class=\"btn btn-sm btn-warning\"><span class=\"glyphicon glyphicon-refresh glyphicon-refresh-animate\"></span> Loading...</button>",
-//						
-//						onshown: function(){
-//							
-//							$("#codearea").append('<textarea id="code_editor" placeholder=""></textarea>');
-//			            	
-//							GW.filebrowser.editor = CodeMirror.fromTextArea(document.getElementById("code_editor"), {
-//				        		
-//				        		lineNumbers: true,
-//				        		lineWrapping: true
-//				        	});
-//							
-//							var url_path = msg.path;
-//							
-//							//prevent it loading from cache
-//							$.ajaxSetup ({
-//							    // Disable caching of AJAX responses
-//							    cache: false
-//							});
-//							
-//							$.get( "../" + url_path, function( data ) {
-//								
-//								GW.filebrowser.editor.setValue(data);
-//								
-//								$("#loading_btn").hide();
-//								
-//							});
-//							
-//							$.ajaxSetup ({
-//							    // Enable caching of AJAX responses
-//							    cache: true
-//							});
-//							
-//			            },
-//			            
-//			            onhide: function(dialogRef){
-//
-//		                	$.ajax({
-//		                		
-//		                		url: "closefilebrowser",
-//		                		
-//		                		method: "POST"
-//		                		
-//		                	}).done(function(msg){
-//		                		
-//		                		console.log(msg);
-//		                		
-//		                	});
-//		                	
-//			            },
-//			            
-//			            buttons: [{
-//			            	
-//			                label: 'Save',
-//			                
-//			                action: function(dialog) {
-//			                	
-//			                	$.ajax({
-//			                		
-//			                		url: "updatefile",
-//			                		
-//			                		method: "POST",
-//			                		
-//			                		data: { filepath: GW.filebrowser.current_path + file_name, 
-//			                			content: GW.filebrowser.editor.getValue()}
-//			                		
-//			                	}).done(function(msg){
-//			                		
-//			                		msg = $.parseJSON(msg);
-//			                		
-//			                		if(msg.ret == "success"){
-//			                			
-//				                		console.log("file updated");
-//			                			
-//				                		alert("Saved!!");
-//				                		
-//			                		}else{
-//			                			
-//			                			alert("Failed!!" + msg.reason);
-//			                		}
-//			                		
-//			                	});
-//			                	
-//			                }
-//			            
-//			            },{
-//			            	
-//			                label: 'Run',
-//			                
-//			                action: function(dialog) {
-//			                	
-//			                	var patt1 = /\.([0-9a-z]+)(?:[\?#]|$)/i;
-//			        			
-//			        			var suffix = file_name.match(patt1);
-//			                	
-//			                	if(GW.filebrowser.isIn(suffix[1],["py", "sh"])){
-//			                		
-//			                		//step 1: add the file as a new process
-//			                		
-//			                		//step 2: pop-up the run dialog of the process
-//			                		
-//			                		var type = "shell";
-//			                		
-//			                		if("py"==suffix[1]){
-//			                			
-//			                			type = "python";
-//			                			
-//			                		}
-//			                		
-//				                	var req = {
-//				                			
-//				                			name: file_name,
-//				                			
-//				                			filepath: GW.filebrowser.current_path + file_name,
-//				                			
-//				                			hid: GW.filebrowser.current_hid,
-//				                			
-//				                			type: type,
-//				                			
-//				                			content: GW.filebrowser.editor.getValue()
-//				                			
-//				                	};
-//				                	
-//				                	$.ajax({
-//				                		
-//				                		url: "addLocalFile",
-//				                		
-//				                		method: "POST",
-//				                		
-//				                		data: req
-//				                		
-//				                	}).done(function(msg){
-//				                		
-//				                		msg = $.parseJSON(msg);
-//				                		
-//				                		var pid = msg.id;
-//				                		
-//				                		GW.process.addMenuItem(msg, type);
-//				                		
-//				                		GW.process.executeProcess(pid, GW.filebrowser.current_hid, type);
-//				                		
-//				                		GW.ssh.addlog("The process " + msg.name + " is added to the process list.");
-//				                		GW.ssh.addlog("Pop up authorization dialog to initiate the run of the process : " + pid);
-//				                		
-//				                	});
-//				                	
-//			                	}else{
-//			                		
-//			                		alert("Only Python and Shell script can run!");
-//			                		
-//			                	}
-//			                	
-//			                	dialog.close();
-//			                
-//			                }
-//			            
-//			            },{
-//			            	
-//			                label: 'Close',
-//			                
-//			                action: function(dialog) {
-//			                	
-//			                	dialog.close();
-//			                
-//			                }
-//			            
-//			            }]
-//						
-//					});
-					
-
-					
-					
 				}else{
 					
 					alert("Fail to retrieve file: " + msg.reason);
@@ -629,9 +409,34 @@ GW.filebrowser = {
 			  }
 		},
 		
+		closeBrowser: function(){
+			
+			if(GW.filebrowser.edit_file==0){
+        		
+        		//only close connection when the file editor is not present
+        		$.ajax({
+            		
+            		url: "closefilebrowser",
+            		
+            		method: "POST"
+            		
+            	}).done(function(msg){
+            		
+            		console.log(msg);
+            		
+            	});
+            	
+        	}
+			
+			$("#host-file-browser").html("");
+			
+		},
+		
 		showFolderBrowserDialog: function(msg){
 			
-			var cont = '<div class="modal-body" style=\"font-size: 12px;\"><div class=\"row\"  style="padding:10px;">';
+			var cont = '<div class="modal-body" style=\"font-size: 12px;\">'+
+			
+			'<div class=\"row\"  style="padding:10px;">';
 			
 			cont += '<table class="table table-sm table-dark col-md-12" id="directory_table"> '+
 				'  <thead> '+
@@ -643,123 +448,23 @@ GW.filebrowser = {
 				'    </tr> '+
 				'  </thead> '+
 				'  <tbody>'+ 
-				'  </tbody></table></div></div>';
-			
-			var frame = GW.process.createJSFrameDialog(800, 640, cont, 'File Browser')
-			
-//			var width = 800; var height = 640;
-//			
-//			const frame = GW.workspace.jsFrame.create({
-//		    		title: 'File Browser',
-//		    	    left: 0, 
-//		    	    top: 0, 
-//		    	    width: width, 
-//		    	    height: height,
-//		    	    appearanceName: 'yosemite',
-//		    	    style: {
-//	                    backgroundColor: 'rgb(255,255,255)',
-//			    	    fontSize: 12,
-//	                    overflow:'auto'
-//	                },
-//		    	    html: cont
-//	    	});
-//	    	
-//			frame.setControl({
-//	            styleDisplay:'inline',
-//	            maximizeButton: 'zoomButton',
-//	            demaximizeButton: 'dezoomButton',
-//	            minimizeButton: 'minimizeButton',
-//	            deminimizeButton: 'deminimizeButton',
-//	            hideButton: 'closeButton',
-//	            animation: true,
-//	            animationDuration: 150,
-//	
-//	        });
-//	    	
-//	    	frame.show();
-//	    	
-//	    	frame.setPosition((window.innerWidth - width) / 2, (window.innerHeight -height) / 2, 'LEFT_TOP');
-	    	
+				'  </tbody></table></div>'+
+				
+				'</div>';
+			
+			cont ="<h4 class=\"border-bottom\">File Browser Section  <button type=\"button\" class=\"btn btn-secondary btn-sm\" id=\"closeFileBrowser\" >close</button></h4>"+ cont;
+			
+			
+//			var frame = GW.process.createJSFrameDialog(800, 640, cont, 'File Browser')
+			
+			$("#host-file-browser").html(cont);
+			
 	    	GW.filebrowser.updateBrowser(msg);
         	
         	GW.filebrowser.edit_file = 0;
         	
-        	frame.on('closeButton', 'click', (_frame, evt) => {
-        		
-            	if(GW.filebrowser.edit_file==0){
-	        		
-	        		//only close connection when the file editor is not present
-	        		$.ajax({
-	            		
-	            		url: "closefilebrowser",
-	            		
-	            		method: "POST"
-	            		
-	            	}).done(function(msg){
-	            		
-	            		console.log(msg);
-	            		
-	            	});
-	            	
-	        	}
-            	
-                _frame.closeFrame();
-                
-            });
-			
-//			BootstrapDialog.show({
-//				
-//				title: 'File Browser',
-//	            
-//	            message: cont,
-//	            
-//	            size: BootstrapDialog.SIZE_WIDE,
-//	            
-//	            closable: true,
-//	            
-//	            onshown: function(){
-//	            	
-//	            	GW.filebrowser.updateBrowser(msg);
-//	            	
-//	            	GW.filebrowser.edit_file = 0;
-//	            	
-//	            },
-//	            
-//	            onhide: function(){
-//	            	
-//	            	if(GW.filebrowser.edit_file==0){
-//	            		
-//	            		//only close connection when the file editor is not present
-//	            		$.ajax({
-//	                		
-//	                		url: "closefilebrowser",
-//	                		
-//	                		method: "POST"
-//	                		
-//	                	}).done(function(msg){
-//	                		
-//	                		console.log(msg);
-//	                		
-//	                	});
-//	                	
-//	            	}
-//	            	
-//	            },
-//	            
-//	            buttons: [{
-//	            	
-//	                label: 'Close',
-//	                
-//	                action: function(dialog) {
-//	                	
-//	                	dialog.close();
-//	                
-//	                }
-//	            
-//	            }]
-//				
-//			});
-			
+        	$("#closeFileBrowser").click(this.closeBrowser);
+        	
 		},
 		
 		connect_folder: function(encrypt, req, dialog, button){
diff --git a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.fileupload.js b/WebContent/geoweaver/js/gw.fileupload.js
similarity index 81%
rename from WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.fileupload.js
rename to WebContent/geoweaver/js/gw.fileupload.js
index 1cdf1fa5c..d321c9238 100644
--- a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.fileupload.js
+++ b/WebContent/geoweaver/js/gw.fileupload.js
@@ -73,35 +73,6 @@ GW.fileupload = {
 				"	<button type=\"button\" id=\"pswd-cancel-btn\" class=\"btn btn-outline-secondary\">Cancel</button>"+
 				'</div>';
 				
-//				var width = 320; var height = 200;
-//				
-//				GW.fileupload.password_frame = GW.workspace.jsFrame.create({
-//		    		title: 'Authorization',
-//		    	    left: 0, 
-//		    	    top: 0, 
-//		    	    width: width, 
-//		    	    height: height,
-//		    	    appearanceName: 'yosemite',
-//		    	    style: {
-//	                    backgroundColor: 'rgb(255,255,255)',
-//			    	    fontSize: 12,
-//	                    overflow:'auto'
-//	                },
-//		    	    html: content
-//		    	});
-//		    	
-//				GW.fileupload.password_frame.setControl({
-//	                styleDisplay:'inline',
-//	                maximizeButton: 'zoomButton',
-//	                demaximizeButton: 'dezoomButton',
-//	                minimizeButton: 'minimizeButton',
-//	                deminimizeButton: 'deminimizeButton',
-//	                hideButton: 'closeButton',
-//	                animation: true,
-//	                animationDuration: 150,
-//
-//	            });
-				
 				GW.fileupload.password_frame = GW.process.createJSFrameDialog(320, 200, content, "Authorization")
 		    	
 				GW.fileupload.password_frame.on('closeButton', 'click', (_frame, evt) => {
@@ -146,47 +117,6 @@ GW.fileupload = {
 		    		
 		    	});
 				
-//				BootstrapDialog.show({
-//		            
-//					title: 'Authorization',
-//		            
-//		            message: cont,
-//		            
-//		            closable: false,
-//		            
-//		            buttons: [{
-//		                
-//		            	label: 'Submit',
-//		                
-//		                action: function(dialog) {
-//		                	
-//		                	var $button = this;
-//		                	
-//		                	$button.spin();
-//		                	
-//		                	dialog.enableButtons(false);
-//		                	
-//		                	GW.fileupload.password = $('#inputpswd').val()
-//		                	
-//		                	GW.fileupload.showUploadDialog();
-//		                	
-//		                    dialog.close();
-//		                	
-//		                }
-//		            }, {
-//		            	
-//		                label: 'Cancel',
-//		                
-//		                action: function(dialog) {
-//		                	
-//		                	dialog.close();
-//		                
-//		                }
-//		            
-//		            }]
-//		        
-//				});
-				
 			});
 			
 		},
@@ -278,7 +208,18 @@ GW.fileupload = {
 			"	<button type=\"button\" id=\"upload-close\" class=\"btn btn-outline-primary\">Close</button> "+
 			'</div>';
 			
-			GW.fileupload.uploader = GW.process.createJSFrameDialog(720, 640, content, "File Uploader")
+			content = "<h4 class=\"border-bottom\">File Uploader Section  <button type=\"button\" class=\"btn btn-secondary btn-sm\" id=\"closeFileUploader\" >close</button></h4>"+
+				content;
+			
+//			GW.fileupload.uploader = GW.process.createJSFrameDialog(720, 640, content, "File Uploader")
+			
+			$("#host-file-uploader").html(content);
+			
+			$("#closeFileUploader").click(function(){
+				
+				$("#host-file-uploader").html("");
+				
+			});
 			
 //			var width = 720; var height = 640;
 //			
@@ -309,11 +250,11 @@ GW.fileupload = {
 //
 //            });
 	    	
-			GW.fileupload.uploader.on('closeButton', 'click', (_frame, evt) => {
-				
-                _frame.closeFrame();
-                
-            });
+//			GW.fileupload.uploader.on('closeButton', 'click', (_frame, evt) => {
+//				
+//                _frame.closeFrame();
+//                
+//            });
             
 	    	//Show the window
 //			GW.fileupload.uploader.show();
@@ -410,7 +351,10 @@ GW.fileupload = {
 			
 			$("#upload-close").click(function(){
 				
-				GW.fileupload.uploader.closeFrame();
+//				GW.fileupload.uploader.closeFrame();
+				
+				$("#host-file-uploader").html("");
+				
 				
 			});
 			
@@ -615,94 +559,98 @@ GW.fileupload = {
 			GW.fileupload.ui_add_log('Start to transfer to file to remote host, please wait until it is finished...');
 			
 			//Two-step encryption is applied here. 
-        	//First, get public key from server.
-        	//Second, encrypt the password and sent the encypted string to server. 
-        	$.ajax({
-        		
-        		url: "key",
-        		
-        		type: "POST",
-        		
-        		data: ""
-        		
-        	}).done(function(msg){
-        		
-        		//encrypt the password using the received rsa key
-        		
-        		msg = $.parseJSON(msg);
-        		
-        		var encrypt = new JSEncrypt();
-        		
-                encrypt.setPublicKey(msg.rsa_public);
-                
-                var encrypted = encrypt.encrypt(GW.fileupload.password);
-                
-//                GW.fileupload.encrypted = encrypted;
-                
-//                GW.fileupload.showUploadDialog();
-                
-                var req = {
-    					
-    					hid: GW.fileupload.hid,
-    					
-    					encrypted: encrypted,
-    					
-    					filepath: url
-    					
-    			}
-    			
-    			$.ajax({
-    				
-    				url: "upload",
-    				
-    				type: "POST",
-    				
-    				data: req
-    				
-    			}).done(function(data){
-    				
-    				data = $.parseJSON(data);
-    				
-    				console.log("response: " + data);
-
-    				GW.fileupload.ui_add_log('Temporary file in Geoweaver temporary folder is removed');
-    				
-    				GW.fileupload.ui_add_log('File has been on remote host!' + data.filename);
-    				
-    				GW.fileupload.ui_multi_update_file_progress(id, 100, 'success', false);
-    			    
-    				GW.fileupload.ui_multi_update_file_status(id, 'success', 'Upload Complete');
-    				
-    				var $btn = GW.fileupload.uploader.getButton("btn-start");
-    				
-    				$btn.enable();
-    				
-    				$btn.stopSpin();
-    				
-    				GW.fileupload.uploader.setClosable(true);
-    				
-    			}).fail(function(){
-    				
-    				console.error("fail to transfer the file to remote host");
-    				
-    				GW.fileupload.ui_add_log('Fail to transfer');
-    				
-    				var $btn = GW.fileupload.uploader.getButton("btn-start");
-    				
-    				$btn.enable();
-    				
-    				$btn.stopSpin();
-    				
-    				GW.fileupload.uploader.setClosable(true);
-    				
-    			});
-                
-        		
-        	}).fail(function(jxr, status){
-        		
-        		console.error("fail to encrypt key");
-        		
-        	});
+	        	//First, get public key from server.
+	        	//Second, encrypt the password and sent the encypted string to server. 
+	        	$.ajax({
+	        		
+	        		url: "key",
+	        		
+	        		type: "POST",
+	        		
+	        		data: ""
+	        		
+	        	}).done(function(msg){
+	        		
+	        		//encrypt the password using the received rsa key
+	        		
+	        		msg = $.parseJSON(msg);
+	        		
+	        		var encrypt = new JSEncrypt();
+	        		
+	                encrypt.setPublicKey(msg.rsa_public);
+	                
+	                var encrypted = encrypt.encrypt(GW.fileupload.password);
+	                
+	//                GW.fileupload.encrypted = encrypted;
+	                
+	//                GW.fileupload.showUploadDialog();
+	                
+	                var req = {
+	    					
+	    					hid: GW.fileupload.hid,
+	    					
+	    					encrypted: encrypted,
+	    					
+	    					filepath: url
+	    					
+	    			}
+	    			
+	    			$.ajax({
+	    				
+	    				url: "upload",
+	    				
+	    				type: "POST",
+	    				
+	    				data: req
+	    				
+	    			}).done(function(data){
+	    				
+	    				data = $.parseJSON(data);
+	    				
+	    				console.log("response: " + data);
+	
+	    				GW.fileupload.ui_add_log('Temporary file in Geoweaver temporary folder is removed');
+	    				
+	    				GW.fileupload.ui_add_log('File has been on remote host!' + data.filename);
+	    				
+	    				GW.fileupload.ui_multi_update_file_progress(id, 100, 'success', false);
+	    			    
+	    				GW.fileupload.ui_multi_update_file_status(id, 'success', 'Upload Complete');
+	    				
+	    				$('#upload-start').prop('disabled', false);
+	    				
+//	    				var $btn = $("#btn-start");
+//	    				
+//	    				$btn.enable();
+//	    				
+//	    				$btn.stopSpin();
+	    				
+	//    				GW.fileupload.uploader.setClosable(true);
+	    				
+	    			}).fail(function(){
+	    				
+	    				console.error("fail to transfer the file to remote host");
+	    				
+	    				GW.fileupload.ui_add_log('Fail to transfer');
+	    				
+//	    				var $btn = $("#btn-start");
+//	    				
+//	    				$btn.enable();
+//	    				
+//	    				$btn.stopSpin();
+	    				
+	    				$('#upload-start').prop('disabled', false);
+	    				
+	//    				GW.fileupload.uploader.setClosable(true);
+	    				
+	    			});
+	                
+	        		
+	        	}).fail(function(jxr, status){
+	        		
+	        		console.error("fail to encrypt key");
+	        		
+	        	});
 			
 		},
 		
diff --git a/WebContent/geoweaver/js/gw.general.js b/WebContent/geoweaver/js/gw.general.js
new file mode 100644
index 000000000..a5ea40b33
--- /dev/null
+++ b/WebContent/geoweaver/js/gw.general.js
@@ -0,0 +1,94 @@
+
+/**
+ * 
+ * Show welcome page
+ * 
+ * @author Ziheng Sun
+ * 
+ */
+
+GW.general = {
+		
+		process_code_editor: null, 
+		
+		init: function(){
+			
+			
+			
+		},
+		
+		displayObject: function(type, msg){
+			
+			if(type=="process"){
+				
+				this.displayProcess(msg);
+				
+			}else if(type="host"){
+				
+				this.displayHost(msg);
+				
+			}else if(type=="workflow"){
+				
+				this.displayWorkflow(msg);
+				
+			}
+			
+		},
+		
+		getCodeStyleByLang: function(lang){
+			
+			var codestyle = "text/x-shell";
+			
+			if(lang == "shell"){
+				
+				codestyle = "";
+				
+			}else if(lang == "python"){
+				
+				codestyle = "";
+				
+			}
+			
+			return codestyle;
+			
+		},
+		
+		switchTab: function(name){
+			
+			if(name=="host"){
+				
+				switchTab(document.getElementById("main-host-tab"), "main-host-info");
+				
+			}else if(name=="process"){
+				
+				switchTab(document.getElementById("main-process-tab"), "main-process-info");
+				
+			}else if(name=="workflow"){
+				
+				switchTab(document.getElementById("main-workflow-tab"), "main-workflow-info");
+				
+			}else if(name=="workspace"){
+				
+				switchTab(document.getElementById("main-workspace-tab"), "workspace");
+				
+			}else if(name=="console"){
+				
+				switchTab(document.getElementById("main-console-tab"), "main-console");
+				
+			}else if(name=="general" || name == null){
+				
+				switchTab(document.getElementById("main-general-tab"), "main-general");
+				
+			}
+			
+			
+		}
+		
+		
+		
+		
+		
+		
+		
+		
+}
\ No newline at end of file
diff --git a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.host.js b/WebContent/geoweaver/js/gw.host.js
similarity index 77%
rename from WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.host.js
rename to WebContent/geoweaver/js/gw.host.js
index a99921602..27c19e1f3 100644
--- a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.host.js
+++ b/WebContent/geoweaver/js/gw.host.js
@@ -111,6 +111,20 @@ GW.host = {
 			
 		},
 		
+		isLocal: function(msg){
+			
+			var is = false;
+			
+			if(msg.ip=="127.0.0.1"){
+				
+				is = true;
+				
+			}
+			
+			return is;
+			
+		},
+		
 		encrypt: function(hid, pstext, req, dialog, button, business_callback){
 			
 			//Two-step encryption is applied here. 
@@ -374,7 +388,7 @@ GW.host = {
                 
          	}).fail(function(jxr, status){
          		 
-         		console.error("fail to execute workflow");
+         		console.error("fail to get encrypted key");
          		
          	});
 			
@@ -631,6 +645,8 @@ GW.host = {
 				
 					console.log("SSH session is closed.");
 					
+					$("#ssh-terminal-iframe").html("");
+					
 				}else{
 					
 					console.error("Fail to close SSH.");
@@ -647,79 +663,23 @@ GW.host = {
 
 		showSSHCmd: function(token){
 			
-			var frame = GW.process.createJSFrameDialog(600, 540, "<iframe src=\"geoweaver-ssh?token="+
-					token+"\" style=\"height:100%;width:100%;\"></iframe>", "SSH Command Line")
+//			var frame = GW.process.createJSFrameDialog(600, 540, "<iframe src=\"geoweaver-ssh?token="+
+//					token+"\" style=\"height:100%;width:100%;\"></iframe>", "SSH Command Line")
 			
-//			const frame = GW.workspace.jsFrame.create({
-//		    		title: 'SSH Command Line',
-//		    	    left: 60, top: 60, width: 600, height: 540,
-//		    	    appearanceName: 'yosemite',
-//		    	    html: "<iframe src=\"geoweaver-ssh?token="+token+"\" style=\"height:100%;width:100%;\"></iframe>"
-//		    	});
-//		    	
-//		    	frame.setControl({
-//		            maximizeButton: 'maximizeButton',
-//		            demaximizeButton: 'restoreButton',
-//		            minimizeButton: 'minimizeButton',
-//		            deminimizeButton: 'deminimizeButton',
-//		            animation: true,
-//		            animationDuration: 200,
-//		
-//		    });
-//			
-//		    frame.on('closeButton', 'click', (_frame, evt) => {
-//		    	GW.host.closeSSH(token);
-//		        _frame.closeFrame();
-//		        
-//		    });
-//    
-//	    	//Show the window
-//	    	frame.show();
-//	    	
-//	    	frame.setPosition(window.innerWidth / 4, window.innerHeight / 4, 'CENTER_TOP');
+			var frame = "<h4 class=\"border-bottom\">SSH Terminal Section  <button type=\"button\" class=\"btn btn-secondary btn-sm\" id=\"closeSSHTerminal\" >close</button></h4>"+
 			
-//			var dialog = new BootstrapDialog.show({
-//	            
-//				title: 'SSH Command Line',
-//	            
-//	            message: "<iframe src=\"geoweaver-ssh?token="+token+"\" style=\"height:100%;width:100%;\"></iframe>",
-//				
-//	            size: BootstrapDialog.SIZE_WIDE,
-//	            
-//	            onhide: function(dialogRef){
-//	                
-////	            	GW.menu.closeSSH(token);
-//	                
-//	            },
-//	            
-//	            closable: false,
-//	            
-//	            buttons: [{
-//	            	
-//	            	label: 'Create Process',
-//	            	
-//	            	action: function(dialog){
-//	            		
-//	            		console.log("not ready yet");
-//	            		
-//	            	}
-//	            	
-//	            },{
-//	                
-//	            	label: 'Close Connection',
-//	                
-//	                action: function(dialog) {
-//	                	
-//	                	GW.host.closeSSH(token);
-//	                	
-//	                	dialog.close();
-//	                	
-//	                }
-//	            }]
-//	        
-//			});
-//			
-//			GW.menu.setFullScreen(dialog);
+			"<iframe src=\"geoweaver-ssh?token="+
+			token+"\" style=\"height: 500px; max-height:600px;width:100%;\"></iframe>"
+			
+			$("#ssh-terminal-iframe").html(frame);
+			
+			$("#closeSSHTerminal").click(function(){
+				
+				GW.host.closeSSH(token);
+				
+				$("#ssh-terminal-iframe").html(""); //double remove to make sure it clears every time
+				
+			})
 			
 		},
 		
@@ -777,47 +737,8 @@ GW.host = {
 				
 				GW.host.ssh_password_frame = GW.process.createJSFrameDialog(500, 340, cont, "Open SSH session")
 				
-//				var width = 500; var height = 340;
-//				
-//				GW.host.ssh_password_frame = GW.workspace.jsFrame.create({
-//			    		title: 'Open SSH session',
-//			    	    left: 0, 
-//			    	    top: 0, 
-//			    	    width: width, 
-//			    	    height: height,
-//			    	    appearanceName: 'yosemite',
-//			    	    style: {
-//		                    backgroundColor: 'rgb(255,255,255)',
-//				    	    fontSize: 12,
-//		                    overflow:'auto'
-//		                },
-//			    	    html: cont
-//		    	});
-//		    	
-//				GW.host.ssh_password_frame.setControl({
-//		            styleDisplay:'inline',
-//		            maximizeButton: 'zoomButton',
-//		            demaximizeButton: 'dezoomButton',
-//		            minimizeButton: 'minimizeButton',
-//		            deminimizeButton: 'deminimizeButton',
-//		            hideButton: 'closeButton',
-//		            animation: true,
-//		            animationDuration: 150,
-//		
-//		        });
-//		    	
-//				GW.host.ssh_password_frame.show();
-//		    	
-//				GW.host.ssh_password_frame.setPosition((window.innerWidth - width) / 2, (window.innerHeight -height) / 2, 'LEFT_TOP');
-		    	
 		    	$("#ssh-connect-btn").click(function(){
 		    		
-//		    		var $button = this;
-//                	
-//                	$button.spin();
-//                	
-//                    dialog.enableButtons(false);
-		    		
 		    		$("#ssh-connect-btn").prop("disabled", true);
                 	
                 	$.ajax({
@@ -880,10 +801,6 @@ GW.host = {
 	                		
 	                		$("#ssh-connect-btn").prop("disabled", false);
 	                		
-//	                		$button.stopSpin();
-//	                		
-//	                		dialog.enableButtons(true);
-	                		
 	                	});
 	                	
                         
@@ -897,106 +814,6 @@ GW.host = {
 		    		
 		    	});
 				
-//				BootstrapDialog.show({
-//		            
-//					title: 'Open SSH session',
-//		            
-//		            message: cont,
-//		            
-//		            closable: false,
-//		            
-//		            buttons: [{
-//		                
-//		            	label: 'Connect',
-//		                
-//		                action: function(dialog) {
-//		                	
-//		                	var $button = this;
-//		                	
-//		                	$button.spin();
-//		                	
-//		                    dialog.enableButtons(false);
-//		                	
-//		                	$.ajax({
-//		                		
-//		                		url: "key",
-//		                		
-//		                		type: "POST",
-//		                		
-//		                		data: ""
-//		                		
-//		                	}).done(function(msg){
-//		                		
-//		                		//encrypt the password using the received rsa key
-//		                		msg = $.parseJSON(msg);
-//		                		
-//		                		var encrypt = new JSEncrypt();
-//		                		
-//		                        encrypt.setPublicKey(msg.rsa_public);
-//		                        
-//		                        var encrypted = encrypt.encrypt($("#passwd").val());
-//		                        
-//		                        var req = {
-//		                        		host: hostmsg.ip,
-//		                        		port: hostmsg.port,
-//		                        		username: hostmsg.username,
-//		                        		password: encrypted
-//		                        }
-//		                	
-//			                	$.ajax({
-//			                		
-//			                		url: "geoweaver-ssh-login-inbox",
-//			                		
-//			                		method: "POST",
-//			                		
-//			                		data: req
-//			                		
-//			                	}).done(function(msg){
-//			                		
-//			                		msg = $.parseJSON(msg);
-//			                		
-//			                		if(msg.token!=null){
-//			                			
-//				                		//open a dialog to show the SSH command line interface
-//	
-//				                		GW.host.showSSHCmd(msg.token);
-//			                			
-//			                		}else{
-//			                			
-//			                			alert("Fail to open SSH session");
-//			                			
-//			                		}
-//				                	dialog.close();
-//			                		
-//			                	}).fail(function(status){
-//			                		
-//			                		alert("Fail to open SSH session" + status);
-//			                		
-//			                		$button.stopSpin();
-//			                		
-//			                		dialog.enableButtons(true);
-//			                		
-//			                	});
-//			                	
-//		                        
-//		                	});
-//		                	
-//		                	
-//		                	
-//		                }
-//		            }, {
-//		            	
-//		                label: 'Cancel',
-//		                
-//		                action: function(dialog) {
-//		                
-//		                	dialog.close();
-//		                
-//		                }
-//		            
-//		            }]
-//		        
-//				});
 				
 			});
 			
@@ -1040,22 +857,6 @@ GW.host = {
     				
 				one.name + "</a> "+
 				
-//				"<i class=\"fa fa-external-link-square subalignicon\" onclick=\"GW.host.openssh('"+
-//            				
-//				one.id + "')\" data-toggle=\"tooltip\" title=\"Connect SSH\"></i>"+
-//				
-//				"<i class=\"fa fa-upload subalignicon\" onclick=\"GW.fileupload.uploadfile('"+
-//            				
-//				one.id + "')\" data-toggle=\"tooltip\" title=\"Upload File\"></i>"+
-//				
-//				" <i class=\"fa fa-sitemap subalignicon\" onclick=\"GW.filebrowser.start('"+
-//            				
-//				one.id + "')\" data-toggle=\"tooltip\" title=\"Browser File Hierarchy\"></i>"+
-//				
-//				" <i class=\"fa fa-minus subalignicon\" data-toggle=\"tooltip\" title=\"Delete this host\" onclick=\"GW.menu.del('" +
-//            				
-//				one.id+"','host')\"></i>"+
-				
 			" </li>");
 			
 		},
@@ -1072,14 +873,6 @@ GW.host = {
 			
 		},
 		
-//		validateIP: function(value){
-//			
-//			var ip = "^(?:(?:25[0-5]2[0-4][0-9][01]?[0-9][0-9]?)\.){3}(?:25[0-5]2[0-4][0-9][01]?[0-9][0-9]?)$";
-//			
-//            return value.match(ip);
-//			
-//		},
-		
 		validateIP: function(ipaddress) {  
 			
 			var valid = false;
@@ -1163,7 +956,7 @@ GW.host = {
 			
 			content += "<div class=\"row\" style=\"font-size: 12px;\">";
 			
-			var hostid = null;
+			var hostid = null, hostip = null;
 			
 			jQuery.each(msg, function(i, val) {
 				
@@ -1180,6 +973,12 @@ GW.host = {
 							
 						}
 						
+						if(i=="ip"){
+							
+							hostip = val;
+							
+						}
+						
 						content += "<div class=\"col col-md-3\">"+i+"</div>"+
 						"<div class=\"col col-md-7\">"+val+"</div>";
 						
@@ -1187,8 +986,15 @@ GW.host = {
 
 			});
 			
+			var delbtn = "";
+			
+			if(hostip!="127.0.0.1")
+				delbtn = "<i class=\"fa fa-minus subalignicon\" style=\"color:red;\" data-toggle=\"tooltip\" title=\"Delete this host\" onclick=\"GW.menu.del('" +hostid+"','host')\"></i>";
+			
 			content += "</div>"+
 			
+			"<div class=\"row\"><div class=\"col-md-12\">"+
+			
 			"<p align=\"right\">"+
 			
 				"<i class=\"fa fa-external-link-square subalignicon\" onclick=\"GW.host.openssh('"+
@@ -1203,18 +1009,31 @@ GW.host = {
 	        				
 				hostid + "')\" data-toggle=\"tooltip\" title=\"Browser File Hierarchy\"></i>"+
 				
-				" <i class=\"fa fa-minus subalignicon\" style=\"color:red;\" data-toggle=\"tooltip\" title=\"Delete this host\" onclick=\"GW.menu.del('" +
-	        				
-				hostid+"','host')\"></i>"+
+				delbtn +
 			
 			"</p>"+
 			
+			"</div></div>"+
+			
+			"<div class=\"row\"><div class=\"col-md-12\" style=\"max-height:600px;\" id=\"ssh-terminal-iframe\">"+
+			
+			"</div></div>"+
+			
+			"<div class=\"row\"><div class=\"col-md-12\" id=\"host-file-uploader\">"+
+			
+			"</div></div>"+
+			
+			"<div class=\"row\"><div class=\"col-md-12\" style=\"max-height:800px;\" id=\"host-file-browser\">"+
+			
+			"</div></div>"+
+			
 			"</div>";
 			
 			
 			$("#main-host-content").html(content);
 			
-			switchTab(document.getElementById("main-host-tab"), "main-host-info");
+//			switchTab(document.getElementById("main-host-tab"), "main-host-info");
+			GW.general.switchTab("host");
 			
 		},
 		
diff --git a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.js b/WebContent/geoweaver/js/gw.js
similarity index 100%
rename from WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.js
rename to WebContent/geoweaver/js/gw.js
diff --git a/WebContent/geoweaver/js/gw.main.js b/WebContent/geoweaver/js/gw.main.js
new file mode 100644
index 000000000..b5375c8f0
--- /dev/null
+++ b/WebContent/geoweaver/js/gw.main.js
@@ -0,0 +1,45 @@
+/**
+*
+* Geoweaver main function
+* 
+* @author Ziheng Sun
+* 
+* @date 20 Aug 2018
+* 
+*/
+
+GW.main = {
+		
+	getJSessionId: function (){
+		
+	    var jsId = document.cookie.match(/JSESSIONID=[^;]+/);
+	    
+	    if(jsId != null) {
+	        if (jsId instanceof Array)
+	            jsId = jsId[0].substring(11);
+	        else
+	            jsId = jsId.substring(11);
+	    }
+	    
+	    return jsId;
+	},
+	
+	init: function(){
+		
+		$("#menuheader").val("Geoweaver v" + GW.version);
+		
+		GW.workspace.init();
+		
+		GW.toolbar.init();
+		
+		GW.general.init();
+		
+		GW.menu.init();
+		
+		GW.ssh.startLogSocket(GW.main.getJSessionId());
+		
+	}
+		
+};
+
+GW.main.init();
\ No newline at end of file
diff --git a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.menu.js b/WebContent/geoweaver/js/gw.menu.js
similarity index 100%
rename from WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.menu.js
rename to WebContent/geoweaver/js/gw.menu.js
diff --git a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.monitor.js b/WebContent/geoweaver/js/gw.monitor.js
similarity index 99%
rename from WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.monitor.js
rename to WebContent/geoweaver/js/gw.monitor.js
index 60a2e6b12..da3de685f 100644
--- a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.monitor.js
+++ b/WebContent/geoweaver/js/gw.monitor.js
@@ -209,6 +209,7 @@ GW.monitor = {
 				
 				GW.monitor.openProgressIndicator();
 
+				
 				GW.monitor.ws = new SockJS("task");
 		        
 				GW.monitor.historyid = historyid;
diff --git a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.process.js b/WebContent/geoweaver/js/gw.process.js
similarity index 63%
rename from WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.process.js
rename to WebContent/geoweaver/js/gw.process.js
index 14270deea..0e8158630 100644
--- a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.process.js
+++ b/WebContent/geoweaver/js/gw.process.js
@@ -428,7 +428,7 @@ GW.process = {
 			
 		},
 		
-		recent: function(num){
+		recent: function(num, outside){
 
 			$.ajax({
 				
@@ -463,25 +463,27 @@ GW.process = {
 				
 				for(var i=0;i<msg.length;i++){
 					
-//					var status_col = "      <td><span class=\"label label-warning\">Pending</span></td> ";
-//					
-//					if(msg[i].end_time!=null && msg[i].end_time != msg[i].begin_time){
-//						
-//						status_col = "      <td><span class=\"label label-success\">Done</span></td> ";
-//						
-//					}else if(msg[i].end_time == msg[i].begin_time && msg[i].output != null){
-//						
-//						status_col = "      <td><span class=\"label label-danger\">Failed</span></td> ";
-//						
-//					}
-					
 					var status_col = GW.process.getStatusCol(msg[i].id, msg[i].status);
 					
+					var detailbtn = null;
+					
+					if(outside){
+						
+						detailbtn = "      <td><a href=\"javascript: GW.process.showHistoryDetails('"+msg[i].id+"')\">Details</a></td> ";
+						
+					}else{
+						
+						detailbtn = "      <td><a href=\"javascript: GW.process.getHistoryDetails('"+msg[i].id+"')\">Details</a></td> ";
+						
+					}
+					
+//					detailbtn = "      <td><a href=\"javascript: void(0))\">Details</a></td> ";
+					
 					content += "    <tr> "+
 						"      <td>"+msg[i].name+"</td> "+
 						"      <td>"+msg[i].begin_time+"</td> "+
 						status_col +
-						"      <td><a href=\"javascript: GW.process.getHistoryDetails('"+msg[i].id+"')\">Details</a></td> "+
+						detailbtn + 
 						"    </tr>";
 					
 				}
@@ -586,7 +588,7 @@ GW.process = {
 		
 		getTable: function(msg){
 			
-			var content = "<table class=\"table\" id=\"history_table\"> "+
+			var content = "<table class=\"table\" style=\"background-color: silver;\" id=\"history_table\"> "+
 			"  <thead> "+
 			"    <tr> "+
 			"      <th scope=\"col\">Execution Id</th> "+
@@ -619,11 +621,21 @@ GW.process = {
 			
 			content += "</tbody>";
 			
+			// create an interactive chart to show all the data
+			
+			content = "<h4 class=\"border-bottom\">History Section  <button type=\"button\" class=\"btn btn-secondary btn-sm\" id=\"closeHistory\" >close</button></h4>"+
+			"<div id=\"process-chart-container\" width=\"200\" height=\"100\">"+
+			"<canvas id=\"process-history-chart\" style=\"width:200px !important; height:100px !important;\" ></canvas>"+
+			"</div>" + 
+			content;
+			
 			return content;
 			
 		},
 		
 		
+		
+		
 		/**
 		 * list all the history execution of the process
 		 */
@@ -649,9 +661,27 @@ GW.process = {
 				
 				msg = $.parseJSON(msg);
 				
-				var content = "<div class=\"modal-body\" style=\"font-size:12px;\">"+ GW.process.getTable(msg) + "</div>";
+				$("#process-history-container").html(GW.process.getTable(msg));
+				
+				GW.chart.renderProcessHistoryChart(msg);
+				
+				$("#closeHistory").click(function(){
+					
+					$("#process-history-container").html("");
+					
+				});
+				
+				console.log("Scroll to the history section.")
 				
-				var frame = GW.process.createJSFrameDialog(800, 500, content, "History")
+				//the code has bug, when it scrolls to the location, the header toolbar is gone. Reason unknown.
+//				var elmnt = document.getElementById("process-history-container");
+//				 
+//				elmnt.scrollIntoView(true);
+				
+				
+//				var content = "<div class=\"modal-body\" style=\"font-size:12px;\">"+ GW.process.getTable(msg) + "</div>";
+//				
+//				var frame = GW.process.createJSFrameDialog(800, 500, content, "History")
 				
 //				var width = 800; var height = 500;
 //				
@@ -753,8 +783,9 @@ GW.process = {
 			
 		},
 		
-		getHistoryDetails: function(history_id){
+		showHistoryDetails: function(history_id){
 			
+
 			$.ajax({
 				
 				url: "log",
@@ -775,98 +806,54 @@ GW.process = {
 				
 				msg = $.parseJSON(msg);
 				
-				var output = msg.output;
+				GW.process.display(msg);
 				
-				if(msg.output=="logfile"){
-					
-					output = "<div class=\"spinner-border\" role=\"status\"> "+
-					"	  <span class=\"sr-only\">Loading...</span> "+
-					"	</div>";
-					
-				}
+				GW.process.displayOutput(msg);
 				
-				var content = "<div class=\"modal-body\" style=\"font-size:12px;\"><div class=\"form-group row\">"+
-				"	<div class=\"col col-md-6\"> "+
-				"		<div class=\"row\">"+
-				"	    	<dt class=\"col col-md-3\">Log Id</dt>"+
-				"	    	<dd class=\"col col-md-7\">"+msg.id+"</dd>"+
-				"		</div>"+
-				"	</div>"+
-				"	<div class=\"col col-md-6\"> "+
-				"		<div class=\"form-group row\">"+
-				"	    	<dt class=\"col col-md-3\">Process Id</dt>"+
-				"	    	<dd class=\"col col-md-7\">"+msg.process+"</dd>"+
-				"		</div>"+
-				"	</div>"+
-				"</div>"+
-				"<div class=\"row\">"+
-				"	<div class=\"col col-md-6\"> "+
-				"		<div class=\"row\">"+
-				"	    	<dt class=\"col col-md-3\">Begin Time</dt>"+
-				"	    	<dd class=\"col col-md-7\">"+msg.begin_time+"</dd>"+
-				"		</div>"+
-				"	</div>"+
-				"	<div class=\"col col-md-6\"> "+
-				"		<div class=\"row\">"+
-				"	    	<dt class=\"col col-md-3\">End Time</dt>"+
-				"	    	<dd class=\"col col-md-7\">"+msg.end_time+"</dd>"+
-				"		</div>"+
-				"	</div>"+
-				"</div>"+
-				"<div class=\"row\"> "+
-				"	<div class=\"col col-md-6\"> "+
-				"		<div class=\"row\">"+
-				"	    	<dt class=\"col col-md-12\">Input</dt>"+
-				"	    	<dd class=\"col col-md-12 word-wrap\">"+msg.input+"</dd>"+
-				"		</div>"+
-				"	</div>"+
-				"	<div class=\"col col-md-6\"> "+
-				"		<div class=\"row\">"+
-				"	    	<dt class=\"col col-md-12\">Output</dt>"+
-				"	    	<dd class=\"col col-md-12 word-wrap\" id=\"log-output\">"+output+"</dd>"+
-				"		</div>"+
-				"	</div>"+
-				"</div></div>";
+			}).fail(function(){
 				
-				content += '<div class="modal-footer">' +
-					"<button type=\"button\" id=\"retrieve-result\" class=\"btn btn-outline-primary\">Retrieve Result</button> "+
-					'</div>';
 				
-				var frame = GW.process.createJSFrameDialog(800, 560, content, 'Process Log of ' + msg.name)
+			});
+			
+			
+		},
+		
+		displayOutput: function(msg){
+			
+			var output = msg.output;
+			
+			if(msg.output=="logfile"){
 				
-//				var width = 800; var height = 560;
-//				
-//				const frame = GW.workspace.jsFrame.create({
-//			    		title: 'Process Log of ' + msg.name,
-//			    	    left: 0, 
-//			    	    top: 0, 
-//			    	    width: width, 
-//			    	    height: height,
-//			    	    appearanceName: 'yosemite',
-//			    	    style: {
-//		                    backgroundColor: 'rgb(255,255,255)',
-//				    	    fontSize: 12,
-//		                    overflow:'auto'
-//		                },
-//			    	    html: content
-//		    	});
-//		    	
-//				frame.setControl({
-//		            styleDisplay:'inline',
-//		            maximizeButton: 'zoomButton',
-//		            demaximizeButton: 'dezoomButton',
-//		            minimizeButton: 'minimizeButton',
-//		            deminimizeButton: 'deminimizeButton',
-//		            hideButton: 'closeButton',
-//		            animation: true,
-//		            animationDuration: 150,
-//		
-//		        });
-//		    	
-//		    	frame.show();
-//		    	
-//		    	frame.setPosition((window.innerWidth - width) / 2, (window.innerHeight -height) / 2, 'LEFT_TOP');
-		    	
+				output = "<div class=\"spinner-border\" role=\"status\"> "+
+				"	  <span class=\"sr-only\">Loading...</span> "+
+				"	</div>";
+				
+			}
+			
+			console.log("Update the code with the old version")
+			
+			GW.process.editor.setValue(GW.process.unescape(msg.input));
+			
+			output = "<h4 class=\"border-bottom\">Output Log Section <button type=\"button\" class=\"btn btn-secondary btn-sm\" id=\"closeLog\">Close</button></h4>"+
+			
+			"<p> Execution started at " + msg.begin_time + "</p>"+ 
+			
+			"<p> Execution ended at " + msg.end_time + "</p>"+
+			
+			"<p> The old code used has been refreshed in the code editor.</p>"+
+			
+			"<div>" + 
+			
+			output + "</div>";
+			
+			$("#console-output").html(output);
+			
+			$("#closeLog").click(function(){
+				
+				$("#console-output").html("");
+				
+			});
+			
 		    	$("#retrieve-result").click(function(){
 		    		
 		    		GW.result.showDialog(history_id);
@@ -875,72 +862,107 @@ GW.process = {
 		    	
 		    	if(msg.output=="logfile"){
 					
-					$.get("../temp/" + msg.id + ".log" ).success(function(data){
-						
-						if(data!=null)
-							$("#log-output").text(data);
-						else
-							$("#log-output").text("missing log");
-						
-					}).error(function(){
-						
+				$.get("../temp/" + msg.id + ".log" ).success(function(data){
+					
+					if(data!=null)
+						$("#log-output").text(data);
+					else
 						$("#log-output").text("missing log");
-						
-					});
+					
+				}).error(function(){
+					
+					$("#log-output").text("missing log");
+					
+				});
+				
+			}
+			
+		},
+		
+		getHistoryDetails: function(history_id){
+			
+			$.ajax({
+				
+				url: "log",
+				
+				method: "POST",
+				
+				data: "type=process&id=" + history_id
+				
+			}).done(function(msg){
+				
+				if(msg==""){
+					
+					alert("Cannot find the process history in the database.");
+					
+					return;
 					
 				}
 				
-//				BootstrapDialog.show({
-//					
-//					title: "Process Log",
+				msg = $.parseJSON(msg);
+				
+				GW.process.displayOutput(msg);
+				
+//				var output = msg.output;
+//				
+//				if(msg.output=="logfile"){
 //					
-//					size: BootstrapDialog.SIZE_WIDE,
+//					output = "<div class=\"spinner-border\" role=\"status\"> "+
+//					"	  <span class=\"sr-only\">Loading...</span> "+
+//					"	</div>";
 //					
-//					message: content,
+//				}
+//				
+//				console.log("Update the code with the old version")
+//				
+//				
+//				
+//				GW.process.editor.setValue(GW.process.unescape(msg.input));
+//				
+//				output = "<h4 class=\"border-bottom\">Output Log Section <button type=\"button\" class=\"btn btn-secondary btn-sm\" id=\"closeLog\">Close</button></h4>"+
+//				
+//				"<p> Execution started at " + msg.begin_time + "</p>"+ 
+//				
+//				"<p> Execution ended at " + msg.end_time + "</p>"+
+//				
+//				"<p> The old code used has been refreshed in the code editor.</p>"+
+//				
+//				"<div>" + 
+//				
+//				output + "</div>";
+//				
+//				$("#console-output").html(output);
+//				
+//				$("#closeLog").click(function(){
 //					
-//					onshown: function(){
-//						
-//						if(msg.output=="logfile"){
-//							
-//							$.get("../temp/" + msg.id + ".log" ).success(function(data){
-//								
-//								if(data!=null)
-//									$("#log-output").text(data);
-//								else
-//									$("#log-output").text("missing log");
-//								
-//							}).error(function(){
-//								
-//								$("#log-output").text("missing log");
-//								
-//							});
-//							
-//						}
-//						
-//					},
+//					$("#console-output").html("");
 //					
-//					buttons: [{
-//						
-//						label: "Retrieve Result",
+//				});
+//				
+//				GW.general.switchTab("process");
+//				
+//			    	$("#retrieve-result").click(function(){
+//			    		
+//			    		GW.result.showDialog(history_id);
+//			    		
+//			    	});
+//			    	
+//			    	if(msg.output=="logfile"){
 //						
-//						action: function(dialog){
-//							
-//							GW.result.showDialog(history_id);
-//							
-//						}
+//					$.get("../temp/" + msg.id + ".log" ).success(function(data){
 //						
-//					},{
+//						if(data!=null)
+//							$("#log-output").text(data);
+//						else
+//							$("#log-output").text("missing log");
 //						
-//						label: "Close",
+//					}).error(function(){
 //						
-//						action: function(dialog){
-//							
-//							dialog.close();
-//						}
+//						$("#log-output").text("missing log");
 //						
-//					}]
+//					});
 //					
-//				});
+//				}
 				
 			}).fail(function(){
 				
@@ -1161,6 +1183,8 @@ GW.process = {
 			
 		},
 		
+		
+		
 		display: function(msg){
 			
 			GW.process.editOn = false;
@@ -1168,6 +1192,7 @@ GW.process = {
 			var content = "<div class=\"modal-body\">";
 			
 			content += '   <div class="row" style="padding:0px;margin:0px;">'+
+			   ''+
 		       '     <div style="font-size: 12px;" class="col-sm-2 col-form-label control-label">Category</div>'+
 		       '     <div class="col-sm-3" style="padding:0;">'+
 		       '			<select class="form-control form-control-sm" id="processcategory">'+
@@ -1196,9 +1221,13 @@ GW.process = {
 		       '   <div class="form-group row" style="padding:0px;margin:0px;" >'+
 		       '	     <div class="col-md-6" style="padding:0;" ><p class=\"h6\"> <span class=\"badge badge-secondary\">Ctrl+S</span> to save edits.</p></div>'+
 		       '	 	 <div class="col-md-6 " style="padding:0;" id="process-btn-group"></div>'+
-			   '   </div>';
+			   '   </div>' ;
 			
-			content += "<div class=\"row\" style=\"font-size: 12px;\">";
+			content += '   <div class="row" id="process-history-container" style="padding:0px;margin:0px; " >'+
+		    '   </div>';
+			
+			content += "<div class=\"row\" style=\"font-size: 12px;\">"+
+				"<div class=\"col col-md-12\" ><h4 class=\"border-bottom\">Code Section <button type=\"button\" class=\"btn btn-secondary btn-sm\" id=\"showCurrent\">Latest Code</button></h4> </div>";
 			
 			var code = null;
 			
@@ -1212,13 +1241,13 @@ GW.process = {
 				
 				if(val!=null&&val!="null"&&val!=""){
 					
-					if(i=="description"){
+					if(i=="description" || i=="category"){
 						
 						code_type = val;
 						
 					}
 					
-					if(i=="code"){
+					if(i=="code" || i=="input"){
 						
 						code = val;
 						
@@ -1238,11 +1267,17 @@ GW.process = {
 
 			});
 			
-			content += "</div></div>";
+			content += '</div>'+
+			'   <div class="row" style="padding:0px;margin:0px;" >'+
+			'		<div class="col col-md-12" id="console-output"  style="width:100%;" ></div>'+
+		    '   </div>'+
+	        
+			'</div>';
 			
 			$("#main-process-content").html(content);
 			
-			switchTab(document.getElementById("main-process-tab"), "main-process-info");
+//			switchTab(document.getElementById("main-process-tab"), "main-process-info");
+			GW.general.switchTab("process");
 			
 			$("#processcategory").val(code_type);
 			
@@ -1274,7 +1309,7 @@ GW.process = {
 				
 				code = val;
 				
-				GW.general.process_code_editor = CodeMirror(document.getElementById("code-embed"), {
+				GW.process.editor = CodeMirror(document.getElementById("code-embed"), {
 //			          mode: "text/html",
 //			          extraKeys: {"Ctrl-Space": "autocomplete"},
 			          lineNumbers: true,
@@ -1290,7 +1325,7 @@ GW.process = {
 				    		    	
 				    		    		if(!GW.process.editOn){
 				    		    			
-					    		    		var process_code = GW.general.process_code_editor.getValue()
+					    		    		var process_code = GW.process.editor.getValue()
 					    		    	
 					    		    		GW.process.updateRaw(process_id, process_name, code_type, code_type, process_code);
 					    		    	
@@ -1353,7 +1388,7 @@ GW.process = {
 			
 //			$("#code-embed").prop( "disabled", GW.process.editOn );
 			
-			GW.general.process_code_editor.setOption("readOnly", GW.process.editOn)
+			GW.process.editor.setOption("readOnly", GW.process.editOn)
 			
 		},
 		
@@ -1556,7 +1591,7 @@ GW.process = {
 		 */
 		showSSHOutputLog: function(msg){
 			
-			GW.ssh.openLog(msg.token);
+			GW.ssh.openLog(msg);
 			
 		},
 		
@@ -1666,348 +1701,184 @@ GW.process = {
             
             if(req.desc == "python" || req.desc == "jupyter"){
             	
-            	//check if there is cached environment for this host
-            	
-            	var cached_env = GW.host.findEnvCache(hid);
-            	
-            	if(cached_env!=null){
-            		
-            		req.env = cached_env;
-            		
-            	}else{
-
-                	// retrive the environment list of a host
-                	$.ajax({
-                		
-                		url: "env",
-                		
-                		method: "POST",
-                		
-                		data: "hid=" + hid
-                		
-                	}).done(function(msg){
-                		
-                		msg = $.parseJSON(msg);
-                		
-                		if(GW.process.env_frame != null){
-                			
-                			try{
-                				
-                				GW.process.env_frame.closeFrame();
-                				
-                			}catch(e){}
-                			
-                			GW.process.env_frame = null;
-                			
-                		}
-                		
-                		var envselector = "<div class=\"form-group\">"+
-                			"<label for=\"env-select\">Select Environment:</label>"+
-                			"<select id=\"env-select\" class=\"form-control\"> "+
-                			"	<option value=\"default\">Default</option>"+
-                			"	<option value=\"new\">New</option>";
-                		
-                		GW.process.envlist = msg;
-    						
-                		for(var i=0;i<msg.length;i+=1){
-                			
-                			envselector += "<option value=\""+msg[i].id+"\">"+msg[i].name+"</option>";
-                			
-                		}
-                		
-                		envselector += "</select>";
-                		
-                		var content = '<div class="modal-body" style="font-size: 12px;">'+
-                			"<form> "+
-	    					"    <div class=\"row\"> "+
-								envselector +
-							"    </div>"+
-							"	<div class=\"form-group row\"> "+
-							"    <label class=\"control-label col-sm-4\" for=\"bin\">Python Command:</label> "+
-							"    <div class=\"col-sm-8\"> "+
-							"      <input type=\"text\" class=\"form-control\" id=\"bin\" placeholder=\"python3\" disabled> "+
-							"    </div> "+
-							"  	</div>"+
-							"	<div class=\"form-group row\"> "+
-							"    <label class=\"control-label col-sm-4\" for=\"env\">Environment Name:</label> "+
-							"    <div class=\"col-sm-8\"> "+
-							"      <input type=\"text\" class=\"form-control\" id=\"env\" placeholder=\"my-conda-env\" disabled> "+
-							"    </div> "+
-							"  	</div>"+
-							"	<div class=\"form-group row\"> "+
-							"    <label class=\"control-label col-sm-4\" for=\"env\">Base Directory:</label> "+
-							"    <div class=\"col-sm-8\"> "+
-							"      <input type=\"text\" class=\"form-control\" id=\"basedir\" placeholder=\"/tmp/\" disabled> "+
-							"    </div> "+
-							"  	</div>"+
-							"</form>"+
-							"	<div class=\"form-group col-sm-10\">"+
-						    "		<input type=\"checkbox\" class=\"form-check-input\" id=\"remember\">"+
-						    "		<label class=\"form-check-label\" for=\"remember\">Don't ask again for this host</label>"+
-						    "   </div></div>";
-                		
-                		content += '<div class="modal-footer">' +
-        				"	<button type=\"button\" id=\"process-confirm-btn\" class=\"btn btn-outline-primary\">Confirm</button> "+
-        				"	<button type=\"button\" id=\"process-cancel-btn\" class=\"btn btn-outline-secondary\">Cancel</button>"+
-        				'</div>';
-                		
-                		GW.process.env_frame = GW.process.createJSFrameDialog(520, 340, content, "Set " + req.desc + " environment")
-                		
-//                		var width = 520; var height = 340;
-//            			
-//            			GW.process.env_frame = GW.workspace.jsFrame.create({
-//            	    		title: "Set " + req.desc + " environment",
-//            	    	    left: 0, 
-//            	    	    top: 0, 
-//            	    	    width: width, 
-//            	    	    height: height,
-//            	    	    appearanceName: 'yosemite',
-//            	    	    style: {
-//            	                backgroundColor: 'rgb(255,255,255)',
-//            		    	    fontSize: 12,
-//            	                overflow:'auto'
-//            	            },
-//            	    	    html: content
-//            	    	});
-//            	    	
-//            			GW.process.env_frame.setControl({
-//            	            styleDisplay:'inline',
-//            	            maximizeButton: 'zoomButton',
-//            	            demaximizeButton: 'dezoomButton',
-//            	            minimizeButton: 'minimizeButton',
-//            	            deminimizeButton: 'deminimizeButton',
-//            	            hideButton: 'closeButton',
-//            	            animation: true,
-//            	            animationDuration: 150,
-//            	
-//            	        });
-//            	    	
-//            			GW.process.env_frame.on('closeButton', 'click', (_frame, evt) => {
-//            	            _frame.closeFrame();
-//            	            
-//            	        });
-//            	        
-//            	    	//Show the window
-//            			GW.process.env_frame.show();
-//            	    	
-//            			GW.process.env_frame.setPosition((window.innerWidth - width) / 2, (window.innerHeight -height) / 2, 'LEFT_TOP');
-            	    	
-            			$("#env-select").change(function(e){
-							
-							if($(this).val() == 'default'){
-								
-								$("#bin").prop('disabled', true);
-								
-								$("#env").prop('disabled', true);
-								
-								$("#basedir").prop('disabled', true);
-								
-							}else{
-								
-								$("#bin").prop('disabled', false);
-								
-								$("#env").prop('disabled', false);
-								
-								$("#basedir").prop('disabled', false);
+	            	//check if there is cached environment for this host
+	            	
+	            	var cached_env = GW.host.findEnvCache(hid);
+	            	
+	            	if(cached_env!=null){
+	            		
+	            		req.env = cached_env;
+	            		
+	            	}else{
+	
+	                	// retrive the environment list of a host
+	                	$.ajax({
+	                		
+	                		url: "env",
+	                		
+	                		method: "POST",
+	                		
+	                		data: "hid=" + hid
+	                		
+	                	}).done(function(msg){
+	                		
+	                		msg = $.parseJSON(msg);
+	                		
+	                		if(GW.process.env_frame != null){
+	                			
+	                			try{
+	                				
+	                				GW.process.env_frame.closeFrame();
+	                				
+	                			}catch(e){}
+	                			
+	                			GW.process.env_frame = null;
+	                			
+	                		}
+	                		
+	                		var envselector = "<div class=\"form-group\">"+
+	                			"<label for=\"env-select\">Select Environment:</label>"+
+	                			"<select id=\"env-select\" class=\"form-control\"> "+
+	                			"	<option value=\"default\">Default</option>"+
+	                			"	<option value=\"new\">New</option>";
+	                		
+	                		GW.process.envlist = msg;
+	    						
+	                		for(var i=0;i<msg.length;i+=1){
+	                			
+	                			envselector += "<option value=\""+msg[i].id+"\">"+msg[i].name+"</option>";
+	                			
+	                		}
+	                		
+	                		envselector += "</select>";
+	                		
+	                		var content = '<div class="modal-body" style="font-size: 12px;">'+
+	                			"<form> "+
+		    					"    <div class=\"row\"> "+
+									envselector +
+								"    </div>"+
+								"	<div class=\"form-group row\"> "+
+								"    <label class=\"control-label col-sm-4\" for=\"bin\">Python Command:</label> "+
+								"    <div class=\"col-sm-8\"> "+
+								"      <input type=\"text\" class=\"form-control\" id=\"bin\" placeholder=\"python3\" disabled> "+
+								"    </div> "+
+								"  	</div>"+
+								"	<div class=\"form-group row\"> "+
+								"    <label class=\"control-label col-sm-4\" for=\"env\">Environment Name:</label> "+
+								"    <div class=\"col-sm-8\"> "+
+								"      <input type=\"text\" class=\"form-control\" id=\"env\" placeholder=\"my-conda-env\" disabled> "+
+								"    </div> "+
+								"  	</div>"+
+								"	<div class=\"form-group row\"> "+
+								"    <label class=\"control-label col-sm-4\" for=\"env\">Base Directory:</label> "+
+								"    <div class=\"col-sm-8\"> "+
+								"      <input type=\"text\" class=\"form-control\" id=\"basedir\" placeholder=\"/tmp/\" disabled> "+
+								"    </div> "+
+								"  	</div>"+
+								"</form>"+
+								"	<div class=\"form-group col-sm-10\">"+
+							    "		<input type=\"checkbox\" class=\"form-check-input\" id=\"remember\" checked=\"true\">"+
+							    "		<label class=\"form-check-label\" for=\"remember\">Don't ask again for this host</label>"+
+							    "   </div></div>";
+	                		
+	                		content += '<div class="modal-footer">' +
+	        				"	<button type=\"button\" id=\"process-confirm-btn\" class=\"btn btn-outline-primary\">Confirm</button> "+
+	        				"	<button type=\"button\" id=\"process-cancel-btn\" class=\"btn btn-outline-secondary\">Cancel</button>"+
+	        				'</div>';
+	                		
+	                		GW.process.env_frame = GW.process.createJSFrameDialog(520, 340, content, "Set " + req.desc + " environment")
+	                		
+	            			$("#env-select").change(function(e){
 								
-								if($(this).val() != 'new'){
+								if($(this).val() == 'default'){
+									
+									$("#bin").prop('disabled', true);
+									
+									$("#env").prop('disabled', true);
+									
+									$("#basedir").prop('disabled', true);
+									
+								}else{
+									
+									$("#bin").prop('disabled', false);
+									
+									$("#env").prop('disabled', false);
 									
-									var envid = $(this).val();
+									$("#basedir").prop('disabled', false);
 									
-									for(var i=0;i<GW.process.envlist.length;i+=1){
+									if($(this).val() != 'new'){
 										
-										var env = GW.process.envlist[i];
+										var envid = $(this).val();
 										
-										if(env.id == envid){
+										for(var i=0;i<GW.process.envlist.length;i+=1){
+											
+											var env = GW.process.envlist[i];
+											
+											if(env.id == envid){
+												
+		        									$("#bin").val(env.bin);
+		        									
+		        									$("#env").val(env.pyenv);
+		        									
+		        									$("#basedir").val(env.basedir);
+		        									
+		        									break;
+		        									
+											}
 											
-
-        									$("#bin").val(env.bin);
-        									
-        									$("#env").val(env.pyenv);
-        									
-        									$("#basedir").val(env.basedir);
-        									
-        									break;
 										}
 										
-										
 									}
 									
 								}
 								
-							}
+							})
 							
-						})
-						
-						$("#process-confirm-btn").click(function(){
-							
-							if($(this).val() == 'default'){
-    	                		
-    	                		req.env = { bin: "default", pyenv: "default", basedir: "default" };
-    	                		
-    	                	}else{
-    	                		
-    	                		req.env = { bin: $("#bin").val(), pyenv: $("#env").val(), basedir: $("#basedir").val() };
-    	                		
-    	                	}
-    	                	
-    	                	if($("#remember").prop('checked')){
-    	                		
-    	                		GW.host.setEnvCache(hid, req.env);
-    	                		
-    	                	}
-    	                	
-    	                	GW.host.start_auth_single(hid, req, GW.process.executeCallback );
-    	                	
-    	                	GW.process.env_frame.closeFrame();
-							
-						});
-            			
-            			$("#process-cancel-btn").click(function(){
-            				
-            				GW.process.env_frame.closeFrame();
-            				
-            			});
-                		
-//                		BootstrapDialog.show({
-//            				
-//            				title: "Set " + req.desc + " environment",
-//            				
-//            				message: "<form> "+
-//        					"    <div class=\"row\"> "+
-//        						envselector +
-//        					"    </div>"+
-//        					"	<div class=\"form-group row\"> "+
-//        					"    <label class=\"control-label col-sm-4\" for=\"bin\">Python Command:</label> "+
-//        					"    <div class=\"col-sm-8\"> "+
-//        					"      <input type=\"text\" class=\"form-control\" id=\"bin\" placeholder=\"python3\" disabled> "+
-//        					"    </div> "+
-//        					"  	</div>"+
-//        					"	<div class=\"form-group row\"> "+
-//        					"    <label class=\"control-label col-sm-4\" for=\"env\">Environment Name:</label> "+
-//        					"    <div class=\"col-sm-8\"> "+
-//        					"      <input type=\"text\" class=\"form-control\" id=\"env\" placeholder=\"my-conda-env\" disabled> "+
-//        					"    </div> "+
-//        					"  	</div>"+
-//        					"	<div class=\"form-group row\"> "+
-//        					"    <label class=\"control-label col-sm-4\" for=\"env\">Base Directory:</label> "+
-//        					"    <div class=\"col-sm-8\"> "+
-//        					"      <input type=\"text\" class=\"form-control\" id=\"basedir\" placeholder=\"/tmp/\" disabled> "+
-//        					"    </div> "+
-//        					"  	</div>"+
-//        					"</form>"+
-//        					"	<div class=\"form-group col-sm-10\">"+
-//        				    "		<input type=\"checkbox\" class=\"form-check-input\" id=\"remember\">"+
-//        				    "		<label class=\"form-check-label\" for=\"remember\">Don't ask again for this host</label>"+
-//        				    "   </div>",
-//        					
-//        					onshown: function(){
-//        						
-//        						$("#env-select").change(function(e){
-//        							
-//        							if($(this).val() == 'default'){
-//        								
-//        								$("#bin").prop('disabled', true);
-//        								
-//        								$("#env").prop('disabled', true);
-//        								
-//        								$("#basedir").prop('disabled', true);
-//        								
-//        							}else{
-//        								
-//        								$("#bin").prop('disabled', false);
-//        								
-//        								$("#env").prop('disabled', false);
-//        								
-//        								$("#basedir").prop('disabled', false);
-//        								
-//        								if($(this).val() != 'new'){
-//        									
-//        									var envid = $(this).val();
-//        									
-//        									for(var i=0;i<GW.process.envlist.length;i+=1){
-//        										
-//        										var env = GW.process.envlist[i];
-//        										
-//        										if(env.id == envid){
-//        											
-//
-//                									$("#bin").val(env.bin);
-//                									
-//                									$("#env").val(env.pyenv);
-//                									
-//                									$("#basedir").val(env.basedir);
-//                									
-//                									break;
-//        										}
-//        										
-//        										
-//        									}
-//        									
-//        								}
-//        								
-//        							}
-//        							
-//        						})
-//        						
-//        					},
-//            				
-//            				buttons: [{
-//            					
-//            	            	label: 'Confirm',
-//            	                
-//            	                action: function(dialog){
-//            	                	
-//            	                	if($(this).val() == 'default'){
-//            	                		
-//            	                		req.env = { bin: "default", pyenv: "default", basedir: "default" };
-//            	                		
-//            	                	}else{
-//            	                		
-//            	                		req.env = { bin: $("#bin").val(), pyenv: $("#env").val(), basedir: $("#basedir").val() };
-//            	                		
-//            	                	}
-//            	                	
-//            	                	if($("#remember").prop('checked')){
-//            	                		
-//            	                		GW.host.setEnvCache(hid, req.env);
-//            	                		
-//            	                	}
-//            	                	
-//            	                	GW.host.start_auth_single(hid, req, GW.process.executeCallback );
-//            	                	
-//            	                	dialog.close();
-//            	                	
-//            	                }
-//            					
-//            				},{
-//            					
-//            					label: 'Cancel',
-//            					
-//            					action: function(dialog){
-//            						
-//            						dialog.close();
-//            						
-//            					}
-//            					
-//            				}]
-//            			});
-                		
-                	}).fail(function(jxr, status){
-        				
-        				console.error("fail to get the environment on this host");
-        				
-        			});
-        			
-            		
-            	}
+							$("#process-confirm-btn").click(function(){
+								
+								if($(this).val() == 'default'){
+	    	                		
+			    	                		req.env = { bin: "default", pyenv: "default", basedir: "default" };
+			    	                		
+			    	                	}else{
+			    	                		
+			    	                		req.env = { bin: $("#bin").val(), pyenv: $("#env").val(), basedir: $("#basedir").val() };
+			    	                		
+			    	                	}
+			    	                	
+			    	                	if($("#remember").prop('checked')){
+			    	                		
+			    	                		GW.host.setEnvCache(hid, req.env);
+			    	                		
+			    	                	}
+			    	                	
+			    	                	GW.host.start_auth_single(hid, req, GW.process.executeCallback );
+			    	                	
+			    	                	GW.process.env_frame.closeFrame();
+								
+							});
+	            			
+	            			$("#process-cancel-btn").click(function(){
+	            				
+	            				GW.process.env_frame.closeFrame();
+	            				
+	            			});
+	                		
+	                	}).fail(function(jxr, status){
+	        				
+	        				console.error("fail to get the environment on this host");
+	        				
+	        			});
+	        			
+	            		
+	            	}
             	
     			
-    		}else{
-    			
-    			GW.host.start_auth_single(hid, req, GW.process.executeCallback );
-    			
-    		}
+	    		}else{
+	    			
+	    			GW.host.start_auth_single(hid, req, GW.process.executeCallback );
+	    			
+	    		}
 			
 		},
 		
@@ -2023,6 +1894,7 @@ GW.process = {
 //			
 //		},
 		
+		
 		runProcess: function(pid, pname, desc){
 			
 			//select a host
@@ -2039,7 +1911,7 @@ GW.process = {
 			       '		<select class="form-control" id="hostselector" >'+
 			       '  		</select>'+
 			       '     <div class="col-sm-12 form-check">'+
-			       '		<input type="checkbox" class="form-check-input" id="remember">'+
+			       '		<input type="checkbox" class="form-check-input" id="remember" checked=\"true\" />'+
 			       '		<label class="form-check-label" for="remember">Remember this process-host connection</label>'+
 			       '     </div>'+
 			       '     </div>'+
@@ -2061,167 +1933,66 @@ GW.process = {
 					
 				}
 				
-				GW.process.host_frame = GW.process.createJSFrameDialog(500, 540, content, 'Select a host')
-				
-//				var width = 500; var height = 540;
-//				
-//				GW.process.host_frame = GW.workspace.jsFrame.create({
-//			    		title: 'Select a host',
-//			    	    left: 0, 
-//			    	    top: 0, 
-//			    	    width: width, 
-//			    	    height: height,
-//			    	    appearanceName: 'yosemite',
-//			    	    style: {
-//		                    backgroundColor: 'rgb(255,255,255)',
-//				    	    fontSize: 12,
-//		                    overflow:'auto'
-//		                },
-//			    	    html: content
-//			    	    
-//		    	});
-//		    	
-//				GW.process.host_frame.setControl({
-//		            styleDisplay:'inline',
-//		            maximizeButton: 'zoomButton',
-//		            demaximizeButton: 'dezoomButton',
-//		            minimizeButton: 'minimizeButton',
-//		            deminimizeButton: 'deminimizeButton',
-//		            hideButton: 'closeButton',
-//		            animation: true,
-//		            animationDuration: 150,
-//		
-//		        });
-//		    	
-//				GW.process.host_frame.show();
-//		    	
-//				GW.process.host_frame.setPosition((window.innerWidth - width) / 2, (window.innerHeight -height) / 2, 'LEFT_TOP');
-		    	
-		    	$.ajax({
-            		
-            		url: "list",
-            		
-            		method: "POST",
-            		
-            		data: "type=host"
-            		
-            	}).done(function(msg){
-            		
-            		msg = $.parseJSON(msg);
-            		
-            		$("#hostselector").find('option').remove().end();
-            		
-            		for(var i=0;i<msg.length;i++){
-            			
-            			$("#hostselector").append("<option id=\""+msg[i].id+"\">"+msg[i].name+"</option>");
-            			
-            		}
-            		
-            	}).fail(function(jxr, status){
-    				
-    				console.error("fail to list host");
-    				
-    			});
-		    	
-		    	$("#host-execute-btn").click(function(){
-		    		
-		    		var hostid = $("#hostselector").children(":selected").attr("id");
-                	
-                	console.log("selected host: " + hostid);
-                	
-                	//remember the process-host connection
-                	if(document.getElementById('remember').checked) {
-                	    
-                		GW.process.setCache(pid, hostid); //remember s
-                		
-                	}
-                	
-                	GW.process.executeProcess(pid, hostid, desc);
-                	
-                	GW.process.host_frame.closeFrame();
-		    		
-		    	});
-		    	
-		    	$("#host-cancel-btn").click(function(){
-		    		
-		    		GW.process.host_frame.closeFrame();
-		    		
-		    	});
+				GW.process.host_frame = GW.process.createJSFrameDialog(550, 280, content, 'Select a host')
 				
-//				BootstrapDialog.show({
-//					
-//					title: "Select a host",
-//					
-//					closable: false,
-//					
-//		            message: content,
-//		            
-//		            onshown: function(){
-//		            	
-//		            	$.ajax({
-//		            		
-//		            		url: "list",
-//		            		
-//		            		method: "POST",
-//		            		
-//		            		data: "type=host"
-//		            		
-//		            	}).done(function(msg){
-//		            		
-//		            		msg = $.parseJSON(msg);
-//		            		
-//		            		$("#hostselector").find('option').remove().end();
-//		            		
-//		            		for(var i=0;i<msg.length;i++){
-//		            			
-//		            			$("#hostselector").append("<option id=\""+msg[i].id+"\">"+msg[i].name+"</option>");
-//		            			
-//		            		}
-//		            		
-//		            	}).fail(function(jxr, status){
-//		    				
-//		    				console.error("fail to list host");
-//		    				
-//		    			});
-//		            	
-//		            },
-//		            
-//		            buttons: [{
-//			            
-//		            	label: 'Execute',
-//		                
-//		                action: function(dialogItself){
-//		                	
-//		                	var hostid = $("#hostselector").children(":selected").attr("id");
-//		                	
-//		                	console.log("selected host: " + hostid);
-//		                	
-//		                	//remember the process-host connection
-//		                	if(document.getElementById('remember').checked) {
-//		                	    
-//		                		GW.process.setCache(pid, hostid); //remember s
-//		                		
-//		                	}
-//		                	
-//		                	GW.process.executeProcess(pid, hostid, desc);
-//		                	
-//		                    dialogItself.close();
-//		                    
-//		                }
-//		        
-//		            },{
-//			            
-//		            	label: 'Cancel',
-//		                
-//		                action: function(dialogItself){
-//		                	
-//		                    dialogItself.close();
-//		                    
-//		                }
-//		        
-//		            }]
-//		            
-//				});
+			    	$.ajax({
+	            		
+	            		url: "list",
+	            		
+	            		method: "POST",
+	            		
+	            		data: "type=host"
+	            		
+	            	}).done(function(msg){
+	            		
+	            		msg = $.parseJSON(msg);
+	            		
+	            		$("#hostselector").find('option').remove().end();
+	            		
+	            		for(var i=0;i<msg.length;i++){
+	            			
+	            			if(GW.host.isLocal(msg[i])){
+	            				
+	            				$("#hostselector").append("<option id=\""+msg[i].id+"\" selected=\"selected\">"+msg[i].name+"</option>");
+	            				
+	            			}else{
+	            				
+	            				$("#hostselector").append("<option id=\""+msg[i].id+"\">"+msg[i].name+"</option>");
+	            				
+	            			}
+	            			
+	            		}
+	            		
+	            	}).fail(function(jxr, status){
+	    				
+	    				console.error("fail to list host");
+	    				
+	    			});
+			    	
+			    	$("#host-execute-btn").click(function(){
+			    		
+			    		var hostid = $("#hostselector").children(":selected").attr("id");
+	                	
+	                	console.log("selected host: " + hostid);
+	                	
+	                	//remember the process-host connection
+	                	if(document.getElementById('remember').checked) {
+	                	    
+	                		GW.process.setCache(pid, hostid); //remember s
+	                		
+	                	}
+	                	
+	                	GW.process.executeProcess(pid, hostid, desc);
+	                	
+	                	GW.process.host_frame.closeFrame();
+			    		
+			    	});
+			    	
+			    	$("#host-cancel-btn").click(function(){
+			    		
+			    		GW.process.host_frame.closeFrame();
+			    		
+			    	});
 				
 			}else{
 				
diff --git a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.result.js b/WebContent/geoweaver/js/gw.result.js
similarity index 100%
rename from WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.result.js
rename to WebContent/geoweaver/js/gw.result.js
diff --git a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.search.js b/WebContent/geoweaver/js/gw.search.js
similarity index 100%
rename from WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.search.js
rename to WebContent/geoweaver/js/gw.search.js
diff --git a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.settings.js b/WebContent/geoweaver/js/gw.settings.js
similarity index 100%
rename from WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.settings.js
rename to WebContent/geoweaver/js/gw.settings.js
diff --git a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.ssh.js b/WebContent/geoweaver/js/gw.ssh.js
similarity index 84%
rename from WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.ssh.js
rename to WebContent/geoweaver/js/gw.ssh.js
index 895ea3f76..2c89cb976 100644
--- a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.ssh.js
+++ b/WebContent/geoweaver/js/gw.ssh.js
@@ -41,8 +41,6 @@ GW.ssh = {
 	    
 	    password_cout: 0,
 	    
-//		root : this.getContextURLPath(),
-		
 		key : '',
 		
 		username : '<sec:authentication property="principal" />',
@@ -80,18 +78,6 @@ GW.ssh = {
 	    	
 	    },
 	    	  
-	    ws_onopen: function (e) {
-	    	
-	      //open the indicator
-//	      GW.monitor.openWorkspaceIndicator();
-	      
-	      //shell.echo(special.white + "connected" + special.reset);
-	      this.echo("connected");
-	      // link the SSH session established with spring security logon to the websocket session...
-	      this.send(this.token);
-	      
-	    },
-	    
 	    send: function (data) {
 	    	
 	        if(this.ws != null){
@@ -104,6 +90,19 @@ GW.ssh = {
 	        
 	        }
 	    },
+	    
+	    ws_onopen: function (e) {
+	    	
+	      //open the indicator
+//	      GW.monitor.openWorkspaceIndicator();
+	      
+	      //shell.echo(special.white + "connected" + special.reset);
+	      this.echo("connected");
+	      // link the SSH session established with spring security logon to the websocket session...
+	      this.send(this.token);
+	      
+	    },
+	    
 
 	    ws_onclose: function (e) {
 	    	
@@ -139,7 +138,7 @@ GW.ssh = {
 	    ws_onmessage: function (e) {
 	      
 	      try {
-	    	
+	    	  
 	        if(e.data.indexOf(this.special.prompt) == -1 && 
 	        		
 	        		e.data.indexOf(this.special.ready) == -1 && 
@@ -171,15 +170,6 @@ GW.ssh = {
 	      }
 	      
 	    },
-
-//	    getContextURLPath: function () {
-//	        var rootUrl = location.protocol;
-//	        rootUrl = rootUrl+"//"+location.host;
-//	        var path = location.pathname;
-//	        var tempStr = path.split('/');
-//	        rootUrl = rootUrl+"/"+tempStr[1];
-//	        return rootUrl;
-//	    },
 	    
 	    addlog: function(content){
 	    	var dt = new Date();
@@ -189,13 +179,27 @@ GW.ssh = {
 //	    	$("#log-window").animate({ scrollTop: $('#log-window').prop("scrollHeight")}, 1);
 	    },
 	    
+	    getWsPrefixURL: function(){
+	    	
+	    	var s = ((window.location.protocol === "https:") ? "wss://" : "ws://") + window.location.host + "/";
+	    	
+	    	s += "Geoweaver/";
+	    	
+	    	console.log("Ws URL Prefix: ", s)
+	    	
+	    	return s;
+	    	
+	    },
+	    
 	    startLogSocket: function(token){
 	    	
-	    	GW.ssh.all_ws = new WebSocket("ws://localhost:8080/Geoweaver/shell-socket");
+	    	console.log("WebSocket Channel is Openned");
+	    	
+	    	GW.ssh.all_ws = new WebSocket(this.getWsPrefixURL() + "command-socket");
 	        
 			GW.ssh.output_div_id = "log_box_id";
 	        
-			GW.ssh.token = token;
+			GW.ssh.token = token; //token is the jsession id
 			
 //			this.echo("Running process " + token)
 	        
@@ -209,10 +213,13 @@ GW.ssh = {
 	    	
 	    },
 
-		openLog: function(token){
+		openLog: function(msg){
 			
 //			$("#log-window").slideToggle(true);
-			switchTab(document.getElementById("main-console-tab"), "main-console");
+//			switchTab(document.getElementById("main-console-tab"), "main-console");
+			GW.general.switchTab("console");
+			
+			this.addlog("=======\nStart to process " + msg.history_id);
 			
 //			BootstrapDialog.show({
 //				
@@ -223,22 +230,24 @@ GW.ssh = {
 //				closable: true,
 //				
 //				onshown: function(){
+			
 					
-					GW.ssh.ws = new SockJS("shell");
-			        
-					GW.ssh.output_div_id = "log_box_id";
-			        
-					GW.ssh.token = token;
-					
-					this.echo("Running process " + token)
-			        
-					GW.ssh.ws.onopen = function(e) { GW.ssh.ws_onopen(e) };
-			        
-					GW.ssh.ws.onclose = function(e) { GW.ssh.ws_onclose(e) };
-			        
-					GW.ssh.ws.onmessage = function(e) { GW.ssh.ws_onmessage(e) };
-			        
-					GW.ssh.ws.onerror = function(e) { GW.ssh.ws_onerror(e) };
+//					GW.ssh.ws = new SockJS("shell");
+//			        
+//					GW.ssh.output_div_id = "log_box_id";
+//			        
+//					GW.ssh.token = token;
+//					
+//					this.echo("Running process " + token)
+//			        
+//					GW.ssh.ws.onopen = function(e) { GW.ssh.ws_onopen(e) };
+//			        
+//					GW.ssh.ws.onclose = function(e) { GW.ssh.ws_onclose(e) };
+//			        
+//					GW.ssh.ws.onmessage = function(e) { GW.ssh.ws_onmessage(e) };
+//			        
+//					GW.ssh.ws.onerror = function(e) { GW.ssh.ws_onerror(e) };
+			
 			        
 //				},
 //
diff --git a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.sshterm.js b/WebContent/geoweaver/js/gw.sshterm.js
similarity index 95%
rename from WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.sshterm.js
rename to WebContent/geoweaver/js/gw.sshterm.js
index 804b4c7e4..8789627e5 100644
--- a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.sshterm.js
+++ b/WebContent/geoweaver/js/gw.sshterm.js
@@ -227,10 +227,24 @@ function getContextURLPath() {
     return rootUrl;
 }
 
+function getWsPrefixURL (){
+	
+	var s = ((window.location.protocol === "https:") ? "wss://" : "ws://") + window.location.host + "/";
+	
+	s +=  "Geoweaver/";
+	
+	console.log("Ws URL Prefix: ", s)
+	
+	return s
+	
+}
+
 $(document).ready(function ($) {
 	
-    ws = new SockJS("shell");
-    
+//    ws = new SockJS("shell");
+	
+	ws = new WebSocket(getWsPrefixURL() + "terminal-socket")
+	
     ws.onopen = function(e) { ws_onopen(e) };
     
     ws.onclose = function(e) { ws_onclose(e) };
diff --git a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.toolbar.js b/WebContent/geoweaver/js/gw.toolbar.js
similarity index 90%
rename from WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.toolbar.js
rename to WebContent/geoweaver/js/gw.toolbar.js
index c6cf96d42..05090d519 100644
--- a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.toolbar.js
+++ b/WebContent/geoweaver/js/gw.toolbar.js
@@ -54,12 +54,12 @@ GW.toolbar = {
 			var frame = GW.process.createJSFrameDialog(300, 180, content, "Recent History");
 			
             frame.on('#history-process-d', 'click', (_frame, evt) => {
-            	GW.process.recent(20);
+            	GW.process.recent(20, true);
             	_frame.closeFrame();
             });
             
             frame.on('#history-workflow-d', 'click', (_frame, evt) => {
-            	GW.workflow.recent(20);
+            	GW.workflow.recent(20, true);
             	_frame.closeFrame();
             });
             
@@ -129,15 +129,15 @@ GW.toolbar = {
 		
 		listenLogWindowSlider: function(){
 			
-			$("#log-window").slideToggle(true);
-			
-			$(".btn-minimize").click(function(){
-			    
-				$(this).toggleClass('btn-plus');
-			    
-			    $("#log-window").slideToggle();
-			
-			});
+//			$("#log-window").slideToggle(true);
+//			
+//			$(".btn-minimize").click(function(){
+//			    
+//				$(this).toggleClass('btn-plus');
+//			    
+//			    $("#log-window").slideToggle();
+//			
+//			});
 			
 		}
 		
diff --git a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.tutorial.js b/WebContent/geoweaver/js/gw.tutorial.js
similarity index 100%
rename from WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.tutorial.js
rename to WebContent/geoweaver/js/gw.tutorial.js
diff --git a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.workflow.js b/WebContent/geoweaver/js/gw.workflow.js
similarity index 96%
rename from WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.workflow.js
rename to WebContent/geoweaver/js/gw.workflow.js
index 7e07b5959..46ea1b515 100644
--- a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.workflow.js
+++ b/WebContent/geoweaver/js/gw.workflow.js
@@ -84,7 +84,7 @@ GW.workflow = {
 
 		});
 		
-		content += "</div>"+
+		content += "</div><div>"+
 		
 		"<p align=\"right\">"+
 		
@@ -100,13 +100,18 @@ GW.workflow = {
     	
 		workflowid+"','workflow')\"></i>"+
 		
-		"</p>"+
+		"</p></div>"+
+		
+		'   <div class="row" id="workflow-history-container" style="padding:0px;margin:0px; " >'+
+		
+	    '   </div>'+
 		
 		"</div>";
 		
 		$("#main-workflow-content").html(content);
 		
-		switchTab(document.getElementById("main-workflow-tab"), "main-workflow-info");
+//		switchTab(document.getElementById("main-workflow-tab"), "main-workflow-info");
+		GW.general.switchTab("workflow")
 		
 	},
 
@@ -480,6 +485,11 @@ GW.workflow = {
 				
 			}
 			
+			// switch to the workflow tab
+//			switchTab(document.getElementById("main-workspace-tab"), "workspace");
+			
+			GW.general.switchTab("workspace")
+			
         	_frame.closeFrame();
         	
         });
@@ -488,6 +498,8 @@ GW.workflow = {
         	_frame.closeFrame();
         });
 		
+		
+		
 //		BootstrapDialog.show({
 //			
 //			title: "Show a way",
@@ -862,6 +874,8 @@ GW.workflow = {
 			
 			try{
 				
+				console.log(msg)
+				
 				msg = $.parseJSON(msg);
 				
 				if(msg.ret == "success"){
@@ -891,13 +905,15 @@ GW.workflow = {
 					
 				}
 				
-				if(dialogItself) dialogItself.close();
+//				if(dialogItself) dialogItself.close();
 				
 			}catch(e){
 				
-				if(button) button.stopSpin();
-        		
-				if(dialogItself) dialogItself.enableButtons(true);
+				console.error(e)
+				
+//				if(button) button.stopSpin();
+//        		
+//				if(dialogItself) dialogItself.enableButtons(true);
 				
 				alert("fail to execute the workflow " + req.wid + ": " + e);
 				
@@ -1120,6 +1136,13 @@ GW.workflow = {
 		
 		content += "</tbody></table></div>";
 		
+		// create an interactive chart to show all the data
+		
+		content = "<div id=\"workflow-chart-container\" width=\"200\" height=\"100\">"+
+		"<canvas id=\"workflow-history-chart\" style=\"width:200px !important; height:100px !important;\" ></canvas>"+
+		"</div>" + 
+		content;
+		
 		return content;
 		
 	},
@@ -1148,7 +1171,12 @@ GW.workflow = {
 			
 			var content = GW.workflow.getTable(msg);
 			
-			var frame = GW.process.createJSFrameDialog(600, 360, content, "History")
+			$("#workflow-history-container").html(content);
+
+			GW.chart.renderWorkflowHistoryChart(msg);
+			
+			
+//			var frame = GW.process.createJSFrameDialog(600, 360, content, "History")
 			
 //			var width = 600; var height = 360;
 //			
@@ -1316,7 +1344,7 @@ GW.workflow = {
 				content += "    <tr> "+
 					"      <td>"+msg.input[i]+"</td> "+
 					"      <td>"+msg.output[i]+"</td> "+
-					"      <td><a href=\"javascript: GW.process.getHistoryDetails('"+msg.output[i]+"')\">Check</a></td> "+
+					"      <td><a href=\"javascript: GW.process.showHistoryDetails('"+msg.output[i]+"')\">Check</a></td> "+
 					"    </tr>";
 				
 			}
diff --git a/WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.workspace.js b/WebContent/geoweaver/js/gw.workspace.js
similarity index 100%
rename from WebContent/geoweaver/js/edu.gmu.csiss.geoweaver.workspace.js
rename to WebContent/geoweaver/js/gw.workspace.js
diff --git a/WebContent/geoweaver/js/jquery-3.2.1.min.js b/WebContent/geoweaver/js/jquery-3.2.1.min.js
new file mode 100644
index 000000000..644d35e27
--- /dev/null
+++ b/WebContent/geoweaver/js/jquery-3.2.1.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v3.2.1 | (c) JS Foundation and other contributors | jquery.org/license */
+!function(a,b){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){"use strict";var c=[],d=a.document,e=Object.getPrototypeOf,f=c.slice,g=c.concat,h=c.push,i=c.indexOf,j={},k=j.toString,l=j.hasOwnProperty,m=l.toString,n=m.call(Object),o={};function p(a,b){b=b||d;var c=b.createElement("script");c.text=a,b.head.appendChild(c).parentNode.removeChild(c)}var q="3.2.1",r=function(a,b){return new r.fn.init(a,b)},s=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,t=/^-ms-/,u=/-([a-z])/g,v=function(a,b){return b.toUpperCase()};r.fn=r.prototype={jquery:q,constructor:r,length:0,toArray:function(){return f.call(this)},get:function(a){return null==a?f.call(this):a<0?this[a+this.length]:this[a]},pushStack:function(a){var b=r.merge(this.constructor(),a);return b.prevObject=this,b},each:function(a){return r.each(this,a)},map:function(a){return this.pushStack(r.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(f.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(a<0?b:0);return this.pushStack(c>=0&&c<b?[this[c]]:[])},end:function(){return this.prevObject||this.constructor()},push:h,sort:c.sort,splice:c.splice},r.extend=r.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||r.isFunction(g)||(g={}),h===i&&(g=this,h--);h<i;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(r.isPlainObject(d)||(e=Array.isArray(d)))?(e?(e=!1,f=c&&Array.isArray(c)?c:[]):f=c&&r.isPlainObject(c)?c:{},g[b]=r.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},r.extend({expando:"jQuery"+(q+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===r.type(a)},isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){var b=r.type(a);return("number"===b||"string"===b)&&!isNaN(a-parseFloat(a))},isPlainObject:function(a){var b,c;return!(!a||"[object Object]"!==k.call(a))&&(!(b=e(a))||(c=l.call(b,"constructor")&&b.constructor,"function"==typeof c&&m.call(c)===n))},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?j[k.call(a)]||"object":typeof a},globalEval:function(a){p(a)},camelCase:function(a){return a.replace(t,"ms-").replace(u,v)},each:function(a,b){var c,d=0;if(w(a)){for(c=a.length;d<c;d++)if(b.call(a[d],d,a[d])===!1)break}else for(d in a)if(b.call(a[d],d,a[d])===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(s,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(w(Object(a))?r.merge(c,"string"==typeof a?[a]:a):h.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:i.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;d<c;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;f<g;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,e,f=0,h=[];if(w(a))for(d=a.length;f<d;f++)e=b(a[f],f,c),null!=e&&h.push(e);else for(f in a)e=b(a[f],f,c),null!=e&&h.push(e);return g.apply([],h)},guid:1,proxy:function(a,b){var c,d,e;if("string"==typeof b&&(c=a[b],b=a,a=c),r.isFunction(a))return d=f.call(arguments,2),e=function(){return a.apply(b||this,d.concat(f.call(arguments)))},e.guid=a.guid=a.guid||r.guid++,e},now:Date.now,support:o}),"function"==typeof Symbol&&(r.fn[Symbol.iterator]=c[Symbol.iterator]),r.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(a,b){j["[object "+b+"]"]=b.toLowerCase()});function w(a){var b=!!a&&"length"in a&&a.length,c=r.type(a);return"function"!==c&&!r.isWindow(a)&&("array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a)}var x=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+1*new Date,v=a.document,w=0,x=0,y=ha(),z=ha(),A=ha(),B=function(a,b){return a===b&&(l=!0),0},C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=function(a,b){for(var c=0,d=a.length;c<d;c++)if(a[c]===b)return c;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",M="\\["+K+"*("+L+")(?:"+K+"*([*^$|!~]?=)"+K+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+L+"))|)"+K+"*\\]",N=":("+L+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+M+")*)|.*)\\)|)",O=new RegExp(K+"+","g"),P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(N),U=new RegExp("^"+L+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L+"|[*])"),ATTR:new RegExp("^"+M),PSEUDO:new RegExp("^"+N),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),aa=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:d<0?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)},ba=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ca=function(a,b){return b?"\0"===a?"\ufffd":a.slice(0,-1)+"\\"+a.charCodeAt(a.length-1).toString(16)+" ":"\\"+a},da=function(){m()},ea=ta(function(a){return a.disabled===!0&&("form"in a||"label"in a)},{dir:"parentNode",next:"legend"});try{G.apply(D=H.call(v.childNodes),v.childNodes),D[v.childNodes.length].nodeType}catch(fa){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function ga(a,b,d,e){var f,h,j,k,l,o,r,s=b&&b.ownerDocument,w=b?b.nodeType:9;if(d=d||[],"string"!=typeof a||!a||1!==w&&9!==w&&11!==w)return d;if(!e&&((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,p)){if(11!==w&&(l=Z.exec(a)))if(f=l[1]){if(9===w){if(!(j=b.getElementById(f)))return d;if(j.id===f)return d.push(j),d}else if(s&&(j=s.getElementById(f))&&t(b,j)&&j.id===f)return d.push(j),d}else{if(l[2])return G.apply(d,b.getElementsByTagName(a)),d;if((f=l[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(f)),d}if(c.qsa&&!A[a+" "]&&(!q||!q.test(a))){if(1!==w)s=b,r=a;else if("object"!==b.nodeName.toLowerCase()){(k=b.getAttribute("id"))?k=k.replace(ba,ca):b.setAttribute("id",k=u),o=g(a),h=o.length;while(h--)o[h]="#"+k+" "+sa(o[h]);r=o.join(","),s=$.test(a)&&qa(b.parentNode)||b}if(r)try{return G.apply(d,s.querySelectorAll(r)),d}catch(x){}finally{k===u&&b.removeAttribute("id")}}}return i(a.replace(P,"$1"),b,d,e)}function ha(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function ia(a){return a[u]=!0,a}function ja(a){var b=n.createElement("fieldset");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function ka(a,b){var c=a.split("|"),e=c.length;while(e--)d.attrHandle[c[e]]=b}function la(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&a.sourceIndex-b.sourceIndex;if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function ma(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function na(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function oa(a){return function(b){return"form"in b?b.parentNode&&b.disabled===!1?"label"in b?"label"in b.parentNode?b.parentNode.disabled===a:b.disabled===a:b.isDisabled===a||b.isDisabled!==!a&&ea(b)===a:b.disabled===a:"label"in b&&b.disabled===a}}function pa(a){return ia(function(b){return b=+b,ia(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function qa(a){return a&&"undefined"!=typeof a.getElementsByTagName&&a}c=ga.support={},f=ga.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return!!b&&"HTML"!==b.nodeName},m=ga.setDocument=function(a){var b,e,g=a?a.ownerDocument||a:v;return g!==n&&9===g.nodeType&&g.documentElement?(n=g,o=n.documentElement,p=!f(n),v!==n&&(e=n.defaultView)&&e.top!==e&&(e.addEventListener?e.addEventListener("unload",da,!1):e.attachEvent&&e.attachEvent("onunload",da)),c.attributes=ja(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ja(function(a){return a.appendChild(n.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(n.getElementsByClassName),c.getById=ja(function(a){return o.appendChild(a).id=u,!n.getElementsByName||!n.getElementsByName(u).length}),c.getById?(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){return a.getAttribute("id")===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c=b.getElementById(a);return c?[c]:[]}}):(d.filter.ID=function(a){var b=a.replace(_,aa);return function(a){var c="undefined"!=typeof a.getAttributeNode&&a.getAttributeNode("id");return c&&c.value===b}},d.find.ID=function(a,b){if("undefined"!=typeof b.getElementById&&p){var c,d,e,f=b.getElementById(a);if(f){if(c=f.getAttributeNode("id"),c&&c.value===a)return[f];e=b.getElementsByName(a),d=0;while(f=e[d++])if(c=f.getAttributeNode("id"),c&&c.value===a)return[f]}return[]}}),d.find.TAG=c.getElementsByTagName?function(a,b){return"undefined"!=typeof b.getElementsByTagName?b.getElementsByTagName(a):c.qsa?b.querySelectorAll(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){if("undefined"!=typeof b.getElementsByClassName&&p)return b.getElementsByClassName(a)},r=[],q=[],(c.qsa=Y.test(n.querySelectorAll))&&(ja(function(a){o.appendChild(a).innerHTML="<a id='"+u+"'></a><select id='"+u+"-\r\\' msallowcapture=''><option selected=''></option></select>",a.querySelectorAll("[msallowcapture^='']").length&&q.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll("[id~="+u+"-]").length||q.push("~="),a.querySelectorAll(":checked").length||q.push(":checked"),a.querySelectorAll("a#"+u+"+*").length||q.push(".#.+[+~]")}),ja(function(a){a.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var b=n.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+K+"*[*^$|!~]?="),2!==a.querySelectorAll(":enabled").length&&q.push(":enabled",":disabled"),o.appendChild(a).disabled=!0,2!==a.querySelectorAll(":disabled").length&&q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=Y.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ja(function(a){c.disconnectedMatch=s.call(a,"*"),s.call(a,"[s!='']:x"),r.push("!=",N)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=Y.test(o.compareDocumentPosition),t=b||Y.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===n||a.ownerDocument===v&&t(v,a)?-1:b===n||b.ownerDocument===v&&t(v,b)?1:k?I(k,a)-I(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,e=a.parentNode,f=b.parentNode,g=[a],h=[b];if(!e||!f)return a===n?-1:b===n?1:e?-1:f?1:k?I(k,a)-I(k,b):0;if(e===f)return la(a,b);c=a;while(c=c.parentNode)g.unshift(c);c=b;while(c=c.parentNode)h.unshift(c);while(g[d]===h[d])d++;return d?la(g[d],h[d]):g[d]===v?-1:h[d]===v?1:0},n):n},ga.matches=function(a,b){return ga(a,null,null,b)},ga.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(S,"='$1']"),c.matchesSelector&&p&&!A[b+" "]&&(!r||!r.test(b))&&(!q||!q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return ga(b,n,null,[a]).length>0},ga.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},ga.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},ga.escape=function(a){return(a+"").replace(ba,ca)},ga.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},ga.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=ga.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=ga.selectors={cacheLength:50,createPseudo:ia,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(_,aa),a[3]=(a[3]||a[4]||a[5]||"").replace(_,aa),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||ga.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&ga.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return V.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&T.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(_,aa).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||"undefined"!=typeof a.getAttribute&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=ga.attr(d,a);return null==e?"!="===b:!b||(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e.replace(O," ")+" ").indexOf(c)>-1:"|="===b&&(e===c||e.slice(0,c.length+1)===c+"-"))}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h,t=!1;if(q){if(f){while(p){m=b;while(m=m[p])if(h?m.nodeName.toLowerCase()===r:1===m.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){m=q,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n&&j[2],m=n&&q.childNodes[n];while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if(1===m.nodeType&&++t&&m===b){k[a]=[w,n,t];break}}else if(s&&(m=b,l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),j=k[a]||[],n=j[0]===w&&j[1],t=n),t===!1)while(m=++n&&m&&m[p]||(t=n=0)||o.pop())if((h?m.nodeName.toLowerCase()===r:1===m.nodeType)&&++t&&(s&&(l=m[u]||(m[u]={}),k=l[m.uniqueID]||(l[m.uniqueID]={}),k[a]=[w,t]),m===b))break;return t-=e,t===d||t%d===0&&t/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||ga.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?ia(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:ia(function(a){var b=[],c=[],d=h(a.replace(P,"$1"));return d[u]?ia(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),b[0]=null,!c.pop()}}),has:ia(function(a){return function(b){return ga(a,b).length>0}}),contains:ia(function(a){return a=a.replace(_,aa),function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:ia(function(a){return U.test(a||"")||ga.error("unsupported lang: "+a),a=a.replace(_,aa).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:oa(!1),disabled:oa(!0),checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:pa(function(){return[0]}),last:pa(function(a,b){return[b-1]}),eq:pa(function(a,b,c){return[c<0?c+b:c]}),even:pa(function(a,b){for(var c=0;c<b;c+=2)a.push(c);return a}),odd:pa(function(a,b){for(var c=1;c<b;c+=2)a.push(c);return a}),lt:pa(function(a,b,c){for(var d=c<0?c+b:c;--d>=0;)a.push(d);return a}),gt:pa(function(a,b,c){for(var d=c<0?c+b:c;++d<b;)a.push(d);return a})}},d.pseudos.nth=d.pseudos.eq;for(b in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})d.pseudos[b]=ma(b);for(b in{submit:!0,reset:!0})d.pseudos[b]=na(b);function ra(){}ra.prototype=d.filters=d.pseudos,d.setFilters=new ra,g=ga.tokenize=function(a,b){var c,e,f,g,h,i,j,k=z[a+" "];if(k)return b?0:k.slice(0);h=a,i=[],j=d.preFilter;while(h){c&&!(e=Q.exec(h))||(e&&(h=h.slice(e[0].length)||h),i.push(f=[])),c=!1,(e=R.exec(h))&&(c=e.shift(),f.push({value:c,type:e[0].replace(P," ")}),h=h.slice(c.length));for(g in d.filter)!(e=V[g].exec(h))||j[g]&&!(e=j[g](e))||(c=e.shift(),f.push({value:c,type:g,matches:e}),h=h.slice(c.length));if(!c)break}return b?h.length:h?ga.error(a):z(a,i).slice(0)};function sa(a){for(var b=0,c=a.length,d="";b<c;b++)d+=a[b].value;return d}function ta(a,b,c){var d=b.dir,e=b.next,f=e||d,g=c&&"parentNode"===f,h=x++;return b.first?function(b,c,e){while(b=b[d])if(1===b.nodeType||g)return a(b,c,e);return!1}:function(b,c,i){var j,k,l,m=[w,h];if(i){while(b=b[d])if((1===b.nodeType||g)&&a(b,c,i))return!0}else while(b=b[d])if(1===b.nodeType||g)if(l=b[u]||(b[u]={}),k=l[b.uniqueID]||(l[b.uniqueID]={}),e&&e===b.nodeName.toLowerCase())b=b[d]||b;else{if((j=k[f])&&j[0]===w&&j[1]===h)return m[2]=j[2];if(k[f]=m,m[2]=a(b,c,i))return!0}return!1}}function ua(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function va(a,b,c){for(var d=0,e=b.length;d<e;d++)ga(a,b[d],c);return c}function wa(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;h<i;h++)(f=a[h])&&(c&&!c(f,d,e)||(g.push(f),j&&b.push(h)));return g}function xa(a,b,c,d,e,f){return d&&!d[u]&&(d=xa(d)),e&&!e[u]&&(e=xa(e,f)),ia(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||va(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:wa(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=wa(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?I(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=wa(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ya(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=ta(function(a){return a===b},h,!0),l=ta(function(a){return I(b,a)>-1},h,!0),m=[function(a,c,d){var e=!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d));return b=null,e}];i<f;i++)if(c=d.relative[a[i].type])m=[ta(ua(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;e<f;e++)if(d.relative[a[e].type])break;return xa(i>1&&ua(m),i>1&&sa(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(P,"$1"),c,i<e&&ya(a.slice(i,e)),e<f&&ya(a=a.slice(e)),e<f&&sa(a))}m.push(c)}return ua(m)}function za(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,o,q,r=0,s="0",t=f&&[],u=[],v=j,x=f||e&&d.find.TAG("*",k),y=w+=null==v?1:Math.random()||.1,z=x.length;for(k&&(j=g===n||g||k);s!==z&&null!=(l=x[s]);s++){if(e&&l){o=0,g||l.ownerDocument===n||(m(l),h=!p);while(q=a[o++])if(q(l,g||n,h)){i.push(l);break}k&&(w=y)}c&&((l=!q&&l)&&r--,f&&t.push(l))}if(r+=s,c&&s!==r){o=0;while(q=b[o++])q(t,u,g,h);if(f){if(r>0)while(s--)t[s]||u[s]||(u[s]=E.call(i));u=wa(u)}G.apply(i,u),k&&!f&&u.length>0&&r+b.length>1&&ga.uniqueSort(i)}return k&&(w=y,j=v),t};return c?ia(f):f}return h=ga.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=ya(b[c]),f[u]?d.push(f):e.push(f);f=A(a,za(e,d)),f.selector=a}return f},i=ga.select=function(a,b,c,e){var f,i,j,k,l,m="function"==typeof a&&a,n=!e&&g(a=m.selector||a);if(c=c||[],1===n.length){if(i=n[0]=n[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&9===b.nodeType&&p&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(_,aa),b)||[])[0],!b)return c;m&&(b=b.parentNode),a=a.slice(i.shift().value.length)}f=V.needsContext.test(a)?0:i.length;while(f--){if(j=i[f],d.relative[k=j.type])break;if((l=d.find[k])&&(e=l(j.matches[0].replace(_,aa),$.test(i[0].type)&&qa(b.parentNode)||b))){if(i.splice(f,1),a=e.length&&sa(i),!a)return G.apply(c,e),c;break}}}return(m||h(a,n))(e,b,!p,c,!b||$.test(a)&&qa(b.parentNode)||b),c},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ja(function(a){return 1&a.compareDocumentPosition(n.createElement("fieldset"))}),ja(function(a){return a.innerHTML="<a href='#'></a>","#"===a.firstChild.getAttribute("href")})||ka("type|href|height|width",function(a,b,c){if(!c)return a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ja(function(a){return a.innerHTML="<input/>",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||ka("value",function(a,b,c){if(!c&&"input"===a.nodeName.toLowerCase())return a.defaultValue}),ja(function(a){return null==a.getAttribute("disabled")})||ka(J,function(a,b,c){var d;if(!c)return a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),ga}(a);r.find=x,r.expr=x.selectors,r.expr[":"]=r.expr.pseudos,r.uniqueSort=r.unique=x.uniqueSort,r.text=x.getText,r.isXMLDoc=x.isXML,r.contains=x.contains,r.escapeSelector=x.escape;var y=function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&r(a).is(c))break;d.push(a)}return d},z=function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c},A=r.expr.match.needsContext;function B(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()}var C=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i,D=/^.[^:#\[\.,]*$/;function E(a,b,c){return r.isFunction(b)?r.grep(a,function(a,d){return!!b.call(a,d,a)!==c}):b.nodeType?r.grep(a,function(a){return a===b!==c}):"string"!=typeof b?r.grep(a,function(a){return i.call(b,a)>-1!==c}):D.test(b)?r.filter(b,a,c):(b=r.filter(b,a),r.grep(a,function(a){return i.call(b,a)>-1!==c&&1===a.nodeType}))}r.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?r.find.matchesSelector(d,a)?[d]:[]:r.find.matches(a,r.grep(b,function(a){return 1===a.nodeType}))},r.fn.extend({find:function(a){var b,c,d=this.length,e=this;if("string"!=typeof a)return this.pushStack(r(a).filter(function(){for(b=0;b<d;b++)if(r.contains(e[b],this))return!0}));for(c=this.pushStack([]),b=0;b<d;b++)r.find(a,e[b],c);return d>1?r.uniqueSort(c):c},filter:function(a){return this.pushStack(E(this,a||[],!1))},not:function(a){return this.pushStack(E(this,a||[],!0))},is:function(a){return!!E(this,"string"==typeof a&&A.test(a)?r(a):a||[],!1).length}});var F,G=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/,H=r.fn.init=function(a,b,c){var e,f;if(!a)return this;if(c=c||F,"string"==typeof a){if(e="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:G.exec(a),!e||!e[1]&&b)return!b||b.jquery?(b||c).find(a):this.constructor(b).find(a);if(e[1]){if(b=b instanceof r?b[0]:b,r.merge(this,r.parseHTML(e[1],b&&b.nodeType?b.ownerDocument||b:d,!0)),C.test(e[1])&&r.isPlainObject(b))for(e in b)r.isFunction(this[e])?this[e](b[e]):this.attr(e,b[e]);return this}return f=d.getElementById(e[2]),f&&(this[0]=f,this.length=1),this}return a.nodeType?(this[0]=a,this.length=1,this):r.isFunction(a)?void 0!==c.ready?c.ready(a):a(r):r.makeArray(a,this)};H.prototype=r.fn,F=r(d);var I=/^(?:parents|prev(?:Until|All))/,J={children:!0,contents:!0,next:!0,prev:!0};r.fn.extend({has:function(a){var b=r(a,this),c=b.length;return this.filter(function(){for(var a=0;a<c;a++)if(r.contains(this,b[a]))return!0})},closest:function(a,b){var c,d=0,e=this.length,f=[],g="string"!=typeof a&&r(a);if(!A.test(a))for(;d<e;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&r.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?r.uniqueSort(f):f)},index:function(a){return a?"string"==typeof a?i.call(r(a),this[0]):i.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(r.uniqueSort(r.merge(this.get(),r(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function K(a,b){while((a=a[b])&&1!==a.nodeType);return a}r.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return y(a,"parentNode")},parentsUntil:function(a,b,c){return y(a,"parentNode",c)},next:function(a){return K(a,"nextSibling")},prev:function(a){return K(a,"previousSibling")},nextAll:function(a){return y(a,"nextSibling")},prevAll:function(a){return y(a,"previousSibling")},nextUntil:function(a,b,c){return y(a,"nextSibling",c)},prevUntil:function(a,b,c){return y(a,"previousSibling",c)},siblings:function(a){return z((a.parentNode||{}).firstChild,a)},children:function(a){return z(a.firstChild)},contents:function(a){return B(a,"iframe")?a.contentDocument:(B(a,"template")&&(a=a.content||a),r.merge([],a.childNodes))}},function(a,b){r.fn[a]=function(c,d){var e=r.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=r.filter(d,e)),this.length>1&&(J[a]||r.uniqueSort(e),I.test(a)&&e.reverse()),this.pushStack(e)}});var L=/[^\x20\t\r\n\f]+/g;function M(a){var b={};return r.each(a.match(L)||[],function(a,c){b[c]=!0}),b}r.Callbacks=function(a){a="string"==typeof a?M(a):r.extend({},a);var b,c,d,e,f=[],g=[],h=-1,i=function(){for(e=e||a.once,d=b=!0;g.length;h=-1){c=g.shift();while(++h<f.length)f[h].apply(c[0],c[1])===!1&&a.stopOnFalse&&(h=f.length,c=!1)}a.memory||(c=!1),b=!1,e&&(f=c?[]:"")},j={add:function(){return f&&(c&&!b&&(h=f.length-1,g.push(c)),function d(b){r.each(b,function(b,c){r.isFunction(c)?a.unique&&j.has(c)||f.push(c):c&&c.length&&"string"!==r.type(c)&&d(c)})}(arguments),c&&!b&&i()),this},remove:function(){return r.each(arguments,function(a,b){var c;while((c=r.inArray(b,f,c))>-1)f.splice(c,1),c<=h&&h--}),this},has:function(a){return a?r.inArray(a,f)>-1:f.length>0},empty:function(){return f&&(f=[]),this},disable:function(){return e=g=[],f=c="",this},disabled:function(){return!f},lock:function(){return e=g=[],c||b||(f=c=""),this},locked:function(){return!!e},fireWith:function(a,c){return e||(c=c||[],c=[a,c.slice?c.slice():c],g.push(c),b||i()),this},fire:function(){return j.fireWith(this,arguments),this},fired:function(){return!!d}};return j};function N(a){return a}function O(a){throw a}function P(a,b,c,d){var e;try{a&&r.isFunction(e=a.promise)?e.call(a).done(b).fail(c):a&&r.isFunction(e=a.then)?e.call(a,b,c):b.apply(void 0,[a].slice(d))}catch(a){c.apply(void 0,[a])}}r.extend({Deferred:function(b){var c=[["notify","progress",r.Callbacks("memory"),r.Callbacks("memory"),2],["resolve","done",r.Callbacks("once memory"),r.Callbacks("once memory"),0,"resolved"],["reject","fail",r.Callbacks("once memory"),r.Callbacks("once memory"),1,"rejected"]],d="pending",e={state:function(){return d},always:function(){return f.done(arguments).fail(arguments),this},"catch":function(a){return e.then(null,a)},pipe:function(){var a=arguments;return r.Deferred(function(b){r.each(c,function(c,d){var e=r.isFunction(a[d[4]])&&a[d[4]];f[d[1]](function(){var a=e&&e.apply(this,arguments);a&&r.isFunction(a.promise)?a.promise().progress(b.notify).done(b.resolve).fail(b.reject):b[d[0]+"With"](this,e?[a]:arguments)})}),a=null}).promise()},then:function(b,d,e){var f=0;function g(b,c,d,e){return function(){var h=this,i=arguments,j=function(){var a,j;if(!(b<f)){if(a=d.apply(h,i),a===c.promise())throw new TypeError("Thenable self-resolution");j=a&&("object"==typeof a||"function"==typeof a)&&a.then,r.isFunction(j)?e?j.call(a,g(f,c,N,e),g(f,c,O,e)):(f++,j.call(a,g(f,c,N,e),g(f,c,O,e),g(f,c,N,c.notifyWith))):(d!==N&&(h=void 0,i=[a]),(e||c.resolveWith)(h,i))}},k=e?j:function(){try{j()}catch(a){r.Deferred.exceptionHook&&r.Deferred.exceptionHook(a,k.stackTrace),b+1>=f&&(d!==O&&(h=void 0,i=[a]),c.rejectWith(h,i))}};b?k():(r.Deferred.getStackHook&&(k.stackTrace=r.Deferred.getStackHook()),a.setTimeout(k))}}return r.Deferred(function(a){c[0][3].add(g(0,a,r.isFunction(e)?e:N,a.notifyWith)),c[1][3].add(g(0,a,r.isFunction(b)?b:N)),c[2][3].add(g(0,a,r.isFunction(d)?d:O))}).promise()},promise:function(a){return null!=a?r.extend(a,e):e}},f={};return r.each(c,function(a,b){var g=b[2],h=b[5];e[b[1]]=g.add,h&&g.add(function(){d=h},c[3-a][2].disable,c[0][2].lock),g.add(b[3].fire),f[b[0]]=function(){return f[b[0]+"With"](this===f?void 0:this,arguments),this},f[b[0]+"With"]=g.fireWith}),e.promise(f),b&&b.call(f,f),f},when:function(a){var b=arguments.length,c=b,d=Array(c),e=f.call(arguments),g=r.Deferred(),h=function(a){return function(c){d[a]=this,e[a]=arguments.length>1?f.call(arguments):c,--b||g.resolveWith(d,e)}};if(b<=1&&(P(a,g.done(h(c)).resolve,g.reject,!b),"pending"===g.state()||r.isFunction(e[c]&&e[c].then)))return g.then();while(c--)P(e[c],h(c),g.reject);return g.promise()}});var Q=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;r.Deferred.exceptionHook=function(b,c){a.console&&a.console.warn&&b&&Q.test(b.name)&&a.console.warn("jQuery.Deferred exception: "+b.message,b.stack,c)},r.readyException=function(b){a.setTimeout(function(){throw b})};var R=r.Deferred();r.fn.ready=function(a){return R.then(a)["catch"](function(a){r.readyException(a)}),this},r.extend({isReady:!1,readyWait:1,ready:function(a){(a===!0?--r.readyWait:r.isReady)||(r.isReady=!0,a!==!0&&--r.readyWait>0||R.resolveWith(d,[r]))}}),r.ready.then=R.then;function S(){d.removeEventListener("DOMContentLoaded",S),
+a.removeEventListener("load",S),r.ready()}"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(r.ready):(d.addEventListener("DOMContentLoaded",S),a.addEventListener("load",S));var T=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===r.type(c)){e=!0;for(h in c)T(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,r.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(r(a),c)})),b))for(;h<i;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},U=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function V(){this.expando=r.expando+V.uid++}V.uid=1,V.prototype={cache:function(a){var b=a[this.expando];return b||(b={},U(a)&&(a.nodeType?a[this.expando]=b:Object.defineProperty(a,this.expando,{value:b,configurable:!0}))),b},set:function(a,b,c){var d,e=this.cache(a);if("string"==typeof b)e[r.camelCase(b)]=c;else for(d in b)e[r.camelCase(d)]=b[d];return e},get:function(a,b){return void 0===b?this.cache(a):a[this.expando]&&a[this.expando][r.camelCase(b)]},access:function(a,b,c){return void 0===b||b&&"string"==typeof b&&void 0===c?this.get(a,b):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d=a[this.expando];if(void 0!==d){if(void 0!==b){Array.isArray(b)?b=b.map(r.camelCase):(b=r.camelCase(b),b=b in d?[b]:b.match(L)||[]),c=b.length;while(c--)delete d[b[c]]}(void 0===b||r.isEmptyObject(d))&&(a.nodeType?a[this.expando]=void 0:delete a[this.expando])}},hasData:function(a){var b=a[this.expando];return void 0!==b&&!r.isEmptyObject(b)}};var W=new V,X=new V,Y=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Z=/[A-Z]/g;function $(a){return"true"===a||"false"!==a&&("null"===a?null:a===+a+""?+a:Y.test(a)?JSON.parse(a):a)}function _(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(Z,"-$&").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c=$(c)}catch(e){}X.set(a,b,c)}else c=void 0;return c}r.extend({hasData:function(a){return X.hasData(a)||W.hasData(a)},data:function(a,b,c){return X.access(a,b,c)},removeData:function(a,b){X.remove(a,b)},_data:function(a,b,c){return W.access(a,b,c)},_removeData:function(a,b){W.remove(a,b)}}),r.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=X.get(f),1===f.nodeType&&!W.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=r.camelCase(d.slice(5)),_(f,d,e[d])));W.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){X.set(this,a)}):T(this,function(b){var c;if(f&&void 0===b){if(c=X.get(f,a),void 0!==c)return c;if(c=_(f,a),void 0!==c)return c}else this.each(function(){X.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){X.remove(this,a)})}}),r.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=W.get(a,b),c&&(!d||Array.isArray(c)?d=W.access(a,b,r.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=r.queue(a,b),d=c.length,e=c.shift(),f=r._queueHooks(a,b),g=function(){r.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return W.get(a,c)||W.access(a,c,{empty:r.Callbacks("once memory").add(function(){W.remove(a,[b+"queue",c])})})}}),r.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.length<c?r.queue(this[0],a):void 0===b?this:this.each(function(){var c=r.queue(this,a,b);r._queueHooks(this,a),"fx"===a&&"inprogress"!==c[0]&&r.dequeue(this,a)})},dequeue:function(a){return this.each(function(){r.dequeue(this,a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,b){var c,d=1,e=r.Deferred(),f=this,g=this.length,h=function(){--d||e.resolveWith(f,[f])};"string"!=typeof a&&(b=a,a=void 0),a=a||"fx";while(g--)c=W.get(f[g],a+"queueHooks"),c&&c.empty&&(d++,c.empty.add(h));return h(),e.promise(b)}});var aa=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,ba=new RegExp("^(?:([+-])=|)("+aa+")([a-z%]*)$","i"),ca=["Top","Right","Bottom","Left"],da=function(a,b){return a=b||a,"none"===a.style.display||""===a.style.display&&r.contains(a.ownerDocument,a)&&"none"===r.css(a,"display")},ea=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};function fa(a,b,c,d){var e,f=1,g=20,h=d?function(){return d.cur()}:function(){return r.css(a,b,"")},i=h(),j=c&&c[3]||(r.cssNumber[b]?"":"px"),k=(r.cssNumber[b]||"px"!==j&&+i)&&ba.exec(r.css(a,b));if(k&&k[3]!==j){j=j||k[3],c=c||[],k=+i||1;do f=f||".5",k/=f,r.style(a,b,k+j);while(f!==(f=h()/i)&&1!==f&&--g)}return c&&(k=+k||+i||0,e=c[1]?k+(c[1]+1)*c[2]:+c[2],d&&(d.unit=j,d.start=k,d.end=e)),e}var ga={};function ha(a){var b,c=a.ownerDocument,d=a.nodeName,e=ga[d];return e?e:(b=c.body.appendChild(c.createElement(d)),e=r.css(b,"display"),b.parentNode.removeChild(b),"none"===e&&(e="block"),ga[d]=e,e)}function ia(a,b){for(var c,d,e=[],f=0,g=a.length;f<g;f++)d=a[f],d.style&&(c=d.style.display,b?("none"===c&&(e[f]=W.get(d,"display")||null,e[f]||(d.style.display="")),""===d.style.display&&da(d)&&(e[f]=ha(d))):"none"!==c&&(e[f]="none",W.set(d,"display",c)));for(f=0;f<g;f++)null!=e[f]&&(a[f].style.display=e[f]);return a}r.fn.extend({show:function(){return ia(this,!0)},hide:function(){return ia(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){da(this)?r(this).show():r(this).hide()})}});var ja=/^(?:checkbox|radio)$/i,ka=/<([a-z][^\/\0>\x20\t\r\n\f]+)/i,la=/^$|\/(?:java|ecma)script/i,ma={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ma.optgroup=ma.option,ma.tbody=ma.tfoot=ma.colgroup=ma.caption=ma.thead,ma.th=ma.td;function na(a,b){var c;return c="undefined"!=typeof a.getElementsByTagName?a.getElementsByTagName(b||"*"):"undefined"!=typeof a.querySelectorAll?a.querySelectorAll(b||"*"):[],void 0===b||b&&B(a,b)?r.merge([a],c):c}function oa(a,b){for(var c=0,d=a.length;c<d;c++)W.set(a[c],"globalEval",!b||W.get(b[c],"globalEval"))}var pa=/<|&#?\w+;/;function qa(a,b,c,d,e){for(var f,g,h,i,j,k,l=b.createDocumentFragment(),m=[],n=0,o=a.length;n<o;n++)if(f=a[n],f||0===f)if("object"===r.type(f))r.merge(m,f.nodeType?[f]:f);else if(pa.test(f)){g=g||l.appendChild(b.createElement("div")),h=(ka.exec(f)||["",""])[1].toLowerCase(),i=ma[h]||ma._default,g.innerHTML=i[1]+r.htmlPrefilter(f)+i[2],k=i[0];while(k--)g=g.lastChild;r.merge(m,g.childNodes),g=l.firstChild,g.textContent=""}else m.push(b.createTextNode(f));l.textContent="",n=0;while(f=m[n++])if(d&&r.inArray(f,d)>-1)e&&e.push(f);else if(j=r.contains(f.ownerDocument,f),g=na(l.appendChild(f),"script"),j&&oa(g),c){k=0;while(f=g[k++])la.test(f.type||"")&&c.push(f)}return l}!function(){var a=d.createDocumentFragment(),b=a.appendChild(d.createElement("div")),c=d.createElement("input");c.setAttribute("type","radio"),c.setAttribute("checked","checked"),c.setAttribute("name","t"),b.appendChild(c),o.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,b.innerHTML="<textarea>x</textarea>",o.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var ra=d.documentElement,sa=/^key/,ta=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,ua=/^([^.]*)(?:\.(.+)|)/;function va(){return!0}function wa(){return!1}function xa(){try{return d.activeElement}catch(a){}}function ya(a,b,c,d,e,f){var g,h;if("object"==typeof b){"string"!=typeof c&&(d=d||c,c=void 0);for(h in b)ya(a,h,c,d,b[h],f);return a}if(null==d&&null==e?(e=c,d=c=void 0):null==e&&("string"==typeof c?(e=d,d=void 0):(e=d,d=c,c=void 0)),e===!1)e=wa;else if(!e)return a;return 1===f&&(g=e,e=function(a){return r().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=r.guid++)),a.each(function(){r.event.add(this,b,e,d,c)})}r.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=W.get(a);if(q){c.handler&&(f=c,c=f.handler,e=f.selector),e&&r.find.matchesSelector(ra,e),c.guid||(c.guid=r.guid++),(i=q.events)||(i=q.events={}),(g=q.handle)||(g=q.handle=function(b){return"undefined"!=typeof r&&r.event.triggered!==b.type?r.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(L)||[""],j=b.length;while(j--)h=ua.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n&&(l=r.event.special[n]||{},n=(e?l.delegateType:l.bindType)||n,l=r.event.special[n]||{},k=r.extend({type:n,origType:p,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&r.expr.match.needsContext.test(e),namespace:o.join(".")},f),(m=i[n])||(m=i[n]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,o,g)!==!1||a.addEventListener&&a.addEventListener(n,g)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),r.event.global[n]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,p,q=W.hasData(a)&&W.get(a);if(q&&(i=q.events)){b=(b||"").match(L)||[""],j=b.length;while(j--)if(h=ua.exec(b[j])||[],n=p=h[1],o=(h[2]||"").split(".").sort(),n){l=r.event.special[n]||{},n=(d?l.delegateType:l.bindType)||n,m=i[n]||[],h=h[2]&&new RegExp("(^|\\.)"+o.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&p!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,o,q.handle)!==!1||r.removeEvent(a,n,q.handle),delete i[n])}else for(n in i)r.event.remove(a,n+b[j],c,d,!0);r.isEmptyObject(i)&&W.remove(a,"handle events")}},dispatch:function(a){var b=r.event.fix(a),c,d,e,f,g,h,i=new Array(arguments.length),j=(W.get(this,"events")||{})[b.type]||[],k=r.event.special[b.type]||{};for(i[0]=b,c=1;c<arguments.length;c++)i[c]=arguments[c];if(b.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,b)!==!1){h=r.event.handlers.call(this,b,j),c=0;while((f=h[c++])&&!b.isPropagationStopped()){b.currentTarget=f.elem,d=0;while((g=f.handlers[d++])&&!b.isImmediatePropagationStopped())b.rnamespace&&!b.rnamespace.test(g.namespace)||(b.handleObj=g,b.data=g.data,e=((r.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(b.result=e)===!1&&(b.preventDefault(),b.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,b),b.result}},handlers:function(a,b){var c,d,e,f,g,h=[],i=b.delegateCount,j=a.target;if(i&&j.nodeType&&!("click"===a.type&&a.button>=1))for(;j!==this;j=j.parentNode||this)if(1===j.nodeType&&("click"!==a.type||j.disabled!==!0)){for(f=[],g={},c=0;c<i;c++)d=b[c],e=d.selector+" ",void 0===g[e]&&(g[e]=d.needsContext?r(e,this).index(j)>-1:r.find(e,this,null,[j]).length),g[e]&&f.push(d);f.length&&h.push({elem:j,handlers:f})}return j=this,i<b.length&&h.push({elem:j,handlers:b.slice(i)}),h},addProp:function(a,b){Object.defineProperty(r.Event.prototype,a,{enumerable:!0,configurable:!0,get:r.isFunction(b)?function(){if(this.originalEvent)return b(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[a]},set:function(b){Object.defineProperty(this,a,{enumerable:!0,configurable:!0,writable:!0,value:b})}})},fix:function(a){return a[r.expando]?a:new r.Event(a)},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==xa()&&this.focus)return this.focus(),!1},delegateType:"focusin"},blur:{trigger:function(){if(this===xa()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if("checkbox"===this.type&&this.click&&B(this,"input"))return this.click(),!1},_default:function(a){return B(a.target,"a")}},beforeunload:{postDispatch:function(a){void 0!==a.result&&a.originalEvent&&(a.originalEvent.returnValue=a.result)}}}},r.removeEvent=function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c)},r.Event=function(a,b){return this instanceof r.Event?(a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||void 0===a.defaultPrevented&&a.returnValue===!1?va:wa,this.target=a.target&&3===a.target.nodeType?a.target.parentNode:a.target,this.currentTarget=a.currentTarget,this.relatedTarget=a.relatedTarget):this.type=a,b&&r.extend(this,b),this.timeStamp=a&&a.timeStamp||r.now(),void(this[r.expando]=!0)):new r.Event(a,b)},r.Event.prototype={constructor:r.Event,isDefaultPrevented:wa,isPropagationStopped:wa,isImmediatePropagationStopped:wa,isSimulated:!1,preventDefault:function(){var a=this.originalEvent;this.isDefaultPrevented=va,a&&!this.isSimulated&&a.preventDefault()},stopPropagation:function(){var a=this.originalEvent;this.isPropagationStopped=va,a&&!this.isSimulated&&a.stopPropagation()},stopImmediatePropagation:function(){var a=this.originalEvent;this.isImmediatePropagationStopped=va,a&&!this.isSimulated&&a.stopImmediatePropagation(),this.stopPropagation()}},r.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(a){var b=a.button;return null==a.which&&sa.test(a.type)?null!=a.charCode?a.charCode:a.keyCode:!a.which&&void 0!==b&&ta.test(a.type)?1&b?1:2&b?3:4&b?2:0:a.which}},r.event.addProp),r.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(a,b){r.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj;return e&&(e===d||r.contains(d,e))||(a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b),c}}}),r.fn.extend({on:function(a,b,c,d){return ya(this,a,b,c,d)},one:function(a,b,c,d){return ya(this,a,b,c,d,1)},off:function(a,b,c){var d,e;if(a&&a.preventDefault&&a.handleObj)return d=a.handleObj,r(a.delegateTarget).off(d.namespace?d.origType+"."+d.namespace:d.origType,d.selector,d.handler),this;if("object"==typeof a){for(e in a)this.off(e,b,a[e]);return this}return b!==!1&&"function"!=typeof b||(c=b,b=void 0),c===!1&&(c=wa),this.each(function(){r.event.remove(this,a,c,b)})}});var za=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,Aa=/<script|<style|<link/i,Ba=/checked\s*(?:[^=]|=\s*.checked.)/i,Ca=/^true\/(.*)/,Da=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Ea(a,b){return B(a,"table")&&B(11!==b.nodeType?b:b.firstChild,"tr")?r(">tbody",a)[0]||a:a}function Fa(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function Ga(a){var b=Ca.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Ha(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(W.hasData(a)&&(f=W.access(a),g=W.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;c<d;c++)r.event.add(b,e,j[e][c])}X.hasData(a)&&(h=X.access(a),i=r.extend({},h),X.set(b,i))}}function Ia(a,b){var c=b.nodeName.toLowerCase();"input"===c&&ja.test(a.type)?b.checked=a.checked:"input"!==c&&"textarea"!==c||(b.defaultValue=a.defaultValue)}function Ja(a,b,c,d){b=g.apply([],b);var e,f,h,i,j,k,l=0,m=a.length,n=m-1,q=b[0],s=r.isFunction(q);if(s||m>1&&"string"==typeof q&&!o.checkClone&&Ba.test(q))return a.each(function(e){var f=a.eq(e);s&&(b[0]=q.call(this,e,f.html())),Ja(f,b,c,d)});if(m&&(e=qa(b,a[0].ownerDocument,!1,a,d),f=e.firstChild,1===e.childNodes.length&&(e=f),f||d)){for(h=r.map(na(e,"script"),Fa),i=h.length;l<m;l++)j=e,l!==n&&(j=r.clone(j,!0,!0),i&&r.merge(h,na(j,"script"))),c.call(a[l],j,l);if(i)for(k=h[h.length-1].ownerDocument,r.map(h,Ga),l=0;l<i;l++)j=h[l],la.test(j.type||"")&&!W.access(j,"globalEval")&&r.contains(k,j)&&(j.src?r._evalUrl&&r._evalUrl(j.src):p(j.textContent.replace(Da,""),k))}return a}function Ka(a,b,c){for(var d,e=b?r.filter(b,a):a,f=0;null!=(d=e[f]);f++)c||1!==d.nodeType||r.cleanData(na(d)),d.parentNode&&(c&&r.contains(d.ownerDocument,d)&&oa(na(d,"script")),d.parentNode.removeChild(d));return a}r.extend({htmlPrefilter:function(a){return a.replace(za,"<$1></$2>")},clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=r.contains(a.ownerDocument,a);if(!(o.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||r.isXMLDoc(a)))for(g=na(h),f=na(a),d=0,e=f.length;d<e;d++)Ia(f[d],g[d]);if(b)if(c)for(f=f||na(a),g=g||na(h),d=0,e=f.length;d<e;d++)Ha(f[d],g[d]);else Ha(a,h);return g=na(h,"script"),g.length>0&&oa(g,!i&&na(a,"script")),h},cleanData:function(a){for(var b,c,d,e=r.event.special,f=0;void 0!==(c=a[f]);f++)if(U(c)){if(b=c[W.expando]){if(b.events)for(d in b.events)e[d]?r.event.remove(c,d):r.removeEvent(c,d,b.handle);c[W.expando]=void 0}c[X.expando]&&(c[X.expando]=void 0)}}}),r.fn.extend({detach:function(a){return Ka(this,a,!0)},remove:function(a){return Ka(this,a)},text:function(a){return T(this,function(a){return void 0===a?r.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=a)})},null,a,arguments.length)},append:function(){return Ja(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ea(this,a);b.appendChild(a)}})},prepend:function(){return Ja(this,arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=Ea(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return Ja(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return Ja(this,arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(r.cleanData(na(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null!=a&&a,b=null==b?a:b,this.map(function(){return r.clone(this,a,b)})},html:function(a){return T(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!Aa.test(a)&&!ma[(ka.exec(a)||["",""])[1].toLowerCase()]){a=r.htmlPrefilter(a);try{for(;c<d;c++)b=this[c]||{},1===b.nodeType&&(r.cleanData(na(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=[];return Ja(this,arguments,function(b){var c=this.parentNode;r.inArray(this,a)<0&&(r.cleanData(na(this)),c&&c.replaceChild(b,this))},a)}}),r.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){r.fn[a]=function(a){for(var c,d=[],e=r(a),f=e.length-1,g=0;g<=f;g++)c=g===f?this:this.clone(!0),r(e[g])[b](c),h.apply(d,c.get());return this.pushStack(d)}});var La=/^margin/,Ma=new RegExp("^("+aa+")(?!px)[a-z%]+$","i"),Na=function(b){var c=b.ownerDocument.defaultView;return c&&c.opener||(c=a),c.getComputedStyle(b)};!function(){function b(){if(i){i.style.cssText="box-sizing:border-box;position:relative;display:block;margin:auto;border:1px;padding:1px;top:1%;width:50%",i.innerHTML="",ra.appendChild(h);var b=a.getComputedStyle(i);c="1%"!==b.top,g="2px"===b.marginLeft,e="4px"===b.width,i.style.marginRight="50%",f="4px"===b.marginRight,ra.removeChild(h),i=null}}var c,e,f,g,h=d.createElement("div"),i=d.createElement("div");i.style&&(i.style.backgroundClip="content-box",i.cloneNode(!0).style.backgroundClip="",o.clearCloneStyle="content-box"===i.style.backgroundClip,h.style.cssText="border:0;width:8px;height:0;top:0;left:-9999px;padding:0;margin-top:1px;position:absolute",h.appendChild(i),r.extend(o,{pixelPosition:function(){return b(),c},boxSizingReliable:function(){return b(),e},pixelMarginRight:function(){return b(),f},reliableMarginLeft:function(){return b(),g}}))}();function Oa(a,b,c){var d,e,f,g,h=a.style;return c=c||Na(a),c&&(g=c.getPropertyValue(b)||c[b],""!==g||r.contains(a.ownerDocument,a)||(g=r.style(a,b)),!o.pixelMarginRight()&&Ma.test(g)&&La.test(b)&&(d=h.width,e=h.minWidth,f=h.maxWidth,h.minWidth=h.maxWidth=h.width=g,g=c.width,h.width=d,h.minWidth=e,h.maxWidth=f)),void 0!==g?g+"":g}function Pa(a,b){return{get:function(){return a()?void delete this.get:(this.get=b).apply(this,arguments)}}}var Qa=/^(none|table(?!-c[ea]).+)/,Ra=/^--/,Sa={position:"absolute",visibility:"hidden",display:"block"},Ta={letterSpacing:"0",fontWeight:"400"},Ua=["Webkit","Moz","ms"],Va=d.createElement("div").style;function Wa(a){if(a in Va)return a;var b=a[0].toUpperCase()+a.slice(1),c=Ua.length;while(c--)if(a=Ua[c]+b,a in Va)return a}function Xa(a){var b=r.cssProps[a];return b||(b=r.cssProps[a]=Wa(a)||a),b}function Ya(a,b,c){var d=ba.exec(b);return d?Math.max(0,d[2]-(c||0))+(d[3]||"px"):b}function Za(a,b,c,d,e){var f,g=0;for(f=c===(d?"border":"content")?4:"width"===b?1:0;f<4;f+=2)"margin"===c&&(g+=r.css(a,c+ca[f],!0,e)),d?("content"===c&&(g-=r.css(a,"padding"+ca[f],!0,e)),"margin"!==c&&(g-=r.css(a,"border"+ca[f]+"Width",!0,e))):(g+=r.css(a,"padding"+ca[f],!0,e),"padding"!==c&&(g+=r.css(a,"border"+ca[f]+"Width",!0,e)));return g}function $a(a,b,c){var d,e=Na(a),f=Oa(a,b,e),g="border-box"===r.css(a,"boxSizing",!1,e);return Ma.test(f)?f:(d=g&&(o.boxSizingReliable()||f===a.style[b]),"auto"===f&&(f=a["offset"+b[0].toUpperCase()+b.slice(1)]),f=parseFloat(f)||0,f+Za(a,b,c||(g?"border":"content"),d,e)+"px")}r.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=Oa(a,"opacity");return""===c?"1":c}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=r.camelCase(b),i=Ra.test(b),j=a.style;return i||(b=Xa(h)),g=r.cssHooks[b]||r.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:j[b]:(f=typeof c,"string"===f&&(e=ba.exec(c))&&e[1]&&(c=fa(a,b,e),f="number"),null!=c&&c===c&&("number"===f&&(c+=e&&e[3]||(r.cssNumber[h]?"":"px")),o.clearCloneStyle||""!==c||0!==b.indexOf("background")||(j[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i?j.setProperty(b,c):j[b]=c)),void 0)}},css:function(a,b,c,d){var e,f,g,h=r.camelCase(b),i=Ra.test(b);return i||(b=Xa(h)),g=r.cssHooks[b]||r.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=Oa(a,b,d)),"normal"===e&&b in Ta&&(e=Ta[b]),""===c||c?(f=parseFloat(e),c===!0||isFinite(f)?f||0:e):e}}),r.each(["height","width"],function(a,b){r.cssHooks[b]={get:function(a,c,d){if(c)return!Qa.test(r.css(a,"display"))||a.getClientRects().length&&a.getBoundingClientRect().width?$a(a,b,d):ea(a,Sa,function(){return $a(a,b,d)})},set:function(a,c,d){var e,f=d&&Na(a),g=d&&Za(a,b,d,"border-box"===r.css(a,"boxSizing",!1,f),f);return g&&(e=ba.exec(c))&&"px"!==(e[3]||"px")&&(a.style[b]=c,c=r.css(a,b)),Ya(a,c,g)}}}),r.cssHooks.marginLeft=Pa(o.reliableMarginLeft,function(a,b){if(b)return(parseFloat(Oa(a,"marginLeft"))||a.getBoundingClientRect().left-ea(a,{marginLeft:0},function(){return a.getBoundingClientRect().left}))+"px"}),r.each({margin:"",padding:"",border:"Width"},function(a,b){r.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];d<4;d++)e[a+ca[d]+b]=f[d]||f[d-2]||f[0];return e}},La.test(a)||(r.cssHooks[a+b].set=Ya)}),r.fn.extend({css:function(a,b){return T(this,function(a,b,c){var d,e,f={},g=0;if(Array.isArray(b)){for(d=Na(a),e=b.length;g<e;g++)f[b[g]]=r.css(a,b[g],!1,d);return f}return void 0!==c?r.style(a,b,c):r.css(a,b)},a,b,arguments.length>1)}});function _a(a,b,c,d,e){return new _a.prototype.init(a,b,c,d,e)}r.Tween=_a,_a.prototype={constructor:_a,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||r.easing._default,this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(r.cssNumber[c]?"":"px")},cur:function(){var a=_a.propHooks[this.prop];return a&&a.get?a.get(this):_a.propHooks._default.get(this)},run:function(a){var b,c=_a.propHooks[this.prop];return this.options.duration?this.pos=b=r.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):_a.propHooks._default.set(this),this}},_a.prototype.init.prototype=_a.prototype,_a.propHooks={_default:{get:function(a){var b;return 1!==a.elem.nodeType||null!=a.elem[a.prop]&&null==a.elem.style[a.prop]?a.elem[a.prop]:(b=r.css(a.elem,a.prop,""),b&&"auto"!==b?b:0)},set:function(a){r.fx.step[a.prop]?r.fx.step[a.prop](a):1!==a.elem.nodeType||null==a.elem.style[r.cssProps[a.prop]]&&!r.cssHooks[a.prop]?a.elem[a.prop]=a.now:r.style(a.elem,a.prop,a.now+a.unit)}}},_a.propHooks.scrollTop=_a.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},r.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2},_default:"swing"},r.fx=_a.prototype.init,r.fx.step={};var ab,bb,cb=/^(?:toggle|show|hide)$/,db=/queueHooks$/;function eb(){bb&&(d.hidden===!1&&a.requestAnimationFrame?a.requestAnimationFrame(eb):a.setTimeout(eb,r.fx.interval),r.fx.tick())}function fb(){return a.setTimeout(function(){ab=void 0}),ab=r.now()}function gb(a,b){var c,d=0,e={height:a};for(b=b?1:0;d<4;d+=2-b)c=ca[d],e["margin"+c]=e["padding"+c]=a;return b&&(e.opacity=e.width=a),e}function hb(a,b,c){for(var d,e=(kb.tweeners[b]||[]).concat(kb.tweeners["*"]),f=0,g=e.length;f<g;f++)if(d=e[f].call(c,b,a))return d}function ib(a,b,c){var d,e,f,g,h,i,j,k,l="width"in b||"height"in b,m=this,n={},o=a.style,p=a.nodeType&&da(a),q=W.get(a,"fxshow");c.queue||(g=r._queueHooks(a,"fx"),null==g.unqueued&&(g.unqueued=0,h=g.empty.fire,g.empty.fire=function(){g.unqueued||h()}),g.unqueued++,m.always(function(){m.always(function(){g.unqueued--,r.queue(a,"fx").length||g.empty.fire()})}));for(d in b)if(e=b[d],cb.test(e)){if(delete b[d],f=f||"toggle"===e,e===(p?"hide":"show")){if("show"!==e||!q||void 0===q[d])continue;p=!0}n[d]=q&&q[d]||r.style(a,d)}if(i=!r.isEmptyObject(b),i||!r.isEmptyObject(n)){l&&1===a.nodeType&&(c.overflow=[o.overflow,o.overflowX,o.overflowY],j=q&&q.display,null==j&&(j=W.get(a,"display")),k=r.css(a,"display"),"none"===k&&(j?k=j:(ia([a],!0),j=a.style.display||j,k=r.css(a,"display"),ia([a]))),("inline"===k||"inline-block"===k&&null!=j)&&"none"===r.css(a,"float")&&(i||(m.done(function(){o.display=j}),null==j&&(k=o.display,j="none"===k?"":k)),o.display="inline-block")),c.overflow&&(o.overflow="hidden",m.always(function(){o.overflow=c.overflow[0],o.overflowX=c.overflow[1],o.overflowY=c.overflow[2]})),i=!1;for(d in n)i||(q?"hidden"in q&&(p=q.hidden):q=W.access(a,"fxshow",{display:j}),f&&(q.hidden=!p),p&&ia([a],!0),m.done(function(){p||ia([a]),W.remove(a,"fxshow");for(d in n)r.style(a,d,n[d])})),i=hb(p?q[d]:0,d,m),d in q||(q[d]=i.start,p&&(i.end=i.start,i.start=0))}}function jb(a,b){var c,d,e,f,g;for(c in a)if(d=r.camelCase(c),e=b[d],f=a[c],Array.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=r.cssHooks[d],g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}function kb(a,b,c){var d,e,f=0,g=kb.prefilters.length,h=r.Deferred().always(function(){delete i.elem}),i=function(){if(e)return!1;for(var b=ab||fb(),c=Math.max(0,j.startTime+j.duration-b),d=c/j.duration||0,f=1-d,g=0,i=j.tweens.length;g<i;g++)j.tweens[g].run(f);return h.notifyWith(a,[j,f,c]),f<1&&i?c:(i||h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:r.extend({},b),opts:r.extend(!0,{specialEasing:{},easing:r.easing._default},c),originalProperties:b,originalOptions:c,startTime:ab||fb(),duration:c.duration,tweens:[],createTween:function(b,c){var d=r.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(d),d},stop:function(b){var c=0,d=b?j.tweens.length:0;if(e)return this;for(e=!0;c<d;c++)j.tweens[c].run(1);return b?(h.notifyWith(a,[j,1,0]),h.resolveWith(a,[j,b])):h.rejectWith(a,[j,b]),this}}),k=j.props;for(jb(k,j.opts.specialEasing);f<g;f++)if(d=kb.prefilters[f].call(j,a,k,j.opts))return r.isFunction(d.stop)&&(r._queueHooks(j.elem,j.opts.queue).stop=r.proxy(d.stop,d)),d;return r.map(k,hb,j),r.isFunction(j.opts.start)&&j.opts.start.call(a,j),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always),r.fx.timer(r.extend(i,{elem:a,anim:j,queue:j.opts.queue})),j}r.Animation=r.extend(kb,{tweeners:{"*":[function(a,b){var c=this.createTween(a,b);return fa(c.elem,a,ba.exec(b),c),c}]},tweener:function(a,b){r.isFunction(a)?(b=a,a=["*"]):a=a.match(L);for(var c,d=0,e=a.length;d<e;d++)c=a[d],kb.tweeners[c]=kb.tweeners[c]||[],kb.tweeners[c].unshift(b)},prefilters:[ib],prefilter:function(a,b){b?kb.prefilters.unshift(a):kb.prefilters.push(a)}}),r.speed=function(a,b,c){var d=a&&"object"==typeof a?r.extend({},a):{complete:c||!c&&b||r.isFunction(a)&&a,duration:a,easing:c&&b||b&&!r.isFunction(b)&&b};return r.fx.off?d.duration=0:"number"!=typeof d.duration&&(d.duration in r.fx.speeds?d.duration=r.fx.speeds[d.duration]:d.duration=r.fx.speeds._default),null!=d.queue&&d.queue!==!0||(d.queue="fx"),d.old=d.complete,d.complete=function(){r.isFunction(d.old)&&d.old.call(this),d.queue&&r.dequeue(this,d.queue)},d},r.fn.extend({fadeTo:function(a,b,c,d){return this.filter(da).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=r.isEmptyObject(a),f=r.speed(b,c,d),g=function(){var b=kb(this,r.extend({},a),f);(e||W.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=r.timers,g=W.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&db.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));!b&&c||r.dequeue(this,a)})},finish:function(a){return a!==!1&&(a=a||"fx"),this.each(function(){var b,c=W.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=r.timers,g=d?d.length:0;for(c.finish=!0,r.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;b<g;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),r.each(["toggle","show","hide"],function(a,b){var c=r.fn[b];r.fn[b]=function(a,d,e){return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(gb(b,!0),a,d,e)}}),r.each({slideDown:gb("show"),slideUp:gb("hide"),slideToggle:gb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){r.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),r.timers=[],r.fx.tick=function(){var a,b=0,c=r.timers;for(ab=r.now();b<c.length;b++)a=c[b],a()||c[b]!==a||c.splice(b--,1);c.length||r.fx.stop(),ab=void 0},r.fx.timer=function(a){r.timers.push(a),r.fx.start()},r.fx.interval=13,r.fx.start=function(){bb||(bb=!0,eb())},r.fx.stop=function(){bb=null},r.fx.speeds={slow:600,fast:200,_default:400},r.fn.delay=function(b,c){return b=r.fx?r.fx.speeds[b]||b:b,c=c||"fx",this.queue(c,function(c,d){var e=a.setTimeout(c,b);d.stop=function(){a.clearTimeout(e)}})},function(){var a=d.createElement("input"),b=d.createElement("select"),c=b.appendChild(d.createElement("option"));a.type="checkbox",o.checkOn=""!==a.value,o.optSelected=c.selected,a=d.createElement("input"),a.value="t",a.type="radio",o.radioValue="t"===a.value}();var lb,mb=r.expr.attrHandle;r.fn.extend({attr:function(a,b){return T(this,r.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){r.removeAttr(this,a)})}}),r.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return"undefined"==typeof a.getAttribute?r.prop(a,b,c):(1===f&&r.isXMLDoc(a)||(e=r.attrHooks[b.toLowerCase()]||(r.expr.match.bool.test(b)?lb:void 0)),void 0!==c?null===c?void r.removeAttr(a,b):e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:(a.setAttribute(b,c+""),c):e&&"get"in e&&null!==(d=e.get(a,b))?d:(d=r.find.attr(a,b),
+null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!o.radioValue&&"radio"===b&&B(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d=0,e=b&&b.match(L);if(e&&1===a.nodeType)while(c=e[d++])a.removeAttribute(c)}}),lb={set:function(a,b,c){return b===!1?r.removeAttr(a,c):a.setAttribute(c,c),c}},r.each(r.expr.match.bool.source.match(/\w+/g),function(a,b){var c=mb[b]||r.find.attr;mb[b]=function(a,b,d){var e,f,g=b.toLowerCase();return d||(f=mb[g],mb[g]=e,e=null!=c(a,b,d)?g:null,mb[g]=f),e}});var nb=/^(?:input|select|textarea|button)$/i,ob=/^(?:a|area)$/i;r.fn.extend({prop:function(a,b){return T(this,r.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[r.propFix[a]||a]})}}),r.extend({prop:function(a,b,c){var d,e,f=a.nodeType;if(3!==f&&8!==f&&2!==f)return 1===f&&r.isXMLDoc(a)||(b=r.propFix[b]||b,e=r.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){var b=r.find.attr(a,"tabindex");return b?parseInt(b,10):nb.test(a.nodeName)||ob.test(a.nodeName)&&a.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),o.optSelected||(r.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null},set:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}}),r.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){r.propFix[this.toLowerCase()]=this});function pb(a){var b=a.match(L)||[];return b.join(" ")}function qb(a){return a.getAttribute&&a.getAttribute("class")||""}r.fn.extend({addClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).addClass(a.call(this,b,qb(this)))});if("string"==typeof a&&a){b=a.match(L)||[];while(c=this[i++])if(e=qb(c),d=1===c.nodeType&&" "+pb(e)+" "){g=0;while(f=b[g++])d.indexOf(" "+f+" ")<0&&(d+=f+" ");h=pb(d),e!==h&&c.setAttribute("class",h)}}return this},removeClass:function(a){var b,c,d,e,f,g,h,i=0;if(r.isFunction(a))return this.each(function(b){r(this).removeClass(a.call(this,b,qb(this)))});if(!arguments.length)return this.attr("class","");if("string"==typeof a&&a){b=a.match(L)||[];while(c=this[i++])if(e=qb(c),d=1===c.nodeType&&" "+pb(e)+" "){g=0;while(f=b[g++])while(d.indexOf(" "+f+" ")>-1)d=d.replace(" "+f+" "," ");h=pb(d),e!==h&&c.setAttribute("class",h)}}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):r.isFunction(a)?this.each(function(c){r(this).toggleClass(a.call(this,c,qb(this),b),b)}):this.each(function(){var b,d,e,f;if("string"===c){d=0,e=r(this),f=a.match(L)||[];while(b=f[d++])e.hasClass(b)?e.removeClass(b):e.addClass(b)}else void 0!==a&&"boolean"!==c||(b=qb(this),b&&W.set(this,"__className__",b),this.setAttribute&&this.setAttribute("class",b||a===!1?"":W.get(this,"__className__")||""))})},hasClass:function(a){var b,c,d=0;b=" "+a+" ";while(c=this[d++])if(1===c.nodeType&&(" "+pb(qb(c))+" ").indexOf(b)>-1)return!0;return!1}});var rb=/\r/g;r.fn.extend({val:function(a){var b,c,d,e=this[0];{if(arguments.length)return d=r.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,r(this).val()):a,null==e?e="":"number"==typeof e?e+="":Array.isArray(e)&&(e=r.map(e,function(a){return null==a?"":a+""})),b=r.valHooks[this.type]||r.valHooks[this.nodeName.toLowerCase()],b&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))});if(e)return b=r.valHooks[e.type]||r.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(rb,""):null==c?"":c)}}}),r.extend({valHooks:{option:{get:function(a){var b=r.find.attr(a,"value");return null!=b?b:pb(r.text(a))}},select:{get:function(a){var b,c,d,e=a.options,f=a.selectedIndex,g="select-one"===a.type,h=g?null:[],i=g?f+1:e.length;for(d=f<0?i:g?f:0;d<i;d++)if(c=e[d],(c.selected||d===f)&&!c.disabled&&(!c.parentNode.disabled||!B(c.parentNode,"optgroup"))){if(b=r(c).val(),g)return b;h.push(b)}return h},set:function(a,b){var c,d,e=a.options,f=r.makeArray(b),g=e.length;while(g--)d=e[g],(d.selected=r.inArray(r.valHooks.option.get(d),f)>-1)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),r.each(["radio","checkbox"],function(){r.valHooks[this]={set:function(a,b){if(Array.isArray(b))return a.checked=r.inArray(r(a).val(),b)>-1}},o.checkOn||(r.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})});var sb=/^(?:focusinfocus|focusoutblur)$/;r.extend(r.event,{trigger:function(b,c,e,f){var g,h,i,j,k,m,n,o=[e||d],p=l.call(b,"type")?b.type:b,q=l.call(b,"namespace")?b.namespace.split("."):[];if(h=i=e=e||d,3!==e.nodeType&&8!==e.nodeType&&!sb.test(p+r.event.triggered)&&(p.indexOf(".")>-1&&(q=p.split("."),p=q.shift(),q.sort()),k=p.indexOf(":")<0&&"on"+p,b=b[r.expando]?b:new r.Event(p,"object"==typeof b&&b),b.isTrigger=f?2:3,b.namespace=q.join("."),b.rnamespace=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=e),c=null==c?[b]:r.makeArray(c,[b]),n=r.event.special[p]||{},f||!n.trigger||n.trigger.apply(e,c)!==!1)){if(!f&&!n.noBubble&&!r.isWindow(e)){for(j=n.delegateType||p,sb.test(j+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),i=h;i===(e.ownerDocument||d)&&o.push(i.defaultView||i.parentWindow||a)}g=0;while((h=o[g++])&&!b.isPropagationStopped())b.type=g>1?j:n.bindType||p,m=(W.get(h,"events")||{})[b.type]&&W.get(h,"handle"),m&&m.apply(h,c),m=k&&h[k],m&&m.apply&&U(h)&&(b.result=m.apply(h,c),b.result===!1&&b.preventDefault());return b.type=p,f||b.isDefaultPrevented()||n._default&&n._default.apply(o.pop(),c)!==!1||!U(e)||k&&r.isFunction(e[p])&&!r.isWindow(e)&&(i=e[k],i&&(e[k]=null),r.event.triggered=p,e[p](),r.event.triggered=void 0,i&&(e[k]=i)),b.result}},simulate:function(a,b,c){var d=r.extend(new r.Event,c,{type:a,isSimulated:!0});r.event.trigger(d,null,b)}}),r.fn.extend({trigger:function(a,b){return this.each(function(){r.event.trigger(a,b,this)})},triggerHandler:function(a,b){var c=this[0];if(c)return r.event.trigger(a,b,c,!0)}}),r.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(a,b){r.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),r.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),o.focusin="onfocusin"in a,o.focusin||r.each({focus:"focusin",blur:"focusout"},function(a,b){var c=function(a){r.event.simulate(b,a.target,r.event.fix(a))};r.event.special[b]={setup:function(){var d=this.ownerDocument||this,e=W.access(d,b);e||d.addEventListener(a,c,!0),W.access(d,b,(e||0)+1)},teardown:function(){var d=this.ownerDocument||this,e=W.access(d,b)-1;e?W.access(d,b,e):(d.removeEventListener(a,c,!0),W.remove(d,b))}}});var tb=a.location,ub=r.now(),vb=/\?/;r.parseXML=function(b){var c;if(!b||"string"!=typeof b)return null;try{c=(new a.DOMParser).parseFromString(b,"text/xml")}catch(d){c=void 0}return c&&!c.getElementsByTagName("parsererror").length||r.error("Invalid XML: "+b),c};var wb=/\[\]$/,xb=/\r?\n/g,yb=/^(?:submit|button|image|reset|file)$/i,zb=/^(?:input|select|textarea|keygen)/i;function Ab(a,b,c,d){var e;if(Array.isArray(b))r.each(b,function(b,e){c||wb.test(a)?d(a,e):Ab(a+"["+("object"==typeof e&&null!=e?b:"")+"]",e,c,d)});else if(c||"object"!==r.type(b))d(a,b);else for(e in b)Ab(a+"["+e+"]",b[e],c,d)}r.param=function(a,b){var c,d=[],e=function(a,b){var c=r.isFunction(b)?b():b;d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(null==c?"":c)};if(Array.isArray(a)||a.jquery&&!r.isPlainObject(a))r.each(a,function(){e(this.name,this.value)});else for(c in a)Ab(c,a[c],b,e);return d.join("&")},r.fn.extend({serialize:function(){return r.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=r.prop(this,"elements");return a?r.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!r(this).is(":disabled")&&zb.test(this.nodeName)&&!yb.test(a)&&(this.checked||!ja.test(a))}).map(function(a,b){var c=r(this).val();return null==c?null:Array.isArray(c)?r.map(c,function(a){return{name:b.name,value:a.replace(xb,"\r\n")}}):{name:b.name,value:c.replace(xb,"\r\n")}}).get()}});var Bb=/%20/g,Cb=/#.*$/,Db=/([?&])_=[^&]*/,Eb=/^(.*?):[ \t]*([^\r\n]*)$/gm,Fb=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Gb=/^(?:GET|HEAD)$/,Hb=/^\/\//,Ib={},Jb={},Kb="*/".concat("*"),Lb=d.createElement("a");Lb.href=tb.href;function Mb(a){return function(b,c){"string"!=typeof b&&(c=b,b="*");var d,e=0,f=b.toLowerCase().match(L)||[];if(r.isFunction(c))while(d=f[e++])"+"===d[0]?(d=d.slice(1)||"*",(a[d]=a[d]||[]).unshift(c)):(a[d]=a[d]||[]).push(c)}}function Nb(a,b,c,d){var e={},f=a===Jb;function g(h){var i;return e[h]=!0,r.each(a[h]||[],function(a,h){var j=h(b,c,d);return"string"!=typeof j||f||e[j]?f?!(i=j):void 0:(b.dataTypes.unshift(j),g(j),!1)}),i}return g(b.dataTypes[0])||!e["*"]&&g("*")}function Ob(a,b){var c,d,e=r.ajaxSettings.flatOptions||{};for(c in b)void 0!==b[c]&&((e[c]?a:d||(d={}))[c]=b[c]);return d&&r.extend(!0,a,d),a}function Pb(a,b,c){var d,e,f,g,h=a.contents,i=a.dataTypes;while("*"===i[0])i.shift(),void 0===d&&(d=a.mimeType||b.getResponseHeader("Content-Type"));if(d)for(e in h)if(h[e]&&h[e].test(d)){i.unshift(e);break}if(i[0]in c)f=i[0];else{for(e in c){if(!i[0]||a.converters[e+" "+i[0]]){f=e;break}g||(g=e)}f=f||g}if(f)return f!==i[0]&&i.unshift(f),c[f]}function Qb(a,b,c,d){var e,f,g,h,i,j={},k=a.dataTypes.slice();if(k[1])for(g in a.converters)j[g.toLowerCase()]=a.converters[g];f=k.shift();while(f)if(a.responseFields[f]&&(c[a.responseFields[f]]=b),!i&&d&&a.dataFilter&&(b=a.dataFilter(b,a.dataType)),i=f,f=k.shift())if("*"===f)f=i;else if("*"!==i&&i!==f){if(g=j[i+" "+f]||j["* "+f],!g)for(e in j)if(h=e.split(" "),h[1]===f&&(g=j[i+" "+h[0]]||j["* "+h[0]])){g===!0?g=j[e]:j[e]!==!0&&(f=h[0],k.unshift(h[1]));break}if(g!==!0)if(g&&a["throws"])b=g(b);else try{b=g(b)}catch(l){return{state:"parsererror",error:g?l:"No conversion from "+i+" to "+f}}}return{state:"success",data:b}}r.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:tb.href,type:"GET",isLocal:Fb.test(tb.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Kb,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":r.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?Ob(Ob(a,r.ajaxSettings),b):Ob(r.ajaxSettings,a)},ajaxPrefilter:Mb(Ib),ajaxTransport:Mb(Jb),ajax:function(b,c){"object"==typeof b&&(c=b,b=void 0),c=c||{};var e,f,g,h,i,j,k,l,m,n,o=r.ajaxSetup({},c),p=o.context||o,q=o.context&&(p.nodeType||p.jquery)?r(p):r.event,s=r.Deferred(),t=r.Callbacks("once memory"),u=o.statusCode||{},v={},w={},x="canceled",y={readyState:0,getResponseHeader:function(a){var b;if(k){if(!h){h={};while(b=Eb.exec(g))h[b[1].toLowerCase()]=b[2]}b=h[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return k?g:null},setRequestHeader:function(a,b){return null==k&&(a=w[a.toLowerCase()]=w[a.toLowerCase()]||a,v[a]=b),this},overrideMimeType:function(a){return null==k&&(o.mimeType=a),this},statusCode:function(a){var b;if(a)if(k)y.always(a[y.status]);else for(b in a)u[b]=[u[b],a[b]];return this},abort:function(a){var b=a||x;return e&&e.abort(b),A(0,b),this}};if(s.promise(y),o.url=((b||o.url||tb.href)+"").replace(Hb,tb.protocol+"//"),o.type=c.method||c.type||o.method||o.type,o.dataTypes=(o.dataType||"*").toLowerCase().match(L)||[""],null==o.crossDomain){j=d.createElement("a");try{j.href=o.url,j.href=j.href,o.crossDomain=Lb.protocol+"//"+Lb.host!=j.protocol+"//"+j.host}catch(z){o.crossDomain=!0}}if(o.data&&o.processData&&"string"!=typeof o.data&&(o.data=r.param(o.data,o.traditional)),Nb(Ib,o,c,y),k)return y;l=r.event&&o.global,l&&0===r.active++&&r.event.trigger("ajaxStart"),o.type=o.type.toUpperCase(),o.hasContent=!Gb.test(o.type),f=o.url.replace(Cb,""),o.hasContent?o.data&&o.processData&&0===(o.contentType||"").indexOf("application/x-www-form-urlencoded")&&(o.data=o.data.replace(Bb,"+")):(n=o.url.slice(f.length),o.data&&(f+=(vb.test(f)?"&":"?")+o.data,delete o.data),o.cache===!1&&(f=f.replace(Db,"$1"),n=(vb.test(f)?"&":"?")+"_="+ub++ +n),o.url=f+n),o.ifModified&&(r.lastModified[f]&&y.setRequestHeader("If-Modified-Since",r.lastModified[f]),r.etag[f]&&y.setRequestHeader("If-None-Match",r.etag[f])),(o.data&&o.hasContent&&o.contentType!==!1||c.contentType)&&y.setRequestHeader("Content-Type",o.contentType),y.setRequestHeader("Accept",o.dataTypes[0]&&o.accepts[o.dataTypes[0]]?o.accepts[o.dataTypes[0]]+("*"!==o.dataTypes[0]?", "+Kb+"; q=0.01":""):o.accepts["*"]);for(m in o.headers)y.setRequestHeader(m,o.headers[m]);if(o.beforeSend&&(o.beforeSend.call(p,y,o)===!1||k))return y.abort();if(x="abort",t.add(o.complete),y.done(o.success),y.fail(o.error),e=Nb(Jb,o,c,y)){if(y.readyState=1,l&&q.trigger("ajaxSend",[y,o]),k)return y;o.async&&o.timeout>0&&(i=a.setTimeout(function(){y.abort("timeout")},o.timeout));try{k=!1,e.send(v,A)}catch(z){if(k)throw z;A(-1,z)}}else A(-1,"No Transport");function A(b,c,d,h){var j,m,n,v,w,x=c;k||(k=!0,i&&a.clearTimeout(i),e=void 0,g=h||"",y.readyState=b>0?4:0,j=b>=200&&b<300||304===b,d&&(v=Pb(o,y,d)),v=Qb(o,v,y,j),j?(o.ifModified&&(w=y.getResponseHeader("Last-Modified"),w&&(r.lastModified[f]=w),w=y.getResponseHeader("etag"),w&&(r.etag[f]=w)),204===b||"HEAD"===o.type?x="nocontent":304===b?x="notmodified":(x=v.state,m=v.data,n=v.error,j=!n)):(n=x,!b&&x||(x="error",b<0&&(b=0))),y.status=b,y.statusText=(c||x)+"",j?s.resolveWith(p,[m,x,y]):s.rejectWith(p,[y,x,n]),y.statusCode(u),u=void 0,l&&q.trigger(j?"ajaxSuccess":"ajaxError",[y,o,j?m:n]),t.fireWith(p,[y,x]),l&&(q.trigger("ajaxComplete",[y,o]),--r.active||r.event.trigger("ajaxStop")))}return y},getJSON:function(a,b,c){return r.get(a,b,c,"json")},getScript:function(a,b){return r.get(a,void 0,b,"script")}}),r.each(["get","post"],function(a,b){r[b]=function(a,c,d,e){return r.isFunction(c)&&(e=e||d,d=c,c=void 0),r.ajax(r.extend({url:a,type:b,dataType:e,data:c,success:d},r.isPlainObject(a)&&a))}}),r._evalUrl=function(a){return r.ajax({url:a,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},r.fn.extend({wrapAll:function(a){var b;return this[0]&&(r.isFunction(a)&&(a=a.call(this[0])),b=r(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstElementChild)a=a.firstElementChild;return a}).append(this)),this},wrapInner:function(a){return r.isFunction(a)?this.each(function(b){r(this).wrapInner(a.call(this,b))}):this.each(function(){var b=r(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=r.isFunction(a);return this.each(function(c){r(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(a){return this.parent(a).not("body").each(function(){r(this).replaceWith(this.childNodes)}),this}}),r.expr.pseudos.hidden=function(a){return!r.expr.pseudos.visible(a)},r.expr.pseudos.visible=function(a){return!!(a.offsetWidth||a.offsetHeight||a.getClientRects().length)},r.ajaxSettings.xhr=function(){try{return new a.XMLHttpRequest}catch(b){}};var Rb={0:200,1223:204},Sb=r.ajaxSettings.xhr();o.cors=!!Sb&&"withCredentials"in Sb,o.ajax=Sb=!!Sb,r.ajaxTransport(function(b){var c,d;if(o.cors||Sb&&!b.crossDomain)return{send:function(e,f){var g,h=b.xhr();if(h.open(b.type,b.url,b.async,b.username,b.password),b.xhrFields)for(g in b.xhrFields)h[g]=b.xhrFields[g];b.mimeType&&h.overrideMimeType&&h.overrideMimeType(b.mimeType),b.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest");for(g in e)h.setRequestHeader(g,e[g]);c=function(a){return function(){c&&(c=d=h.onload=h.onerror=h.onabort=h.onreadystatechange=null,"abort"===a?h.abort():"error"===a?"number"!=typeof h.status?f(0,"error"):f(h.status,h.statusText):f(Rb[h.status]||h.status,h.statusText,"text"!==(h.responseType||"text")||"string"!=typeof h.responseText?{binary:h.response}:{text:h.responseText},h.getAllResponseHeaders()))}},h.onload=c(),d=h.onerror=c("error"),void 0!==h.onabort?h.onabort=d:h.onreadystatechange=function(){4===h.readyState&&a.setTimeout(function(){c&&d()})},c=c("abort");try{h.send(b.hasContent&&b.data||null)}catch(i){if(c)throw i}},abort:function(){c&&c()}}}),r.ajaxPrefilter(function(a){a.crossDomain&&(a.contents.script=!1)}),r.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(a){return r.globalEval(a),a}}}),r.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),r.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(e,f){b=r("<script>").prop({charset:a.scriptCharset,src:a.url}).on("load error",c=function(a){b.remove(),c=null,a&&f("error"===a.type?404:200,a.type)}),d.head.appendChild(b[0])},abort:function(){c&&c()}}}});var Tb=[],Ub=/(=)\?(?=&|$)|\?\?/;r.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=Tb.pop()||r.expando+"_"+ub++;return this[a]=!0,a}}),r.ajaxPrefilter("json jsonp",function(b,c,d){var e,f,g,h=b.jsonp!==!1&&(Ub.test(b.url)?"url":"string"==typeof b.data&&0===(b.contentType||"").indexOf("application/x-www-form-urlencoded")&&Ub.test(b.data)&&"data");if(h||"jsonp"===b.dataTypes[0])return e=b.jsonpCallback=r.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,h?b[h]=b[h].replace(Ub,"$1"+e):b.jsonp!==!1&&(b.url+=(vb.test(b.url)?"&":"?")+b.jsonp+"="+e),b.converters["script json"]=function(){return g||r.error(e+" was not called"),g[0]},b.dataTypes[0]="json",f=a[e],a[e]=function(){g=arguments},d.always(function(){void 0===f?r(a).removeProp(e):a[e]=f,b[e]&&(b.jsonpCallback=c.jsonpCallback,Tb.push(e)),g&&r.isFunction(f)&&f(g[0]),g=f=void 0}),"script"}),o.createHTMLDocument=function(){var a=d.implementation.createHTMLDocument("").body;return a.innerHTML="<form></form><form></form>",2===a.childNodes.length}(),r.parseHTML=function(a,b,c){if("string"!=typeof a)return[];"boolean"==typeof b&&(c=b,b=!1);var e,f,g;return b||(o.createHTMLDocument?(b=d.implementation.createHTMLDocument(""),e=b.createElement("base"),e.href=d.location.href,b.head.appendChild(e)):b=d),f=C.exec(a),g=!c&&[],f?[b.createElement(f[1])]:(f=qa([a],b,g),g&&g.length&&r(g).remove(),r.merge([],f.childNodes))},r.fn.load=function(a,b,c){var d,e,f,g=this,h=a.indexOf(" ");return h>-1&&(d=pb(a.slice(h)),a=a.slice(0,h)),r.isFunction(b)?(c=b,b=void 0):b&&"object"==typeof b&&(e="POST"),g.length>0&&r.ajax({url:a,type:e||"GET",dataType:"html",data:b}).done(function(a){f=arguments,g.html(d?r("<div>").append(r.parseHTML(a)).find(d):a)}).always(c&&function(a,b){g.each(function(){c.apply(this,f||[a.responseText,b,a])})}),this},r.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){r.fn[b]=function(a){return this.on(b,a)}}),r.expr.pseudos.animated=function(a){return r.grep(r.timers,function(b){return a===b.elem}).length},r.offset={setOffset:function(a,b,c){var d,e,f,g,h,i,j,k=r.css(a,"position"),l=r(a),m={};"static"===k&&(a.style.position="relative"),h=l.offset(),f=r.css(a,"top"),i=r.css(a,"left"),j=("absolute"===k||"fixed"===k)&&(f+i).indexOf("auto")>-1,j?(d=l.position(),g=d.top,e=d.left):(g=parseFloat(f)||0,e=parseFloat(i)||0),r.isFunction(b)&&(b=b.call(a,c,r.extend({},h))),null!=b.top&&(m.top=b.top-h.top+g),null!=b.left&&(m.left=b.left-h.left+e),"using"in b?b.using.call(a,m):l.css(m)}},r.fn.extend({offset:function(a){if(arguments.length)return void 0===a?this:this.each(function(b){r.offset.setOffset(this,a,b)});var b,c,d,e,f=this[0];if(f)return f.getClientRects().length?(d=f.getBoundingClientRect(),b=f.ownerDocument,c=b.documentElement,e=b.defaultView,{top:d.top+e.pageYOffset-c.clientTop,left:d.left+e.pageXOffset-c.clientLeft}):{top:0,left:0}},position:function(){if(this[0]){var a,b,c=this[0],d={top:0,left:0};return"fixed"===r.css(c,"position")?b=c.getBoundingClientRect():(a=this.offsetParent(),b=this.offset(),B(a[0],"html")||(d=a.offset()),d={top:d.top+r.css(a[0],"borderTopWidth",!0),left:d.left+r.css(a[0],"borderLeftWidth",!0)}),{top:b.top-d.top-r.css(c,"marginTop",!0),left:b.left-d.left-r.css(c,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var a=this.offsetParent;while(a&&"static"===r.css(a,"position"))a=a.offsetParent;return a||ra})}}),r.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,b){var c="pageYOffset"===b;r.fn[a]=function(d){return T(this,function(a,d,e){var f;return r.isWindow(a)?f=a:9===a.nodeType&&(f=a.defaultView),void 0===e?f?f[b]:a[d]:void(f?f.scrollTo(c?f.pageXOffset:e,c?e:f.pageYOffset):a[d]=e)},a,d,arguments.length)}}),r.each(["top","left"],function(a,b){r.cssHooks[b]=Pa(o.pixelPosition,function(a,c){if(c)return c=Oa(a,b),Ma.test(c)?r(a).position()[b]+"px":c})}),r.each({Height:"height",Width:"width"},function(a,b){r.each({padding:"inner"+a,content:b,"":"outer"+a},function(c,d){r.fn[d]=function(e,f){var g=arguments.length&&(c||"boolean"!=typeof e),h=c||(e===!0||f===!0?"margin":"border");return T(this,function(b,c,e){var f;return r.isWindow(b)?0===d.indexOf("outer")?b["inner"+a]:b.document.documentElement["client"+a]:9===b.nodeType?(f=b.documentElement,Math.max(b.body["scroll"+a],f["scroll"+a],b.body["offset"+a],f["offset"+a],f["client"+a])):void 0===e?r.css(b,c,h):r.style(b,c,e,h)},b,g?e:void 0,g)}})}),r.fn.extend({bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}}),r.holdReady=function(a){a?r.readyWait++:r.ready(!0)},r.isArray=Array.isArray,r.parseJSON=JSON.parse,r.nodeName=B,"function"==typeof define&&define.amd&&define("jquery",[],function(){return r});var Vb=a.jQuery,Wb=a.$;return r.noConflict=function(b){return a.$===r&&(a.$=Wb),b&&a.jQuery===r&&(a.jQuery=Vb),r},b||(a.jQuery=a.$=r),r});
diff --git a/WebContent/geoweaver/js/no-queue.js b/WebContent/geoweaver/js/no-queue.js
new file mode 100644
index 000000000..7edd44e4d
--- /dev/null
+++ b/WebContent/geoweaver/js/no-queue.js
@@ -0,0 +1,66 @@
+$(function(){
+  /*
+   * For the sake keeping the code clean and the examples simple this file
+   * contains only the plugin configuration & callbacks.
+   * 
+   * UI functions ui_* can be located in:
+   *   - assets/demo/uploader/js/ui-main.js
+   *   - assets/demo/uploader/js/ui-multiple.js
+   *   - assets/demo/uploader/js/ui-single.js
+   */
+  $('#drag-and-drop-zone').dmUploader({ //
+    url: '/demo/java-script/upload',
+    maxFileSize: 3000000, // 3 Megs max
+    auto: true,
+    queue: false,
+    onDragEnter: function(){
+      // Happens when dragging something over the DnD area
+      this.addClass('active');
+    },
+    onDragLeave: function(){
+      // Happens when dragging something OUT of the DnD area
+      this.removeClass('active');
+    },
+    onInit: function(){
+      // Plugin is ready to use
+      ui_add_log('Penguin initialized :)', 'info');
+    },
+    onComplete: function(){
+      // All files in the queue are processed (success or error)
+      ui_add_log('All pending tranfers finished');
+    },
+    onNewFile: function(id, file){
+      // When a new file is added using the file selector or the DnD area
+      ui_add_log('New file added #' + id);
+      ui_multi_add_file(id, file);
+    },
+    onBeforeUpload: function(id){
+      // about tho start uploading a file
+      ui_add_log('Starting the upload of #' + id);
+      ui_multi_update_file_progress(id, 0, '', true);
+      ui_multi_update_file_status(id, 'uploading', 'Uploading...');
+    },
+    onUploadProgress: function(id, percent){
+      // Updating file progress
+      ui_multi_update_file_progress(id, percent);
+    },
+    onUploadSuccess: function(id, data){
+      // A file was successfully uploaded
+      ui_add_log('Server Response for file #' + id + ': ' + JSON.stringify(data));
+      ui_add_log('Upload of file #' + id + ' COMPLETED', 'success');
+      ui_multi_update_file_status(id, 'success', 'Upload Complete');
+      ui_multi_update_file_progress(id, 100, 'success', false);
+    },
+    onUploadError: function(id, xhr, status, message){
+      ui_multi_update_file_status(id, 'danger', message);
+      ui_multi_update_file_progress(id, 0, 'danger', false);  
+    },
+    onFallbackMode: function(){
+      // When the browser doesn't support this plugin :(
+      ui_add_log('Plugin cant be used here, running Fallback callback', 'danger');
+    },
+    onFileSizeError: function(file){
+      ui_add_log('File \'' + file.name + '\' cannot be added: size excess limit', 'danger');
+    }
+  });
+});
\ No newline at end of file
diff --git a/WebContent/geoweaver/js/ui-main.js b/WebContent/geoweaver/js/ui-main.js
new file mode 100644
index 000000000..cabda388a
--- /dev/null
+++ b/WebContent/geoweaver/js/ui-main.js
@@ -0,0 +1,23 @@
+  /*
+   * Some helper functions to work with our UI and keep our code cleaner
+   */
+
+// Adds an entry to our debug area
+function ui_add_log(message, color)
+{
+  var d = new Date();
+
+  var dateString = (('0' + d.getHours())).slice(-2) + ':' +
+    (('0' + d.getMinutes())).slice(-2) + ':' +
+    (('0' + d.getSeconds())).slice(-2);
+
+  color = (typeof color === 'undefined' ? 'muted' : color);
+
+  var template = $('#debug-template').text();
+  template = template.replace('%%date%%', dateString);
+  template = template.replace('%%message%%', message);
+  template = template.replace('%%color%%', color);
+  
+  $('#debug').find('li.empty').fadeOut(); // remove the 'no messages yet'
+  $('#debug').prepend(template);
+}
\ No newline at end of file
diff --git a/WebContent/geoweaver/js/ui-multiple.js b/WebContent/geoweaver/js/ui-multiple.js
new file mode 100644
index 000000000..22efaa0b5
--- /dev/null
+++ b/WebContent/geoweaver/js/ui-multiple.js
@@ -0,0 +1,61 @@
+// Creates a new file and add it to our list
+function ui_multi_add_file(id, file)
+{
+  var template = $('#files-template').text();
+  template = template.replace('%%filename%%', file.name);
+
+  template = $(template);
+  template.prop('id', 'uploaderFile' + id);
+  template.data('file-id', id);
+
+  $('#files').find('li.empty').fadeOut(); // remove the 'no files yet'
+  $('#files').prepend(template);
+}
+
+// Changes the status messages on our list
+function ui_multi_update_file_status(id, status, message)
+{
+  $('#uploaderFile' + id).find('span').html(message).prop('class', 'status text-' + status);
+}
+
+// Updates a file progress, depending on the parameters it may animate it or change the color.
+function ui_multi_update_file_progress(id, percent, color, active)
+{
+  color = (typeof color === 'undefined' ? false : color);
+  active = (typeof active === 'undefined' ? true : active);
+
+  var bar = $('#uploaderFile' + id).find('div.progress-bar');
+
+  bar.width(percent + '%').attr('aria-valuenow', percent);
+  bar.toggleClass('progress-bar-striped progress-bar-animated', active);
+
+  if (percent === 0){
+    bar.html('');
+  } else {
+    bar.html(percent + '%');
+  }
+
+  if (color !== false){
+    bar.removeClass('bg-success bg-info bg-warning bg-danger');
+    bar.addClass('bg-' + color);
+  }
+}
+
+// Toggles the disabled status of Star/Cancel buttons on one particual file
+function ui_multi_update_file_controls(id, start, cancel, wasError)
+{
+  wasError = (typeof wasError === 'undefined' ? false : wasError);
+
+  $('#uploaderFile' + id).find('button.start').prop('disabled', !start);
+  $('#uploaderFile' + id).find('button.cancel').prop('disabled', !cancel);
+
+  if (!start && !cancel) {
+    $('#uploaderFile' + id).find('.controls').fadeOut();
+  } else {
+    $('#uploaderFile' + id).find('.controls').fadeIn();
+  }
+
+  if (wasError) {
+    $('#uploaderFile' + id).find('button.start').html('Retry');
+  }
+}
diff --git a/db/geoweaver.mv.db b/db/geoweaver.mv.db
index c85d98a52..1c6e382cc 100644
Binary files a/db/geoweaver.mv.db and b/db/geoweaver.mv.db differ
diff --git a/db/geoweaver.trace.db b/db/geoweaver.trace.db
index 30973a027..380523252 100644
--- a/db/geoweaver.trace.db
+++ b/db/geoweaver.trace.db
@@ -3812,7 +3812,7 @@ org.h2.message.DbException: General error: "java.lang.IllegalStateException: The
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.TestJDBC.h2(TestJDBC.java:62)
+	at gw.database.TestJDBC.h2(TestJDBC.java:62)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -4121,7 +4121,7 @@ org.h2.jdbc.JdbcSQLSyntaxErrorException: Column "ip" not found [42122-199]
 	at org.h2.jdbc.JdbcResultSet.getColumnIndex(JdbcResultSet.java:3188)
 	at org.h2.jdbc.JdbcResultSet.get(JdbcResultSet.java:3287)
 	at org.h2.jdbc.JdbcResultSet.getString(JdbcResultSet.java:314)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.TestJDBC.h2(TestJDBC.java:88)
+	at gw.database.TestJDBC.h2(TestJDBC.java:88)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -4153,7 +4153,7 @@ org.h2.jdbc.JdbcSQLDataException: Invalid value "0" for parameter "parameterInde
 	at org.h2.message.DbException.getInvalidValueException(DbException.java:280)
 	at org.h2.jdbc.JdbcPreparedStatement.setParameter(JdbcPreparedStatement.java:1573)
 	at org.h2.jdbc.JdbcPreparedStatement.setString(JdbcPreparedStatement.java:427)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.TestJDBC.h2(TestJDBC.java:98)
+	at gw.database.TestJDBC.h2(TestJDBC.java:98)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -4188,9 +4188,9 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.SSHSessionImpl.saveHistory(SSHSessionImpl.java:279)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.SSHCmdSessionOutput.run(SSHCmdSessionOutput.java:45)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.SSHSessionImpl.saveHistory(SSHSessionImpl.java:279)
+	at gw.ssh.SSHCmdSessionOutput.run(SSHCmdSessionOutput.java:45)
 	at java.lang.Thread.run(Thread.java:748)
 Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection was not closed by the application and is garbage collected [90018-199]
 	at org.h2.message.DbException.getJdbcSQLException(DbException.java:617)
@@ -4203,9 +4203,9 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.all_history(ProcessTool.java:999)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.all_history(GeoweaverController.java:269)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.all_history(ProcessTool.java:999)
+	at gw.web.GeoweaverController.all_history(GeoweaverController.java:269)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -4260,9 +4260,9 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.HostTool.detail(HostTool.java:24)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.detail(GeoweaverController.java:147)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.HostTool.detail(HostTool.java:24)
+	at gw.web.GeoweaverController.detail(GeoweaverController.java:147)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -4317,13 +4317,13 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.HostTool.getHostDetailsById(HostTool.java:109)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.SSHSessionImpl.login(SSHSessionImpl.java:157)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.executeShell(ProcessTool.java:529)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.execute(ProcessTool.java:867)
-	at edu.gmu.csiss.earthcube.cyberconnector.tasks.GeoweaverWorkflowTask.execute(GeoweaverWorkflowTask.java:328)
-	at edu.gmu.csiss.earthcube.cyberconnector.workers.Worker.run(Worker.java:97)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.HostTool.getHostDetailsById(HostTool.java:109)
+	at gw.ssh.SSHSessionImpl.login(SSHSessionImpl.java:157)
+	at gw.ssh.ProcessTool.executeShell(ProcessTool.java:529)
+	at gw.ssh.ProcessTool.execute(ProcessTool.java:867)
+	at gw.tasks.GeoweaverWorkflowTask.execute(GeoweaverWorkflowTask.java:328)
+	at gw.workers.Worker.run(Worker.java:97)
 
 org.h2.message.DbException: The connection was not closed by the application and is garbage collected [90018-199]
 	at org.h2.message.DbException.get(DbException.java:205)
@@ -4335,9 +4335,9 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.HostTool.detail(HostTool.java:24)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.detail(GeoweaverController.java:147)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.HostTool.detail(HostTool.java:24)
+	at gw.web.GeoweaverController.detail(GeoweaverController.java:147)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -4396,9 +4396,9 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.HostTool.detail(HostTool.java:24)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.detail(GeoweaverController.java:147)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.HostTool.detail(HostTool.java:24)
+	at gw.web.GeoweaverController.detail(GeoweaverController.java:147)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -4453,9 +4453,9 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.all_history(ProcessTool.java:999)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.all_history(GeoweaverController.java:269)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.all_history(ProcessTool.java:999)
+	at gw.web.GeoweaverController.all_history(GeoweaverController.java:269)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -4510,9 +4510,9 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.HostTool.detail(HostTool.java:24)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.detail(GeoweaverController.java:147)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.HostTool.detail(HostTool.java:24)
+	at gw.web.GeoweaverController.detail(GeoweaverController.java:147)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -4567,9 +4567,9 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.one_history(ProcessTool.java:954)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.one_history(GeoweaverController.java:236)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.one_history(ProcessTool.java:954)
+	at gw.web.GeoweaverController.one_history(GeoweaverController.java:236)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -4624,9 +4624,9 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.detail(ProcessTool.java:87)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.detail(GeoweaverController.java:151)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.detail(ProcessTool.java:87)
+	at gw.web.GeoweaverController.detail(GeoweaverController.java:151)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -4681,9 +4681,9 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.one_history(ProcessTool.java:954)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.one_history(GeoweaverController.java:236)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.one_history(ProcessTool.java:954)
+	at gw.web.GeoweaverController.one_history(GeoweaverController.java:236)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -4738,9 +4738,9 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.preexecute(DataBaseOperation.java:199)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.WorkflowTool.update(WorkflowTool.java:377)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.edit(GeoweaverController.java:699)
+	at gw.database.DataBaseOperation.preexecute(DataBaseOperation.java:199)
+	at gw.ssh.WorkflowTool.update(WorkflowTool.java:377)
+	at gw.web.GeoweaverController.edit(GeoweaverController.java:699)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -4795,9 +4795,9 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.WorkflowTool.one_history(WorkflowTool.java:555)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.one_history(GeoweaverController.java:240)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.WorkflowTool.one_history(WorkflowTool.java:555)
+	at gw.web.GeoweaverController.one_history(GeoweaverController.java:240)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -4852,9 +4852,9 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.preexecute(DataBaseOperation.java:199)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.WorkflowTool.update(WorkflowTool.java:377)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.edit(GeoweaverController.java:699)
+	at gw.database.DataBaseOperation.preexecute(DataBaseOperation.java:199)
+	at gw.ssh.WorkflowTool.update(WorkflowTool.java:377)
+	at gw.web.GeoweaverController.edit(GeoweaverController.java:699)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -4909,9 +4909,9 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.one_history(ProcessTool.java:954)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.one_history(GeoweaverController.java:236)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.one_history(ProcessTool.java:954)
+	at gw.web.GeoweaverController.one_history(GeoweaverController.java:236)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -4966,9 +4966,9 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.preexecute(DataBaseOperation.java:199)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.WorkflowTool.update(WorkflowTool.java:377)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.edit(GeoweaverController.java:699)
+	at gw.database.DataBaseOperation.preexecute(DataBaseOperation.java:199)
+	at gw.ssh.WorkflowTool.update(WorkflowTool.java:377)
+	at gw.web.GeoweaverController.edit(GeoweaverController.java:699)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -5023,9 +5023,9 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.WorkflowTool.one_history(WorkflowTool.java:555)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.one_history(GeoweaverController.java:240)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.WorkflowTool.one_history(WorkflowTool.java:555)
+	at gw.web.GeoweaverController.one_history(GeoweaverController.java:240)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -5080,9 +5080,9 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.preexecute(DataBaseOperation.java:199)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.WorkflowTool.update(WorkflowTool.java:377)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.edit(GeoweaverController.java:699)
+	at gw.database.DataBaseOperation.preexecute(DataBaseOperation.java:199)
+	at gw.ssh.WorkflowTool.update(WorkflowTool.java:377)
+	at gw.web.GeoweaverController.edit(GeoweaverController.java:699)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -5137,9 +5137,9 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.detail(ProcessTool.java:87)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.detail(GeoweaverController.java:151)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.detail(ProcessTool.java:87)
+	at gw.web.GeoweaverController.detail(GeoweaverController.java:151)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -5194,9 +5194,9 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.preexecute(DataBaseOperation.java:199)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.WorkflowTool.update(WorkflowTool.java:377)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.edit(GeoweaverController.java:699)
+	at gw.database.DataBaseOperation.preexecute(DataBaseOperation.java:199)
+	at gw.ssh.WorkflowTool.update(WorkflowTool.java:377)
+	at gw.web.GeoweaverController.edit(GeoweaverController.java:699)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -5251,9 +5251,9 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.detail(ProcessTool.java:87)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.detail(GeoweaverController.java:151)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.detail(ProcessTool.java:87)
+	at gw.web.GeoweaverController.detail(GeoweaverController.java:151)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -5308,10 +5308,10 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.search.GWSearchTool.searchHost(GWSearchTool.java:99)
-	at edu.gmu.csiss.earthcube.cyberconnector.search.GWSearchTool.search(GWSearchTool.java:47)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.search(GeoweaverController.java:122)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.search.GWSearchTool.searchHost(GWSearchTool.java:99)
+	at gw.search.GWSearchTool.search(GWSearchTool.java:47)
+	at gw.web.GeoweaverController.search(GeoweaverController.java:122)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -5366,9 +5366,9 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.recent(ProcessTool.java:897)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.recent_history(GeoweaverController.java:203)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.recent(ProcessTool.java:897)
+	at gw.web.GeoweaverController.recent_history(GeoweaverController.java:203)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -5423,10 +5423,10 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.search.GWSearchTool.searchHost(GWSearchTool.java:99)
-	at edu.gmu.csiss.earthcube.cyberconnector.search.GWSearchTool.search(GWSearchTool.java:47)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.search(GeoweaverController.java:122)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.search.GWSearchTool.searchHost(GWSearchTool.java:99)
+	at gw.search.GWSearchTool.search(GWSearchTool.java:47)
+	at gw.web.GeoweaverController.search(GeoweaverController.java:122)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -5481,9 +5481,9 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.one_history(ProcessTool.java:954)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.one_history(GeoweaverController.java:236)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.one_history(ProcessTool.java:954)
+	at gw.web.GeoweaverController.one_history(GeoweaverController.java:236)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -5538,9 +5538,9 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.detail(ProcessTool.java:87)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.detail(GeoweaverController.java:151)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.detail(ProcessTool.java:87)
+	at gw.web.GeoweaverController.detail(GeoweaverController.java:151)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -5595,10 +5595,10 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.search.GWSearchTool.searchProcess(GWSearchTool.java:139)
-	at edu.gmu.csiss.earthcube.cyberconnector.search.GWSearchTool.search(GWSearchTool.java:49)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.search(GeoweaverController.java:122)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.search.GWSearchTool.searchProcess(GWSearchTool.java:139)
+	at gw.search.GWSearchTool.search(GWSearchTool.java:49)
+	at gw.web.GeoweaverController.search(GeoweaverController.java:122)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -5653,9 +5653,9 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.detail(ProcessTool.java:87)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.detail(GeoweaverController.java:151)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.detail(ProcessTool.java:87)
+	at gw.web.GeoweaverController.detail(GeoweaverController.java:151)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -5710,10 +5710,10 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.search.GWSearchTool.searchHost(GWSearchTool.java:99)
-	at edu.gmu.csiss.earthcube.cyberconnector.search.GWSearchTool.search(GWSearchTool.java:47)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.search(GeoweaverController.java:122)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.search.GWSearchTool.searchHost(GWSearchTool.java:99)
+	at gw.search.GWSearchTool.search(GWSearchTool.java:47)
+	at gw.web.GeoweaverController.search(GeoweaverController.java:122)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -5768,9 +5768,9 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.detail(ProcessTool.java:87)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.detail(GeoweaverController.java:151)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.detail(ProcessTool.java:87)
+	at gw.web.GeoweaverController.detail(GeoweaverController.java:151)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -5825,9 +5825,9 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.detail(ProcessTool.java:87)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.detail(GeoweaverController.java:151)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.detail(ProcessTool.java:87)
+	at gw.web.GeoweaverController.detail(GeoweaverController.java:151)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -5882,9 +5882,9 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.HostTool.detail(HostTool.java:24)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.detail(GeoweaverController.java:147)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.HostTool.detail(HostTool.java:24)
+	at gw.web.GeoweaverController.detail(GeoweaverController.java:147)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -5939,10 +5939,10 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.search.GWSearchTool.searchWorkflow(GWSearchTool.java:179)
-	at edu.gmu.csiss.earthcube.cyberconnector.search.GWSearchTool.search(GWSearchTool.java:51)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.search(GeoweaverController.java:122)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.search.GWSearchTool.searchWorkflow(GWSearchTool.java:179)
+	at gw.search.GWSearchTool.search(GWSearchTool.java:51)
+	at gw.web.GeoweaverController.search(GeoweaverController.java:122)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -5997,9 +5997,9 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.HostTool.detail(HostTool.java:24)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.detail(GeoweaverController.java:147)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.HostTool.detail(HostTool.java:24)
+	at gw.web.GeoweaverController.detail(GeoweaverController.java:147)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -6054,12 +6054,12 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.HostTool.getHostDetailsById(HostTool.java:109)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.SSHSessionImpl.login(SSHSessionImpl.java:157)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.executeShell(ProcessTool.java:529)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.execute(ProcessTool.java:867)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.executeProcess(GeoweaverController.java:598)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.HostTool.getHostDetailsById(HostTool.java:109)
+	at gw.ssh.SSHSessionImpl.login(SSHSessionImpl.java:157)
+	at gw.ssh.ProcessTool.executeShell(ProcessTool.java:529)
+	at gw.ssh.ProcessTool.execute(ProcessTool.java:867)
+	at gw.web.GeoweaverController.executeProcess(GeoweaverController.java:598)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -6114,9 +6114,9 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.all_history(ProcessTool.java:999)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.all_history(GeoweaverController.java:269)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.all_history(ProcessTool.java:999)
+	at gw.web.GeoweaverController.all_history(GeoweaverController.java:269)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -6171,9 +6171,9 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.all_history(ProcessTool.java:999)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.all_history(GeoweaverController.java:269)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.all_history(ProcessTool.java:999)
+	at gw.web.GeoweaverController.all_history(GeoweaverController.java:269)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -6228,9 +6228,9 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.SSHSessionImpl.saveHistory(SSHSessionImpl.java:279)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.SSHCmdSessionOutput.run(SSHCmdSessionOutput.java:91)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.SSHSessionImpl.saveHistory(SSHSessionImpl.java:279)
+	at gw.ssh.SSHCmdSessionOutput.run(SSHCmdSessionOutput.java:91)
 	at java.lang.Thread.run(Thread.java:748)
 Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection was not closed by the application and is garbage collected [90018-199]
 	at org.h2.message.DbException.getJdbcSQLException(DbException.java:617)
@@ -6243,9 +6243,9 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.detail(ProcessTool.java:87)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.detail(GeoweaverController.java:151)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.detail(ProcessTool.java:87)
+	at gw.web.GeoweaverController.detail(GeoweaverController.java:151)
 	at sun.reflect.GeneratedMethodAccessor121.invoke(Unknown Source)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
 	at java.lang.reflect.Method.invoke(Method.java:498)
@@ -6299,10 +6299,10 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.getTypeById(ProcessTool.java:402)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.execute(ProcessTool.java:859)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.executeProcess(GeoweaverController.java:598)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.getTypeById(ProcessTool.java:402)
+	at gw.ssh.ProcessTool.execute(ProcessTool.java:859)
+	at gw.web.GeoweaverController.executeProcess(GeoweaverController.java:598)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -6357,9 +6357,9 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.all_history(ProcessTool.java:999)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.all_history(GeoweaverController.java:269)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.all_history(ProcessTool.java:999)
+	at gw.web.GeoweaverController.all_history(GeoweaverController.java:269)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -6414,10 +6414,10 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.getTypeById(ProcessTool.java:402)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.execute(ProcessTool.java:859)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.executeProcess(GeoweaverController.java:598)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.getTypeById(ProcessTool.java:402)
+	at gw.ssh.ProcessTool.execute(ProcessTool.java:859)
+	at gw.web.GeoweaverController.executeProcess(GeoweaverController.java:598)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -6472,9 +6472,9 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.HostTool.getEnvironments(HostTool.java:346)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.env(GeoweaverController.java:297)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.HostTool.getEnvironments(HostTool.java:346)
+	at gw.web.GeoweaverController.env(GeoweaverController.java:297)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -6529,9 +6529,9 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.all_history(ProcessTool.java:999)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.all_history(GeoweaverController.java:269)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.all_history(ProcessTool.java:999)
+	at gw.web.GeoweaverController.all_history(GeoweaverController.java:269)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -6586,12 +6586,12 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.HostTool.getHostDetailsById(HostTool.java:109)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.SSHSessionImpl.login(SSHSessionImpl.java:157)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.executePythonProcess(ProcessTool.java:757)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.execute(ProcessTool.java:879)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.executeProcess(GeoweaverController.java:598)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.HostTool.getHostDetailsById(HostTool.java:109)
+	at gw.ssh.SSHSessionImpl.login(SSHSessionImpl.java:157)
+	at gw.ssh.ProcessTool.executePythonProcess(ProcessTool.java:757)
+	at gw.ssh.ProcessTool.execute(ProcessTool.java:879)
+	at gw.web.GeoweaverController.executeProcess(GeoweaverController.java:598)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -6646,9 +6646,9 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.all_history(ProcessTool.java:999)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.all_history(GeoweaverController.java:269)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.all_history(ProcessTool.java:999)
+	at gw.web.GeoweaverController.all_history(GeoweaverController.java:269)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -6703,9 +6703,9 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.all_history(ProcessTool.java:999)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.all_history(GeoweaverController.java:269)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.all_history(ProcessTool.java:999)
+	at gw.web.GeoweaverController.all_history(GeoweaverController.java:269)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -6760,9 +6760,9 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.HostTool.detail(HostTool.java:24)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.detail(GeoweaverController.java:147)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.HostTool.detail(HostTool.java:24)
+	at gw.web.GeoweaverController.detail(GeoweaverController.java:147)
 	at sun.reflect.GeneratedMethodAccessor121.invoke(Unknown Source)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
 	at java.lang.reflect.Method.invoke(Method.java:498)
@@ -6816,9 +6816,9 @@ Caused by: org.h2.jdbc.JdbcSQLNonTransientConnectionException: The connection wa
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.one_history(ProcessTool.java:954)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.one_history(GeoweaverController.java:236)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.one_history(ProcessTool.java:954)
+	at gw.web.GeoweaverController.one_history(GeoweaverController.java:236)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -6873,9 +6873,9 @@ org.h2.message.DbException: The connection was not closed by the application and
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.HostTool.detail(HostTool.java:24)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.detail(GeoweaverController.java:147)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.HostTool.detail(HostTool.java:24)
+	at gw.web.GeoweaverController.detail(GeoweaverController.java:147)
 	at sun.reflect.GeneratedMethodAccessor121.invoke(Unknown Source)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
 	at java.lang.reflect.Method.invoke(Method.java:498)
@@ -6948,9 +6948,9 @@ org.h2.message.DbException: General error: "java.lang.IllegalStateException: The
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.<clinit>(DataBaseOperation.java:49)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.HostTool.list(HostTool.java:146)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.list(GeoweaverController.java:322)
+	at gw.database.DataBaseOperation.<clinit>(DataBaseOperation.java:49)
+	at gw.ssh.HostTool.list(HostTool.java:146)
+	at gw.web.GeoweaverController.list(GeoweaverController.java:322)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -7037,9 +7037,9 @@ org.h2.message.DbException: General error: "java.lang.IllegalStateException: The
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.HostTool.list(HostTool.java:146)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.list(GeoweaverController.java:322)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.HostTool.list(HostTool.java:146)
+	at gw.web.GeoweaverController.list(GeoweaverController.java:322)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -7126,9 +7126,9 @@ org.h2.message.DbException: General error: "java.lang.IllegalStateException: The
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.list(ProcessTool.java:39)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.list(GeoweaverController.java:326)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.list(ProcessTool.java:39)
+	at gw.web.GeoweaverController.list(GeoweaverController.java:326)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -7215,9 +7215,9 @@ org.h2.message.DbException: General error: "java.lang.IllegalStateException: The
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.WorkflowTool.list(WorkflowTool.java:41)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.list(GeoweaverController.java:330)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.WorkflowTool.list(WorkflowTool.java:41)
+	at gw.web.GeoweaverController.list(GeoweaverController.java:330)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -7304,9 +7304,9 @@ org.h2.message.DbException: General error: "java.lang.IllegalStateException: The
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.HostTool.list(HostTool.java:146)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.list(GeoweaverController.java:322)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.HostTool.list(HostTool.java:146)
+	at gw.web.GeoweaverController.list(GeoweaverController.java:322)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -7393,9 +7393,9 @@ org.h2.message.DbException: General error: "java.lang.IllegalStateException: The
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.WorkflowTool.list(WorkflowTool.java:41)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.list(GeoweaverController.java:330)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.WorkflowTool.list(WorkflowTool.java:41)
+	at gw.web.GeoweaverController.list(GeoweaverController.java:330)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -7482,9 +7482,9 @@ org.h2.message.DbException: General error: "java.lang.IllegalStateException: The
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.list(ProcessTool.java:39)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.list(GeoweaverController.java:326)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.list(ProcessTool.java:39)
+	at gw.web.GeoweaverController.list(GeoweaverController.java:326)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -7571,9 +7571,9 @@ org.h2.message.DbException: General error: "java.lang.IllegalStateException: The
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.HostTool.list(HostTool.java:146)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.list(GeoweaverController.java:322)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.HostTool.list(HostTool.java:146)
+	at gw.web.GeoweaverController.list(GeoweaverController.java:322)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -7660,9 +7660,9 @@ org.h2.message.DbException: General error: "java.lang.IllegalStateException: The
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.WorkflowTool.list(WorkflowTool.java:41)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.list(GeoweaverController.java:330)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.WorkflowTool.list(WorkflowTool.java:41)
+	at gw.web.GeoweaverController.list(GeoweaverController.java:330)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -7749,9 +7749,9 @@ org.h2.message.DbException: General error: "java.lang.IllegalStateException: The
 	at org.h2.Driver.connect(Driver.java:69)
 	at java.sql.DriverManager.getConnection(DriverManager.java:664)
 	at java.sql.DriverManager.getConnection(DriverManager.java:247)
-	at edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation.query(DataBaseOperation.java:98)
-	at edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool.list(ProcessTool.java:39)
-	at edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController.list(GeoweaverController.java:326)
+	at gw.database.DataBaseOperation.query(DataBaseOperation.java:98)
+	at gw.ssh.ProcessTool.list(ProcessTool.java:39)
+	at gw.web.GeoweaverController.list(GeoweaverController.java:326)
 	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
 	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
 	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
@@ -7812,3 +7812,15 @@ Caused by: java.nio.channels.OverlappingFileLockException
 	at java.nio.channels.FileChannel.tryLock(FileChannel.java:1155)
 	at org.h2.mvstore.FileStore.open(FileStore.java:163)
 	... 65 more
+2020-06-27 16:22:05 jdbc[3]: exception
+org.h2.jdbc.JdbcSQLNonTransientException: The object is already closed [90007-199]
+2020-06-27 16:22:06 jdbc[3]: exception
+org.h2.jdbc.JdbcSQLNonTransientException: The object is already closed [90007-199]
+2020-06-27 16:29:31 jdbc[3]: exception
+org.h2.jdbc.JdbcSQLNonTransientException: The object is already closed [90007-199]
+2020-06-27 16:29:31 jdbc[3]: exception
+org.h2.jdbc.JdbcSQLNonTransientException: The object is already closed [90007-199]
+2020-06-27 16:29:31 jdbc[3]: exception
+org.h2.jdbc.JdbcSQLNonTransientException: The object is already closed [90007-199]
+2020-06-27 16:29:31 jdbc[3]: exception
+org.h2.jdbc.JdbcSQLNonTransientException: The object is already closed [90007-199]
diff --git a/pom.xml b/pom.xml
index 3958ed78b..1207ac24b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>Geoweaver</artifactId>
-    <version>0.8.3</version>
+    <version>0.8.4</version>
     <packaging>war</packaging>
     <name>Geoweaver</name>
     <description>ESIPLab incubator project</description>
@@ -280,11 +280,11 @@
 		    <version>1.4.199</version>
 		    <!-- <scope>test</scope> -->
 		</dependency>
-        <dependency>
+        <!-- <dependency>
 		    <groupId>mysql</groupId>
 		    <artifactId>mysql-connector-java</artifactId>
 		    <version>5.1.42</version>
-		</dependency>
+		</dependency> -->
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-web</artifactId>
@@ -338,6 +338,11 @@
             <version>1.9.10</version>
         </dependency>
         
+        <dependency>
+		    <groupId>org.apache.tomcat</groupId>
+		    <artifactId>tomcat-websocket</artifactId>
+		    <version>8.5.43</version>
+		</dependency>
 		
     </dependencies>
     <organization>
diff --git a/src/config.properties b/src/config.properties
index 699440955..ee32795bd 100644
--- a/src/config.properties
+++ b/src/config.properties
@@ -7,8 +7,8 @@ prefixurl=http://localhost:8080
 #database_driver=com.mysql.jdbc.Driver
 database_driver=org.h2.Driver
 #database_url=jdbc:mysql://localhost:3306/cyberconnector
-#database_url=jdbc:h2:~/geoweaver;DB_CLOSE_ON_EXIT=TRUE;FILE_LOCK=NO
-database_url=jdbc:h2:tcp://localhost:8082/file:~/geoweaver
+database_url=jdbc:h2:~/geoweaver;DB_CLOSE_ON_EXIT=TRUE;FILE_LOCK=NO
+#database_url=jdbc:h2:tcp://localhost:8082/file:~/geoweaver
 #java -cp D:\software\h2-1.4.199.jar org.h2.tools.Server -tcp -tcpAllowOthers -tcpPort 8082
 #java -cp ~/Downloads/h2-1.4.199.jar org.h2.tools.Server -tcp -tcpAllowOthers -tcpPort 8082
 #database_docker_url=jdbc:mysql://db:3306/cyberconnector
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ws/client/JupyterWebSocketClientConfig.java b/src/edu/gmu/csiss/earthcube/cyberconnector/ws/client/JupyterWebSocketClientConfig.java
deleted file mode 100644
index 7531ade09..000000000
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ws/client/JupyterWebSocketClientConfig.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package edu.gmu.csiss.earthcube.cyberconnector.ws.client;
-
-
-public class JupyterWebSocketClientConfig {
-	
-	
-
-}
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/config/res_template.html b/src/gw/config/res_template.html
similarity index 100%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/config/res_template.html
rename to src/gw/config/res_template.html
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/database/DataBaseBroker.java b/src/gw/database/DataBaseBroker.java
similarity index 98%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/database/DataBaseBroker.java
rename to src/gw/database/DataBaseBroker.java
index bf3a1ec83..45310cdba 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/database/DataBaseBroker.java
+++ b/src/gw/database/DataBaseBroker.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.database;
+package gw.database;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -10,8 +10,8 @@
 
 import org.apache.log4j.Logger;
 
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.RandomString;
+import gw.utils.BaseTool;
+import gw.utils.RandomString;
 
 /**
  *Class DataBaseBroker.java
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/database/DataBaseOperation.java b/src/gw/database/DataBaseOperation.java
similarity index 99%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/database/DataBaseOperation.java
rename to src/gw/database/DataBaseOperation.java
index 3bca0855c..1a4987e5b 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/database/DataBaseOperation.java
+++ b/src/gw/database/DataBaseOperation.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.database;
+package gw.database;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -18,8 +18,8 @@
 
 import org.apache.log4j.Logger;
 
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.SysDir;
+import gw.utils.BaseTool;
+import gw.utils.SysDir;
 
 /**
  * Class DataBaseOperation contains a seires of functions which operate on a mysql database.
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ncwms/ncWMSTool.java b/src/gw/ncwms/ncWMSTool.java
similarity index 84%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/ncwms/ncWMSTool.java
rename to src/gw/ncwms/ncWMSTool.java
index a64a4a66f..9c69eaf64 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ncwms/ncWMSTool.java
+++ b/src/gw/ncwms/ncWMSTool.java
@@ -1,8 +1,8 @@
-package edu.gmu.csiss.earthcube.cyberconnector.ncwms;
+package gw.ncwms;
 
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.MyHttpUtils;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.SysDir;
+import gw.utils.BaseTool;
+import gw.utils.MyHttpUtils;
+import gw.utils.SysDir;
 
 public class ncWMSTool {
 	
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/order/CronRunnable.java b/src/gw/order/CronRunnable.java
similarity index 86%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/order/CronRunnable.java
rename to src/gw/order/CronRunnable.java
index 246ed0a9f..1c8a30660 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/order/CronRunnable.java
+++ b/src/gw/order/CronRunnable.java
@@ -1,11 +1,11 @@
-package edu.gmu.csiss.earthcube.cyberconnector.order;
+package gw.order;
 
 import org.apache.log4j.Logger;
 
-import edu.gmu.csiss.earthcube.cyberconnector.tasks.Task;
-import edu.gmu.csiss.earthcube.cyberconnector.tasks.TaskManager;
-import edu.gmu.csiss.earthcube.cyberconnector.tools.PlaceOrderTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
+import gw.tasks.Task;
+import gw.tasks.TaskManager;
+import gw.tools.PlaceOrderTool;
+import gw.utils.BaseTool;
 
 /**
 *Class CronRunnable.java
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/order/KillCronRunnable.java b/src/gw/order/KillCronRunnable.java
similarity index 85%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/order/KillCronRunnable.java
rename to src/gw/order/KillCronRunnable.java
index b950ac2cb..651de782d 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/order/KillCronRunnable.java
+++ b/src/gw/order/KillCronRunnable.java
@@ -1,8 +1,8 @@
-package edu.gmu.csiss.earthcube.cyberconnector.order;
+package gw.order;
 
 import org.apache.log4j.Logger;
 
-import edu.gmu.csiss.earthcube.cyberconnector.tools.PlaceOrderTool;
+import gw.tools.PlaceOrderTool;
 
 /**
 *Class KillCronRunnable.java
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/order/Order.java b/src/gw/order/Order.java
similarity index 98%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/order/Order.java
rename to src/gw/order/Order.java
index 49ea11db4..9305f5538 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/order/Order.java
+++ b/src/gw/order/Order.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.order;
+package gw.order;
 
 import java.util.Iterator;
 import java.util.Map;
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/order/OrderTool.java b/src/gw/order/OrderTool.java
similarity index 92%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/order/OrderTool.java
rename to src/gw/order/OrderTool.java
index af86c44c9..0758edfbf 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/order/OrderTool.java
+++ b/src/gw/order/OrderTool.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.order;
+package gw.order;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -7,9 +7,9 @@
 
 import org.apache.log4j.Logger;
 
-import edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation;
-import edu.gmu.csiss.earthcube.cyberconnector.tools.PlaceOrderTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
+import gw.database.DataBaseOperation;
+import gw.tools.PlaceOrderTool;
+import gw.utils.BaseTool;
 
 /**
 *Class OrderTool.java
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/order/TestCron.java b/src/gw/order/TestCron.java
similarity index 93%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/order/TestCron.java
rename to src/gw/order/TestCron.java
index 749585ad4..38fa15359 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/order/TestCron.java
+++ b/src/gw/order/TestCron.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.order;
+package gw.order;
 
 import it.sauronsoftware.cron4j.Scheduler;
 
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/products/DeleteProductTool.java b/src/gw/products/DeleteProductTool.java
similarity index 81%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/products/DeleteProductTool.java
rename to src/gw/products/DeleteProductTool.java
index d1213df2b..eb23f9025 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/products/DeleteProductTool.java
+++ b/src/gw/products/DeleteProductTool.java
@@ -1,7 +1,7 @@
-package edu.gmu.csiss.earthcube.cyberconnector.products;
+package gw.products;
 
-import edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.Message;
+import gw.database.DataBaseOperation;
+import gw.utils.Message;
 
 /**
 *Class DeleteProductTool.java
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/products/Input.java b/src/gw/products/Input.java
similarity index 95%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/products/Input.java
rename to src/gw/products/Input.java
index b3f0b1d4c..edd9f6624 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/products/Input.java
+++ b/src/gw/products/Input.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.products;
+package gw.products;
 /**
 *Class Input.java
 *@author Ziheng Sun
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/products/LikeProductTool.java b/src/gw/products/LikeProductTool.java
similarity index 88%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/products/LikeProductTool.java
rename to src/gw/products/LikeProductTool.java
index 10c7118d9..6ca1e213d 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/products/LikeProductTool.java
+++ b/src/gw/products/LikeProductTool.java
@@ -1,9 +1,9 @@
-package edu.gmu.csiss.earthcube.cyberconnector.products;
+package gw.products;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation;
+import gw.database.DataBaseOperation;
 
 /**
 *Class LikeProductTool.java
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/products/Product.java b/src/gw/products/Product.java
similarity index 99%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/products/Product.java
rename to src/gw/products/Product.java
index 8a8fb9f95..305278994 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/products/Product.java
+++ b/src/gw/products/Product.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.products;
+package gw.products;
 
 import java.util.List;
 import java.util.Map;
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/products/RegisterProductTool.java b/src/gw/products/RegisterProductTool.java
similarity index 93%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/products/RegisterProductTool.java
rename to src/gw/products/RegisterProductTool.java
index b07f9f0c4..eede8b121 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/products/RegisterProductTool.java
+++ b/src/gw/products/RegisterProductTool.java
@@ -1,7 +1,7 @@
-package edu.gmu.csiss.earthcube.cyberconnector.products;
+package gw.products;
 
-import edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseBroker;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.RandomString;
+import gw.database.DataBaseBroker;
+import gw.utils.RandomString;
 
 /**
  *Class RegisterProductTool.java
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/products/RetrieveProductTool.java b/src/gw/products/RetrieveProductTool.java
similarity index 95%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/products/RetrieveProductTool.java
rename to src/gw/products/RetrieveProductTool.java
index b2d67ae05..525ebe05c 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/products/RetrieveProductTool.java
+++ b/src/gw/products/RetrieveProductTool.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.products;
+package gw.products;
 
 import java.sql.ResultSet;
 import java.util.ArrayList;
@@ -9,8 +9,8 @@
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 
-import edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation;
-import edu.gmu.csiss.earthcube.cyberconnector.tools.GetProductInputDetailsTool;
+import gw.database.DataBaseOperation;
+import gw.tools.GetProductInputDetailsTool;
 
 /**
 *Class RetrieveProductTool.java
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/search/GWSearchTool.java b/src/gw/search/GWSearchTool.java
similarity index 97%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/search/GWSearchTool.java
rename to src/gw/search/GWSearchTool.java
index d3e79c383..ec7120e1c 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/search/GWSearchTool.java
+++ b/src/gw/search/GWSearchTool.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.search;
+package gw.search;
 
 import java.sql.ResultSet;
 import java.util.ArrayList;
@@ -6,7 +6,7 @@
 
 import org.apache.log4j.Logger;
 
-import edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation;
+import gw.database.DataBaseOperation;
 
 public class GWSearchTool {
 	
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/search/Granule.java b/src/gw/search/Granule.java
similarity index 93%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/search/Granule.java
rename to src/gw/search/Granule.java
index 7946e3fda..649cdad34 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/search/Granule.java
+++ b/src/gw/search/Granule.java
@@ -1,6 +1,6 @@
-package edu.gmu.csiss.earthcube.cyberconnector.search;
+package gw.search;
 
-import edu.gmu.csiss.earthcube.cyberconnector.products.Product;
+import gw.products.Product;
 import org.codehaus.jackson.annotate.JsonIgnoreProperties;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/search/GranulesRequest.java b/src/gw/search/GranulesRequest.java
similarity index 97%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/search/GranulesRequest.java
rename to src/gw/search/GranulesRequest.java
index e08cc01a2..397714f4a 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/search/GranulesRequest.java
+++ b/src/gw/search/GranulesRequest.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.search;
+package gw.search;
 
 public class GranulesRequest {
     String collection_url, collection_name, collection_desc, time_start, time_end;
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/search/GranulesTool.java b/src/gw/search/GranulesTool.java
similarity index 95%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/search/GranulesTool.java
rename to src/gw/search/GranulesTool.java
index c13776e8a..67de3007e 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/search/GranulesTool.java
+++ b/src/gw/search/GranulesTool.java
@@ -1,6 +1,6 @@
-package edu.gmu.csiss.earthcube.cyberconnector.search;
+package gw.search;
 
-import edu.gmu.csiss.earthcube.cyberconnector.utils.SysDir;
+import gw.utils.SysDir;
 import org.apache.commons.io.IOUtils;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.type.TypeReference;
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/search/SearchRequest.java b/src/gw/search/SearchRequest.java
similarity index 98%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/search/SearchRequest.java
rename to src/gw/search/SearchRequest.java
index 7abeecf57..7e2417fae 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/search/SearchRequest.java
+++ b/src/gw/search/SearchRequest.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.search;
+package gw.search;
 
 import java.util.List;
 
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/search/SearchResponse.java b/src/gw/search/SearchResponse.java
similarity index 92%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/search/SearchResponse.java
rename to src/gw/search/SearchResponse.java
index 7efa4c81b..7be926bfb 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/search/SearchResponse.java
+++ b/src/gw/search/SearchResponse.java
@@ -1,9 +1,9 @@
-package edu.gmu.csiss.earthcube.cyberconnector.search;
+package gw.search;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import edu.gmu.csiss.earthcube.cyberconnector.products.Product;
+import gw.products.Product;
 
 /**
 *Class SearchResponse.java
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/search/SearchTool.java b/src/gw/search/SearchTool.java
similarity index 98%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/search/SearchTool.java
rename to src/gw/search/SearchTool.java
index a6ca351f4..0d12b0730 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/search/SearchTool.java
+++ b/src/gw/search/SearchTool.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.search;
+package gw.search;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -16,11 +16,11 @@
 import org.dom4j.Node;
 import org.dom4j.XPath;
 
-import edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation;
-import edu.gmu.csiss.earthcube.cyberconnector.products.Product;
-import edu.gmu.csiss.earthcube.cyberconnector.tools.LocalFileTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.SysDir;
+import gw.database.DataBaseOperation;
+import gw.products.Product;
+import gw.tools.LocalFileTool;
+import gw.utils.BaseTool;
+import gw.utils.SysDir;
 
 /**
 *Class SearchTool.java
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/services/QueryServiceTool.java b/src/gw/services/QueryServiceTool.java
similarity index 88%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/services/QueryServiceTool.java
rename to src/gw/services/QueryServiceTool.java
index f2856bc1a..1930c884c 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/services/QueryServiceTool.java
+++ b/src/gw/services/QueryServiceTool.java
@@ -1,11 +1,11 @@
-package edu.gmu.csiss.earthcube.cyberconnector.services;
+package gw.services;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation;
+import gw.database.DataBaseOperation;
 
 /**
 *Class QueryServiceTool.java
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/services/RegisterServiceTool.java b/src/gw/services/RegisterServiceTool.java
similarity index 93%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/services/RegisterServiceTool.java
rename to src/gw/services/RegisterServiceTool.java
index c15f21d7c..84549b1c3 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/services/RegisterServiceTool.java
+++ b/src/gw/services/RegisterServiceTool.java
@@ -1,15 +1,15 @@
-package edu.gmu.csiss.earthcube.cyberconnector.services;
+package gw.services;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
 import org.apache.log4j.Logger;
 
-import edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation;
-import edu.gmu.csiss.earthcube.cyberconnector.user.UserTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.Message;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.SysDir;
+import gw.database.DataBaseOperation;
+import gw.user.UserTool;
+import gw.utils.BaseTool;
+import gw.utils.Message;
+import gw.utils.SysDir;
 
 /**
  *Class RegisterServiceTool.java
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/services/Service.java b/src/gw/services/Service.java
similarity index 98%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/services/Service.java
rename to src/gw/services/Service.java
index ab8ac126e..a8849bcb6 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/services/Service.java
+++ b/src/gw/services/Service.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.services;
+package gw.services;
 /**
 *Class Service.java
 *@author Ziheng Sun
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/servlet/FetchProductListServlet.java b/src/gw/servlet/FetchProductListServlet.java
similarity index 90%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/servlet/FetchProductListServlet.java
rename to src/gw/servlet/FetchProductListServlet.java
index 53ba5b40b..fa3ce2b19 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/servlet/FetchProductListServlet.java
+++ b/src/gw/servlet/FetchProductListServlet.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.servlet;
+package gw.servlet;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -9,8 +9,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import edu.gmu.csiss.earthcube.cyberconnector.tools.FetchProductListTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
+import gw.tools.FetchProductListTool;
+import gw.utils.BaseTool;
 
 /**
  * Servlet implementation class FetchProductListServlet
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/servlet/FileUploadServlet.java b/src/gw/servlet/FileUploadServlet.java
similarity index 97%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/servlet/FileUploadServlet.java
rename to src/gw/servlet/FileUploadServlet.java
index 3973d1925..8c52a57ca 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/servlet/FileUploadServlet.java
+++ b/src/gw/servlet/FileUploadServlet.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.servlet;
+package gw.servlet;
 
 import java.util.*;
 import java.io.*;
@@ -13,8 +13,8 @@
 import org.apache.commons.fileupload.servlet.*;
 import org.apache.log4j.Logger;
 
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.SysDir;
+import gw.utils.BaseTool;
+import gw.utils.SysDir;
 
 import org.apache.commons.fileupload.disk.*; 
 
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/servlet/GetInputDetailsServlet.java b/src/gw/servlet/GetInputDetailsServlet.java
similarity index 87%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/servlet/GetInputDetailsServlet.java
rename to src/gw/servlet/GetInputDetailsServlet.java
index eceb14518..4e1d73292 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/servlet/GetInputDetailsServlet.java
+++ b/src/gw/servlet/GetInputDetailsServlet.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.servlet;
+package gw.servlet;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -9,9 +9,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import edu.gmu.csiss.earthcube.cyberconnector.tools.FetchProductListTool;
-import edu.gmu.csiss.earthcube.cyberconnector.tools.GetProductInputDetailsTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
+import gw.tools.FetchProductListTool;
+import gw.tools.GetProductInputDetailsTool;
+import gw.utils.BaseTool;
 
 /**
  * Servlet implementation class GetInputDetailsServlet
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/servlet/MetadataQueryServlet.java b/src/gw/servlet/MetadataQueryServlet.java
similarity index 88%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/servlet/MetadataQueryServlet.java
rename to src/gw/servlet/MetadataQueryServlet.java
index b3e937702..00c071111 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/servlet/MetadataQueryServlet.java
+++ b/src/gw/servlet/MetadataQueryServlet.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.servlet;
+package gw.servlet;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -9,9 +9,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import edu.gmu.csiss.earthcube.cyberconnector.tools.PlaceOrderTool;
-import edu.gmu.csiss.earthcube.cyberconnector.tools.QueryOrderStatusTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
+import gw.tools.PlaceOrderTool;
+import gw.tools.QueryOrderStatusTool;
+import gw.utils.BaseTool;
 
 /**
  * Servlet implementation class MetadataQueryServlet
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/servlet/OrderCheckingServlet.java b/src/gw/servlet/OrderCheckingServlet.java
similarity index 81%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/servlet/OrderCheckingServlet.java
rename to src/gw/servlet/OrderCheckingServlet.java
index 56a86d2a4..946da316e 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/servlet/OrderCheckingServlet.java
+++ b/src/gw/servlet/OrderCheckingServlet.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.servlet;
+package gw.servlet;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -11,11 +11,11 @@
 
 import org.apache.log4j.Logger;
 
-import edu.gmu.csiss.earthcube.cyberconnector.tools.CheckOrderStatusTool;
-import edu.gmu.csiss.earthcube.cyberconnector.tools.PlaceOrderTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.SpatialExtentValidator;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.TimeExtentValidator;
+import gw.tools.CheckOrderStatusTool;
+import gw.tools.PlaceOrderTool;
+import gw.utils.BaseTool;
+import gw.utils.SpatialExtentValidator;
+import gw.utils.TimeExtentValidator;
 
 /**
  * Servlet implementation class OrderCheckingServlet
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/servlet/ServiceRegisterServlet.java b/src/gw/servlet/ServiceRegisterServlet.java
similarity index 91%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/servlet/ServiceRegisterServlet.java
rename to src/gw/servlet/ServiceRegisterServlet.java
index 8b11af621..43be036d7 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/servlet/ServiceRegisterServlet.java
+++ b/src/gw/servlet/ServiceRegisterServlet.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.servlet;
+package gw.servlet;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -10,8 +10,8 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import edu.gmu.csiss.earthcube.cyberconnector.services.RegisterServiceTool;
-import edu.gmu.csiss.earthcube.cyberconnector.user.UserTool;
+import gw.services.RegisterServiceTool;
+import gw.user.UserTool;
 
 /**
  * Servlet implementation class ServiceRegisterServlet
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/servlet/ServiceUnregistrationServlet.java b/src/gw/servlet/ServiceUnregistrationServlet.java
similarity index 93%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/servlet/ServiceUnregistrationServlet.java
rename to src/gw/servlet/ServiceUnregistrationServlet.java
index 287c9604d..ce40ec939 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/servlet/ServiceUnregistrationServlet.java
+++ b/src/gw/servlet/ServiceUnregistrationServlet.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.servlet;
+package gw.servlet;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -9,7 +9,7 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import edu.gmu.csiss.earthcube.cyberconnector.services.RegisterServiceTool;
+import gw.services.RegisterServiceTool;
 
 /**
  * Servlet implementation class ServiceUnregistrationServlet
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/servlet/UpdateServiceServlet.java b/src/gw/servlet/UpdateServiceServlet.java
similarity index 91%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/servlet/UpdateServiceServlet.java
rename to src/gw/servlet/UpdateServiceServlet.java
index 410f4f393..39ec9625b 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/servlet/UpdateServiceServlet.java
+++ b/src/gw/servlet/UpdateServiceServlet.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.servlet;
+package gw.servlet;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -9,8 +9,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import edu.gmu.csiss.earthcube.cyberconnector.services.RegisterServiceTool;
-import edu.gmu.csiss.earthcube.cyberconnector.user.UserTool;
+import gw.services.RegisterServiceTool;
+import gw.user.UserTool;
 
 /**
  * Servlet implementation class UpdateServiceServlet
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/servlet/VirtualProductQueryServlet.java b/src/gw/servlet/VirtualProductQueryServlet.java
similarity index 88%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/servlet/VirtualProductQueryServlet.java
rename to src/gw/servlet/VirtualProductQueryServlet.java
index 0ab1463c3..c1cd197b0 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/servlet/VirtualProductQueryServlet.java
+++ b/src/gw/servlet/VirtualProductQueryServlet.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.servlet;
+package gw.servlet;
 
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -13,14 +13,14 @@
 
 import org.apache.log4j.Logger;
 
-import edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation;
-import edu.gmu.csiss.earthcube.cyberconnector.tools.PlaceOrderTool;
-import edu.gmu.csiss.earthcube.cyberconnector.user.User;
-import edu.gmu.csiss.earthcube.cyberconnector.user.UserTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.EmailValidator;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.SpatialExtentValidator;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.TimeExtentValidator;
+import gw.database.DataBaseOperation;
+import gw.tools.PlaceOrderTool;
+import gw.user.User;
+import gw.user.UserTool;
+import gw.utils.BaseTool;
+import gw.utils.EmailValidator;
+import gw.utils.SpatialExtentValidator;
+import gw.utils.TimeExtentValidator;
 
 /**
  * Servlet implementation class VirtualProductQueryServlet
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/FileTool.java b/src/gw/ssh/FileTool.java
similarity index 97%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/ssh/FileTool.java
rename to src/gw/ssh/FileTool.java
index 27a78938e..e27758675 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/FileTool.java
+++ b/src/gw/ssh/FileTool.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.ssh;
+package gw.ssh;
 
 import java.io.File;
 import java.io.IOException;
@@ -9,9 +9,9 @@
 
 import org.apache.log4j.Logger;
 
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.RandomString;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.SysDir;
+import gw.utils.BaseTool;
+import gw.utils.RandomString;
+import gw.utils.SysDir;
 import net.schmizz.sshj.sftp.RemoteResourceInfo;
 import net.schmizz.sshj.sftp.SFTPClient;
 import net.schmizz.sshj.xfer.FilePermission;
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/HostTool.java b/src/gw/ssh/HostTool.java
similarity index 96%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/ssh/HostTool.java
rename to src/gw/ssh/HostTool.java
index 3b5ee412a..564f98531 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/HostTool.java
+++ b/src/gw/ssh/HostTool.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.ssh;
+package gw.ssh;
 
 
 import java.sql.ResultSet;
@@ -7,9 +7,9 @@
 import org.apache.log4j.Logger;
 import org.json.simple.JSONObject;
 
-import edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.RandomString;
+import gw.database.DataBaseOperation;
+import gw.utils.BaseTool;
+import gw.utils.RandomString;
 
 public class HostTool {
 
@@ -143,7 +143,7 @@ public static String list(String owner) {
 		StringBuffer json = new StringBuffer("[");
 		try {
 			
-			String sql = "select id, name from hosts;";
+			String sql = "select id, ip, name from hosts;";
 			
 			ResultSet rs = DataBaseOperation.query(sql);
 			
@@ -155,13 +155,18 @@ public static String list(String owner) {
 				
 				String hostname = rs.getString("name");
 				
+				String ip = rs.getString("ip");
+				
 				if( num++ != 0) {
 					
 					json.append(",");
 					
 				}
 				
-				json.append("{\"id\":\"").append(hostid).append("\", \"name\": \"").append(hostname).append("\"}");
+				json.append("{\"id\":\"").append(hostid)
+					.append("\", \"name\": \"").append(hostname)
+					.append("\", \"ip\": \"").append(ip)
+					.append("\"}");
 				
 			}
 			
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/ProcessTool.java b/src/gw/ssh/ProcessTool.java
similarity index 96%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/ssh/ProcessTool.java
rename to src/gw/ssh/ProcessTool.java
index b9778147e..a6b5a6b4f 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/ProcessTool.java
+++ b/src/gw/ssh/ProcessTool.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.ssh;
+package gw.ssh;
 
 import java.io.File;
 import java.sql.ResultSet;
@@ -15,18 +15,18 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.web.socket.WebSocketSession;
 
-import edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation;
-import edu.gmu.csiss.earthcube.cyberconnector.tasks.GeoweaverProcessTask;
-import edu.gmu.csiss.earthcube.cyberconnector.tasks.TaskManager;
-import edu.gmu.csiss.earthcube.cyberconnector.tasks.TaskSocket;
-import edu.gmu.csiss.earthcube.cyberconnector.tools.HistoryTool;
-import edu.gmu.csiss.earthcube.cyberconnector.user.User;
-import edu.gmu.csiss.earthcube.cyberconnector.user.UserTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.Message;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.RandomString;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.SysDir;
-import edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController;
+import gw.database.DataBaseOperation;
+import gw.tasks.GeoweaverProcessTask;
+import gw.tasks.TaskManager;
+import gw.tasks.TaskSocket;
+import gw.tools.HistoryTool;
+import gw.user.User;
+import gw.user.UserTool;
+import gw.utils.BaseTool;
+import gw.utils.Message;
+import gw.utils.RandomString;
+import gw.utils.SysDir;
+import gw.web.GeoweaverController;
 import net.schmizz.sshj.common.IOUtils;
 import net.schmizz.sshj.connection.channel.direct.Session;
 
@@ -1095,9 +1095,9 @@ public static String one_history(String hid) {
 			
 			if(rs.next()) {
 				
-				resp.append("{ \"id\": \"").append(rs.getString("history.id")).append("\", ");
+				resp.append("{ \"hid\": \"").append(rs.getString("history.id")).append("\", ");
 				
-				resp.append("\"process\": \"").append(rs.getString("process")).append("\", ");
+				resp.append("\"id\": \"").append(rs.getString("process")).append("\", ");
 				
 				resp.append("\"name\": \"").append(rs.getString("name")).append("\", ");
 				
@@ -1109,6 +1109,8 @@ public static String one_history(String hid) {
 				
 				resp.append("\"output\":\"").append(escape(rs.getString("output"))).append("\", ");
 				
+				resp.append("\"category\":\"").append(escape(rs.getString("description"))).append("\", ");
+				
 				resp.append("\"host\":\"").append(escape(rs.getString("host"))).append("\", ");
 				
 				resp.append("\"status\":\"").append(rs.getString("indicator")).append("\" }");
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/RSAEncryptTool.java b/src/gw/ssh/RSAEncryptTool.java
similarity index 97%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/ssh/RSAEncryptTool.java
rename to src/gw/ssh/RSAEncryptTool.java
index 10acf5d7b..1fc43041b 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/RSAEncryptTool.java
+++ b/src/gw/ssh/RSAEncryptTool.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.ssh;
+package gw.ssh;
 
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;
@@ -12,7 +12,7 @@
 
 import org.apache.commons.codec.binary.Base64;
 
-import edu.gmu.csiss.earthcube.cyberconnector.utils.RandomString;
+import gw.utils.RandomString;
 
 public class RSAEncryptTool {
 	
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SSHAuthenticationException.java b/src/gw/ssh/SSHAuthenticationException.java
similarity index 96%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SSHAuthenticationException.java
rename to src/gw/ssh/SSHAuthenticationException.java
index ee6b62390..376174312 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SSHAuthenticationException.java
+++ b/src/gw/ssh/SSHAuthenticationException.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.ssh;
+package gw.ssh;
 /*
 
 The MIT License (MIT)
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SSHAuthenticationProvider.java b/src/gw/ssh/SSHAuthenticationProvider.java
similarity index 98%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SSHAuthenticationProvider.java
rename to src/gw/ssh/SSHAuthenticationProvider.java
index dc6f82aaf..45d96db65 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SSHAuthenticationProvider.java
+++ b/src/gw/ssh/SSHAuthenticationProvider.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.ssh;
+package gw.ssh;
 /*
 
 The MIT License (MIT)
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SSHCmdSessionOutput.java b/src/gw/ssh/SSHCmdSessionOutput.java
similarity index 83%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SSHCmdSessionOutput.java
rename to src/gw/ssh/SSHCmdSessionOutput.java
index 60248e061..37c968c7a 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SSHCmdSessionOutput.java
+++ b/src/gw/ssh/SSHCmdSessionOutput.java
@@ -1,15 +1,18 @@
-package edu.gmu.csiss.earthcube.cyberconnector.ssh;
+package gw.ssh;
 
 import java.io.BufferedReader;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketSession;
 
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController;
-
+import gw.utils.BaseTool;
+import gw.web.GeoweaverController;
+import gw.ws.server.CommandServlet;
+/**
+ * This class is for command line output
+ * 
+ * @author JensenSun
+ *
+ */
 public class SSHCmdSessionOutput  extends SSHSessionOutput {
 
 	
@@ -17,6 +20,8 @@ public SSHCmdSessionOutput(BufferedReader in, String token) {
     	
     	super(in, token);
     	
+    	wsout = CommandServlet.findSessionById(token);
+    	
     }
     
     public void stop() {
@@ -90,6 +95,9 @@ public void run() {
                 	
                 	if(!BaseTool.isNull(session)) session.saveHistory(logs.toString(), "Done");
                 	
+                	if(!BaseTool.isNull(wsout) && wsout.isOpen())
+                		wsout.getBasicRemote().sendText("The process "+session.getHistory_id()+" is finished.");
+                	
                 	break;
                 	
                 }
@@ -98,7 +106,7 @@ public void run() {
                 
                 logs.append(line).append("\n");
                 
-                if(!BaseTool.isNull(out) && out.isOpen()) {
+                if(!BaseTool.isNull(wsout) && wsout.isOpen()) {
                 	
                 	if(prelog.toString()!=null) {
                 		
@@ -108,7 +116,10 @@ public void run() {
                 		
                 	}
                 	
-                    out.sendMessage(new TextMessage(line));
+                	log.info("wsout message {}:{}", wsout.getId(), line);
+                	
+//                    out.sendMessage(new TextMessage(line));
+                	wsout.getBasicRemote().sendText(line);
                     
                 }else {
                 	
@@ -138,7 +149,7 @@ public void run() {
     
     public void setWebSocketSession(WebSocketSession session) {
         log.info("received websocket session");
-        this.out = session;
+//        this.out = session;
     }
     
 }
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SSHSession.java b/src/gw/ssh/SSHSession.java
similarity index 98%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SSHSession.java
rename to src/gw/ssh/SSHSession.java
index 496d9c6a6..7d9684f11 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SSHSession.java
+++ b/src/gw/ssh/SSHSession.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.ssh;
+package gw.ssh;
 /*
 
 The MIT License (MIT)
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SSHSessionImpl.java b/src/gw/ssh/SSHSessionImpl.java
similarity index 97%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SSHSessionImpl.java
rename to src/gw/ssh/SSHSessionImpl.java
index 0f91202e2..a80778c63 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SSHSessionImpl.java
+++ b/src/gw/ssh/SSHSessionImpl.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.ssh;
+package gw.ssh;
 /*
 
 The MIT License (MIT)
@@ -37,10 +37,10 @@ this software and associated documentation files (the "Software"), to deal in
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.web.socket.WebSocketSession;
 
-import edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.RandomString;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.SysDir;
+import gw.database.DataBaseOperation;
+import gw.utils.BaseTool;
+import gw.utils.RandomString;
+import gw.utils.SysDir;
 import net.schmizz.sshj.SSHClient;
 import net.schmizz.sshj.connection.channel.direct.Session;
 import net.schmizz.sshj.connection.channel.direct.Session.Command;
@@ -101,6 +101,12 @@ public class SSHSessionImpl implements SSHSession {
     /** end of history section **/
     /**********************************************/
     
+    public SSHSessionImpl() {
+    	
+    	history_id = new RandomString(12).nextString(); //create a history id everytime the process is executed
+    	
+    }
+    
     public String getHistory_process() {
 		return history_process;
 	}
@@ -348,7 +354,7 @@ public static String escapeJupter(String json) {
     @Override
 	public void runPython(String python, String processid, boolean isjoin, String bin, String pyenv, String basedir, String token) {
     	
-		this.history_id = token; //new RandomString(12).nextString();
+//		this.history_id = token; //new RandomString(12).nextString();
 		
 		this.history_process = processid.split("-")[0]; //only retain process id, remove object id
 		
@@ -463,7 +469,7 @@ public void runPython(String python, String processid, boolean isjoin, String bi
     @Override
 	public void runJupyter(String notebookjson, String processid, boolean isjoin, String bin, String pyenv, String basedir, String token) {
     	
-		this.history_id = token; //new RandomString(12).nextString();
+//		this.history_id = token; //new RandomString(12).nextString();
 		
 		this.history_process = processid.split("-")[0]; //only retain process id, remove object id
 		
@@ -578,7 +584,7 @@ public void runJupyter(String notebookjson, String processid, boolean isjoin, St
 	@Override
 	public void runBash(String script, String processid, boolean isjoin, String token) {
     	
-		this.history_id = token; //new RandomString(12).nextString();
+//		this.history_id = token; //new RandomString(12).nextString();
 		
 		this.history_process = processid.split("-")[0]; //only retain process id, remove object id
 		
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SSHSessionManager.java b/src/gw/ssh/SSHSessionManager.java
similarity index 97%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SSHSessionManager.java
rename to src/gw/ssh/SSHSessionManager.java
index 8879a29a6..a215d259f 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SSHSessionManager.java
+++ b/src/gw/ssh/SSHSessionManager.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.ssh;
+package gw.ssh;
 /*
 
 The MIT License (MIT)
@@ -43,6 +43,8 @@ public class SSHSessionManager {
 //    public final ConcurrentHashMap<String, SSHSession> sessionsByUsername = new ConcurrentHashMap<String, SSHSession>();   
     /**
      * this map contains all the ssh sessions
+     * Key: HttpSession ID
+     * Value: Open SSH Terminal Session
      */
     public final ConcurrentHashMap<String, SSHSession> sessionsByToken = new ConcurrentHashMap<String, SSHSession>();
     
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SSHSessionOutput.java b/src/gw/ssh/SSHSessionOutput.java
similarity index 83%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SSHSessionOutput.java
rename to src/gw/ssh/SSHSessionOutput.java
index dae755e3d..2d6d8caea 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SSHSessionOutput.java
+++ b/src/gw/ssh/SSHSessionOutput.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.ssh;
+package gw.ssh;
 /*
 
 The MIT License (MIT)
@@ -25,30 +25,43 @@ this software and associated documentation files (the "Software"), to deal in
 
 import java.io.BufferedReader;
 
+import javax.websocket.Session;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketSession;
 
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController;
-
+import gw.utils.BaseTool;
+import gw.web.GeoweaverController;
+import gw.ws.server.TerminalServlet;
+/**
+ * 
+ * This class is used for monitoring the traffic from SSH session/Terminal console
+ * 
+ * @author JensenSun
+ *
+ */
 public class SSHSessionOutput implements Runnable {
 
     protected final Logger log = LoggerFactory.getLogger(getClass());
 
     protected final BufferedReader in;
     
-    protected WebSocketSession out; // log&shell websocket
+    protected WebSocketSession out; // log&shell websocket - not used any more
+    
+    protected Session wsout;
     
     protected String token; // session token
     
     protected boolean run = true;
     
+    protected String history_id;
+    
     public SSHSessionOutput(BufferedReader in, String token) {
         log.info("created");
         this.in = in;
         this.token = token;
+        wsout = TerminalServlet.findSessionById(token);
     }
     
     public void stop() {
@@ -130,7 +143,7 @@ public void run() {
 //                
 //                logs.append(line).append("\n");
                 
-                if(!BaseTool.isNull(out)) {
+                if(!BaseTool.isNull(wsout) && wsout.isOpen()) {
 //                	
 //                	if(prelog.toString()!=null) {
 //                		
@@ -140,14 +153,20 @@ public void run() {
 //                		
 //                	}
                 	
-//                    log.info("message out {}:{}", out.getId(), line);
+                    log.info("wsout message {}:{}", token, line);
+                    
+//                    out.sendMessage(new TextMessage(line)); // for the SockJS session to deliver it back to the SSH Terminal
                     
-                    out.sendMessage(new TextMessage(line));
+                	wsout.getBasicRemote().sendText(line); // for the All information web socket session
                     
 //                }else {
 //                	
 //                	prelog.append(line).append("\n");
 //                	
+                }else {
+                	
+                	wsout = TerminalServlet.findSessionById(token);
+                	
                 }
                 
             } catch (Exception e) {
@@ -166,7 +185,7 @@ public void run() {
     
     public void setWebSocketSession(WebSocketSession session) {
         log.info("received websocket session");
-        this.out = session;
+//        this.out = session;
     }
     
 }
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SecurityConfiguration.java b/src/gw/ssh/SecurityConfiguration.java
similarity index 98%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SecurityConfiguration.java
rename to src/gw/ssh/SecurityConfiguration.java
index ed72a776b..895bb77dd 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/SecurityConfiguration.java
+++ b/src/gw/ssh/SecurityConfiguration.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.ssh;
+package gw.ssh;
 
 /*
 
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/ShellSocket.java b/src/gw/ssh/ShellSocket.java
similarity index 97%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/ssh/ShellSocket.java
rename to src/gw/ssh/ShellSocket.java
index 31e29709b..5125f5512 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/ShellSocket.java
+++ b/src/gw/ssh/ShellSocket.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.ssh;
+package gw.ssh;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -13,7 +13,7 @@
 import org.springframework.web.socket.WebSocketMessage;
 import org.springframework.web.socket.WebSocketSession;
 
-import edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController;
+import gw.web.GeoweaverController;
 
 /**
  * Created by usta on 20.02.2015.
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/ShellSocket.java.bak b/src/gw/ssh/ShellSocket.java.bak
similarity index 98%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/ssh/ShellSocket.java.bak
rename to src/gw/ssh/ShellSocket.java.bak
index 7d58aafc6..ef21b0fa5 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/ShellSocket.java.bak
+++ b/src/gw/ssh/ShellSocket.java.bak
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.web;
+package gw.web;
 
 import net.schmizz.sshj.SSHClient;
 import net.schmizz.sshj.connection.channel.direct.Session;
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/Workflow.java b/src/gw/ssh/Workflow.java
similarity index 90%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/ssh/Workflow.java
rename to src/gw/ssh/Workflow.java
index 50ba66482..7cf9d3415 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/Workflow.java
+++ b/src/gw/ssh/Workflow.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.ssh;
+package gw.ssh;
 
 public class Workflow {
 
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/WorkflowTool.java b/src/gw/ssh/WorkflowTool.java
similarity index 94%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/ssh/WorkflowTool.java
rename to src/gw/ssh/WorkflowTool.java
index 1d6ca4dd7..ebe74b2ca 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ssh/WorkflowTool.java
+++ b/src/gw/ssh/WorkflowTool.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.ssh;
+package gw.ssh;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -13,14 +13,14 @@
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
-import edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation;
-import edu.gmu.csiss.earthcube.cyberconnector.tasks.GeoweaverWorkflowTask;
-import edu.gmu.csiss.earthcube.cyberconnector.tasks.TaskManager;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.RandomString;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.STATUS;
-import edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController;
-import edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool;
+import gw.database.DataBaseOperation;
+import gw.tasks.GeoweaverWorkflowTask;
+import gw.tasks.TaskManager;
+import gw.utils.BaseTool;
+import gw.utils.RandomString;
+import gw.utils.STATUS;
+import gw.web.GeoweaverController;
+import gw.ssh.ProcessTool;
 
 /**
  * 
@@ -417,13 +417,7 @@ public static String execute(String id, String mode, String[] hosts, String[] ps
 		
 		try {
 			
-			GeoweaverWorkflowTask task = new GeoweaverWorkflowTask(token);
-			
-			if(BaseTool.isNull(token)) {
-				
-				token = task.getHistory_id(); //new RandomString(12).nextString(); //this token will be used to establish websocket session
-				
-			}
+			GeoweaverWorkflowTask task = new GeoweaverWorkflowTask("GW-Workflow-Run-" + token);
 			
 			task.initialize(id, mode, hosts, pswds, token);
 			
@@ -713,7 +707,7 @@ public static String one_history(String hid) {
 			
 			if(rs.next()) {
 				
-				resp.append("{ \"id\": \"").append(rs.getString("id")).append("\", ");
+				resp.append("{ \"hid\": \"").append(rs.getString("id")).append("\", ");
 				
 				resp.append("\"process\": \"").append(rs.getString("process")).append("\", ");
 				
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/tasks/GeoweaverProcessTask.java b/src/gw/tasks/GeoweaverProcessTask.java
similarity index 91%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/tasks/GeoweaverProcessTask.java
rename to src/gw/tasks/GeoweaverProcessTask.java
index fa6f2c152..65c98c940 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/tasks/GeoweaverProcessTask.java
+++ b/src/gw/tasks/GeoweaverProcessTask.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.tasks;
+package gw.tasks;
 
 import java.io.File;
 import java.io.IOException;
@@ -10,12 +10,12 @@
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketSession;
 
-import edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation;
-import edu.gmu.csiss.earthcube.cyberconnector.ssh.FileTool;
-import edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.RandomString;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.SysDir;
+import gw.database.DataBaseOperation;
+import gw.ssh.FileTool;
+import gw.ssh.ProcessTool;
+import gw.utils.BaseTool;
+import gw.utils.RandomString;
+import gw.utils.SysDir;
 
 /**
  * 
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/tasks/GeoweaverWorkflowTask.java b/src/gw/tasks/GeoweaverWorkflowTask.java
similarity index 91%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/tasks/GeoweaverWorkflowTask.java
rename to src/gw/tasks/GeoweaverWorkflowTask.java
index 84368b23e..410895ae4 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/tasks/GeoweaverWorkflowTask.java
+++ b/src/gw/tasks/GeoweaverWorkflowTask.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.tasks;
+package gw.tasks;
 
 import java.io.IOException;
 import java.util.List;
@@ -11,17 +11,17 @@
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketSession;
 
-import edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation;
-import edu.gmu.csiss.earthcube.cyberconnector.ssh.HostTool;
-import edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool;
-import edu.gmu.csiss.earthcube.cyberconnector.ssh.SSHSession;
-import edu.gmu.csiss.earthcube.cyberconnector.ssh.SSHSessionImpl;
-import edu.gmu.csiss.earthcube.cyberconnector.ssh.Workflow;
-import edu.gmu.csiss.earthcube.cyberconnector.ssh.WorkflowTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.RandomString;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.STATUS;
-import edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController;
+import gw.database.DataBaseOperation;
+import gw.ssh.HostTool;
+import gw.ssh.ProcessTool;
+import gw.ssh.SSHSession;
+import gw.ssh.SSHSessionImpl;
+import gw.ssh.Workflow;
+import gw.ssh.WorkflowTool;
+import gw.utils.BaseTool;
+import gw.utils.RandomString;
+import gw.utils.STATUS;
+import gw.web.GeoweaverController;
 
 
 public class GeoweaverWorkflowTask extends Task {
@@ -66,21 +66,14 @@ public GeoweaverWorkflowTask(String name) {
 		
 		this.name = name;
 		
+		this.history_id = new RandomString(11).nextString();
+		
 	}
 	
 	public String getHistory_id() {
 		return history_id;
 	}
 	
-	@Override
-	public String getName() {
-		return name;
-	}
-	
-	public void setName(String name) {
-		this.name = name;
-	}
-
 
 
 	@Override
@@ -101,7 +94,6 @@ public void initialize(String wid, String mode, String[] hosts, String[] pswds,
 		
 		this.token = token;
 		
-		this.history_id = new RandomString(11).nextString();
 		
 	}
 	
@@ -389,4 +381,10 @@ public void failureCallback(Exception e) {
 
 	}
 
+	@Override
+	public String getName() {
+		// TODO Auto-generated method stub
+		return name;
+	}
+
 }
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/tasks/RunningTaskObserver.java b/src/gw/tasks/RunningTaskObserver.java
similarity index 90%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/tasks/RunningTaskObserver.java
rename to src/gw/tasks/RunningTaskObserver.java
index 3f41a0bb5..4b50705e2 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/tasks/RunningTaskObserver.java
+++ b/src/gw/tasks/RunningTaskObserver.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.tasks;
+package gw.tasks;
 
 import java.util.Observable;
 import java.util.Observer;
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/tasks/Task.java b/src/gw/tasks/Task.java
similarity index 93%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/tasks/Task.java
rename to src/gw/tasks/Task.java
index 2d3d4d29e..8f5fbc810 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/tasks/Task.java
+++ b/src/gw/tasks/Task.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.tasks;
+package gw.tasks;
 
 import java.util.Observable;
 
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/tasks/TaskManager.java b/src/gw/tasks/TaskManager.java
similarity index 92%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/tasks/TaskManager.java
rename to src/gw/tasks/TaskManager.java
index f2493000e..9ed7dd164 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/tasks/TaskManager.java
+++ b/src/gw/tasks/TaskManager.java
@@ -1,13 +1,13 @@
-package edu.gmu.csiss.earthcube.cyberconnector.tasks;
+package gw.tasks;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.web.socket.WebSocketSession;
 
-import edu.gmu.csiss.earthcube.cyberconnector.utils.SysDir;
-import edu.gmu.csiss.earthcube.cyberconnector.workers.Worker;
-import edu.gmu.csiss.earthcube.cyberconnector.workers.WorkerManager;
+import gw.utils.SysDir;
+import gw.workers.Worker;
+import gw.workers.WorkerManager;
 
 /**
  *Class TaskManager.java
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/tasks/TaskSocket.java b/src/gw/tasks/TaskSocket.java
similarity index 97%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/tasks/TaskSocket.java
rename to src/gw/tasks/TaskSocket.java
index 187f3f116..ed5c9d733 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/tasks/TaskSocket.java
+++ b/src/gw/tasks/TaskSocket.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.tasks;
+package gw.tasks;
 
 import java.util.Arrays;
 import java.util.HashMap;
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/tasks/VirtualProductGenerationTask.java b/src/gw/tasks/VirtualProductGenerationTask.java
similarity index 96%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/tasks/VirtualProductGenerationTask.java
rename to src/gw/tasks/VirtualProductGenerationTask.java
index ecf4b102a..35da9df00 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/tasks/VirtualProductGenerationTask.java
+++ b/src/gw/tasks/VirtualProductGenerationTask.java
@@ -1,13 +1,13 @@
-package edu.gmu.csiss.earthcube.cyberconnector.tasks;
+package gw.tasks;
 
 import java.util.Map;
 
 import org.apache.log4j.Logger;
 import org.springframework.web.socket.WebSocketSession;
 
-import edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseBroker;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.SysDir;
+import gw.database.DataBaseBroker;
+import gw.utils.BaseTool;
+import gw.utils.SysDir;
 
 /**
  *Class VirtualProductGenerationTask.java
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/tasks/WaitingTaskObserver.java b/src/gw/tasks/WaitingTaskObserver.java
similarity index 88%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/tasks/WaitingTaskObserver.java
rename to src/gw/tasks/WaitingTaskObserver.java
index cd1aeb7d3..84d1d6235 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/tasks/WaitingTaskObserver.java
+++ b/src/gw/tasks/WaitingTaskObserver.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.tasks;
+package gw.tasks;
 
 import java.util.Observable;
 import java.util.Observer;
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/tools/CheckOrderStatusTool.java b/src/gw/tools/CheckOrderStatusTool.java
similarity index 82%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/tools/CheckOrderStatusTool.java
rename to src/gw/tools/CheckOrderStatusTool.java
index 57abb946e..408f6018a 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/tools/CheckOrderStatusTool.java
+++ b/src/gw/tools/CheckOrderStatusTool.java
@@ -1,6 +1,6 @@
-package edu.gmu.csiss.earthcube.cyberconnector.tools;
+package gw.tools;
 
-import edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation;
+import gw.database.DataBaseOperation;
 
 /**
  *Class CheckOrderStatusTool.java
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/tools/DataR.java b/src/gw/tools/DataR.java
similarity index 94%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/tools/DataR.java
rename to src/gw/tools/DataR.java
index fadaf7110..9edf88506 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/tools/DataR.java
+++ b/src/gw/tools/DataR.java
@@ -1,6 +1,6 @@
-package edu.gmu.csiss.earthcube.cyberconnector.tools;
+package gw.tools;
 
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
+import gw.utils.BaseTool;
 
 /**
  *Class DataR.java
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/tools/FetchProductListTool.java b/src/gw/tools/FetchProductListTool.java
similarity index 83%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/tools/FetchProductListTool.java
rename to src/gw/tools/FetchProductListTool.java
index c2d04239b..522a7cc0f 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/tools/FetchProductListTool.java
+++ b/src/gw/tools/FetchProductListTool.java
@@ -1,11 +1,11 @@
-package edu.gmu.csiss.earthcube.cyberconnector.tools;
+package gw.tools;
 
 import java.util.List;
 
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 
-import edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseBroker;
+import gw.database.DataBaseBroker;
 
 /**
  *Class FetchProductListTool.java
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/tools/GetProductInputDetailsTool.java b/src/gw/tools/GetProductInputDetailsTool.java
similarity index 76%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/tools/GetProductInputDetailsTool.java
rename to src/gw/tools/GetProductInputDetailsTool.java
index 3ef4ac510..57eb2a937 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/tools/GetProductInputDetailsTool.java
+++ b/src/gw/tools/GetProductInputDetailsTool.java
@@ -1,9 +1,9 @@
-package edu.gmu.csiss.earthcube.cyberconnector.tools;
+package gw.tools;
 
 import org.apache.log4j.Logger;
 
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.SysDir;
+import gw.utils.BaseTool;
+import gw.utils.SysDir;
 
 /**
  *Class GetProductInputDetailsTool.java
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/tools/HistoryTool.java b/src/gw/tools/HistoryTool.java
similarity index 73%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/tools/HistoryTool.java
rename to src/gw/tools/HistoryTool.java
index b778ad0e7..9cd3fee3b 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/tools/HistoryTool.java
+++ b/src/gw/tools/HistoryTool.java
@@ -1,9 +1,9 @@
-package edu.gmu.csiss.earthcube.cyberconnector.tools;
+package gw.tools;
 
-import edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation;
-import edu.gmu.csiss.earthcube.cyberconnector.ssh.SSHSession;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController;
+import gw.database.DataBaseOperation;
+import gw.ssh.SSHSession;
+import gw.utils.BaseTool;
+import gw.web.GeoweaverController;
 
 public class HistoryTool {
 	
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/tools/LocalFileTool.java b/src/gw/tools/LocalFileTool.java
similarity index 95%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/tools/LocalFileTool.java
rename to src/gw/tools/LocalFileTool.java
index f06c65989..7ca4b6e4a 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/tools/LocalFileTool.java
+++ b/src/gw/tools/LocalFileTool.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.tools;
+package gw.tools;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -11,11 +11,11 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 
-import edu.gmu.csiss.earthcube.cyberconnector.products.Product;
-import edu.gmu.csiss.earthcube.cyberconnector.search.SearchResponse;
-import edu.gmu.csiss.earthcube.cyberconnector.search.SearchTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.SysDir;
+import gw.products.Product;
+import gw.search.SearchResponse;
+import gw.search.SearchTool;
+import gw.utils.BaseTool;
+import gw.utils.SysDir;
 
 public class LocalFileTool {
 	
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/tools/PlaceOrderTool.java b/src/gw/tools/PlaceOrderTool.java
similarity index 92%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/tools/PlaceOrderTool.java
rename to src/gw/tools/PlaceOrderTool.java
index 32f84a61a..5bd32c7cc 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/tools/PlaceOrderTool.java
+++ b/src/gw/tools/PlaceOrderTool.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.tools;
+package gw.tools;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -7,12 +7,12 @@
 
 import org.apache.log4j.Logger;
 
-import edu.gmu.csiss.earthcube.cyberconnector.order.CronRunnable;
-import edu.gmu.csiss.earthcube.cyberconnector.order.KillCronRunnable;
-import edu.gmu.csiss.earthcube.cyberconnector.tasks.TaskManager;
-import edu.gmu.csiss.earthcube.cyberconnector.tasks.VirtualProductGenerationTask;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.RandomString;
+import gw.order.CronRunnable;
+import gw.order.KillCronRunnable;
+import gw.tasks.TaskManager;
+import gw.tasks.VirtualProductGenerationTask;
+import gw.utils.BaseTool;
+import gw.utils.RandomString;
 import it.sauronsoftware.cron4j.Scheduler;
 
 /**
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/tools/QueryOrderStatusTool.java b/src/gw/tools/QueryOrderStatusTool.java
similarity index 87%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/tools/QueryOrderStatusTool.java
rename to src/gw/tools/QueryOrderStatusTool.java
index effaa6d46..09d5a200d 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/tools/QueryOrderStatusTool.java
+++ b/src/gw/tools/QueryOrderStatusTool.java
@@ -1,11 +1,11 @@
-package edu.gmu.csiss.earthcube.cyberconnector.tools;
+package gw.tools;
 
 import java.util.List;
 
 import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
 
-import edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseBroker;
+import gw.database.DataBaseBroker;
 
 /**
  *Class QueryOrderStatusTool.java
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/user/Token.java b/src/gw/user/Token.java
similarity index 85%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/user/Token.java
rename to src/gw/user/Token.java
index 65c3fdb1e..6998ebb3d 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/user/Token.java
+++ b/src/gw/user/Token.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.user;
+package gw.user;
 
 public class Token {
 	String token;
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/user/User.java b/src/gw/user/User.java
similarity index 93%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/user/User.java
rename to src/gw/user/User.java
index ee2fa59d0..d874d1874 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/user/User.java
+++ b/src/gw/user/User.java
@@ -1,10 +1,10 @@
-package edu.gmu.csiss.earthcube.cyberconnector.user;
+package gw.user;
 
 import java.util.List;
 
-import edu.gmu.csiss.earthcube.cyberconnector.order.Order;
-import edu.gmu.csiss.earthcube.cyberconnector.products.Product;
-import edu.gmu.csiss.earthcube.cyberconnector.services.Service;
+import gw.order.Order;
+import gw.products.Product;
+import gw.services.Service;
 
 /**
 *Class User.java
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/user/UserTool.java b/src/gw/user/UserTool.java
similarity index 97%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/user/UserTool.java
rename to src/gw/user/UserTool.java
index 2b6062718..9bf46a065 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/user/UserTool.java
+++ b/src/gw/user/UserTool.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.user;
+package gw.user;
 
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
@@ -18,13 +18,13 @@
 
 import org.apache.log4j.Logger;
 
-import edu.gmu.csiss.earthcube.cyberconnector.database.DataBaseOperation;
-import edu.gmu.csiss.earthcube.cyberconnector.order.Order;
-import edu.gmu.csiss.earthcube.cyberconnector.products.Product;
-import edu.gmu.csiss.earthcube.cyberconnector.services.Service;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.Message;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.SysDir;
+import gw.database.DataBaseOperation;
+import gw.order.Order;
+import gw.products.Product;
+import gw.services.Service;
+import gw.utils.BaseTool;
+import gw.utils.Message;
+import gw.utils.SysDir;
 
 /**
 *Class UserTool.java
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/utils/BaseTool.java b/src/gw/utils/BaseTool.java
similarity index 99%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/utils/BaseTool.java
rename to src/gw/utils/BaseTool.java
index 845dbbf81..ae00453c9 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/utils/BaseTool.java
+++ b/src/gw/utils/BaseTool.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.utils;
+package gw.utils;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/utils/EmailValidator.java b/src/gw/utils/EmailValidator.java
similarity index 93%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/utils/EmailValidator.java
rename to src/gw/utils/EmailValidator.java
index b80342f15..572a6f098 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/utils/EmailValidator.java
+++ b/src/gw/utils/EmailValidator.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.utils;
+package gw.utils;
 /**
  *Class EmailValidator.java
  *@author Ziheng Sun
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/utils/Message.java b/src/gw/utils/Message.java
similarity index 96%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/utils/Message.java
rename to src/gw/utils/Message.java
index b10b2878e..6be228baa 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/utils/Message.java
+++ b/src/gw/utils/Message.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.utils;
+package gw.utils;
 /**
 *Class Message.java
 *@author Ziheng Sun
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/utils/MyHttpUtils.java b/src/gw/utils/MyHttpUtils.java
similarity index 99%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/utils/MyHttpUtils.java
rename to src/gw/utils/MyHttpUtils.java
index 4ccb734c7..d9032519d 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/utils/MyHttpUtils.java
+++ b/src/gw/utils/MyHttpUtils.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.utils;
+package gw.utils;
 
 import java.net.*;
 import org.apache.commons.codec.binary.Base64;
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/utils/RandomString.java b/src/gw/utils/RandomString.java
similarity index 95%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/utils/RandomString.java
rename to src/gw/utils/RandomString.java
index a103acc9b..1eb661187 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/utils/RandomString.java
+++ b/src/gw/utils/RandomString.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.utils;
+package gw.utils;
 
 import java.util.Random;
 
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/utils/SOAPClient.java b/src/gw/utils/SOAPClient.java
similarity index 99%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/utils/SOAPClient.java
rename to src/gw/utils/SOAPClient.java
index 7a3e3f3ec..798b305d6 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/utils/SOAPClient.java
+++ b/src/gw/utils/SOAPClient.java
@@ -3,7 +3,7 @@
  * and open the template in the editor.
  */
 
-package edu.gmu.csiss.earthcube.cyberconnector.utils;
+package gw.utils;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/utils/STATUS.java b/src/gw/utils/STATUS.java
similarity index 51%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/utils/STATUS.java
rename to src/gw/utils/STATUS.java
index 882b74fca..e61507edf 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/utils/STATUS.java
+++ b/src/gw/utils/STATUS.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.utils;
+package gw.utils;
 
 public enum STATUS {
 	
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/utils/SpatialExtentValidator.java b/src/gw/utils/SpatialExtentValidator.java
similarity index 97%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/utils/SpatialExtentValidator.java
rename to src/gw/utils/SpatialExtentValidator.java
index fa8b88499..959cc56de 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/utils/SpatialExtentValidator.java
+++ b/src/gw/utils/SpatialExtentValidator.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.utils;
+package gw.utils;
 /**
  *Class SpatialExtentValidator.java
  *@author Ziheng Sun
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/utils/SysDir.java b/src/gw/utils/SysDir.java
similarity index 98%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/utils/SysDir.java
rename to src/gw/utils/SysDir.java
index eeb8ef6b8..12b77c473 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/utils/SysDir.java
+++ b/src/gw/utils/SysDir.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.utils;
+package gw.utils;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/utils/TimeExtentValidator.java b/src/gw/utils/TimeExtentValidator.java
similarity index 96%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/utils/TimeExtentValidator.java
rename to src/gw/utils/TimeExtentValidator.java
index 508732b05..3370aee5f 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/utils/TimeExtentValidator.java
+++ b/src/gw/utils/TimeExtentValidator.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.utils;
+package gw.utils;
 
 import java.util.Date;
 
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/utils/WMSUtils.java b/src/gw/utils/WMSUtils.java
similarity index 99%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/utils/WMSUtils.java
rename to src/gw/utils/WMSUtils.java
index 72b4898af..1424abca2 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/utils/WMSUtils.java
+++ b/src/gw/utils/WMSUtils.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.utils;
+package gw.utils;
 
 import java.io.StringReader;
 import java.io.StringWriter;
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/web/GeoweaverController.java b/src/gw/web/GeoweaverController.java
similarity index 95%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/web/GeoweaverController.java
rename to src/gw/web/GeoweaverController.java
index c6caf4499..509a8b9ff 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/web/GeoweaverController.java
+++ b/src/gw/web/GeoweaverController.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.web;
+package gw.web;
 
 
 import java.io.File;
@@ -25,18 +25,18 @@
 import org.springframework.web.bind.support.SessionStatus;
 import org.springframework.web.context.request.WebRequest;
 
-import edu.gmu.csiss.earthcube.cyberconnector.search.GWSearchTool;
-import edu.gmu.csiss.earthcube.cyberconnector.ssh.FileTool;
-import edu.gmu.csiss.earthcube.cyberconnector.ssh.HostTool;
-import edu.gmu.csiss.earthcube.cyberconnector.ssh.ProcessTool;
-import edu.gmu.csiss.earthcube.cyberconnector.ssh.RSAEncryptTool;
-import edu.gmu.csiss.earthcube.cyberconnector.ssh.SSHSession;
-import edu.gmu.csiss.earthcube.cyberconnector.ssh.SSHSessionImpl;
-import edu.gmu.csiss.earthcube.cyberconnector.ssh.SSHSessionManager;
-import edu.gmu.csiss.earthcube.cyberconnector.ssh.WorkflowTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.RandomString;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.SysDir;
+import gw.search.GWSearchTool;
+import gw.ssh.FileTool;
+import gw.ssh.HostTool;
+import gw.ssh.ProcessTool;
+import gw.ssh.RSAEncryptTool;
+import gw.ssh.SSHSession;
+import gw.ssh.SSHSessionImpl;
+import gw.ssh.SSHSessionManager;
+import gw.ssh.WorkflowTool;
+import gw.utils.BaseTool;
+import gw.utils.RandomString;
+import gw.utils.SysDir;
 
 /**
  * 
@@ -219,6 +219,12 @@ public void destroy() {
 		
 	}
 	
+	/**
+	 * Get history of process or workflow
+	 * @param model
+	 * @param request
+	 * @return
+	 */
 	@RequestMapping(value = "/log", method = RequestMethod.POST)
     public @ResponseBody String one_history(ModelMap model, WebRequest request){
 		
@@ -564,7 +570,7 @@ public void destroy() {
 			
 			String[] passwords = RSAEncryptTool.getPasswords(encrypted_password, session.getId());
 			
-			resp = WorkflowTool.execute(id, mode, hosts, passwords, null);
+			resp = WorkflowTool.execute(id, mode, hosts, passwords, session.getId());
 			
 		}catch(Exception e) {
 			
@@ -674,7 +680,7 @@ public void destroy() {
 			
 			String password = RSAEncryptTool.getPassword(encrypted_password, session.getId());
 			
-			resp = ProcessTool.execute(pid, hid, password, null, false, bin, pyenv, basedir);
+			resp = ProcessTool.execute(pid, hid, password, session.getId(), false, bin, pyenv, basedir);
 			
 		}catch(Exception e) {
 			
@@ -1088,7 +1094,9 @@ public String sshterminal(ModelMap model, WebRequest request, SessionStatus stat
         	
         	String password = RSAEncryptTool.getPassword(encrypted, session.getId());
         	
-        	String token = request.getParameter("token");
+//        	String token = request.getParameter("token");
+        	
+        	String token = session.getId(); //use session id as token
         	
 //        	if(token!=null && sshSessionManager.sessionsByToken.get(token)!=null) {
 //        		
@@ -1096,7 +1104,7 @@ public String sshterminal(ModelMap model, WebRequest request, SessionStatus stat
 //        		
 //        	}else {
         		
-        		token = new RandomString(16).nextString(); //token must be assigned by server in case somebody else hijacks it
+//        		token = new RandomString(16).nextString(); //token must be assigned by server in case somebody else hijacks it
             	
             	SSHSession sshSession = new SSHSessionImpl();
             	
@@ -1108,7 +1116,7 @@ public String sshterminal(ModelMap model, WebRequest request, SessionStatus stat
                 
 //                sshSessionManager.sessionsByUsername.put(host+"-"+username, sshSession);
                 
-                sshSessionManager.sessionsByToken.put(token, sshSession); //disposable token, can only be used for once
+                sshSessionManager.sessionsByToken.put(token, sshSession); //token is session id
         		
 //        	}
         	
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/web/JupyterController.java b/src/gw/web/JupyterController.java
similarity index 99%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/web/JupyterController.java
rename to src/gw/web/JupyterController.java
index aee366268..4ff3b7821 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/web/JupyterController.java
+++ b/src/gw/web/JupyterController.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.web;
+package gw.web;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -35,7 +35,7 @@
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.context.request.WebRequest;
 
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
+import gw.utils.BaseTool;
 
 @Controller 
 public class JupyterController {
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/web/PortalController.java b/src/gw/web/PortalController.java
similarity index 94%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/web/PortalController.java
rename to src/gw/web/PortalController.java
index a97e7df65..5bf253765 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/web/PortalController.java
+++ b/src/gw/web/PortalController.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.web;
+package gw.web;
 
 import javax.servlet.http.HttpSession;
 
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/web/UserController.java b/src/gw/web/UserController.java
similarity index 96%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/web/UserController.java
rename to src/gw/web/UserController.java
index 8c5f4434b..2fe1b9e5a 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/web/UserController.java
+++ b/src/gw/web/UserController.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.web;
+package gw.web;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -24,21 +24,21 @@
 import org.springframework.web.bind.support.SessionStatus;
 import org.springframework.web.context.request.WebRequest;
 
-import edu.gmu.csiss.earthcube.cyberconnector.order.Order;
-import edu.gmu.csiss.earthcube.cyberconnector.order.OrderTool;
-import edu.gmu.csiss.earthcube.cyberconnector.products.DeleteProductTool;
-import edu.gmu.csiss.earthcube.cyberconnector.products.LikeProductTool;
-import edu.gmu.csiss.earthcube.cyberconnector.products.Product;
-import edu.gmu.csiss.earthcube.cyberconnector.products.RetrieveProductTool;
-import edu.gmu.csiss.earthcube.cyberconnector.search.SearchRequest;
-import edu.gmu.csiss.earthcube.cyberconnector.services.QueryServiceTool;
-import edu.gmu.csiss.earthcube.cyberconnector.services.RegisterServiceTool;
-import edu.gmu.csiss.earthcube.cyberconnector.services.Service;
-import edu.gmu.csiss.earthcube.cyberconnector.tools.PlaceOrderTool;
-import edu.gmu.csiss.earthcube.cyberconnector.user.User;
-import edu.gmu.csiss.earthcube.cyberconnector.user.UserTool;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.Message;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.RandomString;
+import gw.order.Order;
+import gw.order.OrderTool;
+import gw.products.DeleteProductTool;
+import gw.products.LikeProductTool;
+import gw.products.Product;
+import gw.products.RetrieveProductTool;
+import gw.search.SearchRequest;
+import gw.services.QueryServiceTool;
+import gw.services.RegisterServiceTool;
+import gw.services.Service;
+import gw.tools.PlaceOrderTool;
+import gw.user.User;
+import gw.user.UserTool;
+import gw.utils.Message;
+import gw.utils.RandomString;
 
 
 /**
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/workers/Worker.java b/src/gw/workers/Worker.java
similarity index 92%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/workers/Worker.java
rename to src/gw/workers/Worker.java
index 39aae43c4..1067e71b0 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/workers/Worker.java
+++ b/src/gw/workers/Worker.java
@@ -1,9 +1,9 @@
-package edu.gmu.csiss.earthcube.cyberconnector.workers;
+package gw.workers;
 
 import java.util.concurrent.TimeUnit;
 
-import edu.gmu.csiss.earthcube.cyberconnector.tasks.Task;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.RandomString;
+import gw.tasks.Task;
+import gw.utils.RandomString;
 
 /**
  *Class Worker.java
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/workers/WorkerManager.java b/src/gw/workers/WorkerManager.java
similarity index 92%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/workers/WorkerManager.java
rename to src/gw/workers/WorkerManager.java
index d2781753f..6b1939d96 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/workers/WorkerManager.java
+++ b/src/gw/workers/WorkerManager.java
@@ -1,12 +1,12 @@
-package edu.gmu.csiss.earthcube.cyberconnector.workers;
+package gw.workers;
 
 import java.util.ArrayList;
 import java.util.List;
 
 
-import edu.gmu.csiss.earthcube.cyberconnector.tasks.Task;
-import edu.gmu.csiss.earthcube.cyberconnector.tasks.TaskManager;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.SysDir;
+import gw.tasks.Task;
+import gw.tasks.TaskManager;
+import gw.utils.SysDir;
 
 /**
  *Class WorkerManager.java
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/workers/WorkerObserver.java b/src/gw/workers/WorkerObserver.java
similarity index 86%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/workers/WorkerObserver.java
rename to src/gw/workers/WorkerObserver.java
index 78f96e979..6412e8667 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/workers/WorkerObserver.java
+++ b/src/gw/workers/WorkerObserver.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.workers;
+package gw.workers;
 
 import java.util.Observable;
 import java.util.Observer;
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ws/client/Java2JupyterClientDialog.java b/src/gw/ws/client/Java2JupyterClientDialog.java
similarity index 87%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/ws/client/Java2JupyterClientDialog.java
rename to src/gw/ws/client/Java2JupyterClientDialog.java
index d990c0051..61f5de703 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ws/client/Java2JupyterClientDialog.java
+++ b/src/gw/ws/client/Java2JupyterClientDialog.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.ws.client;
+package gw.ws.client;
 
 import java.awt.BorderLayout;
 import java.awt.FlowLayout;
@@ -62,10 +62,10 @@ Map<String, List<String>> getHeaders(){
       vals.add("13");
       headers.put("Sec-WebSocket-Version", vals);
       vals.clear();
-      vals.add("JSESSIONID=6A76ED20085E0D3F2C56248F370D765C; username-localhost-8888=\"2|1:0|10:1589056727|23:username-localhost-8888|44:OTc5NGFkYjk5Mjc0NGZhODk4YjdlZTljMTdlYjhkYzg=|2b129b076ea248da7bb60b67ef5215ace4e1f22d5b8357892740daf831011afb\"; _xsrf=2|71c72b4a|edbb6345b2cfe9820c5f7ae7bbb029af|1589331447");
+      vals.add("JSESSIONID=B6740B35283A0081A0A75BEFD3CE9265; _xsrf=2|56aa5ecc|8c1e5470fb6844ba80e26ca0f3fb00ac|1592420813; username-localhost-8888=\"2|1:0|10:1592420823|23:username-localhost-8888|44:YmJlOWU4NTljMjEwNGQ2YTllNDJhNDZlYzBmNDBkZTU=|6b6e1012a25db4c8d9191921dd9dfd92290eafdecd171e6b4fad2678ab6cfaf3\"");
       headers.put("Cookie", vals);
       vals.clear();
-      vals.add("cu+bm2FWa4WMw21AoK848Q==");
+      vals.add("FI1AraAMT7iChOkIzp2tfA==");
       headers.put("Sec-WebSocket-Key", vals);
       vals.clear();
       vals.add("permessage-deflate; client_max_window_bits");
@@ -100,7 +100,9 @@ public Java2JupyterClientDialog() throws Exception {
       scroll.setViewportView(serverMessageText);
       add(scroll, BorderLayout.CENTER);
       
-      String wsurl = "ws://localhost:8080/Geoweaver/shell-socket";
+//      String wsurl = "ws://localhost:8080/Geoweaver/shell-socket";
+      
+      String wsurl = "ws://localhost:8080/Geoweaver/jupyter-socket/api/kernels/8b7e9d57-c83b-4449-91d8-c0486c99c389/channels?session_id=e792c1994197490d8c8780dac70d3d07";
       
       client = new Java2JupyterClientEndpoint(new URI(wsurl), null, getHeaders());
       
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ws/client/Java2JupyterClientEndpoint.java b/src/gw/ws/client/Java2JupyterClientEndpoint.java
similarity index 97%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/ws/client/Java2JupyterClientEndpoint.java
rename to src/gw/ws/client/Java2JupyterClientEndpoint.java
index 755f93032..636dc8175 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ws/client/Java2JupyterClientEndpoint.java
+++ b/src/gw/ws/client/Java2JupyterClientEndpoint.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.ws.client;
+package gw.ws.client;
 
 import java.io.IOException;
 import java.net.URI;
@@ -19,7 +19,7 @@
 
 import org.apache.log4j.Logger;
 
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
+import gw.utils.BaseTool;
 
 @ClientEndpoint
 public class Java2JupyterClientEndpoint 
diff --git a/src/gw/ws/client/JupyterWebSocketClientConfig.java b/src/gw/ws/client/JupyterWebSocketClientConfig.java
new file mode 100644
index 000000000..5455f9904
--- /dev/null
+++ b/src/gw/ws/client/JupyterWebSocketClientConfig.java
@@ -0,0 +1,8 @@
+package gw.ws.client;
+
+
+public class JupyterWebSocketClientConfig {
+	
+	
+
+}
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ws/server/ShellServlet.java b/src/gw/ws/server/CommandServlet.java
similarity index 93%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/ws/server/ShellServlet.java
rename to src/gw/ws/server/CommandServlet.java
index 996173c5a..093f91e6d 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ws/server/ShellServlet.java
+++ b/src/gw/ws/server/CommandServlet.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.ws.server;
+package gw.ws.server;
 
 import java.io.IOException;
 import java.net.URI;
@@ -19,15 +19,16 @@
 import javax.websocket.server.ServerEndpoint;
 
 import org.apache.log4j.Logger;
+import org.apache.tomcat.websocket.WsSession;
 import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.context.request.WebRequest;
 import org.springframework.web.socket.TextMessage;
 import org.springframework.web.socket.WebSocketSession;
 
-import edu.gmu.csiss.earthcube.cyberconnector.ssh.SSHSession;
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.web.GeoweaverController;
+import gw.ssh.SSHSession;
+import gw.utils.BaseTool;
+import gw.web.GeoweaverController;
 
 /**
  * 
@@ -37,10 +38,10 @@
  *
  */
 //ws://localhost:8080/geoweaver-shell-socket
-@ServerEndpoint(value = "/shell-socket")
-public class ShellServlet {
+@ServerEndpoint(value = "/command-socket")
+public class CommandServlet {
 	
-	Logger logger = Logger.getLogger(ShellServlet.class);
+	Logger logger = Logger.getLogger(CommandServlet.class);
 	
 	private Session wsSession;
 	
@@ -59,7 +60,11 @@ public void open(Session session, EndpointConfig config) {
 			
 			this.wsSession = session;
 			
-			peers.put(session.getId(), session);
+			WsSession wss = (WsSession) session;
+			
+			System.out.println("Web Socket Session ID:" + wss.getHttpSessionId());
+			
+			peers.put(wss.getHttpSessionId(), session);
 			
 		} catch (Exception e) {
 			
@@ -243,7 +248,7 @@ public void close(final Session session) {
     }
     
     
-    protected static javax.websocket.Session findSessionById(String sessionid) {
+    public static javax.websocket.Session findSessionById(String sessionid) {
         if (peers.containsKey(sessionid)) {
             return peers.get(sessionid);
         }
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ws/server/JupyterRedirectServerConfig.java b/src/gw/ws/server/JupyterRedirectServerConfig.java
similarity index 96%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/ws/server/JupyterRedirectServerConfig.java
rename to src/gw/ws/server/JupyterRedirectServerConfig.java
index 3962dd723..5ef17d4ce 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ws/server/JupyterRedirectServerConfig.java
+++ b/src/gw/ws/server/JupyterRedirectServerConfig.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.ws.server;
+package gw.ws.server;
 
 import javax.servlet.http.HttpSession;
 import javax.websocket.HandshakeResponse;
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ws/server/JupyterRedirectServlet.java b/src/gw/ws/server/JupyterRedirectServlet.java
similarity index 93%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/ws/server/JupyterRedirectServlet.java
rename to src/gw/ws/server/JupyterRedirectServlet.java
index e67ece66a..fba23b41e 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ws/server/JupyterRedirectServlet.java
+++ b/src/gw/ws/server/JupyterRedirectServlet.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.ws.server;
+package gw.ws.server;
 
 import java.io.IOException;
 import java.net.URI;
@@ -20,8 +20,8 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.context.request.WebRequest;
 
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
-import edu.gmu.csiss.earthcube.cyberconnector.ws.client.Java2JupyterClientEndpoint;
+import gw.utils.BaseTool;
+import gw.ws.client.Java2JupyterClientEndpoint;
 
 /**
  * 
diff --git a/src/gw/ws/server/TerminalServlet.java b/src/gw/ws/server/TerminalServlet.java
new file mode 100644
index 000000000..3133fe32d
--- /dev/null
+++ b/src/gw/ws/server/TerminalServlet.java
@@ -0,0 +1,196 @@
+package gw.ws.server;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+import javax.websocket.EndpointConfig;
+import javax.websocket.OnClose;
+import javax.websocket.OnError;
+import javax.websocket.OnMessage;
+import javax.websocket.OnOpen;
+import javax.websocket.Session;
+import javax.websocket.server.PathParam;
+import javax.websocket.server.ServerEndpoint;
+
+import org.apache.log4j.Logger;
+import org.apache.tomcat.websocket.WsSession;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpHeaders;
+import org.springframework.web.context.request.WebRequest;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketSession;
+
+import gw.ssh.SSHSession;
+import gw.utils.BaseTool;
+import gw.web.GeoweaverController;
+
+/**
+ * 
+ * This works and will be used as the only websocket channel for transferring all the SSH related message
+ * 
+ * @author JensenSun
+ *
+ */
+//ws://localhost:8080/geoweaver-shell-socket
+@ServerEndpoint(value = "/terminal-socket")
+public class TerminalServlet {
+	
+	Logger logger = Logger.getLogger(TerminalServlet.class);
+	
+	private Session wsSession;
+	
+	private List<String> logoutCommands = Arrays.asList(new String[]{"logout", "quit"});
+    
+    static Map<String, Session> peers =new HashMap();
+	
+//    private HttpSession httpSession;
+	
+	@OnOpen
+    public void open(Session session, EndpointConfig config) {
+		
+		try {
+			
+			logger.info("websocket channel openned");
+			
+			this.wsSession = session;
+			
+			WsSession wss = (WsSession) session;
+			
+			System.out.println("Web Socket Session ID:" + wss.getHttpSessionId());
+			
+			peers.put(wss.getHttpSessionId(), session);
+			
+		} catch (Exception e) {
+			
+			e.printStackTrace();
+			
+		}
+		
+    }
+
+    @OnError
+    public void error(final Session session, final Throwable throwable) throws Throwable {
+        
+    	logger.error("websocket channel error" + throwable.getLocalizedMessage());
+    	
+    	throw throwable;
+    	
+    }
+
+    @OnMessage
+    public void echo(String message, Session session) {
+        
+    	try {
+    		
+			logger.info("Received message: " + message);
+        	
+//        	session.getBasicRemote().sendText("Message received and Geoweaver Shell Socket Send back: " + message);
+        	
+            SSHSession sshSession = GeoweaverController.sshSessionManager.sessionsByWebsocketID.get(session.getId());
+            
+            if (sshSession == null) {
+                
+            	logger.info("linking " + session.getId() + message);
+                
+                // TODO is there a better way to do this?
+                // Can the client send the websocket session id and username in a REST call to link them up?
+                sshSession = GeoweaverController.sshSessionManager.sessionsByToken.get(message);
+                
+//                if(sshSession!=null&&sshSession.getSSHInput().ready()) {
+                if(sshSession!=null) {
+                	
+//                	sshSession.setWebSocketSession(session);
+                    
+                	GeoweaverController.sshSessionManager.sessionsByWebsocketID.put(session.getId(), sshSession);
+                	
+//                	GeoweaverController.sshSessionManager.sessionsByToken.remove(messageText); //remove session, a token can only be used once
+                    
+                }else {
+                	
+                	session.getBasicRemote().sendText("No SSH connection is active");
+                	
+//                	session.close();
+                	
+                }
+                
+            } else {
+            	
+                logger.debug("message in " + session.getId() + message);
+                
+                sshSession.getSSHOutput().write((message + '\n').getBytes());
+                
+                sshSession.getSSHOutput().flush();
+                
+//    			//send Ctrl + C command to the SSH to close the connection
+//    			
+//    			cmd.getOutputStream().write(3);
+//    			
+//    		    cmd.getOutputStream().flush();
+                
+                // if we receive a valid logout command, then close the websocket session.
+                // the system will logout and tidy itself up...
+                
+                if (logoutCommands.contains(message.trim().toLowerCase())) {
+                    
+                	logger.info("valid logout command received " +  message);
+                	
+                	sshSession.logout();
+                	
+//                	session.close(); //close WebSocket session. Notice: the SSHSession will continue to run.
+                	
+                }
+                
+            }
+            
+    	}catch(Exception e) {
+    		
+    		e.printStackTrace();
+    		
+    	}
+    	
+    }
+
+    @OnClose
+    public void close(final Session session) {
+    	
+		try {
+			
+    		logger.error("Geoweaver Shell Channel closed.");
+    		
+    		logger.debug("websocket session closed:" + session.getId());
+    		
+            //close SSH session
+            if(GeoweaverController.sshSessionManager!=null) {
+            	
+            	SSHSession sshSession = GeoweaverController.sshSessionManager.sessionsByWebsocketID.get(session.getId());
+                if (sshSession != null && sshSession.isShell()) { //only close when it is shell
+                    sshSession.logout();
+                }
+                GeoweaverController.sshSessionManager.sessionsByWebsocketID.remove(session.getId());
+            	
+            }
+            peers.remove(session.getId());
+        	
+		} catch (Exception e) {
+			
+			e.printStackTrace();
+			
+		}
+    	
+    }
+    
+    
+    public static javax.websocket.Session findSessionById(String sessionid) {
+        if (peers.containsKey(sessionid)) {
+            return peers.get(sessionid);
+        }
+        return null;
+    }
+
+}
diff --git a/src/edu/gmu/csiss/earthcube/cyberconnector/ws/server/WorkflowServlet.java b/src/gw/ws/server/WorkflowServlet.java
similarity index 94%
rename from src/edu/gmu/csiss/earthcube/cyberconnector/ws/server/WorkflowServlet.java
rename to src/gw/ws/server/WorkflowServlet.java
index 6adde9673..2280cb548 100644
--- a/src/edu/gmu/csiss/earthcube/cyberconnector/ws/server/WorkflowServlet.java
+++ b/src/gw/ws/server/WorkflowServlet.java
@@ -1,4 +1,4 @@
-package edu.gmu.csiss.earthcube.cyberconnector.ws.server;
+package gw.ws.server;
 
 import java.io.IOException;
 import java.net.URI;
@@ -20,7 +20,7 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.context.request.WebRequest;
 
-import edu.gmu.csiss.earthcube.cyberconnector.utils.BaseTool;
+import gw.utils.BaseTool;
 
 /**
  *