Sfoglia il codice sorgente

Fix implementazione numeroBollettino

feature/asseverazioni-geologo
abianchi7701 8 mesi fa
parent
commit
245ff758ec
  1. BIN
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar
  2. 1
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties
  3. 4
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties
  4. 134
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/submit_form_window.jsp
  5. 34
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view.jsp
  6. 44
      liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_form_bollettino.jsp
  7. BIN
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar
  8. 12
      liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori_calcolo.jsp

BIN
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar

File binario non mostrato.

1
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/content/Portal.properties

@ -899,6 +899,7 @@ causale-pagamento-bolli = Causale Pagamento Bolli
importo-bolli = Importo Bolli
importo-spese-istruttoria = Importo Spese Istruttoria
numero-bollettino =Numero Marca da Bollo e Data
label-codice-bollettino =Codice bollettino
errore-lenght-bollettino = Il limite massimo di 250 caratteri è stato superato
pag-nuove-costruzioni = Pagamento Nuove Costruzioni

4
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/WEB-INF/src/service.properties

@ -13,8 +13,8 @@
##
build.namespace=portos_bo
build.number=2966
build.date=1707408695550
build.number=2970
build.date=1707838344827
build.auto.upgrade=true
##

134
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/common/submit_form_window.jsp

@ -0,0 +1,134 @@
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@include file="/html/init.jsp"%>
<%
String formName = ParamUtil.getString(request, "formName", "fm");
String titolo = ParamUtil.getString(request, "titolo", "Invio");
String buttonId = ParamUtil.getString(request, "buttonId", "sumbit-button");
String buttonConferma = ParamUtil.getString(request, "buttonConferma", "Modifica");
String buttonAnnulla = ParamUtil.getString(request, "buttonAnnulla", "Annulla");
String width = ParamUtil.getString(request, "width", "700");
String height = ParamUtil.getString(request, "height");
String contentDiv = ParamUtil.getString(request, "contentDiv", "saveAndCloseDiv");
boolean buttonBar = ParamUtil.getBoolean(request, "buttonBar", true);
String randomId = StringUtil.randomId();
String onClick = ParamUtil.getString(request, "onClick");
boolean externalForm = ParamUtil.getBoolean(request, "externalForm", false);
boolean okVisible = ParamUtil.getBoolean(request, "okVisible", true);
%>
<aui:input name='<%= "confirmClose_" + randomId %>' type="hidden" value="false" />
<div id='<%=renderResponse.getNamespace() + "saveAndCloseModal_" + randomId %>' class="confirmModal"></div>
<div class='customAlert'>
<p class='message'></p>
<input type='button' class='confirmButton' value='CHIUDI'>
</div>
<liferay-portlet:resourceURL var="resourceURL" id="controllaExtraInfo" copyCurrentRenderParameters="false" />
<aui:script >
AUI().ready('aui-modal', 'aui-io-request', 'aui-form-validator', function(A) {
var modal = new A.Modal({
bodyContent: A.one('#<portlet:namespace /><%=contentDiv%>'),
width: <%= width %>,
<%
if (!height.equals(StringPool.BLANK)) {
%>
height: <%= height %>,
<%
}
%>
centered: true,
destroyOnHide: false,
headerContent: '<h3 class="text-center"><%= titolo %></h3>',
modal: true,
render: '#<portlet:namespace />saveAndCloseModal_<%= randomId %>',
visible: false,
close: false,
}).render();
<%
if (buttonBar) {
%>
modal.addToolbar(
[
{
label: '<%= buttonAnnulla %>',
on: {
click: function() {
modal.hide();
}
}
},
<%
if (okVisible) {
%>
{
label: '<%= buttonConferma %>',
cssClass: 'btn-primary',
on: {
click: function() {
<%
if (Validator.isNotNull(onClick)) {
out.print(onClick);
} else {
%>
submitForm(document.<portlet:namespace /><%= formName %>);
var formValidator = Liferay.Form.get('<portlet:namespace /><%= formName %>')
.formValidator;
<%
if (externalForm) {
%>
if (!formValidator.hasErrors()) {
A.one('#<portlet:namespace />confirmClose_<%= randomId %>')
.set('value', 'true');
} else {
alert("Attenzione!\nCampi richiesti non compilati correttamente");
}
modal.hide();
<%
} else {
%>
if (!formValidator.hasErrors()) {
modal.hide();
A.one('#<portlet:namespace />confirmClose_<%= randomId %>')
.set('value', 'true');
}
<%
}
%>
<%
}
%>
}
}
}
<%
}
%>
]
);
<%
}
%>
A.one('#<portlet:namespace /><%= buttonId %>').on('click', function() {
A.one('#<portlet:namespace /><%=contentDiv%>').show();
modal.show();
});
window.alert = function(msg) {
$('.message').text(msg);
$('.customAlert').css('animation', 'fadeIn 0.3s linear');
$('.customAlert').css('display', 'inline');
setTimeout(function() {
$('.customAlert').css('animation', 'none');
}, 100);
};
$(function(){
$('.confirmButton').click(function(){
$('.customAlert').css('animation', 'fadeOut 0.3s linear');
setTimeout(function(){
$('.customAlert').css('animation', 'none');
$('.customAlert').css('display', 'none');
}, 100);
});
});
});
</aui:script>

