diff --git a/AYA.SlnSynor/AYA.SlnSynor/Controllers/Catalogos/CatalogosController.cs b/AYA.SlnSynor/AYA.SlnSynor/Controllers/Catalogos/CatalogosController.cs index 5b5ad6a00..21c086767 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Controllers/Catalogos/CatalogosController.cs +++ b/AYA.SlnSynor/AYA.SlnSynor/Controllers/Catalogos/CatalogosController.cs @@ -7,7 +7,7 @@ using System.Web.Mvc; namespace AYA.SlnSinort.Controllers.Catalogos { - //[LoggingFilter] + [LoggingFilter] public class CatalogosController : BaseController { diff --git a/AYA.SlnSynor/AYA.SlnSynor/Controllers/HomeController.cs b/AYA.SlnSynor/AYA.SlnSynor/Controllers/HomeController.cs index 5a31d8a9e..e1c903e47 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Controllers/HomeController.cs +++ b/AYA.SlnSynor/AYA.SlnSynor/Controllers/HomeController.cs @@ -6,7 +6,7 @@ using System.Web.Mvc; namespace AYA.SlnSinort.Controllers { - //[LoggingFilter] + [LoggingFilter] public class HomeController : BaseController { public ActionResult Index() diff --git a/AYA.SlnSynor/AYA.SlnSynor/Controllers/NormativaReglamentacionTecnicaController.cs b/AYA.SlnSynor/AYA.SlnSynor/Controllers/NormativaReglamentacionTecnicaController.cs index 8844203cb..9972caf82 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Controllers/NormativaReglamentacionTecnicaController.cs +++ b/AYA.SlnSynor/AYA.SlnSynor/Controllers/NormativaReglamentacionTecnicaController.cs @@ -8,7 +8,7 @@ namespace AYA.SlnSinort.Controllers.NormativaReglamentacionTecnica { public class NormativaReglamentacionTecnicaController : BaseController { - //[LoggingFilter] + [LoggingFilter] public ActionResult FichaTecnica() { InitControllers(); diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js index 70440b12d..680990ac5 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js +++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js @@ -1654,10 +1654,10 @@ this.CerrarSesion = function () { contentType: "application/json; charset=utf-8", dataType: "json", success: function () { - document.location.href = url; + document.location.href = "http://localhost/AYA.SlnSinort/"; }, error: function () { - document.location.href = url; + document.location.href = "http://localhost/AYA.SlnSinort/"; } }); } diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/NormativaReglamentacionTecnica/BusquedaFichaTecnica.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/NormativaReglamentacionTecnica/BusquedaFichaTecnica.js index e19888f2b..5215612ef 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/NormativaReglamentacionTecnica/BusquedaFichaTecnica.js +++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/NormativaReglamentacionTecnica/BusquedaFichaTecnica.js @@ -2,9 +2,30 @@ var Item = {}; jQuery(document).ready(function () { - //$('#tableFichas').TableInit(0, false, false, false, false, null, null); - //$('#tableFichas').DataTable().column(0).visible(false); + //$('#example').DataTable({ + // initComplete: function () { + // this.api().columns().every(function () { + // var column = this; + // var select = $('') + // .appendTo($(column.footer()).empty()) + // .on('change', function () { + // var val = $.fn.dataTable.util.escapeRegex( + // $(this).val() + // ); + + // column + // .search(val ? '^' + val + '$' : '', true, false) + // .draw(); + // }); + + // column.data().unique().sort().each(function (d, j) { + // select.append('') + // }); + // }); + // } + //}); CargarFichas(); + }); this.CargarFichas = function () { @@ -25,19 +46,41 @@ this.CargarTablaFichas = function (data) { { "data": 'IdFichaTecnica' }, { "data": "DescripcionEmisor" }, { "data": "DescripcionDocumentoTecnico" }, - { "data": "DescripcionAplicacion" }, + { "data": "DescripcionAplicacion" } //{ "data": "FechaPublicacionDocumentoTecnico", "render": function (value) { return DateFormatNoTime(value); } }, - { "data": null, className: "center", defaultContent: Seleccionar } + //{ "data": null, className: "center", defaultContent: Seleccionar } ]; + $('#tableFichas').DataTable({ + initComplete: function () { + $('#tableFichas').TableInit(1, false, true, false, true, columnDefinition, FichaTecnica); + this.api().columns().every(function () { + var column = this; + var select = $('') + .appendTo($(column.footer()).empty()) + .on('change', function () { + var val = $.fn.dataTable.util.escapeRegex( + $(this).val() + ); + + column + .search(val ? '^' + val + '$' : '', true, false) + .draw(); + }); + + column.data().unique().sort().each(function (d, j) { + select.append('') + }); + }); + } + }); - $('#tableFichas').TableInit(1, false, true, false, true, columnDefinition, FichaTecnica); - CargarFiltros(); if ($.fn.DataTable.isDataTable('#tableFichas')) { $('#tableFichas').DataTable().search('').draw(); ENDREQUEST(); } + } } diff --git a/AYA.SlnSynor/AYA.SlnSynor/Views/NormativaReglamentacionTecnica/BusquedaFichaTecnica.cshtml b/AYA.SlnSynor/AYA.SlnSynor/Views/NormativaReglamentacionTecnica/BusquedaFichaTecnica.cshtml index 0876ec5e4..dbd2be462 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Views/NormativaReglamentacionTecnica/BusquedaFichaTecnica.cshtml +++ b/AYA.SlnSynor/AYA.SlnSynor/Views/NormativaReglamentacionTecnica/BusquedaFichaTecnica.cshtml @@ -7,12 +7,492 @@
- +

   Consulta de Fichas Técnicas Vigentes


+ @* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NamePositionOfficeAgeStart dateSalary
Tiger NixonSystem ArchitectEdinburgh612011/04/25$320,800
Garrett WintersAccountantTokyo632011/07/25$170,750
Ashton CoxJunior Technical AuthorSan Francisco662009/01/12$86,000
Cedric KellySenior Javascript DeveloperEdinburgh222012/03/29$433,060
Airi SatouAccountantTokyo332008/11/28$162,700
Brielle WilliamsonIntegration SpecialistNew York612012/12/02$372,000
Herrod ChandlerSales AssistantSan Francisco592012/08/06$137,500
Rhona DavidsonIntegration SpecialistTokyo552010/10/14$327,900
Colleen HurstJavascript DeveloperSan Francisco392009/09/15$205,500
Sonya FrostSoftware EngineerEdinburgh232008/12/13$103,600
Jena GainesOffice ManagerLondon302008/12/19$90,560
Quinn FlynnSupport LeadEdinburgh222013/03/03$342,000
Charde MarshallRegional DirectorSan Francisco362008/10/16$470,600
Haley KennedySenior Marketing DesignerLondon432012/12/18$313,500
Tatyana FitzpatrickRegional DirectorLondon192010/03/17$385,750
Michael SilvaMarketing DesignerLondon662012/11/27$198,500
Paul ByrdChief Financial Officer (CFO)New York642010/06/09$725,000
Gloria LittleSystems AdministratorNew York592009/04/10$237,500
Bradley GreerSoftware EngineerLondon412012/10/13$132,000
Dai RiosPersonnel LeadEdinburgh352012/09/26$217,500
Jenette CaldwellDevelopment LeadNew York302011/09/03$345,000
Yuri BerryChief Marketing Officer (CMO)New York402009/06/25$675,000
Caesar VancePre-Sales SupportNew York212011/12/12$106,450
Doris WilderSales AssistantSidney232010/09/20$85,600
Angelica RamosChief Executive Officer (CEO)London472009/10/09$1,200,000
Gavin JoyceDeveloperEdinburgh422010/12/22$92,575
Jennifer ChangRegional DirectorSingapore282010/11/14$357,650
Brenden WagnerSoftware EngineerSan Francisco282011/06/07$206,850
Fiona GreenChief Operating Officer (COO)San Francisco482010/03/11$850,000
Shou ItouRegional MarketingTokyo202011/08/14$163,000
Michelle HouseIntegration SpecialistSidney372011/06/02$95,400
Suki BurksDeveloperLondon532009/10/22$114,500
Prescott BartlettTechnical AuthorLondon272011/05/07$145,000
Gavin CortezTeam LeaderSan Francisco222008/10/26$235,500
Martena MccrayPost-Sales supportEdinburgh462011/03/09$324,050
Unity ButlerMarketing DesignerSan Francisco472009/12/09$85,675
Howard HatfieldOffice ManagerSan Francisco512008/12/16$164,500
Hope FuentesSecretarySan Francisco412010/02/12$109,850
Vivian HarrellFinancial ControllerSan Francisco622009/02/14$452,500
Timothy MooneyOffice ManagerLondon372008/12/11$136,200
Jackson BradshawDirectorNew York652008/09/26$645,750
Olivia LiangSupport EngineerSingapore642011/02/03$234,500
Bruno NashSoftware EngineerLondon382011/05/03$163,500
Sakura YamamotoSupport EngineerTokyo372009/08/19$139,575
Thor WaltonDeveloperNew York612013/08/11$98,540
Finn CamachoSupport EngineerSan Francisco472009/07/07$87,500
Serge BaldwinData CoordinatorSingapore642012/04/09$138,575
Zenaida FrankSoftware EngineerNew York632010/01/04$125,250
Zorita SerranoSoftware EngineerSan Francisco562012/06/01$115,000
Jennifer AcostaJunior Javascript DeveloperEdinburgh432013/02/01$75,650
Cara StevensSales AssistantNew York462011/12/06$145,600
Hermione ButlerRegional DirectorLondon472011/03/21$356,250
Lael GreerSystems AdministratorLondon212009/02/27$103,500
Jonas AlexanderDeveloperSan Francisco302010/07/14$86,500
Shad DeckerRegional DirectorEdinburgh512008/11/13$183,000
Michael BruceJavascript DeveloperSingapore292011/06/27$183,000
Donna SniderCustomer SupportNew York272011/01/25$112,000
NamePositionOfficeAgeStart dateSalary
*@ @@ -20,10 +500,18 @@ - @**@ - + @* + *@ + + + + + + + +
diff --git a/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml b/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml index 60341c031..1c9ff803e 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml +++ b/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml @@ -16,7 +16,8 @@ - + + diff --git a/AYA.SlnSynor/AYA.SlnSynor/Web.config b/AYA.SlnSynor/AYA.SlnSynor/Web.config index d61698e4b..408492386 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Web.config +++ b/AYA.SlnSynor/AYA.SlnSynor/Web.config @@ -25,9 +25,9 @@ @@ -37,7 +37,7 @@ - + diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/AYA.SlnSinortModel.csproj b/AYA.SlnSynor/AYA.SlnSynorModel/AYA.SlnSinortModel.csproj index 8befa4945..3ec4ce44f 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/AYA.SlnSinortModel.csproj +++ b/AYA.SlnSynor/AYA.SlnSynorModel/AYA.SlnSinortModel.csproj @@ -85,6 +85,7 @@ + diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Aplicacion.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Aplicacion.cs index 61548d69b..a0cf908e6 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Aplicacion.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Aplicacion.cs @@ -12,7 +12,7 @@ namespace AYA.SlnSinortModel.Sinort [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public Aplicacion() { - FichaTecnicas = new HashSet(); + FichaTecnica = new HashSet(); } [Key] @@ -40,7 +40,7 @@ namespace AYA.SlnSinortModel.Sinort public string UsuarioModificacion { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection FichaTecnicas { get; set; } + public virtual ICollection FichaTecnica { get; set; } public virtual TipoAplicacion TipoAplicacion { get; set; } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/AreaAplicacionDocumentoTecnico.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/AreaAplicacionDocumentoTecnico.cs index 126c78a4c..ade1f72f4 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/AreaAplicacionDocumentoTecnico.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/AreaAplicacionDocumentoTecnico.cs @@ -12,7 +12,7 @@ namespace AYA.SlnSinortModel.Sinort [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public AreaAplicacionDocumentoTecnico() { - Solicituds = new HashSet(); + Solicitud = new HashSet(); } [Key] @@ -35,6 +35,6 @@ namespace AYA.SlnSinortModel.Sinort public string UsuarioModificacion { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection Solicituds { get; set; } + public virtual ICollection Solicitud { get; set; } } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Calendario.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Calendario.cs index 7e7fad7a6..5f7cfe971 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Calendario.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Calendario.cs @@ -41,7 +41,7 @@ namespace AYA.SlnSinortModel.Sinort [StringLength(200)] public string UsuarioModificacion { get; set; } - public virtual DocumentosAdjunto DocumentosAdjunto { get; set; } + public virtual DocumentosAdjuntos DocumentosAdjuntos { get; set; } public virtual ProyectoNormativo ProyectoNormativo { get; set; } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ComentariosProyecto.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ComentariosProyecto.cs index 031cdf69b..6d3f87f1c 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ComentariosProyecto.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ComentariosProyecto.cs @@ -54,7 +54,7 @@ namespace AYA.SlnSinortModel.Sinort [StringLength(200)] public string UsuarioModificacion { get; set; } - public virtual DocumentosAdjunto DocumentosAdjunto { get; set; } + public virtual DocumentosAdjuntos DocumentosAdjuntos { get; set; } public virtual ProyectoNormativo ProyectoNormativo { get; set; } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Contenido.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Contenido.cs index 7f05600c2..317f574a9 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Contenido.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Contenido.cs @@ -12,8 +12,8 @@ namespace AYA.SlnSinortModel.Sinort [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public Contenido() { - FichaTecnicas = new HashSet(); - SubCategoriaContenidoes = new HashSet(); + FichaTecnica = new HashSet(); + SubCategoriaContenido = new HashSet(); } [Key] @@ -39,9 +39,9 @@ namespace AYA.SlnSinortModel.Sinort public string UsuarioModificacion { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection FichaTecnicas { get; set; } + public virtual ICollection FichaTecnica { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection SubCategoriaContenidoes { get; set; } + public virtual ICollection SubCategoriaContenido { get; set; } } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/DocumentoTecnico.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/DocumentoTecnico.cs index 3556c76d0..746a1c47f 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/DocumentoTecnico.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/DocumentoTecnico.cs @@ -12,7 +12,7 @@ namespace AYA.SlnSinortModel.Sinort [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public DocumentoTecnico() { - FichaTecnicas = new HashSet(); + FichaTecnica = new HashSet(); } [Key] @@ -38,6 +38,6 @@ namespace AYA.SlnSinortModel.Sinort public string UsuarioModificacion { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection FichaTecnicas { get; set; } + public virtual ICollection FichaTecnica { get; set; } } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/DocumentosAdjuntos.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/DocumentosAdjuntos.cs index 936161a0e..bc9ddc31f 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/DocumentosAdjuntos.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/DocumentosAdjuntos.cs @@ -16,6 +16,7 @@ namespace AYA.SlnSinortModel.Sinort Calendario = new HashSet(); ComentariosProyecto = new HashSet(); FichaTecnica = new HashSet(); + GotitasNormativas = new HashSet(); } [Key] @@ -74,5 +75,8 @@ namespace AYA.SlnSinortModel.Sinort [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection FichaTecnica { get; set; } + + [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] + public virtual ICollection GotitasNormativas { get; set; } } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Emisor.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Emisor.cs index 78e0e5bb8..206e08d58 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Emisor.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Emisor.cs @@ -12,7 +12,7 @@ namespace AYA.SlnSinortModel.Sinort [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public Emisor() { - FichaTecnicas = new HashSet(); + FichaTecnica = new HashSet(); } [Key] @@ -37,7 +37,7 @@ namespace AYA.SlnSinortModel.Sinort public string UsuarioModificacion { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection FichaTecnicas { get; set; } + public virtual ICollection FichaTecnica { get; set; } public virtual TipoEmisor TipoEmisor { get; set; } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Estado.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Estado.cs index f7e56437e..6a9eba444 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Estado.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Estado.cs @@ -12,8 +12,8 @@ namespace AYA.SlnSinortModel.Sinort [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public Estado() { - FichaTecnicas = new HashSet(); - Solicituds = new HashSet(); + FichaTecnica = new HashSet(); + Solicitud = new HashSet(); } [Key] @@ -39,11 +39,11 @@ namespace AYA.SlnSinortModel.Sinort public string UsuarioModificacion { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection FichaTecnicas { get; set; } + public virtual ICollection FichaTecnica { get; set; } public virtual TipoEstado TipoEstado { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection Solicituds { get; set; } + public virtual ICollection Solicitud { get; set; } } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/FichaTecnica.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/FichaTecnica.cs index 980975040..d652e9de1 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/FichaTecnica.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/FichaTecnica.cs @@ -12,7 +12,7 @@ namespace AYA.SlnSinortModel.Sinort [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public FichaTecnica() { - FichaTecnicaPalabraClaves = new HashSet(); + FichaTecnicaPalabraClave = new HashSet(); } [Key] @@ -106,9 +106,9 @@ namespace AYA.SlnSinortModel.Sinort public virtual SubCategoriaGrupoTematico SubCategoriaGrupoTematico { get; set; } - public virtual DocumentosAdjunto DocumentosAdjunto { get; set; } + public virtual DocumentosAdjuntos DocumentosAdjuntos { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection FichaTecnicaPalabraClaves { get; set; } + public virtual ICollection FichaTecnicaPalabraClave { get; set; } } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/GotitasNormativas.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/GotitasNormativas.cs new file mode 100644 index 000000000..3764162f0 --- /dev/null +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/GotitasNormativas.cs @@ -0,0 +1,42 @@ +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.GotitasNormativas")] + public partial class GotitasNormativas + { + [Key] + public int IdGotitaNormativa { get; set; } + + [StringLength(500)] + public string Nombre { get; set; } + + [StringLength(500)] + public string Descripcion { get; set; } + + public DateTime? FechaCaducidad { get; set; } + + public int? IdDocumentoAdjunto { get; set; } + + [StringLength(200)] + public string DescripcionDocumentoAdjunto { get; set; } + + public bool? Estado { get; set; } + + public DateTime? FechaCreacion { get; set; } + + [StringLength(200)] + public string UsuarioCreacion { get; set; } + + public DateTime? FechaModificacion { get; set; } + + [StringLength(200)] + public string UsuarioModificacion { get; set; } + + public virtual DocumentosAdjuntos DocumentosAdjuntos { get; set; } + } +} diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/GrupoTematico.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/GrupoTematico.cs index 01ed121aa..0ac1e0e8a 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/GrupoTematico.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/GrupoTematico.cs @@ -12,8 +12,8 @@ namespace AYA.SlnSinortModel.Sinort [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public GrupoTematico() { - FichaTecnicas = new HashSet(); - SubCategoriaGrupoTematicoes = new HashSet(); + FichaTecnica = new HashSet(); + SubCategoriaGrupoTematico = new HashSet(); } [Key] @@ -39,9 +39,9 @@ namespace AYA.SlnSinortModel.Sinort public string UsuarioModificacion { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection FichaTecnicas { get; set; } + public virtual ICollection FichaTecnica { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection SubCategoriaGrupoTematicoes { get; set; } + public virtual ICollection SubCategoriaGrupoTematico { get; set; } } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/PalabraClave.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/PalabraClave.cs index c0c1966ab..1f19a2c8d 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/PalabraClave.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/PalabraClave.cs @@ -12,7 +12,7 @@ namespace AYA.SlnSinortModel.Sinort [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public PalabraClave() { - FichaTecnicaPalabraClaves = new HashSet(); + FichaTecnicaPalabraClave = new HashSet(); } [Key] @@ -35,6 +35,6 @@ namespace AYA.SlnSinortModel.Sinort public string UsuarioModificacion { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection FichaTecnicaPalabraClaves { get; set; } + public virtual ICollection FichaTecnicaPalabraClave { get; set; } } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ProyectoNormativo.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ProyectoNormativo.cs index 7079a3329..6ce2db86c 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ProyectoNormativo.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/ProyectoNormativo.cs @@ -12,9 +12,9 @@ namespace AYA.SlnSinortModel.Sinort [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public ProyectoNormativo() { - Calendarios = new HashSet(); - ComentariosProyectoes = new HashSet(); - Convocatorias = new HashSet(); + Calendario = new HashSet(); + ComentariosProyecto = new HashSet(); + Convocatoria = new HashSet(); } [Key] @@ -71,12 +71,12 @@ namespace AYA.SlnSinortModel.Sinort public virtual TipoProyecto TipoProyecto { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection Calendarios { get; set; } + public virtual ICollection Calendario { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection ComentariosProyectoes { get; set; } + public virtual ICollection ComentariosProyecto { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection Convocatorias { get; set; } + public virtual ICollection Convocatoria { get; set; } } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/RolesUsuario.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/RolesUsuario.cs index ac4bd75a1..b878702ca 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/RolesUsuario.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/RolesUsuario.cs @@ -30,7 +30,7 @@ namespace AYA.SlnSinortModel.Sinort [StringLength(200)] public string UsuarioModificacion { get; set; } - public virtual Role Role { get; set; } + public virtual Roles Roles { get; set; } public virtual Usuario Usuario { get; set; } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs index 1c4bb0b02..e6422403f 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SinortContex.cs @@ -4,48 +4,50 @@ namespace AYA.SlnSinortModel.Sinort using System.Data.Entity; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; + using AYA.SlnSinortModel.Sinort.Partial; public partial class SinortContex : Contex { + - public virtual DbSet Aplicacions { get; set; } - public virtual DbSet AreaAplicacionDocumentoTecnicoes { get; set; } - public virtual DbSet Categorias { get; set; } - public virtual DbSet Contenidoes { get; set; } - public virtual DbSet DocumentoTecnicoes { get; set; } - public virtual DbSet Emisors { get; set; } - public virtual DbSet Estadoes { get; set; } - public virtual DbSet GrupoTematicoes { get; set; } - public virtual DbSet Mantenimientoes { get; set; } - public virtual DbSet PalabraClaves { get; set; } - public virtual DbSet Pantallas { get; set; } - public virtual DbSet PlantillaEmails { get; set; } - public virtual DbSet Roles { get; set; } - public virtual DbSet RolesPantallas { get; set; } - public virtual DbSet RolesUsuarios { get; set; } - public virtual DbSet SubCategoriaContenidoes { get; set; } - public virtual DbSet SubCategoriaGrupoTematicoes { get; set; } - public virtual DbSet SubCategoriaTipoDocumentoes { get; set; } - public virtual DbSet TipoAplicacions { get; set; } - public virtual DbSet TipoComentarios { get; set; } - public virtual DbSet TipoDocumentoes { get; set; } - public virtual DbSet TipoEmisors { get; set; } - public virtual DbSet TipoEstadoes { get; set; } - public virtual DbSet TipoProyectoes { get; set; } - public virtual DbSet TipoSolicituds { get; set; } - public virtual DbSet Usuarios { get; set; } - public virtual DbSet BitacoraDocumentos { get; set; } - public virtual DbSet Documentos { get; set; } - public virtual DbSet DocumentosAdjuntos { get; set; } - public virtual DbSet Calendarios { get; set; } - public virtual DbSet ComentariosProyectoes { get; set; } - public virtual DbSet Convocatorias { get; set; } - public virtual DbSet FichaTecnicas { get; set; } - public virtual DbSet FichaTecnicaPalabraClaves { get; set; } - public virtual DbSet GotitasNormativas { get; set; } - public virtual DbSet ProyectoNormativoes { get; set; } - public virtual DbSet Solicituds { get; set; } - public virtual DbSet TareasPendientes { get; set; } + public virtual DbSet Aplicacion { get; set; } + public virtual DbSet AreaAplicacionDocumentoTecnico { get; set; } + public virtual DbSet Categoria { get; set; } + public virtual DbSet Contenido { get; set; } + public virtual DbSet DocumentoTecnico { get; set; } + public virtual DbSet Emisor { get; set; } + public virtual DbSet Estado { get; set; } + public virtual DbSet GrupoTematico { get; set; } + public virtual DbSet Mantenimiento { get; set; } + public virtual DbSet PalabraClave { get; set; } + public virtual DbSet Pantallas { get; set; } + public virtual DbSet PlantillaEmail { get; set; } + public virtual DbSet Roles { get; set; } + public virtual DbSet RolesPantallas { get; set; } + public virtual DbSet RolesUsuario { get; set; } + public virtual DbSet SubCategoriaContenido { get; set; } + public virtual DbSet SubCategoriaGrupoTematico { get; set; } + public virtual DbSet SubCategoriaTipoDocumento { get; set; } + public virtual DbSet TipoAplicacion { get; set; } + public virtual DbSet TipoComentario { get; set; } + public virtual DbSet TipoDocumento { get; set; } + public virtual DbSet TipoEmisor { get; set; } + public virtual DbSet TipoEstado { get; set; } + public virtual DbSet TipoProyecto { get; set; } + public virtual DbSet TipoSolicitud { get; set; } + public virtual DbSet Usuario { get; set; } + public virtual DbSet BitacoraDocumentos { get; set; } + public virtual DbSet Documentos { get; set; } + public virtual DbSet DocumentosAdjuntos { get; set; } + public virtual DbSet Calendario { get; set; } + public virtual DbSet ComentariosProyecto { get; set; } + public virtual DbSet Convocatoria { get; set; } + public virtual DbSet FichaTecnica { get; set; } + public virtual DbSet FichaTecnicaPalabraClave { get; set; } + public virtual DbSet GotitasNormativas { get; set; } + public virtual DbSet ProyectoNormativo { get; set; } + public virtual DbSet Solicitud { get; set; } + public virtual DbSet TareasPendientes { get; set; } protected override void OnModelCreating(DbModelBuilder modelBuilder) { @@ -98,7 +100,7 @@ namespace AYA.SlnSinortModel.Sinort .IsUnicode(false); modelBuilder.Entity() - .HasMany(e => e.SubCategoriaContenidoes) + .HasMany(e => e.SubCategoriaContenido) .WithRequired(e => e.Contenido) .WillCascadeOnDelete(false); @@ -139,7 +141,7 @@ namespace AYA.SlnSinortModel.Sinort .IsUnicode(false); modelBuilder.Entity() - .HasMany(e => e.Solicituds) + .HasMany(e => e.Solicitud) .WithOptional(e => e.Estado1) .HasForeignKey(e => e.IdEstadoSolicitud); @@ -156,7 +158,7 @@ namespace AYA.SlnSinortModel.Sinort .IsUnicode(false); modelBuilder.Entity() - .HasMany(e => e.SubCategoriaGrupoTematicoes) + .HasMany(e => e.SubCategoriaGrupoTematico) .WithRequired(e => e.GrupoTematico) .WillCascadeOnDelete(false); @@ -189,23 +191,23 @@ namespace AYA.SlnSinortModel.Sinort .IsUnicode(false); modelBuilder.Entity() - .HasMany(e => e.FichaTecnicaPalabraClaves) + .HasMany(e => e.FichaTecnicaPalabraClave) .WithRequired(e => e.PalabraClave) .WillCascadeOnDelete(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.Descripcion) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.Vista) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.UsuarioCreacion) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.UsuarioModificacion) .IsUnicode(false); @@ -233,23 +235,23 @@ namespace AYA.SlnSinortModel.Sinort .Property(e => e.UsuarioModificacion) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.Descripcion) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.UsuarioCreacion) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.UsuarioModificacion) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.UsuarioCreacion) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.UsuarioModificacion) .IsUnicode(false); @@ -343,7 +345,7 @@ namespace AYA.SlnSinortModel.Sinort .IsUnicode(false); modelBuilder.Entity() - .HasMany(e => e.SubCategoriaTipoDocumentoes) + .HasMany(e => e.SubCategoriaTipoDocumento) .WithRequired(e => e.TipoDocumento) .WillCascadeOnDelete(false); @@ -416,12 +418,12 @@ namespace AYA.SlnSinortModel.Sinort .IsUnicode(false); modelBuilder.Entity() - .HasMany(e => e.Convocatorias) + .HasMany(e => e.Convocatoria) .WithRequired(e => e.Usuario) .WillCascadeOnDelete(false); modelBuilder.Entity() - .HasMany(e => e.Solicituds) + .HasMany(e => e.Solicitud) .WithOptional(e => e.Usuario) .HasForeignKey(e => e.NombreSuperior); @@ -431,72 +433,72 @@ namespace AYA.SlnSinortModel.Sinort .HasForeignKey(e => e.UsuarioAsignado); modelBuilder.Entity() - .HasMany(e => e.Solicituds1) + .HasMany(e => e.Solicitud1) .WithOptional(e => e.Usuario1) .HasForeignKey(e => e.UsuarioSistema); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.UsuarioCreacion) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.UsuarioModificacion) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.NombreDocumento) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.UsuarioCreacion) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.UsuarioModificacion) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .HasMany(e => e.BitacoraDocumentos) - .WithRequired(e => e.Documento) + .WithRequired(e => e.Documentos) .WillCascadeOnDelete(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.Nombre) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.DescTipoDocumento) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.DescIdSubTipoDocumento) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.TipoArchivo) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.UsuarioCreacion) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.UsuarioModificacion) .IsUnicode(false); - modelBuilder.Entity() - .HasMany(e => e.Calendarios) - .WithOptional(e => e.DocumentosAdjunto) + modelBuilder.Entity() + .HasMany(e => e.Calendario) + .WithOptional(e => e.DocumentosAdjuntos) .HasForeignKey(e => e.IdDocumento); - modelBuilder.Entity() - .HasMany(e => e.ComentariosProyectoes) - .WithOptional(e => e.DocumentosAdjunto) + modelBuilder.Entity() + .HasMany(e => e.ComentariosProyecto) + .WithOptional(e => e.DocumentosAdjuntos) .HasForeignKey(e => e.IdDocumento); - modelBuilder.Entity() - .HasMany(e => e.FichaTecnicas) - .WithOptional(e => e.DocumentosAdjunto) + modelBuilder.Entity() + .HasMany(e => e.FichaTecnica) + .WithOptional(e => e.DocumentosAdjuntos) .HasForeignKey(e => e.IdDocumento); modelBuilder.Entity() @@ -636,7 +638,7 @@ namespace AYA.SlnSinortModel.Sinort .IsUnicode(false); modelBuilder.Entity() - .HasMany(e => e.FichaTecnicaPalabraClaves) + .HasMany(e => e.FichaTecnicaPalabraClave) .WithRequired(e => e.FichaTecnica) .WillCascadeOnDelete(false); @@ -652,23 +654,23 @@ namespace AYA.SlnSinortModel.Sinort .Property(e => e.UsuarioModificacion) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.Nombre) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.Descripcion) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.DescripcionDocumentoAdjunto) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.UsuarioCreacion) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.UsuarioModificacion) .IsUnicode(false); @@ -709,7 +711,7 @@ namespace AYA.SlnSinortModel.Sinort .IsUnicode(false); modelBuilder.Entity() - .HasMany(e => e.Convocatorias) + .HasMany(e => e.Convocatoria) .WithRequired(e => e.ProyectoNormativo) .WillCascadeOnDelete(false); @@ -749,35 +751,35 @@ namespace AYA.SlnSinortModel.Sinort .Property(e => e.UsuarioModificacion) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.Descripcion) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.ContenidoRelacionado) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.TipoTareaPendiente) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.UsuarioAsignado) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.NombreProyectoNormativo) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.PromotorProyectoNormativo) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.UsuarioCreacion) .IsUnicode(false); - modelBuilder.Entity() + modelBuilder.Entity() .Property(e => e.UsuarioModificacion) .IsUnicode(false); } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SubCategoriaContenido.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SubCategoriaContenido.cs index 0da56b79c..5a60670aa 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SubCategoriaContenido.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SubCategoriaContenido.cs @@ -12,7 +12,7 @@ namespace AYA.SlnSinortModel.Sinort [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public SubCategoriaContenido() { - FichaTecnicas = new HashSet(); + FichaTecnica = new HashSet(); } [Key] @@ -39,6 +39,6 @@ namespace AYA.SlnSinortModel.Sinort public virtual Contenido Contenido { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection FichaTecnicas { get; set; } + public virtual ICollection FichaTecnica { get; set; } } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SubCategoriaGrupoTematico.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SubCategoriaGrupoTematico.cs index f24b05d5b..59b76b9aa 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SubCategoriaGrupoTematico.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SubCategoriaGrupoTematico.cs @@ -12,7 +12,7 @@ namespace AYA.SlnSinortModel.Sinort [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public SubCategoriaGrupoTematico() { - FichaTecnicas = new HashSet(); + FichaTecnica = new HashSet(); } [Key] @@ -39,6 +39,6 @@ namespace AYA.SlnSinortModel.Sinort public virtual GrupoTematico GrupoTematico { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection FichaTecnicas { get; set; } + public virtual ICollection FichaTecnica { get; set; } } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SubCategoriaTipoDocumento.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SubCategoriaTipoDocumento.cs index 5aa79647f..58b631d9e 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SubCategoriaTipoDocumento.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/SubCategoriaTipoDocumento.cs @@ -12,7 +12,7 @@ namespace AYA.SlnSinortModel.Sinort [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public SubCategoriaTipoDocumento() { - DocumentosAdjuntos = new HashSet(); + DocumentosAdjuntos = new HashSet(); } [Key] @@ -37,7 +37,7 @@ namespace AYA.SlnSinortModel.Sinort public string UsuarioModificacion { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection DocumentosAdjuntos { get; set; } + public virtual ICollection DocumentosAdjuntos { get; set; } public virtual TipoDocumento TipoDocumento { get; set; } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoAplicacion.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoAplicacion.cs index 0f6695e92..571471dd8 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoAplicacion.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoAplicacion.cs @@ -12,7 +12,7 @@ namespace AYA.SlnSinortModel.Sinort [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public TipoAplicacion() { - Aplicacions = new HashSet(); + Aplicacion = new HashSet(); } [Key] @@ -35,6 +35,6 @@ namespace AYA.SlnSinortModel.Sinort public string UsuarioModificacion { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection Aplicacions { get; set; } + public virtual ICollection Aplicacion { get; set; } } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoDocumento.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoDocumento.cs index 86b54ed12..df09ca0f6 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoDocumento.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoDocumento.cs @@ -12,9 +12,9 @@ namespace AYA.SlnSinortModel.Sinort [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public TipoDocumento() { - SubCategoriaTipoDocumentoes = new HashSet(); - Documentos = new HashSet(); - DocumentosAdjuntos = new HashSet(); + SubCategoriaTipoDocumento = new HashSet(); + Documentos = new HashSet(); + DocumentosAdjuntos = new HashSet(); } [Key] @@ -37,12 +37,12 @@ namespace AYA.SlnSinortModel.Sinort public string UsuarioModificacion { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection SubCategoriaTipoDocumentoes { get; set; } + public virtual ICollection SubCategoriaTipoDocumento { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection Documentos { get; set; } + public virtual ICollection Documentos { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection DocumentosAdjuntos { get; set; } + public virtual ICollection DocumentosAdjuntos { get; set; } } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoEmisor.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoEmisor.cs index cc756869f..b3e80b65d 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoEmisor.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoEmisor.cs @@ -12,7 +12,7 @@ namespace AYA.SlnSinortModel.Sinort [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public TipoEmisor() { - Emisors = new HashSet(); + Emisor = new HashSet(); } [Key] @@ -35,6 +35,6 @@ namespace AYA.SlnSinortModel.Sinort public string UsuarioModificacion { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection Emisors { get; set; } + public virtual ICollection Emisor { get; set; } } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoEstado.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoEstado.cs index c9bff37e1..0a3ee2aec 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoEstado.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoEstado.cs @@ -12,7 +12,7 @@ namespace AYA.SlnSinortModel.Sinort [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public TipoEstado() { - Estadoes = new HashSet(); + Estado1 = new HashSet(); } [Key] @@ -35,6 +35,6 @@ namespace AYA.SlnSinortModel.Sinort public string UsuarioModificacion { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection Estadoes { get; set; } + public virtual ICollection Estado1 { get; set; } } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoProyecto.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoProyecto.cs index 0a2c96042..774f92b9c 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoProyecto.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoProyecto.cs @@ -12,7 +12,7 @@ namespace AYA.SlnSinortModel.Sinort [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public TipoProyecto() { - ProyectoNormativoes = new HashSet(); + ProyectoNormativo = new HashSet(); } [Key] @@ -33,6 +33,6 @@ namespace AYA.SlnSinortModel.Sinort public string UsuarioModificacion { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection ProyectoNormativoes { get; set; } + public virtual ICollection ProyectoNormativo { get; set; } } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoSolicitud.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoSolicitud.cs index 1476894f7..570e5ad1d 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoSolicitud.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/TipoSolicitud.cs @@ -12,7 +12,7 @@ namespace AYA.SlnSinortModel.Sinort [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public TipoSolicitud() { - Solicituds = new HashSet(); + Solicitud = new HashSet(); } [Key] @@ -35,6 +35,6 @@ namespace AYA.SlnSinortModel.Sinort public string UsuarioModificacion { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection Solicituds { get; set; } + public virtual ICollection Solicitud { get; set; } } } diff --git a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Usuario.cs b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Usuario.cs index d166b0f2a..3c1cd2f92 100644 --- a/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Usuario.cs +++ b/AYA.SlnSynor/AYA.SlnSynorModel/Sinort/Usuario.cs @@ -12,11 +12,11 @@ namespace AYA.SlnSinortModel.Sinort [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")] public Usuario() { - RolesUsuarios = new HashSet(); - Convocatorias = new HashSet(); - Solicituds = new HashSet(); - TareasPendientes = new HashSet(); - Solicituds1 = new HashSet(); + RolesUsuario = new HashSet(); + Convocatoria = new HashSet(); + Solicitud = new HashSet(); + TareasPendientes = new HashSet(); + Solicitud1 = new HashSet(); } [Key] @@ -42,18 +42,18 @@ namespace AYA.SlnSinortModel.Sinort public string UsuarioModificacion { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection RolesUsuarios { get; set; } + public virtual ICollection RolesUsuario { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection Convocatorias { get; set; } + public virtual ICollection Convocatoria { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection Solicituds { get; set; } + public virtual ICollection Solicitud { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection TareasPendientes { get; set; } + public virtual ICollection TareasPendientes { get; set; } [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection Solicituds1 { get; set; } + public virtual ICollection Solicitud1 { get; set; } } }