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

PCHD#53859 Notitieveld toevoegen aan object (mobiel)

Browse Source 
svn path=/Website/trunk/; revision=38930
This commit is contained in:
Alex Tiehuis
2018-08-23 09:22:49 +00:00
parent b01d277d28
commit b2fdc136e5
3 changed files with 96 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
APPL/INS/ins_deel_note_save.asp Normal file
View File

@@ -0,0 +1,56 @@
<%@language = "javascript" %>
<% /*
$Revision$
$Id$
File: ins_deel_note_save.asp
Description: Het echte bewaren van een object notitie, zonder interactie
Parameters: ins_key object key
note_key notitie key
note notitie tekst
urole
Context: Vanuit pda/notitie.asp
*/
var JSON_Result = true;
var ins_key = getQParamInt("ins_key");
var LOCKED_USER_OK = { "xmlnode": "ins_deel", "key": ins_key };
%>
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../Shared/json2.js" -->
<!-- #include file="../Shared/save2db.inc" -->
<!-- #include file="ins.inc" -->
<%
var note_key = getQParamInt("note_key", -1);
var this_ins = ins.func_enabled_deel(ins_key); // wat mag ik zoal op deze opdracht
user.auth_required_or_abort(this_ins.canChange);
var note = getFParam("note", "");
if (note != "")
{
var fields = [ { dbs: "ins_deel_key", typ: "key", val: ins_key },
{ dbs: "prs_perslid_key", typ: "key", val: user_key },
{ dbs: "ins_deel_note_omschrijving", typ: "varchar", frm: "note", len:4000 }
]
if (note_key == -1)
{
var noteIns = buildInsert("ins_deel_note", fields);
Oracle.Execute(noteIns.sql);
}
else
{
var sql = buildUpdate("ins_deel_note", fields)
+ " ins_deel_note_key = " + note_key
+ " AND prs_perslid_key = " + user_key; // Voorkom dat er een notitie van een ander aangepast wordt.
Oracle.Execute(sql);
}
}
var result = {success: true,
ins_key: ins_key,
note_key: note_key
};
Response.Write(JSON.stringify(result));
Response.End;
%>

14
APPL/PDA/ins_deel.asp
View File

@@ -150,6 +150,14 @@ oRs.Close();
<html>
<head>
<% FCLTMHeader.Generate({title: subject}); %>
<script>
<% if (getQParamInt("notitie", 0) == 1) { %>
$(function() {
jqToast(L("lcl_mobile_data_saved"));
window.setTimeout(function() { window.history.go(-3); }, 2000); // in case of new Note: walk back the history
});
<% } %>
</script>
</head>
<body>
@@ -241,6 +249,12 @@ oRs.Close();
if (hasOnderdelen) {
BUTTON(L("lcl_subobjects"), {linkid: "./ins_list.asp?ins_parent_key="+ins_key + transitParam, dataicon: "gear", dataajax: 'false'});
}
if (this_ins.canChange) { // Heb ik rechten om notities te zien
var tsql = "SELECT COUNT(*) FROM ins_deel_note n WHERE n.ins_deel_key = " + ins_key;
toRs = Oracle.Execute(tsql);
BUTTON(L("lcl_ins_deel_notes")+" ("+toRs(0).value+")", {linkid: rooturl+"/appl/pda/notitie.asp?node=deel&key="+ins_key, dataicon: "comment", dataajax: "false"});
toRs.Close();
}
trackinglines = mobile.hastrackingpage('deel', ins_key);
if (trackinglines>0) {
BUTTON(L("lcl_history"), {linkid: "#ins-2-"+ins_key, dataicon: "bullets"});

26
APPL/PDA/notitie.asp
View File

@@ -18,6 +18,7 @@ var LOCKED_USER_OK = { "xmlnode": pnode, "key": pkey };%>
<!-- #include file="../Shared/common.inc" -->
<!-- #include file="../mld/mld.inc" -->
<!-- #include file="../cnt/cnt.inc" -->
<!-- #include file="../ins/ins.inc" -->
<!-- #include file="./resultset_table.inc" -->
<!-- #include file="./mobile.inc" -->
<!-- #include file="./iface.inc" -->
@@ -153,6 +154,30 @@ var sql = "";
+ " WHERE n.prs_perslid_key = pf.prs_perslid_key (+)"
+ " AND n.cnt_contract_key = " + pkey;
break;
case 'deel':
var this_ins = ins.func_enabled_deel(pkey); // Wat heb ik zoal aan rechten op deze opdracht?
user.auth_required_or_abort(this_ins.canChange);
pnote.canwritenotes = this_ins.canChange;
var action = "../ins/ins_deel_note_save.asp?ins_key=" +pkey;
sql = "SELECT ins_deel_omschrijving"
+ " FROM ins_deel d"
+ " WHERE ins_deel_key = " + pkey;
oRs = Oracle.Execute(sql);
pnote.subject = oRs("ins_deel_omschrijving").Value;
oRs.Close();
sql = "SELECT n.ins_deel_note_aanmaak note_aanmaak"
+ " , n.ins_deel_note_key note_key"
+ " , pf.prs_perslid_key"
+ " , pf.prs_perslid_naam_friendly"
+ " , n.ins_deel_note_omschrijving note_omschrijving"
+ " , NULL fac_srtnotificatie_code"
+ " FROM ins_deel_note n"
+ " , prs_v_perslid_fullnames_all pf"
+ " WHERE n.prs_perslid_key = pf.prs_perslid_key (+)"
+ " AND n.ins_deel_key = " + pkey;
break;
}
sql = sql + " ORDER BY 1 DESC";
@@ -189,6 +214,7 @@ var sql = "";
case "melding": url = "melding.asp?notitie=1&mld_key=" + pkey; break; // Terug naar de melding.
case "opdracht": url = "order.asp?notitie=1&opdr_key=" + pkey; break; // Terug naar de opdracht.
case "contract": url = "contract.asp?notitie=1&cnt_key=" + pkey; break; // Terug naar het contract.
case "deel": url = "ins_deel.asp?notitie=1&ins_key=" + pkey; break; // Back to show object.
}
return url;