From 7bfef84907cdea0447e9de4ea63cbf34da57560c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Olivier?= <clement@carfup.com>
Date: Tue, 4 Feb 2020 14:33:10 +0100
Subject: [PATCH] various fixing

---
 Carfup_PCFControls/Carfup_PCFControls.cdsproj           | 1 +
 Carfup_PCFControls/Other/Solution.xml                   | 2 +-
 IbanValidator/IbanValidator/ControlManifest.Input.xml   | 2 +-
 IbanValidator/IbanValidator/index.ts                    | 6 +++---
 SirenValidator/SirenValidator/ControlManifest.Input.xml | 2 +-
 SirenValidator/SirenValidator/index.ts                  | 4 ++--
 SiretValidator/SiretValidator/ControlManifest.Input.xml | 2 +-
 SiretValidator/SiretValidator/index.ts                  | 4 ++--
 8 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Carfup_PCFControls/Carfup_PCFControls.cdsproj b/Carfup_PCFControls/Carfup_PCFControls.cdsproj
index f48d1ff..17f35ea 100644
--- a/Carfup_PCFControls/Carfup_PCFControls.cdsproj
+++ b/Carfup_PCFControls/Carfup_PCFControls.cdsproj
@@ -43,6 +43,7 @@
     <ProjectReference Include="..\IbanValidator\IbanValidator.pcfproj" />
     <ProjectReference Include="..\SirenValidator\SirenValidator.pcfproj" />
     <ProjectReference Include="..\SiretValidator\SiretValidator.pcfproj" />
+    <ProjectReference Include="..\BICValidator\BICValidator.pcfproj" />
   </ItemGroup>
 
   <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
diff --git a/Carfup_PCFControls/Other/Solution.xml b/Carfup_PCFControls/Other/Solution.xml
index 3375e94..b8d9b69 100644
--- a/Carfup_PCFControls/Other/Solution.xml
+++ b/Carfup_PCFControls/Other/Solution.xml
@@ -8,7 +8,7 @@
       <LocalizedName description="Carfup_PCFControls" languagecode="1033" />
     </LocalizedNames>
     <Descriptions />
-    <Version>1.1.0.1</Version>
+    <Version>1.1.0.3</Version>
     <!-- Solution Package Type: Unmanaged(0)/Managed(1)/Both(2)-->
     <Managed>2</Managed>
     <Publisher>
diff --git a/IbanValidator/IbanValidator/ControlManifest.Input.xml b/IbanValidator/IbanValidator/ControlManifest.Input.xml
index 89909b3..8489c14 100644
--- a/IbanValidator/IbanValidator/ControlManifest.Input.xml
+++ b/IbanValidator/IbanValidator/ControlManifest.Input.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest>
-  <control namespace="Carfup" constructor="IbanValidator" version="0.0.10" display-name-key="Carfup.IbanValidator" description-key="IBAN validator for PCF" control-type="standard">
+  <control namespace="Carfup" constructor="IbanValidator" version="0.0.14" display-name-key="Carfup.IbanValidator" description-key="IBAN validator for PCF" control-type="standard">
     <!-- property node identifies a specific, configurable piece of data that the control expects from CDS -->
     <property name="IbanValue" display-name-key="IbanValidator_IbanValue" description-key="IBAN field value" of-type="SingleLine.Text" usage="bound" required="true" />
     <property name="IsValidIban" display-name-key="IbanValidator_IsValidIban" description-key="Is IBAN valid" of-type="TwoOptions" usage="bound" required="false" />
