From 9982fbda63ef3d4bd377c49b32d89631349f1093 Mon Sep 17 00:00:00 2001
From: Matheus Agio Nerone <man13@inf.ufpr.br>
Date: Mon, 19 Oct 2015 10:51:48 -0200
Subject: [PATCH] add basic regex fetching
Signed-off-by: Matheus Agio Nerone <man13@inf.ufpr.br>
---
app/assets/javascripts/application/search.js | 18 +++++++++++++++++-
app/views/search/index.html.erb | 13 ++++++-------
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/app/assets/javascripts/application/search.js b/app/assets/javascripts/application/search.js
index 4e7bfdf1e..da7e7e20c 100644
--- a/app/assets/javascripts/application/search.js
+++ b/app/assets/javascripts/application/search.js
@@ -183,6 +183,18 @@ var search = function() {
watchFilterSubject();
watchCheckbox('type', 'filter-type');
watchCheckbox('school_year', 'filter-school-year');
+ watchFilterRegex();
+ }
+
+ function watchFilterRegex() {
+ $('.regex-submit').on('click', function (event) {
+ event.preventDefault();
+ params.add('regex_all', $(".regex input[name='all']").val());
+ params.add('regex_exact', $(".regex input[name='exact']").val());
+ params.add('regex_any', $(".regex input[name='any']").val());
+ params.add('regex_none', $(".regex input[name='none']").val());
+ filtersFetchInterval();
+ });
}
function watchFilterSubject() {
@@ -290,7 +302,11 @@ var searchParameters = function() {
subject: [],
type: [],
school_year: [],
- year: ""
+ year: "",
+ regex_all: "",
+ regex_exact: "",
+ regex_any: "",
+ regex_none: ""
}
// clone default_params
var params = JSON.parse(JSON.stringify(default_params));
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index 796b7fa4d..81f29aeac 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -221,31 +221,30 @@
</div>
<h3 class="dropdown">Pesquisa Avançada<span class="caret caret-align-right"/></h3>
- <form method="get">
+ <form method="get" class="regex">
<div class="dropdown-element">
<table style="width:100%">
<tr>
<td>Todas estas palavras:</td>
- <td><input type="text" name="All" ></td>
+ <td><input type="text" name="all" ></td>
</tr>
<tr>
<td>A frase exata:</td>
- <td><input type="text" name="Exact" ></td>
+ <td><input type="text" name="exact" ></td>
</tr>
<tr>
<td>Qualquer uma destas palavras:</td>
- <td><input type="text" name="Any"></td>
+ <td><input type="text" name="any"></td>
</tr>
<tr>
<td>Nenhuma destas palavras:</td>
- <td><input type="text" name="None"></td>
+ <td><input type="text" name="none"></td>
</tr>
<tr>
<td></td>
<td align="right"><br>
- <button type="submit" class="btn btn-default">Pesquisar</button>
+ <button type="submit" class="btn btn-default regex-submit">Pesquisar</button>
</td>
- <a onclick="getWordsFilter()">Palavras</a>
</tr>
</table>
</div>
--
GitLab