diff --git a/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj b/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj
index 6f25231a3..b21940e50 100644
--- a/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj
+++ b/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj
@@ -6577,6 +6577,10 @@
+
+
+
+
@@ -7598,6 +7602,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/AYA.SlnSynor/AYA.SlnSynor/App_Start/BundleConfig.cs b/AYA.SlnSynor/AYA.SlnSynor/App_Start/BundleConfig.cs
index 7e226e1fa..a65154b2b 100644
--- a/AYA.SlnSynor/AYA.SlnSynor/App_Start/BundleConfig.cs
+++ b/AYA.SlnSynor/AYA.SlnSynor/App_Start/BundleConfig.cs
@@ -28,6 +28,7 @@ namespace AYA.SlnSinort
.Include("~/Scripts/jQuery.FileUpload/jquery.fileupload-process.js")
.Include("~/Scripts/jQuery.FileUpload/jquery.fileupload-validate.js"));
bundles.Add(new ScriptBundle("~/bundles/timepicki").Include("~/Scripts/timepicki.js"));
+ bundles.Add(new ScriptBundle("~/bundles/jquery-fullCalendar").Include("~/Scripts/fullcalendar/fullcalendar.min.js").Include("~/Scripts/fullcalendar/locale/es.js"));
bundles.Add(new StyleBundle("~/Content/css")
.Include("~/Content/Site.css"));
@@ -50,7 +51,8 @@ namespace AYA.SlnSinort
.Include("~/Content/themes/base/jquery.ui.css")
.Include("~/Content/toastr.css")
.Include("~/Content/DataTables-1.10.0/css/jquery.dataTables.css")
- .Include("~/Content/jQuery.FileUpload/css/jquery.fileupload.css"));
+ .Include("~/Content/jQuery.FileUpload/css/jquery.fileupload.css")
+ .Include("~/Content/fullcalendar.css"));
bundles.Add(new ScriptBundle("~/Script-Global")
.Include("~/Sinort-Scripts/ROTn.js")
diff --git a/AYA.SlnSynor/AYA.SlnSynor/Content/fullcalendar.css b/AYA.SlnSynor/AYA.SlnSynor/Content/fullcalendar.css
new file mode 100644
index 000000000..dcbc99975
--- /dev/null
+++ b/AYA.SlnSynor/AYA.SlnSynor/Content/fullcalendar.css
@@ -0,0 +1,1293 @@
+/*!
+ * FullCalendar v3.9.0
+ * Docs & License: https://fullcalendar.io/
+ * (c) 2018 Adam Shaw
+ */
+.fc {
+ direction: ltr;
+ text-align: left; }
+
+.fc-rtl {
+ text-align: right; }
+
+body .fc {
+ /* extra precedence to overcome jqui */
+ font-size: 1em; }
+
+/* Colors
+--------------------------------------------------------------------------------------------------*/
+.fc-highlight {
+ /* when user is selecting cells */
+ background: #bce8f1;
+ opacity: .3; }
+
+.fc-bgevent {
+ /* default look for background events */
+ background: #8fdf82;
+ opacity: .3; }
+
+.fc-nonbusiness {
+ /* default look for non-business-hours areas */
+ /* will inherit .fc-bgevent's styles */
+ background: #d7d7d7; }
+
+/* Buttons (styled
-
-
+
+
-
+
-
+
-
+
@* Matriz*@
@@ -298,16 +305,16 @@
@*Usuario*@
-
-
@@ -412,70 +419,69 @@
@section Modals{
-@*---------------------Adjuntar documentos ---------------------------------------------------------*@
-
-
-
-
-
-
+ @*---------------------Adjuntar documentos ---------------------------------------------------------*@
+
+
+
+
+
+
-
- @*---------------------Descripción ---------------------------------------------------------*@
-
- @*---------------------Comentario ---------------------------------------------------------*@
-
- @*---------------------Doc Auxiliar ---------------------------------------------------------*@
-
- @*---------------------Adjuntar ---------------------------------------------------------*@
-
-
-
@*---------------------Usuario ---------------------------------------------------------*@
@@ -504,7 +510,7 @@
-
+
@@ -548,7 +554,7 @@
-
+
@@ -704,13 +710,35 @@
Aceptar
Cerrar
-
+
+@*---------------------Calendario ---------------------------------------------------------*@
+
}
@Scripts.Render("~/Sinort-Scripts/PropuestaNormativa/DetallePropuestaNormativa.js")
diff --git a/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml b/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml
index 2f36776c4..0212c2ddf 100644
--- a/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml
+++ b/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml
@@ -26,7 +26,6 @@
- @*@Styles.Render("~/Content/dashboard")*@
@Styles.Render("~/Content/themes/base/css")
@Styles.Render("~/Content/sinort-css")
@@ -40,6 +39,7 @@
@Scripts.Render("~/bundles/toastr")
@Scripts.Render("~/bundles/jquery-dataTables")
@Scripts.Render("~/bundles/jquery-fileupload")
+ @Scripts.Render("~/bundles/jquery-fullCalendar")
@* Seccion futuros scripts *@