34
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view.jsp

@ -79,7 +79,39 @@
%>
</c:if>
</liferay-ui:search-container-column-text>
<liferay-ui:search-container-column-text>
<div>
<%
String buttonFormId = "pagamentoFormButton_" + index;
String contentFormId = "pagamentoFormContent_" + index;
String formNameBollettino = "fmPagamenti_" + index;
%>
<liferay-ui:icon-menu showWhenSingleIcon="false" extended="false" showExpanded="true"
cssClass="inline_toolbar">
<liferay-ui:icon id="<%= buttonFormId %>" iconCssClass="fa fa-edit" message=""
url="javascript:void(0)" linkCssClass="btn btn-action" />
</liferay-ui:icon-menu>
<div id="<portlet:namespace /><%= contentFormId %>" class="hide" >
<liferay-util:include page="/html/pagamenti/view_panel_form_bollettino.jsp"
servletContext='<%= application %>'>
<liferay-util:param name="idPagamento"
value="<%= String.valueOf(pagamento.getPagamentoId()) %>" />
<liferay-util:param name="dettPraticaId"
value="<%= String.valueOf(pagamento.getClassPk()) %>" />
<liferay-util:param name="formName" value="<%= formNameBollettino %>" />
</liferay-util:include>
</div>
<liferay-util:include page="/html/common/submit_form_window.jsp"
servletContext="<%= application %>">
<liferay-util:param name="titolo" value="Modifica Pagamento" />
<liferay-util:param name="buttonId" value="<%= buttonFormId %>" />
<liferay-util:param name="contentDiv" value="<%= contentFormId %>" />
<liferay-util:param name="width" value="750" />
<liferay-util:param name="formName" value="<%= formNameBollettino %>" />
<liferay-util:param name="buttonBar" value="true" />
</liferay-util:include>
<div>
</liferay-ui:search-container-column-text>
<liferay-ui:search-container-column-text>
<%
String[] notAllowed = new String[]{};

44
liferay-plugins-sdk-6.2/portlets/portos-bo-portlet/docroot/html/pagamenti/view_panel_form_bollettino.jsp

