Browse Source

ajuste de layout para notas e de código eslint

pull/2485/head
Leandro Roberto 7 years ago
parent
commit
3d9cce09fd
  1. 14
      sapl-frontend/.eslintrc.js
  2. 4
      sapl-frontend/babel.config.js
  3. 2
      sapl-frontend/postcss.config.js
  4. 753
      sapl-frontend/src/apps/compilacao/js/old/compilacao_edit.js
  5. 4
      sapl-frontend/src/apps/compilacao/js/old/compilacao_notas.js
  6. 1
      sapl-frontend/src/apps/compilacao/scss/compilacao.scss
  7. 189
      sapl-frontend/src/global/functions.js
  8. 1725
      sapl-frontend/src/global/image_cropping/js/jquery.Jcrop.js
  9. 872
      sapl-frontend/src/global/image_cropping/js/jquery.color.js
  10. 4
      sapl-frontend/src/global/main.js
  11. 4
      sapl-frontend/src/hellow/components/HelloWorld.vue
  12. 10
      sapl-frontend/src/hellow/main.js
  13. 6
      sapl-frontend/src/hellow/router.js
  14. 6
      sapl-frontend/src/hellow/store.js
  15. 4
      sapl-frontend/src/hellow/views/Home.vue
  16. 23
      sapl-frontend/vue.config.js
  17. 29
      sapl/compilacao/forms.py
  18. 3
      sapl/crispy_layout_mixin.py

14
sapl-frontend/.eslintrc.js

@ -6,25 +6,25 @@ module.exports = {
jquery: true jquery: true
}, },
extends: [ extends: [
"plugin:vue/essential", 'plugin:vue/essential',
'standard' 'standard'
], ],
rules: { rules: {
'generator-star-spacing': 'off', 'generator-star-spacing': 'off',
"no-console": process.env.NODE_ENV === "production" ? "error" : "off", 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
"no-debugger": process.env.NODE_ENV === "production" ? "error" : "off" 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
}, },
// required to lint *.vue files // required to lint *.vue files
plugins: [ plugins: [
'vue' 'vue'
], ],
parserOptions: { parserOptions: {
parser: "babel-eslint" parser: 'babel-eslint'
}, },
globals: { globals: {
"$": true, '$': true,
"jQuery": true, 'jQuery': true,
'_': true '_': true
} }
}; }

4
sapl-frontend/babel.config.js

@ -1,3 +1,3 @@
module.exports = { module.exports = {
presets: ["@vue/app"] presets: ['@vue/app']
}; }

2
sapl-frontend/postcss.config.js

@ -2,4 +2,4 @@ module.exports = {
plugins: { plugins: {
autoprefixer: {} autoprefixer: {}
} }
}; }

753
sapl-frontend/src/apps/compilacao/js/old/compilacao_edit.js

