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

Merge 5.3.1 Gold D patches in wording

Browse Source 
svn path=/Website/trunk/; revision=18367
This commit is contained in:
Jos Groot Lipman
2013-07-04 14:46:43 +00:00
parent aea8a83a34
commit 21f4d5b168
18 changed files with 110 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/API/api_ressoap.asp
View File

@@ -234,7 +234,7 @@
{ dbs: "res_status_bo_key", typ: "key", val: 2 } // ingevoerd
]);
var resIns = buildInsert("res_rsv_ruimte", fields);
var resIns = buildInsert("res_rsv_ruimte", fields, { noValidateToken: true });
rsv_ruimte_key = resIns.sequences["res_rsv_ruimte_key"];
sql = "BEGIN "
+ resIns.sql + ";"

6
APPL/CAD/default.asp
View File

@@ -521,7 +521,7 @@ if (scenario_key != 0)
var url = "../cad/PrintFG.asp";
url += "?XSLmode=" + data.style;
url += getCustomParameters();
pngURL = MMap.GetPrintURL(true); // true for current zoom
var pngURL = MMap.GetPrintURL(true); // true for current zoom
if (data.allFloor)
{
@@ -535,6 +535,10 @@ if (scenario_key != 0)
{
data.DWGscale = MMap.gSLNKEvent.scaleY;
}
else if (data.DWGscale == -1) // Maximaal
{
pngURL += "&maximize=1"; // omdat anders -1 een aanduiding is van DWGSchaal 1:1
}
else if (data.DWGscale > 0) // factor gekozen in select-box
{
data.DWGscale = -data.DWGscale; // speel vals: negatief betekent: paperScale (ipv. pixelScale)

33
APPL/PRJ/RuimteSync.asp
View File

@@ -22,17 +22,6 @@ ctKey = getFParamInt("tKey"); // Required CAD_TEKENING_KEY
scenario_key = getFParamInt("scenariokey", "NULL"); // Optional scenario_key
/***** End get webform parameters *****/
// 2005-09-05T13:14:37.000+01:00
// http://www.merlyn.demon.co.uk/js-date3.htm#XML
function CvtXML(In)
{
var D = In.replace(/^(\d{4})-(\d\d)-(\d\d)T([0-9:]*)([.0-9]*)(.)(\d\d):(\d\d)$/,
'$1/$2/$3 $4 GMT$6$7$8')
D = Date.parse(D) + 1000*RegExp.$5
return (new Date(D))
}
if (1) // Inout
{
sql = "SELECT cad_tekening_key,"
@@ -60,11 +49,7 @@ if (!oRs.Eof)
}
else
{
var slnkXML = Server.CreateObject("MSXML2.DOMDocument.4.0");
var slnkContoursNode;
slnkXML.loadXML(GetContoursXML(fname, S("fg_contourlayers"), S("fg_labellayers"), S("fg_contour_minArea")));
slnkXML.setProperty("SelectionLanguage", "XPath");
slnkContoursNode = slnkXML.selectNodes("SLNKDWFContours/SLNKDWFContour");
var dwfHandle = GetContoursHandle(fname, S("fg_contourlayers"), S("fg_labellayers"), S("fg_contour_minArea"));
// Oude contouren opruimen
sql = "DELETE FROM CAD_IMP_CONTOUR "
@@ -75,30 +60,32 @@ if (!oRs.Eof)
sql += " AND prj_scenario_key = " + scenario_key;
Oracle.Execute(sql)
for (i=0; i < slnkContoursNode.length; i++)
for (var i=0; i < dwfHandle.ContourCount; i++)
{
oLabel = slnkContoursNode.item(i).attributes.getNamedItem("Label");
var cont = dwfHandle.ContourItem(i);
oLabel = cont.Label;
if (oLabel)
{
oOpp = slnkContoursNode.item(i).attributes.getNamedItem("Area");
oOpp = cont.Area;
if (oOpp)
{
sql = "INSERT INTO CAD_IMP_CONTOUR "
+" (prj_scenario_key, cad_tekening_key, cad_imp_contour_nr, cad_imp_contour_opp)"
+" VALUES("+scenario_key
+ "," + ctKey
+ ", " + safe.quoted_sql(oLabel.text)
+ "," + oOpp.text/1e6 + ")";
+ ", " + safe.quoted_sql(oLabel)
+ "," + oOpp / 1e6 + ")";
Oracle.Execute(sql);
}
}
}
__Log("Scannen tekening " + teknaam + " met " + slnkContoursNode.length + " contouren")
__Log("Scannen tekening " + teknaam + " met " + dwfHandle.ContourCount + " contouren")
sql = "UPDATE cad_tekening "
+ " SET cad_tekening_geimporteerd = SYSDATE"
+ " WHERE cad_tekening_key = " + ctKey;
Oracle.Execute(sql);
msg = L("lcl_prj_ready_dwfscan").format(oRs("CAD_TEKENING_FILENAAM").Value + ".DWF", slnkContoursNode.length);
msg = L("lcl_prj_ready_dwfscan").format(oRs("CAD_TEKENING_FILENAAM").Value + ".DWF", dwfHandle.ContourCount);
}
// Kan er maar een zijn oRs.MoveNext();
}

16
APPL/PRJ/edit_bezetting.asp
View File

@@ -28,21 +28,21 @@ var authparams = user.checkAutorisation(autfunction);
<% FCLTHeader.Generate(); %>
<% var pwp_key = getQParamInt("pwp_key"); // Werkplek key
var doUpdate = getQParamInt("doUpdate", 0) == 1; // Moet ik bijwerken? (dan autoclose)
var doUpdate = getFParamInt("doUpdate", 0) == 1; // Moet ik bijwerken? (dan autoclose)
var sql = "";
if (doUpdate)
{
protectRequest.validateToken();
var wp_bez = getQParamInt("wp_bez");
var wp_oms = getQParam("wp_oms");
var wp_seq = getQParamInt("wp_seq");
var wp_key = getQParamInt("wp_key");
var wp_vast = (getQParam("wp_vast") == "vast")? "1" : "null";
var wp_bez = getFParamInt("wp_bez");
var wp_oms = getFParam("wp_oms");
var wp_seq = getFParamInt("wp_seq");
var wp_key = getFParamInt("wp_key");
var wp_vast = (getFParam("wp_vast") == "vast")? "1" : "null";
var wp_opp = "null";
if (wp_vast == "1")
{
var wp_opp = getQParamFloat("wp_opp");
var wp_opp = getFParamFloat("wp_opp");
if (isNaN(wp_opp)) wp_opp = "null";
}
@@ -178,7 +178,7 @@ var authparams = user.checkAutorisation(autfunction);
}
</script>
<form name="u2" method="get">
<form name="u2" method="post">
<INPUT type='hidden' name='pwp_key' id='pwp_key' value='<%=pwp_key%>'>
<INPUT type='hidden' name='wp_key' id='wp_key' value='<%=oRs("prj_werkplek_key")%>'>
<INPUT type='hidden' name='doUpdate' id='doUpdate' value='1'>

16
APPL/PRJ/edit_note.asp
View File

@@ -21,8 +21,8 @@
var scenario_key = getQParamInt("scenario_key"); // scenario key
var floor_key = getQParamInt("vKey"); // verdieping key
var note_nr = -1; // note nr (volgnummer)
var doUpdate = getQParamInt("doUpdate", 0) == 1; // Moet ik bijwerken? (dan autoclose)
var doDelete = getQParamInt("doDelete", 0) == 1; // Moet ik verwijderen? (dan autoclose)
var doUpdate = getFParamInt("doUpdate", 0) == 1; // Moet ik bijwerken? (dan autoclose)
var doDelete = getFParamInt("doDelete", 0) == 1; // Moet ik verwijderen? (dan autoclose)
var authparamsBOF = user.checkAutorisation("WEB_PRJBOF"); // om te bewerken
@@ -45,9 +45,9 @@
if (doUpdate)
{
protectRequest.validateToken();
var note_nr = getQParamInt("note_nr");
var note_descr = getQParam("note_descr", "");
var perslid_key = getQParamInt("perslid_key");
var note_nr = getFParamInt("note_nr");
var note_descr = getFParam("note_descr", "");
var perslid_key = getFParamInt("perslid_key");
if (note_key!=-1)
{
@@ -78,7 +78,7 @@
%>
<body class="modal" id="mod_pnotes">
<div id="mod_pnotes">
<form name=u2 method=get>
<form name=u2 method=post>
<%
if ((isNaN(scenario_key) || scenario_key==-1) && (isNaN(note_key) || note_key==-1))
@@ -130,7 +130,7 @@
function doSubmit()
{
if (document.forms.u2.note_descr.value != "")
document.forms.u2.submit();
document.u2.submit();
else
alert(L("lcl_prj_no_description_note"));
}
@@ -139,7 +139,7 @@
{
if (confirm(L("lcl_R_U_sure")))
{
document.forms.u2.doUpdate.value = 0;
document.u2.doUpdate.value = 0;
document.forms.u2.doDelete.value = 1;
document.forms.u2.submit();
}

8
APPL/PRJ/edit_room.asp
View File

@@ -23,13 +23,13 @@ var authparams = user.checkAutorisation(autfunction);
<head>
<% FCLTHeader.Generate(); %>
<% var room_key = getQParamInt("room_key");
var doUpdate = getQParamInt("doUpdate", 0) == 1; // Moet ik bijwerken? (dan autoclose)
var doUpdate = getFParamInt("doUpdate", 0) == 1; // Moet ik bijwerken? (dan autoclose)
if (doUpdate)
{
protectRequest.validateToken();
srtruimte_key = getQParamInt("srt_room_key");
room_descr = getQParam("room_descr", "");
srtruimte_key = getFParamInt("srt_room_key");
room_descr = getFParam("room_descr", "");
sql = "UPDATE prj_ruimte"
+ " SET alg_srtruimte_key = " + srtruimte_key
+ " , prj_ruimte_omschrijving = " + safe.quoted_sql(room_descr)
@@ -41,7 +41,7 @@ var authparams = user.checkAutorisation(autfunction);
</head>
<body class="modal" id="prjeditroom">
<form name=u2 method=get>
<form name=u2 method=post>
<%
var sql = "";

6
APPL/PRJ/rap_prj3.asp
View File

@@ -128,9 +128,9 @@ else
var url='../prj/edit_Bezetting.asp?pwp_key=' + bKey;
FcltMgr.openModalDetail(url, "<%=L("lcl_prj_graphics")%>",
{ callback: function (data)
{ if (data.changed)
parent.parent.parent.parent.myRefresh(); // Er is misschien iets veranderd.
// Pas plaatje aan. En indirect onszelf.
{ if (data.refresh)
parent.myRefresh(); // Er is misschien iets veranderd.
// Pas plaatje aan. En indirect onszelf.
}
})
}

2
APPL/PRJ/rap_prj5.asp
View File

@@ -64,7 +64,7 @@ else
var data = { actie : 'domove'
, deel_key : dragElement.getAttribute("myKey")
, room_key : SlnkEvent.key
, room_key : SlnkEvent.Key
, dwgX : dwgX
, dwgY : dwgY
};

51
APPL/PRJ/rap_prj6.asp
View File

@@ -31,11 +31,6 @@ var scenario_key = getQParamInt("scenario_key");
var TransitParams = "scenario_key=" + scenario_key
var outputmode = getQParamInt("outputmode", 0);
var showall = getQParamInt("showall", 0) == 1;
var emptybuffer = getQParamInt("emptybuffer", 0) == 1;
var fillbuffer = getQParamInt("fillbuffer", 0) == 1;
var doMove = getQParamInt("doMove", 0) == 1;
var dodetach = getQParamInt("dodetach", 0) == 1;
var doremoveWP = getQParamInt("doremoveWP", 0) == 1;
// ==========================
// Eventueel buffer bijwerken na (dubbel)klikken op plaatje
@@ -49,7 +44,7 @@ if (objKeys.length > 0)
}
var highlight = getQParamIntArray("highlight", []); // Comma-separated room_key_list
if (S("prs_werkplek_implicit") == 1 || fillbuffer) // Dan voegt selecteren (klikken in) ruimte alles toe aan buffer
if (S("prs_werkplek_implicit") == 1) // Dan voegt selecteren (klikken in) ruimte alles toe aan buffer
{
if (highlight.length > 0)
{
@@ -219,10 +214,10 @@ sql = "SELECT prj_selectie_key, prj_selectie_tabelkey, prj_selectie_tabelnaam,"
if (SlnkEvent.ContourLayer == "SLNK Contours") // PRJ_RUIMTE
{
var data = { actie : actie
, selKey : dragElement.selKey
, selKey : dragElement.getAttribute("selKey")
, tablekey : dragElement.getAttribute("tblKey")
, tablename : dragElement.getAttribute("tblName")
, room_key : SlnkEvent.key
, room_key : SlnkEvent.Key
, dwgX : dwgX
, dwgY : dwgY
};
@@ -231,7 +226,7 @@ sql = "SELECT prj_selectie_key, prj_selectie_tabelkey, prj_selectie_tabelnaam,"
{
var wpKey = SlnkEvent.Key.substring(2);
var data = { actie : actie
, selKey : dragElement.selKey
, selKey : dragElement.getAttribute("selKey")
, tablekey : dragElement.getAttribute("tblKey")
, tablename : dragElement.getAttribute("tblName")
, room_key : -1
@@ -242,10 +237,10 @@ sql = "SELECT prj_selectie_key, prj_selectie_tabelkey, prj_selectie_tabelnaam,"
{ // Gedropt op een bestaande persoon. Mogelijk past hij op de werkplek van die persoon bij
var pwpKey = SlnkEvent.Key;
var data = { actie : actie
, selKey : dragElement.selKey
, selKey : dragElement.getAttribute("selKey")
, tablekey : dragElement.getAttribute("tblKey")
, tablename : dragElement.getAttribute("tblName")
, room_key : SlnkEvent.RuimteKey
, room_key : SlnkEvent.Key
, pwpKey : pwpKey
};
}
@@ -257,12 +252,12 @@ sql = "SELECT prj_selectie_key, prj_selectie_tabelkey, prj_selectie_tabelnaam,"
if (actie != "")
{
data.scenario_key = <%=scenario_key %>;
<% protectRequest.dataToken("data"); %>
$.post("rap_prj6_save.asp",
data,
FcltCallback,
FcltCallbackAndThen(parent.myRefresh),
"json");
parent.myRefresh(); // Iets is misschien veranderd. Pas plaatje aan
};
dragend();
}
@@ -277,9 +272,8 @@ sql = "SELECT prj_selectie_key, prj_selectie_tabelkey, prj_selectie_tabelnaam,"
<% protectRequest.dataToken("data"); %>
$.post("rap_prj6_save.asp",
data,
FcltCallback,
FcltCallbackAndThen(parent.myRefresh),
"json");
parent.myRefresh(); // Iets is misschien veranderd. Pas plaatje aan
}
}
@@ -287,7 +281,15 @@ sql = "SELECT prj_selectie_key, prj_selectie_tabelkey, prj_selectie_tabelnaam,"
{
if (confirm("<%=L("lcl_prj_fillbufferQ").format(highlight.length)%>?"))
{
parent.myRefresh();
var data = { actie : "fillbuffer"
, highlight : "<%=highlight.join(",")%>"
, scenario_key : <%=scenario_key%>
};
<% protectRequest.dataToken("data"); %>
$.post("rap_prj6_save.asp",
data,
FcltCallbackAndThen(parent.myRefresh),
"json");
}
}
@@ -301,13 +303,13 @@ sql = "SELECT prj_selectie_key, prj_selectie_tabelkey, prj_selectie_tabelnaam,"
, prskey : prsKey
, wpkey : wpKey
, tablename : tblName
, scenario_key : <%=scenario_key%>
};
<% protectRequest.dataToken("data"); %>
$.post("rap_prj6_save.asp",
data,
FcltCallback,
FcltCallbackAndThen(parent.myRefresh),
"json");
parent.myRefresh(); // Iets is misschien veranderd. Pas plaatje aan
}
}
@@ -319,24 +321,19 @@ sql = "SELECT prj_selectie_key, prj_selectie_tabelkey, prj_selectie_tabelnaam,"
var data = { actie : "removewp"
, selKey : selKey
, wpkey : wpKey
, scenario_key : <%=scenario_key%>
};
<% protectRequest.dataToken("data"); %>
$.post("rap_prj6_save.asp",
data,
FcltCallback,
FcltCallbackAndThen(parent.myRefresh),
"json");
parent.myRefresh(); // Iets is misschien veranderd. Pas plaatje aan
}
}
function onLoad_prj6()
{
<%if (objKeys.length > 0 ||
emptybuffer ||
fillbuffer ||
doMove ||
dodetach ||
doremoveWP) { %>
<%if (objKeys.length > 0 ) { %>
{
parent.myRefresh(); // Iets is misschien veranderd. Pas plaatje aan
}
@@ -398,7 +395,7 @@ sql = "SELECT prj_selectie_key, prj_selectie_tabelkey, prj_selectie_tabelnaam,"
+ " src='../pictures/delete.gif' title='" + L("lcl_prj_delete_empty_wp") + "'>";
else
if (oRs("prj_perslidwerkplek_key").value != null) // perslid met werkplek
return "<img onclick='DetachWP(" + oRs("prj_selectie_key").value + ", this.tblName, "
return "<img onclick='DetachWP(" + oRs("prj_selectie_key").value + ", this.getAttribute(\"tblName\"), "
+ oRs("prj_perslidwerkplek_key").value + ","
+ oRs("prs_perslid_key").value + ","
+ oRs("prj_werkplek_key").value + ")'"

31
APPL/PRJ/rap_prj6_save.asp
View File

@@ -30,9 +30,8 @@ function emptyBuffer()
// ==========================
// Actie: emptybuffer
// ==========================
var scenarioKey = getFParamInt("scenario_key");
sql = "DELETE FROM prj_selectie "
+ " WHERE prj_scenario_key = " + scenarioKey
+ " WHERE prj_scenario_key = " + scenario_key
+ " AND prs_perslid_key = " + user_key;
Oracle.Execute(sql);
}
@@ -217,6 +216,28 @@ function AddToSelectionBuffer(prj_selectie_tabelnaam, prj_selectie_tabelkey)
Oracle.Execute(sql)
}
function fillBuffer()
{
var highlight = getFParamIntArray("highlight", []); // Comma-separated room_key_list
if (highlight.length > 0)
{
var sql = "SELECT PRJ_WERKPLEK_KEY"
+ " FROM PRJ_WERKPLEK prj_w,"
+ " prj_ruimte prj_r"
+ " WHERE prj_werkplek_verwijder IS NULL"
+ " AND prj_w.prj_ruimte_key = prj_r.prj_ruimte_key"
+ " AND prj_r.prj_scenario_key = " + scenario_key
+ " AND prj_w.prj_ruimte_key IN (" + highlight + ")";
var oRs = Oracle.Execute(sql);
while (!oRs.Eof)
{
AddToSelectionBuffer("PRJ_WERKPLEK", oRs("PRJ_WERKPLEK_KEY").value);
oRs.MoveNext();
}
}
}
var message = "";
switch (actie)
{
@@ -228,8 +249,10 @@ switch (actie)
break;
case 'removewp': removeWP();
break;
case 'fillbuffer': fillBuffer();
break;
}
var result = {message: message};
var result = {message: message, success: true};
Response.Write(JSON.stringify(result));
Response.End;
%>

6
APPL/PRJ/rap_prj7.asp
View File

@@ -177,9 +177,9 @@ else
{
var url='../prj/edit_room.asp?room_key=' + row.getAttribute("ROWKEY");
FcltMgr.openModalDetail(url, "<%=L("lcl_prj_graphics")%>",
{ callback: function (data) { if (data.changed)
parent.parent.parent.parent.myRefresh(); // Er is misschien iets veranderd.
// Pas plaatje aan. En indirect onszelf.
{ callback: function (data) { if (data.refresh)
parent.myRefresh(); // Er is misschien iets veranderd.
// Pas plaatje aan. En indirect onszelf.
}})
}

6
APPL/PRJ/rap_prj8.asp
View File

@@ -85,9 +85,8 @@ else
<% protectRequest.dataToken("data"); %>
$.post("rap_prj8_save.asp",
data,
FcltCallback,
FcltCallbackAndThen(parent.myRefresh),
"json");
parent.myRefresh();
}
else
alert("TODO: Dan niet");
@@ -97,7 +96,7 @@ else
function editNote(notekey)
{
var url = '../prj/edit_note.asp?scenario_key=<%=scenario_key%>&vKey=<%=floorKey%>&note_key=' + notekey;
FcltMgr.openModalDetail(url, "<%=L("lcl_prj_scenario_note_omschrijving")%>", { callback: FcltMgr.reload, width: 600});
FcltMgr.openModalDetail(url, "<%=L("lcl_prj_scenario_note_omschrijving")%>", { callback: parent.myRefresh, width: 600});
}
function onClickNote(row)
@@ -147,6 +146,7 @@ else
rst.addAction({ action: "onClickNote", caption: L("lcl_edit"), isDefault: true });
var cnt = rst.processResultset();
IFACE.FORM_END();
%>
</form>
</body>

2
APPL/PRJ/rap_prj8_save.asp
View File

@@ -64,7 +64,7 @@ switch (actie)
case 'doplace': doPlace();
break;
}
var result = {message: message};
var result = {message: message, success: true};
Response.Write(JSON.stringify(result));
Response.End;
%>

7
APPL/PRJ/rap_prj9.asp
View File

@@ -158,7 +158,6 @@ sql = " SELECT p.prs_perslid_key, "+ S("prs_pers_string") +" naam,"
{
document.u2.action="rap_prj9.asp?domove=1&scenario_key=<%=scenario_key%>"+
"&perslid_key="+dragElement.getAttribute("perslid_key")+"&room_key="+SlnkEvent.Key;
document.u2.target="_self";
document.u2.submit();
}
else if (SlnkEvent.Key && SlnkEvent.Key.match(/^W:/)) // PRJ_WERKPLEK
@@ -167,16 +166,14 @@ sql = " SELECT p.prs_perslid_key, "+ S("prs_pers_string") +" naam,"
document.u2.action="rap_prj9.asp?domove=1&scenario_key=<%=scenario_key%>"+
"&perslid_key="+dragElement.getAttribute("perslid_key")+"&room_key=-1"+
"&wpKey="+wpKey;
document.u2.target="_self";
document.u2.submit();
}
else if (SlnkEvent.Soort == "PRJ_PERSLIDWERKPLEK")
{ // Gedropt op een bestaande persoon. Mogelijk past hij op de werkplek van die persoon bij
pwpKey = SlnkEvent.Key;
document.u2.action="rap_prj9.asp?domove=1&scenario_key=<%=scenario_key%>"+
"&perslid_key="+dragElement.getAttribute("perslid_key")+"&room_key="+SlnkEvent.RuimteKey+
"&perslid_key="+dragElement.getAttribute("perslid_key")+"&room_key="+SlnkEvent.Key+
"&pwpKey="+pwpKey;
document.u2.target="_self";
document.u2.submit();
}
else if (typeof(SlnkEvent.Soort) != "undefined")
@@ -194,7 +191,7 @@ sql = " SELECT p.prs_perslid_key, "+ S("prs_pers_string") +" naam,"
</head>
<body class="prjtabpage" onLoad="PerhapsRefresh();initDragger()">
<form name='u2'>
<form name='u2' action="rap_prj9.asp" method="get" target="_self">
<%
function DraggableName(oRs)
{

13
APPL/SLE/sle_edit_srtdeel_save.asp
View File

@@ -264,13 +264,12 @@ else
sql = "UPDATE ins_deel"
+ " SET ins_alg_ruimte_key = NULL"
+ " , ins_alg_ruimte_type = NULL"
+ " WHERE ins_alg_ruimte_key IN"
+ " (SELECT id.ins_alg_ruimte_key"
+ " FROM ins_deel id"
+ " , ins_srtdeel isd"
+ " WHERE id.ins_srtdeel_key = isd.ins_srtdeel_key"
+ " AND isd.ins_srtgroep_key = " + S("cil_ins_srt_groep_key")
+ " AND id.ins_alg_ruimte_key = " + oRs("alg_ruimte_key").value + ")";
+ " WHERE ins_alg_ruimte_key = " + oRs("alg_ruimte_key").value
+ " AND ins_alg_ruimte_type = 'R'"
+ " AND ins_srtdeel_key IN " // Alleen cilinders natuurlijk
+ " (SELECT ins_srtdeel_key"
+ " FROM ins_srtdeel"
+ " WHERE ins_srtgroep_key = " + S("cil_ins_srt_groep_key") + ")";
oRs1 = Oracle.Execute(sql);
// Omschrijving met uniek volgnummer erin bepalen.

2
APPL/Shared/default-print.css
View File

@@ -35,7 +35,6 @@ table {
clear: both;
width: 100%;
border: 0px solid black;
padding: 3px 3px 3px 3px;
border-collapse: collapse;
}
@@ -49,6 +48,7 @@ table {
border-left: 1px solid #E0E0E0;
border-right: 1px solid #E0E0E0;
vertical-align: top;
padding: 3px 3px 3px 3px;
}
.headerlabel {

4
APPL/Shared/kenmerk_common.inc
View File

@@ -106,7 +106,7 @@ function BijlagenButton(pModule, pNiveau, pKey, tmpfolder, pKenmerk_key,
var filehtmlarr = [];
for (var file in lijst)
{
var href = protectQS.create(OpenFlexFile(pModule, pNiveau, pKey, pKenmerk_key, safe.jsstring(lijst[file])));
var href = protectQS.create(OpenFlexFile(pModule, pNiveau, pKey, pKenmerk_key, lijst[file]));
//var html = "<a href='" + safe.htmlattr(href) + "' target='_new'>" + safe.html(lijst[file]) + "</a>";
var html = '<input class="details fldflexM" " readonly=1'
+ ' onclick=\'window.open("' + safe.jsstring(href) + '")\' value="' + safe.htmlattr(lijst[file]) + '">';
@@ -805,7 +805,7 @@ function listKenmerk(sql, module, key, props)
kvClick = " title='" + L("lcl_flex_autocopy") +"' ";
else if (readonlyfield && val && !missing) // rechtstreeks openen
{
var fnclick = "parent.window.open('" + protectQS.create(OpenFlexFile(module, niveau, key, kkey, safe.jsstring(val))) + "')";
var fnclick = "parent.window.open('" + protectQS.create(OpenFlexFile(module, niveau, key, kkey, val)) + "')";
kvClick = " onclick='" + safe.htmlattr(fnclick) + "'";
}
else if (readonlyfield && val && missing) // Waarschuwen

2
APPL/SlnkDwf/Slnk2IMG.inc
View File

@@ -85,7 +85,7 @@ function SLNKDWF (myProps)
// De DLL kent alleen (nog) versie A dus rekenen we B terug naar A
// om dat te kunnen omrekenen hebben we DWGminX..DWGmaxY nodig
// maar die krijgen we dan gelukkig aangereikt door de aanroeper
if (_getParam("DWGminX","")=="")
if (_getParam("maximize","0")=="1" || _getParam("DWGminX","")=="")
{
var ox = _getParam("offsetX",0);
var oy = _getParam("offsetY",0);