@ -0,0 +1,44 @@
<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@page import="java.util.Locale"%>
<%@page import="com.liferay.portal.kernel.util.Validator"%>
<%@page import="java.text.NumberFormat"%>
<%@page import="java.math.BigDecimal"%>
<%@page import="com.liferay.portal.kernel.bean.BeanPropertiesUtil"%>
<%@page import="it.tref.liferay.portos.bo.shared.util.PagamentoConstants"%>
<%@page import="com.liferay.portal.kernel.language.LanguageUtil"%>
<%@ include file="/html/init.jsp" %>
<%
long dettPraticaId = ParamUtil.getLong(request, "dettPraticaId",0l);
long idPagamento = ParamUtil.getLong(request, "idPagamento", 0l);
String formName = ParamUtil.getString(request, "formName", "fm");
DettPratica dettPratica = DettPraticaLocalServiceUtil.getDettPratica(dettPraticaId);
Pagamento objPagamento = PagamentoLocalServiceUtil.fetchPagamento(idPagamento);
long companyId = company.getCompanyId();
String portletNamespace = renderResponse.getNamespace();
String redirect = currentURL+"#"+portletNamespace+"tab="+portletNamespace+"page_pagamenti";
%>
<c:if test="<%= Validator.isNotNull(objPagamento) %>">
<div class="col-sm-12 col-md-12">
<%-- <liferay-portlet:actionURL name="setBollettinoImposta" var="setBollettinoImpostaURL">
<liferay-portlet:param name="idPagamento" value="<%=String.valueOf(idPagamento) %>"/>
<liferay-portlet:param name="dettPraticaId" value="<%=String.valueOf(dettPraticaId) %>"/>
<liferay-portlet:param name="redirect" value="<%= redirect %>" />
<liferay-portlet:param name="mvcPath" value="/html/pagamenti/view_panel_form_bollettino.jsp"/>
</liferay-portlet:actionURL> --%>
<aui:form name="<%= formName %>" method="post" action="">
<aui:input name="numeroBollettino" type="textarea"
label="label-codice-bollettino" value="<%= objPagamento.getNumeroBollettino() %>">
<aui:validator name="maxLength" errorMessage="errore-lenght-bollettino">250</aui:validator>
<aui:validator name="required" errorMessage="Campo Richiesto" />
</aui:input>
</aui:form>
</div>
</c:if>

BIN
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/WEB-INF/lib/portos-bo-portlet-service.jar

File binario non mostrato.

12
liferay-plugins-sdk-6.2/portlets/portos-fe-portlet/docroot/html/fascicolofe/verify_fine-lavori_calcolo.jsp

@ -109,15 +109,19 @@ String currentCompleteUrl = PortalUtil.getCurrentCompleteURL(request);
</liferay-portlet:actionURL>
<c:if test="<%= pagamento.getMezzo().equals(
PagamentoConstants.MEZZO_MANUALE) %>">
<div class="col-xs-10 padding_15"><span>
<div class="col-xs-8 padding_15"><span>
<%= LanguageUtil.get(pageContext, "text-pagamento-manuale-bolli") %>
</span>
</div>
<div class="col-xs-2 padding_15 total-row">
<div class="col-xs-4 padding_15 total-row">
<aui:form name="<%= formRicevutaPagamento %>"
enctype="multipart/form-data" method="post"
action="<%= allegatoFilePagamentoURL %>">
<div>
<aui:input label="numero-bollettino" name="numeroBollettino" type="textarea" >
<aui:validator name="maxLength" errorMessage="errore-lenght-bollettino">250</aui:validator>
<aui:validator name="required" errorMessage="Campo Richiesto" />
</aui:input>
<aui:input type="file" name="docFile"
label="Ricevuta Pagamento">
<aui:validator name="required"
@ -167,11 +171,11 @@ String currentCompleteUrl = PortalUtil.getCurrentCompleteURL(request);
</liferay-portlet:actionURL>
<c:if test="<%= pagamentoSpese.getMezzo().equals(
PagamentoConstants.MEZZO_MANUALE) %>">
<div class="col-xs-10 padding_15"><span>
<div class="col-xs-8 padding_15"><span>
<%= LanguageUtil.get(pageContext, "text-pagamento-manuale-oneri") %>
</span>
</div>
<div class="col-xs-2 padding_15 total-row">
<div class="col-xs-4 padding_15 total-row">
<aui:form name="<%= formRicevutaPagamento %>"
enctype="multipart/form-data" method="post"
action="<%= allegatoFilePagamentoURL %>">

Caricamento…
Annulla
Salva