diff -r 106da55fdd88 referencedata/standard/Obmobc_logclient_grid_config.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/referencedata/standard/Obmobc_logclient_grid_config.xml Mon Dec 10 12:28:35 2018 +0100 @@ -0,0 +1,130 @@ + + + 1E370295AEB2469BBDD894551AD8674D + true + 2018-10-11T16:30:36.808Z + + 2018-10-11T16:30:36.808Z + + + + Y + D + IE + D + + D + D + D + + + 365BD091510440E5970D5A9463118A1E + true + 2018-10-11T16:27:49.856Z + + 2018-10-11T16:28:45.952Z + + + + D + Y + D + D + + D + D + D + + + 78844E46B1F749F59ED3C60D4BCE9C8D + true + 2018-10-18T12:17:38.915Z + + 2018-10-30T11:57:23.552Z + + + + Y + D + E + D + + D + D + D + + + 80848D9BF09B4D11A53BE2F5CB5A3D5B + true + 2018-10-11T16:30:55.308Z + + 2018-10-18T12:28:39.873Z + + + + Y + D + IC + D + + D + D + D + + + 841DC4CA85754F81885B134A12FEEB7B + true + 2018-10-11T16:29:39.825Z + + 2018-10-11T16:29:39.825Z + + + + Y + D + D + D + + D + D + D + + + E923620A3C8F47C782705D7C1586EA72 + true + 2018-10-11T16:29:11.658Z + + 2018-10-11T16:29:11.658Z + + + + Y + D + D + D + + D + D + D + + + 1AD989605ACA4F5FB6C11B2E7AC88867 + true + 2018-10-11T16:26:19.17Z + + 2018-10-30T11:57:12.351Z + + + N + N + D + + Y + D + D + D + D + 10 + D + + diff -r 106da55fdd88 src-db/database/model/tables/OBMOBC_LOGCLIENT.xml --- a/src-db/database/model/tables/OBMOBC_LOGCLIENT.xml Wed Nov 14 19:17:40 2018 +0100 +++ b/src-db/database/model/tables/OBMOBC_LOGCLIENT.xml Mon Dec 10 12:28:35 2018 +0100 @@ -41,7 +41,7 @@ - + @@ -53,12 +53,38 @@ + + + + + + + +

