Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync mobile and import views improvements #3282

Merged
merged 8 commits into from
Nov 26, 2024
Merged

Sync mobile and import views improvements #3282

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8d3a31e
improve sync_rando view
submarcos Jul 12, 2022
d229609
pep8
submarcos Sep 30, 2022
d4166ca
import sync and import views
submarcos Oct 6, 2022
838165c
fix form
submarcos Oct 14, 2022
caeb20a
rebase
submarcos Jan 27, 2023
6efc923
fix views.py
submarcos Nov 26, 2024
ccb6f4b
fix views.py
submarcos Nov 26, 2024
96e8b13
fix views.py
submarcos Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docs/changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,6 +936,7 @@ In preparation for HD Views developments (PR #3298)

- Show direction on lines with setting ``DIRECTION_ON_LINES_ENABLED`` in signage detail
- Add mobile nginx configuration directly on Geotrek-admin
- Improve sync rando, sync mobile and import views.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- Improve sync rando, sync mobile and import views.


**Bug fixes**

Expand All @@ -951,7 +952,7 @@ In preparation for HD Views developments (PR #3298)

!!!! Clear cache after update. You can do this by going to admin panel, "clearcache" section, then delete default / fat and api_v2 !!!!

**Improvements**
**Improvments**

- Cache API v2 Detail endpoints and themes list endpoint
- Sensitive areas are now computed with buffered geometries with settings SENSITIVE_AREA_INTERSECTION_MARGIN. Use ST_INTERSECTS on it is faster.
Expand Down
72 changes: 41 additions & 31 deletions geotrek/api/templates/mobile/sync_mobile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,29 +32,29 @@
has_progress = true;
disable_sync_button(false);

$('#progress-value').show();
$("#progress-value").removeClass('bar-danger');
$("#progress-value").parent().addClass("active");
$("#progress-bar").removeClass('bg-danger');
$("#progress-bar").parent().addClass("active");

if (this.result.current) {
$("#progress-value").css("width", this.result.current+'%');
$("#progress-bar").css("width", this.result.current + '%');

if (this.result.current == 100){
$("#progress-value").parent().removeClass("active");
$("#progress-value").addClass('bar-success');
}
if (this.result.current == 100) {
$("#progress-bar").parent().removeClass("active");
$("#progress-bar").addClass('bg-success');
}
}
if (this.result.infos) {
$("#progress-text").text(this.result.infos);
}
$("#progress-bar").text(this.result.infos);
}
}
else {
if (this.status == 'FAILURE'){
// case of exception in task
$("#progress-text").text("{% trans 'An error occured' %}");
$('#exception-message').text(this.result.exc_type + ' : ' + this.result.exc_message)
$("#progress-value").addClass('bar-danger');
$("#progress-value").parent().removeClass("active");
$("#progress-bar").text("{% trans 'An error occured' %}");
$('#exception-message').text(this.result.exc_type + ' : ' + this.result.exc_message)
$('#exception-message').show();
$("#progress-bar").addClass('bg-danger');
$("#progress-value").parent().removeClass("active");
}
}
});
Expand All @@ -70,11 +70,12 @@
get_sync_infos();

$('#btn-confirm')[0].addEventListener('click', function(evt) {
$("#progress-value").css("width", '0%');
$("#progress-text").text('');
$("#progress-value").parent().addClass("active");
$("#progress-value").removeClass('bar-success');
$("#progress-value").removeClass('bar-danger');
$('#exception-message').hide();
$("#progress-bar").css("width", '0%');
$("#progress-bar").text('');
$("#progress-bar").parent().addClass("active");
$("#progress-bar").removeClass('bg-success');
$("#progress-bar").removeClass('bg-danger');

$.post(
$('#form-sync').attr('action'),
Expand All @@ -87,33 +88,42 @@

window.setInterval(function(){
get_sync_infos();
}, 500);
}, 1000);
});
</script>
<link rel="stylesheet" href="{% static 'trekking/css/sync_trek.css' %}" />
<link rel="stylesheet" href="{% static 'common/css/sync.css' %}" />
{% endblock extrahead %}

{% block toolbar %}
{% endblock toolbar %}

{% block mainpanel %}

<div id="sync-div" class="col-12 col-sm-3">
<h3>{% trans "Mobile sync" %}</h3>
<div class="progress progress-striped active">
<div id="progress-value" class="bar" style="width: 0%;"></div>
<span id="progress-text"></span>
</div>
{% block mainform %}
{% crispy form form.helper %}
{% endblock mainform %}
<div id="sync-div" class="col-12 col-md-6 offset-md-3">
<div class="card">
<div class="card-header">
<h3>{% trans "Mobile sync" %}</h3>
</div>