diff --git a/IbanValidator/IbanValidator/index.ts b/IbanValidator/IbanValidator/index.ts
index 5a94667..9a0e314 100644
--- a/IbanValidator/IbanValidator/index.ts
+++ b/IbanValidator/IbanValidator/index.ts
@@ -137,7 +137,7 @@ export class IbanValidator implements ComponentFramework.StandardControl<IInputs
 		else {
 			this._context.resources.getResource("img/" + imageName + ".png",
 				data => {
-					this._ibanValueElement.setAttribute("src", this.generateImageSrcUrl(".png", data));
+					this._ibanValueValidationElement.setAttribute("src", this.generateImageSrcUrl(".png", data));
 				},
 				() => {
 					console.log('Error when downloading ' + imageName + '.png image.');
@@ -161,9 +161,9 @@ export class IbanValidator implements ComponentFramework.StandardControl<IInputs
 			}
 		}
 		
-		var iconToDisplay = this._iconValid == "" || this._iconValid == undefined ? "ValidIcon.png" : this._iconValid;
+		var iconToDisplay = this._iconValid == "null" || this._iconValid == "" || this._iconValid == undefined ? "IconValid" : this._iconValid;
 		if(!this._isValidIban){
-			iconToDisplay = this._iconInvalid == "" || this._iconValid == undefined ? "InvalidIcon.png" : this._iconInvalid;
+			iconToDisplay = this._iconValid == "null" ||  this._iconInvalid == "" || this._iconValid == undefined ? "IconInvalid" : this._iconInvalid;
 		} 
 
 		this.findAndSetImage(iconToDisplay);
diff --git a/SirenValidator/SirenValidator/ControlManifest.Input.xml b/SirenValidator/SirenValidator/ControlManifest.Input.xml
index 29b3160..55eb35c 100644
--- a/SirenValidator/SirenValidator/ControlManifest.Input.xml
+++ b/SirenValidator/SirenValidator/ControlManifest.Input.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest>
-  <control namespace="Carfup" constructor="SirenValidator" version="0.0.8" display-name-key="Carfup.SirenValidator" description-key="Siren Validator for PCF" control-type="standard">
+  <control namespace="Carfup" constructor="SirenValidator" version="0.0.10" display-name-key="Carfup.SirenValidator" description-key="Siren Validator for PCF" control-type="standard">
     <!-- property node identifies a specific, configurable piece of data that the control expects from CDS -->
     <property name="SirenValue" display-name-key="SirenValidator_SirenValue" description-key="Siren field value" of-type="SingleLine.Text" usage="bound" required="true" />
     <property name="IsValid" display-name-key="SiretValidator_IsValid" description-key="Is Siret valid" of-type="TwoOptions" usage="bound" required="false" />
diff --git a/SirenValidator/SirenValidator/index.ts b/SirenValidator/SirenValidator/index.ts
index 51af743..651251d 100644
--- a/SirenValidator/SirenValidator/index.ts
+++ b/SirenValidator/SirenValidator/index.ts
@@ -181,9 +181,9 @@ export class SirenValidator implements ComponentFramework.StandardControl<IInput
 			}
 		}
 
-		var iconToDisplay = this._iconValid == "" || this._iconValid == undefined ? "ValidIcon" : this._iconValid;
+		var iconToDisplay = this._iconValid == "null" ||  this._iconValid == "" || this._iconValid == undefined ? "IconValid" : this._iconValid;
 		if(!this._isValid){
-			iconToDisplay = this._iconInvalid == "" || this._iconValid == undefined ? "InvalidIcon" : this._iconInvalid;
+			iconToDisplay = this._iconValid == "null" ||  this._iconInvalid == "" || this._iconValid == undefined ? "IconInvalid" : this._iconInvalid;
 		} 
 
 		this.findAndSetImage(iconToDisplay);
diff --git a/SiretValidator/SiretValidator/ControlManifest.Input.xml b/SiretValidator/SiretValidator/ControlManifest.Input.xml
index 3af5a4a..f92eb9c 100644
--- a/SiretValidator/SiretValidator/ControlManifest.Input.xml
+++ b/SiretValidator/SiretValidator/ControlManifest.Input.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest>
-  <control namespace="Carfup" constructor="SiretValidator" version="0.0.8" display-name-key="Carfup.SiretValidator" description-key="Siret Validator for PCF" control-type="standard">
+  <control namespace="Carfup" constructor="SiretValidator" version="0.0.10" display-name-key="Carfup.SiretValidator" description-key="Siret Validator for PCF" control-type="standard">
     <!-- property node identifies a specific, configurable piece of data that the control expects from CDS -->
     <property name="SiretValue" display-name-key="SiretValidator_SiretValue" description-key="Siret field value" of-type="SingleLine.Text" usage="bound" required="true" />
     <property name="IsValid" display-name-key="SiretValidator_IsValid" description-key="Is Siret valid" of-type="TwoOptions" usage="bound" required="false" />
diff --git a/SiretValidator/SiretValidator/index.ts b/SiretValidator/SiretValidator/index.ts
index 388eb09..e06d670 100644
--- a/SiretValidator/SiretValidator/index.ts
+++ b/SiretValidator/SiretValidator/index.ts
@@ -188,9 +188,9 @@ export class SiretValidator implements ComponentFramework.StandardControl<IInput
 			}
 		}
 
-		var iconToDisplay = this._iconValid == "" || this._iconValid == undefined ? "ValidIcon" : this._iconValid;
+		var iconToDisplay = this._iconValid == "null" ||  this._iconValid == "" || this._iconValid == undefined ? "IconValid" : this._iconValid;
 		if(!this._isValid){
-			iconToDisplay = this._iconInvalid == "" || this._iconValid == undefined ? "InvalidIcon" : this._iconInvalid;
+			iconToDisplay = this._iconValid == "null" ||  this._iconInvalid == "" || this._iconValid == undefined ? "IconInvalid" : this._iconInvalid;
 		} 
 		
 		this.findAndSetImage(iconToDisplay);