no message

git-svn-id: https://svn.coded.pt/svn/SIPRP@164 bb69d46d-e84e-40c8-a05a-06db0d633741

trunk/siprp/SingletonConstants.java

@@ -23,6 +23,9 @@ public class SingletonConstants
 	public static final String SUBJECT_VISITA = "subject_visita";
 	public static final String LETTER_VISITA = "letter_visita";
 	public static final String USES_HOUR = "uses_hour";
+	public static final String CODIGO_EMPRESA_FORMAT = "codigo_empresa_format";
+	public static final String FICHA_MARCA_EXAMES = "ficha_marca_exames";
+	public static final String EXCEL_FORMAT = "ficha_marca_exames";
 	
 	public static final String MODULE_FICHA = "module_ficha";
 	public static final String MODULE_CLIENTES = "module_clientes";

trunk/siprp/companydataloaders/SIPRPDataLoader.java

@@ -72,6 +72,9 @@ public class SIPRPDataLoader implements CompanyDataLoader
 					+ "%0A%0A%0A"
 					+ "Cumprimentos,%0A%0ASIPRP" );
 		Singleton.setInstance( SingletonConstants.USES_HOUR, Boolean.FALSE );
+		Singleton.setInstance( SingletonConstants.CODIGO_EMPRESA_FORMAT, "TT/T" );
+		Singleton.setInstance( SingletonConstants.FICHA_MARCA_EXAMES, Boolean.TRUE );
+		Singleton.setInstance( SingletonConstants.EXCEL_FORMAT, new int[]{ 0, 2, 3, 1, -1, 4, 5, 7, 6, -1 } );
 		
 		Singleton.setInstance( SingletonConstants.MODULE_FICHA, Boolean.TRUE );
 		Singleton.setInstance( SingletonConstants.MODULE_CLIENTES, Boolean.TRUE );

trunk/siprp/importer/Importer.java

@@ -6,6 +6,7 @@
 
 package siprp.importer;
 
+import com.evolute.utils.*;
 import com.evolute.utils.arrays.*;
 import com.evolute.utils.tables.*;
 import com.evolute.utils.ui.*;
@@ -19,6 +20,8 @@ import javax.swing.table.*;
 
 import jxl.*;
 
+import siprp.*;
+
 /**
  *
  * @author  psantos
@@ -44,7 +47,7 @@ public class Importer extends CustomJDialog
 	private boolean canceled = false;
 	private DataChooserWindow dcw;
 	private Object vals[][];
-	private final int[] DEFAULT_SELECTION = new int[]{ 0, 2, 3, 1, -1, 4, 5, 7, 6, -1 };
+	private int[] DEFAULT_SELECTION = new int[]{ 0, 2, 3, 1, -1, 4, 5, 7, 6, -1 };
 
 	public static final String NAMES[] = new String[]{
 			NOME,
@@ -72,6 +75,12 @@ public class Importer extends CustomJDialog
 	{
 		super( modalFrame, true );
 		multipleSelection = multiple;
+		
+		int []selection = ( int [] ) Singleton.getInstance( SingletonConstants.EXCEL_FORMAT );
+		if( selection != null )
+		{
+			DEFAULT_SELECTION = selection;
+		}
 		setupComponents( filename );
 		if( modalFrame == null )
 		{