# HG changeset patch # User Ranjith S R # Date 1459157196 -19800 # Node ID 4ff6f9d3a116db133932bc21d111586140f29352 # Parent 760f4ff087f91879c1025ec60fcfff705bfc0a3b Related to issue 30652 : Removing "json" column from Mobile Core Log table diff -r 760f4ff087f9 -r 4ff6f9d3a116 src-db/database/model/tables/OBMOBC_LOGCLIENT.xml --- a/src-db/database/model/tables/OBMOBC_LOGCLIENT.xml Wed Mar 23 15:52:52 2016 +0100 +++ b/src-db/database/model/tables/OBMOBC_LOGCLIENT.xml Mon Mar 28 14:56:36 2016 +0530 @@ -33,10 +33,6 @@ - - - - @@ -53,6 +49,10 @@ + + + + @@ -60,5 +60,6 @@ + diff -r 760f4ff087f9 -r 4ff6f9d3a116 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Wed Mar 23 15:52:52 2016 +0100 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Mon Mar 28 14:56:36 2016 +0530 @@ -37,41 +37,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1701,6 +1666,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 760f4ff087f9 -r 4ff6f9d3a116 src-db/database/sourcedata/AD_ELEMENT.xml --- a/src-db/database/sourcedata/AD_ELEMENT.xml Wed Mar 23 15:52:52 2016 +0100 +++ b/src-db/database/sourcedata/AD_ELEMENT.xml Mon Mar 28 14:56:36 2016 +0530 @@ -125,6 +125,18 @@ + + + + + + + + + + + + @@ -223,18 +235,6 @@ - - - - - - - - - - - - diff -r 760f4ff087f9 -r 4ff6f9d3a116 src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml Wed Mar 23 15:52:52 2016 +0100 +++ b/src-db/database/sourcedata/AD_FIELD.xml Mon Mar 28 14:56:36 2016 +0530 @@ -551,6 +551,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1077,32 +1103,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 760f4ff087f9 -r 4ff6f9d3a116 src/org/openbravo/mobile/core/utils/LogClientLoader.java --- a/src/org/openbravo/mobile/core/utils/LogClientLoader.java Wed Mar 23 15:52:52 2016 +0100 +++ b/src/org/openbravo/mobile/core/utils/LogClientLoader.java Mon Mar 28 14:56:36 2016 +0530 @@ -92,12 +92,10 @@ JSONObject objJson = new JSONObject(jsonlogclient.getString("json")); - logClient.setJson(jsonlogclient.getString("json")); - JSONPropertyToEntity.fillBobFromJSON( ModelProvider.getInstance().getEntity(obmobcLogClient.class), logClient, objJson); - updateAuditInfo(logClient, jsonlogclient); + updateAuditInfo(logClient, objJson); OBDal.getInstance().save(logClient); log.debug("Creation of Log Client records: " + (System.currentTimeMillis() - t0)); @@ -123,7 +121,7 @@ lc.setCreationDate(new Date(value)); lc.setUpdated(new Date(value)); String strUserId = "0"; - if (jsonorder.getString("createdby") != null && !"".equals(jsonorder.getString("createdby"))) { + if (jsonorder.optString("createdby", null) != null) { strUserId = jsonorder.getString("createdby"); } User createdby = OBDal.getInstance().get(User.class, strUserId); diff -r 760f4ff087f9 -r 4ff6f9d3a116 web/org.openbravo.mobile.core/source/model/logclient.js --- a/web/org.openbravo.mobile.core/source/model/logclient.js Wed Mar 23 15:52:52 2016 +0100 +++ b/web/org.openbravo.mobile.core/source/model/logclient.js Mon Mar 28 14:56:36 2016 +0530 @@ -1,6 +1,6 @@ /* ************************************************************************************ - * Copyright (C) 2012 Openbravo S.L.U. + * Copyright (C) 2012-2016 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, 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, created TEXT, createdby TEXT)', dropStatement: 'DROP TABLE IF EXISTS obmobc_logclient', - insertStatement: 'INSERT INTO obmobc_logclient (obmobc_logclient_id, deviceId, cacheSessionId, msg, json, created, createdby) VALUES (?,?,?,?,?,?,?)', + insertStatement: 'INSERT INTO obmobc_logclient (obmobc_logclient_id, deviceId, cacheSessionId, msg, json, loglevel, created, createdby) VALUES (?,?,?,?,?,?,?,?)', serializeToJSON: function () { return JSON.parse(JSON.stringify(this.toJSON())); } @@ -47,6 +47,10 @@ column: 'json', type: 'CLOB' }, { + name: 'loglevel', + column: 'loglevel', + type: 'TEXT' + }, { name: 'created', column: 'created', type: 'TEXT' diff -r 760f4ff087f9 -r 4ff6f9d3a116 web/org.openbravo.mobile.core/source/model/ob-terminal-model.js --- a/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js Wed Mar 23 15:52:52 2016 +0100 +++ b/web/org.openbravo.mobile.core/source/model/ob-terminal-model.js Mon Mar 28 14:56:36 2016 +0530 @@ -288,7 +288,7 @@ function () { return { - online: OB.MobileApp.model.get('connectedToERP') + isOnline: OB.MobileApp.model.get('connectedToERP') }; }] }); diff -r 760f4ff087f9 -r 4ff6f9d3a116 web/org.openbravo.mobile.core/source/utils/logClientSyncUtils.js --- a/web/org.openbravo.mobile.core/source/utils/logClientSyncUtils.js Wed Mar 23 15:52:52 2016 +0100 +++ b/web/org.openbravo.mobile.core/source/utils/logClientSyncUtils.js Mon Mar 28 14:56:36 2016 +0530 @@ -1,6 +1,6 @@ /* ************************************************************************************ - * Copyright (C) 2012 Openbravo S.L.U. + * Copyright (C) 2012-2016 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. @@ -54,7 +54,10 @@ var toJson = logClient.serializeToJSON(); if (toJson && toJson.msg) { if (toJson.msg.toLowerCase().indexOf('logclient') < 0) { - logClientsToJson.push(toJson); + logClientsToJson.push({ + id: toJson.id, + json: toJson.json + }); return; } console.warn("Log client failed to log:\n" + toJson.msg); diff -r 760f4ff087f9 -r 4ff6f9d3a116 web/org.openbravo.mobile.core/source/utils/ob-utilities.js --- a/web/org.openbravo.mobile.core/source/utils/ob-utilities.js Wed Mar 23 15:52:52 2016 +0100 +++ b/web/org.openbravo.mobile.core/source/utils/ob-utilities.js Mon Mar 28 14:56:36 2016 +0530 @@ -1,6 +1,6 @@ /* ************************************************************************************ - * Copyright (C) 2012-2015 Openbravo S.L.U. + * Copyright (C) 2012-2016 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. @@ -405,7 +405,6 @@ } var date = new Date(); - logClientModel.set('obmobc_logclient_id', OB.UTIL.get_UUID()); logClientModel.set('created', date.getTime()); logClientModel.set('createdby', OB.MobileApp.model.get('orgUserId')); logClientModel.set('loglevel', level); @@ -420,7 +419,6 @@ _.each(OB.MobileApp.model.get('logConfiguration').logPropertiesExtension, function (f) { logClientModel.set(f()); }); - logClientModel.set('json', JSON.stringify(logClientModel.toJSON())); OB.Dal.save(logClientModel, function () {