Skip to content

Commit

Permalink
Varie
Browse files Browse the repository at this point in the history
  • Loading branch information
@gifracr
gifracr committed May 9, 2017
1 parent 7095c08 commit 4d07956
Show file tree
Hide file tree
Showing 12 changed files with 46 additions and 65 deletions.
4 changes: 2 additions & 2 deletions sigla-ejb/src/main/java/it/cnr/contab/ordmag/anag00/AbilitBeneServMagBase.java
View file
Expand Up @@ -15,8 +15,8 @@ public class AbilitBeneServMagBase extends AbilitBeneServMagKey implements Keyed
public AbilitBeneServMagBase() {
super();
}
public AbilitBeneServMagBase(java.lang.String cdCds, java.lang.String cdMagazzino, java.lang.String cdCategoriaGruppo, java.sql.Timestamp dtIniValidita) {
super(cdCds, cdMagazzino, cdCategoriaGruppo, dtIniValidita);
public AbilitBeneServMagBase(java.lang.String cdCds, java.lang.String cdMagazzino, java.lang.String cdCategoriaGruppo) {
super(cdCds, cdMagazzino, cdCategoriaGruppo);
}
/**
* Created by BulkGenerator 2.0 [07/12/2009]
Expand Down
4 changes: 2 additions & 2 deletions sigla-ejb/src/main/java/it/cnr/contab/ordmag/anag00/AbilitBeneServMagBulk.java
View file
Expand Up @@ -31,8 +31,8 @@ public AbilitBeneServMagBulk() {
* Created by BulkGenerator 2.0 [07/12/2009]
* Table name: ABILIT_BENE_SERV_MAG
**/
public AbilitBeneServMagBulk(java.lang.String cdCds, java.lang.String cdMagazzino, java.lang.String cdCategoriaGruppo, java.sql.Timestamp dtIniValidita) {
super(cdCds, cdMagazzino, cdCategoriaGruppo, dtIniValidita);
public AbilitBeneServMagBulk(java.lang.String cdCds, java.lang.String cdMagazzino, java.lang.String cdCategoriaGruppo) {
super(cdCds, cdMagazzino, cdCategoriaGruppo);
setMagazzino( new MagazzinoBulk(cdCds,cdMagazzino) );
setCategoriaGruppoInvent( new Categoria_gruppo_inventBulk(cdCategoriaGruppo) );
}
Expand Down
20 changes: 1 addition & 19 deletions sigla-ejb/src/main/java/it/cnr/contab/ordmag/anag00/AbilitBeneServMagKey.java
View file
Expand Up @@ -9,20 +9,18 @@ public class AbilitBeneServMagKey extends OggettoBulk implements KeyedPersistent
private java.lang.String cdCds;
private java.lang.String cdMagazzino;
private java.lang.String cdCategoriaGruppo;
private java.sql.Timestamp dtIniValidita;
/**
* Created by BulkGenerator 2.0 [07/12/2009]
* Table name: ABILIT_BENE_SERV_MAG
**/
public AbilitBeneServMagKey() {
super();
}
public AbilitBeneServMagKey(java.lang.String cdCds, java.lang.String cdMagazzino, java.lang.String cdCategoriaGruppo, java.sql.Timestamp dtIniValidita) {
public AbilitBeneServMagKey(java.lang.String cdCds, java.lang.String cdMagazzino, java.lang.String cdCategoriaGruppo) {
super();
this.cdCds=cdCds;
this.cdMagazzino=cdMagazzino;
this.cdCategoriaGruppo=cdCategoriaGruppo;
this.dtIniValidita=dtIniValidita;
}
public boolean equalsByPrimaryKey(Object o) {
if (this== o) return true;
Expand All @@ -31,15 +29,13 @@ public boolean equalsByPrimaryKey(Object o) {
if (!compareKey(getCdCds(), k.getCdCds())) return false;
if (!compareKey(getCdMagazzino(), k.getCdMagazzino())) return false;
if (!compareKey(getCdCategoriaGruppo(), k.getCdCategoriaGruppo())) return false;
if (!compareKey(getDtIniValidita(), k.getDtIniValidita())) return false;
return true;
}
public int primaryKeyHashCode() {
int i = 0;
i = i + calculateKeyHashCode(getCdCds());
i = i + calculateKeyHashCode(getCdMagazzino());
i = i + calculateKeyHashCode(getCdCategoriaGruppo());
i = i + calculateKeyHashCode(getDtIniValidita());
return i;
}
/**
Expand Down Expand Up @@ -84,18 +80,4 @@ public void setCdCategoriaGruppo(java.lang.String cdCategoriaGruppo) {
public java.lang.String getCdCategoriaGruppo() {
return cdCategoriaGruppo;
}
/**
* Created by BulkGenerator 2.0 [07/12/2009]
* Restituisce il valore di: [dtIniValidita]
**/
public void setDtIniValidita(java.sql.Timestamp dtIniValidita) {
this.dtIniValidita=dtIniValidita;
}
/**
* Created by BulkGenerator 2.0 [07/12/2009]
* Setta il valore di: [dtIniValidita]
**/
public java.sql.Timestamp getDtIniValidita() {
return dtIniValidita;
}
}
7 changes: 7 additions & 0 deletions sigla-ejb/src/main/java/it/cnr/contab/ordmag/anag00/MagazzinoBulk.java
View file
Expand Up @@ -40,6 +40,7 @@ public class MagazzinoBulk extends MagazzinoBase {
private RaggrMagazzinoBulk raggrMagazzinoRim = new RaggrMagazzinoBulk();
private BulkList categoriaGruppoColl = new BulkList();
private BulkList numeratoreColl = new BulkList();
private boolean isInQuery = false;
/**
* Created by BulkGenerator 2.0 [07/12/2009]
* Table name: MAGAZZINO
Expand Down Expand Up @@ -668,4 +669,10 @@ public NumerazioneMagBulk removeFromNumeratoreColl(int index)
// Gestisce la selezione del bottone cancella repertorio
return (NumerazioneMagBulk)numeratoreColl.remove(index);
}
public boolean isInQuery() {
return isInQuery;
}
public void setInQuery(boolean isInQuery) {
this.isInQuery = isInQuery;
}
}
21 changes: 21 additions & 0 deletions sigla-ejb/src/main/java/it/cnr/contab/ordmag/anag00/bp/CRUDAbilitBeneServMagBP.java
View file
@@ -1,6 +1,10 @@
package it.cnr.contab.ordmag.anag00.bp;

import it.cnr.contab.ordmag.anag00.AbilitBeneServMagBulk;
import it.cnr.contab.ordmag.anag00.MagazzinoBulk;
import it.cnr.jada.action.ActionContext;
import it.cnr.jada.action.BusinessProcessException;
import it.cnr.jada.bulk.OggettoBulk;
import it.cnr.jada.util.action.SimpleCRUDBP;
import it.cnr.jada.util.action.SimpleDetailCRUDController;

Expand Down Expand Up @@ -34,5 +38,22 @@ public boolean isEditingAbilitazione()
return true;

return false;
}

@Override
public OggettoBulk initializeModelForFreeSearch(ActionContext actioncontext, OggettoBulk oggettobulk)
throws BusinessProcessException {
MagazzinoBulk mag = (MagazzinoBulk)oggettobulk;
mag.setInQuery(true);
return super.initializeModelForFreeSearch(actioncontext, mag);
}

@Override
public OggettoBulk initializeModelForSearch(ActionContext actioncontext, OggettoBulk oggettobulk)
throws BusinessProcessException {
MagazzinoBulk mag = (MagazzinoBulk)oggettobulk;
mag.setInQuery(true);
return super.initializeModelForSearch(actioncontext, mag);
}
}

5 changes: 2 additions & 3 deletions ...src/main/resources/it/cnr/contab/docamm00/tabrif/bulk/Categoria_gruppo_inventBulkInfo.xml
View file
Expand Up @@ -190,11 +190,10 @@
name="livello"
style="width:300px"/>
</columnSet>
<form name="searchtool">
<form name="searchtool">
<formFieldProperty
name="cd_categoria_gruppo"/>
<formFieldProperty
name="ds_categoria_gruppo"
/>
name="ds_categoria_gruppo"/>
</form>
</bulkInfo>
19 changes: 3 additions & 16 deletions sigla-ejb/src/main/resources/it/cnr/contab/ordmag/anag00/AbilitBeneServMagBulkInfo.xml
View file
Expand Up @@ -15,7 +15,7 @@
<fieldProperty
name="findCategoriaGruppo"
property="categoriaGruppoInvent"
inputType="SEARCHTOOL"
inputType="searchtool"
formName="searchtool"
label="Categoria-Gruppo"
enabledOnSearch="true"
Expand Down Expand Up @@ -63,13 +63,6 @@
enabledOnSearch="false"
nullable="false"
label="Descrizione Categoria Gruppo" />
<fieldProperty
name="dtIniValidita"
property="dtIniValidita"
inputType="TEXT"
formatName="date_short"
nullable="false"
label="Data Inizio Validita" />
<fieldProperty
name="dtFinValidita"
property="dtFinValidita"
Expand All @@ -82,17 +75,15 @@
name="cdMagazzino" />
<formFieldProperty
name="cdCategoriaGruppo" />
<formFieldProperty
name="dtIniValidita" />
</form>
<formFieldProperty
name="findMagazzino" />
<formFieldProperty
name="findCategoriaGruppo" />
<formFieldProperty
name="cdCategoriaGruppo" />
<formFieldProperty
name="dsCategoriaGruppo" />
<formFieldProperty
name="dtIniValidita" />
<formFieldProperty
name="dtFinValidita" />
<findFieldProperty
Expand All @@ -101,16 +92,12 @@
name="cdMagazzino" />
<findFieldProperty
name="cdCategoriaGruppo" />
<findFieldProperty
name="dtIniValidita" />
<findFieldProperty
name="dtFinValidita" />
<columnFieldProperty
name="cdCategoriaGruppo" />
<columnFieldProperty
name="dsCategoriaGruppo" />
<columnFieldProperty
name="dtIniValidita" />
<columnFieldProperty
name="dtFinValidita" />
</bulkInfo>
2 changes: 1 addition & 1 deletion ...jb/src/main/resources/it/cnr/contab/ordmag/anag00/AbilitBeneServMagBulkPersistentInfo.xml
View file
Expand Up @@ -6,7 +6,7 @@
tableName="ABILIT_BENE_SERV_MAG">
<columnMapping
columnName="CD_CDS"
propertyName="magazzino.cdCds" />
propertyName="magazzino.unitaOrganizzativa.cd_unita_organizzativa" />
<columnMapping
columnName="CD_MAGAZZINO"
propertyName="magazzino.cdMagazzino" />
Expand Down
10 changes: 0 additions & 10 deletions ...ejb/src/main/resources/it/cnr/contab/ordmag/anag00/AbilitBeneServMagKeyPersistentInfo.xml
View file
Expand Up @@ -24,13 +24,6 @@
columnSize="10"
nullable="false"
primary="true" />
<columnMapping
columnName="DT_INI_VALIDITA"
propertyName="dtIniValidita"
sqlTypeName="TIMESTAMP"
columnSize="7"
nullable="false"
primary="true" />
</defaultColumnMap>
<persistentProperty
name="cdCds"
Expand All @@ -41,7 +34,4 @@
<persistentProperty
name="cdCategoriaGruppo"
partOfOid="true" />
<persistentProperty
name="dtIniValidita"
partOfOid="true" />
</SQLPersistentInfo>
1 change: 1 addition & 0 deletions sigla-ejb/src/main/resources/it/cnr/contab/ordmag/anag00/MagazzinoBulkInfo.xml
View file
Expand Up @@ -32,6 +32,7 @@
property="dsMagazzino"
inputType="TEXT"
maxLength="100"
inputSize="100"
nullable="false"
label="Descrizione" />
<fieldProperty
Expand Down
4 changes: 2 additions & 2 deletions ...ejb/src/main/resources/it/cnr/contab/ordmag/anag00/TipoMovimentoMagBulkPersistentInfo.xml
View file
Expand Up @@ -9,13 +9,13 @@
propertyName="unitaOrganizzativa.cd_unita_organizzativa" />
<columnMapping
columnName="CD_CDS_STORNO"
propertyName="tipoMovimentoMagStorno.cdCds" />
propertyName="tipoMovimentoMagStorno.unitaOrganizzativa.cd_unita_organizzativa" />
<columnMapping
columnName="CD_TIPO_MOVIMENTO_STORNO"
propertyName="tipoMovimentoMagStorno.cdTipoMovimento" />
<columnMapping
columnName="CD_CDS_ALT"
propertyName="tipoMovimentoMagAlt.cdCds" />
propertyName="tipoMovimentoMagAlt.unitaOrganizzativa.cd_unita_organizzativa" />
<columnMapping
columnName="CD_TIPO_MOVIMENTO_ALT"
propertyName="tipoMovimentoMagAlt.cdTipoMovimento" />
Expand Down
14 changes: 4 additions & 10 deletions sigla-web/src/main/webapp/ordmag/abilit_bene_serv_mag.jsp
View file
@@ -1,3 +1,4 @@
<%@page import="it.cnr.contab.ordmag.anag00.MagazzinoBulk"%>
<%@page import="it.cnr.contab.ordmag.anag00.bp.CRUDAssUnitaOperativaBP"%>
<%@ page
import="it.cnr.jada.action.*,
Expand All @@ -7,6 +8,7 @@

<%
CRUDAbilitBeneServMagBP bp = (CRUDAbilitBeneServMagBP)BusinessProcess.getBusinessProcess(request);
MagazzinoBulk mag = (MagazzinoBulk)bp.getModel();
%>

<html>
Expand All @@ -24,7 +26,7 @@ CRUDAbilitBeneServMagBP bp = (CRUDAbilitBeneServMagBP)BusinessProcess.getBusines
<table class="Panel">
<TR>
<TD><% bp.getController().writeFormLabel(out,"cdMagazzino");%></TD>
<TD><% bp.getController().writeFormInput(out,"cdMagazzino");%></TD>
<TD><% bp.getController().writeFormInput(out,null,"cdMagazzino", !mag.isInQuery(),null,null);%></TD>
</TR>
<TR>
<TD><% bp.getController().writeFormLabel(out,"dsMagazzino");%></TD>
Expand All @@ -49,17 +51,9 @@ CRUDAbilitBeneServMagBP bp = (CRUDAbilitBeneServMagBP)BusinessProcess.getBusines
<tr></tr>
<tr></tr>
<tr>
<td><% bp.getAbilitBeneServMagController().writeFormLabel( out, "cdCategoriaGruppo");%></td>
<td><% bp.getAbilitBeneServMagController().writeFormLabel( out, "findCategoriaGruppo");%></td>
<% bp.getAbilitBeneServMagController().writeFormInput(out,"default","findCategoriaGruppo",!bp.isEditingAbilitazione(),"FormInput", null);%></td>
</tr>
<tr>
<td><% bp.getAbilitBeneServMagController().writeFormLabel(out,"dtIniValidita");%></td>
<td colspan="1"><% bp.getAbilitBeneServMagController().writeFormInput(out,"dtIniValidita");%></td>
</tr>
<tr>
<td><% bp.getAbilitBeneServMagController().writeFormLabel(out,"dtFinValidita");%></td>
<td colspan="1"><% bp.getAbilitBeneServMagController().writeFormInput(out,"dtFinValidita");%></td>
</tr>
</table>
<% bp.closeFormWindow(pageContext); %>
</body>

0 comments on commit 4d07956

Please sign in to comment.