[Opentaps-crmcommits] [SCM] opentaps v2 branch, master, updated. e78bba6b8a2327d3b60af1bd275c6ba2068374a3

[<kry...@ea...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "opentaps v2".

The branch, master has been updated
       via  e78bba6b8a2327d3b60af1bd275c6ba2068374a3 (commit)
      from  12ab91ff3caeac9b1ddb5fafa84ed6aaaefa1ee9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e78bba6b8a2327d3b60af1bd275c6ba2068374a3
Author: Konstantin Rybalko <kon...@gm...>
Date:   Thu Jan 26 22:56:26 2012 +0200

    #2615 Add sequence number field for notes

diff --git a/modules/notes/api/services/src/main/java/org/opentaps/notes/domain/Note.java b/modules/notes/api/services/src/main/java/org/opentaps/notes/domain/Note.java
index 061b1f7..84a801f 100644
--- a/modules/notes/api/services/src/main/java/org/opentaps/notes/domain/Note.java
+++ b/modules/notes/api/services/src/main/java/org/opentaps/notes/domain/Note.java
@@ -30,6 +30,8 @@ public class Note {
     private String createdByUserId;
     private String userIdType;
 
+    private Long sequenceNum;
+    
     private Timestamp dateTimeCreated;
 
     private String attribute1;
@@ -84,6 +86,14 @@ public class Note {
     public void setUserIdType(String userIdType) {
         this.userIdType = userIdType;
     }
+    
+    public Long getSequenceNum() {
+        return sequenceNum;
+    }
+    
+    public void setSequenceNum(Long sequenceNum) {
+        this.sequenceNum = sequenceNum;
+    }
 
     public String getAttribute1() {
         return attribute1;
diff --git a/modules/notes/impl/repository/src/main/java/org/opentaps/notes/entity/NoteData.java b/modules/notes/impl/repository/src/main/java/org/opentaps/notes/entity/NoteData.java
index 95ae589..af79a84 100644
--- a/modules/notes/impl/repository/src/main/java/org/opentaps/notes/entity/NoteData.java
+++ b/modules/notes/impl/repository/src/main/java/org/opentaps/notes/entity/NoteData.java
@@ -58,6 +58,10 @@ public class NoteData implements Serializable {
     @Column(name = "USER_ID_TYPE")
     private String userIdType;
 
+    @GeneratedValue(strategy=GenerationType.AUTO)
+    @Column(name = "SEQUENCE_NUM", nullable = false)
+    private Long sequenceNum;
+
     @NotNull
     @Column(name = "DATE_TIME_CREATED")
     private Timestamp dateTimeCreated;
@@ -125,6 +129,14 @@ public class NoteData implements Serializable {
         this.userIdType = userIdType;
     }
 
+    public Long getSequenceNum() {
+        return sequenceNum;
+    }
+
+    public void setSequenceNum(Long sequenceNum) {
+        this.sequenceNum = sequenceNum;
+    }
+
     public String getAttribute1() {
         return attribute1;
     }
diff --git a/modules/notes/impl/repository/src/main/java/org/opentaps/notes/repository/impl/NoteRepositoryImpl.java b/modules/notes/impl/repository/src/main/java/org/opentaps/notes/repository/impl/NoteRepositoryImpl.java
index e0a59c5..0a3bfa2 100644
--- a/modules/notes/impl/repository/src/main/java/org/opentaps/notes/repository/impl/NoteRepositoryImpl.java
+++ b/modules/notes/impl/repository/src/main/java/org/opentaps/notes/repository/impl/NoteRepositoryImpl.java
@@ -63,6 +63,7 @@ public class NoteRepositoryImpl implements NoteRepository {
         note.setAttribute10(noteData.getAttribute10());
         note.setDateTimeCreated(noteData.getDateTimeCreated());
         note.setCreatedByUserId(noteData.getCreatedByUserId());
+        note.setSequenceNum(noteData.getSequenceNum());
         return note;
     }
 
@@ -82,6 +83,7 @@ public class NoteRepositoryImpl implements NoteRepository {
         noteData.setAttribute10(note.getAttribute10());
         noteData.setDateTimeCreated(note.getDateTimeCreated());
         noteData.setCreatedByUserId(note.getCreatedByUserId());
+        noteData.setSequenceNum(note.getSequenceNum());
         return noteData;
     }
 
diff --git a/modules/notes/rest/src/main/java/org/opentaps/notes/rest/NoteResource.java b/modules/notes/rest/src/main/java/org/opentaps/notes/rest/NoteResource.java
index b6c1b48..4447ba1 100644
--- a/modules/notes/rest/src/main/java/org/opentaps/notes/rest/NoteResource.java
+++ b/modules/notes/rest/src/main/java/org/opentaps/notes/rest/NoteResource.java
@@ -199,6 +199,8 @@ public class NoteResource extends ServerResource {
                                              .object()
                                              .key("id").value(note.getId())
                                              .key("text").value(note.getText())
+                                             .key("sequenceNum").value(note.getSequenceNum())
+                                             .key("dateTimeCreated").value(note.getDateTimeCreated())
                                              .key("attribute1").value(note.getAttribute1())
                                              .key("attribute2").value(note.getAttribute2())
                                              .key("attribute3").value(note.getAttribute3())

-----------------------------------------------------------------------

Summary of changes:
 .../main/java/org/opentaps/notes/domain/Note.java  |   10 ++++++++++
 .../java/org/opentaps/notes/entity/NoteData.java   |   12 ++++++++++++
 .../notes/repository/impl/NoteRepositoryImpl.java  |    2 ++
 .../java/org/opentaps/notes/rest/NoteResource.java |    2 ++
 4 files changed, 26 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
opentaps v2