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

LPNL#70357 kleuren toHexValue

Browse Source 
svn path=/Website/trunk/; revision=54504
This commit is contained in:
Koen Reefman
2022-01-13 10:32:13 +00:00
parent 0d100e4f37
commit a293d428f1
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
APPL/CAD/FGII.inc
View File

@@ -491,7 +491,7 @@ function kleurThema(cHandle, kleurProps)
rs_r = Oracle.Execute(sql);
while (!rs_r.EOF)
{
var kleur = parseInt(rs_r("cad_legendawaarde_rgb").value, 16)||0;
var kleur = parseInt(toHexValue(rs_r("cad_legendawaarde_rgb").value), 16)||0;
if (!(rs_r("cad_legendawaarde_value").Value in legenda))
legenda[rs_r("cad_legendawaarde_value").Value] = { kleur: kleur, count: 0, tekst: rs_r("cad_legendawaarde_omschr").Value };
@@ -542,13 +542,13 @@ function kleurThema(cHandle, kleurProps)
+ " WHERE ti.cad_legenda_key = " + schKey
+ " ORDER BY fac.safe_to_number(ti.cad_legendawaarde_value)";
var rs_r2 = Oracle.Execute(sql2);
var prevColor = parseInt(rs_r2("cad_legendawaarde_rgb").value, 16)||0;
var prevColor = parseInt(toHexColor(rs_r2("cad_legendawaarde_rgb").value), 16)||0;
while (!rs_r.EOF)
{
// Schuif rs_r2 vooruit om te zien waar onze range eindigt
while (!rs_r2.EOF && rs_r2("waarde").value <= rs_r("waarde").value)
{
prevColor = parseInt(rs_r2("cad_legendawaarde_rgb").value, 16)||0;
prevColor = parseInt(toHexColor(rs_r2("cad_legendawaarde_rgb").value), 16)||0;
rs_r2.MoveNext();
}
// prevColor is nu de laatste kleur die nog kleiner is

2
APPL/CAD/InfoBord.asp
View File

@@ -511,7 +511,7 @@ while (!oRs.Eof)
desc += " ("+oRs("aantal").Value+ ")";
Response.Write("\n<input type='button' value='" + safe.htmlattr(desc) + "'"
+ (oRs("alg_verdieping_key").Value == floor_key?" class='selected flrbutton'":"class='flrbutton'")
+ (0 && oRs("cad_legendawaarde_rgb").Value ? " style='background-color:#" + oRs("cad_legendawaarde_rgb").Value + "'":"")
+ (0 && oRs("cad_legendawaarde_rgb").Value ? " style='background-color:#" + safe.htmlattr(toHexValue(oRs("cad_legendawaarde_rgb").Value)) + "'":"")
+ " onclick='OnFloorChanged(this, "+oRs("alg_verdieping_key").Value+", showmode)'"
+">");
last_floor_key = oRs("alg_verdieping_key").Value;

4
APPL/CAD/legenda.asp
View File

@@ -228,7 +228,7 @@
%>
<TR
<% if (isUpdatable && v_waarde_key != null) { %>
class='legendaupdatable' onmousedown='mydragstartLegenda(event, "<%=safe.htmlattr(v_kleur)%>", "<%=v_waarde_key%>");'
class='legendaupdatable' onmousedown='mydragstartLegenda(event, "<%=safe.htmlattr(toHexValue(v_kleur))%>", "<%=v_waarde_key%>");'
<% } else {
if ((themaType == 0x01))
{ %>
@@ -238,7 +238,7 @@
>
<TD class='legendaregel'>
<div class='legendakleur'>
<div style="border:8px solid #<%=safe.htmlattr(v_kleur)%>;line-height:0px;font-size:0px;">&nbsp;</div>
<div style="border:8px solid #<%=safe.htmlattr(toHexValue(v_kleur))%>;line-height:0px;font-size:0px;">&nbsp;</div>
</div>
</TD>
<TD class='legendatekst' title="<%=safe.htmlattr(v_waarde)%><%=v_count%>"><%=safe.html(v_waarde)%></TD>

2
APPL/CAD/showGebouw.asp
View File

@@ -340,7 +340,7 @@ else // Ruimte mode
desc += " ("+oRs("aantal").Value+ ")";
Response.Write("\n<input type='button' value='" + safe.htmlattr(desc) + "'"
+ (oRs("alg_verdieping_key").Value == floor_key?" class='selected'":"")
+ (oRs("cad_legendawaarde_rgb").Value ? " style='background-color:#" + oRs("cad_legendawaarde_rgb").Value + "'":"")
+ (oRs("cad_legendawaarde_rgb").Value ? " style='background-color:#" + safe.htmlattr(toHexValue(oRs("cad_legendawaarde_rgb").Value)) + "'":"")
+ " onclick='OnFloorChanged(this, "+oRs("alg_verdieping_key").Value+")'"
+">");
last_floor_key = oRs("alg_verdieping_key").Value;

2
APPL/PDA/plattegrond.asp
View File

@@ -218,7 +218,7 @@ imgurl += "&sizeY=" + (1*sizeY);
v_waarde_key = oRs.Fields("waarde_key").value;
}
%>
<div class='mlegendaregel'><span style="background-color: #<%=safe.htmlattr(v_kleur)%>; padding: 0 10px;">&nbsp;&nbsp;</span> <%=safe.html(v_waarde)%> <%=v_count%></div>
<div class='mlegendaregel'><span style="background-color: #<%=safe.htmlattr(toHexValue(v_kleur))%>; padding: 0 10px;">&nbsp;&nbsp;</span> <%=safe.html(v_waarde)%> <%=v_count%></div>
<%
oRs.MoveNext();
}

2
APPL/PDA/res_plattegrond.asp
View File

@@ -233,7 +233,7 @@ imgurl += "&sizeY=" + (1*sizeY);
v_waarde_key = oRs.Fields("waarde_key").value;
}
%>
<div class='mlegendaregel'><span style="background-color: #<%=safe.htmlattr(v_kleur)%>; padding: 0 10px;">&nbsp;&nbsp;</span> <%=safe.html(v_waarde)%> </div>
<div class='mlegendaregel'><span style="background-color: #<%=safe.htmlattr(toHexValue(v_kleur))%>; padding: 0 10px;">&nbsp;&nbsp;</span> <%=safe.html(v_waarde)%> </div>
<%
oRs.MoveNext();
}