Merge branch 'etl_0.5'

src-modules/module/etl/conf/etl.xml

@@ -49,14 +49,14 @@ rightname="CS_BIA_STANDARDREPORTS_ADMIN[ETL]" />
 			notnull="true" description="Unique Name" />
 		<column name="caption" type="VARCHAR" size="255" default=""
 			notnull="" description="Bezeichnung" />
+		<column name="systeminfo_id" type="INTEGER" size="" default=""
+			notnull="true" description="Komponente" />
 		<column name="job_export" type="VARCHAR" size="255" default=""
 			notnull="" description="Job zum Exportieren" />
 		<column name="job_import" type="VARCHAR" size="255" default=""
 			notnull="" description="Job zum Importieren" />
 		<column name="job_param_ui" type="VARCHAR" size="255" default=""
 			notnull="" description="Identifikator im Job" />
-		<column name="systeminfo_id" type="INTEGER" size="" default=""
-			notnull="true" description="Komponente" />
 		<column name="maskeninfo_id" type="INTEGER" size="" default=""
 			notnull="false" description="Maske (für Suche/Auswahl)" />
 		<column name="felderinfo_id" type="INTEGER" size="" default=""

superx/edit/etl/etl_manager.jsp

@@ -12,11 +12,12 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>ETL Manager</title>
+    <title>Job Management</title>
 
 <link rel="stylesheet" href="../../style/dbforms.css" />
 <link rel="stylesheet" href="../../style/bulma.css" />
     <link rel="stylesheet" href="../../style/bulma-tooltip.min.css" />
+   <!-- <link rel="stylesheet" href="../../style/sx_common.css" />-->
     <script type="text/javascript" src="/superx/xml/js/memtext/sx_functions.js"></script>
     <script type="text/javascript" src="/superx/xml/js/memtext/nd_functions.js"></script>
 </head>
