SPDT
/
sapl
mirror of https://github.com/interlegis/sapl.git
5
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

migra jquery e algumas funções dependentes

pull/2485/head
Leandro Roberto 7 years ago
parent
b9e0cd1472
commit
22de53e210
5 changed files with 57 additions and 56 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      sapl-frontend/package.json
  2. 84
      sapl-frontend/src/global/functions.js
  3. 9
      sapl-frontend/src/global/main.js
  4. 4
      sapl/static/js/app.js
  5. 10
      sapl/templates/base.html

6
sapl-frontend/package.json
View File

@ -8,19 +8,21 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"@fortawesome/fontawesome-free": "^5.6.3",
"bootstrap": "^4.2.1",
"bootstrap-material-design": "^4.1.1",
"dotenv": "^6.2.0",
"jquery": "^3.3.1",
"jquery-mask-plugin": "^1.14.15",
"jquery-ui": "^1.12.1",
"jquery-ui-themes": "^1.12.0",
"popper.js": "^1.14.6",
"sapl-oficial-theme": "../../sapl-oficial-theme",
"vue": "^2.5.21",
"vue-router": "^3.0.1",
"vuex": "^3.0.1",
"webpack": "^4.28.4",
"webpack-bundle-tracker": "^0.4.2-beta"
"webpack-bundle-tracker": "^0.4.2-beta",
"webpack-jquery-ui": "^2.0.1"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.3.0",

84
sapl-frontend/src/global/functions.js
View File

