From 1b73315c6db921ce827a07d59a6a8bc13db10545 Mon Sep 17 00:00:00 2001
From: Erik Groener <erik.groener@aareon.nl>
Date: Thu, 10 Mar 2016 14:14:38 +0000
Subject: [PATCH] FSN#35338 Alle CodeCharge schermen herschrijven naar gewoon
 ASP II

svn path=/Website/trunk/; revision=28440
---
 APPL/API2/model_cad_legendawaarde.inc | 7 ++++---
 APPL/MGT/cad_legendawaarde.js         | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/APPL/API2/model_cad_legendawaarde.inc b/APPL/API2/model_cad_legendawaarde.inc
index 5f6e41dbc3..e832a19cf9 100644
--- a/APPL/API2/model_cad_legendawaarde.inc
+++ b/APPL/API2/model_cad_legendawaarde.inc
@@ -92,8 +92,8 @@ function model_cad_legendawaarde()
     };
 
     function fnshowcolor(oRs)
-    {
-        var kleur = oRs.Fields("value_rgb").Value;
+    {   // Tonen van gekleurde blokjes bij de waarde in de lijst.
+        var kleur = (oRs.Fields("value_rgb").Value).replace(/ /g, "");
 
         return "<div style='width:20px; background-color:#" + safe.html(kleur) + "'><span style='padding:25px'>" + safe.html(kleur) + "</span></div>";
     }
@@ -119,7 +119,8 @@ function model_cad_legendawaarde()
             "hidden": true
         };
 
-        var kleur = '<span style="border:1px;width:16px;display: inline-block;background-color:#' + obj.value_rgb + '">&nbsp;</span>'
+        var rgb = (obj.value_rgb).replace(/ /g, "");
+        var kleur = '<span style="border:1px;width:16px;display: inline-block;background-color:#' + rgb + '">&nbsp;</span>'
                   + '&nbsp;' + L("cad_legendawaarde_select");
         fld._color.defaultvalue = kleur;
     }
diff --git a/APPL/MGT/cad_legendawaarde.js b/APPL/MGT/cad_legendawaarde.js
index f26f7d414b..3ad6a61f6b 100644
--- a/APPL/MGT/cad_legendawaarde.js
+++ b/APPL/MGT/cad_legendawaarde.js
@@ -41,7 +41,7 @@ function showColor()
 function acceptColor()
 {
     var kleur = $("#color_select").colorpicker("val");
-    var rgb = kleur.replace("#","");
+    var rgb = kleur.replace("#","").toUpperCase().trim();
 
     $("#value_rgb").val(rgb);
     $("#_color span").css("background-color", kleur);