diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/AYA.SlnSinortModel.csproj b/AYA.SlnSynor/AYA.SlnSynorModel/AYA.SlnSinortModel.csproj index e93dd8119..f7756259d 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/AYA.SlnSinortModel.csproj +++ b/AYA.SlnSynor/AYA.SlnSynorModel/AYA.SlnSinortModel.csproj @@ -117,6 +117,7 @@ + diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/DetalleEncuesta.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/DetalleEncuesta.cs index 5b2442b98..3ccd903fc 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/DetalleEncuesta.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/DetalleEncuesta.cs @@ -27,6 +27,8 @@ namespace AYA.SlnSinortModel.Sinort [StringLength(200)] public string NombrePregunta { get; set; } + public bool? Requerido { get; set; } + [Column(TypeName = "ntext")] public string RespuestaPregunta { get; set; } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/EncabezadoEncuesta.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/EncabezadoEncuesta.cs index 49751cf1c..e6236e4f9 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/EncabezadoEncuesta.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/EncabezadoEncuesta.cs @@ -13,6 +13,7 @@ namespace AYA.SlnSinortModel.Sinort public EncabezadoEncuesta() { DetalleEncuesta = new HashSet(); + UsuariosEncuesta = new HashSet(); } [Key] @@ -36,5 +37,8 @@ namespace AYA.SlnSinortModel.Sinort [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection DetalleEncuesta { get; set; } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection UsuariosEncuesta { get; set; } } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs index 75bbb49e8..a38285fde 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs @@ -8,7 +8,7 @@ namespace AYA.SlnSinortModel.Sinort public partial class SinortContex : Contex { - + public virtual DbSet Aplicacion { get; set; } public virtual DbSet AreaAplicacionDocumentoTecnico { get; set; } @@ -51,6 +51,7 @@ namespace AYA.SlnSinortModel.Sinort public virtual DbSet ProyectoNormativo { get; set; } public virtual DbSet Solicitud { get; set; } public virtual DbSet TareasPendientes { get; set; } + public virtual DbSet UsuariosEncuesta { get; set; } protected override void OnModelCreating(DbModelBuilder modelBuilder) { @@ -456,6 +457,11 @@ namespace AYA.SlnSinortModel.Sinort .WithOptional(e => e.Usuario1) .HasForeignKey(e => e.UsuarioSistema); + modelBuilder.Entity() + .HasMany(e => e.UsuariosEncuesta) + .WithRequired(e => e.Usuario) + .WillCascadeOnDelete(false); + modelBuilder.Entity() .Property(e => e.UsuarioCreacion) .IsUnicode(false); @@ -643,6 +649,12 @@ namespace AYA.SlnSinortModel.Sinort .HasForeignKey(e => e.IdEncabezadoEncuesta) .WillCascadeOnDelete(false); + modelBuilder.Entity() + .HasMany(e => e.UsuariosEncuesta) + .WithRequired(e => e.EncabezadoEncuesta) + .HasForeignKey(e => e.IdEncabezadoEncuesta) + .WillCascadeOnDelete(false); + modelBuilder.Entity() .Property(e => e.DescripcionDocumento) .IsUnicode(false); @@ -852,6 +864,18 @@ namespace AYA.SlnSinortModel.Sinort modelBuilder.Entity() .Property(e => e.UsuarioModificacion) .IsUnicode(false); + + modelBuilder.Entity() + .Property(e => e.UsuarioSistema) + .IsUnicode(false); + + modelBuilder.Entity() + .Property(e => e.UsuarioCreacion) + .IsUnicode(false); + + modelBuilder.Entity() + .Property(e => e.UsuarioModificacion) + .IsUnicode(false); } } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Usuario.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Usuario.cs index 3c1cd2f92..fee4f39df 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Usuario.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Usuario.cs @@ -17,6 +17,7 @@ namespace AYA.SlnSinortModel.Sinort Solicitud = new HashSet(); TareasPendientes = new HashSet(); Solicitud1 = new HashSet(); + UsuariosEncuesta = new HashSet(); } [Key] @@ -55,5 +56,8 @@ namespace AYA.SlnSinortModel.Sinort [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection Solicitud1 { get; set; } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection UsuariosEncuesta { get; set; } } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/UsuariosEncuesta.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/UsuariosEncuesta.cs new file mode 100644 index 000000000..05249411a --- /dev/null +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/UsuariosEncuesta.cs @@ -0,0 +1,38 @@ +namespace AYA.SlnSinortModel.Sinort +{ + using System; + using System.Collections.Generic; + using System.ComponentModel.DataAnnotations; + using System.ComponentModel.DataAnnotations.Schema; + using System.Data.Entity.Spatial; + + [Table("Global.UsuariosEncuesta")] + public partial class UsuariosEncuesta + { + [Key] + [Column(Order = 0)] + [StringLength(200)] + public string UsuarioSistema { get; set; } + + [Key] + [Column(Order = 1)] + [DatabaseGenerated(DatabaseGeneratedOption.None)] + public int IdEncabezadoEncuesta { get; set; } + + public bool? Estado { get; set; } + + public DateTime? FechaCreacion { get; set; } + + [StringLength(500)] + public string UsuarioCreacion { get; set; } + + public DateTime? FechaModificacion { get; set; } + + [StringLength(500)] + public string UsuarioModificacion { get; set; } + + public virtual Usuario Usuario { get; set; } + + public virtual EncabezadoEncuesta EncabezadoEncuesta { get; set; } + } +} diff --git a/AYA.SlnSynor/ReportViewerForMvc/bin/Debug/ReportViewerForMvc.dll b/AYA.SlnSynor/ReportViewerForMvc/bin/Debug/ReportViewerForMvc.dll index be06353bf..12dbab68a 100644 Binary files a/AYA.SlnSynor/ReportViewerForMvc/bin/Debug/ReportViewerForMvc.dll and b/AYA.SlnSynor/ReportViewerForMvc/bin/Debug/ReportViewerForMvc.dll differ diff --git a/AYA.SlnSynor/ReportViewerForMvc/bin/Debug/ReportViewerForMvc.pdb b/AYA.SlnSynor/ReportViewerForMvc/bin/Debug/ReportViewerForMvc.pdb index 1a37db3c5..6abfacee9 100644 Binary files a/AYA.SlnSynor/ReportViewerForMvc/bin/Debug/ReportViewerForMvc.pdb and b/AYA.SlnSynor/ReportViewerForMvc/bin/Debug/ReportViewerForMvc.pdb differ diff --git a/AYA.SlnSynor/ReportViewerForMvc/obj/Debug/ReportViewerForMvc.dll b/AYA.SlnSynor/ReportViewerForMvc/obj/Debug/ReportViewerForMvc.dll index be06353bf..12dbab68a 100644 Binary files a/AYA.SlnSynor/ReportViewerForMvc/obj/Debug/ReportViewerForMvc.dll and b/AYA.SlnSynor/ReportViewerForMvc/obj/Debug/ReportViewerForMvc.dll differ diff --git a/AYA.SlnSynor/ReportViewerForMvc/obj/Debug/ReportViewerForMvc.pdb b/AYA.SlnSynor/ReportViewerForMvc/obj/Debug/ReportViewerForMvc.pdb index 1a37db3c5..6abfacee9 100644 Binary files a/AYA.SlnSynor/ReportViewerForMvc/obj/Debug/ReportViewerForMvc.pdb and b/AYA.SlnSynor/ReportViewerForMvc/obj/Debug/ReportViewerForMvc.pdb differ