Attached Files | issue 30652 source mobile.core 2017.patch [^] (23,238 bytes) 2016-03-28 14:03 [Show Content] [Hide Content]# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# 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 @@
<default/>
<onCreateDefault/>
</column>
- <column name="JSON" primaryKey="false" required="true" type="CLOB" size="4000" autoIncrement="false">
- <default/>
- <onCreateDefault/>
- </column>
<column name="DEVICEID" primaryKey="false" required="false" type="VARCHAR" size="255" autoIncrement="false">
<default/>
<onCreateDefault/>
@@ -53,6 +49,10 @@
<default/>
<onCreateDefault/>
</column>
+ <column name="ISONLINE" primaryKey="false" required="true" type="CHAR" size="1" autoIncrement="false">
+ <default><![CDATA[Y]]></default>
+ <onCreateDefault/>
+ </column>
<foreign-key foreignTable="AD_CLIENT" name="OBMOBC_LOGCLIENT_AD_CLIENT">
<reference local="AD_CLIENT_ID" foreign="AD_CLIENT_ID"/>
</foreign-key>
@@ -60,5 +60,6 @@
<reference local="AD_ORG_ID" foreign="AD_ORG_ID"/>
</foreign-key>
<check name="OBMOBC_LOGCLIENT_ISACTIVE_CHK"><![CDATA[ISACTIVE IN ('Y', 'N')]]></check>
+ <check name="OBMOBC_LOGCLIENT_ISONLINE_CHK"><![CDATA[ISONLINE IN ('Y', 'N')]]></check>
</table>
</database>
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 @@
<!--0B9D815A89954CA6BC002D374D6C397C--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
<!--0B9D815A89954CA6BC002D374D6C397C--></AD_COLUMN>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--><AD_COLUMN>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <AD_COLUMN_ID><![CDATA[0F7EF5D1C8044893AB6C2E627C25C07B]]></AD_COLUMN_ID>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <NAME><![CDATA[json]]></NAME>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <COLUMNNAME><![CDATA[Json]]></COLUMNNAME>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <AD_TABLE_ID><![CDATA[D669D497165B4A0CB9D382378BA8D0F5]]></AD_TABLE_ID>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <AD_REFERENCE_ID><![CDATA[14]]></AD_REFERENCE_ID>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <FIELDLENGTH><![CDATA[1000000]]></FIELDLENGTH>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <ISKEY><![CDATA[N]]></ISKEY>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <ISPARENT><![CDATA[N]]></ISPARENT>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <SEQNO><![CDATA[120]]></SEQNO>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <AD_ELEMENT_ID><![CDATA[B9BD3FBA84B245D884F09F2C32F0FFFA]]></AD_ELEMENT_ID>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <POSITION><![CDATA[9]]></POSITION>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
-<!--0F7EF5D1C8044893AB6C2E627C25C07B--></AD_COLUMN>
-
<!--109FF518A6584B7FA15D4F7EE8DCAD13--><AD_COLUMN>
<!--109FF518A6584B7FA15D4F7EE8DCAD13--> <AD_COLUMN_ID><![CDATA[109FF518A6584B7FA15D4F7EE8DCAD13]]></AD_COLUMN_ID>
<!--109FF518A6584B7FA15D4F7EE8DCAD13--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1701,6 +1666,42 @@
<!--ADC3C18156DD4EF58F08CA8C7EF3E6D0--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
<!--ADC3C18156DD4EF58F08CA8C7EF3E6D0--></AD_COLUMN>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--><AD_COLUMN>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <AD_COLUMN_ID><![CDATA[AE2B7BABD28E409386F9524B5B3E2D1B]]></AD_COLUMN_ID>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <NAME><![CDATA[isOnline]]></NAME>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <COLUMNNAME><![CDATA[Isonline]]></COLUMNNAME>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <AD_TABLE_ID><![CDATA[D669D497165B4A0CB9D382378BA8D0F5]]></AD_TABLE_ID>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <DEFAULTVALUE><![CDATA[Y]]></DEFAULTVALUE>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <ISKEY><![CDATA[N]]></ISKEY>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <ISPARENT><![CDATA[N]]></ISPARENT>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <ISMANDATORY><![CDATA[Y]]></ISMANDATORY>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <SEQNO><![CDATA[170]]></SEQNO>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <AD_ELEMENT_ID><![CDATA[5DFC15E4F8284723893EEDC347465D59]]></AD_ELEMENT_ID>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <POSITION><![CDATA[17]]></POSITION>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--> <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING>
+<!--AE2B7BABD28E409386F9524B5B3E2D1B--></AD_COLUMN>
+
<!--B27BB9DE907642A79CDB84D494A40CD9--><AD_COLUMN>
<!--B27BB9DE907642A79CDB84D494A40CD9--> <AD_COLUMN_ID><![CDATA[B27BB9DE907642A79CDB84D494A40CD9]]></AD_COLUMN_ID>
<!--B27BB9DE907642A79CDB84D494A40CD9--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
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 @@
<!--5D5312057045416FAFB5E8E9335AC138--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
<!--5D5312057045416FAFB5E8E9335AC138--></AD_ELEMENT>
+<!--5DFC15E4F8284723893EEDC347465D59--><AD_ELEMENT>
+<!--5DFC15E4F8284723893EEDC347465D59--> <AD_ELEMENT_ID><![CDATA[5DFC15E4F8284723893EEDC347465D59]]></AD_ELEMENT_ID>
+<!--5DFC15E4F8284723893EEDC347465D59--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--5DFC15E4F8284723893EEDC347465D59--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--5DFC15E4F8284723893EEDC347465D59--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--5DFC15E4F8284723893EEDC347465D59--> <COLUMNNAME><![CDATA[IsOnline]]></COLUMNNAME>
+<!--5DFC15E4F8284723893EEDC347465D59--> <NAME><![CDATA[Is Online]]></NAME>
+<!--5DFC15E4F8284723893EEDC347465D59--> <PRINTNAME><![CDATA[Is Online]]></PRINTNAME>
+<!--5DFC15E4F8284723893EEDC347465D59--> <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
+<!--5DFC15E4F8284723893EEDC347465D59--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
+<!--5DFC15E4F8284723893EEDC347465D59--></AD_ELEMENT>
+
<!--62BEA2CA5C1144239E93029DF755FA04--><AD_ELEMENT>
<!--62BEA2CA5C1144239E93029DF755FA04--> <AD_ELEMENT_ID><![CDATA[62BEA2CA5C1144239E93029DF755FA04]]></AD_ELEMENT_ID>
<!--62BEA2CA5C1144239E93029DF755FA04--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -223,18 +235,6 @@
<!--B2A700B9E9414B6CAF8EE12686B25D64--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
<!--B2A700B9E9414B6CAF8EE12686B25D64--></AD_ELEMENT>
-<!--B9BD3FBA84B245D884F09F2C32F0FFFA--><AD_ELEMENT>
-<!--B9BD3FBA84B245D884F09F2C32F0FFFA--> <AD_ELEMENT_ID><![CDATA[B9BD3FBA84B245D884F09F2C32F0FFFA]]></AD_ELEMENT_ID>
-<!--B9BD3FBA84B245D884F09F2C32F0FFFA--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--B9BD3FBA84B245D884F09F2C32F0FFFA--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--B9BD3FBA84B245D884F09F2C32F0FFFA--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--B9BD3FBA84B245D884F09F2C32F0FFFA--> <COLUMNNAME><![CDATA[Json]]></COLUMNNAME>
-<!--B9BD3FBA84B245D884F09F2C32F0FFFA--> <NAME><![CDATA[Json]]></NAME>
-<!--B9BD3FBA84B245D884F09F2C32F0FFFA--> <PRINTNAME><![CDATA[Json]]></PRINTNAME>
-<!--B9BD3FBA84B245D884F09F2C32F0FFFA--> <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
-<!--B9BD3FBA84B245D884F09F2C32F0FFFA--> <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY>
-<!--B9BD3FBA84B245D884F09F2C32F0FFFA--></AD_ELEMENT>
-
<!--BC8B4ACD54074AE087A8099EA231A998--><AD_ELEMENT>
<!--BC8B4ACD54074AE087A8099EA231A998--> <AD_ELEMENT_ID><![CDATA[BC8B4ACD54074AE087A8099EA231A998]]></AD_ELEMENT_ID>
<!--BC8B4ACD54074AE087A8099EA231A998--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
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 @@
<!--5FBDD5849B7B40A08D598DA26590E144--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--5FBDD5849B7B40A08D598DA26590E144--></AD_FIELD>
+<!--60FB31A3D33C4F49AAF9C50910813867--><AD_FIELD>
+<!--60FB31A3D33C4F49AAF9C50910813867--> <AD_FIELD_ID><![CDATA[60FB31A3D33C4F49AAF9C50910813867]]></AD_FIELD_ID>
+<!--60FB31A3D33C4F49AAF9C50910813867--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--60FB31A3D33C4F49AAF9C50910813867--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--60FB31A3D33C4F49AAF9C50910813867--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--60FB31A3D33C4F49AAF9C50910813867--> <NAME><![CDATA[Is Online]]></NAME>
+<!--60FB31A3D33C4F49AAF9C50910813867--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
+<!--60FB31A3D33C4F49AAF9C50910813867--> <AD_TAB_ID><![CDATA[14BDEAB664C146DCB662B2E3EA7A495E]]></AD_TAB_ID>
+<!--60FB31A3D33C4F49AAF9C50910813867--> <AD_COLUMN_ID><![CDATA[AE2B7BABD28E409386F9524B5B3E2D1B]]></AD_COLUMN_ID>
+<!--60FB31A3D33C4F49AAF9C50910813867--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
+<!--60FB31A3D33C4F49AAF9C50910813867--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
+<!--60FB31A3D33C4F49AAF9C50910813867--> <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
+<!--60FB31A3D33C4F49AAF9C50910813867--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
+<!--60FB31A3D33C4F49AAF9C50910813867--> <SEQNO><![CDATA[45]]></SEQNO>
+<!--60FB31A3D33C4F49AAF9C50910813867--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
+<!--60FB31A3D33C4F49AAF9C50910813867--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
+<!--60FB31A3D33C4F49AAF9C50910813867--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
+<!--60FB31A3D33C4F49AAF9C50910813867--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
+<!--60FB31A3D33C4F49AAF9C50910813867--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
+<!--60FB31A3D33C4F49AAF9C50910813867--> <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
+<!--60FB31A3D33C4F49AAF9C50910813867--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
+<!--60FB31A3D33C4F49AAF9C50910813867--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
+<!--60FB31A3D33C4F49AAF9C50910813867--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
+<!--60FB31A3D33C4F49AAF9C50910813867--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
+<!--60FB31A3D33C4F49AAF9C50910813867--></AD_FIELD>
+
<!--67182A781216444783A9652CB5E0B7C2--><AD_FIELD>
<!--67182A781216444783A9652CB5E0B7C2--> <AD_FIELD_ID><![CDATA[67182A781216444783A9652CB5E0B7C2]]></AD_FIELD_ID>
<!--67182A781216444783A9652CB5E0B7C2--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
@@ -1077,32 +1103,6 @@
<!--D7C95D909D684C0EBFEE578AE76164AC--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
<!--D7C95D909D684C0EBFEE578AE76164AC--></AD_FIELD>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--><AD_FIELD>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--> <AD_FIELD_ID><![CDATA[E0120144403D4EEFA2C58ADEA6E8531A]]></AD_FIELD_ID>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--> <NAME><![CDATA[Json]]></NAME>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--> <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--> <AD_TAB_ID><![CDATA[14BDEAB664C146DCB662B2E3EA7A495E]]></AD_TAB_ID>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--> <AD_COLUMN_ID><![CDATA[0F7EF5D1C8044893AB6C2E627C25C07B]]></AD_COLUMN_ID>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--> <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--> <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--> <DISPLAYLENGTH><![CDATA[1000000]]></DISPLAYLENGTH>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--> <ISREADONLY><![CDATA[Y]]></ISREADONLY>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--> <SEQNO><![CDATA[50]]></SEQNO>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--> <ISSAMELINE><![CDATA[N]]></ISSAMELINE>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--> <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--> <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--> <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--> <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--> <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--> <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--> <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--> <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--> <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY>
-<!--E0120144403D4EEFA2C58ADEA6E8531A--></AD_FIELD>
-
<!--E96D046079E744B495D75AF08CCD3C47--><AD_FIELD>
<!--E96D046079E744B495D75AF08CCD3C47--> <AD_FIELD_ID><![CDATA[E96D046079E744B495D75AF08CCD3C47]]></AD_FIELD_ID>
<!--E96D046079E744B495D75AF08CCD3C47--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
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 () {
issue 30652 source posterminal 6241.patch [^] (1,079 bytes) 2016-03-28 14:03 [Show Content] [Hide Content]# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1459157191 -19800
# Node ID cb733181cb81a1e86f3765ee9a2e49e5c8ebf46c
# Parent f6a786ee3b2cdd6fc61aad864cf7608b81f302ec
Related to issue 30652 : Renaming Log client column from "online" to "isOnline"
diff -r f6a786ee3b2c -r cb733181cb81 web/org.openbravo.retail.posterminal/js/login/model/login-model.js
--- a/web/org.openbravo.retail.posterminal/js/login/model/login-model.js Fri Mar 25 12:26:04 2016 +0530
+++ b/web/org.openbravo.retail.posterminal/js/login/model/login-model.js Mon Mar 28 14:56:31 2016 +0530
@@ -43,7 +43,7 @@
function () {
return {
- online: OB.MobileApp.model.get('connectedToERP')
+ isOnline: OB.MobileApp.model.get('connectedToERP')
};
}]
},
@@ -76,7 +76,7 @@
function () {
return {
- online: OB.MobileApp.model.get('connectedToERP')
+ isOnline: OB.MobileApp.model.get('connectedToERP')
};
}]
});
issue 30652 Test 5218.patch [^] (2,380 bytes) 2016-03-28 14:03 [Show Content] [Hide Content]# HG changeset patch
# User Ranjith S R <ranjith@qualiantech.com>
# Date 1459157204 -19800
# Node ID 1f696d99c0d86410902899c0a8cdec3528b0b277
# Parent 9b90073126760a5fde3554b6d6e304a3c6c13f82
Verifies issue 30652 : Modifies MobileCoreDatabaseHelper, Removed json column from obmobc_logclient
diff -r 9b9007312676 -r 1f696d99c0d8 src-test/org/openbravo/test/mobile/common/selenium/database/MobileCoreDatabaseHelper.java
--- a/src-test/org/openbravo/test/mobile/common/selenium/database/MobileCoreDatabaseHelper.java Fri Mar 25 12:25:43 2016 +0530
+++ b/src-test/org/openbravo/test/mobile/common/selenium/database/MobileCoreDatabaseHelper.java Mon Mar 28 14:56:44 2016 +0530
@@ -48,11 +48,9 @@
errorCnt++;
final String deviceId = rs.getString("deviceid");
final String msg = rs.getString("msg");
- final String json = rs.getString("json");
sb.append(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n");
sb.append("Device --> " + deviceId + "\n");
sb.append("Message --> \n" + msg + "\n");
- sb.append("Json --> \n" + json);
}
if (!isAllowErrors) {
// if there are errors in the 'Errors While Importing POS Data', tag the test as failed
@@ -61,7 +59,7 @@
sb.toString()), errorCnt == 0);
}
}
- }.execute("SELECT deviceid, msg, json FROM obmobc_logclient WHERE loglevel='Error'");
+ }.execute("SELECT deviceid, msg FROM obmobc_logclient WHERE loglevel='Error'");
}
public static void verifyImportTableIsProcessed(final boolean isAllowErrors) {
@@ -79,7 +77,7 @@
}.execute("SELECT COUNT(*) AS count FROM c_import_entry WHERE importstatus = 'Initial'", 1);
}
- public static void cleanUnprocessedImportTableEntries(){
+ public static void cleanUnprocessedImportTableEntries() {
new DatabaseHelperSelect() {
@Override
protected void yieldResultSet(final ResultSet rs) throws SQLException {
@@ -87,7 +85,8 @@
final String sql = "DELETE FROM c_import_entry WHERE importstatus = 'Initial'";
new DatabaseHelperInsertUpdateOrDelete().execute(sql, count);
}
- }.execute("SELECT COUNT(*) AS count FROM c_import_entry WHERE importstatus = 'Initial'", 1, false);
+ }.execute("SELECT COUNT(*) AS count FROM c_import_entry WHERE importstatus = 'Initial'", 1,
+ false);
}
}
|