Skip to content
This repository has been archived by the owner on Feb 16, 2023. It is now read-only.

Commit

Permalink
layout changes, removed irrelevant test cases
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonas Winkler committed May 23, 2019
1 parent 32f3876 commit 292959d
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 204 deletions.
31 changes: 22 additions & 9 deletions src/documents/templates/admin/documents/document/change_list_results.html
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,29 @@
-moz-box-sizing: border-box;
box-sizing: border-box;
}
.grid {
display: flex;
flex-wrap: wrap;
margin: 10px 0px 10px 10px;
}
.box {
width: 12.5%;
padding: 1em;
float: left;
opacity: 0.7;
padding-right: 10px;
padding-bottom: 15px;
opacity: 0.8;
transition: all 0.5s;
}
.box:hover {
opacity: 1;
transition: all 0.5s;
}
.box:last-of-type {
padding-right: 0;
}
.result {
border: 1px solid #cccccc;
border-radius: 2%;
overflow: hidden;
height: 350px;
position: relative;
box-shadow: 1px 1px 4px #cccccc;
}
.result .header {
padding: 5px;
Expand Down Expand Up @@ -95,9 +98,6 @@
background: white;
}

.grid {
margin-right: 260px;
}
.grid:after {
content: "";
display: table;
Expand Down Expand Up @@ -135,6 +135,15 @@


{# This is just copypasta from the parent change_list_results.html file #}

{% if result_hidden_fields %}
<div class="hiddenfields">{# DIV for HTML validation #}
{% for item in result_hidden_fields %}{{ item }}{% endfor %}
</div>
{% endif %}

{% if results %}
<div class="results">
<table id="result_list">
<thead>
<tr>
Expand All @@ -155,6 +164,8 @@
</tr>
</thead>
</table>
{% endif %}

{# /copypasta #}


Expand Down Expand Up @@ -213,3 +224,5 @@
.prop("checked", this.checked);
});
</script>

</div>
2 changes: 1 addition & 1 deletion src/documents/templates/admin/documents/document/viewers/viewer_pdf.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
pageNum = 1,
pageRendering = false,
pageNumPending = null,
scale = 1.0,
scale = 1.44,
canvas = document.getElementById('the-canvas'),
ctx = canvas.getContext('2d');

Expand Down
194 changes: 0 additions & 194 deletions src/documents/tests/test_matchables.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,200 +7,6 @@
from ..models import Correspondent, Document, Tag
from ..signals import document_consumption_finished


class TestMatching(TestCase):

def _test_matching(self, text, algorithm, true, false):
for klass in (Tag, Correspondent):
instance = klass.objects.create(
name=str(randint(10000, 99999)),
match=text,
matching_algorithm=getattr(klass, algorithm)
)
for string in true:
self.assertTrue(
instance.matches(string),
'"%s" should match "%s" but it does not' % (text, string)
)
for string in false:
self.assertFalse(
instance.matches(string),
'"%s" should not match "%s" but it does' % (text, string)
)

def test_match_all(self):

self._test_matching(
"alpha charlie gamma",
"MATCH_ALL",
("I have alpha, charlie, and gamma in me",),
(
"I have alpha in me",
"I have charlie in me",
"I have gamma in me",
"I have alpha and charlie in me",
"I have alphas, charlie, and gamma in me",
"I have alphas in me",
"I have bravo in me",
)
)

self._test_matching(
"12 34 56",
"MATCH_ALL",
(
"I have 12 34, and 56 in me",
),
(
"I have 12 in me",
"I have 34 in me",
"I have 56 in me",
"I have 12 and 34 in me",
"I have 120, 34, and 56 in me",
"I have 123456 in me",
"I have 01234567 in me",
)
)

self._test_matching(
'brown fox "lazy dogs"',
"MATCH_ALL",
(
"the quick brown fox jumped over the lazy dogs",
"the quick brown fox jumped over the lazy dogs",
),
(
"the quick fox jumped over the lazy dogs",
"the quick brown wolf jumped over the lazy dogs",
"the quick brown fox jumped over the fat dogs",
"the quick brown fox jumped over the lazy... dogs",
)
)

def test_match_any(self):

self._test_matching(
"alpha charlie gamma",
"MATCH_ANY",
(
"I have alpha in me",
"I have charlie in me",
"I have gamma in me",
"I have alpha, charlie, and gamma in me",
"I have alpha and charlie in me",
),
(
"I have alphas in me",
"I have bravo in me",
)
)

self._test_matching(
"12 34 56",
"MATCH_ANY",
(
"I have 12 in me",
"I have 34 in me",
"I have 56 in me",
"I have 12 and 34 in me",
"I have 12, 34, and 56 in me",
"I have 120, 34, and 56 in me",
),
(
"I have 123456 in me",
"I have 01234567 in me",
)
)

self._test_matching(
'"brown fox" " lazy dogs "',
"MATCH_ANY",
(
"the quick brown fox",
"jumped over the lazy dogs.",
),
(
"the lazy fox jumped over the brown dogs",
)
)

def test_match_literal(self):

self._test_matching(
"alpha charlie gamma",
"MATCH_LITERAL",
(
"I have 'alpha charlie gamma' in me",
),
(
"I have alpha in me",
"I have charlie in me",
"I have gamma in me",
"I have alpha and charlie in me",
"I have alpha, charlie, and gamma in me",
"I have alphas, charlie, and gamma in me",
"I have alphas in me",
"I have bravo in me",
)
)

self._test_matching(
"12 34 56",
"MATCH_LITERAL",
(
"I have 12 34 56 in me",
),
(
"I have 12 in me",
"I have 34 in me",
"I have 56 in me",
"I have 12 and 34 in me",
"I have 12 34, and 56 in me",
"I have 120, 34, and 560 in me",
"I have 120, 340, and 560 in me",
"I have 123456 in me",
"I have 01234567 in me",
)
)

def test_match_regex(self):

self._test_matching(
r"alpha\w+gamma",
"MATCH_REGEX",
(
"I have alpha_and_gamma in me",
"I have alphas_and_gamma in me",
),
(
"I have alpha in me",
"I have gamma in me",
"I have alpha and charlie in me",
"I have alpha,and,gamma in me",
"I have alpha and gamma in me",
"I have alpha, charlie, and gamma in me",
"I have alphas, charlie, and gamma in me",
"I have alphas in me",
)
)

def test_match_fuzzy(self):

self._test_matching(
"Springfield, Miss.",
"MATCH_FUZZY",
(
"1220 Main Street, Springf eld, Miss.",
"1220 Main Street, Spring field, Miss.",
"1220 Main Street, Springfeld, Miss.",
"1220 Main Street Springfield Miss",
),
(
"1220 Main Street, Springfield, Mich.",
)
)


@override_settings(POST_CONSUME_SCRIPT=None)
class TestDocumentConsumptionFinishedSignal(TestCase):
"""
Expand Down
Empty file modified src/paperless/settings.py
100755 → 100644
View file
Empty file.

0 comments on commit 292959d

Please sign in to comment.