@@ -39,7 +40,7 @@ var xhttp = new XMLHttpRequest();
 
 function getTabMenu(srctype,caption,i,jobExportUniquename,jobImportUniquename,maskeninfo_tid,felderinfo_tid,paramname,jobParamName)
 {
-var zs=caption+": ";
+var zs=paramname+": ";
 //
 zs+="<input type=\"hidden\" name=\"jobParamName\" value=\""+jobParamName+"\"/> ";
 zs+="<input type=\"hidden\" name=\"jobParamValue\" value=\"\"/> ";
@@ -50,15 +51,23 @@ if(srctype=="load")
 {
 document.getElementById("MaskHeader").innerHTML=caption+"-Quellcode exportieren";
 zs+="<input type='hidden' name='jobuniquename' value='"+jobExportUniquename+"'/>";
-zs+="<button class=\"button has-tooltip-multiline has-tooltip-right\" data-tooltip=\"Quellcode exportieren\" onclick=\"getSrcAsXml('"+jobExportUniquename+"','"+jobParamName+"',document.getElementById('"+paramname+"').value);return false;\">anzeigen...</button>";
+
-zs+="<button class=\"button has-tooltip-multiline has-tooltip-right\" data-tooltip=\"Quellcode herunterladen\" onclick=\"downloadMaskSrc('"+jobExportUniquename+"','"+jobParamName+"',document.getElementById('"+paramname+"').value);return false;\">herunterladen...</button>";
+//zs+="<button class=\"button has-tooltip-multiline has-tooltip-right\" data-tooltip=\"Quellcode exportieren\" onclick=\"getSrcAsXml('"+jobExportUniquename+"','"+jobParamName+"',document.getElementById('"+paramname+"').value);return false;\">anzeigen...</button>";
+zs+="<a onclick=\"getSrcAsXml('"+jobExportUniquename+"','"+jobParamName+"',document.getElementById('"+paramname+"').value);return false;\" class=\"linkLookImage\"><img title=\"Quellcode anzeigen\" alt=\"Quellcode anzeigen\" src=\"../../images/eye.svg\" border=\"0\"/></a>";
+zs+="<a onclick=\"downloadMaskSrc('"+jobExportUniquename+"','"+jobParamName+"',document.getElementById('"+paramname+"').value);return false;\" class=\"linkLookImage\"><img title=\"Quellcode herunterladen\" alt=\"Quellcode herunterladen\" src=\"../../images/downloadblck.svg\" border=\"0\"/></a>";
+
+
+
+//zs+="<button class=\"button has-tooltip-multiline has-tooltip-right\" data-tooltip=\"Quellcode exportieren\" onclick=\"getSrcAsXml('"+jobExportUniquename+"','"+jobParamName+"',document.getElementById('"+paramname+"').value);return false;\">anzeigen...</button>";
+//zs+="<button class=\"button has-tooltip-multiline has-tooltip-right\" data-tooltip=\"Quellcode herunterladen\" onclick=\"downloadMaskSrc('"+jobExportUniquename+"','"+jobParamName+"',document.getElementById('"+paramname+"').value);return false;\">herunterladen...</button>";
 
 }
 if(srctype=="save")
 {
 document.getElementById("MaskHeader").innerHTML=caption+"-Quellcode importieren";
 zs+="<input type='hidden' name='src' /><input type='hidden' name='jobuniquename' value='"+jobImportUniquename+"'/>";
-zs+="<button class=\"button has-tooltip-multiline has-tooltip-right\" data-tooltip=\"Quellcode importieren\" onclick=\"saveEtlXmlSrc('"+jobParamName+"',document.getElementById('"+paramname+"').value)\">importieren...</button>";
+//zs+="<button class=\"button has-tooltip-multiline has-tooltip-right\" data-tooltip=\"Quellcode importieren\" onclick=\"saveEtlXmlSrc('"+jobParamName+"',document.getElementById('"+paramname+"').value)\">importieren...</button>";
+zs+="<a onclick=\"saveEtlXmlSrc('"+jobParamName+"',document.getElementById('"+paramname+"').value);return false;\" class=\"linkLookImage\"><img title=\"Quellcode importieren\" alt=\"Quellcode importieren\" src=\"../../images/resultset_up.svg\" border=\"0\"/></a>";
 
 
 //document.getElementById("maskentid_for_upload").style.visibility="visible";
@@ -104,7 +113,7 @@ function saveEtlXmlSrc(jobParamName,jobParamValue)
 document.forms["saveEtlXml"].elements["src"].value=document.getElementById("Inhalt").value;
 if(document.forms["saveEtlXml"].elements["src"].value=="" || jobParamValue=="")
 {
-alert("Bitte setzen Sie eine Nummer in das Feld TID und einen passenden XML ins Feld Inhalt");
+alert("Bitte setzen Sie passenden XML-Quellcode ins Feld Inhalt");
 return false;
 }
 else
@@ -168,6 +177,20 @@ function togglekeyfields() {
 
 }
 </script>
+<style  type="text/css">
+.buttonbar img {
+  height: 1.5rem;
+  width: 1.7rem;
+  margin: 8px 0px 0px 0px;
+  padding: 0rem 0.1rem 0rem 0.1rem;
+  }
+  .buttonbar input {
+  height: 1.5rem;
+  width: 14rem;
+  margin: 8px 10px 0px 0px;
+  padding: 0rem 0.1rem 0rem 0.1rem;
+  }
+ </style>
 <body>
 <%
 //init Variables:
@@ -256,7 +279,7 @@ etlJobsArr=etlJobs.toArray(etlJobsArr);
         <div class="container">
             <div class="navbar-brand">
                 
-          <a class="navbar-item" href="etl_manager.jsp">ETL Manager</a>
+          <a class="navbar-item" href="etl_manager.jsp">Job Management</a>
       
                 
             </div>
@@ -297,15 +320,14 @@ String tabUrl="etl_manager.jsp?tab="+tabUniquename.toLowerCase();
         <div class="columns">
             <div class="column is-3 ">
                 <aside class="menu is-hidden-mobile">
-                    <p class="menu-label">
+                    <!--<p class="menu-label">
                         Untermenü
                     </p>
                     <ul class="menu-list">
                         <li><a class="is-active">Startseite</a></li>
-                        <!--<li><a>Customers</a></li>
-                        <li><a>Other</a></li>-->
-                    </ul>
                        
+                    </ul>
+		    -->
 <%
 for (int i = 0; i < etlJobsArr.length; i++) {
 
@@ -313,7 +335,9 @@ if(tab.equals(etlJobsArr[i].tabUniquename.toLowerCase()))
 {
 %>
                     
-                    <p class="menu-label">
+                    <ul class="menu-list">
+                        <li>
+		    <a class="is-active">
 		    <% out.print(etlJobsArr[i].tabCaption); 
 		    String menuArgs=",";
 		    menuArgs+="'"+etlJobsArr[i].tabCaption+"'";
@@ -326,7 +350,9 @@ if(tab.equals(etlJobsArr[i].tabUniquename.toLowerCase()))
 		    menuArgs+=",'"+etlJobsArr[i].jobParamName+"'";
 		    
 		    %>
-                    </p>
+		    </a>
+		    </li>
+		    </ul>
                     <ul class="menu-list">
                         <li><a onClick="<%= "getTabMenu('load'"+menuArgs+");" %>"><% out.print(etlJobsArr[i].tabCaption); %>-Quellcode exportieren</a></li>
                         <li><a onClick="<%= "getTabMenu('save'"+menuArgs+");" %>"><% out.print(etlJobsArr[i].tabCaption); %>-Quellcode importieren</a></li>
@@ -351,15 +377,18 @@ if(tab.equals(""))
                     <div class="hero-body">
                         <div class="container">
                             <h1 class="title">
-                                ETL Manager
+                                Job Management
                             </h1>
                             <h2 class="subtitle">
                                 Diese Komponente dient der Job-Verwaltung. 
                             </h2>
-			    <p class="title">Klicken Sie oben links auf "Masken", um zum Menü zu gelangen.</p>
+			    
                         </div>
                     </div>
                 </section>
+		<section class="section">
+		<p>Klicken Sie oben auf den jew. Reiter, um zum jew. Menü zu gelangen.</p>
+		</section>
 
                 <div class="columns">
                     <div class="column is-6">
@@ -379,14 +408,19 @@ for (int i = 0; i < etlJobsArr.length; i++) {
 if(tab.equals(etlJobsArr[i].tabUniquename.toLowerCase()))
 {
 %>
-<section class="section">
+<section class="hero is-info welcome is-small">
-   
    
+    <div class="hero-body">
     <div class="container" id="loadMask" >
        <h1 class="title" id="MaskHeader"><% out.print(etlJobsArr[i].tabCaption); %></h1>
+       <h2 class="subtitle">Quellcodes verwalten</h2>
+     </div>
+     </div>
+     </section>
+     <section class="section">
       <h2 class="subtitle">
         <form method="post" name="saveEtlXml" action="../../edit/etl/saveEtlXml.jsp" target="_blank">
-	<div id="MaskSubHeader">Wählen Sie links das Export/Import-Menü</div>
+	<div id="MaskSubHeader" class="buttonbar">Wählen Sie links das Export/Import-Menü</div>
 	<div style="float:right">
 	<input type="hidden" name="keyfieldsused"  value="false"/>
 	</div>