From 2e2083158284587ac270aca1e0fc014edceb63d4 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Thu, 3 Jan 2019 11:15:33 +0100
Subject: [PATCH] Ajout de logs dans la console
---
.../externs/formReader/formReaderDrtv.js | 2 +-
.../externs/formReader/formReaderSrvc.js | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/vitis/client/javascript/externs/formReader/formReaderDrtv.js b/src/vitis/client/javascript/externs/formReader/formReaderDrtv.js
index 609e6316..5a90b945 100644
--- a/src/vitis/client/javascript/externs/formReader/formReaderDrtv.js
+++ b/src/vitis/client/javascript/externs/formReader/formReaderDrtv.js
@@ -504,7 +504,7 @@ formReader.formReaderDirective = function ($q, formReaderService, propertiesSrvc
}
}
}
-
+
/**
* Ajoute des watchers pour déclencher les dynamic values
*
diff --git a/src/vitis/client/javascript/externs/formReader/formReaderSrvc.js b/src/vitis/client/javascript/externs/formReader/formReaderSrvc.js
index c4dfddeb..968cad29 100644
--- a/src/vitis/client/javascript/externs/formReader/formReaderSrvc.js
+++ b/src/vitis/client/javascript/externs/formReader/formReaderSrvc.js
@@ -707,6 +707,8 @@ formReader.formReaderService = function ($translate, $rootScope, $q, $log, $time
*/
"translateCustomTernaryString": function (sString, bIsCondition, oFormValues, sFormDefinitionName) {
+ var this_ = this;
+
// Verif type
if (!goog.isString(sString)) {
return null;
@@ -725,6 +727,7 @@ formReader.formReaderService = function ($translate, $rootScope, $q, $log, $time
// Remplace les attributs
var sReplacer;
+ var sValue;
for (var i = 0; i < aAttrs.length; i++) {
if (goog.isDefAndNotNull(aAttrs[i][0]) && goog.isDefAndNotNull(aAttrs[i][1])) {
@@ -739,12 +742,26 @@ formReader.formReaderService = function ($translate, $rootScope, $q, $log, $time
if (goog.isDefAndNotNull(oFormValues[sFormDefinitionName][aAttrs[i][1]]['selectedOption']['value'])) {
sReplacer = 'oFormValues[sFormDefinitionName].' + aAttrs[i][1] + '.selectedOption.value';
}
+ sValue = oFormValues[sFormDefinitionName][aAttrs[i][1]]['selectedOption']['value'];
+ } else {
+ sValue = oFormValues[sFormDefinitionName][aAttrs[i][1]];
}
}
}
}
+ // log toutes les secondes
+ var iLogCounter_ = Date.now();
+ $rootScope.iLogCounter_ = angular.copy(iLogCounter_);
+ setTimeout(angular.bind(this, function (sAttr, sValue) {
+ if (iLogCounter_ === $rootScope.iLogCounter_ &&
+ goog.isDefAndNotNull(sAttr) &&
+ goog.isDefAndNotNull(sValue)) {
+ $log.log(sAttr + ' : ' + sValue);
+ }
+ }, aAttrs[i][0], sValue), 1000);
+ // Remplace
sString = sString.replace(aAttrs[i][0], sReplacer);
}
}
--
GitLab