From: mka <mka@opencascade.com>
Date: Thu, 12 Dec 2013 14:48:20 +0000 (+0000)
Subject: Update uses list functionality
X-Git-Tag: V1_0_0~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=92211fb733030a36267ccc496d9ed508a4f2b7fa;p=tools%2Fsiman.git

Update uses list functionality
---

diff --git a/Workspace/Siman/WebContent/study/importDocument.jsp b/Workspace/Siman/WebContent/study/importDocument.jsp
index 3a715bd..ee3f104 100644
--- a/Workspace/Siman/WebContent/study/importDocument.jsp
+++ b/Workspace/Siman/WebContent/study/importDocument.jsp
@@ -42,6 +42,19 @@ $(document).ready(function () {
 	   }
 	});
 });
+
+$(document).ready(function () {
+	$("#bring #documentType").change(function () {		
+		 $.ajax({
+			 type: 'POST',
+		 	 url:'update-uses.action?documentType=' + $('#documentType').val(),
+		 	 success: function(data){ 		 
+		 		$("#bring .dynamic").remove();
+		 	 	$(data).insertBefore("#bring .inner");		 	 	
+		 	 }		 	 
+		 });		 
+	}
+)}).change();
 </script>
 
 <!-- Import dialog
@@ -85,19 +98,20 @@ $(document).ready(function () {
 		<td><s:textfield theme="simple" id="documentName"
 			name="documentName" disabled="true" /></td>
 	</tr>
-	<s:if test="defaultDocumentUses.size > 0">
-		<tr>
-			<td align="right"><s:text name="label.uses" />:</td>
-		</tr>
-		<s:iterator value="defaultDocumentUses">
-			<tr>
-				<td align="right"><input type="checkbox" name="uses"
-					value="<s:property value="index"/>" checked></td>
-				<td><s:property value="title" /></td>
-			</tr>
-		</s:iterator>
-	</s:if>
-	<tr height="10">
+				<s:if test="defaultDocumentUses.size > 0">
+				<tr class="dynamic">
+					<td align="right"><s:text name="label.uses" />:</td>
+				</tr>
+				<s:iterator value="defaultDocumentUses">
+					<tr class=dynamic>
+						<td align="right"><input type="checkbox" name="uses"
+							value="<s:property value="index"/>" checked></td>
+						<td><s:property value="title" /></td>
+					</tr>
+				</s:iterator>
+			</s:if>
+
+			<tr height="10" class ="inner">
 		<td></td>
 	</tr>
 	<tr>
diff --git a/Workspace/Siman/WebContent/study/usesList.jsp b/Workspace/Siman/WebContent/study/usesList.jsp
new file mode 100644
index 0000000..d426c22
--- /dev/null
+++ b/Workspace/Siman/WebContent/study/usesList.jsp
@@ -0,0 +1,17 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+	pageEncoding="ISO-8859-1"%>
+<%@ taglib prefix="s" uri="/struts-tags"%>
+
+<s:if test="defaultDocumentUses.size > 0">
+	<tr class = dynamic>
+		<td align="right"><s:text name="label.uses" />:</td>
+	</tr>
+	<s:iterator value="defaultDocumentUses">
+		<tr class = dynamic>
+			<td align="right"><input type="checkbox" name="uses"
+				value="<s:property value="index"/>" checked></td>
+			<td><s:property value="title" /></td>
+		</tr>
+	</s:iterator>
+</s:if>
+
diff --git a/Workspace/Siman/src/org/splat/simer/ImportDocumentAction.java b/Workspace/Siman/src/org/splat/simer/ImportDocumentAction.java
index 3381631..ed307e2 100644
--- a/Workspace/Siman/src/org/splat/simer/ImportDocumentAction.java
+++ b/Workspace/Siman/src/org/splat/simer/ImportDocumentAction.java
@@ -59,6 +59,21 @@ public class ImportDocumentAction extends BaseUploadDocumentAction {
 	 */
 	private DocumentTypeService _documentTypeService;
 
+	/**
+	 * Update uses documents list if chosen new type of import document.
+	 * @return SUCCESS
+	 */
+	public final  String updateUsesList() {
+		_mystudy = getOpenStudy();
+		_defuses = new ArrayList<Document>();
+		_deftype = getDocumentTypeService().selectType(
+				(int) _documentType);
+		if (_deftype != null) {
+			setupDefaultUses(_deftype);
+		}
+		return SUCCESS;
+	}
+
 	/**
 	 * Initialize the operation.
 	 * 
@@ -446,4 +461,4 @@ public class ImportDocumentAction extends BaseUploadDocumentAction {
 	public List<Boolean> getReviewable() {
 		return _reviewable;
 	}
-}
\ No newline at end of file
+}
diff --git a/Workspace/Siman/src/struts.xml b/Workspace/Siman/src/struts.xml
index 5b0a0c7..add83ea 100644
--- a/Workspace/Siman/src/struts.xml
+++ b/Workspace/Siman/src/struts.xml
@@ -546,6 +546,12 @@
 			</result>
 			<result name="error" type="tiles">page.importerror</result>
 		</action>
+		<action name="update-uses" class="importDocumentAction"
+			method="updateUsesList">
+			<result name="success"  type="dispatcher">
+				/study/usesList.jsp
+			</result>
+		</action>
 		<action name="valid-import" class="importDocumentAction"
 			method="import">
             <interceptor-ref name="simanBasicStack"/>