Implement #96

adentes-org · Jul 11, 2016 · e768d47 · e768d47
1 parent 342572a
commit e768d47
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/www/assets/js/sofia.db.js b/www/assets/js/sofia.db.js
@@ -202,7 +202,7 @@ S.db.fiches = {
   },
   getDiffConflict : function(o,n) {
     //return objectDiff.diff(o.patient, n.patient)
-    return objectDiff.diff($.extend({}, o, {events : []}), $.extend({}, n, {events : []})) //Create a shallow clone and overwrite events parts to not be big in term of data 
+    return objectDiff.diff($.extend({}, o, {events : []}), $.extend({}, n, {events : []})) //Create a shallow clone and overwrite events parts to not be big in term of data
   },
   mergeConflict : function(o,n) { // o : obj in db, n: obj to commit
     //This is never call normally because the vue and obj of the vue is instantly update when in localDB
@@ -313,6 +313,8 @@ S.db.fiches = {
           return; //If it's a design doc
         }
         ret.fiches[ret.fiches.length] = value.doc;
+
+        value.doc.creation_date = moment(value.doc.events[0].timestamp).format("ddd, H:mm");
         value.doc.last_update = value.doc.events[value.doc.events.length -1].timestamp;
         var m = moment(value.doc.last_update);
         value.doc.last_update_since = m.fromNow();

diff --git a/www/assets/platform/android/less/style.less b/www/assets/platform/android/less/style.less
@@ -132,12 +132,12 @@
           .birthdate{
               float: right;
           }
-          .timestamp{
+          .creation{
             float: right;
             position: absolute;
             top: 0px;
             right: 0px;
-            color: #FFF;
+            color: #444;
             background: #CCC;
             padding: 0 4px;
             border-bottom-left-radius: 6px;
@@ -146,6 +146,20 @@
               color: red;
             }
           }
+          .timestamp{
+            float: left;
+            position: absolute;
+            bottom: 0px;
+            right: 0px;
+            color: #FFF;
+            background: #CCC;
+            padding: 0 4px;
+            border-top-left-radius: 6px;
+            font-size: 60%;
+            &.old{
+              color: red;
+            }
+          }
           .owner{
             float: left;
             position: absolute;

diff --git a/www/assets/platform/android/template/fiche.tmpl b/www/assets/platform/android/template/fiche.tmpl
@@ -13,6 +13,7 @@
                 </span>
             </div>
             <span class="owner" v-if="u.isAdmin()">{{f.owner_id}}</span>
+            <span class="creation">{{ f.creation_date }}</span>
             <span class="timestamp  {{f.last_update_is_old ? 'old':' '}}">{{ f.last_update_since }}</span>
         </div>
     </a>
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ @@
                     </span>
                 </div>
                 <span class="owner" v-if="u.isAdmin()">{{f.owner_id}}</span>
+                <span class="creation">{{ f.creation_date }}</span>
                 <span class="timestamp  {{f.last_update_is_old ? 'old':' '}}">{{ f.last_update_since }}</span>
             </div>
         </a>
@@ Expand Down @@