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

Merge 5.2.3 Gold C patches

Browse Source 
svn path=/Website/trunk/; revision=16556
This commit is contained in:
Jos Groot Lipman
2013-01-17 13:49:07 +00:00
parent 28243a628f
commit 756b0989db
9 changed files with 91 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
APPL/API/api_mldsoap.asp
View File

@@ -28,6 +28,43 @@
Session.Codepage = 65001;
Response.Charset = 'utf-8';
// Zet de loglevel in de API op 1 om de xml te loggen naar de TEMP folder
function XML2TEMP(xml, postfix)
{
if (!API.apidata.loglevel) return;
var in_file = Server.MapPath("./temp") + "/" + customerId + "_" + APIname + "_" + postfix + "_";
var jsDate = new Date();
var s = String(jsDate.getFullYear()) + padout(jsDate.getMonth() + 1) + padout(jsDate.getDate())
+ padout(jsDate.getHours()) + padout(jsDate.getMinutes()) + padout(jsDate.getSeconds())
in_file = in_file + s + ".xml";
//Response.Write(in_file);Response.End;
var fs = Server.CreateObject("Scripting.FileSystemObject");
var ts = fs.CreateTextFile(in_file, true, -1); // -1 voor de Unicode
ts.WriteLine (xml); // Anders hier Invalid procedure call or argument
ts.Close();
}
// CreateFullPath moet hier weg bij overnemen naar trunk 531!
function CreateFullPath(sPath)
{
var oFS = Server.CreateObject("Scripting.FileSystemObject");
if (!oFS.FolderExists(sPath))
{
while (!oFS.FolderExists(sPath))
{
var sParent = sPath;
while (!oFS.FolderExists(sParent))
{
var sChild = sParent;
var sParent = oFS.GetParentFolderName(sChild);
}
oFolder = oFS.CreateFolder(sChild)
}
}
oFS = null;
}
var APIname = getQParam("API");
var APIKEY = getQParam("APIKEY");
var API = new API_func(APIname, APIKEY);
@@ -38,6 +75,8 @@
var xmlReq = Server.CreateObject("MSXML2.DOMDocument.4.0");
xmlReq.load(Request);
XML2TEMP(xmlReq.xml, "IN");
var xmlResp = new ActiveXObject("MSXML2.DOMDocument.4.0");
xmlResp.appendChild(xmlResp.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"utf-8\""))

3
APPL/INS/ins_inspect.asp
View File

