From 0c6663c7f583230adcadbbd125936436a366ccda Mon Sep 17 00:00:00 2001
From: LeandroRoberto <leandroroberto.br@gmail.com>
Date: Sun, 13 Dec 2015 01:50:45 -0200
Subject: [PATCH] =?UTF-8?q?Criado=20quatro=20formatos=20de=20visualiza?=
 =?UTF-8?q?=C3=A7=C3=A3o=20de=20uma=20Norma?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- TMS - Texto Multivigente Sequencial
- TMI - Texto Multivigente Integrado com Realce de Aterações
- TVL - Texto Vigente COM Link para Normas Alteradoras
- TVT - Texto Vigente
---
 .../migrations/0030_auto_20151203_1114.py     | 19 +++++++++++++++++++
 .../migrations/0030_auto_20151203_1117.py     | 19 +++++++++++++++++++
 ...203_1514.py => 0032_auto_20151213_1538.py} |  2 +-
 static/js/compilacao_view.js                  |  6 +++---
 4 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 compilacao/migrations/0030_auto_20151203_1114.py
 create mode 100644 compilacao/migrations/0030_auto_20151203_1117.py
 rename compilacao/migrations/{0030_auto_20151203_1514.py => 0032_auto_20151213_1538.py} (87%)

diff --git a/compilacao/migrations/0030_auto_20151203_1114.py b/compilacao/migrations/0030_auto_20151203_1114.py
new file mode 100644
index 000000000..27b47f052
--- /dev/null
+++ b/compilacao/migrations/0030_auto_20151203_1114.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('compilacao', '0029_auto_20151201_1611'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='tipodispositivo',
+            name='relacoes_diretas_pai_filho',
+            field=models.ManyToManyField(to='compilacao.TipoDispositivo', related_name='+', through='compilacao.TipoDispositivoRelationship'),
+        ),
+    ]
diff --git a/compilacao/migrations/0030_auto_20151203_1117.py b/compilacao/migrations/0030_auto_20151203_1117.py
new file mode 100644
index 000000000..4daa1e950
--- /dev/null
+++ b/compilacao/migrations/0030_auto_20151203_1117.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('compilacao', '0029_auto_20151201_1611'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='tipodispositivo',
+            name='relacoes_diretas_pai_filho',
+            field=models.ManyToManyField(to='compilacao.TipoDispositivo', through='compilacao.TipoDispositivoRelationship', related_name='+'),
+        ),
+    ]
diff --git a/compilacao/migrations/0030_auto_20151203_1514.py b/compilacao/migrations/0032_auto_20151213_1538.py
similarity index 87%
rename from compilacao/migrations/0030_auto_20151203_1514.py
rename to compilacao/migrations/0032_auto_20151213_1538.py
index 3bff2a458..db6a23ec7 100644
--- a/compilacao/migrations/0030_auto_20151203_1514.py
+++ b/compilacao/migrations/0032_auto_20151213_1538.py
@@ -7,7 +7,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('compilacao', '0029_auto_20151201_1611'),
+        ('compilacao', '0031_merge'),
     ]
 
     operations = [
diff --git a/static/js/compilacao_view.js b/static/js/compilacao_view.js
index b661399cd..a39a23889 100644
--- a/static/js/compilacao_view.js
+++ b/static/js/compilacao_view.js
@@ -24,8 +24,8 @@ function textoMultiVigente(item, diff) {
 
     if (diff) {
         $(".dtxt[id^='da'").each(function() {
-
-            if ($(this).html().indexOf('</table>') > 0)
+  
+            if ( $(this).html().search( /<\/\w+>/g ) > 0)
                 return;
 
             var pk = $(this).attr('pk')
@@ -44,7 +44,7 @@ function textoMultiVigente(item, diff) {
             var  diff = JsDiff.diffWordsWithSpace($(a).text(), $(b).text());
 
             if (diff.length > 0) {
-                $('#d'+pk).addClass("displaynone");
+                $('#d'+pks).closest('.desativado').addClass("displaynone");
 
                 var clone = $('#da'+pk).clone();
                 $('#da'+pk).after( clone );