From aeac36c410da65d8f048e793bcb4c47ef96af553 Mon Sep 17 00:00:00 2001
From: Ashwin <ashwin@micropyramid.com>
Date: Sat, 2 Feb 2019 15:22:12 +0530
Subject: [PATCH] fixed wrong time in comments and attachments

---
 accounts/templates/view_account.html        |  9 +++++----
 cases/templates/view_case.html              |  8 +++++---
 contacts/models.py                          |  1 +
 contacts/templates/view_contact.html        |  9 +++++----
 leads/templates/view_leads.html             | 11 ++++++-----
 opportunity/templates/view_opportunity.html |  9 +++++----
 static/js/cases/view_case.js                |  2 +-
 7 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/accounts/templates/view_account.html b/accounts/templates/view_account.html
index 66117f58..98fe0b90 100644
--- a/accounts/templates/view_account.html
+++ b/accounts/templates/view_account.html
@@ -163,7 +163,7 @@
                                 <div class="stream-post-container" id="attachment_name{{attachemnt.id}}"><pre><a href="{{ attachemnt.attachment.url }}">{{ attachemnt.file_name }}</a></pre></div>
                               <div class="stream-container">
                                 <pre class="float-left">{{ attachemnt.created_by }}</pre>
-                                <pre class="float-right">{{ attachemnt.created_on }}</pre>
+                                <pre class="float-right">{{ attachemnt.created_on|date:'m/d/Y,  H:i:s A' }}</pre>
                               </div>
                           </li>
                       {% endfor %}
@@ -211,7 +211,7 @@
                     <div class="stream-post-container" id="comment_name{{comment.id}}"><pre>{{ comment.comment }}</pre></div>
                     <div class="stream-container">
                       <pre class="float-left">{{ comment.commented_by }}</pre>
-                      <pre class="float-right">{{ comment.commented_on }}</pre>
+                      <pre class="float-right">{{ comment.commented_on|date:'m/d/Y,  H:i:s A' }}</pre>
                     </div>
                   </li>
                   {% endfor %}
@@ -2059,7 +2059,7 @@
                                "<li><a class='action' onclick='edit_comment("+data.comment_id+")'>Edit</a></li>"+
                                "<li><a class='action' onclick='remove_comment("+data.comment_id+")''>Remove</a></li></ul></div></div>"+
                                "<div class='stream-post-container' id='comment_name"+data.comment_id+"'><pre>"+data.comment+"</pre></div>"+
-                               "<div class='stream-container'><pre class='float-left'>"+data.commented_by+"</pre><pre class='float-right'>"+d.toGMTString()+"</pre></div>"
+                               "<div class='stream-container'><pre class='float-left'>"+data.commented_by+"</pre><pre class='float-right'>"+d.toLocaleString('en-US', { hour12: true })+"</pre></div>"
                                )
           $("#id_comments").val("")
           alert("Comment Submitted")
