diff --git a/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj b/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj
index 483a1915e..c71e15641 100644
--- a/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj
+++ b/AYA.SlnSynor/AYA.SlnSynor/AYA.SlnSinort.csproj
@@ -6302,6 +6302,9 @@
+
+
+
@@ -6315,6 +6318,7 @@
+
diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js
index 13d3f474e..f6301d3fb 100644
--- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js
+++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js
@@ -1972,17 +1972,22 @@ this.ValidarAcceder = function (vista, controlador, opcion) {
}
this.ExportarAMsWord = function (html, filename) {
+
+ var tipo = filename == 'DocMatriz' ? 'application/vnd.ms-excel' :'application/msword';
var blob = new Blob(['\ufeff', html], {
- type: 'application/msword'
+ type: tipo
+
});
// Specify link url
- //var url = 'data:application/vnd.ms-word;charset=utf-8,' + encodeURIComponent(html);
- var url = 'data:application/vnd.ms-word;charset=utf-8,' + encodeURIComponent(html);
+
+ var url = filename == 'DocMatriz' ? 'data:application/vnd.ms-excel;charset=utf-8,' + encodeURIComponent(html) : 'data:application/vnd.ms-word;charset=utf-8,' + encodeURIComponent(html);
// Specify file name
- filename = filename ? filename + '.doc' : 'document.doc';
+ var documentoword = filename ? filename + '.doc' : 'document.doc';
+ var documentoexcel = filename ? filename + '.xls' : 'document.xls';
+ filename = filename == 'DocMatriz' ? documentoexcel : documentoword;
// Create download link element
var downloadLink = document.createElement("a");
diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/PropuestaNormativa/DetallePropuestaNormativa.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/PropuestaNormativa/DetallePropuestaNormativa.js
index 20c5d640d..720d477a7 100644
--- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/PropuestaNormativa/DetallePropuestaNormativa.js
+++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/PropuestaNormativa/DetallePropuestaNormativa.js
@@ -1712,15 +1712,19 @@ this.Export2Doc = function (element, filename) {
this.ExportarADoc = function (TipoComentario, filename) {
-
-
- var preHtml = "
SINORT";
+ var preHtml;
+ if (TipoComentario == 'Matriz') {
+ preHtml = "SINORT";
+ } else {
+ preHtml = "SINORT";
+ }
+
var postHtml = "";
var html = preHtml;
html = html + '
';
html = html + '
'
- html = html + 'SISTEMA DE NORMATIVA Y REGULACION TECNICA DEL AyA
'
+ html = html + 'SISTEMA DE NORMATIVA Y REGLAMENTACION TECNICA
'
html = html + '
'
html = html + '' + ((TipoComentario == 'Matriz') ? 'MATRIZ' : 'FORO') + '
' +
'PROYECTO NORMATIVO N. ' + model.ProyectoNormativo.IdProyectoNormativo + ' NOMBRE: ' + model.ProyectoNormativo.NombreProyectoNormativo + '
' ;
diff --git a/AYA.SlnSynor/AYA.SlnSynor/Views/Home/Index.cshtml b/AYA.SlnSynor/AYA.SlnSynor/Views/Home/Index.cshtml
index e732b1872..faa8a3ab9 100644
--- a/AYA.SlnSynor/AYA.SlnSynor/Views/Home/Index.cshtml
+++ b/AYA.SlnSynor/AYA.SlnSynor/Views/Home/Index.cshtml
@@ -2,20 +2,49 @@
Layout = "~/Views/Shared/_Layout.cshtml";
}
+
+*@
+
+
\ No newline at end of file
diff --git a/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml b/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml
index 2423fa415..9d3cb121a 100644
--- a/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml
+++ b/AYA.SlnSynor/AYA.SlnSynor/Views/Shared/_Layout.cshtml
@@ -171,17 +171,23 @@
-
- Normativa y Reglamentación Técnica
+
+
Normativa y Reglamentación Técnica
@@ -202,11 +208,16 @@
- Proyectos Normativos
+
Proyectos Normativos
+
- Estadísticas y Reportes
+
Estadísticas y Reportes
+
+
+ @* Estadísticas y Reportes
-
+ *@
+
+
-
+
@**@
diff --git a/AYA.SlnSynor/AYA.SlnSynor/dist/img/GotaEstadisticas.png b/AYA.SlnSynor/AYA.SlnSynor/dist/img/GotaEstadisticas.png
new file mode 100644
index 000000000..9581c53a3
Binary files /dev/null and b/AYA.SlnSynor/AYA.SlnSynor/dist/img/GotaEstadisticas.png differ
diff --git a/AYA.SlnSynor/AYA.SlnSynor/dist/img/GotaNormativa.png b/AYA.SlnSynor/AYA.SlnSynor/dist/img/GotaNormativa.png
new file mode 100644
index 000000000..4d159767c
Binary files /dev/null and b/AYA.SlnSynor/AYA.SlnSynor/dist/img/GotaNormativa.png differ
diff --git a/AYA.SlnSynor/AYA.SlnSynor/dist/img/GotaProyectos.png b/AYA.SlnSynor/AYA.SlnSynor/dist/img/GotaProyectos.png
new file mode 100644
index 000000000..f8abf2d7a
Binary files /dev/null and b/AYA.SlnSynor/AYA.SlnSynor/dist/img/GotaProyectos.png differ
diff --git a/AYA.SlnSynor/AYA.SlnSynor/dist/img/SINORT_LOGO.png b/AYA.SlnSynor/AYA.SlnSynor/dist/img/SINORT_LOGO.png
new file mode 100644
index 000000000..e51040c3e
Binary files /dev/null and b/AYA.SlnSynor/AYA.SlnSynor/dist/img/SINORT_LOGO.png differ