Browse Source

Atualiza para djbs-theme 1.0.6 e outros pacotes

pull/194/merge 4.0.19
Sesóstris Vieira 2 weeks ago
parent
commit
86945fb83c
  1. 4
      requirements/requirements.txt
  2. 2
      sigi/apps/casas/admin.py
  3. 1
      sigi/apps/espacos/forms.py
  4. 6
      sigi/apps/home/static/home/js/openmap.js
  5. 13
      sigi/apps/ocorrencias/static/ocorrencias/js/jquery-ui.min.js
  6. 5
      sigi/apps/ocorrencias/static/ocorrencias/js/painel_ocorrencias.js
  7. 5
      sigi/apps/ocorrencias/templates/ocorrencias/painel.html
  8. 1
      sigi/settings.py
  9. 3
      sigi/static/js/materialize-inits.js
  10. 38
      sigi/static/material/admin/js/filters.js

4
requirements/requirements.txt

@ -23,7 +23,7 @@ odfpy==1.4.1
pandas==3.0.2
parsel==1.11.0
pillow==12.2.0
psycopg2-binary==2.9.11
psycopg2-binary==2.9.12
python-docx==1.2.0
python-magic==0.4.27
PyYAML==6.0.3
@ -32,6 +32,6 @@ tzdata==2026.1
uritemplate==4.2.0
weasyprint==68.1
xlsxwriter==3.2.9
djbs-theme @ git+https://github.com/interlegis/djbs-theme.git
djbs-theme @ git+https://github.com/interlegis/djbs-theme.git@v1.0.6
django-dashboard @ git+https://github.com/interlegis/django-dashboard.git
dx-job-controller @ git+https://github.com/interlegis/dx-job-controller.git@v1.0.0

2
sigi/apps/casas/admin.py

@ -13,7 +13,6 @@ from django.utils.html import format_html
from django.utils.safestring import mark_safe
from django.utils.translation import gettext as _
from django_weasyprint.views import WeasyTemplateResponse
from djbs import djbs_constants as djbsc
from import_export import resources
from import_export.admin import ExportActionMixin
from import_export.fields import Field
@ -187,7 +186,6 @@ class ListaFuncionarioInline(admin.TabularInline):
can_delete = False
verbose_name_plural = _("Lista de contatos")
ordering = ["setor", "-ult_alteracao"]
djbs_hide_original = True
def get_queryset(self, request):
qs = super().get_queryset(request)

1
sigi/apps/espacos/forms.py

@ -29,7 +29,6 @@ class UsoEspacoReportForm(forms.Form):
"admin/js/vendor/select2/select2.full.js",
"admin/js/change_form.js",
"admin/js/vendor/select2/i18n/pt-BR.js",
"material/admin/js/widgets/TimeInput.js",
"admin/js/core.js",
"/admin/jsi18n/",
]

6
sigi/apps/home/static/home/js/openmap.js

@ -13,7 +13,7 @@ var map_center = [-14.235004, -51.92528];
var options = { color: 'blue', fillColor: 'red', fillOpacity: 0.4, radius: 500 };
var unfiltred_options = { color: 'red', fillColor: 'red', fillOpacity: 0, radius: 1000 };
$(document).ready(function () {
$("input[type=checkbox]").change(filtra);
$("input[type=checkbox]").on("change", filtra);
var search_field = $("#map-search");
if (search_field) {
@ -140,7 +140,7 @@ $(document).ready(function () {
})
}
$("#clear-filters").click(function (event) {
$("#clear-filters").on("click", function (event) {
event.preventDefault();
$("input[type=checkbox][name=tipo_orgao]").prop('checked', false);
$("input[type=checkbox][name=tipo_servico]").prop('checked', false);
@ -150,7 +150,7 @@ $(document).ready(function () {
$("input[type=checkbox][name=gerente]").prop('checked', false);
filtra();
});
$("#center-map").click(function (event) {
$("#center-map").on("click", function (event) {
event.preventDefault();
mymap.flyTo(map_center, 4.5);
});

13
sigi/apps/ocorrencias/static/ocorrencias/js/jquery-ui.min.js

File diff suppressed because one or more lines are too long

5
sigi/apps/ocorrencias/static/ocorrencias/js/painel_ocorrencias.js

@ -1,5 +0,0 @@
$(document).ready(function () {
M.Dropdown.init($('.dropdown-trigger'));
M.Modal.init($(".modal"));
M.FloatingActionButton.init($(".fixed-action-btn"));
});

5
sigi/apps/ocorrencias/templates/ocorrencias/painel.html

@ -94,9 +94,4 @@
<button id="apply-filters" type="submit" class="btn btn-outline-secondary">{% translate 'Filter' %}</button>
</form>
</div>
{% endblock %}
{% block footer %}
{{ block.super }}
<script type="text/javascript" src="{% static 'ocorrencias/js/painel_ocorrencias.js' %}"></script>
{% endblock %}

1
sigi/settings.py

@ -258,6 +258,7 @@ DJBSTHEME = {
"FIELDSET_STYLE": djbs_constants.STYLE_TAB,
"INLINESET_STYLE": djbs_constants.STYLE_TAB,
"BADGERIZE_FACETS": True,
"HIDE_ORIGINAL": True,
"ICONS": {
"chart": "bi bi-graph-up",
"checklist": "bi bi-list-check",

3
sigi/static/js/materialize-inits.js

@ -1,3 +0,0 @@
$(document).ready(function () {
M.Materialbox.init($('.materialboxed'));
})

38
sigi/static/material/admin/js/filters.js

@ -1,38 +0,0 @@
$("#apply-filters").on("click", function () {
var query = [];
var retorno = decodeURIComponent(window.location.search).replace("?", "").split("&");
var remove = [];
var filters = $(".admin_filter");
var dal_filters = $("[id$=dal-filter]")
for (i = 0; i < filters.length; i++) {
var element = $(filters[i]);
var filter;
if (element.attr("type") == "text") {
var cleaner = decodeURIComponent(element.attr("data-clear")).replace("?", "").split("&");
if (element.val() == "") {
filter = []
} else {
filter = [element.attr("name") + '=' + decodeURIComponent(element.val())];
}
filter = filter.concat(cleaner);
} else {
filter = decodeURIComponent(element.val()).replace("?", "").split("&");
}
remove = remove.concat(retorno.filter(x => !filter.includes(x)));
query = query.concat(filter.filter(x => !retorno.includes(x)));
}
for (i = 0; i < dal_filters.length; i++) {
var element = $(dal_filters[i]);
var filter = [];
if (element.val() != "") {
filter = [element.serialize()];
}
remove = remove.concat(retorno.filter(x => x.includes(element.attr("name"))));
query = query.concat(filter);
}
query = query.concat(retorno.filter(x => !remove.includes(x)));
query = query.filter(x => x != "");
window.location.href = "?" + (query.join("&"));
});
Loading…
Cancel
Save