Changeset 2112

Timestamp:

07/15/10 14:51:39 (19 months ago)

Author:

dart

Message:

LoReality?:
o AJAX work for message

Location:

trunk/loreality

Files:

• development.db (modified) (previous)
• loreality/controllers/messager.py (modified) (2 diffs)
• loreality/model/databases.py (modified) (2 diffs)
• loreality/public/style.css (modified) (2 diffs)
• loreality/templates/base/index.html (modified) (3 diffs)
• loreality/templates/derived/page/messager.html (modified) (1 diff)

trunk/loreality/loreality/controllers/messager.py

@@ -14 +14 @@
 
 from authkit.authorize.pylons_adaptors import authorize
-from pylons.decorators import validate
+from pylons.decorators import validate,jsonify
+
 
 from formencode import htmlfill, variabledecode
@@ -62 +63 @@
     def open(self, id):
         return self.index(opened=uuid.UUID(id))
+    #--------------------------------------------------------------
+    @jsonify
+    def getallmsgs(self):
+        pilot_q = meta.Session.query(model.Pilot)
+        pilot = pilot_q.filter_by(login=request.environ['REMOTE_USER']).first()
+        if pilot is None:
+            abort(404)
+
+        messages = pilot.messages 
+        buf = ""
+
+        for m in messages:
+            buf += "%(date)s#%(from_)s#%(subject)s|"%m.__dict__
+        if buf:
+            buf = buf[:-1]
+        return buf
+    #--------------------------------------------------------------
+    def getmsg(self, id):
+        pilot_q = meta.Session.query(model.Pilot)
+        pilot = pilot_q.filter_by(login=request.environ['REMOTE_USER']).first()
+        if pilot is None:
+            abort(404)
+
+        message_q = meta.Session.query(model.Message)
+        message = message_q.filter_by(id=uuid.UUID(id)).first()
+        if message is None:
+            return "Error"
+        
+        #- Be sure it is our message
+        if message not in pilot.messages: return "Error"
+
+        if message.unread:
+            pilot.messages_unread -= 1
+            message.unread = False
+            meta.Session.commit()
+        return "%s|%s|%s"% ( str(message.id), message.text, pilot.messages_unread )
     #--------------------------------------------------------------
     def delete(self, id):

trunk/loreality/loreality/model/databases.py

@@ -125 +125 @@
     login = sa.Column(sa.types.String, nullable=False)
     squadron_id = sa.Column(UUID(), ForeignKey('squadrons.id'))
+    loobject_id = sa.Column(UUID(), ForeignKey('loobjects.id'))
 
     messages = orm.relation("Message", backref="pilot")
@@ -139 +140 @@
         if message.unread:
             self.messages_unread += 1
+#----------------------------------------------------------------
+class LoObject(Base):
+    __tablename__ = 'loobjects'
+    id = sa.Column(UUID(), primary_key=True,default=uuid.uuid4)
+    name = sa.Column(sa.types.String, nullable=False)
+    group = sa.Column(sa.types.String, nullable=False)
+
+    latitude  = sa.Column(sa.types.Integer, nullable=False)
+    longitude = sa.Column(sa.types.Integer, nullable=False)
+    altitude  = sa.Column(sa.types.Integer, nullable=False)
+    heading   = sa.Column(sa.types.Integer, nullable=False)

trunk/loreality/loreality/public/style.css

@@ -72 +72 @@
 div.message {
  display: inline;
- border: solid black 1px;
+ /* border: solid black 1px; */
  width: 80%;
- background: #AAAAAA;
+ /* background: #AAAAAA; */
  font-size: small;
 }
@@ -86 +86 @@
     margin-right: 30px;
 }