+ + + + + + + + + + + + + + + + + + diff -r 106da55fdd88 src-db/database/model/tables/OBMOBC_PROCESS_DEFINITION.xml --- a/src-db/database/model/tables/OBMOBC_PROCESS_DEFINITION.xml Wed Nov 14 19:17:40 2018 +0100 +++ b/src-db/database/model/tables/OBMOBC_PROCESS_DEFINITION.xml Mon Dec 10 12:28:35 2018 +0100 @@ -49,6 +49,10 @@ + + + + diff -r 106da55fdd88 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Wed Nov 14 19:17:40 2018 +0100 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Mon Dec 10 12:28:35 2018 +0100 @@ -756,6 +756,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1333,6 +1368,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1674,6 +1744,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2100,8 +2209,9 @@ - - + + + diff -r 106da55fdd88 src-db/database/sourcedata/AD_DATASET.xml --- a/src-db/database/sourcedata/AD_DATASET.xml Wed Nov 14 19:17:40 2018 +0100 +++ b/src-db/database/sourcedata/AD_DATASET.xml Mon Dec 10 12:28:35 2018 +0100 @@ -16,4 +16,20 @@ + + + + + + + + + + + + + + + + diff -r 106da55fdd88 src-db/database/sourcedata/AD_DATASET_TABLE.xml --- a/src-db/database/sourcedata/AD_DATASET_TABLE.xml Wed Nov 14 19:17:40 2018 +0100 +++ b/src-db/database/sourcedata/AD_DATASET_TABLE.xml Mon Dec 10 12:28:35 2018 +0100 @@ -1,5 +1,19 @@ + + + + + + + + + + + + + + @@ -28,6 +42,20 @@ + + + + + + + + + + + + + + diff -r 106da55fdd88 src-db/database/sourcedata/AD_ELEMENT.xml --- a/src-db/database/sourcedata/AD_ELEMENT.xml Wed Nov 14 19:17:40 2018 +0100 +++ b/src-db/database/sourcedata/AD_ELEMENT.xml Mon Dec 10 12:28:35 2018 +0100 @@ -48,6 +48,18 @@ + + + + + + + + + + + + @@ -185,6 +197,21 @@ + + + + + + + + + + + + + + + @@ -238,6 +265,18 @@ + + + + + + + + + + + + @@ -282,8 +321,8 @@ - - + + diff -r 106da55fdd88 src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Wed Nov 14 19:17:40 2018 +0100 +++ b/src-db/database/sourcedata/AD_FIELD.xml Mon Dec 10 12:28:35 2018 +0100 @@ -41,7 +41,6 @@ - @@ -307,12 +306,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -938,6 +964,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1635,6 +1689,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 106da55fdd88 src-db/database/sourcedata/AD_MENU.xml --- a/src-db/database/sourcedata/AD_MENU.xml Wed Nov 14 19:17:40 2018 +0100 +++ b/src-db/database/sourcedata/AD_MENU.xml Mon Dec 10 12:28:35 2018 +0100 @@ -47,7 +47,7 @@ - + diff -r 106da55fdd88 src-db/database/sourcedata/AD_PREFERENCE.xml --- a/src-db/database/sourcedata/AD_PREFERENCE.xml Wed Nov 14 19:17:40 2018 +0100 +++ b/src-db/database/sourcedata/AD_PREFERENCE.xml Mon Dec 10 12:28:35 2018 +0100 @@ -77,6 +77,17 @@ + + + + + + + + + + + @@ -165,6 +176,17 @@ + + + + + + + + + + + diff -r 106da55fdd88 src-db/database/sourcedata/AD_REFERENCE.xml --- a/src-db/database/sourcedata/AD_REFERENCE.xml Wed Nov 14 19:17:40 2018 +0100 +++ b/src-db/database/sourcedata/AD_REFERENCE.xml Mon Dec 10 12:28:35 2018 +0100 @@ -56,6 +56,19 @@ + + + + + + + + + + + + + diff -r 106da55fdd88 src-db/database/sourcedata/AD_REF_LIST.xml --- a/src-db/database/sourcedata/AD_REF_LIST.xml Wed Nov 14 19:17:40 2018 +0100 +++ b/src-db/database/sourcedata/AD_REF_LIST.xml Mon Dec 10 12:28:35 2018 +0100 @@ -59,6 +59,17 @@ + + + + + + + + + + + @@ -93,6 +104,18 @@ + + + + + + + + + + + + @@ -296,6 +319,18 @@ + + + + + + + + + + + + @@ -307,6 +342,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -366,6 +425,18 @@ + + + + + + + + + + + + @@ -415,6 +486,18 @@ + + + + + + + + + + + + @@ -438,6 +521,18 @@ + + + + + + + + + + + + @@ -496,6 +591,18 @@ + + + + + + + + + + + + @@ -566,6 +673,18 @@ + + + + + + + + + + + + diff -r 106da55fdd88 src-db/database/sourcedata/AD_TAB.xml --- a/src-db/database/sourcedata/AD_TAB.xml Wed Nov 14 19:17:40 2018 +0100 +++ b/src-db/database/sourcedata/AD_TAB.xml Mon Dec 10 12:28:35 2018 +0100 @@ -5,7 +5,7 @@ - + diff -r 106da55fdd88 src-db/database/sourcedata/AD_WINDOW.xml --- a/src-db/database/sourcedata/AD_WINDOW.xml Wed Nov 14 19:17:40 2018 +0100 +++ b/src-db/database/sourcedata/AD_WINDOW.xml Mon Dec 10 12:28:35 2018 +0100 @@ -22,7 +22,7 @@ - + diff -r 106da55fdd88 src-db/database/sourcedata/OBMOBC_PROCESS_DEFINITION.xml --- a/src-db/database/sourcedata/OBMOBC_PROCESS_DEFINITION.xml Wed Nov 14 19:17:40 2018 +0100 +++ b/src-db/database/sourcedata/OBMOBC_PROCESS_DEFINITION.xml Mon Dec 10 12:28:35 2018 +0100 @@ -9,6 +9,7 @@ + @@ -20,6 +21,7 @@ + @@ -31,6 +33,7 @@ + diff -r 106da55fdd88 src-db/database/sourcedata/OBMOBC_SERVICES.xml --- a/src-db/database/sourcedata/OBMOBC_SERVICES.xml Wed Nov 14 19:17:40 2018 +0100 +++ b/src-db/database/sourcedata/OBMOBC_SERVICES.xml Mon Dec 10 12:28:35 2018 +0100 @@ -164,6 +164,18 @@ + + + + + + + + + + + + diff -r 106da55fdd88 src/org/openbravo/mobile/core/MobileCoreComponentProvider.java --- a/src/org/openbravo/mobile/core/MobileCoreComponentProvider.java Wed Nov 14 19:17:40 2018 +0100 +++ b/src/org/openbravo/mobile/core/MobileCoreComponentProvider.java Mon Dec 10 12:28:35 2018 +0100 @@ -74,7 +74,6 @@ final ArrayList jsDependency = new ArrayList(); jsDependency.add("utils/ob-check"); // must be first because don't want to load a wrong url jsDependency.add("utils/ob-debug"); // must be second because the OB namespace is defined in it - jsDependency.add("utils/ob-loghumanaction"); jsDependency.add("utils/ob-dom-extension"); jsDependency.add("utils/ob-versionmanagement"); jsDependency.add("main"); @@ -93,6 +92,8 @@ jsDependency.add("data/ob-model"); jsDependency.add("data/ob-windowmodel"); jsDependency.add("component/ob-dateformat"); + jsDependency.add("model/terminal-log"); + jsDependency.add("utils/ob-terminal-log"); jsDependency.add("component/ob-terminal-component"); jsDependency.add("model/ob-router"); jsDependency.add("model/ob-terminal-model"); @@ -134,6 +135,7 @@ jsDependency.add("component/ob-markdown"); jsDependency.add("component/ob-performancetest"); jsDependency.add("offline/ob-fetch-manifest"); + jsDependency.add("utils/terminal-log-sync-utils"); final ArrayList jsRetailDependency = new ArrayList(); diff -r 106da55fdd88 src/org/openbravo/mobile/core/TerminalLogLoader.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/openbravo/mobile/core/TerminalLogLoader.java Mon Dec 10 12:28:35 2018 +0100 @@ -0,0 +1,173 @@ +/* + ************************************************************************************ + * Copyright (C) 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. + ************************************************************************************ + */ + +package org.openbravo.mobile.core; + +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.Date; + +import org.apache.log4j.Logger; +import org.codehaus.jettison.json.JSONArray; +import org.codehaus.jettison.json.JSONObject; +import org.openbravo.dal.core.OBContext; +import org.openbravo.dal.service.OBDal; +import org.openbravo.database.ConnectionProvider; +import org.openbravo.mobile.core.process.DataSynchronizationImportProcess; +import org.openbravo.mobile.core.process.DataSynchronizationProcess; +import org.openbravo.mobile.core.process.DataSynchronizationProcess.DataSynchronization; +import org.openbravo.service.db.DalConnectionProvider; +import org.openbravo.service.json.JsonConstants; + +@DataSynchronization(entity = "OBMOBC_TerminalLog") +public class TerminalLogLoader extends DataSynchronizationProcess implements + DataSynchronizationImportProcess { + + private static final Logger log = Logger.getLogger(TerminalLogLoader.class); + + protected String getImportQualifier() { + return "OBMOBC_TerminalLog"; + } + + @Override + protected boolean bypassPreferenceCheck() { + return true; + } + + public JSONObject saveRecord(JSONObject jsonEvents) throws Exception { + + try { + + // since we do a rollback in case of error, if using syncronized mode we ensure we don't + // rollback other models. + OBDal.getInstance().commitAndClose(); + + JSONArray events = new JSONArray(jsonEvents.getString("events")); + String deviceid = jsonEvents.getString("terminal"); + String cache_session_id = jsonEvents.getString("cacheSessionId"); + + String processName; + JSONObject processInfo; + String processId; + String elementId; + + String tstamp; + String context; + String isonline; + String loglevel = ""; + String msg = ""; + String ad_org_id; + String ad_client_id; + String created; + String createdby; + String updated; + String updatedby; + + ConnectionProvider cp = new DalConnectionProvider(false); + + ad_client_id = OBContext.getOBContext().getCurrentClient().getId(); + ad_org_id = OBContext.getOBContext().getCurrentOrganization().getId(); + createdby = OBContext.getOBContext().getUser().getId(); + + final SimpleDateFormat dateFormatter = new SimpleDateFormat("dd-MM-yyyy HH:mm:ss"); + + for (int i = 0; i < events.length(); i++) { + + JSONObject event = events.getJSONObject(i); + + Timestamp timestamp = new Timestamp(Long.parseLong(event.getString("d"))); + + created = dateFormatter.format(new Date(timestamp.getTime())); + updated = created; + updatedby = createdby; + tstamp = String.valueOf(timestamp.getTime()); + context = event.getString("c"); + isonline = String.valueOf(event.getString("o").equals("true") ? "Y" : "N"); + + if (event.has("e")) { + elementId = " - (" + event.getString("e") + ")"; + } else { + elementId = ""; + } + + switch (event.getString("t")) { + case "k": + loglevel = "UserAction"; + msg = "Typed: " + event.getString("k") + elementId; + break; + case "b": + loglevel = "UserAction"; + msg = "Clicked on '" + event.getString("b") + "'" + elementId; + break; + case "bk": + loglevel = "UserAction"; + msg = "Clicked on '" + event.getString("b") + "'" + elementId; + break; + case "s": + loglevel = "Process"; + processName = event.getString("v"); + processInfo = new JSONObject(event.getString("i")); + processId = processInfo.getString("id"); + msg = "Process: " + processName + " - started - (" + processId + ")"; + break; + case "f": + loglevel = "Process"; + processName = event.getString("v"); + processInfo = new JSONObject(event.getString("i")); + processId = processInfo.getString("id"); + msg = "Process: " + processName + " - finished - (" + processId + ")"; + break; + default: + log.warn("Event " + event.getString("t") + " no supported"); + } + + UserEventLoaderQueriesData.insertUserEventLog(cp, // + ad_client_id, // + ad_org_id, // + created, // + createdby, // + updated, // + updatedby, // + tstamp, // + deviceid, // + context, // + msg, // + loglevel, // + cache_session_id, // + isonline // + ); + + } + + } catch (Exception e) { + OBDal.getInstance().rollbackAndClose(); + log.error("Could not save UserEvent log with info: " + jsonEvents.toString()); + } + return successMessage(); + } + + private JSONObject successMessage() throws Exception { + final JSONObject jsonResponse = new JSONObject(); + + jsonResponse.put(JsonConstants.RESPONSE_STATUS, JsonConstants.RPCREQUEST_STATUS_SUCCESS); + jsonResponse.put("result", "0"); + return jsonResponse; + } + + @Override + protected String getProperty() { + return "OBMOBC_TerminalLog"; + } + + @Override + public String getAppName() { + return "Mobile Core"; + } + +} \ No newline at end of file diff -r 106da55fdd88 src/org/openbravo/mobile/core/UserEventLoaderQueries_data.xsql --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/openbravo/mobile/core/UserEventLoaderQueries_data.xsql Mon Dec 10 12:28:35 2018 +0100 @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 106da55fdd88 src/org/openbravo/mobile/core/importprocess/TerminalLogImportEntryProcessor.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/org/openbravo/mobile/core/importprocess/TerminalLogImportEntryProcessor.java Mon Dec 10 12:28:35 2018 +0100 @@ -0,0 +1,50 @@ +/* + ************************************************************************************ + * Copyright (C) 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. + ************************************************************************************ + */ +package org.openbravo.mobile.core.importprocess; + +import javax.enterprise.context.ApplicationScoped; + +import org.openbravo.base.weld.WeldUtils; +import org.openbravo.mobile.core.TerminalLogLoader; +import org.openbravo.mobile.core.process.DataSynchronizationProcess; +import org.openbravo.mobile.core.process.MobileImportEntryProcessorRunnable; +import org.openbravo.service.importprocess.ImportEntry; +import org.openbravo.service.importprocess.ImportEntryManager.ImportEntryQualifier; +import org.openbravo.service.importprocess.ImportEntryProcessor; + +/** + * Encapsulates the {@link TerminalLogLoader} in a thread. + */ +@ImportEntryQualifier(entity = "OBMOBC_TerminalLog") +@ApplicationScoped +public class TerminalLogImportEntryProcessor extends ImportEntryProcessor { + + protected ImportEntryProcessRunnable createImportEntryProcessRunnable() { + return WeldUtils.getInstanceFromStaticBeanManager(TerminalLogLoaderRunnable.class); + } + + protected boolean canHandleImportEntry(ImportEntry importEntryInformation) { + return "OBMOBC_TerminalLog".equals(importEntryInformation.getTypeofdata()); + } + + protected String getProcessSelectionKey(ImportEntry importEntry) { + return importEntry.getOrganization().getId(); + } + + @Override + protected boolean enableArchive() { + return false; + } + + private static class TerminalLogLoaderRunnable extends MobileImportEntryProcessorRunnable { + protected Class getDataSynchronizationClass() { + return TerminalLogLoader.class; + } + }; +} diff -r 106da55fdd88 src/org/openbravo/mobile/core/login/MobileCoreLoginUtilsServlet.java --- a/src/org/openbravo/mobile/core/login/MobileCoreLoginUtilsServlet.java Wed Nov 14 19:17:40 2018 +0100 +++ b/src/org/openbravo/mobile/core/login/MobileCoreLoginUtilsServlet.java Mon Dec 10 12:28:35 2018 +0100 @@ -331,6 +331,7 @@ jsonObject.put("name", process.getName()); jsonObject.put("searchkey", process.getSearchkey()); jsonObject.put("description", process.getDescription()); + jsonObject.put("terminallog", process.isTerminalLog()); respArray.put(jsonObject); } return respArray; diff -r 106da55fdd88 src/org/openbravo/mobile/core/process/SecuredJSONProcess.java --- a/src/org/openbravo/mobile/core/process/SecuredJSONProcess.java Wed Nov 14 19:17:40 2018 +0100 +++ b/src/org/openbravo/mobile/core/process/SecuredJSONProcess.java Mon Dec 10 12:28:35 2018 +0100 @@ -138,7 +138,7 @@ return false; } } else { - log.warn("Not checking form access for " + this.getClass()); + log.debug("Not checking form access for " + this.getClass()); } if (bypassPreferenceCheck()) { diff -r 106da55fdd88 src/org/openbravo/mobile/core/utils/LogClientLoader.java --- a/src/org/openbravo/mobile/core/utils/LogClientLoader.java Wed Nov 14 19:17:40 2018 +0100 +++ b/src/org/openbravo/mobile/core/utils/LogClientLoader.java Mon Dec 10 12:28:35 2018 +0100 @@ -94,8 +94,8 @@ final JSONObject jsonMsg = new JSONObject(jsonMsgString); final SimpleDateFormat dateFormatter = new SimpleDateFormat("dd-MM-yyyy HH:mm:ss"); - - final String strCreated = dateFormatter.format(new Date(jsonMsg.getLong("created"))); + final Long timestamp = jsonMsg.getLong("created"); + final String strCreated = dateFormatter.format(new Date(timestamp)); final String strCreatedBy; if (jsonMsg.has("createdby")) { strCreatedBy = jsonMsg.getString("createdby"); @@ -106,6 +106,7 @@ final String strMsg = jsonMsg.getString("msg"); final String strLogLevel = jsonMsg.getString("loglevel"); final String strCacheSessionId = jsonMsg.getString("cacheSessionId"); + final String strContext = jsonMsg.getString("context"); final String isOnline; if (jsonMsg.has("isOnline")) { isOnline = (jsonMsg.getString("isOnline").equals("true") ? "Y" : "N"); @@ -119,11 +120,11 @@ + " (obmobc_logclient_id, ad_client_id, ad_org_id, isactive," + " created, createdby," // + " updated, updatedby," - + " deviceid, msg, loglevel, cache_session_id, isonline) values" + + " tstamp, deviceid, context, msg, loglevel, cache_session_id, isonline) values" + " (?, ?, ?, 'Y'," + " to_timestamp(to_char(?), to_char('DD-MM-YYYY HH24:MI:SS')), ?," + " to_timestamp(to_char(?), to_char('DD-MM-YYYY HH24:MI:SS')), ?," - + " ?, ?, ?, ?, ?)"; + + " ?, ?, ?, ?, ?, ?, ?)"; PreparedStatement st = null; @@ -137,11 +138,13 @@ UtilSql.setValue(st, 5, 12, null, strCreatedBy); UtilSql.setValue(st, 6, 12, null, strCreated); UtilSql.setValue(st, 7, 12, null, strCreatedBy); - UtilSql.setValue(st, 8, 12, null, strDeviceId); - UtilSql.setValue(st, 9, 12, null, strMsg); - UtilSql.setValue(st, 10, 12, null, strLogLevel); - UtilSql.setValue(st, 11, 12, null, strCacheSessionId); - UtilSql.setValue(st, 12, 12, null, isOnline); + UtilSql.setValue(st, 8, 2, null, String.valueOf(timestamp)); + UtilSql.setValue(st, 9, 12, null, strDeviceId); + UtilSql.setValue(st, 10, 12, null, strContext); + UtilSql.setValue(st, 11, 12, null, strMsg); + UtilSql.setValue(st, 12, 12, null, strLogLevel); + UtilSql.setValue(st, 13, 12, null, strCacheSessionId); + UtilSql.setValue(st, 14, 12, null, isOnline); st.executeUpdate(); diff -r 106da55fdd88 web/org.openbravo.mobile.core/source/component/ob-commonbuttons.js --- a/web/org.openbravo.mobile.core/source/component/ob-commonbuttons.js Wed Nov 14 19:17:40 2018 +0100 +++ b/web/org.openbravo.mobile.core/source/component/ob-commonbuttons.js Mon Dec 10 12:28:35 2018 +0100 @@ -322,6 +322,7 @@ } }, show: function (args) { + OB.UTIL.TerminalLog.addPopup(this.name, "open"); var resp = true; // While in poup, disable focusKeeper @@ -366,6 +367,7 @@ this.hide(inEvent.args); }, hide: function (args) { + OB.UTIL.TerminalLog.addPopup(this.name, "close"); var resp = true; var executeOBEvents = true; if (args && args.ignoreOBEvents && args.ignoreOBEvents === true) { diff -r 106da55fdd88 web/org.openbravo.mobile.core/source/model/logclient.js --- a/web/org.openbravo.mobile.core/source/model/logclient.js Wed Nov 14 19:17:40 2018 +0100 +++ b/web/org.openbravo.mobile.core/source/model/logclient.js Mon Dec 10 12:28:35 2018 +0100 @@ -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. @@ -39,6 +39,10 @@ column: 'cacheSessionId', type: 'TEXT' }, { + name: 'context', + column: 'context', + type: 'TEXT' + }, { name: 'msg', column: 'msg', type: 'TEXT' diff -r 106da55fdd88 web/org.openbravo.mobile.core/source/model/ob-terminal-model.js --- a/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js Wed Nov 14 19:17:40 2018 +0100 +++ b/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js Mon Dec 10 12:28:35 2018 +0100 @@ -77,6 +77,8 @@ pricelistversion: null, currency: null, connectedToERP: null, + terminalLogContext: 'refresh(F5)', + terminalLogContextPopUp: [], loginUtilsUrl: '../../org.openbravo.mobile.core.loginutils', loginUtilsParams: {}, supportsOffline: false, @@ -108,7 +110,16 @@ }, shouldExecuteBenchmark: false, propertiesLoaders: [], - dataSyncModels: [] + dataSyncModels: [{ + name: 'OBMOBC_TerminalLog', + model: OB.Model.TerminalLog, + modelFunc: 'OB.Model.TerminalLog', + className: 'org.openbravo.mobile.core.TerminalLogLoader', + criteria: {}, + getIdentifier: function (model) { + return 'User event ' + model.get('id'); + } + }] }, initialize: function () { @@ -199,6 +210,14 @@ pushState: false }); }, 0); + + OB.UTIL.TerminalLog.restoreFromBackup(); + OB.UTIL.activateTerminalLogBackup(); + + window.addEventListener("beforeunload", function () { + OB.UTIL.TerminalLog.doBackup(); + OB.info("Done user event log backup, before an unload"); + }, true); // needed true to capture the event before propagate, if not, on logout not always do the backup }, false); }, @@ -400,6 +419,9 @@ pReplace = true; } OB.debug("Navigating to '" + route + "' Replace: " + pReplace); + if (route) { + this.set('terminalLogContext', route); + } OB.MobileApp.view.keyReceivers.splice(0, OB.MobileApp.view.keyReceivers.length); this.router.navigate(route, { trigger: true, @@ -707,6 +729,10 @@ if (modelChecksum === '') { return; } + //TerminalLog synchronization shouldn't be mandatory for tests + if (modelName === 'TerminalLog') { + return; + } var promiseOfModelToVerify = new Promise(function (resolve, reject) { var syncModel = OB.MobileApp.model.getSyncModel(model); if (syncModel) { @@ -899,7 +925,7 @@ }); }, doPostSynchronizedCallActions: function (callback, syncData) { - if (OB.UTIL.localStorage.getItem('synchronizedMessageId') === syncData.messageId) { + if (OB.UTIL.isNullOrUndefined(OB.UTIL.localStorage.getItem('synchronizedMessageId')) || OB.UTIL.localStorage.getItem('synchronizedMessageId') === syncData.messageId) { OB.UTIL.localStorage.removeItem('synchronizedMessageId'); } else { OB.error("Message id of the last request doesn't much with the current messageId"); @@ -1133,7 +1159,9 @@ } // success. Elements can be now deleted from the database var removeSyncedElemsCallback = function (tx) { - OB.info("Purging the '" + OB.Dal.getTableName(model) + "' table"); + if (OB.Dal.getTableName(model) !== 'OBMOBC_TerminalLog') { + OB.info("Purging the '" + OB.Dal.getTableName(model) + "' table"); + } var promises = []; if (modelObj.successSendModel) { @@ -1177,7 +1205,9 @@ me.syncModel(); return; } - OB.info("The table '" + OB.Dal.getTableName(model) + "' has been fully synchronized with the server"); + if (OB.Dal.getTableName(model) !== 'OBMOBC_TerminalLog') { + OB.info("The table '" + OB.Dal.getTableName(model) + "' has been fully synchronized with the server"); + } }, function (err) { OB.error("Could not purge the '" + OB.Dal.getTableName(model) + "' table. Error message: " + err); }); @@ -1332,6 +1362,13 @@ */ syncAllModels: function (successCallback, errorCallback) { var me = this; + OB.UTIL.TerminalLog.packageEvents(function () { + me.syncAllModelsImpl(successCallback, errorCallback); + }); + }, + + syncAllModelsImpl: function (successCallback, errorCallback) { + var me = this; // if the user is not authenticated, the server will reject all the connections if (!OB.MobileApp.model.isUserAuthenticated()) { @@ -1694,6 +1731,18 @@ OB.MobileApp.model.set('modelsToLoad', []); OB.UTIL.activateLogClient(); + if (OB.MobileApp.model.get('permissions') && ( + OB.MobileApp.model.hasPermission('OBMOBC_EnableTerminalLogUserActions', true) || OB.MobileApp.model.hasPermission('OBMOBC_EnableTerminalLogProcess', true))) { + OB.UTIL.activateTerminalLogSync(); + } else { + OB.UTIL.stopTerminalLogBackup(); + window.removeEventListener("beforeunload", function () { + OB.UTIL.TerminalLog.doBackup(); + OB.info("Done terminal log backup, before an unload"); + }, true); // needed true to capture the event before propagate, if not, on logout not always do the backup + OB.UTIL.TerminalLog.deleteBackup(); + OB.info("Terminal log is disabled because both preferences (OBMOBC_EnableTerminalLogUserActions and OBMOBC_EnableTerminalLogProcess) are set to false."); + } var countOfLoadedWindows = 0; var registeredWindows = this.windowRegistry.registeredWindows; diff -r 106da55fdd88 web/org.openbravo.mobile.core/source/model/terminal-log.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/org.openbravo.mobile.core/source/model/terminal-log.js Mon Dec 10 12:28:35 2018 +0100 @@ -0,0 +1,42 @@ +/* + ************************************************************************************ + * Copyright (C) 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. + ************************************************************************************ + */ + +/*global Backbone */ + +(function () { + var TerminalLog = OB.Data.ExtensibleModel.extend({ + modelName: 'TerminalLog', + tableName: 'OBMOBC_TerminalLog', + entityName: 'OBMOBC_TerminalLog', + source: '', + local: true + }); + + TerminalLog.addProperties([{ + name: 'id', + column: 'terminallog_id', + primaryKey: true, + type: 'TEXT' + }, { + name: 'terminal', + column: 'terminal', + type: 'TEXT' + }, { + name: 'cacheSessionId', + column: 'cacheSessionId', + type: 'TEXT' + }, { + name: 'events', + column: 'events', + type: 'TEXT' + }]); + + + OB.Data.Registry.registerModel(TerminalLog); +}()); \ No newline at end of file diff -r 106da55fdd88 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 Wed Nov 14 19:17:40 2018 +0100 +++ b/web/org.openbravo.mobile.core/source/retail/component/ob-retail-searchproductcharacteristic.js Mon Dec 10 12:28:35 2018 +0100 @@ -89,10 +89,10 @@ // List of default filters defaults: [], - // Get component to filter render + // Get component to filter render renderInfo: function () { return null; - // Example: + // Example: // return { // kind: 'FilterExample', // getFilterCondition: function () { @@ -171,14 +171,14 @@ return null; }, - // Function to post process filtered collection + // Function to post process filtered collection // // function (collection, callback); // collection: Collection of filtered items // callback: Callback function to be called when post processing finish postProcess: null, - // Add attributes to show + // Add attributes to show addItemAttributes: function (item, attr) { var filterAttr = item.get("filterAttr"); if (!filterAttr) { @@ -456,7 +456,7 @@ me.categories.reset(); } // Verify if have a category tree - var select = "select tree.category_id, sum(case when pc.m_product_category_id is null then 0 else 1 end) as childs " // + var select = "select tree.category_id, sum(case when pc.m_product_category_id is null then 0 else 1 end) as childs " // + "from m_product_category_tree tree left join m_product_category_tree child on tree.category_id = child.parent_id " // + "left join m_product_category pc on pc.m_product_category_id = child.category_id " // + "where tree.parent_id = '0' group by tree.category_id order by tree.seqno"; @@ -602,7 +602,7 @@ OB.UI.SearchProductCharacteristic.postProcessCustomFilters.push(filter); } }, - // Render custom filters + // Render custom filters filtersCustomRender: function () { var index = 0, me = this, @@ -1026,7 +1026,7 @@ } } }); - // Notify to filters + // Notify to filters this.customFilters.forEach(function (filter) { filter.doAddProduct({ product: model, @@ -1259,6 +1259,7 @@ this.$.searchProductCharacteristicHeader.disableFilterButtons(value); }, searchAction: function (inSender, inEvent) { + var execution = OB.UTIL.ProcessController.start('searchProduct'); this.$.products.hide(); this.$.renderLoading.show(); this.params = []; @@ -1537,7 +1538,7 @@ remoteCriteria.push(brandfilter); } } - // product name and category + // product name and category if (productFilterText !== undefined && productCategory) { // characteristic filter if (me.model.get('filter').length > 0) { @@ -1900,5 +1901,6 @@ } } }); + OB.UTIL.ProcessController.finish('searchProduct', execution); } }); \ No newline at end of file diff -r 106da55fdd88 web/org.openbravo.mobile.core/source/utils/ob-dom-extension.js --- a/web/org.openbravo.mobile.core/source/utils/ob-dom-extension.js Wed Nov 14 19:17:40 2018 +0100 +++ b/web/org.openbravo.mobile.core/source/utils/ob-dom-extension.js Mon Dec 10 12:28:35 2018 +0100 @@ -29,7 +29,7 @@ var elmt = _.find(event.path, function (el) { return el.tagName === 'BUTTON'; }) || event.target; - OB.UTIL.humanAction.push(elmt); + OB.UTIL.TerminalLog.addButtonClick(elmt); avoidDoubleClick(event, elmt); } var debounceMouseDown = _.debounce(mouseDown, 1); @@ -40,7 +40,7 @@ }); document.onkeydown = function (k) { if (k.key) { - OB.UTIL.humanAction.push(k.key); + OB.UTIL.TerminalLog.addKeyPress(k); } }; }()); \ No newline at end of file diff -r 106da55fdd88 web/org.openbravo.mobile.core/source/utils/ob-loghumanaction.js --- a/web/org.openbravo.mobile.core/source/utils/ob-loghumanaction.js Wed Nov 14 19:17:40 2018 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -/* - ************************************************************************************ - * Copyright (C) 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. - ************************************************************************************ - * - * Author MDJ - * - */ - -/*global OB, _, moment */ - -/** - * API to log human action to save as log client messages - * - */ - -(function () { - OB.UTIL = window.OB.UTIL || {}; - OB.UTIL.humanAction = { - messages: [], - messagesLength: 50, - push: function (elmt) { - var message = '[' + moment().format("HH:mm:ss.SSS") + '] '; - if (typeof (elmt) === 'string' && elmt !== "") { - message = message + "Key pressed: " + elmt; - } else { - var ids = elmt.id.split('_'); - message = message + "'" + (elmt.textContent ? elmt.textContent : ids[ids.length - 1]) + "' in context: '" + elmt.id.substring(elmt.id.length - 40) + "'"; - } - if (this.messages.length >= 50) { - this.messages.shift(); - } - this.messages.push(message); - }, - getActionsLog: function () { - var i, message = '\n \n [Human Action Log]: \n'; - if (this.messages.length > 0) { - for (i = 0; i < this.messages.length; i++) { - message = message + '\t' + (i + 1) + '.- ' + this.messages[i] + '\n'; - } - return message; - } - return ""; - } - }; - -}()); \ No newline at end of file diff -r 106da55fdd88 web/org.openbravo.mobile.core/source/utils/ob-processcontroller.js --- a/web/org.openbravo.mobile.core/source/utils/ob-processcontroller.js Wed Nov 14 19:17:40 2018 +0100 +++ b/web/org.openbravo.mobile.core/source/utils/ob-processcontroller.js Mon Dec 10 12:28:35 2018 +0100 @@ -24,6 +24,7 @@ name: null, searchkey: null, description: null, + terminallog: null, subscriptions: [], //List of components subscribed to the process executions: new Backbone.Collection() //List of process instances in execution @@ -33,6 +34,7 @@ this.set('name', attributes.name); this.set('searchkey', attributes.searchkey); this.set('description', attributes.description); + this.set('terminallog', attributes.terminallog); this.set('subscriptions', []); this.set('executions', new Backbone.Collection()); } @@ -123,6 +125,9 @@ obj.processStarted(execProcess, execution, me.getProcessesInExecByOBj(obj)); } }); + if (execProcess.get('terminallog')) { + OB.UTIL.TerminalLog.addProcess(searchkey, execution, 'start'); + } return execution; }, finish: function (searchkey, execution) { @@ -135,6 +140,9 @@ obj.processFinished(execProcess, execution, me.getProcessesInExecByOBj(obj)); } }); + if (execProcess.get('terminallog')) { + OB.UTIL.TerminalLog.addProcess(searchkey, execution, 'finish'); + } }, subscribe: function (processesSearchKey, obj) { //Ignore components with no processes defined diff -r 106da55fdd88 web/org.openbravo.mobile.core/source/utils/ob-terminal-log.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/org.openbravo.mobile.core/source/utils/ob-terminal-log.js Mon Dec 10 12:28:35 2018 +0100 @@ -0,0 +1,245 @@ +/* + ************************************************************************************ + * Copyright (C) 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. + ************************************************************************************ + */ + +/*global OB, _, moment */ + +/** + * API to log user action and processes start and finish + * + */ + +(function () { + OB.UTIL = window.OB.UTIL || {}; + OB.UTIL.TerminalLog = { + events: [], + eventsMaximumNumber: 10000, + addKeyPress: function (elmt) { + if (OB.MobileApp.model.get('permissions') && !OB.MobileApp.model.hasPermission('OBMOBC_EnableTerminalLogUserActions', true)) { + return; + } + + if (this.events.length >= this.eventsMaximumNumber) { + return; + } + + var keyName = elmt.key; + var password = false; + if (elmt.dispatchTarget.type === "password" && keyName !== "Enter" && keyName !== 'Tab') { + // don't save log of key pressed in input type password + keyName = ''; + password = true; + } + var ids = elmt.srcElement.id.split('_'); + var previousEvent = this.events[this.events.length - 1]; + var context = this.getContext(ids); + if (previousEvent && previousEvent.t === 'k' && previousEvent.c === context && previousEvent.k.substr(previousEvent.k.length - 3) !== 'Tab') { + if (!password) { + this.events[this.events.length - 1].k += ', ' + keyName; + } + } else { + var event = this.getNewEvent(context); + event.t = 'k'; + if (password) { + event.k = '[password] ' + keyName; + } else { + event.k = keyName; + event.e = this.getElemFromIds(ids); + } + this.events.push(event); + } + }, + addButtonClick: function (elmt) { + if (OB.MobileApp.model.get('permissions') && !OB.MobileApp.model.hasPermission('OBMOBC_EnableTerminalLogUserActions', true)) { + return; + } + var isKeyPadButton = function (txt, ids) { + // keypadcontainer include all the numbers and '.' of keypad, and also all the coins. But it don't include others like enter, backspace or + , -, etc + return txt.search(/[0-9.]+/) === 0 && ids['6'] === 'keypadcontainer'; + }; + if (this.events.length >= this.eventsMaximumNumber) { + return; + } + var ids = elmt.id.split('_'); + var buttonName = this.getButtonName(elmt, ids); + var previousEvent = this.events[this.events.length - 1]; + var context = this.getContext(ids); + + if (isKeyPadButton(buttonName, ids) && previousEvent && previousEvent.t === 'bk' && previousEvent.c === context) { + previousEvent.b += ', ' + buttonName; + } else { + var event = this.getNewEvent(context); + event.t = isKeyPadButton(buttonName, ids) ? 'bk' : 'b'; + event.b = buttonName; + event.e = this.getElemFromIds(ids); + this.events.push(event); + } + }, + getButtonName: function (elmt, ids) { + var buttonName = ''; + if (elmt.tagName === 'INPUT') { + buttonName += ' [input_field] '; + } + if (elmt.textContent) { + // button label text + buttonName += elmt.textContent; + } else { + var backgroundImg = window.getComputedStyle(document.getElementById(elmt.id)).getPropertyValue("background-image"); + if (backgroundImg) { + buttonName += backgroundImg.replace(/.*\/(icon)?([^.]+)\..*/, '$2'); + } else { + //if not, use the enyo object name + buttonName += ids[ids.length - 1]; + if (buttonName === 'button') { + // for keypad use the enyo parent + buttonName += ids[ids.length - 2]; + } + + // make more clean the guessed name form enyo object (i case insensitive, g all ocurrences) + buttonName = buttonName.replace(/button/ig, ''); + buttonName = buttonName.replace(/btn/ig, ''); + buttonName = buttonName.replace(/entity/ig, ''); + } + } + if (buttonName.length > 60) { + buttonName = buttonName.substring(0, 60) + '[...]'; + } + return buttonName; + }, + getContext: function (ids) { + var context = []; + context.push(OB.MobileApp.model.get('terminalLogContext')); + if (ids && (!OB.MobileApp.model.get('terminalLogContextPopUp') || OB.MobileApp.model.get('terminalLogContextPopUp').length === 0)) { + context.push(this.getContextFromIds(ids)); + } else { + var terminalLogContextPopUp = OB.MobileApp.model.get('terminalLogContextPopUp'); + if (terminalLogContextPopUp && terminalLogContextPopUp.length > 0) { + context = context.concat(terminalLogContextPopUp); + } + } + var contextString = context.join(" | "); + if (contextString.length > 250) { + contextString = contextString.substring(1, 245) + '[...]'; + } + return contextString; + }, + getContextFromIds: function (ids) { + return ids[3] + " - " + ids[4]; + }, + getElemFromIds: function (ids) { + return ids[ids.length - 2] + " - " + ids[ids.length - 1]; + }, + addProcess: function (name, id, status) { + if (OB.MobileApp.model.get('permissions') && !OB.MobileApp.model.hasPermission('OBMOBC_EnableTerminalLogProcess', true)) { + return; + } + if (this.events.length >= this.eventsMaximumNumber) { + return; + } + + var event = this.getNewEvent(); + if (status === 'start') { + event.t = 's'; + event.v = name; + event.i = id; + } else if (status === 'finish') { + event.t = 'f'; + event.v = name; + event.i = id; + } else { + OB.warn("Called OB.UTIL.TerminalLog.addProcess with status '" + status + "', but this status is not one of accepted ones."); + } + this.events.push(event); + }, + addPopup: function (popupName, status) { + if (OB.MobileApp.model.get('permissions') && !OB.MobileApp.model.hasPermission('OBMOBC_EnableTerminalLogUserActions', true) && !OB.MobileApp.model.hasPermission('OBMOBC_EnableTerminalLogProcess', true)) { + return; + } + var terminalLogContextPopUp = OB.MobileApp.model.get('terminalLogContextPopUp'); + var index = terminalLogContextPopUp.indexOf(popupName); + if (status === 'open') { + if (index < 0) { + // show could be executed when the popup is still visible + terminalLogContextPopUp.push(popupName); + } + } else if (status === 'close') { + if (index >= 0) { + terminalLogContextPopUp.splice(index, 1); + } + } else { + OB.warn("Called OB.UTIL.TerminalLog.addPopup with status '" + status + "', but this status is not one of accepted ones."); + } + OB.MobileApp.model.set('terminalLogContextPopUp', terminalLogContextPopUp); + }, + getNewEvent: function (context) { + var event = {}; + event.d = new Date().getTime(); + event.o = OB.MobileApp.model.get('connectedToERP'); + event.c = context ? context : this.getContext(); + return event; + }, + getEventsLog: function () { + return this.events; + }, + packageEvents: function (successCallback) { + + function callSuccessCallback() { + if (successCallback) { + successCallback(); + } + } + + if (!OB.MobileApp.model) { + // check if application is available + return callSuccessCallback(); + } + if (this.events.length === 0) { + // if nothing to package, don't do the package :) + return callSuccessCallback(); + } + + if (OB.MobileApp.model.get('sessionLost')) { + // if we are not logged it, we continue saving user events but we don't package and sync them + return callSuccessCallback(); + } + + // synchronous part + var eventPackage = new OB.Model.TerminalLog(); + eventPackage.set('terminal', OB.MobileApp.model.get('logConfiguration').deviceIdentifier); + eventPackage.set('cacheSessionId', OB.UTIL.localStorage.getItem('cacheSessionId')); + eventPackage.set('events', JSON.stringify(this.events.slice())); // only clones first level, and events are immutable + this.events = []; + // asynchronous part + // inside a transaction + // delete backup + // save model to sync + OB.Dal.transaction(function (tx) { + + OB.UTIL.TerminalLog.deleteBackup(); + OB.Dal.saveInTransaction(tx, eventPackage, function () { + callSuccessCallback(); + }, function () { + OB.error('Could not package events'); + callSuccessCallback(); + }); + }); + }, + doBackup: function () { + OB.UTIL.localStorage.setItem('eventLogBackup', JSON.stringify(this.events)); + }, + restoreFromBackup: function () { + var eventsBackup = OB.UTIL.localStorage.getItem('eventLogBackup'); + if (eventsBackup && eventsBackup !== "undefined") { + this.events = JSON.parse(eventsBackup); + } + }, + deleteBackup: function () { + OB.UTIL.localStorage.setItem('eventLogBackup', JSON.stringify([])); + } + }; +}()); \ No newline at end of file diff -r 106da55fdd88 web/org.openbravo.mobile.core/source/utils/ob-utilities.js --- a/web/org.openbravo.mobile.core/source/utils/ob-utilities.js Wed Nov 14 19:17:40 2018 +0100 +++ b/web/org.openbravo.mobile.core/source/utils/ob-utilities.js Mon Dec 10 12:28:35 2018 +0100 @@ -348,8 +348,6 @@ try { var saveInServer = OB.UTIL.checkPermissionLog(logLevel, "save"); - var humanLog = OB.UTIL.humanAction.getActionsLog(); - var processesLog = OB.UTIL.ProcessController.getProcessesInExecLog(); if (saveInServer) { var isSaveOnlyTraceOfCaller = true; @@ -357,9 +355,6 @@ 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); @@ -377,7 +372,6 @@ } else if (logLevel === "Warn") { console.warn(consoleMessage); } else if (logLevel === "Error" || logLevel === "Critical") { - consoleMessage = consoleMessage + humanLog + processesLog; console.error(consoleMessage); } else { OB.UTIL.Debug.execute(function () { @@ -472,10 +466,9 @@ logClientModel.set('loglevel', level); logClientModel.set('msg', msg); logClientModel.set('deviceId', OB.MobileApp.model.get('logConfiguration').deviceIdentifier); - logClientModel.set('cacheSessionId', null); - if (OB.UTIL.localStorage.getItem('cacheSessionId') !== null) { - logClientModel.set('cacheSessionId', OB.UTIL.localStorage.getItem('cacheSessionId')); - } + logClientModel.set('context', OB.MobileApp.model.get('terminalLogContext')); + logClientModel.set('cacheSessionId', OB.UTIL.localStorage.getItem('cacheSessionId')); + logClientModel.set('link', OB.UTIL.getStackLink()); _.each(OB.MobileApp.model.get('logConfiguration').logPropertiesExtension, function (f) { diff -r 106da55fdd88 web/org.openbravo.mobile.core/source/utils/ob-utilitiesui.js --- a/web/org.openbravo.mobile.core/source/utils/ob-utilitiesui.js Wed Nov 14 19:17:40 2018 +0100 +++ b/web/org.openbravo.mobile.core/source/utils/ob-utilitiesui.js Mon Dec 10 12:28:35 2018 +0100 @@ -210,6 +210,8 @@ components = container.getComponents ? container.getComponents() : [], i, dialog; + OB.info("Opened popup: " + (title ? title : text)); + function getDialog() { // Allow display in a confirmation message a literal or a list of components or literal messages diff -r 106da55fdd88 web/org.openbravo.mobile.core/source/utils/terminal-log-sync-utils.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/org.openbravo.mobile.core/source/utils/terminal-log-sync-utils.js Mon Dec 10 12:28:35 2018 +0100 @@ -0,0 +1,61 @@ +/* + ************************************************************************************ + * Copyright (C) 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. + ************************************************************************************ + */ + +/*global OB, console, _, Backbone*/ + +(function () { + + OB.UTIL = window.OB.UTIL || {}; + + OB.UTIL.activateTerminalLogSync = function () { + if (!OB.UTIL.terminalLogSyncIntervalId) { + var terminalLogIntervalInSecs; + if (OB.MobileApp.model.get('permissions')) { + terminalLogIntervalInSecs = OB.MobileApp.model.get('permissions').OBMOBC_TerminalLogSyncInterval; + } + if (!terminalLogIntervalInSecs) { + // default value for OBMOBC_TerminalLogSyncInterval + terminalLogIntervalInSecs = 30; + } + OB.UTIL.terminalLogSyncIntervalId = setInterval(function () { + OB.UTIL.TerminalLog.packageEvents(); + }, terminalLogIntervalInSecs * 1000); + } + }; + + OB.UTIL.stopTerminalLogSync = function () { + if (OB.UTIL.terminalLogSyncIntervalId) { + clearInterval(OB.UTIL.terminalLogSyncIntervalId); + OB.UTIL.terminalLogSyncIntervalId = null; + } + }; + + OB.UTIL.activateTerminalLogBackup = function () { + if (!OB.UTIL.terminalLogBackupIntervalId) { + var terminalLogBackupIntervalInSecs; + if (OB.MobileApp.model.get('permissions')) { + terminalLogBackupIntervalInSecs = OB.MobileApp.model.get('permissions').OBMOBC_TerminalLogBackupInterval; + } + if (!terminalLogBackupIntervalInSecs) { + // default value for OBMOBC_TerminalLogBackupInterval + terminalLogBackupIntervalInSecs = 1; + } + OB.UTIL.terminalLogBackupIntervalId = setInterval(function () { + OB.UTIL.TerminalLog.doBackup(); + }, terminalLogBackupIntervalInSecs * 1000); + } + }; + + OB.UTIL.stopTerminalLogBackup = function () { + if (OB.UTIL.terminalLogBackupIntervalId) { + clearInterval(OB.UTIL.terminalLogBackupIntervalId); + OB.UTIL.terminalLogBackupIntervalId = null; + } + }; +}()); \ No newline at end of file