FCLT#63646 Graphics 2022 fixjes

svn path=/Website/trunk/; revision=53098
This commit is contained in:
Peter Feij
2021-09-21 10:56:57 +00:00
parent dfba32a57f
commit c1ea740320
2 changed files with 35 additions and 30 deletions

View File

@@ -61,7 +61,7 @@ else
function drag_onMouseOut(dragElement)
{
myHTML="<div style='color:red;font-family:Tahoma,Arial,Helvetica,sans-serif;font-size:8pt;cursor:move;'>" + dragElement.innerText + "</div>"
myHTML="<div class='dragging'>" + dragElement.innerText + "</div>"
parent.EnableDragAndDrop(notifyDrop, myHTML);
}
@@ -78,7 +78,7 @@ else
, note_key : dragElement.getAttribute("note_key")
, dwgX : dwgX
, dwgY : dwgY
, room_key : (ruimteKey?ruimteKey:null)
, room_key : (ruimteKey?ruimteKey:-1)
};
<% protectRequest.dataToken("data"); %>
$.post("rap_prj8_save.asp",
@@ -120,7 +120,7 @@ else
function DraggableName(oRs)
{
var nm = oRs("prj_scenario_note_nr").Value;
return "<font class='draggable'" + " note_key=" + oRs("prj_scenario_note_key").Value + ">" + L("lcl_prj_scenario_draggable_note")+"&nbsp;"+nm + "</font>"
return "<span class='draggable'" + " note_key=" + oRs("prj_scenario_note_key").Value + ">" + I("fa-diamond")+ "&nbsp;" + L("lcl_prj_scenario_draggable_note")+"&nbsp;"+nm + "</span>"
}
buttons = [{ icon: "fa-plus", title: L("lcl_prj_add_scenario_note"), action: "addScenarioNote()" }];

View File

@@ -24,39 +24,44 @@ var actie = getFParam("actie");
function doPlace()
{
note_key = getFParamInt("note_key");
room_key = getFParamInt("room_key", null);
room_key = getFParamInt("room_key", -1);
dwgX = getFParam("dwgX");
dwgY = getFParam("dwgY");
var sql = "SELECT 'x'"
+ " FROM prj_scenario_note"
+ " WHERE prj_scenario_note_key = " + note_key;
// buiten de plattegrond gedropt doen we niks mee.
// overweging had ook kunnen zijn dat we de ruimte niet aanpassen maar de xy wel
// hiervoor kwam er echter een Aiai, dus dan is dit zeker beter.
if (room_key > 0)
{
var sql = "SELECT 'x'"
+ " FROM prj_scenario_note"
+ " WHERE prj_scenario_note_key = " + note_key;
if (Oracle.Execute(sql).eof)
sql = "INSERT INTO prj_scenario_note "
+ " ( prj_scenario_note_key"
+ " , prj_scenario_note_dwgX"
+ " , prj_scenario_note_dwgY"
+ " , alg_verdieping_key"
+ " , prj_ruimte_key"
+ ") VALUES"
+ " (" + prj_scenario_note_key
+ " ," + dwgX
+ " ," + dwgY
+ " ," + floorKey
+ " ," + room_key
+ " )"
else
sql = "UPDATE prj_scenario_note"
+ " SET prj_scenario_note_dwgX = " + dwgX
+ " , prj_scenario_note_dwgY = " + dwgY
+ " , prj_ruimte_key = " + room_key
+ " , prj_scenario_note_aanmaak = SYSDATE" // mutatiedatum is relevanter dan ooit aangemaakt
+ " WHERE prj_scenario_note_key = " + note_key
Oracle.Execute(sql)
if (Oracle.Execute(sql).eof)
sql = "INSERT INTO prj_scenario_note "
+ " ( prj_scenario_note_key"
+ " , prj_scenario_note_dwgX"
+ " , prj_scenario_note_dwgY"
+ " , alg_verdieping_key"
+ " , prj_ruimte_key"
+ ") VALUES"
+ " (" + prj_scenario_note_key
+ " ," + dwgX
+ " ," + dwgY
+ " ," + floorKey
+ " ," + room_key
+ " )"
else
sql = "UPDATE prj_scenario_note"
+ " SET prj_scenario_note_dwgX = " + dwgX
+ " , prj_scenario_note_dwgY = " + dwgY
+ " , prj_ruimte_key = " + room_key
+ " , prj_scenario_note_aanmaak = SYSDATE" // mutatiedatum is relevanter dan ooit aangemaakt
+ " WHERE prj_scenario_note_key = " + note_key
Oracle.Execute(sql)
}
}
var message = "";
switch (actie)
{