-span.unread a{
+span.read{
+    font-weight: normal;
+    background: #AAAAAA;
+}
+span.unread{
     font-weight: bold;
-     background: #ffffff;
+    color: #aa1111;
+    background: #ffffff;
 }
 div.message_open{

trunk/loreality/loreality/templates/base/index.html

@@ -12 +12 @@
 ${ h.stylesheet_link( '/style.css') }
 ${ h.javascript_link( '/dojo/dojo/dojo.js', djConfig="parseOnLoad: true") }
+ <script type="text/javascript">
+     // Load Dojo's code relating to the Button widget
+     dojo.require("dijit.form.Button");
+     dojo.require("dojo.fx");
+     dojo.require("dojo.html");
+  </script>
+
     <title>${self.title()}</title>
     ${self.head()}
@@ -24 +31 @@
                 % if h.auth.authorized(h.auth.is_valid_user) and not (request.urlvars['controller'] == 'account' and request.urlvars['action'] == 'signout'):
             <div id="message_box">
-                You have <a href="${h.url_for(controller='messager', action='index')}">${h.msg.nb_messages(request.environ['REMOTE_USER'])} new messages</a>.
+                You have <a href="${h.url_for(controller='messager', action='index')}">${self.messages_unread()} new messages</a>.
             </div>
                 % endif
@@ -63 +70 @@
     % endif
 </%def>
+
+<%def name="messages_unread()">
+<span id="nb_msg_unread">${h.msg.nb_messages(request.environ['REMOTE_USER'])}</span>
+</%def>

trunk/loreality/loreality/templates/derived/page/messager.html

@@ -1 +1 @@
 <%inherit file="/base/index.html"/>
+
+<script>
+/*-------------------------------------*/
+function showMessage(data,ioArgs) {
+    if( data == "Error"){
+        alert("Error");
+        }else{
+        d = data.split('|');
+        dojo.fx.wipeIn({
+            node:"message-" + d[0],
+            beforeBegin: function(n){
+                dojo.byId("message-txt-"+d[0]).innerHTML = d[1];
+            }
+        }).play();
+        dojo.byId( "nb_msg_unread").innerHTML = d[2];
+    }
+
+}
+/*-------------------------------------*/
+function helloError(data, ioArgs) {
+    alert('Error when retrieving data from the server!');
+}
+/*-------------------------------------*/
+function loadMsg() {
+    dojo.empty("message_table");
+    dojo.xhrGet({
+        url: '${h.url_for(controller='messager', action='getallmsgs') }',
+        load: fillMessages,
+        error: helloError,
+    }).play();
+}
+dojo.addOnLoad( loadMsg );
+/*-------------------------------------*/
+function fillMessages(data,ioArgs) {
+    if( data == "Error"){
+        alert("Error");
+        }else{
+        var buffer = "";
+        messages = data.split("|");
+        for (i = 0; i < messages.length; i += 1) {
+            buffer += "<tr>";
+            elements = messages[i].split("#");
+            for (n = 0; n < elements.length; n += 1 ){
+                buffer += "<td>" + elements[n] + "</td>" 
+            }
+            buffer += "</tr>";
+        }
+        dojo.html.set("message_table", buffer);
+
+    }
+}
+</script>
 
 <h2>Messager</h2>
 % for message in c.messages:
-% if message.id == c.message_open:
-<div class="message_open">
-% else:
 <div class="message">
-% endif
     <a href=${h.url_for(controller='messager', action='delete',id=message.id) } class="action">[Delete]</a>
-% if message.id == c.message_open:
-<span><a href=${h.url_for(controller='messager', action='index',id=message.id) } class="action">${h.msg.get_from(message)} | ${message.date.strftime("%c")}  <span id="subject">${message.subject}</span></a></span>
-    <div id="text">${h.literal(message.text)}</div>
-    <a href=${h.url_for(controller='messager', action='create',id=message.id) } class="action">[Reply]</a>
-% else:
-    % if message.unread:
-        <span class="unread"><a href=${h.url_for(controller='messager', action='open',id=message.id) } class="action">${h.msg.get_from(message)} | ${message.date.strftime("%c")} | <span id="subject"> ${message.subject}</span></a></span>
-    %else:
-        <span><a href=${h.url_for(controller='messager', action='open',id=message.id) } class="action">${h.msg.get_from(message)} | ${message.date.strftime("%c")} | <span id="subject"> ${message.subject}</span></a></span>
-    % endif
-% endif
+ <button dojoType="dijit.form.ToggleButton">
+    <span 
+        %if message.unread:
+        class="unread"
+        %else:
+        class="read"
+        %endif
+        id="span-${message.id}" >${h.msg.get_from(message)} | ${message.date.strftime("%c")} | <span id="subject"> ${message.subject}</span></span>
+
+      <script type="dojo/method" event="onChange">
+          node = "span-${message.id}";
+          if( this.checked )
+          {
+              if( dojo.hasClass( node, "unread") )
+              {
+                  dojo.removeClass( node, "unread");
+                  dojo.addClass( node, "read");
+              }
+              dojo.xhrGet({
+                  url: '${h.url_for(controller='messager', action='getmsg',id=message.id) }',
+                  load: showMessage,
+                  error: helloError,
+                  }).play();
+          }else{
+          dojo.fx.wipeOut({
+              node:"message-${message.id}",
+              }).play();
+          }
+      </script>
+  </button>
 </div>
+  <div id="message-${message.id}" class='message_open' style="display: none;">
+  <button dojoType="dijit.form.Button">Reply
+      <script type="dojo/method" event="onClick">
+      </script>
+  </button>
+  <p id="message-txt-${message.id}"></p>
+  </div>
 <br/>
 % endfor
-
+<h2>New one</h2>
+<div id="message_list">
+    <table id="message_table">
+    </table>
+</div>
 <a href=${h.url_for(controller='messager', action='create', id=None)}>[New message]</a>