Skip to content

Commit

Permalink
Varie
Browse files Browse the repository at this point in the history
  • Loading branch information
@gifracr
gifracr committed May 17, 2017
1 parent 2ec15c6 commit 187034b
Show file tree
Hide file tree
Showing 7 changed files with 73 additions and 17 deletions.
44 changes: 43 additions & 1 deletion sigla-ejb/src/main/java/it/cnr/contab/ordmag/anag00/UnitaOperativaOrdHome.java
View file
Expand Up @@ -5,11 +5,18 @@
package it.cnr.contab.ordmag.anag00;
import java.sql.Connection;

import it.cnr.contab.config00.bulk.CigBulk;
import it.cnr.contab.config00.sto.bulk.Unita_organizzativaBulk;
import it.cnr.contab.config00.sto.bulk.Unita_organizzativaHome;
import it.cnr.contab.config00.sto.bulk.Unita_organizzativa_enteBulk;
import it.cnr.contab.utenze00.bp.CNRUserContext;
import it.cnr.jada.UserContext;
import it.cnr.jada.bulk.BulkHome;
import it.cnr.jada.comp.ApplicationException;
import it.cnr.jada.persistency.IntrospectionException;
import it.cnr.jada.persistency.PersistencyException;
import it.cnr.jada.persistency.PersistentCache;
import it.cnr.jada.persistency.sql.CompoundFindClause;
import it.cnr.jada.persistency.sql.PersistentHome;
import it.cnr.jada.persistency.sql.SQLBuilder;
public class UnitaOperativaOrdHome extends BulkHome {
Expand All @@ -23,8 +30,43 @@ public java.util.List findAssUnitaOperativaList(UnitaOperativaOrdBulk uop ) thro
{
PersistentHome repHome = getHomeCache().getHome(AssUnitaOperativaOrdBulk.class);
SQLBuilder sql = repHome.createSQLBuilder();

sql.addSQLClause( "AND", "cd_unita_operativa", SQLBuilder.EQUALS, uop.getCdUnitaOperativa());
return repHome.fetchAll(sql);
}
public SQLBuilder selectUnitaOrganizzativaByClause(UserContext userContext, UnitaOperativaOrdBulk uopBulk,
Unita_organizzativaHome unita_organizzativaHome, Unita_organizzativaBulk unita_organizzativaBulk,
CompoundFindClause compoundfindclause) throws PersistencyException{
SQLBuilder sql = unita_organizzativaHome.selectByClause(userContext, compoundfindclause);
filtraUO(userContext, sql, false);
return sql;
}

@Override
public SQLBuilder selectByClause(UserContext userContext,
CompoundFindClause compoundfindclause) throws PersistencyException {
SQLBuilder sql = super.selectByClause(userContext, compoundfindclause);
filtraUO(userContext, sql, true);
return sql;
}

private void filtraUO(UserContext userContext, SQLBuilder sql, boolean join) throws PersistencyException{
Unita_organizzativa_enteBulk ente = (Unita_organizzativa_enteBulk)
getHomeCache().getHome(Unita_organizzativa_enteBulk.class).findAll().get(0);
if (!CNRUserContext.getCd_unita_organizzativa(userContext).equals(ente.getCd_unita_organizzativa())){
Unita_organizzativaBulk uoScrivania = (Unita_organizzativaBulk)getHomeCache().getHome(Unita_organizzativaBulk.class).
findByPrimaryKey(new Unita_organizzativaBulk(CNRUserContext.getCd_unita_organizzativa(userContext)));
if(!uoScrivania.isUoCds())
sql.addSQLClause("AND","CD_UNITA_ORGANIZZATIVA",SQLBuilder.EQUALS,CNRUserContext.getCd_unita_organizzativa(userContext));
else {
if (join){
sql.addTableToHeader("UNITA_ORGANIZZATIVA");
sql.addSQLJoin("UNITA_OPERATIVA_ORD.CD_UNITA_ORGANIZZATIVA", "UNITA_ORGANIZZATIVA.CD_UNITA_ORGANIZZATIVA");
sql.addSQLClause("AND", "UNITA_ORGANIZZATIVA.CD_UNITA_PADRE", SQLBuilder.EQUALS, CNRUserContext.getCd_cds(userContext));
}else {
sql.addSQLClause("AND","CD_UNITA_PADRE",SQLBuilder.EQUALS,CNRUserContext.getCd_cds(userContext));
}
}
}
}
}
6 changes: 3 additions & 3 deletions sigla-ejb/src/main/java/it/cnr/contab/ordmag/richieste/bp/CRUDRichiestaUopBP.java
View file
Expand Up @@ -274,9 +274,9 @@ public CRUDRichiestaUopBP(String function) throws BusinessProcessException{
// *
// * @return Il valore della proprietà 'dettaglio'
// */
//public final SimpleDetailCRUDController getRighe() {
// return righe;
//}
public final SimpleDetailCRUDController getRighe() {
return righe;
}
///**
// * Restituisce il valore della proprietà 'dettaglioObbligazioneController'
// *
Expand Down
1 change: 0 additions & 1 deletion sigla-ejb/src/main/java/it/cnr/contab/ordmag/richieste/bulk/RichiestaUopBulk.java
View file
Expand Up @@ -257,7 +257,6 @@ public Dictionary getStatoKeysForSearch() {

OrderedHashtable d = (OrderedHashtable)getStatoKeys();
if (d == null) return null;

OrderedHashtable clone = (OrderedHashtable)d.clone();
return clone;
}
Expand Down
2 changes: 1 addition & 1 deletion sigla-ejb/src/main/resources/it/cnr/contab/ordmag/anag00/UnitaOperativaOrdBulkInfo.xml
View file
Expand Up @@ -9,7 +9,7 @@
name="cdUnitaOperativa"
property="cdUnitaOperativa"
inputType="TEXT"
inputSize="30"
inputSize="20"
maxLength="30"
enabledOnEdit="false"
enabledOnSearch="true"
Expand Down
14 changes: 14 additions & 0 deletions sigla-ejb/src/main/resources/it/cnr/contab/ordmag/richieste/bulk/RichiestaUopBulkInfo.xml
View file
Expand Up @@ -90,6 +90,20 @@
nullable="false"
keysProperty="statoKeys"
label="Stato" />
<fieldProperty
name="statoForSearch"
property="stato"
inputSize="20"
maxLength="20"
inputType="SELECT"
nullable="true"
keysProperty="statoKeysForSearch"
enabledOnInsert="false"
enabledOnEdit="false"
enabledOnSearch="true"
enabledOnFreeSearch="true"
label="Stato"
caseSensitiveSearch="false" />
<fieldProperty
name="dsRichiesta"
property="dsRichiesta"
Expand Down
8 changes: 5 additions & 3 deletions sigla-web/src/main/webapp/ordmag/richieste/tab_richiesta_uop.jsp
View file
Expand Up @@ -41,9 +41,11 @@
<%
bp.getController().writeFormField(out, "dataRichiesta");
%>
<%
bp.getController().writeFormField(out, "stato");
%>
<% if (!bp.isSearching()) {
bp.getController().writeFormField(out, "stato");
} else {
bp.getController().writeFormField(out, "statoKeysForSearch");
} %>
</tr>
</table>
<table>
Expand Down
15 changes: 7 additions & 8 deletions sigla-web/src/main/webapp/ordmag/richieste/tab_richiesta_uop_dettaglio.jsp
View file
@@ -1,17 +1,16 @@
<%@ page
import="it.cnr.jada.util.jsp.*,
import = "it.cnr.jada.util.jsp.*,
it.cnr.jada.action.*,
java.util.*,
it.cnr.jada.util.action.*,
it.cnr.contab.docamm00.tabrif.bulk.*,
it.cnr.contab.docamm00.docs.bulk.*,
it.cnr.contab.docamm00.bp.*,
it.cnr.contab.anagraf00.tabrif.bulk.*"
it.cnr.contab.ordmag.richieste.bp.CRUDRichiestaUopBP,
it.cnr.contab.ordmag.richieste.bulk.RichiestaUopRigaBulk,
it.cnr.contab.ordmag.anag00.*"
%>

<% CRUDDocumentoGenericoPassivoBP bp = (CRUDDocumentoGenericoPassivoBP)BusinessProcess.getBusinessProcess(request);
Documento_generico_rigaBulk riga = (Documento_generico_rigaBulk)bp.getDettaglio().getModel();
bp.getDettaglio().writeHTMLTable(pageContext,"righiSet",true,false,true,"100%","100px"); %>
<% CRUDBP bp = (CRUDRichiestaUopBP)BusinessProcess.getBusinessProcess(request);
RichiestaUopRigaBulk riga = (RichiestaUopRigaBulk)bp.getRighe().getModel();
bp.getDettaglio().writeHTMLTable(pageContext,"default",true,false,true,"100%","100px"); %>

<div class="Group">
<table>
Expand Down

0 comments on commit 187034b

Please sign in to comment.