@ -1,610 +1,563 @@
function DispositivoEdit() { function DispositivoEdit () {
// Função única - Singleton pattern - operador new sempre devolve o mesmo objeto // Função única - Singleton pattern - operador new sempre devolve o mesmo objeto
var instance; var instance
var editortype = "textarea"; var editortype = 'textarea'
if (!(this instanceof DispositivoEdit)) { if (!(this instanceof DispositivoEdit)) {
if (!instance) { if (!instance) {
instance = new DispositivoEdit(); instance = new DispositivoEdit()
} }
return instance; return instance
}
instance = this
DispositivoEdit = function () {
return instance
} }
instance = this;
DispositivoEdit = function() {
return instance;
};
instance.bindActionsEditorType = function(event) { instance.bindActionsEditorType = function (event) {
editortype = this.getAttribute('editortype'); editortype = this.getAttribute('editortype')
SetCookie("editortype", editortype, 30); SetCookie('editortype', editortype, 30)
var dpt = $(this).closest('.dpt'); var dpt = $(this).closest('.dpt')
var pk = dpt.attr('pk'); var pk = dpt.attr('pk')
instance.clearEditSelected(); instance.clearEditSelected()
instance.triggerBtnDptEdit(pk); instance.triggerBtnDptEdit(pk)
} }
instance.bindActionsClick = function(event) { instance.bindActionsClick = function (event) {
var pk = this.getAttribute('pk'); var pk = this.getAttribute('pk')
var form_data = { var form_data = {
'action' : this.getAttribute('action'), 'action': this.getAttribute('action'),
'tipo_pk' : this.getAttribute('tipo_pk'), 'tipo_pk': this.getAttribute('tipo_pk'),
'perfil_pk' : this.getAttribute('perfil_pk'), 'perfil_pk': this.getAttribute('perfil_pk'),
'variacao' : this.getAttribute('variacao'), 'variacao': this.getAttribute('variacao'),
'pk_bloco' : this.getAttribute('pk_bloco'), 'pk_bloco': this.getAttribute('pk_bloco')
}; }
var url = pk+'/refresh'; var url = pk + '/refresh'
instance.waitShow(); instance.waitShow()
$.get(url, form_data).done(function(data) { $.get(url, form_data).done(function (data) {
instance.clearEditSelected(); instance.clearEditSelected()
if (data.pk != null) { if (data.pk != null) {
instance.message(data); instance.message(data)
} }
}).fail(instance.waitHide).always(instance.waitHide); }).fail(instance.waitHide).always(instance.waitHide)
} }
instance.clearEditSelected = function() { instance.clearEditSelected = function () {
$('.dpt-selected > .dpt-form').html(''); $('.dpt-selected > .dpt-form').html('')
$('.dpt-actions, .dpt-actions-bottom').html(''); $('.dpt-actions, .dpt-actions-bottom').html('')
tinymce.remove(); tinymce.remove()
$('.dpt-selected').removeClass('dpt-selected'); $('.dpt-selected').removeClass('dpt-selected')
} }
instance.editDispositivo = function(event) { instance.editDispositivo = function (event) {
var obj_click = (event.target.classList.contains('dpt-link') var obj_click = (event.target.classList.contains('dpt-link')
? event.target ? event.target
: (event.target.parentElement.classList.contains('dpt-link') : (event.target.parentElement.classList.contains('dpt-link')
? event.target.parentElement ? event.target.parentElement
: null)); : null))
if (obj_click && obj_click.getAttribute('href') && obj_click.getAttribute('href').length > 0) if (obj_click && obj_click.getAttribute('href') && obj_click.getAttribute('href').length > 0) { return }
return;
var dpt = $(this).closest('.dpt'); var dpt = $(this).closest('.dpt')
if (dpt.hasClass('dpt-selected')) { if (dpt.hasClass('dpt-selected')) {
if (this.getAttribute('action') == 'editor-close') if (this.getAttribute('action') == 'editor-close') { instance.clearEditSelected() }
instance.clearEditSelected(); return
return;
} }
instance.clearEditSelected(); instance.clearEditSelected()
instance.loadActionsEdit(dpt); instance.loadActionsEdit(dpt)
var formtype = dpt.attr('formtype'); var formtype = dpt.attr('formtype')
dpt.on(formtype, instance[formtype]); dpt.on(formtype, instance[formtype])
instance.loadForm(dpt, formtype); instance.loadForm(dpt, formtype)
} }
instance.gc = function() { instance.gc = function () {
setTimeout(function() { setTimeout(function () {
$('.dpt:not(.dpt-selected) > .dpt-form').html(''); $('.dpt:not(.dpt-selected) > .dpt-form').html('')
},500); }, 500)
} }
instance.get_form_base = function () { instance.get_form_base = function () {
var _this = $(this); var _this = $(this)
_this.addClass('dpt-selected'); _this.addClass('dpt-selected')
var dpt_form = _this.children().filter('.dpt-form'); var dpt_form = _this.children().filter('.dpt-form')
dpt_form.find('form').submit(instance.onSubmitEditFormBase); dpt_form.find('form').submit(instance.onSubmitEditFormBase)
instance.scrollTo(_this); instance.scrollTo(_this)
_this.off('get_form_base') _this.off('get_form_base')
var btn_fechar = _this.find('.btn-fechar'); var btn_fechar = _this.find('.btn-fechar')
btn_fechar.on('click', function() { btn_fechar.on('click', function () {
instance.clearEditSelected(); instance.clearEditSelected()
}); })
var btns_excluir = _this.find('.btns-excluir'); var btns_excluir = _this.find('.btns-excluir')
_this.find('.dpt-actions-bottom').first().append(btns_excluir); _this.find('.dpt-actions-bottom').first().append(btns_excluir)
btns_excluir.find('.btn-outline-danger').on('click', instance.bindActionsClick); btns_excluir.find('.btn-outline-danger').on('click', instance.bindActionsClick)
} }
instance.get_form_alteracao = function () { instance.get_form_alteracao = function () {
var _this = $(this); var _this = $(this)
_this.off('get_form_alteracao'); _this.off('get_form_alteracao')
$('.dpt-actions, .dpt-actions-bottom').html(''); $('.dpt-actions, .dpt-actions-bottom').html('')
var dpt_form = _this.children().filter('.dpt-form').children().first(); var dpt_form = _this.children().filter('.dpt-form').children().first()
var url_search = dpt_form[0]['id_dispositivo_search_form'].value; var url_search = dpt_form[0]['id_dispositivo_search_form'].value
DispositivoSearch({ DispositivoSearch({
'url_form': url_search, 'url_form': url_search,
'text_button': 'Selecionar' 'text_button': 'Selecionar'
}); })
instance.scrollTo(_this); instance.scrollTo(_this)
dpt_form.submit(instance.onSubmitFormRegistraAlteracao); dpt_form.submit(instance.onSubmitFormRegistraAlteracao)
var btn_fechar = _this.find('.btn-fechar'); var btn_fechar = _this.find('.btn-fechar')
btn_fechar.on('click', function() { btn_fechar.on('click', function () {
instance.clearEditSelected(); instance.clearEditSelected()
instance.triggerBtnDptEdit(_this.attr('pk')); instance.triggerBtnDptEdit(_this.attr('pk'))
}); })
} }
instance.get_form_inclusao = function () { instance.get_form_inclusao = function () {
var _this = $(this); var _this = $(this)
_this.off('get_form_inclusao'); _this.off('get_form_inclusao')
$('.dpt-actions, .dpt-actions-bottom').html(''); $('.dpt-actions, .dpt-actions-bottom').html('')
var dpt_form = _this.children().filter('.dpt-form').children().first(); var dpt_form = _this.children().filter('.dpt-form').children().first()
var url_search = dpt_form[0]['id_dispositivo_search_form'].value; var url_search = dpt_form[0]['id_dispositivo_search_form'].value
DispositivoSearch({ DispositivoSearch({
'url_form': url_search, 'url_form': url_search,
'text_button': 'Selecionar', 'text_button': 'Selecionar',
'post_selected': instance.allowed_inserts_registro_inclusao, 'post_selected': instance.allowed_inserts_registro_inclusao,
'params_post_selected': {'pk_bloco': _this.attr('pk')} 'params_post_selected': { 'pk_bloco': _this.attr('pk') }
}); })
instance.scrollTo(_this); instance.scrollTo(_this)
dpt_form.submit(instance.onSubmitFormRegistraInclusao); dpt_form.submit(instance.onSubmitFormRegistraInclusao)
var btn_fechar = _this.find('.btn-fechar'); var btn_fechar = _this.find('.btn-fechar')
btn_fechar.on('click', function() { btn_fechar.on('click', function () {
instance.clearEditSelected(); instance.clearEditSelected()
instance.triggerBtnDptEdit(_this.attr('pk')); instance.triggerBtnDptEdit(_this.attr('pk'))
}); })
} }
instance.get_form_revogacao = function () { instance.get_form_revogacao = function () {
var _this = $(this); var _this = $(this)
_this.off('get_form_revogacao'); _this.off('get_form_revogacao')
$('.dpt-actions, .dpt-actions-bottom').html(''); $('.dpt-actions, .dpt-actions-bottom').html('')
var dpt_form = _this.children().filter('.dpt-form').children().first(); var dpt_form = _this.children().filter('.dpt-form').children().first()
var url_search = dpt_form[0]['id_dispositivo_search_form'].value; var url_search = dpt_form[0]['id_dispositivo_search_form'].value
DispositivoSearch({ DispositivoSearch({
'url_form': url_search, 'url_form': url_search,
'text_button': 'Selecionar' 'text_button': 'Selecionar'
}); })
instance.scrollTo(_this)
dpt_form.submit(instance.onSubmitFormRegistraRevogacao)
instance.scrollTo(_this); var btn_fechar = _this.find('.btn-fechar')
dpt_form.submit(instance.onSubmitFormRegistraRevogacao); btn_fechar.on('click', function () {
instance.clearEditSelected()
instance.triggerBtnDptEdit(_this.attr('pk'))
})
}
instance.allowed_inserts_registro_inclusao = function (params) {
var dispositivo_base_para_inclusao = $('#id' + params.pk_bloco + " input[name='dispositivo_base_para_inclusao']")
if (dispositivo_base_para_inclusao.length == 0) { return }
var btn_fechar = _this.find('.btn-fechar'); var pk = dispositivo_base_para_inclusao[0].value
btn_fechar.on('click', function() { var form_data = {
instance.clearEditSelected(); 'action': 'get_actions_allowed_inserts_registro_inclusao',
instance.triggerBtnDptEdit(_this.attr('pk')); 'pk_bloco': params.pk_bloco
});
} }
instance.allowed_inserts_registro_inclusao = function(params) { var url = pk + '/refresh'
instance.waitShow()
var dispositivo_base_para_inclusao = $("#id"+params.pk_bloco+" input[name='dispositivo_base_para_inclusao']") $.get(url, form_data).done(function (data) {
if (dispositivo_base_para_inclusao.length == 0) $('.allowed_inserts').html(data)
return; $('.allowed_inserts').find('.btn-action').on('click', instance.bindActionsClick)
}).fail(instance.waitHide).always(instance.waitHide)
}
var pk = dispositivo_base_para_inclusao[0].value; instance.loadActionsEdit = function (dpt) {
var form_data = { var pk = dpt.attr('pk')
'action' : 'get_actions_allowed_inserts_registro_inclusao', var url = pk + '/refresh?action=get_actions'
'pk_bloco' : params.pk_bloco $.get(url).done(function (data) {
}; dpt.find('.dpt-actions').first().html(data)
dpt.find('.btn-action').on('click', instance.bindActionsClick)
var url = pk+'/refresh'; // dpt.find('.btn-perfis').on('click', instance.bindActionsClick);
instance.waitShow(); dpt.find('.btn-compila').on('click', instance.loadFormsCompilacao)
dpt.find('.btn-editor-type').on('click', instance.bindActionsEditorType)
$.get(url, form_data).done(function(data) {
$(".allowed_inserts").html(data); if (editortype == 'construct') { dpt.find('.btn-group-inserts').first().addClass('open') }
$(".allowed_inserts").find('.btn-action').on('click', instance.bindActionsClick);
}).fail(instance.waitHide).always(instance.waitHide); dpt.find('.btn-group-inserts button').mouseenter(function (event) {
} dpt.find('.btn-group-inserts').removeClass('open')
instance.loadActionsEdit = function(dpt) {
var pk = dpt.attr('pk');
var url = pk+'/refresh?action=get_actions';
$.get(url).done(function(data) {
dpt.find('.dpt-actions').first().html(data);
dpt.find('.btn-action').on('click', instance.bindActionsClick);
//dpt.find('.btn-perfis').on('click', instance.bindActionsClick);
dpt.find('.btn-compila').on('click', instance.loadFormsCompilacao);
dpt.find('.btn-editor-type').on('click', instance.bindActionsEditorType);
if (editortype == 'construct')
dpt.find('.btn-group-inserts').first().addClass('open');
dpt.find('.btn-group-inserts button').mouseenter(function(event) {
dpt.find('.btn-group-inserts').removeClass('open');
$(this.parentElement).addClass('open') $(this.parentElement).addClass('open')
}); })
instance.gc(); instance.gc()
}); })
} }
instance.loadForm = function(dpt, trigger) { instance.loadForm = function (dpt, trigger) {
var pk = dpt.attr('pk'); var pk = dpt.attr('pk')
var dpt_form = dpt.children().filter('.dpt-form'); var dpt_form = dpt.children().filter('.dpt-form')
if (dpt_form.length == 1) { if (dpt_form.length == 1) {
var url = pk+'/refresh?action='+trigger; var url = pk + '/refresh?action=' + trigger
$.get(url).done(function(data) { $.get(url).done(function (data) {
if (editortype != "construct") { if (editortype != 'construct') {
dpt_form.html(data); dpt_form.html(data)
if (editortype == 'tinymce' ) { if (editortype == 'tinymce') {
initTextRichEditor(); initTextRichEditor()
} }
//OptionalCustomFrontEnd().init(); OptionalCustomFrontEnd().init()
} }
dpt.trigger(trigger); dpt.trigger(trigger)
}).always(function() { }).always(function () {
instance.waitHide(); instance.waitHide()
}); })
} }
} }
instance.loadFormsCompilacao = function(event) { instance.loadFormsCompilacao = function (event) {
var dpt = $(this).closest('.dpt'); var dpt = $(this).closest('.dpt')
var formtype = this.getAttribute('action'); var formtype = this.getAttribute('action')
dpt.on(formtype, instance[formtype]); dpt.on(formtype, instance[formtype])
instance.loadForm(dpt, formtype); instance.loadForm(dpt, formtype)
} }
instance.modalMessage = function(message, alert, closeFunction) { instance.modalMessage = function (message, alert, closeFunction) {
if (message != null && message != '') { if (message != null && message != '') {
$('#modal-message #message').html(message); $('#modal-message #message').html(message)
$('#modal-message').modal('show'); $('#modal-message').modal('show')
$('#modal-message, #modal-message .alert button').off(); $('#modal-message, #modal-message .alert button').off()
$('#modal-message .alert').removeClass('alert-success alert-info alert-warning alert-danger alert-danger'); $('#modal-message .alert').removeClass('alert-success alert-info alert-warning alert-danger alert-danger')
$('#modal-message .alert').addClass(alert); $('#modal-message .alert').addClass(alert)
if (closeFunction != null) if (closeFunction != null) { $('#modal-message').on('hidden.bs.modal', closeFunction) }
$('#modal-message').on('hidden.bs.modal', closeFunction);
$('#modal-message .alert button').on('click', function() { $('#modal-message .alert button').on('click', function () {
$('#modal-message').modal('hide'); $('#modal-message').modal('hide')
}); })
return true; return true
} }
return false; return false
} }
instance.message = function(data) { instance.message = function (data) {
if (data.message !== undefined) { if (data.message !== undefined) {
if (data.message.modal) { if (data.message.modal) {
instance.modalMessage(data.message.value, 'alert-'+data.message.type, function() { instance.modalMessage(data.message.value, 'alert-' + data.message.type, function () {
instance.waitShow(); instance.waitShow()
instance.refreshScreenFocusPk(data); instance.refreshScreenFocusPk(data)
}); })
return; } else {
} instance.refreshScreenFocusPk(data)
else { if (!('message' in data)) { return }
instance.refreshScreenFocusPk(data); var cp_notify = $('.cp-notify')
if (!('message' in data))
return;
var cp_notify = $(".cp-notify")
cp_notify.removeClass('hide') cp_notify.removeClass('hide')
var msg = cp_notify.find('.message'); var msg = cp_notify.find('.message')
msg.text(data.message.value); msg.text(data.message.value)
msg.removeClass('bg-primary bg-success bg-info bg-warning bg-danger').addClass('bg-'+data.message.type); msg.removeClass('bg-primary bg-success bg-info bg-warning bg-danger').addClass('bg-' + data.message.type)
setTimeout(function() { setTimeout(function () {
cp_notify.addClass('hide'); cp_notify.addClass('hide')
}, (data.message.time?data.message.time: 3000)); }, (data.message.time ? data.message.time : 3000))
} }
} else {
instance.refreshScreenFocusPk(data)
} }
else {
instance.refreshScreenFocusPk(data);
} }
} instance.offClicks = function () {
instance.offClicks = function() {
$('.btn-dpt-edit').off() $('.btn-dpt-edit').off()
} }
instance.onClicks = function(container) { instance.onClicks = function (container) {
var objects; var objects
if (container == null) if (container == null) { objects = $('.btn-dpt-edit') } else { objects = $(container).find('.btn-dpt-edit') }
objects = $('.btn-dpt-edit'); objects.on('click', instance.editDispositivo)
else
objects = $(container).find('.btn-dpt-edit');
objects.on('click', instance.editDispositivo);
} }
instance.onSubmitFormRegistraAlteracao = function(event) { instance.onSubmitFormRegistraAlteracao = function (event) {
var _this = this; var _this = this
if (this.dispositivo_alterado === undefined) { if (this.dispositivo_alterado === undefined) {
instance.modalMessage('Nenhum dispositivo selecionado', 'alert-info') instance.modalMessage('Nenhum dispositivo selecionado', 'alert-info')
if (event != null) if (event != null) { event.preventDefault() }
event.preventDefault();
return return
} }
var dispositivo_alterado = this.dispositivo_alterado.length === undefined ? [this.dispositivo_alterado, ] : Array.from(this.dispositivo_alterado) var dispositivo_alterado = this.dispositivo_alterado.length === undefined ? [this.dispositivo_alterado ] : Array.from(this.dispositivo_alterado)
var form_data = { var form_data = {
'csrfmiddlewaretoken' : this.csrfmiddlewaretoken.value, 'csrfmiddlewaretoken': this.csrfmiddlewaretoken.value,
'dispositivo_alterado' : dispositivo_alterado.filter( 'dispositivo_alterado': dispositivo_alterado.filter(
function(elem, idx, array) { function (elem, idx, array) {
return elem.checked return elem.checked
} }
).map(function(dsp) { ).map(function (dsp) {
return dsp.value return dsp.value
}), }),
'formtype': 'get_form_alteracao', 'formtype': 'get_form_alteracao'
}; }
var url = $(this).closest('.dpt').attr( "pk" )+'/refresh'; var url = $(this).closest('.dpt').attr('pk') + '/refresh'
instance.waitShow(); instance.waitShow()
$.post(url, form_data, dataType="json") $.post(url, form_data, dataType = 'json')
.done(function(data) { .done(function (data) {
instance.clearEditSelected(); instance.clearEditSelected()
if (data.pk != null) { if (data.pk != null) {
instance.message(data); instance.message(data)
} } else {
else { alert('Erro na resposta!')
alert('Erro na resposta!');
} }
}).always(function () {
}).always(function() { instance.waitHide()
instance.waitHide(); })
}); if (event != null) { event.preventDefault() }
if (event != null)
event.preventDefault();
} }
instance.onSubmitFormRegistraInclusao = function(event) { instance.onSubmitFormRegistraInclusao = function (event) {
var _this = this; var _this = this
var form_data = { var form_data = {
'csrfmiddlewaretoken' : this['csrfmiddlewaretoken'].value, 'csrfmiddlewaretoken': this['csrfmiddlewaretoken'].value,
'dispositivo_base_para_inclusao' : this['dispositivo_base_para_inclusao'].value, 'dispositivo_base_para_inclusao': this['dispositivo_base_para_inclusao'].value,
'formtype': 'get_form_inclusao', 'formtype': 'get_form_inclusao'
}; }
var url = $(this).closest('.dpt').attr( "pk" )+'/refresh'; var url = $(this).closest('.dpt').attr('pk') + '/refresh'
instance.waitShow(); instance.waitShow()
$.post(url, form_data) $.post(url, form_data)
.done(function(data) { .done(function (data) {
instance.clearEditSelected(); instance.clearEditSelected()
if (data.pk != null) { if (data.pk != null) {
instance.message(data); instance.message(data)
} else {
alert('Erro na resposta!')
} }
else { }).always(function () {
alert('Erro na resposta!'); instance.waitHide()
})
if (event != null) { event.preventDefault() }
} }
}).always(function() { instance.onSubmitFormRegistraRevogacao = function (event) {
instance.waitHide(); var _this = this
});
if (event != null)
event.preventDefault();
}
instance.onSubmitFormRegistraRevogacao = function(event) {
var _this = this;
if (this.dispositivo_revogado === undefined) { if (this.dispositivo_revogado === undefined) {
instance.modalMessage('Nenhum dispositivo selecionado', 'alert-info') instance.modalMessage('Nenhum dispositivo selecionado', 'alert-info')
if (event != null) if (event != null) { event.preventDefault() }
event.preventDefault();
return return
} }
var dispositivo_revogado = this.dispositivo_revogado.length === undefined ? [this.dispositivo_revogado, ] : Array.from(this.dispositivo_revogado) var dispositivo_revogado = this.dispositivo_revogado.length === undefined ? [this.dispositivo_revogado ] : Array.from(this.dispositivo_revogado)
var form_data = { var form_data = {
'csrfmiddlewaretoken' : this.csrfmiddlewaretoken.value, 'csrfmiddlewaretoken': this.csrfmiddlewaretoken.value,
'dispositivo_revogado' : dispositivo_revogado.filter( 'dispositivo_revogado': dispositivo_revogado.filter(
function(elem, idx, array) { function (elem, idx, array) {
return elem.checked return elem.checked
} }
).map(function(dsp) { ).map(function (dsp) {
return dsp.value return dsp.value
}), }),
'revogacao_em_bloco': this.revogacao_em_bloco.value, 'revogacao_em_bloco': this.revogacao_em_bloco.value,
'formtype': 'get_form_revogacao', 'formtype': 'get_form_revogacao'
}; }
var url = $(this).closest('.dpt').attr( "pk" )+'/refresh'; var url = $(this).closest('.dpt').attr('pk') + '/refresh'
instance.waitShow(); instance.waitShow()
$.post(url, form_data) $.post(url, form_data)
.done(function(data) { .done(function (data) {
instance.clearEditSelected(); instance.clearEditSelected()
if (data.pk != null) { if (data.pk != null) {
instance.message(data); instance.message(data)
} else {
alert('Erro na resposta!')
} }
else { }).always(function () {
alert('Erro na resposta!'); instance.waitHide()
})
if (event != null) { event.preventDefault() }
} }
}).always(function() { instance.onSubmitEditFormBase = function (event) {
instance.waitHide(); var _this = this
}); var texto = ''
if (event != null) var texto_atualizador = ''
event.preventDefault(); var visibilidade = ''
} var editor_tiny_texto = tinymce.get('id_texto')
var editor_tiny_texto_atualizador = tinymce.get('id_texto_atualizador')
instance.onSubmitEditFormBase = function(event) { if (editor_tiny_texto != null) { texto = editor_tiny_texto.getContent() } else { texto = this['id_texto'].value }
var _this = this; if (editor_tiny_texto_atualizador != null) { texto_atualizador = editor_tiny_texto_atualizador.getContent() } else if ('id_texto_atualizador' in this) { texto_atualizador = this['id_texto_atualizador'].value }
var texto = '';
var texto_atualizador = '';
var visibilidade = '';
var editor_tiny_texto = tinymce.get('id_texto');
var editor_tiny_texto_atualizador = tinymce.get('id_texto_atualizador');
if (editor_tiny_texto != null) if ('visibilidade' in this) { visibilidade = this['visibilidade'].value }
texto = editor_tiny_texto.getContent();
else
texto = this['id_texto'].value;
if (editor_tiny_texto_atualizador != null)
texto_atualizador = editor_tiny_texto_atualizador.getContent();
else if ('id_texto_atualizador' in this)
texto_atualizador = this['id_texto_atualizador'].value;
if ('visibilidade' in this)
visibilidade = this['visibilidade'].value;
var form_data = { var form_data = {
'csrfmiddlewaretoken' : this['csrfmiddlewaretoken'].value, 'csrfmiddlewaretoken': this['csrfmiddlewaretoken'].value,
'texto' : texto, 'texto': texto,
'texto_atualizador' : texto_atualizador, 'texto_atualizador': texto_atualizador,
'visibilidade' : visibilidade, 'visibilidade': visibilidade,
'formtype': 'get_form_base', 'formtype': 'get_form_base'
}; }
var url = $(this).closest('.dpt').attr( "pk" )+'/refresh'; var url = $(this).closest('.dpt').attr('pk') + '/refresh'
instance.waitShow(); instance.waitShow()
$.post(url, form_data) $.post(url, form_data)
.done(function(data) { .done(function (data) {
if (typeof data == "string") { /* if obsoleto */ if (typeof data === 'string') { /* if obsoleto */
var dpt = $(_this).closest('.dpt'); var dpt = $(_this).closest('.dpt')
dpt = $('#'+dpt.replaceWith(data).attr('id')); dpt = $('#' + dpt.replaceWith(data).attr('id'))
instance.onClicks(dpt); instance.onClicks(dpt)
instance.waitHide(); instance.waitHide()
return; return
} }
instance.clearEditSelected(); instance.clearEditSelected()
if (data.pk != null) { if (data.pk != null) {
instance.message(data); instance.message(data)
} else {
alert('Erro na resposta!')
} }
else { }).always(function () {
alert('Erro na resposta!'); instance.waitHide()
})
if (event != null) { event.preventDefault() }
} }
instance.refreshContent = function (pais, trigger_edit_pk) {
}).always(function() {
instance.waitHide();
});
if (event != null)
event.preventDefault();
}
instance.refreshContent = function(pais, trigger_edit_pk) {
if (pais.length == 0) { if (pais.length == 0) {
instance.waitHide(); instance.waitHide()
return; return
} }
var pk = pais.shift(); var pk = pais.shift()
var url = pk+'/refresh'; var url = pk + '/refresh'
$.get(url).done(function(data) { $.get(url).done(function (data) {
var dpt = $('#id'+pk).closest('.dpt'); var dpt = $('#id' + pk).closest('.dpt')
dpt = $('#'+dpt.replaceWith(data).attr('id')); dpt = $('#' + dpt.replaceWith(data).attr('id'))
instance.onClicks(dpt); instance.onClicks(dpt)
instance.reloadFunctionsDraggables(); instance.reloadFunctionsDraggables()
if (trigger_edit_pk > 0) if (trigger_edit_pk > 0) { instance.triggerBtnDptEdit(trigger_edit_pk) }
instance.triggerBtnDptEdit(trigger_edit_pk)
instance.refreshContent(pais); instance.refreshContent(pais)
}); })
} }
instance.refreshScreenFocusPk = function (data) { instance.refreshScreenFocusPk = function (data) {
instance.waitShow(); instance.waitShow()
if (data.pai[0] == -1) { if (data.pai[0] == -1) {
instance.waitShow() instance.waitShow()
href = location.href.split('#')[0] href = location.href.split('#')[0]
location.href = href+'#'+data.pk; location.href = href + '#' + data.pk
location.reload(true) location.reload(true)
} } else {
else { instance.refreshContent(data.pai, data.pk)
instance.refreshContent(data.pai, data.pk);
/*setTimeout(function() { /* setTimeout(function() {
for (var pai = 1; pai < data.pai.length; pai++) for (var pai = 1; pai < data.pai.length; pai++)
instance.refreshContent(data.pai[pai]); instance.refreshContent(data.pai[pai]);
instance.waitHide(); instance.waitHide();
}, 1000);*/ }, 1000); */
} }
} }
instance.reloadFunctionsDraggables = function() { instance.reloadFunctionsDraggables = function () {
$( ".dpt-alts" ).sortable({ $('.dpt-alts').sortable({
revert: true, revert: true,
distance: 15, distance: 15,
start: function( event, ui ) { start: function (event, ui) {
} },
, stop: function (event, ui) {
stop: function( event, ui ) { var pk = ui.item.attr('pk')
var pk = ui.item.attr('pk'); var bloco_pk = ui.item.closest('.dpt-alts').closest('.dpt').attr('pk')
var bloco_pk = ui.item.closest('.dpt-alts').closest('.dpt').attr('pk');
var url = pk+'/refresh?action=json_drag_move_dpt_alterado&index='+ui.item.index()+'&bloco_pk='+bloco_pk; var url = pk + '/refresh?action=json_drag_move_dpt_alterado&index=' + ui.item.index() + '&bloco_pk=' + bloco_pk
$.get(url).done(function( data ) { $.get(url).done(function (data) {
console.log(pk+ ' - '+ bloco_pk); console.log(pk + ' - ' + bloco_pk)
//reloadFunctionsForObjectsOfCompilacao(); // reloadFunctionsForObjectsOfCompilacao();
}); })
} }
}); })
$( ".dpt-alts .dpt" ).draggable({ $('.dpt-alts .dpt').draggable({
connectToSortable: ".dpt-alts", connectToSortable: '.dpt-alts',
revert: 'invalid', revert: 'invalid',
zIndex: 1, zIndex: 1,
distance: 15, distance: 15,
drag: function( event, ui ) { drag: function (event, ui) {
//$('.dpt-comp-selected').removeClass('dpt-comp-selected'); // $('.dpt-comp-selected').removeClass('dpt-comp-selected');
$(".dpt-alts").addClass('drag'); $('.dpt-alts').addClass('drag')
},
stop: function( event, ui ) {
$(".dpt-alts").removeClass('drag');
}, },
}); stop: function (event, ui) {
$('.dpt-alts').removeClass('drag')
}
})
$(".dpt-alts").disableSelection(); $('.dpt-alts').disableSelection()
} }
instance.scrollTo = function(dpt) { instance.scrollTo = function (dpt) {
try { try {
$('html, body').animate({ $('html, body').animate({
scrollTop: dpt.offset().top - window.innerHeight / 9 scrollTop: dpt.offset().top - window.innerHeight / 9
}, 100); }, 100)
} catch (err) {
} }
catch(err) {
} }
instance.triggerBtnDptEdit = function (pk) {
var btn_dpt_edit = $('#id' + pk + ' > .dpt-text.btn-dpt-edit')
if (btn_dpt_edit.length == 0) { btn_dpt_edit = $('#id' + pk + ' > .dpt-actions-fixed > .btn-dpt-edit') }
btn_dpt_edit.trigger('click')
} }
instance.triggerBtnDptEdit =function(pk) { instance.waitHide = function () {
var btn_dpt_edit = $('#id'+pk + ' > .dpt-text.btn-dpt-edit'); $('#wait_message').addClass('displaynone')
if (btn_dpt_edit.length == 0)
btn_dpt_edit = $('#id'+pk + ' > .dpt-actions-fixed > .btn-dpt-edit');
btn_dpt_edit.trigger( "click" );
} }
instance.waitHide = function() { instance.waitShow = function () {
$("#wait_message").addClass("displaynone"); $('#wait_message').removeClass('displaynone')
} }
instance.waitShow = function() {
$("#wait_message").removeClass("displaynone");
}
instance.init = function() { instance.init = function () {
$('.dpt-actions-fixed').first().css('opacity','1'); $('.dpt-actions-fixed').first().css('opacity', '1')
editortype = ReadCookie("editortype"); editortype = ReadCookie('editortype')
if (editortype == null || editortype == '') { if (editortype == null || editortype == '') {
editortype = "textarea" editortype = 'textarea'
SetCookie("editortype", editortype, 30) SetCookie('editortype', editortype, 30)
} }
//editortype = "textarea"; // editortype = "textarea";
instance.offClicks(); instance.offClicks()
instance.onClicks(); instance.onClicks()
instance.reloadFunctionsDraggables(); instance.reloadFunctionsDraggables()
href = location.href.split('#') href = location.href.split('#')
if (href.length == 2 && href[1] != '') { if (href.length == 2 && href[1] != '') {
instance.triggerBtnDptEdit(href[1]) instance.triggerBtnDptEdit(href[1])
} }
$('main').click(function(event) { $('main').click(function (event) {
if (event.target == this || event.target == this.firstElementChild) if (event.target == this || event.target == this.firstElementChild) { instance.clearEditSelected() }
instance.clearEditSelected(); })
}); instance.waitHide()
instance.waitHide();
} }
instance.init(); instance.init()
} }
$(document).ready(function () {
$(document).ready(function() { DispositivoEdit()
})
DispositivoEdit();
});

