From 2ed0a4bcf91e59139086e9907a1b9eb58f28ddb9 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 16 Mar 2016 10:08:26 +0000
Subject: [PATCH] Updated changes view to use diff where appropriate.

---
 RIGS/templates/RIGS/version_changes.html      | 43 ++++++-------------
 .../RIGS/version_changes_change.html          | 27 ++++++++++++
 RIGS/versioning.py                            | 20 +++++++++
 3 files changed, 60 insertions(+), 30 deletions(-)
 create mode 100644 RIGS/templates/RIGS/version_changes_change.html

diff --git a/RIGS/templates/RIGS/version_changes.html b/RIGS/templates/RIGS/version_changes.html
index 98abaf15..9fd57020 100644
--- a/RIGS/templates/RIGS/version_changes.html
+++ b/RIGS/templates/RIGS/version_changes.html
@@ -1,40 +1,23 @@
 {% for change in version.field_changes %}
 
-	<button title="Changes to {{ change.field.verbose_name }}" type="button" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='
-
-    	{% if change.new %}
-            <div class="alert alert-success {% if change.long %}overflow-ellipsis{% endif %}">
-                {% if change.linebreaks %}
-                    {{change.new|linebreaksbr}}
-                {% else %}
-                    {{change.new}}
-                {% endif %}
-            </div>
-        {% endif %}
-
-    	{% if change.old %}
-            <div class="alert alert-danger {% if change.long %}overflow-ellipsis{% endif %}">
-                {% if change.linebreaks %}
-                    {{change.old|linebreaksbr}}
-                {% else %}
-                    {{change.old}}
-                {% endif %}
-            </div>
-        {% endif %}
-    	
-        '>{{ change.field.verbose_name }}</button>
+	<button title="Changes to {{ change.field.verbose_name }}" type="button" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='{% spaceless %}
+        {% include "RIGS/version_changes_change.html" %}
+        {% endspaceless %}'>{{ change.field.verbose_name }}</button>
 
 {% endfor %}
 
 {% for itemChange in version.item_changes %}
-    <button title="Changes to item '{% if itemChange.new %}{{ itemChange.new.name }}{% else %}{{ itemChange.old.name }}{% endif %}'" type="button" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='
+    <button title="Changes to item '{% if itemChange.new %}{{ itemChange.new.name }}{% else %}{{ itemChange.old.name }}{% endif %}'" type="button" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='{% spaceless %}
         {% for change in itemChange.changes %}
-            <h4>{{ change.field.verbose_name }}</h4>
-
-            {% if change.new %}<div class="alert alert-success">{{change.new|linebreaksbr}}</div>{% endif %}
-            {% if change.old %}<div class="alert alert-danger">{{change.old|linebreaksbr}}</div>{% endif %}
-
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <h3 class="panel-title">{{ change.field.verbose_name }}</h3>
+                </div>
+            
+            <div class="panel-body">
+                {% include "RIGS/version_changes_change.html" %}
+            </div></div>
         {% endfor %}
         
-        '>item '{% if itemChange.new %}{{ itemChange.new.name }}{% else %}{{ itemChange.old.name }}{% endif %}'</button>
+        {% endspaceless %}'>item '{% if itemChange.new %}{{ itemChange.new.name }}{% else %}{{ itemChange.old.name }}{% endif %}'</button>
 {% endfor %}
\ No newline at end of file
diff --git a/RIGS/templates/RIGS/version_changes_change.html b/RIGS/templates/RIGS/version_changes_change.html
new file mode 100644
index 00000000..19411a36
--- /dev/null
+++ b/RIGS/templates/RIGS/version_changes_change.html
@@ -0,0 +1,27 @@
+{# pass in variable "change" to this template #}
+
+{% if change.linebreaks and change.new and change.old %}
+    {% for diff in change.diff %}
+        {% if diff.type == "insert" %}
+            <ins>{{ diff.text|linebreaksbr }}</ins>
+        {% elif diff.type == "delete" %}
+            <del>{{diff.text|linebreaksbr}}</del>
+        {% else %}
+            <span>{{diff.text|linebreaksbr}}</span>
+        {% endif %}
+    {% endfor %}
+{% else %}
+    {% if change.old %}
+        <del {% if change.long %}class="overflow-ellipsis"{% endif %}>
+            {{change.old}}
+        </del>
+    {% endif %}
+    {% if change.new and change.old %}
+        <hr>
+    {% endif %}
+    {% if change.new %}
+        <ins {% if change.long %}class="overflow-ellipsis"{% endif %}>
+            {{change.new}}
+        </ins>
+    {% endif %}
+{% endif %}
\ No newline at end of file
diff --git a/RIGS/versioning.py b/RIGS/versioning.py
index fa54e9ff..38c92936 100644
--- a/RIGS/versioning.py
+++ b/RIGS/versioning.py
@@ -17,6 +17,7 @@ from reversion.models import Version
 from django.contrib.contenttypes.models import ContentType # Used to lookup the content_type
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from django.db.models import ForeignKey, IntegerField, EmailField, TextField
+from diff_match_patch import diff_match_patch
 
 from RIGS import models, forms
 import datetime
@@ -64,6 +65,25 @@ def model_compare(oldObj, newObj, excluded_keys=[]):
                 return True
             return False
 
+        @property
+        def diff(self):
+            oldText = str(self.display_value(self._old)) or ""
+            newText = str(self.display_value(self._new)) or ""
+            dmp = diff_match_patch()
+            diffs = dmp.diff_main(oldText, newText)
+            dmp.diff_cleanupSemantic(diffs)
+
+            outputDiffs = []
+
+            for (op, data) in diffs:
+              if op == dmp.DIFF_INSERT:
+                outputDiffs.append({'type':'insert', 'text':data})
+              elif op == dmp.DIFF_DELETE:
+                outputDiffs.append({'type':'delete', 'text':data})
+              elif op == dmp.DIFF_EQUAL:
+                outputDiffs.append({'type':'equal', 'text':data})
+            return outputDiffs
+
     changes = []
 
     for thisField in theFields: