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

FSN#36512 notities bij contracten + andere kleine verbeteringen

Browse Source 
svn path=/Website/trunk/; revision=29413
This commit is contained in:
Ruud Lipper
2016-05-17 09:44:54 +00:00
parent 6f9c16e4f1
commit aedf67d197
2 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
APPL/PDA/contract.asp
View File

@@ -92,14 +92,15 @@ var subject = L("lcl_cnt_contract") + " " + cnt_info.nummer_intern+ (cnt_info.ve
CONTENT_START();
ROFIELD ("fldoms", L("lcl_cnt_descr"), cnt_info.discipline_omschrijving +"/"+ cnt_info.omschrijving);
ROFIELD ("fldpers", L("lcl_cnt_contact_eig"), cnt_info.perslid_naam_eig, {suppressEmpty: true});
ROFIELD ("fldpers", L("lcl_cnt_manager"), cnt_info.perslid_naam_beh);
ROFIELD ("fldcntnr", L("lcl_cnt_contractnr"), cnt_info.nummer, {suppressEmpty: true});
if (cnt_info.mantel_key != null)
{
ROFIELD ("fldcontract", L("lcl_cnt_mantel"), cnt_info.mantelcontractnummer);
ROFIELD ("fldcontract", L("lcl_cnt_mantel"), cnt_info.mantelcontractnummer, { moreinfo: "./contract.asp?cnt_key="+cnt_info.mantel_key });
}
ROFIELD ("fldtxt", L("lcl_cnt_document"), cnt_info.document, {suppressEmpty: true});
ROFIELD("fldtxt", L("lcl_remark"), cnt_info.opmerking, {suppressEmpty: true});
ROFIELD ("fldtxt", L("lcl_cnt_document"), cnt_info.document, {suppressEmpty: true, multi: true});
ROFIELD("fldtxt", L("lcl_remark"), cnt_info.opmerking, {suppressEmpty: true, multi: true});
if (cnt_info.srtcontract_type == S("cnt_srttype_rental"))
@@ -108,7 +109,10 @@ var subject = L("lcl_cnt_contract") + " " + cnt_info.nummer_intern+ (cnt_info.ve
ROFIELD ("flddep", L("lcl_cnt_afdeling"), cnt_info.afdeling_naam, {suppressEmpty: true});
}
else
ROFIELD ("fld", L("lcl_cnt_company"), cnt_info.bedrijf_naam);
{
ROFIELD ("fld", L("lcl_cnt_company"), cnt_info.bedrijf_naam, {suppressEmpty: true});
ROFIELD ("fld", L("lcl_person"), cnt_info.perslid_naam, {suppressEmpty: true});
}
ROFIELD ("flddate", L("lcl_cnt_looptijd"), toDateString(cnt_info.looptijd_van)+ " " +L("lcl_tot")+" "+ toDateString(cnt_info.looptijd_tot));
@@ -387,6 +391,11 @@ var subject = L("lcl_cnt_contract") + " " + cnt_info.nummer_intern+ (cnt_info.ve
{
BUTTON(L("lcl_history"), {linkid: "#cnt-2-" + cnt_key, dataicon: "bullets", transition: "pop", datarel: "dialog"});
}
var tsql = "SELECT COUNT(*) FROM cnt_contract_note n WHERE n.cnt_contract_key = " + cnt_key;
toRs = Oracle.Execute(tsql);
BUTTON(L("lcl_cnt_frame_notes")+" ("+toRs(0).value+")", {linkid: "./notitie.asp?node=contract&key="+cnt_key, dataicon: "comment", dataajax: 'false'});
}
else
trackinglines = 0;

20
APPL/PDA/notitie.asp
View File

@@ -14,6 +14,7 @@
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../mld/mld.inc" -->
<!-- #include file="../cnt/cnt.inc" -->
<!-- #include file="./resultset_table.inc" -->
<!-- #include file="./mobile.inc" -->
<!-- #include file="./iface.inc" -->
@@ -108,6 +109,24 @@ var sql = "";
sql = "SELECT * FROM ("+ sql + " UNION " + sql_t + ")";
}
break;
case 'contract':
var this_cnt = cnt.func_enabled_contract(pkey); // Wat heb ik zoal aan rechten op dit contract?
user.auth_required_or_abort(this_cnt.canWriteNotes);
var cnt_info = cnt.cnt_contract_info(pkey);
pnote.subject = L("lcl_cnt_contract") + " " + cnt_info.nummer_intern+ (cnt_info.versie == null || cnt_info.versie == ""? "" : "." + cnt_info.versie);
var sql = "SELECT n.cnt_contract_note_aanmaak note_aanmaak"
+ " , n.cnt_contract_note_key note_key"
+ " , pf.prs_perslid_key"
+ " , pf.prs_perslid_naam_friendly"
+ " , n.cnt_contract_note_omschrijving note_omschrijving"
+ " , NULL fac_srtnotificatie_code"
+ " FROM cnt_contract_note n"
+ " , prs_v_perslid_fullnames_all pf"
+ " WHERE n.prs_perslid_key = pf.prs_perslid_key (+)"
+ " AND n.cnt_contract_key = " + pkey;
break;
}
sql = sql + " ORDER BY 1 DESC";
@@ -134,6 +153,7 @@ var sql = "";
switch (pnode)
{
case "melding": url = "melding.asp?mld_key=" + pkey; break; // Terug naar de melding.
case "contract": url = "contract.asp?cnt_key=" + pkey; break; // Terug naar het contract.
}
return url;