4
sapl-frontend/src/apps/compilacao/js/old/compilacao_notas.js

@ -32,11 +32,11 @@ function onSubmitEditNVForm (event) {
let url = '' let url = ''
let model = 'nota' let model = 'nota'
let idEdit = null let idEdit = null
let idDispositivo = $('#idDispositivo').val() let idDispositivo = $('#id_dispositivo').val()
if (idDispositivo === null) { // trata-se de um vide if (idDispositivo === null) { // trata-se de um vide
// $('#idDispositivo_ref').remove() // $('#idDispositivo_ref').remove()
idDispositivo = $('#idDispositivo_base').val() idDispositivo = $('#id_dispositivo_base').val()
model = 'vide' model = 'vide'
} }

1
sapl-frontend/src/apps/compilacao/scss/compilacao.scss

@ -337,6 +337,7 @@ a:link:after, a:visited:after {
min-height: 2.5em; min-height: 2.5em;
&:hover { &:hover {
ul { ul {
font-size: 1rem;
transition: opacity 0.5s linear, clip 0s 0.3s; transition: opacity 0.5s linear, clip 0s 0.3s;
clip: auto; clip: auto;
opacity: 1; opacity: 1;

189
sapl-frontend/src/global/functions.js

@ -1,120 +1,121 @@
window.getCookie = function(name) { window.getCookie = function (name) {
var cookieValue = null; var cookieValue = null
if (document.cookie && document.cookie !== "") { if (document.cookie && document.cookie !== '') {
var cookies = document.cookie.split(";"); var cookies = document.cookie.split(';')
for (var i = 0; i < cookies.length; i++) { for (var i = 0; i < cookies.length; i++) {
var cookie = $.trim(cookies[i]); var cookie = $.trim(cookies[i])
if (cookie.substring(0, name.length + 1) === name + "=") { if (cookie.substring(0, name.length + 1) === name + '=') {
cookieValue = decodeURIComponent(cookie.substring(name.length + 1)); cookieValue = decodeURIComponent(cookie.substring(name.length + 1))
break; break
} }
} }
} }
return cookieValue; return cookieValue
}; }
window.autorModal = function() { window.autorModal = function () {
$(function() { $(function () {
var dialog = $("#modal_autor").dialog({ var dialog = $('#modal_autor').dialog({
autoOpen: false, autoOpen: false,
modal: true, modal: true,
width: 500, width: 500,
height: 340, height: 340,
show: { show: {
effect: "blind", effect: 'blind',
duration: 500 duration: 500
}, },
hide: { hide: {
effect: "explode", effect: 'explode',
duration: 500 duration: 500
} }
}); })
$("#button-id-limpar").click(function() { $('#button-id-limpar').click(function () {
$("#nome_autor").text(""); $('#nome_autor').text('')
function clean_if_exists(fieldname) { function clean_if_exists (fieldname) {
if ($(fieldname).length > 0) { if ($(fieldname).length > 0) {
$(fieldname).val(""); $(fieldname).val('')
} }
} }
clean_if_exists("#id_autor"); clean_if_exists('#id_autor')
clean_if_exists("#id_autoria__autor"); clean_if_exists('#id_autoria__autor')
}); })
$("#button-id-pesquisar").click(function() { $('#button-id-pesquisar').click(function () {
$("#q").val(""); $('#q').val('')
$("#div-resultado") $('#div-resultado')
.children() .children()
.remove(); .remove()
$("#modal_autor").dialog("open"); $('#modal_autor').dialog('open')
$("#selecionar").attr("hidden", "hidden"); $('#selecionar').attr('hidden', 'hidden')
}); })
$("#pesquisar").click(function() { $('#pesquisar').click(function () {
var name_in_query = $("#q").val(); var name_in_query = $('#q').val()
//var q_0 = "q_0=nome__icontains" // var q_0 = "q_0=nome__icontains"
//var q_1 = name_in_query // var q_1 = name_in_query
//query = q_1 // query = q_1
$.get("/api/autor?q=" + name_in_query, function(data) { $.get('/api/autor?q=' + name_in_query, function (data) {
$("#div-resultado") $('#div-resultado')
.children() .children()
.remove(); .remove()
if (data.pagination.total_entries == 0) { if (data.pagination.total_entries == 0) {
$("#selecionar").attr("hidden", "hidden"); $('#selecionar').attr('hidden', 'hidden')
$("#div-resultado").html( $('#div-resultado').html(
"<span class='alert'><strong>Nenhum resultado</strong></span>" "<span class='alert'><strong>Nenhum resultado</strong></span>"
); )
return; return
} }
var select = $( var select = $(
'<select id="resultados" style="min-width: 90%; max-width:90%;" size="5"/>' '<select id="resultados" style="min-width: 90%; max-width:90%;" size="5"/>'
); )
data.results.forEach(function(item) { data.results.forEach(function (item) {
select.append( select.append(
$("<option>") $('<option>')
.attr("value", item.value) .attr('value', item.value)
.text(item.text) .text(item.text)
); )
}); })
$("#div-resultado") $('#div-resultado')
.append("<br/>") .append('<br/>')
.append(select); .append(select)
$("#selecionar").removeAttr("hidden", "hidden"); $('#selecionar').removeAttr('hidden', 'hidden')
if (data.pagination.total_pages > 1) if (data.pagination.total_pages > 1) {
$("#div-resultado").prepend( $('#div-resultado').prepend(
"<span><br/>Mostrando 10 primeiros autores relativos a sua busca.<br/></span>" '<span><br/>Mostrando 10 primeiros autores relativos a sua busca.<br/></span>'
); )
}
$("#selecionar").click(function() { $('#selecionar').click(function () {
let res = $("#resultados option:selected"); let res = $('#resultados option:selected')
let id = res.val(); let id = res.val()
let nome = res.text(); let nome = res.text()
$("#nome_autor").text(nome); $('#nome_autor').text(nome)
// MateriaLegislativa pesquisa Autor via a tabela Autoria // MateriaLegislativa pesquisa Autor via a tabela Autoria
if ($("#id_autoria__autor").length) { if ($('#id_autoria__autor').length) {
$("#id_autoria__autor").val(id); $('#id_autoria__autor').val(id)
} }
// Protocolo pesquisa a própria tabela de Autor // Protocolo pesquisa a própria tabela de Autor
if ($("#id_autor").length) { if ($('#id_autor').length) {
$("#id_autor").val(id); $('#id_autor').val(id)
} }
dialog.dialog("close"); dialog.dialog('close')
}); })
}); })
}); })
}); })
/*function get_nome_autor(fieldname) { /* function get_nome_autor(fieldname) {
if ($(fieldname).length > 0) { // se campo existir if ($(fieldname).length > 0) { // se campo existir
if ($(fieldname).val() != "") { // e não for vazio if ($(fieldname).val() != "") { // e não for vazio
var id = $(fieldname).val(); var id = $(fieldname).val();
@ -126,22 +127,22 @@ window.autorModal = function() {
} }
get_nome_autor("#id_autor"); get_nome_autor("#id_autor");
get_nome_autor("#id_autoria__autor");*/ get_nome_autor("#id_autoria__autor"); */
}; }
window.refreshMask = function() { window.refreshMask = function () {
$(".telefone").mask("(99) 9999-9999", { placeholder: "(__) ____ -____" }); $('.telefone').mask('(99) 9999-9999', { placeholder: '(__) ____ -____' })
$(".cpf").mask("000.000.000-00", { placeholder: "___.___.___-__" }); $('.cpf').mask('000.000.000-00', { placeholder: '___.___.___-__' })
$(".cep").mask("00000-000", { placeholder: "_____-___" }); $('.cep').mask('00000-000', { placeholder: '_____-___' })
$(".rg").mask("0.000.000", { placeholder: "_.___.___" }); $('.rg').mask('0.000.000', { placeholder: '_.___.___' })
$(".titulo_eleitor").mask("0000.0000.0000.0000", { $('.titulo_eleitor').mask('0000.0000.0000.0000', {
placeholder: "____.____.____.____" placeholder: '____.____.____.____'
}); })
$(".dateinput").mask("00/00/0000", { placeholder: "__/__/____" }); $('.dateinput').mask('00/00/0000', { placeholder: '__/__/____' })
$(".hora, input[name=hora_inicio], input[name=hora_fim], input[name=hora]").mask("00:00", { $('.hora, input[name=hora_inicio], input[name=hora_fim], input[name=hora]').mask('00:00', {
placeholder: "hh:mm" placeholder: 'hh:mm'
}); })
$(".hora_hms").mask("00:00:00", { placeholder: "hh:mm:ss" }); $('.hora_hms').mask('00:00:00', { placeholder: 'hh:mm:ss' })
$(".timeinput").mask("00:00:00", { placeholder: "hh:mm:ss" }); $('.timeinput').mask('00:00:00', { placeholder: 'hh:mm:ss' })
$(".cronometro").mask("00:00:00", { placeholder: "hh:mm:ss" }); $('.cronometro').mask('00:00:00', { placeholder: 'hh:mm:ss' })
}; }

1725
sapl-frontend/src/global/image_cropping/js/jquery.Jcrop.js

File diff suppressed because it is too large

872
sapl-frontend/src/global/image_cropping/js/jquery.color.js

File diff suppressed because it is too large

4
sapl-frontend/src/global/main.js

@ -1,6 +1,4 @@
// eslint-disable-next-line // eslint-disable-next-line
require('imports-loader?window.jQuery=jquery!./jquery.runner.js')
import 'jquery-mask-plugin' import 'jquery-mask-plugin'
import 'webpack-jquery-ui/dialog' import 'webpack-jquery-ui/dialog'
@ -12,6 +10,8 @@ import './functions'
import './image_cropping' import './image_cropping'
require('imports-loader?window.jQuery=jquery!./jquery.runner.js')
window.jQuery = jQuery window.jQuery = jQuery
window.$ = jQuery window.$ = jQuery

4
sapl-frontend/src/hellow/components/HelloWorld.vue

@ -88,11 +88,11 @@
<script> <script>
export default { export default {
name: "HelloWorld", name: 'HelloWorld',
props: { props: {
msg: String msg: String
} }
}; }
</script> </script>
<!-- Add "scoped" attribute to limit CSS to this component only --> <!-- Add "scoped" attribute to limit CSS to this component only -->

10
sapl-frontend/src/hellow/main.js

@ -1,7 +1,7 @@
import Vue from "vue" import Vue from 'vue'
import App from "./App.vue" import App from './App.vue'
import router from "./router" import router from './router'
import store from "./store" import store from './store'
Vue.config.productionTip = false Vue.config.productionTip = false
@ -9,4 +9,4 @@ new Vue({
router, router,
store, store,
render: h => h(App) render: h => h(App)
}).$mount("#app") }).$mount('#app')

6
sapl-frontend/src/hellow/router.js

@ -1,10 +1,10 @@
import Vue from "vue" import Vue from 'vue'
import Router from "vue-router" import Router from 'vue-router'
Vue.use(Router) Vue.use(Router)
export default new Router({ export default new Router({
mode: "history", mode: 'history',
base: process.env.BASE_URL, base: process.env.BASE_URL,
routes: [] routes: []
}) })

6
sapl-frontend/src/hellow/store.js

@ -1,5 +1,5 @@
import Vue from "vue" import Vue from 'vue'
import Vuex from "vuex" import Vuex from 'vuex'
Vue.use(Vuex) Vue.use(Vuex)
@ -7,4 +7,4 @@ export default new Vuex.Store({
state: {}, state: {},
mutations: {}, mutations: {},
actions: {} actions: {}
}); })

4
sapl-frontend/src/hellow/views/Home.vue

@ -7,10 +7,10 @@
<script> <script>
// @ is an alias to /src // @ is an alias to /src
import HelloWorld from "@/hellow/components/HelloWorld.vue" import HelloWorld from '@/hellow/components/HelloWorld.vue'
export default { export default {
name: "home", name: 'home',
components: { components: {
HelloWorld HelloWorld
} }

23
sapl-frontend/vue.config.js

@ -5,14 +5,13 @@ const BundleTracker = require('webpack-bundle-tracker')
const dotenv = require('dotenv') const dotenv = require('dotenv')
dotenv.config({ path: '../sapl/.env' }) dotenv.config({ path: '../sapl/.env' })
var THEME_CUSTOM = process.env.THEME_CUSTOM === undefined ? "sapl-oficial-theme" : process.env.THEME_CUSTOM var THEME_CUSTOM = process.env.THEME_CUSTOM === undefined ? 'sapl-oficial-theme' : process.env.THEME_CUSTOM
module.exports = { module.exports = {
publicPath: 'http://localhost:8080/', publicPath: 'http://localhost:8080/',
outputDir: './dist/', outputDir: './dist/',
chainWebpack: config => { chainWebpack: config => {
config.optimization config.optimization
.splitChunks(false) .splitChunks(false)
@ -20,7 +19,7 @@ module.exports = {
.plugin('BundleTracker') .plugin('BundleTracker')
.use(BundleTracker, [{ filename: './webpack-stats.json' }]) .use(BundleTracker, [{ filename: './webpack-stats.json' }])
config.devtool = "source-map" config.devtool = 'source-map'
config.resolve.alias config.resolve.alias
.set('__STATIC__', 'static') .set('__STATIC__', 'static')
@ -31,14 +30,14 @@ module.exports = {
.port(8080) .port(8080)
.hot(true) .hot(true)
.watchOptions({ poll: true }) .watchOptions({ poll: true })
.watchContentBase( true ) .watchContentBase(true)
.https(false) .https(false)
.headers({ 'Access-Control-Allow-Origin': '\*' }) .headers({ 'Access-Control-Allow-Origin': '*' })
.contentBase( [ .contentBase([
path.join(__dirname, 'public'), path.join(__dirname, 'public'),
path.join(__dirname, 'src', 'assets'), path.join(__dirname, 'src', 'assets'),
path.join(__dirname, 'node_modules', THEME_CUSTOM, 'public'), path.join(__dirname, 'node_modules', THEME_CUSTOM, 'public')
] ) ])
config.entryPoints.delete('app') config.entryPoints.delete('app')
@ -52,10 +51,9 @@ module.exports = {
_: 'lodash' _: 'lodash'
}]) }])
config.entry(THEME_CUSTOM) config.entry(THEME_CUSTOM)
.add('./src/theme-dev/main.js') .add('./src/theme-dev/main.js')
//.add(THEME_CUSTOM + '/src/main.js') // .add(THEME_CUSTOM + '/src/main.js')
.end() .end()
config.entry('global') config.entry('global')
@ -66,12 +64,11 @@ module.exports = {
.add('./src/apps/compilacao/main.js') .add('./src/apps/compilacao/main.js')
.end() .end()
/*config /* config
.plugin('theme') .plugin('theme')
.use(webpack.DefinePlugin, [{ .use(webpack.DefinePlugin, [{
THEME_CUSTOM: JSON.stringify(THEME_CUSTOM) THEME_CUSTOM: JSON.stringify(THEME_CUSTOM)
}]) }])
.end()*/ .end() */
} }
} }

29
sapl/compilacao/forms.py

@ -23,7 +23,8 @@ from sapl.compilacao.models import (NOTAS_PUBLICIDADE_CHOICES,
TipoTextoArticulado, TipoVide, TipoTextoArticulado, TipoVide,
VeiculoPublicacao, Vide) VeiculoPublicacao, Vide)
from sapl.compilacao.utils import DISPOSITIVO_SELECT_RELATED from sapl.compilacao.utils import DISPOSITIVO_SELECT_RELATED
from sapl.crispy_layout_mixin import SaplFormLayout, to_column, to_row from sapl.crispy_layout_mixin import SaplFormLayout, to_column, to_row,\
form_actions
from sapl.utils import YES_NO_CHOICES from sapl.utils import YES_NO_CHOICES
error_messages = { error_messages = {
@ -256,19 +257,22 @@ class NotaForm(ModelForm):
]) ])
buttons = FormActions( buttons = FormActions(
HTML('<a class="btn btn-inverse btn-close-container">' *[
'%s</a>' % _('Cancelar')), HTML('<a href="" class="btn btn-dark '
'btn-close-container">%s</a>' % _('Cancelar'))
],
Button( Button(
'submit-form', 'submit-form',
'Salvar', 'Salvar',
css_class='btn btn-primary float-right') css_class='btn btn-primary float-right'),
css_class='form-group row justify-content-between mr-1 ml-1'
) )
self.helper = FormHelper() self.helper = FormHelper()
self.helper.layout = Layout( self.helper.layout = Layout(
Div( Div(
Div(HTML(_('Notas')), css_class='card-header bg-bg-light'), Div(HTML(_('Notas')), css_class='card-header bg-light'),
Div( Div(
row1, row1,
to_row([(Field( to_row([(Field(
@ -327,14 +331,13 @@ class VideForm(ModelForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
buttons = FormActions( buttons = form_actions(
HTML('<a class="btn btn-inverse btn-close-container">' label=_('Salvar'),
'%s</a>' % _('Cancelar')), more=[
Button( HTML('<a href="" class="btn btn-dark '
'submit-form', 'btn-close-container">%s</a>' % _('Cancelar'))
'Salvar', ],
css_class='btn-primary float-right') disabled=False)
)
dispositivo_ref = Field( dispositivo_ref = Field(
'dispositivo_ref', 'dispositivo_ref',

3
sapl/crispy_layout_mixin.py

@ -35,7 +35,8 @@ def to_fieldsets(fields):
def form_actions(more=[Div(css_class='clearfix')], def form_actions(more=[Div(css_class='clearfix')],
label=_('Salvar'), name='salvar', css_class='float-right', disabled=True): label=_('Salvar'), name='salvar',
css_class='float-right', disabled=True):
if disabled: if disabled:
doubleclick = 'this.form.submit();this.disabled=true;' doubleclick = 'this.form.submit();this.disabled=true;'

Loading…
Cancel
Save