@@ -2168,11 +2168,12 @@ $("#attachment_form").submit(function (e) {
       if (data.error) {
         $("#AttachmentError").html(data.error).show()
       } else {
+        d = new Date(data.created_on)
         $("#attachment_div").prepend(
             "<li class='list-group-item list-row' id='attachment" + data.attachment_id + "'>" +
               "<div class='float-right right-container'><div class='list-row-buttons btn-group float-right'><button class='action btn btn-danger' onclick='remove_attachment("+data.attachment_id+")''>Remove</button></div></div>" +
               "<div class='stream-post-container' id='comment_name"+data.attachment_id+"'><pre><a href='"+data.attachment_url+"'>"+data.attachment+"</a></pre></div>"+
-              "<div class='stream-container'><pre class='float-left'>"+data.created_by+"</pre><pre class='float-right'>"+data.created_on+"</pre></div>" +
+              "<div class='stream-container'><pre class='float-left'>"+data.created_by+"</pre><pre class='float-right'>"+d.toLocaleString('en-US', { hour12: true })+"</pre></div>" +
             "</li>"
         )
 
diff --git a/cases/templates/view_case.html b/cases/templates/view_case.html
index 49de4d0d..feb0a106 100644
--- a/cases/templates/view_case.html
+++ b/cases/templates/view_case.html
@@ -129,7 +129,7 @@
                                 <div class="stream-post-container" id="attachment_name{{attachment.id}}"><pre><a href="{{ attachment.attachment.url }}">{{ attachment.file_name }}</a></pre></div>
                               <div class="stream-container">
                                 <pre class="float-left">{{ attachment.created_by }}</pre>
-                                <pre class="float-right">{{ attachment.created_on }}</pre>
+                                <pre class="float-right">{{ attachment.created_on|date:'m/d/Y,  H:i:s A' }}</pre>
                               </div>
                           </li>
                       {% endfor %}
@@ -174,7 +174,7 @@
                       <div class="stream-post-container" id="comment_name{{comment.id}}"><pre>{{ comment.comment }}</pre></div>
                       <div class="stream-container">
                         <pre class="float-left">{{ comment.commented_by }}</pre>
-                        <pre class="float-right">{{ comment.commented_on }}</pre>
+                        <pre class="float-right">{{ comment.commented_on|date:'m/d/Y,  H:i:s A' }}</pre>
                       </div>
                     </li>
                     {% endfor %}
@@ -423,14 +423,16 @@ $("#attachment_form").submit(function (e) {
       if (data.error) {
         $("#AttachmentError").html(data.errors).show()
       } else {
+          d = new Date(data.created_on)
           $("#attachment_div").prepend(
             "<li class='list-group-item list-row' id='attachment" + data.attachment_id + "'>" +
               "<div class='float-right right-container'><div class='list-row-buttons btn-group float-right'><button class='action btn btn-danger' onclick='remove_attachment("+data.attachment_id+")''>Remove</button></div></div>" +
               "<div class='stream-post-container' id='comment_name"+data.attachment_id+"'><pre><a href='"+data.attachment_url+"'>"+data.attachment+"</a></pre></div>"+
-              "<div class='stream-container'><pre class='float-left'>"+data.created_by+"</pre><pre class='float-right'>"+data.created_on+"</pre></div>" +
+              "<div class='stream-container'><pre class='float-left'>"+data.created_by+"</pre><pre class='float-right'>"+d.toLocaleString('en-US', { hour12: true})+"</pre></div>" +
             "</li>"
           )
           $("#AttachmentError").html("")
+          alert("Attachment Saved")
           $("#id_attachments").val("")
       }
     }
diff --git a/contacts/models.py b/contacts/models.py
index 62bcf591..9f31880d 100644
--- a/contacts/models.py
+++ b/contacts/models.py
@@ -25,3 +25,4 @@ class Contact(models.Model):
 
     class Meta:
         unique_together = (("email", ),)
+        ordering = ['-created_on']
diff --git a/contacts/templates/view_contact.html b/contacts/templates/view_contact.html
index 1503bfd0..b5b0abef 100644
--- a/contacts/templates/view_contact.html
+++ b/contacts/templates/view_contact.html
@@ -118,7 +118,7 @@
                                 <div class="stream-post-container" id="attachment_name{{attachemnt.id}}"><pre><a href="{{ attachemnt.attachment.url }}">{{ attachemnt.file_name }}</a></pre></div>
                               <div class="stream-container">
                                 <pre class="float-left">{{ attachemnt.created_by }}</pre>
-                                <pre class="float-right">{{ attachemnt.created_on }}</pre>
+                                <pre class="float-right">{{ attachemnt.created_on|date:'m/d/Y,  H:i:s A' }}</pre>
                               </div>
                           </li>
                       {% endfor %}
@@ -165,7 +165,7 @@
                     <div class="stream-post-container" id="comment_name{{comment.id}}"><pre>{{ comment.comment }}</pre></div>
                     <div class="stream-container">
                       <pre class="float-left">{{ comment.commented_by }}</pre>
-                      <pre class="float-right">{{ comment.commented_on }}</pre>
+                      <pre class="float-right">{{ comment.commented_on|date:'m/d/Y,  H:i:s A' }}</pre>
                     </div>
                   </li>
                   {% endfor %}
@@ -244,7 +244,7 @@ $("#comment_form").submit(function (e) {
           "<li><a class='action' onclick='edit_comment(" + data.comment_id + ")'>Edit</a></li>" +
           "<li><a class='action' onclick='remove_comment(" + data.comment_id + ")''>Remove</a></li></ul></div></div>" +
           "<div class='stream-post-container' id='comment_name"+data.comment_id+"'><pre>"+data.comment+"</pre></div>"+
-          "<div class='stream-container'><pre class='float-left'>"+data.commented_by+"</pre><pre class='float-right'>"+d.toGMTString()+"</pre></div>"
+          "<div class='stream-container'><pre class='float-left'>"+data.commented_by+"</pre><pre class='float-right'>"+d.toLocaleString('en-US', { hour12: true })+"</pre></div>"
         )
         $("#id_comments").val("")
         alert("Comment Submitted")
@@ -320,11 +320,12 @@ $("#attachment_form").submit(function (e) {
       if (data.error) {
         $("#AttachmentError").html(data.error).show()
       } else {
+        d = new Date(data.created_on)
         $("#attachment_div").prepend(
             "<li class='list-group-item list-row' id='attachment" + data.attachment_id + "'>" +
               "<div class='float-right right-container'><div class='list-row-buttons btn-group float-right'><button class='action btn btn-danger' onclick='remove_attachment("+data.attachment_id+")''>Remove</button></div></div>" +
               "<div class='stream-post-container' id='comment_name"+data.attachment_id+"'><pre><a href='"+data.attachment_url+"'>"+data.attachment+"</a></pre></div>"+
-              "<div class='stream-container'><pre class='float-left'>"+data.created_by+"</pre><pre class='float-right'>"+data.created_on+"</pre></div>" +
+              "<div class='stream-container'><pre class='float-left'>"+data.created_by+"</pre><pre class='float-right'>"+d.toLocaleString('en-US', { hour12: true })+"</pre></div>" +
             "</li>"
         )
         $("#id_attachments").val("")
diff --git a/leads/templates/view_leads.html b/leads/templates/view_leads.html
index 19a2c2ee..e5dfa280 100644
--- a/leads/templates/view_leads.html
+++ b/leads/templates/view_leads.html
@@ -151,7 +151,7 @@
                                 <div class="stream-post-container" id="attachment_name{{attachemnt.id}}"><pre><a href="{{ attachemnt.attachment.url }}">{{ attachemnt.file_name }}</a></pre></div>
                               <div class="stream-container">
                                 <pre class="float-left">{{ attachemnt.created_by }}</pre>
-                                <pre class="float-right">{{ attachemnt.created_on }}</pre>
+                                <pre class="float-right">{{ attachemnt.created_on|date:'m/d/Y,  H:i:s A' }}</pre>
                               </div>
                           </li>
                       {% endfor %}
@@ -197,8 +197,8 @@
                   </div>
                   <div class="stream-post-container" id="comment_name{{comment.id}}"><pre>{{ comment.comment }}</pre></div>
                   <div class="stream-container">
-                    <pre class="float-left">{{ comment.commented_by }}</pre>
-                    <pre class="float-right">{{ comment.commented_on }}</pre>
+                    <pre class="float-left">{{ comment.commented_by}}</pre>
+                    <pre class="float-right">{{ comment.commented_on|date:'m/d/Y,  H:i:s A' }}</pre>
                   </div>
                 </li>
                 {% endfor %}
@@ -280,7 +280,7 @@ $("#comment_form").submit(function (e) {
           "<li><a class='action' onclick='edit_comment(" + data.comment_id + ")'>Edit</a></li>" +
           "<li><a class='action' onclick='remove_comment(" + data.comment_id + ")''>Remove</a></li></ul></div></div>" +
           "<div class='stream-post-container' id='comment_name"+data.comment_id+"'><pre>"+data.comment+"</pre></div>"+
-          "<div class='stream-container'><pre class='float-left'>"+data.commented_by+"</pre><pre class='float-right'>"+d.toGMTString()+"</pre></div>"+
+          "<div class='stream-container'><pre class='float-left'>"+data.commented_by+"</pre><pre class='float-right'>"+d.toLocaleString('en-US', { hour12: true })+"</pre></div>"+
           "<div class='stream-date-container' id='comment_file_div"+data.comment_id+"'><div id='new_comment"+data.comment_id+"'</div></div></li>"
         );
         $("#id_comments").val("")
@@ -355,11 +355,12 @@ $("#attachment_form").submit(function (e) {
       if (data.error) {
         $("#AttachmentError").html(data.error).show()
       } else {
+        d = new Date(data.created_on)
         $("#attachment_div").prepend(
             "<li class='list-group-item list-row' id='attachment" + data.attachment_id + "'>" +
               "<div class='float-right right-container'><div class='list-row-buttons btn-group float-right'><button class='action btn btn-danger' onclick='remove_attachment("+data.attachment_id+")''>Remove</button></div></div>" +
               "<div class='stream-post-container' id='comment_name"+data.attachment_id+"'><pre><a href='"+data.attachment_url+"'>"+data.attachment+"</a></pre></div>"+
-              "<div class='stream-container'><pre class='float-left'>"+data.created_by+"</pre><pre class='float-right'>"+data.created_on+"</pre></div>" +
+              "<div class='stream-container'><pre class='float-left'>"+data.created_by+"</pre><pre class='float-right'>"+d.toLocaleString('en-US', { hour12: true })+"</pre></div>" +
             "</li>"
         );
         $("#id_attachments").val("")
diff --git a/opportunity/templates/view_opportunity.html b/opportunity/templates/view_opportunity.html
index 90f5c22a..b499973b 100644
--- a/opportunity/templates/view_opportunity.html
+++ b/opportunity/templates/view_opportunity.html
@@ -149,7 +149,7 @@
                                 <div class="stream-post-container" id="attachment_name{{attachemnt.id}}"><pre><a href="{{ attachemnt.attachment.url }}">{{ attachemnt.file_name }}</a></pre></div>
                               <div class="stream-container">
                                 <pre class="float-left">{{ attachemnt.created_by }}</pre>
-                                <pre class="float-right">{{ attachemnt.created_on }}</pre>
+                                <pre class="float-right">{{ attachemnt.created_on|date:'m/d/Y,  H:i:s A' }}</pre>
                               </div>
                           </li>
                       {% endfor %}
@@ -195,7 +195,7 @@
                     <div class="stream-post-container" id="comment_name{{comment.id}}"><pre>{{ comment.comment }}</pre></div>
                     <div class="stream-container">
                       <pre class="float-left">{{ comment.commented_by }}</pre>
-                      <pre class="float-right">{{ comment.commented_on }}</pre>
+                      <pre class="float-right">{{ comment.commented_on|date:'m/d/Y,  H:i:s A' }}</pre>
                     </div>
                   </li>
                   {% endfor %}
@@ -282,7 +282,7 @@ assigned_to_list = JSON.parse(assigned_to_list.replace(/&(l|g|quo)t;/g, function
             "<li><a class='action' onclick='edit_comment(" + data.comment_id + ")'>Edit</a></li>" +
             "<li><a class='action' onclick='remove_comment(" + data.comment_id + ")''>Remove</a></li></ul></div></div>" +
             "<div class='stream-post-container' id='comment_name"+data.comment_id+"'><pre>"+data.comment+"</pre></div>"+
-            "<div class='stream-container'><pre class='float-left'>"+data.commented_by+"</pre><pre class='float-right'>"+d.toGMTString()+"</pre></div>"
+            "<div class='stream-container'><pre class='float-left'>"+data.commented_by+"</pre><pre class='float-right'>"+d.toLocaleString('en-US', { hour12: true })+"</pre></div>"
           )
           $("#id_comments").val("")
           alert("Comment Submitted")
@@ -372,11 +372,12 @@ $("#attachment_form").submit(function (e) {
       if (data.error) {
         $("#AttachmentError").html(data.error).show()
       } else {
+        d = new Date(data.created_on)
         $("#attachment_div").prepend(
             "<li class='list-group-item list-row' id='attachment" + data.attachment_id + "'>" +
               "<div class='float-right right-container'><div class='list-row-buttons btn-group float-right'><button class='action btn btn-danger' onclick='remove_attachment("+data.attachment_id+")''>Remove</button></div></div>" +
               "<div class='stream-post-container' id='comment_name"+data.attachment_id+"'><pre><a href='"+data.attachment_url+"'>"+data.attachment+"</a></pre></div>"+
-              "<div class='stream-container'><pre class='float-left'>"+data.created_by+"</pre><pre class='float-right'>"+data.created_on+"</pre></div>" +
+              "<div class='stream-container'><pre class='float-left'>"+data.created_by+"</pre><pre class='float-right'>"+d.toLocaleString('en-US', { hour12: true})+"</pre></div>" +
             "</li>"
         )
         $("#id_attachments").val("")
diff --git a/static/js/cases/view_case.js b/static/js/cases/view_case.js
index 5fb7f786..6c817085 100644
--- a/static/js/cases/view_case.js
+++ b/static/js/cases/view_case.js
@@ -22,7 +22,7 @@ $("#comment_form").submit(function (e) {
           "<li><a class='action' onclick='edit_comment(" + data.comment_id + ")'>Edit</a></li>" +
           "<li><a class='action' onclick='remove_comment(" + data.comment_id + ")''>Remove</a></li></ul></div></div>" +
           "<div class='stream-post-container' id='comment_name"+data.comment_id+"'><pre>"+data.comment+"</pre></div>"+
-          "<div class='stream-container'><pre class='float-left'>"+data.commented_by+"</pre><pre class='float-right'>"+d.toGMTString()+"</pre></div>"
+          "<div class='stream-container'><pre class='float-left'>"+data.commented_by+"</pre><pre class='float-right'>"+d.toLocaleString('en-US', { hour12: true })+"</pre></div>"
         );
         $("#id_comments").val("");
         alert("Comment Submitted");