|
|
|
@ -25,9 +25,6 @@ List<Organization> organizationList = OrganizationLocalServiceUtil.getUserOrgani |
|
|
|
<div class="col-xs-12 col-md-3"> |
|
|
|
<div class="col-xs-12 col-md-3"> |
|
|
|
<aui:input type="text" name="numeroProgetto" label="Numero Progetto" /> |
|
|
|
<aui:input type="text" name="numeroProgetto" label="Numero Progetto" /> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="col-xs-12 col-md-3"> |
|
|
|
|
|
|
|
<aui:input type="text" name="protocollo" label="Protocollo" /> |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
<div class="col-xs-12 col-md-3"> |
|
|
|
<div class="col-xs-12 col-md-3"> |
|
|
|
<aui:select name="tipoPratica" label="Tipo Pratica"> |
|
|
|
<aui:select name="tipoPratica" label="Tipo Pratica"> |
|
|
|
<aui:option value="-1">Seleziona il tipo di pratica</aui:option> |
|
|
|
<aui:option value="-1">Seleziona il tipo di pratica</aui:option> |
|
|
|
@ -44,7 +41,7 @@ List<Organization> organizationList = OrganizationLocalServiceUtil.getUserOrgani |
|
|
|
<aui:option value="sorteggio"><liferay-ui:message key="sorteggiata"/></aui:option> |
|
|
|
<aui:option value="sorteggio"><liferay-ui:message key="sorteggiata"/></aui:option> |
|
|
|
</aui:select> |
|
|
|
</aui:select> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="col-xs-12 col-md-3"> |
|
|
|
<!-- <div class="col-xs-12 col-md-3"> |
|
|
|
<aui:select name="statoPratica" label="Stato Pratica"> |
|
|
|
<aui:select name="statoPratica" label="Stato Pratica"> |
|
|
|
<aui:option value="-1">Stato Pratica</aui:option> |
|
|
|
<aui:option value="-1">Stato Pratica</aui:option> |
|
|
|
<aui:option value="<%= StatoPraticaConstants.ANNULLATA %>"> |
|
|
|
<aui:option value="<%= StatoPraticaConstants.ANNULLATA %>"> |
|
|
|
@ -90,20 +87,61 @@ List<Organization> organizationList = OrganizationLocalServiceUtil.getUserOrgani |
|
|
|
<liferay-ui:message key="sospesa"/> |
|
|
|
<liferay-ui:message key="sospesa"/> |
|
|
|
</aui:option> |
|
|
|
</aui:option> |
|
|
|
</aui:select> |
|
|
|
</aui:select> |
|
|
|
|
|
|
|
</div>--> |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
<div class="row"> |
|
|
|
|
|
|
|
<div class="col-xs-12 col-md-3"> |
|
|
|
|
|
|
|
<aui:select name="provincia" label="Provincia" cssClass="provinciaSelect"> |
|
|
|
|
|
|
|
<aui:option value="000"> </aui:option> |
|
|
|
|
|
|
|
<% |
|
|
|
|
|
|
|
List<String> province = TerritorioLocalServiceUtil.getActiveProvince(); |
|
|
|
|
|
|
|
//ADT BUG-ID=15 Sezione Ricerca / Ordinamento Filtro |
|
|
|
|
|
|
|
List<Provincia> provinceList = new ArrayList<Provincia>(); |
|
|
|
|
|
|
|
for (String codiceProvincia : province) { |
|
|
|
|
|
|
|
Provincia provinciaToStamp = ProvinciaLocalServiceUtil.fetchByC_C(company.getCompanyId(), |
|
|
|
|
|
|
|
codiceProvincia); |
|
|
|
|
|
|
|
provinceList.add(provinciaToStamp); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
Collections.sort(provinceList, new Comparator<Provincia>() { |
|
|
|
|
|
|
|
public int compare(Provincia o1, Provincia o2){ |
|
|
|
|
|
|
|
return o1.getProvincia().compareTo(o2.getProvincia()); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
for (Provincia provincia : provinceList) { |
|
|
|
|
|
|
|
%> |
|
|
|
|
|
|
|
<aui:option value="<%= provincia.getCodiceProvincia() %>"> |
|
|
|
|
|
|
|
<%= provincia.getProvincia() %> |
|
|
|
|
|
|
|
</aui:option> |
|
|
|
|
|
|
|
<% |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
%> |
|
|
|
|
|
|
|
</aui:select> |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
<div class="col-sm-12 col-md-3 add-new-project__comune"> |
|
|
|
|
|
|
|
<% |
|
|
|
|
|
|
|
String comuneSelect = ParamUtil.getString(renderRequest, "comune"); |
|
|
|
|
|
|
|
%> |
|
|
|
|
|
|
|
<aui:select name="comune" label="Comune" /> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="row"> |
|
|
|
<div class="row"> |
|
|
|
<div class="col-xs-12 col-md-4"> |
|
|
|
<div class="col-xs-12 col-md-3"> |
|
|
|
|
|
|
|
<aui:input type="text" name="titolareDigitale" label="Titolare Digitale" /> |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
<div class="col-xs-12 col-md-3"> |
|
|
|
<aui:input type="text" name="committente" label="Committente" /> |
|
|
|
<aui:input type="text" name="committente" label="Committente" /> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="col-xs-12 col-md-4"> |
|
|
|
<div class="col-xs-12 col-md-3"> |
|
|
|
<aui:input type="text" name="soggettiInterconnessi" |
|
|
|
<aui:input type="text" name="soggettiInterconnessi" label="Soggetti Interconnessi" /> |
|
|
|
label="Soggetti Interconnessi" /> |
|
|
|
|
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="col-xs-12 col-md-4"> |
|
|
|
</div> |
|
|
|
<%-- ADT BUG BO ID = 8 SEZIONE ATTIVITÀ --%> |
|
|
|
<div class="row"> |
|
|
|
|
|
|
|
<div class="col-xs-12 col-md-1"> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
<div class="col-xs-12 col-md-2"> |
|
|
|
<c:if test="<%= organizationList != null && organizationList.size() > 1 %>"> |
|
|
|
<c:if test="<%= organizationList != null && organizationList.size() > 1 %>"> |
|
|
|
<aui:select name="istruttore" label="Tecnico Istruttore"> |
|
|
|
<aui:select name="istruttore" label="Istruttore"> |
|
|
|
<aui:option value="-1">Tutti</aui:option> |
|
|
|
<aui:option value="-1">Tutti</aui:option> |
|
|
|
<% |
|
|
|
<% |
|
|
|
List<UserGroupRole> tecniciIstruttori = new ArrayList<UserGroupRole>(); |
|
|
|
List<UserGroupRole> tecniciIstruttori = new ArrayList<UserGroupRole>(); |
|
|
|
@ -145,6 +183,14 @@ List<Organization> organizationList = OrganizationLocalServiceUtil.getUserOrgani |
|
|
|
</aui:select> |
|
|
|
</aui:select> |
|
|
|
</c:if> |
|
|
|
</c:if> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div class="col-xs-12 col-md-3"> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div class="col-xs-12 col-md-3"> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="row"> |
|
|
|
<div class="row"> |
|
|
|
<div class="col-xs-12 col-md-4"> |
|
|
|
<div class="col-xs-12 col-md-4"> |
|
|
|
@ -159,28 +205,8 @@ List<Organization> organizationList = OrganizationLocalServiceUtil.getUserOrgani |
|
|
|
</liferay-util:include> |
|
|
|
</liferay-util:include> |
|
|
|
</aui:field-wrapper> |
|
|
|
</aui:field-wrapper> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="col-sm-12 col-md-3 add-new-project__ufficio"> |
|
|
|
|
|
|
|
<c:if test="<%= organizationList != null && organizationList.size() > 1 %>"> |
|
|
|
|
|
|
|
<aui:select name="ufficio" label="Ufficio"> |
|
|
|
|
|
|
|
<aui:option value="-1">Tutte</aui:option> |
|
|
|
|
|
|
|
<% |
|
|
|
|
|
|
|
for (Organization org : organizationList) { |
|
|
|
|
|
|
|
if (org.getParentOrganizationId() != 0) { |
|
|
|
|
|
|
|
%> |
|
|
|
|
|
|
|
<aui:option value="<%= org.getGroupId() %>"><%= org.getName() %></aui:option> |
|
|
|
|
|
|
|
<% |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
%> |
|
|
|
|
|
|
|
</aui:select> |
|
|
|
|
|
|
|
</c:if> |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
<div class="col-sm-12 col-md-3 add-new-project__comune"> |
|
|
|
|
|
|
|
<% |
|
|
|
|
|
|
|
String comuneSelect = ParamUtil.getString(renderRequest, "comune"); |
|
|
|
|
|
|
|
%> |
|
|
|
|
|
|
|
<aui:select name="comune" label="Comune" /> |
|
|
|
|
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
<!-- <div class="row"> |
|
|
|
<div class="col-sm-12 col-md-2"> |
|
|
|
<div class="col-sm-12 col-md-2"> |
|
|
|
<aui:select name="tipoProcedura" label="tipo-procedura"> |
|
|
|
<aui:select name="tipoProcedura" label="tipo-procedura"> |
|
|
|
<aui:option value="">Tutte</aui:option> |
|
|
|
<aui:option value="">Tutte</aui:option> |
|
|
|
@ -189,10 +215,10 @@ List<Organization> organizationList = OrganizationLocalServiceUtil.getUserOrgani |
|
|
|
<aui:option value="C">Procedura C</aui:option> |
|
|
|
<aui:option value="C">Procedura C</aui:option> |
|
|
|
</aui:select> |
|
|
|
</aui:select> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div>--> |
|
|
|
<div class="row"> |
|
|
|
<div class="row"> |
|
|
|
<div class="col-xs-12 col-md-4"> |
|
|
|
<div class="col-xs-12 col-md-3"> |
|
|
|
<aui:select name="tipoAttivita" label="Tipo Attività"> |
|
|
|
<aui:select name="tipoAttivita" label="Attività"> |
|
|
|
<aui:option value="-1">Tutte</aui:option> |
|
|
|
<aui:option value="-1">Tutte</aui:option> |
|
|
|
<aui:option value="Assegnazione">Assegnazione</aui:option> |
|
|
|
<aui:option value="Assegnazione">Assegnazione</aui:option> |
|
|
|
<aui:option value="Approvazione">Approvazione</aui:option> |
|
|
|
<aui:option value="Approvazione">Approvazione</aui:option> |
|
|
|
@ -203,11 +229,17 @@ List<Organization> organizationList = OrganizationLocalServiceUtil.getUserOrgani |
|
|
|
<aui:option value="signal_ff">Firma</aui:option> |
|
|
|
<aui:option value="signal_ff">Firma</aui:option> |
|
|
|
</aui:select> |
|
|
|
</aui:select> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
<div class="col-xs-12 col-md-3"> |
|
|
|
|
|
|
|
<aui:select name="esito" label="Esito"> |
|
|
|
|
|
|
|
<aui:option value="0">Tutti</aui:option> |
|
|
|
|
|
|
|
<aui:option value="Assegnazione">Autorizzata</aui:option> |
|
|
|
|
|
|
|
<aui:option value="Approvazione">Non autorizzata</aui:option> |
|
|
|
|
|
|
|
<aui:option value="Annullato">Non si rilascia parere</aui:option> |
|
|
|
|
|
|
|
</aui:select> |
|
|
|
|
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="row"> |
|
|
|
<div class="row"> |
|
|
|
<div class="col-xs-12 col-md-4"> |
|
|
|
<div class="col-xs-12 col-md-3"> |
|
|
|
<div class="row"> |
|
|
|
|
|
|
|
<div class="col-xs-12 col-md-6"> |
|
|
|
|
|
|
|
<aui:select name="ordinaPer" label="Ordina Per"> |
|
|
|
<aui:select name="ordinaPer" label="Ordina Per"> |
|
|
|
<aui:option value="taskName">Nome Task</aui:option> |
|
|
|
<aui:option value="taskName">Nome Task</aui:option> |
|
|
|
<aui:option selected="true" value="numeroProgetto">Numero Progetto</aui:option> |
|
|
|
<aui:option selected="true" value="numeroProgetto">Numero Progetto</aui:option> |
|
|
|
@ -216,60 +248,57 @@ List<Organization> organizationList = OrganizationLocalServiceUtil.getUserOrgani |
|
|
|
<aui:option value="tipoPratica">Tipo Pratica</aui:option> |
|
|
|
<aui:option value="tipoPratica">Tipo Pratica</aui:option> |
|
|
|
</aui:select> |
|
|
|
</aui:select> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="col-xs-12 col-md-6"> |
|
|
|
<div class="col-xs-12 col-md-3"> |
|
|
|
<aui:select name="ordinaTipo" label="Tipo Ordine"> |
|
|
|
<aui:select name="ordinaTipo" label="Tipo Ordine"> |
|
|
|
<aui:option selected="true" value="dec">Dec</aui:option> |
|
|
|
<aui:option selected="true" value="dec">Dec</aui:option> |
|
|
|
<aui:option value="asc">Asc</aui:option> |
|
|
|
<aui:option value="asc">Asc</aui:option> |
|
|
|
</aui:select> |
|
|
|
</aui:select> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
<aui:button type="submit" value="search" /> |
|
|
|
<aui:button type="submit" value="search" /> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</liferay-ui:panel> |
|
|
|
</liferay-ui:panel> |
|
|
|
|
|
|
|
|
|
|
|
<%-- ADT BUG BO ID = 1 SEZIONE ATTIVITÀ --%> |
|
|
|
<%-- ADT BUG BO ID = 1 SEZIONE ATTIVITÀ --%> |
|
|
|
<liferay-portlet:resourceURL id="comuniForUfficio" var="getComuniURL" /> |
|
|
|
<liferay-portlet:resourceURL id="comuni" var="getComuniURL" /> |
|
|
|
<aui:script use="aui-io-request"> |
|
|
|
<aui:script use="aui-base,aui-io-request"> |
|
|
|
$(".add-new-project__ufficio select").change(function() { |
|
|
|
var getComuni = function(provinciaId, comuneId, comuneValue) { |
|
|
|
var comuni = ''; |
|
|
|
var comuneSelect = A.one("#"+comuneId); |
|
|
|
var val = $(this).val(); |
|
|
|
if (provinciaId == "" || provinciaId == "000") { |
|
|
|
$(".add-new-project__comune select").empty(); |
|
|
|
comuneSelect.html("<option value='000' label=''></option>") |
|
|
|
A.io.request( |
|
|
|
comuneSelect.addClass("disabled").set("disabled", true); |
|
|
|
'<%= getComuniURL %>', |
|
|
|
} else { |
|
|
|
{ |
|
|
|
A.io.request('<%= getComuniURL %>', { |
|
|
|
data: { |
|
|
|
data: { |
|
|
|
<portlet:namespace />ufficioId: val |
|
|
|
<portlet:namespace />provinciaId: provinciaId |
|
|
|
}, |
|
|
|
}, |
|
|
|
dataType: 'json', |
|
|
|
dataType: 'json', |
|
|
|
on: { |
|
|
|
on: { |
|
|
|
success: function() { |
|
|
|
success: function() { |
|
|
|
$(".add-new-project__comune select").empty(); |
|
|
|
|
|
|
|
$(".add-new-project__comune select").append($('<option>').val('-1').text('Tutti')); |
|
|
|
|
|
|
|
var response = this.get('responseData'); |
|
|
|
var response = this.get('responseData'); |
|
|
|
<% |
|
|
|
comuneSelect.html("<option value='000' label=''></option>") |
|
|
|
String csParam = ParamUtil.getString(renderRequest, "comune"); |
|
|
|
|
|
|
|
String cs = "null"; |
|
|
|
|
|
|
|
if (csParam != null && !csParam.equals("")) { |
|
|
|
|
|
|
|
cs = csParam; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
%> |
|
|
|
|
|
|
|
var cs = <%= cs %>; |
|
|
|
|
|
|
|
var checkIfExists = false; |
|
|
|
|
|
|
|
for (index in response) { |
|
|
|
for (index in response) { |
|
|
|
$(".add-new-project__comune select").append($('<option>').val(response[index].comuneId).text(response[index].descLong)); |
|
|
|
var code = '<option value="' + response[index].comuneId + '" label="' + response[index].descLong |
|
|
|
if (cs != 'null') { |
|
|
|
+ '" class="comuneItem" ' + (comuneValue==response[index].comuneId ? "selected=\"true\"" |
|
|
|
if(response[index].comuneId == cs){ |
|
|
|
: "") |
|
|
|
checkIfExists = true; |
|
|
|
+ '>' + response[index].descLong + '</option>'; |
|
|
|
} |
|
|
|
comuneSelect.append(code); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
if (checkIfExists) { |
|
|
|
if (provinciaId != "" && provinciaId != "000") { |
|
|
|
$(".add-new-project__comune select").val(cs); |
|
|
|
comuneSelect.removeClass("disabled").set("disabled", false); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
); |
|
|
|
}; |
|
|
|
}).trigger("change"); |
|
|
|
|
|
|
|
|
|
|
|
A.ready(function() { |
|
|
|
|
|
|
|
A.one(".provinciaSelect").on('change', function(event) { |
|
|
|
|
|
|
|
var provinciaId = event.currentTarget.get('value'), |
|
|
|
|
|
|
|
comuneId = event.currentTarget.attr("id").replace("provincia","comune"), |
|
|
|
|
|
|
|
comuneValue = "000"; |
|
|
|
|
|
|
|
getComuni(provinciaId, comuneId, comuneValue) |
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
}); |
|
|
|
</aui:script> |
|
|
|
</aui:script> |
Mattia Gosetto
3 anni fa