-
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/AYA.SlnSinortModel.DAL.csproj b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/AYA.SlnSinortModel.DAL.csproj
index b2f7d0ff8..ff8770242 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/AYA.SlnSinortModel.DAL.csproj
+++ b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/AYA.SlnSinortModel.DAL.csproj
@@ -54,12 +54,12 @@
+
-
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/UsuarioDAL.cs b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/UsuarioDAL.cs
index fcb6b2891..759134b2f 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/UsuarioDAL.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel.DAL/Sinort/UsuarioDAL.cs
@@ -118,7 +118,7 @@ namespace AYA.SlnSinortModel.DAL.Sinort
model.FechaCreacion = Actual.FechaCreacion;
model.UsuarioCreacion = Actual.UsuarioCreacion;
model.IdRol = Actual.IdRol;
- model.IdUsuario =Actual.IdUsuario ;
+ model.UsuarioSistema =Actual.UsuarioSistema ;
Conn.Entry(Actual).State = System.Data.Entity.EntityState.Detached;
Conn.RolesUsuario.Attach(model);
Conn.Entry(model).State = System.Data.Entity.EntityState.Modified;
@@ -146,6 +146,42 @@ namespace AYA.SlnSinortModel.DAL.Sinort
}
+ #endregion
+
+ #region UsuariosAyA
+
+ public async Task
ActualizarUsuarios(UsuariosAyAJSON model)
+ {
+
+ try
+ {
+ using (SinortContex Conn = new SinortContex())
+ {
+
+ Conn.Usuario.AddRange(model.ListaUsuariosAyA);
+ await Conn.SaveChangesAsync();
+ Conn.Commit();
+ }
+ }
+ catch (DbEntityValidationException ex)
+ {
+ log.Error(ex);
+ model.CodigoRespuesta = EnumTipoCodigoRespuesta.ERROR.ToString();
+ }
+ catch (Exception ex)
+ {
+ log.Error(ex);
+ model.CodigoRespuesta = EnumTipoCodigoRespuesta.ERROR.ToString();
+ }
+ finally
+ {
+
+ }
+
+
+ return model;
+ }
+
#endregion
}
}
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/App.config b/AYA.SlnSynor/AYA.SlnSynorModel/App.config
index e10b1e80f..f3178c048 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel/App.config
+++ b/AYA.SlnSynor/AYA.SlnSynorModel/App.config
@@ -17,4 +17,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Entidades/CatalogosJSON.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Entidades/CatalogosJSON.cs
index 1a2f73b06..5cfaec345 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel/Entidades/CatalogosJSON.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel/Entidades/CatalogosJSON.cs
@@ -32,4 +32,8 @@ namespace AYA.SlnSinortModel.Entidades
{
public List ListaRolesUsuarios { get; set; }
}
+ public class UsuariosAyAJSON : BaseJson
+ {
+ public List ListaUsuariosAyA { get; set; }
+ }
}
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ComentariosForo.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ComentariosForo.cs
index 387588659..c6df058a8 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ComentariosForo.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ComentariosForo.cs
@@ -34,8 +34,6 @@ namespace AYA.SlnSinortModel.Sinort
[StringLength(200)]
public string UsuarioModificacion { get; set; }
- public virtual Usuario Usuario { get; set; }
-
public virtual Documentos Documentos { get; set; }
public virtual Foro Foro { get; set; }
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ComentariosMatriz.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ComentariosMatriz.cs
index b3db6473b..f808157be 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ComentariosMatriz.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ComentariosMatriz.cs
@@ -44,8 +44,6 @@ namespace AYA.SlnSinortModel.Sinort
[StringLength(200)]
public string UsuarioModificacion { get; set; }
- public virtual Usuario Usuario { get; set; }
-
public virtual Documentos Documentos { get; set; }
public virtual Matriz Matriz { get; set; }
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Convocatoria.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Convocatoria.cs
index 08789ab02..34f6f986b 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Convocatoria.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Convocatoria.cs
@@ -29,8 +29,6 @@ namespace AYA.SlnSinortModel.Sinort
[StringLength(200)]
public string UsuarioModificacion { get; set; }
- public virtual Usuario Usuario { get; set; }
-
public virtual Foro Foro { get; set; }
}
}
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ConvocatoriaProyectoNormativo.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ConvocatoriaProyectoNormativo.cs
index 3ef968a04..c470ac533 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ConvocatoriaProyectoNormativo.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ConvocatoriaProyectoNormativo.cs
@@ -29,8 +29,6 @@ namespace AYA.SlnSinortModel.Sinort
[StringLength(200)]
public string UsuarioModificacion { get; set; }
- public virtual Usuario Usuario { get; set; }
-
public virtual ProyectoNormativo ProyectoNormativo { get; set; }
}
}
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/RolesUsuario.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/RolesUsuario.cs
index 4c785f0f2..b878702ca 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/RolesUsuario.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/RolesUsuario.cs
@@ -15,7 +15,8 @@ namespace AYA.SlnSinortModel.Sinort
public int? IdRol { get; set; }
- public int? IdUsuario { get; set; }
+ [StringLength(200)]
+ public string UsuarioSistema { get; set; }
public bool? Estado { get; set; }
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs
index ba7b00ba8..f64ec3d8a 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs
@@ -8,8 +8,7 @@ namespace AYA.SlnSinortModel.Sinort
public partial class SinortContex : Contex
{
-
-
+
public virtual DbSet Aplicacion { get; set; }
public virtual DbSet Categoria { get; set; }
public virtual DbSet Emisor { get; set; }
@@ -161,6 +160,10 @@ namespace AYA.SlnSinortModel.Sinort
.Property(e => e.UsuarioModificacion)
.IsUnicode(false);
+ modelBuilder.Entity()
+ .Property(e => e.UsuarioSistema)
+ .IsUnicode(false);
+
modelBuilder.Entity()
.Property(e => e.UsuarioCreacion)
.IsUnicode(false);
@@ -261,16 +264,6 @@ namespace AYA.SlnSinortModel.Sinort
.Property(e => e.UsuarioModificacion)
.IsUnicode(false);
- modelBuilder.Entity()
- .HasMany(e => e.Convocatoria)
- .WithRequired(e => e.Usuario)
- .WillCascadeOnDelete(false);
-
- modelBuilder.Entity()
- .HasMany(e => e.ConvocatoriaProyectoNormativo)
- .WithRequired(e => e.Usuario)
- .WillCascadeOnDelete(false);
-
modelBuilder.Entity()
.Property(e => e.UsuarioCreacion)
.IsUnicode(false);
diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Usuario.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Usuario.cs
index 1b431bade..c0bf67595 100644
--- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Usuario.cs
+++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Usuario.cs
@@ -13,16 +13,11 @@ namespace AYA.SlnSinortModel.Sinort
public Usuario()
{
RolesUsuario = new HashSet();
- ComentariosForo = new HashSet();
- ComentariosMatriz = new HashSet();
- Convocatoria = new HashSet();
- ConvocatoriaProyectoNormativo = new HashSet();
}
- [Key]
- [DatabaseGenerated(DatabaseGeneratedOption.None)]
- public int IdUsuario { get; set; }
+ public int? IdUsuario { get; set; }
+ [Key]
[StringLength(200)]
public string UsuarioSistema { get; set; }
@@ -46,17 +41,5 @@ namespace AYA.SlnSinortModel.Sinort
[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
public virtual ICollection RolesUsuario { get; set; }
-
- [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
- public virtual ICollection ComentariosForo { get; set; }
-
- [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
- public virtual ICollection ComentariosMatriz { get; set; }
-
- [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
- public virtual ICollection Convocatoria { get; set; }
-
- [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")]
- public virtual ICollection ConvocatoriaProyectoNormativo { get; set; }
}
}
diff --git a/AYA.SlnSynor/Atesa.Utilitarios/ObtieneParametros.cs b/AYA.SlnSynor/Atesa.Utilitarios/ObtieneParametros.cs
index fa06941ba..c755ac26d 100644
--- a/AYA.SlnSynor/Atesa.Utilitarios/ObtieneParametros.cs
+++ b/AYA.SlnSynor/Atesa.Utilitarios/ObtieneParametros.cs
@@ -25,7 +25,7 @@ namespace Atesa.Utilitarios
}
catch
{
- throw new Exception("The registry key 'Parametros' does not exist and could not create it");
+ throw new Exception("The registry key 'ParametrosProceso' does not exist and could not create it");
}
}
public void AddValueKeyRegedit(string KeyStringName, string KeyStringValue, bool Encrypt)