Tesoreria Unica - modifiche parziali

consiglionazionaledellericerche · Jan 8, 2016 · 1c7c9d8 · 1c7c9d8
1 parent 73bc3f2
commit 1c7c9d8
Show file tree

Hide file tree

Showing 27 changed files with 1,156 additions and 172 deletions.
diff --git a/sigla-ejb/src/main/java/it/cnr/contab/doccont00/action/CRUDDistintaCassiereAction.java b/sigla-ejb/src/main/java/it/cnr/contab/doccont00/action/CRUDDistintaCassiereAction.java
@@ -1,9 +1,12 @@
 package it.cnr.contab.doccont00.action;
 
 import java.util.*;
+
 import it.cnr.contab.doccont00.core.bulk.*;
 import it.cnr.contab.doccont00.intcass.bulk.*;
 import it.cnr.contab.doccont00.bp.*;
+import it.cnr.contab.firma.bulk.FirmaOTPBulk;
+import it.cnr.contab.util.Utility;
 import it.cnr.jada.action.*;
 import it.cnr.jada.bulk.*;
 import it.cnr.jada.util.*;
@@ -25,10 +28,13 @@ public Forward doAddToCRUDMain_DistintaCassDet(ActionContext context)
 	{
 		CRUDDistintaCassiereBP bp = (CRUDDistintaCassiereBP)getBusinessProcess(context);
 		RicercaMandatoReversaleBP ricercaBP = (RicercaMandatoReversaleBP) context.createBusinessProcess( "RicercaMandatoReversaleBP",  new Object[]{ "MTh" });
-		if (bp.isElencoConUo())
-			ricercaBP.setSearchResultColumnSet("elencoConUo");
+		if (Utility.createParametriCnrComponentSession().getParametriCnr(context.getUserContext(),it.cnr.contab.utenze00.bulk.CNRUserInfo.getEsercizio(context)).getFl_tesoreria_unica().booleanValue())
+			ricercaBP.setSearchResultColumnSet("elencoConUoFirmati");
 		else
-			ricercaBP.setSearchResultColumnSet("default");
+			if (bp.isElencoConUo())
+				ricercaBP.setSearchResultColumnSet("elencoConUo");
+			else
+				ricercaBP.setSearchResultColumnSet("default");
 
         context.addHookForward("bringback", this, "doBringBackDettaglioDistinta");
 		return context.addBusinessProcess(ricercaBP);		
@@ -183,4 +189,47 @@ public Forward doConfermaEstrai(ActionContext context,int option) {
 		return handleException(context,e);
 	}
 }
+public Forward doSign(ActionContext context) {
+	try {
+		CRUDBP bp = getBusinessProcess(context);
+		fillModel(context);
+		if (bp.isDirty())
+			return openContinuePrompt(context,"doConfermaSign");
+		return doConfermaSign(context,OptionBP.YES_BUTTON);
+	} catch(Throwable e) {
+		return handleException(context,e);
+	}
+}
+public Forward doConfermaSign(ActionContext context,int option) {
+	try {
+		if (option == OptionBP.YES_BUTTON) {
+			try {
+				BulkBP firmaOTPBP = (BulkBP) context.createBusinessProcess("FirmaOTPBP");
+				firmaOTPBP.setModel(context, new FirmaOTPBulk());
+				context.addHookForward("firmaOTP",this,"doBackSign");			
+				return context.addBusinessProcess(firmaOTPBP);
+			} catch(Exception e) {
+				return handleException(context,e);
+			}
+		}
+		return context.findDefaultForward();
+	} catch(Throwable e) {
+		return handleException(context,e);
+	}
+}
+
+public Forward doBackSign(ActionContext context) {
+CRUDDistintaCassiereBP bp = (CRUDDistintaCassiereBP)context.getBusinessProcess();
+
+HookForward caller = (HookForward)context.getCaller();
+FirmaOTPBulk firmaOTPBulk = (FirmaOTPBulk) caller.getParameter("firmaOTP");
+try {
+	fillModel(context);	
+	bp.invia(context, firmaOTPBulk);	
+
+} catch(Exception e) {
+	return handleException(context,e);
+}
+return context.findDefaultForward();
+}	
 }
diff --git a/sigla-ejb/src/main/java/it/cnr/contab/doccont00/action/RicercaMandatoReversaleAction.java b/sigla-ejb/src/main/java/it/cnr/contab/doccont00/action/RicercaMandatoReversaleAction.java
@@ -3,10 +3,12 @@
 
 import java.rmi.RemoteException;
 import java.util.*;
+
 import it.cnr.contab.doccont00.core.bulk.*;
 import it.cnr.contab.doccont00.intcass.bulk.*;
 import it.cnr.contab.doccont00.bp.*;
 import it.cnr.contab.utenze00.bp.CNRUserContext;
+import it.cnr.contab.util.Utility;
 import it.cnr.jada.action.*;
 import it.cnr.jada.bulk.*;
 import it.cnr.jada.util.*;
@@ -70,8 +72,12 @@ else if (ri.countElements() == 1) {
 			CRUDDistintaCassiereBP bpp = (CRUDDistintaCassiereBP) bp.getParent();
 
 			bp.setModel(context,model);
-			if (bpp != null && bpp.isUoDistintaTuttaSac(context))
-				setCol = "elencoConUo";
+
+			if (bpp != null && bpp.isUoDistintaTuttaSac(context) &&  (Utility.createParametriCnrComponentSession().getParametriCnr(context.getUserContext(),it.cnr.contab.utenze00.bulk.CNRUserInfo.getEsercizio(context)).getFl_tesoreria_unica().booleanValue()))
+				setCol = "elencoConUoFirmati";
+			else
+				if (bpp != null && bpp.isUoDistintaTuttaSac(context))
+					setCol = "elencoConUo";
 
 			SelezionatoreListaBP nbp = selectMandatiInDistinta(context,
 												ri,