@@ -122,6 +122,7 @@ user.anything_todo_or_abort(tobeinspected > 0); // We klagen niet over enkele we
{ label: L("lcl_ins_controle"),
initKey: srtcont_key,
emptyOption: L("lcl_select_srtcontrole"),
//readonly: srtcont_key > 0, // dan wordtie niet gesubmit
required: true
}
);
@@ -129,7 +130,7 @@ user.anything_todo_or_abort(tobeinspected > 0); // We klagen niet over enkele we
{
sql = "SELECT ins_srtcontrole_info FROM ins_srtcontrole WHERE ins_srtcontrole_key = " + srtcont_key;
var oRs = Oracle.Execute(sql);
RWTEXTAREATR("srtcontrole_info", "fldtxt", L("lcl_ins_info"), oRs("ins_srtcontrole_info").value, {html: "rows='3'"});
ROTEXTAREATR("fldtxt", L("lcl_ins_info"), oRs("ins_srtcontrole_info").value, {html: "rows='3'"});
}
FCLTcalendar( "deelsrtcontrole_datum",
{ label : L("lcl_ins_controle_datum"),

18
APPL/INS/ins_list.inc
View File

@@ -493,7 +493,7 @@ function ins_list (pautfunction, params)
+ " ORDER BY inspectie_next)"
+ " WHERE rn = 1";
sqlInspectie_select = "inspectie_next, ins_srtcontrole_omschrijving";
sqlInspectie_select = "inspectie_next, ins_srtcontrole_omschrijving, ins_srtcontrole_key";
sqlInspectie_from = ", ("+sqlNext+") ispn"
@@ -564,7 +564,6 @@ function ins_list (pautfunction, params)
+ ", (SELECT " + S("prs_dep_string") + " FROM prs_v_afdeling d WHERE prs_afdeling_key = i.ins_alg_ruimte_key) eigenaar"
+ ", NULL alg_ruimte_key " // person key
+ ", i.ins_alg_ruimte_key prs_afdeling_key" // department key
+ ", ins_srtcontrole_key"
+ (koppel_key? ", ins_deelkoppeling_omschrijving, ins_deelkoppeling_van_key, ins_deelkoppeling_naar_key" : "")
+ sqlOwner_from
+ ", prs_v_afdeling_boom d"
@@ -581,7 +580,6 @@ function ins_list (pautfunction, params)
+ ", " + S("prs_pers_string") + " eigenaar"
+ ", i.ins_alg_ruimte_key alg_ruimte_key " // person key
+ ", p.prs_afdeling_key prs_afdeling_key" // department key
+ ", ins_srtcontrole_key"
+ (koppel_key? ", ins_deelkoppeling_omschrijving, ins_deelkoppeling_van_key, ins_deelkoppeling_naar_key" : "")
+ sqlOwner_from
+ ", prs_perslid p"
@@ -600,7 +598,6 @@ function ins_list (pautfunction, params)
+ ", c.prs_contactpersoon_naam eigenaar"
+ ", i.ins_alg_ruimte_key alg_ruimte_key" // person key
+ ", NULL prs_afdeling_key" // department key
+ ", ins_srtcontrole_key"
+ (koppel_key? ", ins_deelkoppeling_omschrijving, ins_deelkoppeling_van_key, ins_deelkoppeling_naar_key" : "")
+ sqlOwner_from
+ ", prs_contactpersoon c"
@@ -648,7 +645,6 @@ function ins_list (pautfunction, params)
+ ", null eigenaar"
+ ", i.ins_alg_ruimte_key alg_ruimte_key"
+ ", 0 dummy1" // department key
+ ", ins_srtcontrole_key"
+ (koppel_key? ", ins_deelkoppeling_omschrijving, ins_deelkoppeling_van_key, ins_deelkoppeling_naar_key" : "")
+ " FROM ins_deel i"
+ (terr_key
@@ -1053,7 +1049,7 @@ function ins_list (pautfunction, params)
var insKey = oRs("ins_deel_key").value;
var insTypeKey = oRs("ins_srtdeel_key").value;
var insAvailable = oRs("ins_alg_ruimte_key_org").value == null? 1 : 0;
var insSrtControleKey = oRs("ins_srtcontrole_key").value;
var insSrtControleKey = (params.inspect? oRs("ins_srtcontrole_key").value : -1);
var data = {insKey:insKey, insTypeKey:insTypeKey, insAvailable:insAvailable, insSrtControleKey:insSrtControleKey};
return JSON.stringify(data);
@@ -1332,11 +1328,13 @@ function ins_list (pautfunction, params)
{
rst.addAction({ action: "insEdit", caption: L("lcl_change"), isDefault: true}); // isDefault, dus nooit multi, alleen door aanklikken regel. Multi via afgehandeld via functie insMultiEdit()
if (params.inspect)
rst.addAction({ action: "insInspect", caption: L("lcl_ins_controle"), multi: !tiny, multiOnce: true });
rst.addAction({ action: "insInspect", caption: L("lcl_ins_controle"), multi: !tiny, multiOnce: true });
else
rst.addAction({ action: "insDelete", caption: L("lcl_delete"), enabler: "eDelete", single: false, multi: !tiny, multiOnce: true});
rst.addAction({ action: "insMultiEdit", caption: L("lcl_ins_multi_edit"), enabler: "eEdit", multi: !tiny, single: false, multiOnce: true});
rst.addAction({ action: "insMultiMove", caption: L("lcl_ins_multi_move"), enabler: "NotExist", multi: !tiny, multiOnce: true});
{
rst.addAction({ action: "insDelete", caption: L("lcl_delete"), enabler: "eDelete", single: false, multi: !tiny, multiOnce: true});
rst.addAction({ action: "insMultiEdit", caption: L("lcl_ins_multi_edit"), enabler: "eEdit", multi: !tiny, single: false, multiOnce: true});
rst.addAction({ action: "insMultiMove", caption: L("lcl_ins_multi_move"), enabler: "NotExist", multi: !tiny, multiOnce: true});
}
}
var count = rst.processResultset();

16
APPL/INS/ins_list.js
View File

@@ -190,6 +190,22 @@ function insInspect(rowArray)
rowdata = eval('(' + rowArray[0].getAttribute("ROWDATA") + ')');
srtcontrole_key = rowdata.insSrtControleKey;
}
else
{
srtcontrolekeyArray = new Array();
for (var i = 0; i < rowArray.length; i++)
{
rowdata = eval('(' + rowArray[i].getAttribute("ROWDATA") + ')');
srtcontrolekeyArray[i] = rowdata.insSrtControleKey;
// Zijn er twee controlesoorten geselecteerd. Is de waarde gelijk aan de voorgaande.
if (i > 0 && srtcontrolekeyArray[i-1] != srtcontrolekeyArray[i])
{ // Twee controlesoorten zijn niet toegestaan
alert(L("lcl_ins_no_same_srtcontrole"));
return false;
}
}
srtcontrole_key = srtcontrolekeyArray[0];
}
var subject = L("lcl_ins_multi_controle");
var url = "../ins/ins_inspect.asp?ins_keys=" + insKeyString + (srtcontrole_key > 0? "&srtcont_key=" + srtcontrole_key : "");
FcltMgr.openModalDetail(url, rowArray.length > 1? L("lcl_ins_multi_controle") : L("lcl_ins_docontrole"), {callback: FcltCallbackRefresh});

6
APPL/MLD/mld_edit_melding_save.asp
View File

@@ -114,9 +114,11 @@ if (!forcesave && (fronto || frontend) && isNew)
sql = "SELECT DISTINCT m.mld_melding_key"
+ " FROM mld_melding m"
+ " , alg_v_allonroerendgoed org"
+ " , mld_melding_object mo"
+ (one_object?
" , mld_melding_object mo" : "")
+ " WHERE m.mld_alg_onroerendgoed_keys = org.alg_onroerendgoed_keys"
+ " AND m.mld_melding_key = mo.mld_melding_key(+)"
+ (one_object?
" AND m.mld_melding_key = mo.mld_melding_key" : "")
+ " AND m.mld_melding_status IN (0, 2, 3, 4, 7)"
+ " AND m.mld_melding_parentkey IS NULL" // Geen child meldingen tonen
+ " AND m.mld_stdmelding_key = " + stdm_key

15
APPL/PDA/melding.asp
View File

@@ -188,6 +188,13 @@ var subject = mld_key > -1 ? (oRs("ins_srtdiscipline_prefix").Value || "")+ mld_
<head>
<% FCLTMHeader.Generate({title: subject }); %>
<script type="text/javascript">
var timerID=null;
function delayed(delay, fn)
{
if (timerID) clearTimeout(timerID);
timerID = setTimeout(fn, delay);
}
function mld_accept()
{
$.post($("form[name=meld]")[0].action, $("[name=meld]").serialize(), null, "json");
@@ -212,7 +219,13 @@ var subject = mld_key > -1 ? (oRs("ins_srtdiscipline_prefix").Value || "")+ mld_
if (json.success)
{
if (json.mld_key > 0 && !json.opdr_key) // Na opslaan opdracht niet nog een keer de melding weergeven.
jqToast("Gegevens zijn opgeslagen"); // ' onder nummer ... '
<% if (qrc) { %>
jqToast("<%=L("lcl_pda_mld_call_confirm")%>");
delayed(5000, function() { McltCallbackClose(json); } );
<% } else { %>
jqToast("Gegevens zijn opgeslagen"); // ' onder nummer ... '
<% } %>
if (json.autoorder)
{

11
APPL/PDA/mld_list.asp
View File

@@ -4,7 +4,8 @@
$Id$
File: pda/mld_list.asp
Description: Toont een beknopte meldingenlijst voor op de pda
Description: Toont een beknopte meldingenlijst voor op de pda, dat zijn de aan mij
geautoriseerde actieve meldingen op de plaats waar ik ben plus die zonder plaatsgegevens
Parameters: -
Context: -
@@ -100,7 +101,7 @@ var authparams = user.checkAutorisation(autfunction);
sqln += mld.getfromwherelist_sql(autfunction, params);
if (ruimte_key > -1) {
sqln += " AND v.alg_ruimte_key = " + ruimte_key;
sqln += " AND (l.alg_locatie_key IS NULL OR v.alg_ruimte_key = " + ruimte_key +")";
}
if (ins_key > -1) {
sqln += " AND m.mld_melding_key IN "
@@ -108,13 +109,13 @@ var authparams = user.checkAutorisation(autfunction);
}
if (ins_key == -1 && ruimte_key == -1) { // die lagere keys zijn sterker, ook als ik evt niet ter plaatse ben
if (gebouw_key > -1) {
sqln += " AND v.alg_gebouw_key = " + gebouw_key;
sqln += " AND (l.alg_locatie_key IS NULL OR v.alg_gebouw_key = " + gebouw_key +")";
}
if (locatie_key > -1) {
sqln += " AND l.alg_locatie_key = " + locatie_key;
sqln += " AND (l.alg_locatie_key IS NULL OR l.alg_locatie_key = " + locatie_key +")";
}
if (verdieping_key > -1) {
sqln += " AND v.alg_verdieping_key = " + verdieping_key;
sqln += " AND (l.alg_locatie_key IS NULL OR v.alg_verdieping_key = " + verdieping_key +")";
}
}
// apply 3D authorization to the locations and to the organisations (both ALG and PRS)

2
APPL/PDA/mobile.js
View File

@@ -52,7 +52,7 @@ function jqToast (msg)
width: "270px",
left: (($(window).width() - 284)/2)+"px",
top: ($(window).scrollTop() + $(window).height()/2)+"px" })
.appendTo( $.mobile.pageContainer ).delay( 1500 )
.appendTo( $.mobile.pageContainer ).delay( 2500 )
.fadeOut( 400, function(){
$(this).remove();
});

1
APPL/Shared/UploadForm_save.asp
View File

@@ -250,6 +250,7 @@ Public Function VB_savefile(regFilter, flexAllowedExt, fullpath, doEncrypt)
Set VB_savefile = result
Exit Function
End If
CreateFullPath(fullpath)
If doEncrypt = "1" Then ''Encrypting
Set oZip = Server.CreateObject("SLNKDWF.Zip")