diff --git a/src-db/database/model/tables/OBMOBC_LOGCLIENT_READABLE.xml b/src-db/database/model/tables/OBMOBC_LOGCLIENT_READABLE.xml
new file mode 100644
--- /dev/null
+++ b/src-db/database/model/tables/OBMOBC_LOGCLIENT_READABLE.xml
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml
--- a/src-db/database/sourcedata/AD_COLUMN.xml
+++ b/src-db/database/sourcedata/AD_COLUMN.xml
@@ -39,6 +39,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -150,6 +264,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -297,6 +449,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -642,6 +833,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -756,6 +983,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1333,6 +1596,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1788,6 +2092,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2854,6 +3196,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2895,6 +3276,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -3127,6 +3545,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml
--- a/src-db/database/sourcedata/AD_ELEMENT.xml
+++ b/src-db/database/sourcedata/AD_ELEMENT.xml
@@ -264,6 +264,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_FIELD.xml b/src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml
+++ b/src-db/database/sourcedata/AD_FIELD.xml
@@ -1,5 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -747,6 +777,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -801,6 +858,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1020,6 +1104,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1074,6 +1184,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1242,6 +1380,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1296,6 +1459,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1352,6 +1544,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1382,6 +1601,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1635,6 +1884,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_MENU.xml b/src-db/database/sourcedata/AD_MENU.xml
--- a/src-db/database/sourcedata/AD_MENU.xml
+++ b/src-db/database/sourcedata/AD_MENU.xml
@@ -14,6 +14,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_PREFERENCE.xml b/src-db/database/sourcedata/AD_PREFERENCE.xml
--- a/src-db/database/sourcedata/AD_PREFERENCE.xml
+++ b/src-db/database/sourcedata/AD_PREFERENCE.xml
@@ -77,6 +77,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_REF_LIST.xml b/src-db/database/sourcedata/AD_REF_LIST.xml
--- a/src-db/database/sourcedata/AD_REF_LIST.xml
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml
@@ -553,6 +553,17 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_TAB.xml b/src-db/database/sourcedata/AD_TAB.xml
--- a/src-db/database/sourcedata/AD_TAB.xml
+++ b/src-db/database/sourcedata/AD_TAB.xml
@@ -89,6 +89,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_TABLE.xml b/src-db/database/sourcedata/AD_TABLE.xml
--- a/src-db/database/sourcedata/AD_TABLE.xml
+++ b/src-db/database/sourcedata/AD_TABLE.xml
@@ -48,6 +48,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_TREENODE.xml b/src-db/database/sourcedata/AD_TREENODE.xml
--- a/src-db/database/sourcedata/AD_TREENODE.xml
+++ b/src-db/database/sourcedata/AD_TREENODE.xml
@@ -8,7 +8,7 @@
-
+
@@ -44,4 +44,15 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src-db/database/sourcedata/AD_WINDOW.xml b/src-db/database/sourcedata/AD_WINDOW.xml
--- a/src-db/database/sourcedata/AD_WINDOW.xml
+++ b/src-db/database/sourcedata/AD_WINDOW.xml
@@ -17,6 +17,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/org/openbravo/mobile/core/utils/LogClientLoader.java b/src/org/openbravo/mobile/core/utils/LogClientLoader.java
--- a/src/org/openbravo/mobile/core/utils/LogClientLoader.java
+++ b/src/org/openbravo/mobile/core/utils/LogClientLoader.java
@@ -20,13 +20,18 @@
import org.codehaus.jettison.json.JSONArray;
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
+import org.openbravo.base.model.ModelProvider;
+import org.openbravo.base.provider.OBProvider;
import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBDal;
import org.openbravo.dal.service.OBQuery;
import org.openbravo.data.UtilSql;
import org.openbravo.database.SessionInfo;
import org.openbravo.mobile.core.obmobcLogClient;
+import org.openbravo.mobile.core.obmobcLogClientReadable;
import org.openbravo.mobile.core.process.JSONProcessSimple;
+import org.openbravo.mobile.core.process.JSONPropertyToEntity;
+import org.openbravo.model.ad.access.User;
import org.openbravo.service.db.QueryTimeOutUtil;
import org.openbravo.service.json.JsonConstants;
@@ -51,7 +56,10 @@
try {
for (int i = 0; i < jsonarray.length(); i++) {
JSONObject jsonlogclient = jsonarray.getJSONObject(i);
- errorReturned = saveLogClient(jsonlogclient);
+ JSONObject objJson = new JSONObject(jsonlogclient.getString("json"));
+ boolean humanReadable = objJson.getBoolean("humanReadable");
+ errorReturned = humanReadable ? saveLogClientHumanReadable(jsonlogclient, objJson)
+ : saveLogClient(jsonlogclient);
if (errorReturned.length() != 0) {
error += errorReturned + "\n";
}
@@ -184,6 +192,44 @@
return error;
}
+ private String saveLogClientHumanReadable(JSONObject jsonlogclient, JSONObject objJson)
+ throws Exception {
+
+ long t0 = System.currentTimeMillis();
+ obmobcLogClientReadable logClient = null;
+ if (OBDal.getInstance().get(obmobcLogClientReadable.class, jsonlogclient.getString("id")) != null) {
+ // Duplicated message
+ return "";
+ }
+
+ logClient = OBProvider.getInstance().get(obmobcLogClientReadable.class);
+ logClient.setId(jsonlogclient.getString("id"));
+ logClient.setNewOBObject(true);
+
+ JSONPropertyToEntity.fillBobFromJSON(
+ ModelProvider.getInstance().getEntity(obmobcLogClientReadable.class), logClient, objJson);
+
+ updateAuditInfo(logClient, objJson);
+ OBDal.getInstance().save(logClient);
+
+ log.debug("Creation of Log Client records: " + (System.currentTimeMillis() - t0));
+ return "";
+ }
+
+ private void updateAuditInfo(obmobcLogClientReadable lc, JSONObject jsonorder)
+ throws JSONException {
+ Long value = jsonorder.getLong("created");
+ lc.setCreationDate(new Date(value));
+ lc.setUpdated(new Date(value));
+ String strUserId = "0";
+ if (jsonorder.optString("createdby", null) != null) {
+ strUserId = jsonorder.getString("createdby");
+ }
+ User createdby = OBDal.getInstance().getProxy(User.class, strUserId);
+ lc.setCreatedBy(createdby);
+ lc.setUpdatedBy(createdby);
+ }
+
@Override
protected boolean bypassPreferenceCheck() {
return true;
diff --git a/web/org.openbravo.mobile.core/source/component/dialog/ob-profile.js b/web/org.openbravo.mobile.core/source/component/dialog/ob-profile.js
--- a/web/org.openbravo.mobile.core/source/component/dialog/ob-profile.js
+++ b/web/org.openbravo.mobile.core/source/component/dialog/ob-profile.js
@@ -1,6 +1,6 @@
/*
************************************************************************************
- * Copyright (C) 2012-2017 Openbravo S.L.U.
+ * Copyright (C) 2012-2018 Openbravo S.L.U.
* Licensed under the Openbravo Commercial License version 1.0
* You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
* or in the legal folder of this module distribution.
@@ -289,6 +289,15 @@
OB.UTIL.HookManager.executeHooks('OBMOBC_ProfileDialogApply', {
profileDialogProp: this
}, function (args) {
+ var role = _.find(widgetForm.roleList.collection.models, function (r) {
+ return r.get('id') === newRoleId;
+ });
+ var language = _.find(widgetForm.langList.collection.models, function (l) {
+ return l.get('id') === newLanguageId;
+ });
+ if (role && language) {
+ OB.logUserAction('Change to role: ' + role.get('_identifier') + ', Language: ' + language.get('_identifier'));
+ }
OB.DS.allowRequests(false);
OB.UTIL.localStorage.setItem('POSlanguageId', newLanguageId);
OB.UTIL.localStorage.setItem('POSlanguageSk', newLanguageSk);
diff --git a/web/org.openbravo.mobile.core/source/component/dialog/ob-properties.js b/web/org.openbravo.mobile.core/source/component/dialog/ob-properties.js
--- a/web/org.openbravo.mobile.core/source/component/dialog/ob-properties.js
+++ b/web/org.openbravo.mobile.core/source/component/dialog/ob-properties.js
@@ -1,6 +1,6 @@
/*
************************************************************************************
- * Copyright (C) 2013-2017 Openbravo S.L.U.
+ * Copyright (C) 2013-2018 Openbravo S.L.U.
* Licensed under the Openbravo Commercial License version 1.0
* You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
* or in the legal folder of this module distribution.
@@ -39,6 +39,7 @@
});
},
applyChanges: function (inSender, inEvent) {
+ OB.logUserAction('Change ticket properties: ' + this.model.get('documentNo'));
this.waterfall('onApplyChange', {});
return true;
},
diff --git a/web/org.openbravo.mobile.core/source/component/ob-keyboard.js b/web/org.openbravo.mobile.core/source/component/ob-keyboard.js
--- a/web/org.openbravo.mobile.core/source/component/ob-keyboard.js
+++ b/web/org.openbravo.mobile.core/source/component/ob-keyboard.js
@@ -798,24 +798,30 @@
if (button.command) {
button.$.button.tap = function () {
- OB.UTIL.HookManager.executeHooks('OBMOBC_PrePaymentSelected', {
- paymentSelected: button,
- receipt: me.receipt
- }, function (args) {
- if (args && args.cancellation && args.cancellation === true) {
- return;
- }
- if (button.$.button.disabled) {
- return true;
- }
- if (button && button.definition && button.definition.includedInPopUp) {
- me.virtualKeypressHandler(button.command, {
- fromPopup: button.definition.includedInPopUp
- });
- } else {
- me.virtualKeypressHandler(button.command);
- }
- });
+ OB.logUserAction('Button pushed: ' + (this.content ? this.content : button.command));
+
+ var tapButton = function () {
+ if (button.$.button.disabled) {
+ return true;
+ }
+ if (button && button.definition && button.definition.includedInPopUp) {
+ me.virtualKeypressHandler(button.command, {
+ fromPopup: button.definition.includedInPopUp
+ });
+ } else {
+ me.virtualKeypressHandler(button.command);
+ }
+ };
+
+ if (button.definition && button.definition.canTap) {
+ button.definition.canTap(function (success) {
+ if (success) {
+ return tapButton();
+ }
+ });
+ } else {
+ return tapButton();
+ }
};
this.addButton(button.command, button.$.button);
diff --git a/web/org.openbravo.mobile.core/source/component/obpos-approval.js b/web/org.openbravo.mobile.core/source/component/obpos-approval.js
--- a/web/org.openbravo.mobile.core/source/component/obpos-approval.js
+++ b/web/org.openbravo.mobile.core/source/component/obpos-approval.js
@@ -1,6 +1,6 @@
/*
************************************************************************************
- * Copyright (C) 2014-2017 Openbravo S.L.U.
+ * Copyright (C) 2014-2018 Openbravo S.L.U.
* Licensed under the Openbravo Commercial License version 1.0
* You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
* or in the legal folder of this module distribution.
@@ -163,33 +163,50 @@
},
initComponents: function () {
- var i, j;
+ var i, j, logMsg = '',
+ hasLineBreak = false;
this.inherited(arguments);
+
+ function addLogMsg(msg) {
+ if (logMsg.length > 0) {
+ logMsg += '\r\n';
+ hasLineBreak = true;
+ }
+ logMsg += msg;
+ }
+
this.$.bodyContent.$.username.attributes.placeholder = OB.I18N.getLabel('OBMOBC_LoginUserInput');
this.$.bodyContent.$.password.attributes.placeholder = OB.I18N.getLabel('OBMOBC_LoginPasswordInput');
if (!Array.isArray(this.approvalType)) {
this.approvalType = [this.approvalType];
}
for (i = 0; i < this.approvalType.length; i++) {
+ var msg;
if (this.approvalType[i] instanceof Object) {
if (this.approvalType[i].message instanceof Object) {
// Complex format approvalType[i] = { message: [ { message, padding, fonstSize, fontWeight, color } ]}
for (j = 0; j < this.approvalType[i].message.length; j++) {
this.addTextComponent(this.approvalType[i].message[j]);
+ addLogMsg(this.approvalType[i].message[j].message);
}
} else {
// Approval with approvalType[i] = { message, params }
+ msg = OB.I18N.getLabel(this.approvalType[i].message, this.approvalType[i].params) || OB.I18N.getLabel('OBMOBC_ApprovalTextHeader');
this.addTextComponent({
- message: OB.I18N.getLabel(this.approvalType[i].message, this.approvalType[i].params) || OB.I18N.getLabel('OBMOBC_ApprovalTextHeader')
+ message: msg
});
+ addLogMsg(msg);
}
} else {
// Simple approval
+ msg = OB.I18N.labels[this.approvalType[i]] || OB.I18N.getLabel('OBMOBC_ApprovalTextHeader');
this.addTextComponent({
- message: OB.I18N.labels[this.approvalType[i]] || OB.I18N.getLabel('OBMOBC_ApprovalTextHeader')
+ message: msg
});
+ addLogMsg(msg);
}
}
+ OB.logUserAction('Raised approval for: ' + (hasLineBreak ? '\r\n' : ' ') + logMsg);
this.postRenderActions();
},
@@ -324,9 +341,11 @@
OB.UTIL.checkApproval(this.approvalType, u, p, function (approved, supervisor, approvalType, continueCallback, warningMsg) {
if (!OB.UTIL.isNullOrUndefined(warningMsg)) {
me.$.bodyContent.$.approvalWarning.setContent(warningMsg);
+ OB.logUserAction('Approval warning: ' + warningMsg);
return;
}
if (continueCallback) {
+ OB.logUserAction('Approved by User: ' + u);
if (me.model && me.model.approvedRequest) {
me.model.approvedRequest(approved, supervisor, approvalType, me.callback);
} else {
diff --git a/web/org.openbravo.mobile.core/source/model/logclient.js b/web/org.openbravo.mobile.core/source/model/logclient.js
--- a/web/org.openbravo.mobile.core/source/model/logclient.js
+++ b/web/org.openbravo.mobile.core/source/model/logclient.js
@@ -1,6 +1,6 @@
/*
************************************************************************************
- * Copyright (C) 2012-2016 Openbravo S.L.U.
+ * Copyright (C) 2012-2018 Openbravo S.L.U.
* Licensed under the Openbravo Commercial License version 1.0
* You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
* or in the legal folder of this module distribution.
@@ -17,9 +17,9 @@
entityName: 'LogClient',
source: 'org.openbravo.mobile.core.master.LogClient',
local: true,
- createStatement: 'CREATE TABLE IF NOT EXISTS obmobc_logclient (obmobc_logclient_id TEXT PRIMARY KEY, deviceId TEXT, cacheSessionId TEXT, msg TEXT, json CLOB, loglevel TEXT, created TEXT, createdby TEXT)',
+ createStatement: 'CREATE TABLE IF NOT EXISTS obmobc_logclient (obmobc_logclient_id TEXT PRIMARY KEY, deviceId TEXT, cacheSessionId TEXT, msg TEXT, json CLOB, loglevel TEXT, humanReadable TEXT, created TEXT, createdby TEXT)',
dropStatement: 'DROP TABLE IF EXISTS obmobc_logclient',
- insertStatement: 'INSERT INTO obmobc_logclient (obmobc_logclient_id, deviceId, cacheSessionId, msg, json, loglevel, created, createdby) VALUES (?,?,?,?,?,?,?,?)',
+ insertStatement: 'INSERT INTO obmobc_logclient (obmobc_logclient_id, deviceId, cacheSessionId, msg, json, loglevel, humanReadable, created, createdby) VALUES (?,?,?,?,?,?,?,?,?)',
serializeToJSON: function () {
return JSON.parse(JSON.stringify(this.toJSON()));
}
@@ -51,6 +51,10 @@
column: 'loglevel',
type: 'TEXT'
}, {
+ name: 'humanReadable',
+ column: 'humanReadable',
+ type: 'TEXT'
+ }, {
name: 'created',
column: 'created',
type: 'TEXT'
diff --git a/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js b/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
--- a/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
+++ b/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js
@@ -2040,6 +2040,8 @@
postLoginActions: function () {
OB.debug("next process: none");
+ var context = OB.MobileApp.model.get('context');
+ OB.logUserAction('Login user: ' + (context && context.user ? OB.MobileApp.model.get('context').user.username : '-'));
},
loginUsingCache: function () {
@@ -2301,6 +2303,8 @@
* Override this method if your app needs to do something special
*/
preLogoutActions: function (callback) {
+ var context = OB.MobileApp.model.get('context');
+ OB.logUserAction('Logout user: ' + (context && context.user ? OB.MobileApp.model.get('context').user.username : '-'));
callback();
},
diff --git a/web/org.openbravo.mobile.core/source/retail/component/ob-retail-searchproductcharacteristic.js b/web/org.openbravo.mobile.core/source/retail/component/ob-retail-searchproductcharacteristic.js
--- a/web/org.openbravo.mobile.core/source/retail/component/ob-retail-searchproductcharacteristic.js
+++ b/web/org.openbravo.mobile.core/source/retail/component/ob-retail-searchproductcharacteristic.js
@@ -1271,6 +1271,7 @@
brandString = '',
i, j, forceRemote, doLocalIfRemoteFails = true;
+ OB.logUserAction('Search products: "' + inEvent.productName + '"');
// Disable the filters button
me.disableFilters(true);
diff --git a/web/org.openbravo.mobile.core/source/utils/ob-utilities.js b/web/org.openbravo.mobile.core/source/utils/ob-utilities.js
--- a/web/org.openbravo.mobile.core/source/utils/ob-utilities.js
+++ b/web/org.openbravo.mobile.core/source/utils/ob-utilities.js
@@ -352,7 +352,7 @@
OB.UTIL.localStorage.setItem('logclientErrors', 0);
};
- function processConsoleLevel(logLevel, args) {
+ function processConsoleLevel(logLevel, args, humanReadable) {
try {
var saveInServer = OB.UTIL.checkPermissionLog(logLevel, "save");
@@ -361,16 +361,14 @@
if (saveInServer) {
var isSaveOnlyTraceOfCaller = true;
+ var serverMessage = OB.UTIL.argumentsToStringifyed(args) + (humanReadable ? '' : "; stackTrace: " + OB.UTIL.getStackTrace('OB.' + logLevel.toLowerCase(), isSaveOnlyTraceOfCaller));
if (logLevel === 'Error' || logLevel === "Critical") {
isSaveOnlyTraceOfCaller = false;
- }
- var serverMessage = OB.UTIL.argumentsToStringifyed(args) + "; stackTrace: " + OB.UTIL.getStackTrace('OB.' + logLevel.toLowerCase(), isSaveOnlyTraceOfCaller);
- if (logLevel === 'Error' || logLevel === "Critical") {
serverMessage = serverMessage + humanLog + processesLog;
}
// cut the message
serverMessage = (serverMessage.length < 100000000) ? serverMessage : serverMessage.substring(0, 100000000);
- OB.UTIL.saveLogClient(serverMessage, logLevel);
+ OB.UTIL.saveLogClient(serverMessage, logLevel, humanReadable);
}
if (logLevel === 'Error' || logLevel === "Critical") {
@@ -378,7 +376,7 @@
}
var showInConsole = OB.UTIL.checkPermissionLog(logLevel, "console");
- if (OB.UTIL.Debug.isDebug() || showInConsole) {
+ if ((OB.UTIL.Debug.isDebug() || showInConsole) && !humanReadable) {
saveInServer = saveInServer && (OB && OB.MobileApp && OB.MobileApp.model && OB.MobileApp.model.get('logClientStatus') === 'OK');
var tags = (showInConsole || saveInServer) ? ("(" + (showInConsole ? "*" : "") + ((showInConsole && saveInServer) ? "," : "") + (saveInServer ? "+" : "") + ")") : "";
var consoleMessage = OB.UTIL.argumentsToStringifyed(args) + "; line: " + OB.UTIL.getStackTrace('OB.' + logLevel.toLowerCase(), true) + " " + tags;
@@ -404,28 +402,32 @@
}
OB.trace = function () {
- processConsoleLevel('Trace', arguments);
+ processConsoleLevel('Trace', arguments, false);
};
OB.debug = function () {
- processConsoleLevel('Debug', arguments);
+ processConsoleLevel('Debug', arguments, false);
};
OB.info = function () {
- processConsoleLevel('Info', arguments);
+ processConsoleLevel('Info', arguments, false);
};
OB.warn = function () {
- processConsoleLevel('Warn', arguments);
+ processConsoleLevel('Warn', arguments, false);
};
OB.error = function () {
- processConsoleLevel('Error', arguments);
+ processConsoleLevel('Error', arguments, false);
+ };
+
+ OB.logUserAction = function () {
+ processConsoleLevel(null, arguments, true);
};
// deprecated
OB.critical = function () {
- processConsoleLevel('Critical', arguments);
+ processConsoleLevel('Critical', arguments, false);
};
// this function receive as arguments first the level of log, the rest of the arguments are the message
@@ -442,7 +444,7 @@
msg = OB.UTIL.composeMessage(argsWithoutFirst);
if (OB.UTIL.checkPermissionLog(level, "save")) {
- OB.UTIL.saveLogClient(msg, level);
+ OB.UTIL.saveLogClient(msg, level, false);
}
if (OB.UTIL.checkPermissionLog(level, "console")) {
if (level === "Info") {
@@ -460,7 +462,7 @@
}
};
- OB.UTIL.saveLogClient = function (msg, level) {
+ OB.UTIL.saveLogClient = function (msg, level, humanReadable) {
try {
if (OB.MobileApp && OB.MobileApp.model && OB.MobileApp.model.supportLogClient()) {
if (!OB.Data.localDB) {
@@ -482,6 +484,7 @@
logClientModel.set('created', date.getTime());
logClientModel.set('createdby', OB.MobileApp.model.get('orgUserId'));
logClientModel.set('loglevel', level);
+ logClientModel.set('humanReadable', humanReadable === true);
logClientModel.set('msg', msg);
logClientModel.set('deviceId', OB.MobileApp.model.get('logConfiguration').deviceIdentifier);
logClientModel.set('cacheSessionId', null);
@@ -529,6 +532,9 @@
}
return false;
}
+ if (level === null) {
+ return OB.MobileApp.model.get('permissions')['OBMOBC_logClient.humanReadable'];
+ }
if (type === "save") {
if (OB.MobileApp.model.get('permissions')['OBMOBC_logClient.saveLog'] === false) {