Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
vvenegasv committed Feb 25, 2017
2 parents b1fc2a1 + a0ffa7d commit 1cefccc
Show file tree
Hide file tree
Showing 26 changed files with 296 additions and 174 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="CannotParseNumber" xml:space="preserve">
<value>El valor "{0}" no puede ser convertido a un número válido</value>
</data>
<data name="EngineHasBusinessExceptions" xml:space="preserve">
<value>Se han presentado {0} errores al validar los datos antes de exportarlos. Para más informacion, revise la propiedad "Data"</value>
</data>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// Puede especificar todos los valores o establecer como predeterminados los números de compilación y de revisión
// mediante el carácter '*', como se muestra a continuación:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.1.0")]
[assembly: AssemblyFileVersion("1.2.1.0")]
[assembly: AssemblyVersion("1.3.2.0")]
[assembly: AssemblyFileVersion("1.3.2.0")]
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,23 @@ namespace Infodinamica.Framework.Exportable.Attribute
[AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
public class ImportableAttribute : System.Attribute
{
private int _position;

/// <summary>
/// Constructor
/// Posición de la columna que debe ser leida
/// </summary>
/// <param name="position">Posición de la columna</param>
public ImportableAttribute(int position)
{
_position = position;
}

public int Position { get; set; }

/// <summary>
/// Obtiene la posición de la columna
/// Valor por defecto en caso que el dato contenido en la celda no exista o sea inválido
/// </summary>
/// <returns></returns>
public int GetPosition()
public string DefaultForNullOrInvalidValues { get; set; }

/// <summary>
/// Constructor de la clase
/// </summary>
/// <param name="position"></param>
public ImportableAttribute(int position)
{
return _position;
this.Position = position;
}
}
}
Loading

0 comments on commit 1cefccc

Please sign in to comment.