TWYN#55491 importeren/kopieren default project

svn path=/Website/branches/v2018.2/; revision=40017
This commit is contained in:
Erik Groener
2018-11-29 08:45:40 +00:00
parent 66824ff699
commit 431f055b0f
2 changed files with 10 additions and 18 deletions

View File

@@ -147,9 +147,8 @@ function model_bgt_project()
var data_key = getFParamInt("import", -1);
if (data_key > 0)
{
var err = create_default_projectdata(key, data_key);
if (err == "")
params.toaster = "Standaard projectdata toegevoegd."
create_default_projectdata(key, data_key);
params.toaster = "Standaard projectdata toegevoegd."
}
}
@@ -159,9 +158,8 @@ function model_bgt_project()
var data_key = getFParamInt("import", -1);
if (data_key > 0)
{
var err = create_default_projectdata(key, data_key);
if (err == "")
params.toaster = "Standaard projectdata toegevoegd."
create_default_projectdata(key, data_key);
params.toaster = "Standaard projectdata toegevoegd."
}
}

View File

@@ -76,7 +76,6 @@ function create_default_projectdata(prj_key, def_prj_key)
{
// Kopieer de standaard deel-projectdata naar een nieuw project.
var err = "";
var warning = "";
// Rubriek:
var sql_rub = "SELECT bgt_kostenrubriek_key"
+ " , bgt_kostenrubriek_code"
@@ -84,7 +83,7 @@ function create_default_projectdata(prj_key, def_prj_key)
+ " FROM bgt_kostenrubriek"
+ " WHERE bgt_project_key = " + def_prj_key;
var oRs_rub = Oracle.Execute(sql_rub);
while (!oRs_rub.eof && warning == "")
while (!oRs_rub.eof)
{
var rub_key = get_sequence("bgt_s_bgt_kostenrubriek_key");
var ins_rub = "INSERT INTO bgt_kostenrubriek"
@@ -100,8 +99,7 @@ function create_default_projectdata(prj_key, def_prj_key)
+ "," + safe.quoted_sql(oRs_rub("bgt_kostenrubriek_oms").Value)
+ ")";
err = Oracle.Execute(ins_rub, true);
if (err.friendlyMsg)
warning = err.friendlyMsg;
abort_with_warning(err.friendlyMsg);
var def_rub_key = oRs_rub("bgt_kostenrubriek_key").Value;
// Kostensoortgroep:
var sql_grp = "SELECT prs_kostensoortgrp_key"
@@ -110,7 +108,7 @@ function create_default_projectdata(prj_key, def_prj_key)
+ " FROM prs_kostensoortgrp"
+ " WHERE bgt_kostenrubriek_key = " + def_rub_key;
var oRs_grp = Oracle.Execute(sql_grp);
while (!oRs_grp.eof && warning == "")
while (!oRs_grp.eof)
{
var grp_key = get_sequence("prs_s_prs_kostensoortgrp_key");
var ins_grp = "INSERT INTO prs_kostensoortgrp"
@@ -126,8 +124,7 @@ function create_default_projectdata(prj_key, def_prj_key)
+ "," + safe.quoted_sql(oRs_grp("prs_kostensoortgrp_oms").Value)
+ ")";
err = Oracle.Execute(ins_grp, true);
if (err.friendlyMsg)
warning = err.friendlyMsg;
abort_with_warning(err.friendlyMsg);
var def_grp_key = oRs_grp("prs_kostensoortgrp_key").Value;
// Kostensoort:
var sql_srt = "SELECT prs_kostensoort_key"
@@ -137,7 +134,7 @@ function create_default_projectdata(prj_key, def_prj_key)
+ " FROM prs_kostensoort"
+ " WHERE prs_kostensoortgrp_key = " + def_grp_key;
var oRs_srt = Oracle.Execute(sql_srt);
while (!oRs_srt.eof && warning == "")
while (!oRs_srt.eof)
{
var srt_key = get_sequence("prs_s_prs_kostensoort_key");
var ins_srt = "INSERT INTO prs_kostensoort"
@@ -157,8 +154,7 @@ function create_default_projectdata(prj_key, def_prj_key)
+ "," + oRs_srt("fin_btwtabelwaarde_key").Value
+ ")";
err = Oracle.Execute(ins_srt, true);
if (err.friendlyMsg)
warning = err.friendlyMsg;
abort_with_warning(err.friendlyMsg);
oRs_srt.MoveNext();
}
oRs_srt.Close()
@@ -168,8 +164,6 @@ function create_default_projectdata(prj_key, def_prj_key)
oRs_rub.MoveNext();
}
oRs_rub.Close();
return warning;
}
function get_sequence(seq)