Attached Files | Field_Serial_No_Correct.png [^] (136,447 bytes) 2019-03-20 11:02
Field_Expiration_Date_Covered.png [^] (175,015 bytes) 2019-03-20 11:03
diffFinalMobileProblems.diff [^] (15,960 bytes) 2019-03-22 08:06 [Show Content] [Hide Content]diff -r f81be58faee4 src-db/database/sourcedata/AD_PREFERENCE.xml
--- a/src-db/database/sourcedata/AD_PREFERENCE.xml Mon Mar 18 12:23:34 2019 +0100
+++ b/src-db/database/sourcedata/AD_PREFERENCE.xml Fri Mar 22 08:05:38 2019 +0100
@@ -154,6 +154,17 @@
<!--F0FA6C74FF6347E6B2CE38F115D5F2CA--> <AD_MODULE_ID><![CDATA[E09B68E8080847CF99A3AA62238C7079]]></AD_MODULE_ID>
<!--F0FA6C74FF6347E6B2CE38F115D5F2CA--></AD_PREFERENCE>
+<!--F1AA159332D24ECAAEEF72DF796BB5DB--><AD_PREFERENCE>
+<!--F1AA159332D24ECAAEEF72DF796BB5DB--> <AD_PREFERENCE_ID><![CDATA[F1AA159332D24ECAAEEF72DF796BB5DB]]></AD_PREFERENCE_ID>
+<!--F1AA159332D24ECAAEEF72DF796BB5DB--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--F1AA159332D24ECAAEEF72DF796BB5DB--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--F1AA159332D24ECAAEEF72DF796BB5DB--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--F1AA159332D24ECAAEEF72DF796BB5DB--> <VALUE><![CDATA[540px]]></VALUE>
+<!--F1AA159332D24ECAAEEF72DF796BB5DB--> <PROPERTY><![CDATA[OBAWO_RightScrollDeviceHeight]]></PROPERTY>
+<!--F1AA159332D24ECAAEEF72DF796BB5DB--> <ISPROPERTYLIST><![CDATA[Y]]></ISPROPERTYLIST>
+<!--F1AA159332D24ECAAEEF72DF796BB5DB--> <AD_MODULE_ID><![CDATA[E09B68E8080847CF99A3AA62238C7079]]></AD_MODULE_ID>
+<!--F1AA159332D24ECAAEEF72DF796BB5DB--></AD_PREFERENCE>
+
<!--F35FCBB6D80849C3B62D37D72AFFA085--><AD_PREFERENCE>
<!--F35FCBB6D80849C3B62D37D72AFFA085--> <AD_PREFERENCE_ID><![CDATA[F35FCBB6D80849C3B62D37D72AFFA085]]></AD_PREFERENCE_ID>
<!--F35FCBB6D80849C3B62D37D72AFFA085--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r f81be58faee4 src-db/database/sourcedata/AD_REF_LIST.xml
--- a/src-db/database/sourcedata/AD_REF_LIST.xml Mon Mar 18 12:23:34 2019 +0100
+++ b/src-db/database/sourcedata/AD_REF_LIST.xml Fri Mar 22 08:05:38 2019 +0100
@@ -689,6 +689,17 @@
<!--C99B670A43394505B8B6B93C1C2F9307--> <AD_MODULE_ID><![CDATA[E09B68E8080847CF99A3AA62238C7079]]></AD_MODULE_ID>
<!--C99B670A43394505B8B6B93C1C2F9307--></AD_REF_LIST>
+<!--C9B43B13919348CC8E0316B11E219664--><AD_REF_LIST>
+<!--C9B43B13919348CC8E0316B11E219664--> <AD_REF_LIST_ID><![CDATA[C9B43B13919348CC8E0316B11E219664]]></AD_REF_LIST_ID>
+<!--C9B43B13919348CC8E0316B11E219664--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--C9B43B13919348CC8E0316B11E219664--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--C9B43B13919348CC8E0316B11E219664--> <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--C9B43B13919348CC8E0316B11E219664--> <VALUE><![CDATA[OBAWO_RightScrollDeviceHeight]]></VALUE>
+<!--C9B43B13919348CC8E0316B11E219664--> <NAME><![CDATA[Height of right scroll for AWOFE]]></NAME>
+<!--C9B43B13919348CC8E0316B11E219664--> <AD_REFERENCE_ID><![CDATA[A26BA480E2014707B47257024C3CBFF7]]></AD_REFERENCE_ID>
+<!--C9B43B13919348CC8E0316B11E219664--> <AD_MODULE_ID><![CDATA[E09B68E8080847CF99A3AA62238C7079]]></AD_MODULE_ID>
+<!--C9B43B13919348CC8E0316B11E219664--></AD_REF_LIST>
+
<!--CA6FA5774B214B04BB4D8B0FAC1EBB3A--><AD_REF_LIST>
<!--CA6FA5774B214B04BB4D8B0FAC1EBB3A--> <AD_REF_LIST_ID><![CDATA[CA6FA5774B214B04BB4D8B0FAC1EBB3A]]></AD_REF_LIST_ID>
<!--CA6FA5774B214B04BB4D8B0FAC1EBB3A--> <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff -r f81be58faee4 web/org.openbravo.warehouse.advancedwarehouseoperations/assets/css/obawo-styles.css
--- a/web/org.openbravo.warehouse.advancedwarehouseoperations/assets/css/obawo-styles.css Mon Mar 18 12:23:34 2019 +0100
+++ b/web/org.openbravo.warehouse.advancedwarehouseoperations/assets/css/obawo-styles.css Fri Mar 22 08:05:38 2019 +0100
@@ -981,3 +981,8 @@
.productDetailsContainer > .flex-item {
padding-right: 2%;
}
+
+.taskFieldsContainer {
+ display: flex;
+ flex-direction: column;
+}
diff -r f81be58faee4 web/org.openbravo.warehouse.advancedwarehouseoperations/source/box/components/obawo-box-components.js
--- a/web/org.openbravo.warehouse.advancedwarehouseoperations/source/box/components/obawo-box-components.js Mon Mar 18 12:23:34 2019 +0100
+++ b/web/org.openbravo.warehouse.advancedwarehouseoperations/source/box/components/obawo-box-components.js Fri Mar 22 08:05:38 2019 +0100
@@ -34,8 +34,8 @@
},
//Set from outside
unpItem: null,
- tap: function () {
- this.unpItem.setFocusOnField(this.field, true);
+ tap: function (domElement) {
+ this.unpItem.setFocusOnField(this.field, true, domElement);
return true;
},
classes: 'taskPropertyLine',
@@ -118,8 +118,8 @@
value: this.unpItem.getFieldValue(this.field),
onchange: 'valueUpdated',
disabled: (this.field && this.field.readOnly) ? true : false,
- focus: function () {
- this.unpItem.setFocusOnField(this.field, true);
+ focus: function (domElement) {
+ this.unpItem.setFocusOnField(this.field, true, domElement);
},
blur: function () {
OB.MobileApp.view.scanningFocus(true);
diff -r f81be58faee4 web/org.openbravo.warehouse.advancedwarehouseoperations/source/components/obawo-boxunboxsharedcomponents.js
--- a/web/org.openbravo.warehouse.advancedwarehouseoperations/source/components/obawo-boxunboxsharedcomponents.js Mon Mar 18 12:23:34 2019 +0100
+++ b/web/org.openbravo.warehouse.advancedwarehouseoperations/source/components/obawo-boxunboxsharedcomponents.js Fri Mar 22 08:05:38 2019 +0100
@@ -675,7 +675,8 @@
classes: 'span12',
style: 'background-color: #FFFFFF;',
components: [{
- name: 'bupItemsFieldsContainerLines'
+ name: 'bupItemsFieldsContainerLines',
+ classes: 'taskFieldsContainer'
}]
}, {
name: 'dummycomponent',
@@ -738,6 +739,15 @@
me.$.bupItemsFieldsContainerLines.waterfall('onFocusSet', {
focusedField: newFocusedField.field
});
+ if (newFocusedField.domElement) {
+ setTimeout(function () {
+ if (newFocusedField.domElement.getBounds().top - 47 > 0) {
+ me.$.bupItemsFieldsContainer.setScrollTop(newFocusedField.domElement.getBounds().top - 70);
+ } else {
+ me.$.bupItemsFieldsContainer.scrollToTop();
+ }
+ }, 450);
+ }
}
};
}
@@ -765,6 +775,19 @@
});
}, this);
+ if (OB.MobileApp.model.get('permissions')['OBAWO_RightScrollDeviceHeight'] && OB.MobileApp.model.get('permissions')['OBAWO_RightScrollDeviceHeight'] !== '540px') {
+ //We assume that we are using a mobile device and screen keyboard could be shown
+ //We need to make the scroll area smaller in order to show the keyboard without hide fields
+ var componentToIncreaseScroll = {
+ name: 'scrollOverflow',
+ style: 'height: 200px;'
+ };
+ var newHeightForScrollInPx = OB.MobileApp.model.get('permissions')['OBAWO_RightScrollDeviceHeight'];
+ this.$.bupItemsFieldsContainerLines.createComponent(componentToIncreaseScroll);
+ this.$.bupItemsFieldsContainer.applyStyle('max-height', newHeightForScrollInPx);
+ this.$.bupItemsFieldsContainer.setMaxHeight(newHeightForScrollInPx);
+ }
+
this.$.bupItemsFieldsContainerLines.render();
}
}
diff -r f81be58faee4 web/org.openbravo.warehouse.advancedwarehouseoperations/source/components/obawo-physicalinventory-property.js
--- a/web/org.openbravo.warehouse.advancedwarehouseoperations/source/components/obawo-physicalinventory-property.js Mon Mar 18 12:23:34 2019 +0100
+++ b/web/org.openbravo.warehouse.advancedwarehouseoperations/source/components/obawo-physicalinventory-property.js Fri Mar 22 08:05:38 2019 +0100
@@ -13,8 +13,8 @@
handlers: {
onFocusSet: 'focused'
},
- tap: function () {
- this.pipItem.setFocusOnField(this.field, true);
+ tap: function (domElement) {
+ this.pipItem.setFocusOnField(this.field, true, domElement);
return true;
},
classes: 'taskPropertyLine',
@@ -96,8 +96,8 @@
value: this.pipItem.getFieldValue(this.field),
onchange: 'valueUpdated',
disabled: (this.field && this.field.readOnly) ? true : false,
- focus: function () {
- this.pipItem.setFocusOnField(this.field, true);
+ focus: function (domElement) {
+ this.pipItem.setFocusOnField(this.field, true, domElement);
},
blur: function () {
OB.MobileApp.view.scanningFocus(true);
diff -r f81be58faee4 web/org.openbravo.warehouse.advancedwarehouseoperations/source/components/obawo-task-panel.js
--- a/web/org.openbravo.warehouse.advancedwarehouseoperations/source/components/obawo-task-panel.js Mon Mar 18 12:23:34 2019 +0100
+++ b/web/org.openbravo.warehouse.advancedwarehouseoperations/source/components/obawo-task-panel.js Fri Mar 22 08:05:38 2019 +0100
@@ -381,7 +381,8 @@
classes: 'span12',
style: 'background-color: #FFFFFF;',
components: [{
- name: 'taskFieldsContainerLines'
+ name: 'taskFieldsContainerLines',
+ classes: 'taskFieldsContainer'
}]
}, {
name: 'dummycomponent',
@@ -438,6 +439,15 @@
me.$.taskFieldsContainerLines.waterfall('onFocusSet', {
focusedField: newFocusedField.field
});
+ if (newFocusedField.domElement) {
+ setTimeout(function () {
+ if (newFocusedField.domElement.getBounds().top - 47 > 0) {
+ me.$.taskFieldsContainer.setScrollTop(newFocusedField.domElement.getBounds().top - 70);
+ } else {
+ me.$.taskFieldsContainer.scrollToTop();
+ }
+ }, 450);
+ }
}
};
}
@@ -465,6 +475,20 @@
});
}, this);
+ if (OB.MobileApp.model.get('permissions')['OBAWO_RightScrollDeviceHeight'] && OB.MobileApp.model.get('permissions')['OBAWO_RightScrollDeviceHeight'] !== '540px') {
+ //We assume that we are using a mobile device and screen keyboard could be shown
+ //We need to make the scroll area smaller in order to show the keyboard without hide fields
+ var componentToIncreaseScroll = {
+ name: 'scrollOverflow',
+ style: 'height: 200px;'
+ };
+ var newHeightForScrollInPx = OB.MobileApp.model.get('permissions')['OBAWO_RightScrollDeviceHeight'];
+ this.$.taskFieldsContainerLines.createComponent(componentToIncreaseScroll);
+ this.$.taskFieldsContainer.applyStyle('max-height', newHeightForScrollInPx);
+ this.$.taskFieldsContainer.setMaxHeight(newHeightForScrollInPx);
+ }
+
+
this.$.taskFieldsContainerLines.render();
},
initComponents: function () {
diff -r f81be58faee4 web/org.openbravo.warehouse.advancedwarehouseoperations/source/components/obawo-task-property.js
--- a/web/org.openbravo.warehouse.advancedwarehouseoperations/source/components/obawo-task-property.js Mon Mar 18 12:23:34 2019 +0100
+++ b/web/org.openbravo.warehouse.advancedwarehouseoperations/source/components/obawo-task-property.js Fri Mar 22 08:05:38 2019 +0100
@@ -20,7 +20,7 @@
OB.MobileApp.view.scanningFocus(false);
event.originator.hasNode().focus();
}
- this.task.setFocusOnField(this.field, true);
+ this.task.setFocusOnField(this.field, true, sender);
return true;
},
classes: 'taskPropertyLine',
diff -r f81be58faee4 web/org.openbravo.warehouse.advancedwarehouseoperations/source/models/bup.js
--- a/web/org.openbravo.warehouse.advancedwarehouseoperations/source/models/bup.js Mon Mar 18 12:23:34 2019 +0100
+++ b/web/org.openbravo.warehouse.advancedwarehouseoperations/source/models/bup.js Fri Mar 22 08:05:38 2019 +0100
@@ -507,12 +507,13 @@
}
}, this);
},
- setFocusOnField: function (field, triggerEvent) {
+ setFocusOnField: function (field, triggerEvent, domElement) {
this.clearFocus();
field.hasFocus = true;
if (triggerEvent && triggerEvent === true) {
this.trigger('focusCalculated', {
- field: field
+ field: field,
+ domElement: domElement
});
}
},
diff -r f81be58faee4 web/org.openbravo.warehouse.advancedwarehouseoperations/source/models/pip.js
--- a/web/org.openbravo.warehouse.advancedwarehouseoperations/source/models/pip.js Mon Mar 18 12:23:34 2019 +0100
+++ b/web/org.openbravo.warehouse.advancedwarehouseoperations/source/models/pip.js Fri Mar 22 08:05:38 2019 +0100
@@ -408,12 +408,13 @@
}
}, this);
},
- setFocusOnField: function (field, triggerEvent) {
+ setFocusOnField: function (field, triggerEvent, domElement) {
this.clearFocus();
field.hasFocus = true;
if (triggerEvent && triggerEvent === true) {
this.trigger('focusCalculated', {
- field: field
+ field: field,
+ domElement: domElement
});
}
},
diff -r f81be58faee4 web/org.openbravo.warehouse.advancedwarehouseoperations/source/models/task.js
--- a/web/org.openbravo.warehouse.advancedwarehouseoperations/source/models/task.js Mon Mar 18 12:23:34 2019 +0100
+++ b/web/org.openbravo.warehouse.advancedwarehouseoperations/source/models/task.js Fri Mar 22 08:05:38 2019 +0100
@@ -880,12 +880,13 @@
}
}, this);
},
- setFocusOnField: function (field, triggerEvent) {
+ setFocusOnField: function (field, triggerEvent, domElement) {
this.clearFocus();
field.hasFocus = true;
if (triggerEvent && triggerEvent === true) {
this.trigger('focusCalculated', {
- field: field
+ field: field,
+ domElement: domElement
});
}
},
diff -r f81be58faee4 web/org.openbravo.warehouse.advancedwarehouseoperations/source/physicalinventorycount/components/obawo-physicalinventorycount-pip.js
--- a/web/org.openbravo.warehouse.advancedwarehouseoperations/source/physicalinventorycount/components/obawo-physicalinventorycount-pip.js Mon Mar 18 12:23:34 2019 +0100
+++ b/web/org.openbravo.warehouse.advancedwarehouseoperations/source/physicalinventorycount/components/obawo-physicalinventorycount-pip.js Fri Mar 22 08:05:38 2019 +0100
@@ -655,7 +655,8 @@
classes: 'span12',
style: 'background-color: #FFFFFF;',
components: [{
- name: 'pipItemsFieldsContainerLines'
+ name: 'pipItemsFieldsContainerLines',
+ classes: 'taskFieldsContainer'
}]
}, {
name: 'dummycomponent',
@@ -713,6 +714,15 @@
me.$.pipItemsFieldsContainerLines.waterfall('onFocusSet', {
focusedField: newFocusedField.field
});
+ if (newFocusedField.domElement) {
+ setTimeout(function () {
+ if (newFocusedField.domElement.getBounds().top - 47 > 0) {
+ me.$.pipItemsFieldsContainer.setScrollTop(newFocusedField.domElement.getBounds().top - 70);
+ } else {
+ me.$.pipItemsFieldsContainer.scrollToTop();
+ }
+ }, 450);
+ }
}
};
}
@@ -739,7 +749,18 @@
field: field
});
}, this);
-
+ if (OB.MobileApp.model.get('permissions')['OBAWO_RightScrollDeviceHeight'] && OB.MobileApp.model.get('permissions')['OBAWO_RightScrollDeviceHeight'] !== '540px') {
+ //We assume that we are using a mobile device and screen keyboard could be shown
+ //We need to make the scroll area smaller in order to show the keyboard without hide fields
+ var componentToIncreaseScroll = {
+ name: 'scrollOverflow',
+ style: 'height: 200px;'
+ };
+ var newHeightForScrollInPx = OB.MobileApp.model.get('permissions')['OBAWO_RightScrollDeviceHeight'];
+ this.$.pipItemsFieldsContainerLines.createComponent(componentToIncreaseScroll);
+ this.$.pipItemsFieldsContainer.applyStyle('max-height', newHeightForScrollInPx);
+ this.$.pipItemsFieldsContainer.setMaxHeight(newHeightForScrollInPx);
+ }
this.$.pipItemsFieldsContainerLines.render();
}
},
|