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

NYBU#56537 Actielijst campus | Veld persoon in contract campus verplicht maken

Browse Source 
svn path=/Website/trunk/; revision=41116
This commit is contained in:
Alex Tiehuis
2019-02-22 10:47:07 +00:00
parent c5a1868b84
commit a7d536a852
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
APPL/CNT/cnt_change_cnttype.asp
View File

@@ -185,8 +185,8 @@ user.anything_todo_or_abort(this_cnt.canChangeSrt);
+ " WHERE td.ins_discipline_module = 'CNT'"
+ " AND td.ins_discipline_verwijder IS NULL"
+ " AND td.ins_discipline_key = dp.cnt_ins_discipline_key"
+ (oRs("cnt_prs_perslid_key").Value ? " AND BITAND (dp.cnt_disc_params_binding, 1) = 1" : "")
+ (oRs("cnt_prs_bedrijf_key").Value ? " AND BITAND (dp.cnt_disc_params_binding, 2) = 2" : "")
+ (oRs("cnt_prs_perslid_key").Value == null ? " AND BITAND (dp.cnt_disc_params_binding, 1) = 1" : "")
+ (oRs("cnt_prs_bedrijf_key").Value == null ? " AND BITAND (dp.cnt_disc_params_binding, 2) = 2" : "")
+ " AND dp.cnt_srtcontract_type = " + cnt_type_key;
FCLTselector("cnt_srt_new_key",
sql_typecnt,

2
APPL/CNT/cnt_show_contract.asp
View File

@@ -275,6 +275,8 @@ var urlMail = "../shared/queuemail.asp?pcode=CNTMAI&defemail_key=" + defemail_ke
var sql = "SELECT cnt_ins_discipline_key"
+ " FROM cnt_disc_params"
+ " WHERE cnt_srtcontract_type = " + cnt_info.srtcontract_type
+ (cnt_info.perslid_key > 0 ? " AND BITAND (cnt_disc_params_binding, 1) = 1" : "")
+ (cnt_info.bedrijf_key > 0 ? " AND BITAND (cnt_disc_params_binding, 2) = 2" : "")
+ " AND cnt_ins_discipline_key != " + cnt_info.discipline_key; // Huidige waarde niet laten zien.
var oRs = Oracle.Execute(sql);
if (!oRs.Eof) // er zijn andere mogelijk