admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VEBE#39163 Kijkt bij kopieren scope nu ook of de plaats wel bestaat && status = null bij copy

Browse Source 
svn path=/Website/trunk/; revision=33624
This commit is contained in:
Koen Reefman
2017-05-01 08:43:10 +00:00
parent 22651296a3
commit 5df4680ff6
2 changed files with 54 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
APPL/CNT/cnt_edit_contract.asp
View File

@@ -62,7 +62,8 @@ else // nieuw contract of copy
user.auth_required_or_abort(this_cnt.canCopy);
cnt_info.cnt_key = -1;
cnt_info.nummer_intern = null;
cnt_info.contract_status = S("cnt_contract_approval") == 1 ? 2 : 0;
cnt_info.contract_status = null;
cnt_info.contract_status_str = null;
cnt_disc_key = getQParamInt("srtdisc", -1);
}
else

64
APPL/CNT/cnt_edit_contract_save.asp
View File

@@ -208,18 +208,58 @@ if (!warning)
CopyFlexFolders("CNT/" + subfolderKey("C", cnt_copy_key), "CNT/" + subfolderKey("C", cnt_key), flexsql);
var copyPlaatsScopeSql = "INSERT INTO cnt_contract_plaats (cnt_contract_key,"
+ " cnt_alg_plaats_code,"
+ " cnt_alg_plaats_key,"
+ " cnt_contract_plaats_gewicht)"
+ " SELECT " + cnt_key + ","
+ " cnt_alg_plaats_code,"
+ " cnt_alg_plaats_key,"
+ " cnt_contract_plaats_gewicht"
+ " FROM cnt_contract_plaats"
+ " WHERE cnt_contract_key = " + cnt_copy_key
+ " AND cnt_contract_plaats_verwijder IS NULL";
Oracle.Execute(copyPlaatsScopeSql);
var prePlaatsScopeSql = "SELECT cnt_alg_plaats_code, cnt_alg_plaats_key"
+ " FROM cnt_contract_plaats"
+ " WHERE cnt_contract_key = " + cnt_copy_key
+ " AND cnt_contract_plaats_verwijder IS NULL";
var preOracle = Oracle.Execute(prePlaatsScopeSql);
if (!preOracle.EoF)
{
var cnt_alg_code = preOracle("cnt_alg_plaats_code").Value;
var cnt_alg_key = preOracle("cnt_alg_plaats_key").Value;
prePlaatsScopeSql = "";
switch(cnt_alg_code) {
case 'R':
prePlaatsScopeSql = "SELECT alg_ruimte_key FROM alg_v_aanwezigruimte WHERE alg_ruimte_key = " + cnt_alg_key;
break;
case 'V':
prePlaatsScopeSql = "SELECT alg_verdieping_key FROM alg_v_aanwezigverdieping WHERE alg_verdieping_key = " + cnt_alg_key;
break;
case 'G':
prePlaatsScopeSql = "SELECT alg_gebouw_key FROM alg_v_aanweziggebouw WHERE alg_gebouw_key = " + cnt_alg_key;
break;
case 'T':
prePlaatsScopeSql = "SELECT alg_terreinsector_key FROM alg_v_aanwezigterreinsector WHERE alg_terreinsector_key = " + cnt_alg_key;
break;
case 'L':
prePlaatsScopeSql = "SELECT alg_locatie_key FROM alg_v_aanweziglocatie WHERE alg_locatie_key = " + cnt_alg_key;
break;
default:
break;
}
if (prePlaatsScopeSql != "")
{
preOracle2 = Oracle.Execute(prePlaatsScopeSql);
if (!preOracle2.EoF)
{
var copyPlaatsScopeSql = "INSERT INTO cnt_contract_plaats (cnt_contract_key,"
+ " cnt_alg_plaats_code,"
+ " cnt_alg_plaats_key,"
+ " cnt_contract_plaats_gewicht)"
+ " SELECT " + cnt_key + ","
+ " cnt_alg_plaats_code,"
+ " cnt_alg_plaats_key,"
+ " cnt_contract_plaats_gewicht"
+ " FROM cnt_contract_plaats"
+ " WHERE cnt_contract_key = " + cnt_copy_key
+ " AND cnt_contract_plaats_verwijder IS NULL";
Oracle.Execute(copyPlaatsScopeSql);
}
preOracle2.Close();
}
}
preOracle.Close();
var copyObjectScopeSql = "INSERT INTO cnt_contract_object (cnt_contract_key,"
+ " cnt_ins_srtdeel_key,"