diff --git a/trademark/templates/trademark/form.html b/trademark/templates/trademark/form.html
index 98d1611..1b6c8e6 100644
--- a/trademark/templates/trademark/form.html
+++ b/trademark/templates/trademark/form.html
@@ -30,6 +30,14 @@
Отправка запроса
+
+ Поиск среди 1 435 282 знаков
Подбор производных знаков
+ Поиск может занять несколько минут
@@ -62,19 +77,24 @@
$form = $('.trademark-search-form'),
$loading = $('.trademark-search-loading'),
$status_list = $('.trademark-search-loading-status'),
+ $count = $('#trademark-search-count'),
$title = $('#trademark-search-request-value'),
$sending = $('#trademark-search-sending'),
$identity = $('#trademark-search-identity'),
$contains = $('#trademark-search-contains'),
$similar = $('#trademark-search-similar'),
- slug = '';
+ $wait = $('#trademark-search-wait'),
+ slug = '',
+ iteration = 0;
function update_status(data) {
var identity = data['identity'],
contains = data['contains'],
similar = data['similar'],
- completed = identity['status'] == 'finished' && contains['status'] == 'finished' && similar['status'] == 'finished';
- almost_completed = identity['status'] == 'finished' && contains['status'] == 'finished' && identity['count'] > 0;
+ completed = identity['status'] == 'finished' && contains['status'] == 'finished' && similar['status'] == 'finished',
+ almost_completed = identity['status'] == 'finished' && contains['status'] == 'finished' && identity['count'] > 0,
+ show_link = identity['status'] == 'finished' || contains['status'] == 'finished' || similar['status'] == 'finished',
+ tm_url = '/ru/trademarks/online-search/results/' + slug + '/';
if(identity['status'] == 'finished') {
$identity.text('Найдено ' + identity['count'] + ' таких знаков в ' + identity['nices'] + ' классах');
@@ -88,9 +108,21 @@
$similar.text('Подобрано ' + similar['count'] + ' производных знаков');
}
+ if(iteration > 5) {
+ $wait.show(500);
+ }
+
+ if(show_link && iteration > 10) {
+ var href = ''
+ $wait.text('Остановить поиск и перейти к результатам');
+ } else {
+ console.log(iteration);
+ }
+
if(completed || almost_completed) {
- document.location.href = '/ru/trademarks/online-search/results/' + slug + '/';
+ document.location.href = tm_url;
} else {
+ iteration += 1;
setTimeout(function () {
get_status(slug);
}, 5000);
@@ -113,9 +145,10 @@
{ 'keyword': request}).done(function(data) {
console.log( "second success" );
console.log(data);
- $identity.show(500);
- $contains.delay(3000).show(500);
- $similar.delay(5000).show(500);
+ $count.show(500);
+ $identity.show(1500);
+ $contains.delay(5000).show(500);
+ $similar.delay(10000).show(500);
slug = data['slug'];
update_status(data);