@ -1,18 +1,11 @@
import jQuery from "jquery";
import mask from "jquery-mask-plugin";
import dialog from "jquery-ui/ui/widgets/dialog";
import "jquery-ui/themes/base/all.css"
jQuery.dialog = dialog;
jQuery.mask = mask;
let $ = jQuery;
import $ from "jquery";
window.getCookie = function(name) {
var cookieValue = null;
if (document.cookie && document.cookie !== '') {
var cookies = document.cookie.split(';');
for (var i = 0; i < cookies.length; i++) {
var cookie = jQuery.trim(cookies[i]);
var cookie = $.trim(cookies[i]);
if (cookie.substring(0, name.length + 1) === (name + '=')) {
cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
break;
@ -24,8 +17,8 @@ window.getCookie = function(name) {
window.autorModal = function() {
jQuery(function() {
var dialog = jQuery("#modal_autor").dialog({
$(function() {
var dialog = $("#modal_autor").dialog({
autoOpen: false,
modal: true,
width: 500,
@ -39,12 +32,12 @@ window.autorModal = function() {
}
});
jQuery("#button-id-limpar").click(function() {
jQuery("#nome_autor").text('');
$("#button-id-limpar").click(function() {
$("#nome_autor").text('');
function clean_if_exists(fieldname) {
if (jQuery(fieldname).length > 0) {
jQuery(fieldname).val('');
if ($(fieldname).length > 0) {
$(fieldname).val('');
}
}
@ -52,56 +45,56 @@ window.autorModal = function() {
clean_if_exists("#id_autoria__autor");
});
jQuery("#button-id-pesquisar").click(function() {
jQuery("#q").val('');
jQuery("#div-resultado").children().remove();
jQuery("#modal_autor").dialog( "open" );
jQuery("#selecionar").attr("hidden", "hidden");
$("#button-id-pesquisar").click(function() {
$("#q").val('');
$("#div-resultado").children().remove();
$("#modal_autor").dialog( "open" );
$("#selecionar").attr("hidden", "hidden");
});
jQuery("#pesquisar").click(function() {
var name_in_query = jQuery("#q").val()
$("#pesquisar").click(function() {
var name_in_query = $("#q").val()
//var q_0 = "q_0=nome__icontains"
//var q_1 = name_in_query
//query = q_1
jQuery.get("/api/autor?q=" + name_in_query, function(data, status) {
jQuery("#div-resultado").children().remove();
$.get("/api/autor?q=" + name_in_query, function(data, status) {
$("#div-resultado").children().remove();
if (data.pagination.total_entries == 0) {
jQuery("#selecionar").attr("hidden", "hidden");
jQuery("#div-resultado").html(
$("#selecionar").attr("hidden", "hidden");
$("#div-resultado").html(
"<span class='alert'><strong>Nenhum resultado</strong></span>");
return;
}
var select = jQuery(
var select = $(
'<select id="resultados" \
style="min-width: 90%; max-width:90%;" size="5"/>');
data.results.forEach(function(item, index) {
select.append(jQuery("<option>").attr('value', item.value).text(item.text));
select.append($("<option>").attr('value', item.value).text(item.text));
});
jQuery("#div-resultado").append("<br/>").append(select);
jQuery("#selecionar").removeAttr("hidden", "hidden");
$("#div-resultado").append("<br/>").append(select);
$("#selecionar").removeAttr("hidden", "hidden");
if (data.pagination.total_pages > 1)
jQuery("#div-resultado").prepend('<span><br/>Mostrando 10 primeiros autores relativos a sua busca.<br/></span>');
$("#div-resultado").prepend('<span><br/>Mostrando 10 primeiros autores relativos a sua busca.<br/></span>');
jQuery("#selecionar").click(function() {
let res = jQuery("#resultados option:selected");
$("#selecionar").click(function() {
let res = $("#resultados option:selected");
let id = res.val();
let nome = res.text();
jQuery("#nome_autor").text(nome);
$("#nome_autor").text(nome);
// MateriaLegislativa pesquisa Autor via a tabela Autoria
if (jQuery('#id_autoria__autor').length) {
jQuery('#id_autoria__autor').val(id);
if ($('#id_autoria__autor').length) {
$('#id_autoria__autor').val(id);
}
// Protocolo pesquisa a própria tabela de Autor
if (jQuery('#id_autor').length) {
jQuery("#id_autor").val(id);
if ($('#id_autor').length) {
$("#id_autor").val(id);
}
dialog.dialog( "close" );
@ -111,11 +104,11 @@ window.autorModal = function() {
});
/*function get_nome_autor(fieldname) {
if (jQuery(fieldname).length > 0) { // se campo existir
if (jQuery(fieldname).val() != "") { // e não for vazio
var id = jQuery(fieldname).val();
jQuery.get("/proposicao/get-nome-autor?id=" + id, function(data, status){
jQuery("#nome_autor").text(data.nome);
if ($(fieldname).length > 0) { // se campo existir
if ($(fieldname).val() != "") { // e não for vazio
var id = $(fieldname).val();
$.get("/proposicao/get-nome-autor?id=" + id, function(data, status){
$("#nome_autor").text(data.nome);
});
}
}
@ -138,3 +131,8 @@ window.refreshMask = function () {
$('.timeinput').mask("00:00:00", {placeholder:"hh:mm:ss"});
$('.cronometro').mask("00:00:00", {placeholder:"hh:mm:ss"});
}
window.refreshDatePicker = function() {
$.datepicker.setDefaults($.datepicker.regional['pt-BR']);
$('.dateinput').datepicker();
}

9
sapl-frontend/src/global/main.js
View File

@ -1,8 +1,13 @@
import jQuery from "jquery";
import "jquery-mask-plugin";
import 'webpack-jquery-ui/dialog'
import 'webpack-jquery-ui/sortable'
import "./functions";
window.$ = window.jQuery = jQuery;
window.autorModal();
window.refreshMask();
window.refreshMask();

4
sapl/static/js/app.js
View File

@ -33,10 +33,6 @@ function removeTinymce() {
}
}
function refreshDatePicker() {
$.datepicker.setDefaults($.datepicker.regional['pt-BR']);
$('.dateinput').datepicker();
}
function OptionalCustomFrontEnd() {

10
sapl/templates/base.html
View File

@ -19,12 +19,8 @@
{# Styles #}
{% comment "" %}
<link rel="stylesheet" href="{% static 'components-font-awesome/css/font-awesome.css' %}">
<link rel="stylesheet" href="{% sass_src 'styles/app.scss' %}" type="text/css">
{# Scripts #}
{# modernizr must be in head (see http://modernizr.com/docs/#installing) #}
{# Incorporado em sapl-frontend#}
@ -32,6 +28,10 @@
<script type="text/javascript" src="{% static 'jquery/dist/jquery.min.js' %}"></script>
<link rel="stylesheet" href="{% static 'jquery-ui/themes/cupertino/jquery-ui.min.css' %}">
<link rel="stylesheet" href="{% static 'drunken-parrot-flat-ui/css/drunken-parrot.css' %}">
<link rel="stylesheet" href="{% static 'components-font-awesome/css/font-awesome.css' %}">
<link rel="stylesheet" href="{% sass_src 'styles/app.scss' %}" type="text/css">
{# Scripts #}
{# modernizr must be in head (see http://modernizr.com/docs/#installing) #}
{% endcomment %}
@ -247,7 +247,6 @@
<!-- Bootstrap core JavaScript ================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script type="text/javascript" src="{% static 'jquery-ui/ui/i18n/datepicker-pt-BR.js' %}"></script>
<script type="text/javascript" src="{% static 'js/jquery.runner.js' %}"></script>
@ -266,6 +265,7 @@
<script type="text/javascript" src="{% static 'jquery-ui/jquery-ui.min.js' %}"></script>
<script type="text/javascript" src="{% static 'bootstrap-sass/assets/javascripts/bootstrap.min.js' %}"></script>
<script type="text/javascript" src="{% static 'jquery-mask-plugin/dist/jquery.mask.js' %}"></script>
<script type="text/javascript" src="{% static 'jquery-ui/ui/i18n/datepicker-pt-BR.js' %}"></script>
{% endcomment %}

Write Preview
Loading…
Cancel
Save