<div class="card-body">
<div class="progress">
<div class="progress-bar progress-bar-striped" style="width: 0;" id="progress-bar" role="progressbar"></div>
</div>
<div id="exception-message" style="display: none;" class="alert alert-danger">
</div>
</div>
<div class="card-footer">
{% block mainform %}
{% crispy form form.helper %}
{% endblock mainform %}
</div>
</div>
</div>

<div id="exception-message" style="display: none;">
</div>

<div class="modal fade" id="confirm-submit" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<!-- boostrap 2 modal confirmation -->
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
Expand Down
2 changes: 0 additions & 2 deletions geotrek/common/static/common/css/import.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,10 @@
}

#progress-bars div.alert {
margin-left: 45px;
display: none;
}

#progress-bars div.description {
margin-left: 45px;
}

#progress-bars span.parser{
Expand Down
0 ...rekking/static/trekking/css/sync_trek.css → geotrek/common/static/common/css/sync.css
View file
Open in desktop
File renamed without changes.
40 changes: 22 additions & 18 deletions geotrek/common/static/common/js/import.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,42 @@ function updateImportProgressBars() {
$.getJSON('/commands/import-update.json', function(json) {
parent = document.querySelector('#progress-bars');
json.forEach(function(row) {
var local_percent = row.result.current + "%";
var status_class = 'pogress-info';

if (row.status == 'SUCCESS') {
local_percent = "100%";
status_class = "progress-success";
} else if (row.status == 'FAILURE') {
local_percent = "100%";
status_class = "progress-danger";
var local_percent = row.result.current;
var status_class = '';

if (row.status === 'SUCCESS') {
local_percent = "100";
status_class = "bg-success";
} else if (row.status === 'FAILURE') {
local_percent = "100";
status_class = "bg-danger";
}

// Update element if exists
if (element = document.getElementById(row.id)) {
element.querySelector('.bar').style.width = local_percent;
element.querySelector('.pull-left').innerHTML = local_percent;
element.querySelector('.progress-bar').setAttribute('style', 'width: ' + local_percent + '% ;');
element.querySelector('.progress-bar').setAttribute('aria-valuenow', local_percent);
element.querySelector('.progress-bar').innerHTML = local_percent + "%";

if(!element.querySelector('.alert').classList.contains('alert-success')) {
// Add report if success.
if (row.result.report) {
alert = element.querySelector('.alert');
alert.classList.add('alert-success');
alert.innerHTML = row.result.report;
message = element.querySelector('.message');
message.innerHTML = row.result.report;
alert.style.display = 'block';
}
}

} else { //Create element in dom.
element = document.createElement('div');
element.innerHTML = document.querySelector('#import-template').innerHTML
element.innerHTML = document.querySelector('#import-template').innerHTML;
element.id = row.id;
element.querySelector('.bar').style.width = local_percent + ' : ';
element.querySelector('.pull-left').innerHTML = local_percent;
element.querySelector('.progress-bar').setAttribute('style', 'width: ' + local_percent + '% ;');
element.querySelector('.progress-bar').setAttribute('aria-valuenow', local_percent);
element.querySelector('.progress-bar').innerHTML = local_percent + "%";

element.querySelector('.parser').innerHTML = row.result.parser;
element.querySelector('.filename').innerHTML = row.result.filename;

Expand All @@ -43,13 +47,13 @@ function updateImportProgressBars() {
// Handle errors if any.
if (row.result.exc_message) {
element.querySelector('.alert').classList.add('alert-danger');
element.querySelector('.alert span').innerHTML = row.result.exc_type + " : " + row.result.exc_message;
element.querySelector('.message span').innerHTML = row.result.exc_type + " : " + row.result.exc_message;
element.querySelector('.alert').style.display = 'block';
}

// Add class on status change.
if (!element.querySelector('.progress').classList.contains(status_class)) {
element.querySelector('.progress').classList.add(status_class);
if (!element.querySelector('.progress-bar').classList.contains(status_class)) {
element.querySelector('.progress-bar').classList.add(status_class);
}
});
});
Expand Down
87 changes: 42 additions & 45 deletions geotrek/common/templates/common/import_dataset.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,56 +2,53 @@
{% load static crispy_forms_tags i18n %}

{% block extrahead %}
<script type="text/javascript" src="{% static "common/js/import.js" %}"></script>
<link rel="stylesheet" href="{% static "common/css/import.css" %}" />
<script type="text/javascript" src="{% static "common/js/import.js" %}"></script>
<link rel="stylesheet" href="{% static "common/css/import.css" %}"/>
{% endblock extrahead %}

{% block toolbar %}
{% endblock toolbar %}

{% block mainpanel %}
<div id="import-forms" class="col-12 col-sm-3">
{% block mainform %}
{% if form %}
{% crispy form form.helper %}
{% endif %}
{% if encoding_error %}
<p style="color: red;">
{% trans "Decoding error. Please check encoding and use only ASCII in file names." %}
</p>
{% endif %}
{% if form_without_file %}
{% crispy form_without_file form_without_file.helper%}
{% endif %}
{% if form_suricate %}
{% crispy form_suricate form_suricate.helper%}
{% endif %}
{% if not form and not form_without_file and not form_suricate %}
<p>{% trans "No parser available." %}</p>
{% endif %}
{% endblock mainform %}
</div>
<div id="progress-bars" class="col-12 col-sm-5">
</div>
<div id="import-forms" class="col-12 col-md-6 offset-md-3">
{% block mainform %}
{% if form %}
{% crispy form form.helper %}
{% endif %}
{% if encoding_error %}
<p style="color: red;">
{% trans "Decoding error. Please check encoding and use only ASCII in file names." %}
</p>
{% endif %}
{% if form_without_file %}
{% crispy form_without_file form_without_file.helper %}
{% endif %}
{% if form_suricate %}
{% crispy form_suricate form_suricate.helper %}
{% endif %}
{% if not form and not form_without_file and not form_suricate %}
<p>{% trans "No parser available." %}</p>
{% endif %}
{% endblock mainform %}
<div id="progress-bars" class="col-12">
</div>
</div>

<script id="import-template" type="text/template">
<div id="progress-tpl">
<button type="button" class="close" data-dismiss="alert">&times;</button>
<div class="description">
<span class="parser"></span>
<span class="filename">
</span>
</div>
<div class="pull-left">
<span></span>
</div>
<div class="progress progress-striped active">
<div class="bar"></div>
</div>
<div class="alert">
<span></span>
</div>
<hr></hr>
</div>
</script>
<script id="import-template" type="text/template">
<div id="progress-tpl">
<div class="description">
<span class="parser"></span>
<span class="filename"></span>
</div>
<div class="progress">
<div class="progress-bar progress-bar-striped" role="progressbar" style="width: 0%" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100"></div>
</div>
<div class="alert alert-warning alert-dismissible fade show" role="alert">
<span class="message"></span>
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
</div>
</script>
{% endblock mainpanel %}
Empty file added geotrek/common/templates/common/sync_rando.html
View file
Open in desktop
Empty file.
18 changes: 14 additions & 4 deletions geotrek/common/tests/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
from geotrek.core.models import Path
from geotrek.trekking.models import Trek
from geotrek.trekking.tests.factories import TrekFactory
import geotrek.trekking.parsers # noqa


class DocumentPublicPortalTest(TestCase):
Expand Down Expand Up @@ -108,6 +109,7 @@ class ViewsTest(TestCase):
@classmethod
def setUpTestData(cls):
cls.user = UserFactory.create()
cls.super_user = SuperUserFactory()

def setUp(self):
self.client.force_login(user=self.user)
Expand All @@ -118,14 +120,19 @@ def test_settings_json(self):
self.assertEqual(response.status_code, 200)

def test_admin_check_extents(self):
""" Admin can access to extents view"""
url = reverse('common:check_extents')
response = self.client.get(url)
self.assertEqual(response.status_code, 302)
self.user.is_superuser = True
self.user.save()
self.client.force_login(self.super_user)
response = self.client.get(url)
self.assertEqual(response.status_code, 200)

def test_simple_user_check_extents(self):
""" Simple user can't access to extents view"""
url = reverse('common:check_extents')
self.client.force_login(self.user)
response = self.client.get(url)
self.assertEqual(response.status_code, 302)

@override_settings(COLUMNS_LISTS={})
@mock.patch('geotrek.common.mixins.views.logger')
def test_custom_columns_mixin_error_log(self, mock_logger):
Expand All @@ -145,6 +152,9 @@ def setUpTestData(cls):
cls.user = UserFactory()
cls.super_user = SuperUserFactory()

def setUp(self):
self.client.force_login(user=self.user)

def test_import_form_access(self):
self.client.force_login(user=self.user)
url = reverse('common:import_dataset')
Expand Down
Loading
Loading