details: https://code.openbravo.com/erp/devel/pi/rev/c4af7f9e6aaa changeset: 13345:c4af7f9e6aaa user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Fri Jul 29 11:26:09 2011 +0200 summary: Related to issue 17880. Related to issue 17819. Added recordTime property. Also, added getTimePassedInterval() method to support it.
details: https://code.openbravo.com/erp/devel/pi/rev/11de85d32280 changeset: 13346:11de85d32280 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Fri Jul 29 11:27:42 2011 +0200 summary: Fixed issue 17819. Notes timestamp will be calculated in the server to prevent clock synchronization problems details: https://code.openbravo.com/erp/devel/pi/rev/2d138204577c changeset: 13347:2d138204577c user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Fri Jul 29 11:29:14 2011 +0200 summary: Fixed issue 17880. Attachments 'age' will be calculated in the server to prevent clock synchronization issues diffstat: modules/org.openbravo.client.application/src/org/openbravo/client/application/window/AttachmentsAH.java | 12 +++------ modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java | 12 +++------ modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-notes.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js | 11 ++++++-- modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java | 1 + 6 files changed, 19 insertions(+), 21 deletions(-) diffs (141 lines): diff -r c77612cebdbe -r 2d138204577c modules/org.openbravo.client.application/src/org/openbravo/client/application/window/AttachmentsAH.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/AttachmentsAH.java Fri Jul 29 10:56:10 2011 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/AttachmentsAH.java Fri Jul 29 11:29:14 2011 +0200 @@ -19,8 +19,8 @@ package org.openbravo.client.application.window; import java.io.File; -import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; @@ -104,19 +104,15 @@ String tableId = (String) DalUtil.getId(tab.getTable()); OBCriteria<Attachment> attachmentFiles = OBDao.getFilteredCriteria(Attachment.class, Restrictions.eq("table.id", tableId), Restrictions.in("record", recordIds.split(","))); + attachmentFiles.addOrderBy("creationDate", false); List<JSONObject> attachments = new ArrayList<JSONObject>(); for (Attachment attachment : attachmentFiles.list()) { JSONObject attachmentobj = new JSONObject(); try { attachmentobj.put("id", attachment.getId()); attachmentobj.put("name", attachment.getName()); - final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZZZZZ"); - dateFormat.setLenient(true); - String date = dateFormat.format(attachment.getCreationDate()); - String d1 = date.substring(0, date.length() - 2); - String d2 = date.substring(date.length() - 2, date.length()); - attachmentobj.put("creationDate", d1 + ":" + d2); - attachmentobj.put("createdby", attachment.getCreatedBy().getName()); + attachmentobj.put("age", (new Date().getTime() - attachment.getUpdated().getTime())); + attachmentobj.put("createdby", attachment.getUpdatedBy().getName()); } catch (Exception e) { throw new OBException("Error while reading attachments:", e); } diff -r c77612cebdbe -r 2d138204577c modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java Fri Jul 29 10:56:10 2011 +0200 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java Fri Jul 29 11:29:14 2011 +0200 @@ -22,8 +22,8 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -292,18 +292,14 @@ attachments = OBDao.getFilteredCriteria(Attachment.class, Restrictions.eq("table.id", tableId), Restrictions.in("record", multipleRowIds)); } + attachments.addOrderBy("creationDate", false); for (Attachment attachment : attachments.list()) { JSONObject obj = new JSONObject(); try { obj.put("name", attachment.getName()); obj.put("id", attachment.getId()); - final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZZZZZ"); - dateFormat.setLenient(true); - String date = dateFormat.format(attachment.getCreationDate()); - String d1 = date.substring(0, date.length() - 2); - String d2 = date.substring(date.length() - 2, date.length()); - obj.put("creationDate", d1 + ":" + d2); - obj.put("createdby", attachment.getCreatedBy().getName()); + obj.put("age", (new Date().getTime() - attachment.getUpdated().getTime())); + obj.put("createdby", attachment.getUpdatedBy().getName()); } catch (JSONException e) { log.error("Error while reading attachments", e); } diff -r c77612cebdbe -r 2d138204577c modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js Fri Jul 29 10:56:10 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-attachments.js Fri Jul 29 11:29:14 2011 +0200 @@ -392,7 +392,7 @@ height: 20, wrap: false }); - var creationDate = OB.Utilities.getTimePassed(isc.Date.parseSchemaDate(attachment.creationDate)); + var creationDate = OB.Utilities.getTimePassedInterval(attachment.age); var attachmentBy = isc.Label.create({ height: 1, className: 'OBNoteListGridAuthor', diff -r c77612cebdbe -r 2d138204577c modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-notes.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-notes.js Fri Jul 29 10:56:10 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form-notes.js Fri Jul 29 11:29:14 2011 +0200 @@ -274,7 +274,7 @@ } value = value + ' <span class="OBNoteListGridAuthor">' + - OB.Utilities.getTimePassed(record.creationDate) + + OB.Utilities.getTimePassedInterval(record.recordTime-record.creationDate.getTime()) + ' ' + OB.I18N.getLabel('OBUIAPP_by') + ' ' + record['createdBy._identifier']+'</span>'; diff -r c77612cebdbe -r 2d138204577c modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js Fri Jul 29 10:56:10 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities.js Fri Jul 29 11:29:14 2011 +0200 @@ -830,7 +830,12 @@ n; // time difference in days - var diffDays = Math.floor((msNow - msCreated) / (1000 * 60 * 60 * 24)); + return OB.Utilities.getTimePassedInterval(msNow - msCreated); +}; + +OB.Utilities.getTimePassedInterval = function( + /* amount of time in miliseconds */ timeInMiliseconds) { + var diffDays = Math.floor((timeInMiliseconds) / (1000 * 60 * 60 * 24)); if (diffDays >= 30) { n = Math.floor(diffDays / 30); return OB.Utilities.formatTimePassedMessage(n, @@ -846,7 +851,7 @@ } // time difference in hours - var diffHours = Math.floor((msNow - msCreated) / (1000 * 60 * 60)); + var diffHours = Math.floor((timeInMiliseconds) / (1000 * 60 * 60)); if (diffHours >= 1) { n = diffHours; return OB.Utilities.formatTimePassedMessage(n, @@ -854,7 +859,7 @@ } // time difference in minutes - n = Math.floor((msNow - msCreated) / (1000 * 60)); + n = Math.floor((timeInMiliseconds) / (1000 * 60)); return OB.Utilities.formatTimePassedMessage(n, 'OBUIAPP_minutes_ago'); }; diff -r c77612cebdbe -r 2d138204577c modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java --- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java Fri Jul 29 10:56:10 2011 +0200 +++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/DataToJsonConverter.java Fri Jul 29 11:29:14 2011 +0200 @@ -179,6 +179,7 @@ } } + jsonObject.put("recordTime", new Date().getTime()); return jsonObject; } catch (JSONException e) { throw new IllegalStateException(e); ------------------------------------------------------------------------------ Got Input? Slashdot Needs You. Take our quick survey online. Come on, we don't ask for help often. Plus, you'll get a chance to win $100 to spend on ThinkGeek. http://p.sf.net/sfu/slashdot-survey _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
