');
+ //jQuery(element).append('
');
}
diff --git a/static/js/compilacao_edit.js b/static/js/compilacao_edit.js
index 44ad142ba..a5f720e33 100644
--- a/static/js/compilacao_edit.js
+++ b/static/js/compilacao_edit.js
@@ -3,255 +3,255 @@ var editortype = "textarea";
var gets = 0;
var onSubmitEditForm = function(event) {
- var texto = '';
- var editorTiny = tinymce.get('editdi_texto');
-
- if (editorTiny != null)
- texto = editorTiny.getContent();
- else
- texto = $('#editdi_texto').val();
-
- var formData = {
- 'csrfmiddlewaretoken' : $('input[name=csrfmiddlewaretoken]').val(),
- 'texto' : texto
- };
-
- var url = $('.csform form').attr( "action_ajax" );
- $("#message_block").css("display", "block");
-
- $.post(url, formData)
- .done(function(data) {
-
- if (typeof data == "string") {
- $('.dpt-selected').html(data);
- clearEditSelected();
- reloadFunctionClicks();
- return;
- }
-
- clearEditSelected();
-
- if (data.pk != null)
- refreshScreenFocusPk(data);
- else {
- alert('Erro na inserção!');
- flag_refresh_all = false;
- }
-
- }).always(function() {
- $("#message_block").css("display", "none");
- });
- if (event != null)
- event.preventDefault();
+ var texto = '';
+ var editorTiny = tinymce.get('editdi_texto');
+
+ if (editorTiny != null)
+ texto = editorTiny.getContent();
+ else
+ texto = $('#editdi_texto').val();
+
+ var formData = {
+ 'csrfmiddlewaretoken' : $('input[name=csrfmiddlewaretoken]').val(),
+ 'texto' : texto
+ };
+
+ var url = $('.csform form').attr( "action_ajax" );
+ $("#message_block").css("display", "block");
+
+ $.post(url, formData)
+ .done(function(data) {
+
+ if (typeof data == "string") {
+ $('.dpt-selected').html(data);
+ clearEditSelected();
+ reloadFunctionClicks();
+ return;
+ }
+
+ clearEditSelected();
+
+ if (data.pk != null)
+ refreshScreenFocusPk(data);
+ else {
+ alert('Erro na inserção!');
+ flag_refresh_all = false;
+ }
+
+ }).always(function() {
+ $("#message_block").css("display", "none");
+ });
+ if (event != null)
+ event.preventDefault();
}
var clickEditDispositivo = function(event) {
- var _pk = event.currentTarget.getAttribute('pk');
- if ($('#dpt'+_pk).hasClass("dpt-selected")) {
- clearEditSelected();
- return;
- }
- clearEditSelected();
- clickUpdateDispositivo(event);
+ var _pk = event.currentTarget.getAttribute('pk');
+ if ($('#dpt'+_pk).hasClass("dpt-selected")) {
+ clearEditSelected();
+ return;
+ }
+ clearEditSelected();
+ clickUpdateDispositivo(event);
}
var clickUpdateDispositivo = function(event, __pk_refresh, __pk_edit, __action, flag_actions_vibible, flag_refresh_all) {
- var pk_refresh = __pk_refresh;
- var pk_edit = __pk_edit;
- var _action = __action;
- var _variacao = '';
- var _tipo_pk = '';
- var _perfil_pk = '';
-
- if (event != null) {
- pk_refresh = event.currentTarget.getAttribute('pk');
- _action = $(this).attr('action');
- _variacao = $(this).attr('variacao');
- _tipo_pk = $(this).attr('tipo_pk');
- _perfil_pk = $(this).attr('perfil_pk');
- }
-
- if (pk_edit == null)
- pk_edit = pk_refresh;
-
- var url = '';
- if (_action == '')
- return;
- else if ( _action == null) {
- url = pk_refresh+'/refresh?edit='+pk_edit;
- }
- else if (_action.startsWith('refresh')) {
- var str = _action.split(':');
- if (str.length > 1) {
- if(_action.endsWith('perfil')) {
- url = '&perfil_pk='+_perfil_pk;
- $("#message_block").css("display", "block");
- }
- else {
- editortype = str[1];
- SetCookie("editortype", editortype, 30)
- }
- }
- url = pk_refresh+'/refresh?edit='+pk_edit+url;
-
- }
- else if (_action.startsWith('add_')) {
-
- url = pk_refresh+'/actions?action='+_action;
- url += '&tipo_pk='+_tipo_pk;
- url += '&variacao='+_variacao;
-
- $("#message_block").css("display", "block");
-
- }
- else if (_action.startsWith('delete_')) {
- var r = confirm("Confirma Exclusão deste dispositivo?");
- if (r == true) {
- x = "You pressed OK!";
- } else {
- return
- }
- url = pk_refresh+'/actions?action='+_action;
- $("#message_block").css("display", "block");
- }
-
- $.get(url).done(function( data ) {
- if ( _action == null || _action.startsWith('refresh')) {
-
- if (flag_refresh_all) {
+ var pk_refresh = __pk_refresh;
+ var pk_edit = __pk_edit;
+ var _action = __action;
+ var _variacao = '';
+ var _tipo_pk = '';
+ var _perfil_pk = '';
+
+ if (event != null) {
+ pk_refresh = event.currentTarget.getAttribute('pk');
+ _action = $(this).attr('action');
+ _variacao = $(this).attr('variacao');
+ _tipo_pk = $(this).attr('tipo_pk');
+ _perfil_pk = $(this).attr('perfil_pk');
+ }
+
+ if (pk_edit == null)
+ pk_edit = pk_refresh;
+
+ var url = '';
+ if (_action == '')
+ return;
+ else if ( _action == null) {
+ url = pk_refresh+'/refresh?edit='+pk_edit;
+ }
+ else if (_action.startsWith('refresh')) {
+ var str = _action.split(':');
+ if (str.length > 1) {
+ if(_action.endsWith('perfil')) {
+ url = '&perfil_pk='+_perfil_pk;
+ $("#message_block").css("display", "block");
+ }
+ else {
+ editortype = str[1];
+ SetCookie("editortype", editortype, 30)
+ }
+ }
+ url = pk_refresh+'/refresh?edit='+pk_edit+url;
+
+ }
+ else if (_action.startsWith('add_')) {
+
+ url = pk_refresh+'/actions?action='+_action;
+ url += '&tipo_pk='+_tipo_pk;
+ url += '&variacao='+_variacao;
+
+ $("#message_block").css("display", "block");
+
+ }
+ else if (_action.startsWith('delete_')) {
+ var r = confirm("Confirma Exclusão deste dispositivo?");
+ if (r == true) {
+ x = "You pressed OK!";
+ } else {
+ return
+ }
+ url = pk_refresh+'/actions?action='+_action;
+ $("#message_block").css("display", "block");
+ }
+
+ $.get(url).done(function( data ) {
+ if ( _action == null || _action.startsWith('refresh')) {
+
+ if (flag_refresh_all) {
if (flag_actions_vibible)
clearEditSelected();
- $( '#dpt' + pk_refresh ).html( data);
- }
- else {
- //console.log(pk_refresh + ' - '+pk_edit)
- if (flag_actions_vibible == null || flag_actions_vibible)
- clearEditSelected();
-
- //$( '#dpt' + pk_refresh+' > .bloco' ).addClass('displaynone' );
- $( '#dpt' + pk_refresh ).prepend( data );
- }
-
- reloadFunctionClicks();
-
- var _editortype = editortype;
- if ( $('.edt-'+_editortype).length == 0) {
- _editortype = 'construct';
- }
-
- if ( _editortype == 'tinymce' ) {
- initTinymce();
- }
- else if (_editortype == 'textarea') {
- $('.csform form').submit(onSubmitEditForm);
- }
- else if (_editortype == 'construct') {
- $('.csform .btn-salvar').parent().addClass("displaynone");
- $('.csform .btn-salvar, .csform .fields').addClass("displaynone");
- $('#dpt'+pk_refresh).css('min-height', $('.actions_right').height()*2);
- $('.actions_inserts').removeClass('menu_flutuante');
- }
- else if (_editortype == 'detail') {
- $('.csform .btn-salvar').parent().removeClass("displaynone");
- $('.csform .btn-salvar, .csform .fields').removeClass("displaynone");
- $('#dpt'+pk_refresh).css('min-height', $('.actions_right').height()*2);
- $('.actions_inserts').addClass('menu_flutuante');
- }
-
- $(".edt-"+_editortype).addClass('selected');
- //$(".container").addClass('class_color_container');
-
- if (flag_actions_vibible == null || flag_actions_vibible) {
- $('#dpt'+pk_edit).addClass('dpt-selected');
- $('html, body').animate({
- scrollTop: $('#dpt' + pk_edit ).offset().top - window.innerHeight / 9
- }, 0);
- }
- }
-
- else if (_action == 'add_next' || _action == 'add_in') {
- clearEditSelected();
- if (data.pk != null) {
-
- if (data.alert != null)
- alert(data.alert)
-
- refreshScreenFocusPk(data);
- }
- else {
- alert('Erro na inserção!');
- }
- }
- else if (_action.startsWith('delete_')) {
- $("#message_block").css("display", "block");
- clearEditSelected();
- if (data.pk != null) {
- refreshScreenFocusPk(data);
- }
- else {
- alert('Erro exclusão!');
- }
- }
- else {
- clearEditSelected();
- reloadFunctionClicks();
- }
- }).always(function() {
- $("#message_block").css("display", "none");
- });
+ $( '#dpt' + pk_refresh ).html( data);
+ }
+ else {
+ //console.log(pk_refresh + ' - '+pk_edit)
+ if (flag_actions_vibible == null || flag_actions_vibible)
+ clearEditSelected();
+
+ //$( '#dpt' + pk_refresh+' > .bloco' ).addClass('displaynone' );
+ $( '#dpt' + pk_refresh ).prepend( data );
+ }
+
+ reloadFunctionClicks();
+
+ var _editortype = editortype;
+ if ( $('.edt-'+_editortype).length == 0) {
+ _editortype = 'construct';
+ }
+
+ if ( _editortype == 'tinymce' ) {
+ initTinymce();
+ }
+ else if (_editortype == 'textarea') {
+ $('.csform form').submit(onSubmitEditForm);
+ }
+ else if (_editortype == 'construct') {
+ $('.csform .btn-salvar').parent().addClass("displaynone");
+ $('.csform .btn-salvar, .csform .fields').addClass("displaynone");
+ $('#dpt'+pk_refresh).css('min-height', $('.actions_right').height()*2);
+ $('.actions_inserts').removeClass('menu_flutuante');
+ }
+ else if (_editortype == 'detail') {
+ $('.csform .btn-salvar').parent().removeClass("displaynone");
+ $('.csform .btn-salvar, .csform .fields').removeClass("displaynone");
+ $('#dpt'+pk_refresh).css('min-height', $('.actions_right').height()*2);
+ $('.actions_inserts').addClass('menu_flutuante');
+ }
+
+ $(".edt-"+_editortype).addClass('selected');
+ //$(".container").addClass('class_color_container');
+
+ if (flag_actions_vibible == null || flag_actions_vibible) {
+ $('#dpt'+pk_edit).addClass('dpt-selected');
+ $('html, body').animate({
+ scrollTop: $('#dpt' + pk_edit ).offset().top - window.innerHeight / 9
+ }, 0);
+ }
+ }
+
+ else if (_action == 'add_next' || _action == 'add_in') {
+ clearEditSelected();
+ if (data.pk != null) {
+
+ if (data.alert != null)
+ alert(data.alert)
+
+ refreshScreenFocusPk(data);
+ }
+ else {
+ alert('Erro na inserção!');
+ }
+ }
+ else if (_action.startsWith('delete_')) {
+ $("#message_block").css("display", "block");
+ clearEditSelected();
+ if (data.pk != null) {
+ refreshScreenFocusPk(data);
+ }
+ else {
+ alert('Erro exclusão!');
+ }
+ }
+ else {
+ clearEditSelected();
+ reloadFunctionClicks();
+ }
+ }).always(function() {
+ $("#message_block").css("display", "none");
+ });
}
function refreshScreenFocusPk(data) {
- for (var pai = 0; pai < data.pai.length; pai++)
- if (data.pai[pai] != -1) {
- clickUpdateDispositivo(null, data.pai[pai], data.pk, 'refresh', pai == 0, true);
- }
- else {
- href = location.href.split('#')[0]
- location.href = href+'#'+data.pk
- location.reload(true)
- }
+ for (var pai = 0; pai < data.pai.length; pai++)
+ if (data.pai[pai] != -1) {
+ clickUpdateDispositivo(null, data.pai[pai], data.pk, 'refresh', pai == 0, true);
+ }
+ else {
+ href = location.href.split('#')[0]
+ location.href = href+'#'+data.pk
+ location.reload(true)
+ }
}
function clearEditSelected() {
- $('.bloco' ).removeClass('displaynone' );
+ $('.bloco' ).removeClass('displaynone' );
- $(".container").removeClass('class_color_container');
- tinymce.remove();
- $('.dpt-selected').removeClass('dpt-selected');
- $('.dpt').css('min-height', '');
- $('.csform').remove();
+ $(".container").removeClass('class_color_container');
+ tinymce.remove();
+ $('.dpt-selected').removeClass('dpt-selected');
+ $('.dpt').css('min-height', '');
+ $('.csform').remove();
}
function reloadFunctionClicks() {
- $('.dpt .de, .btn-action, .btn-edit').off();
+ $('.dpt .de, .btn-action, .btn-edit').off();
- $('.dpt .de, .btn-edit').on('click', clickEditDispositivo);
+ $('.dpt .de, .btn-edit').on('click', clickEditDispositivo);
- $('.btn-action').on('click', clickUpdateDispositivo);
+ $('.btn-action').on('click', clickUpdateDispositivo);
- $('#editdi_texto').focus();
+ $('#editdi_texto').focus();
}
$(document).ready(function() {
- editortype = ReadCookie("editortype")
+ editortype = ReadCookie("editortype")
- if (editortype == null || editortype == "") {
- editortype = "textarea"
- SetCookie("editortype", editortype, 30)
- }
+ if (editortype == null || editortype == "") {
+ editortype = "textarea"
+ SetCookie("editortype", editortype, 30)
+ }
- reloadFunctionClicks();
- $("#message_block").css("display", "none");
+ reloadFunctionClicks();
+ $("#message_block").css("display", "none");
- href = location.href.split('#')
- if (href.length == 2) {
- clickUpdateDispositivo(null, href[1], href[1], 'refresh', true);
- }
+ href = location.href.split('#')
+ if (href.length == 2) {
+ clickUpdateDispositivo(null, href[1], href[1], 'refresh', true);
+ }
});
diff --git a/static/js/compilacao_notas.js b/static/js/compilacao_notas.js
index 8d1168acd..dd5a02c91 100644
--- a/static/js/compilacao_notas.js
+++ b/static/js/compilacao_notas.js
@@ -1,179 +1,200 @@
-function onEventsDneExec(pk) {
-
- $('html, body').animate({
- scrollTop: $('#dne' + pk ).offset().top - window.innerHeight / 5
- }, 300);
-
- $('.dateinput').fdatepicker({
- // TODO localize
- format: 'dd/mm/yyyy',
- language: 'pt',
- endDate: '31/12/2100',
- todayBtn: true
- });
-
- $('#dne'+pk+" .primary").click(onSubmitEditForm);
- $('#dne'+pk+" .btn-close-container").click(function(){
- $(this).closest('.dne-nota').removeClass('dne-nota');
- $(this).closest('.dne-form').html('');
- });
-
- $('#dne'+pk+" select[name='tipo']").change(function(event) {
- var url = '';
- url = 'text/'+pk+'/nota/create?action=modelo_nota&id_tipo='+this.value;
- $.get(url).done(function( data ) {
- $('#dne'+pk+" textarea[name='texto']").val(data);
- });
- });
-
- $('#dne'+pk+" select[name='tipo_norma']"
- ).change(onChangeParamNorma);
-
- $('#dne'+pk+" input[name='num_norma'], "
- + '#dne'+pk+" input[name='ano_norma'], "
- + '#dne'+pk+" input[name='busca_dispositivo']"
- ).change(onChangeParamNorma);
-
- $('#dne'+pk+" .btn-busca").click(onChangeParamNorma);
-
- onChangeParamNorma();
+function onEventsDneExec(pk, model) {
+
+ $('html, body').animate({
+ scrollTop: $('#dne' + pk ).offset().top - window.innerHeight / 5
+ }, 300);
+
+ refreshDatePicker()
+
+ $('#dne'+pk+" #button-id-submit-form").click(onSubmitEditForm);
+ $('#dne'+pk+" .btn-close-container").click(function(){
+ $(this).closest('.dne-nota').removeClass('dne-nota');
+ $(this).closest('.dne-form').html('');
+ });
+
+ if (model == 'nota') {
+ $('#dne'+pk+" select[name='tipo']").change(function(event) {
+ var url = '';
+ url = 'text/'+pk+'/nota/create?action=modelo_nota&id_tipo='+this.value;
+ $.get(url).done(function( data ) {
+ $('#dne'+pk+" textarea[name='texto']").val(data);
+ });
+ });
+ }
+ else if (model == 'vide') {
+ $('#dne'+pk+" select[name='tipo_ta']").change(function(event) {
+ var url = '';
+ url = 'text/'+pk+'/vide/create?action=get_tipos&tipo_ta='+this.value;
+
+ $('#dne'+pk+" label[for='id_tipo_model']").html('Tipos de ' + this.children[this.selectedIndex].innerHTML);
+
+
+ var select = $('#dne'+pk+" select[name='tipo_model']");
+ select.empty();
+ $('').appendTo(select);
+
+ $.get(url).done(function( data ) {
+ select.empty();
+ for(var item in data) {
+ for (var i in data[item])
+ $('').appendTo(select);
+ }
+
+
+ });
+ });
+ $('#dne'+pk+" input[name='num_norma'], "
+ + '#dne'+pk+" input[name='ano_norma'], "
+ + '#dne'+pk+" input[name='busca_dispositivo']"
+ ).change(onChangeParamNorma);
+
+ $('#dne'+pk+" .btn-busca").click(onChangeParamNorma);
+
+ onChangeParamNorma();
+ }
}
var onChangeParamNorma = function(event) {
- var tipo_ta = $("select[name='tipo_ta']").val();
- var num_ta = $("input[name='num_ta']").val();
- var ano_ta = $("input[name='ano_ta']").val();
- var busca_dispositivo = $("input[name='busca_dispositivo']").val();
- var dispositivo_ref = $("#id_dispositivo_ref").val();
- $('#id_dispositivo_ref').remove();
-
- if (dispositivo_ref == null)
- dispositivo_ref = ''
-
- var url = '';
- var pk = $("select[name='tipo_ta']").closest('.dne').attr('pk')
-
- var formData = {
- 'tipo_ta' : tipo_ta,
- 'num_ta' : num_ta,
- 'ano_ta' : ano_ta,
- 'busca' : busca_dispositivo,
- 'tipo_form' : 'radio',
- 'initial_ref' : dispositivo_ref
- };
-
- url = 'text/search';
- $('.container-busca').html('');
- insertWaitAjax('.container-busca')
- $.get(url, formData).done(function( data ) {
- $('.container-busca').html(data);
- $("input[name='dispositivo_ref']").first().prop('checked', true);
- });
+ var tipo_ta = $("select[name='tipo_ta']").val();
+ var tipo_model = $("select[name='tipo_model']").val();
+ var num_ta = $("input[name='num_ta']").val();
+ var ano_ta = $("input[name='ano_ta']").val();
+ var busca_dispositivo = $("input[name='busca_dispositivo']").val();
+ var dispositivo_ref = $("#id_dispositivo_ref").val();
+ $('#id_dispositivo_ref').remove();
+
+ if (dispositivo_ref == null)
+ dispositivo_ref = ''
+
+ var url = '';
+ var pk = $("select[name='tipo_ta']").closest('.dne').attr('pk')
+
+ var formData = {
+ 'tipo_ta' : tipo_ta,
+ 'tipo_model' : tipo_model,
+ 'num_ta' : num_ta,
+ 'ano_ta' : ano_ta,
+ 'busca' : busca_dispositivo,
+ 'tipo_form' : 'radio',
+ 'initial_ref' : dispositivo_ref
+ };
+
+ url = 'text/search';
+ $('.container-busca').html('');
+ insertWaitAjax('.container-busca')
+ $.get(url, formData).done(function( data ) {
+ $('.container-busca').html(data);
+ $("input[name='dispositivo_ref']").first().prop('checked', true);
+ });
}
var onSubmitEditForm = function(event) {
- var url = '';
- var model = 'nota';
- var id_edit = null;
- var id_dispositivo = $('#id_dispositivo').val();
-
- if (id_dispositivo == null) { // trata-se de um vide
- $('#id_dispositivo_ref').remove();
- id_dispositivo = $('#id_dispositivo_base').val();
- model='vide';
- }
-
- id_edit = $('#id_pk').val();
- url = 'text/'+id_dispositivo+'/'+model+'/'
- if (id_edit == null || id_edit == '')
- url += 'create';
- else
- url += id_edit+'/edit';
-
- console.log($('#dne'+id_dispositivo+" form").serialize());
-
- $.post( url, $('#dne'+id_dispositivo+" form").serialize(), function(data) {
-
- if (typeof data == "string") {
- if (data.indexOf('
{{ view.title|linebreaksbr }}
- {% endif %} ++ {% if view.title %} + {{ view.title|safe|linebreaksbr }} + {% else %} + {{ title|safe|linebreaksbr }} + {% endif %} +
{% endblock %} @@ -217,15 +221,18 @@ {% block foot_js %} - + - - - + + + + + + {% block extra_js %}{% endblock %} diff --git a/templates/compilacao/ajax_form.html b/templates/compilacao/ajax_form.html index 52cbf0e30..8daf9e789 100644 --- a/templates/compilacao/ajax_form.html +++ b/templates/compilacao/ajax_form.html @@ -1,3 +1,2 @@ {% load crispy_forms_tags %} -
{% crispy form form.helper%}
diff --git a/templates/compilacao/confirm_delete.html b/templates/compilacao/confirm_delete.html
deleted file mode 100644
index 354db7f00..000000000
--- a/templates/compilacao/confirm_delete.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "base.html" %}
-{% load i18n %}
-
-{% block base_content %}
-
-{% endblock %}
diff --git a/templates/compilacao/dispositivo_search_fragment_form.html b/templates/compilacao/dispositivo_search_fragment_form.html
index be999ad8d..385096057 100644
--- a/templates/compilacao/dispositivo_search_fragment_form.html
+++ b/templates/compilacao/dispositivo_search_fragment_form.html
@@ -2,39 +2,38 @@
{% load compilacao_filters %}
{% if object_list.count >= 100 %}
-
- {% trans 'Use argumentos para simplificar listagem...' %}
-
+
+ {% trans 'Use argumentos para simplificar listagem...' %}
+
{% endif %}
{% for dpt in object_list %}
- {% ifchanged dpt.ta%}
- {% if not forloop.first %}{% endif %}
- {{dpt.ta}}
- -
- {% endifchanged %}
+ {% ifchanged dpt.ta%}
+ {% if not forloop.first %}
{{dpt.ta}}
+ -
+ {% endifchanged %}
- {% if dpt.is_relative_auto_insert and dpt.dispositivo_pai.nivel != 0 %}
-
-
- - -- -
- {% elif not dpt.tipo_dispositivo.dispositivo_de_articulacao %}
-
-
- - -- -
- {% endif%}
-
- {% if forloop.last %}
+
+
+
+
+
+
+
+
+{% block base_content %}
+
+
{% block actions %}
-
- {% endblock actions %}
+ {% endblock actions %}
+
- {% block sections_nav %}
- {% endblock %}
+ {% trans 'Editar' %}
+ {% trans 'Excluir' %}
-
+ {% block sections_nav %}
+ {% endblock %}
+
- {% block detail_content %} {# TODO replace fieldset for something semantically correct, but with similar visual grouping style #}
+ {% block detail_content %} {# TODO replace fieldset for something semantically correct, but with similar visual grouping style #}