FCLT#83767 Data-roundtrip via Excel/CSV voor bulkdata aanvulling (evt mutaties)

svn path=/Website/trunk/; revision=66448
This commit is contained in:
Erik Groener
2024-10-03 08:53:50 +00:00
parent 2e5a5334b4
commit 27d8532a6d
12 changed files with 26 additions and 65 deletions

View File

@@ -109,8 +109,8 @@ FCLTHeader.Requires({ plugins: ["jQuery"] });
<% if (canImport) { %>
function doRoundtrip_exp(pCode)
{
var url = "appl/fac/fac_roundtrip_exp.asp?app_code=" + pCode;
FcltMgr.openDetail(url, "Roundtrip");
var url = "../fac/fac_roundtrip_exp.asp?app_code=" + pCode;
FcltMgr.windowopen(url);
}
function doRoundtrip_imp(pCode)

View File

@@ -111,8 +111,8 @@ function ruimte_list(pautfunction, params)
<% if (canImport) { %>
function doRoundtrip_exp(pCode)
{
var url = "appl/fac/fac_roundtrip_exp.asp?app_code=" + pCode;
FcltMgr.openDetail(url, "Roundtrip");
var url = "../fac/fac_roundtrip_exp.asp?app_code=" + pCode;
FcltMgr.windowopen(url);
}
function doRoundtrip_imp(pCode)

View File

@@ -18,8 +18,6 @@ FCLTHeader.Requires({ plugins:["jQuery"]});
var autfunction = "WEB_IMPORT";
var authparams = user.checkAutorisation(autfunction);
var code = getQParamSafe("app_code");
var imp_app_key = getQParamInt("app_key", -1);
var isTest = (imp_app_key == -1);
var imp_params = { success: true
, warning: ""
@@ -30,8 +28,8 @@ var sql = "SELECT fac_import_app_key"
+ " , fac_import_app_oms"
+ " , fac_functie_key"
+ " FROM fac_import_app"
+ " WHERE fac_import_app_code = " + safe.quoted_sql(code)
+ ( imp_app_key > 0 ? " AND fac_import_app_key = " + imp_app_key : "");
+ " WHERE fac_import_app_prefix IS NULL"
+ " AND fac_import_app_code = " + safe.quoted_sql(code);
var oRs = Oracle.Execute(sql);
if (!oRs.eof)
{
@@ -55,16 +53,6 @@ if (imp_params.success)
var tm_start = hiresTimer.usTimer;
var sql = "SELECT * FROM " + viewname;
var oRs = Oracle.RealConnection.Execute(sql);
if (isTest)
{
imp_params.app_key = imp_app_key;
oRs.Close();
}
else
{
create_export(oRs, filename);
}
}
catch (e)
{
@@ -136,36 +124,6 @@ function create_export(oRs, filename)
var cnt = rst.processResultset();
}
if (isTest)
{ // Voorkom dat de html bij in het csv-bestand komt te staan.
%>
<html>
<head>
<% FCLTHeader.Generate(); %>
<script>
var wnd_exp;
$(function()
{
var params = <%=JSON.stringify(imp_params)%>;
FcltMgr.closeDetail(window, { success: params.success
, warning: params.warning
, keepForm: false
});
if (params.success)
{
var url = "../fac/fac_roundtrip_exp.asp?app_code=" + params.app_code + "&app_key=" + params.app_key;
wnd_exp = FcltMgr.windowopen(url);
window.close();
}
});
</script>
</head>
<body>
</body>
</html>
<%
} %>
<% ASPPAGE_END(); %>

View File

@@ -23,7 +23,8 @@ var sql = "SELECT fac_import_app_key"
+ " , fac_import_app_oms"
+ " , fac_functie_key"
+ " FROM fac_import_app"
+ " WHERE fac_import_app_code = " + safe.quoted_sql(code);
+ " WHERE fac_import_app_prefix IS NULL"
+ " AND fac_import_app_code = " + safe.quoted_sql(code);
var oRs = Oracle.Execute(sql);
if (!oRs.eof)
{

View File

@@ -203,8 +203,8 @@ var canImport = (user.checkAutorisation("WEB_IMPORT", true) != null);
<% if (canImport) { %>
function doRoundtrip_exp(pCode)
{
var url = "appl/fac/fac_roundtrip_exp.asp?app_code=" + pCode;
FcltMgr.openDetail(url, "Roundtrip");
var url = "../fac/fac_roundtrip_exp.asp?app_code=" + pCode;
FcltMgr.windowopen(url);
}
function doRoundtrip_imp(pCode)

View File

@@ -177,8 +177,8 @@ function ins_list (pautfunction, params)
<% if (canImport) { %>
function doRoundtrip_exp(pCode)
{
var url = "appl/fac/fac_roundtrip_exp.asp?app_code=" + pCode;
FcltMgr.openDetail(url, "Roundtrip");
var url = "../fac/fac_roundtrip_exp.asp?app_code=" + pCode;
FcltMgr.windowopen(url);
}
function doRoundtrip_imp(pCode)

View File

@@ -24,8 +24,8 @@ if (mode != "save" && mode != "delete" && mode != "api2")
<% if (canImport) { %>
function doRoundtrip_exp(pCode)
{
var url = "appl/fac/fac_roundtrip_exp.asp?app_code=" + pCode;
FcltMgr.openDetail(url, "Roundtrip");
var url = "../fac/fac_roundtrip_exp.asp?app_code=" + pCode;
FcltMgr.windowopen(url);
}
function doRoundtrip_imp(pCode)

View File

@@ -99,8 +99,8 @@ function bedrijf_list (pautfunction, params)
<% if (canImport) { %>
function doRoundtrip_exp(pCode)
{
var url = "appl/fac/fac_roundtrip_exp.asp?app_code=" + pCode;
FcltMgr.openDetail(url, "Roundtrip");
var url = "../fac/fac_roundtrip_exp.asp?app_code=" + pCode;
FcltMgr.windowopen(url);
}
function doRoundtrip_imp(pCode)

View File

@@ -114,8 +114,8 @@ function afdeling_list(pautfunction, params)
<% if (canImport) { %>
function doRoundtrip_exp(pCode)
{
var url = "appl/fac/fac_roundtrip_exp.asp?app_code=" + pCode;
FcltMgr.openDetail(url, "Roundtrip");
var url = "../fac/fac_roundtrip_exp.asp?app_code=" + pCode;
FcltMgr.windowopen(url);
}
function doRoundtrip_imp(pCode)

View File

@@ -41,8 +41,8 @@ var canImport = (user.checkAutorisation("WEB_IMPORT", true) != null);
<% if (canImport) { %>
function doRoundtrip_exp(pCode)
{
var url = "appl/fac/fac_roundtrip_exp.asp?app_code=" + pCode;
FcltMgr.openDetail(url, "Roundtrip");
var url = "../fac/fac_roundtrip_exp.asp?app_code=" + pCode;
FcltMgr.windowopen(url);
}
function doRoundtrip_imp(pCode)

View File

@@ -100,8 +100,8 @@ function contactpersoon_list (params)
<% if (canImport) { %>
function doRoundtrip_exp(pCode)
{
var url = "appl/fac/fac_roundtrip_exp.asp?app_code=" + pCode;
FcltMgr.openDetail(url, "Roundtrip");
var url = "../fac/fac_roundtrip_exp.asp?app_code=" + pCode;
FcltMgr.windowopen(url);
}
function doRoundtrip_imp(pCode)

View File

@@ -145,8 +145,10 @@ function perslid_list(pautfunction, params)
<% if (canImport) { %>
function doRoundtrip_exp(pCode)
{
var url = "appl/fac/fac_roundtrip_exp.asp?app_code=" + pCode;
FcltMgr.openDetail(url, "Roundtrip");
var url = "../fac/fac_roundtrip_exp.asp?app_code=" + pCode;
FcltMgr.windowopen(url);
//var url = "appl/fac/fac_roundtrip_exp.asp?app_code=" + pCode;
//FcltMgr.openDetail(url, "Roundtrip");
}
function doRoundtrip_imp(pCode)