diff --git a/AYA.SlnSynor/AYA.SlnSinort.sln b/AYA.SlnSynor/AYA.SlnSinort.sln index c10d06829..02a36eb78 100644 --- a/AYA.SlnSynor/AYA.SlnSinort.sln +++ b/AYA.SlnSynor/AYA.SlnSinort.sln @@ -5,8 +5,6 @@ VisualStudioVersion = 12.0.40629.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AYA.SlnSinort", "AYA.SlnSynor\AYA.SlnSinort.csproj", "{D672EAD6-E8C6-4374-B149-DED461546905}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AYA.SlnSinort.Mantenimientos", "AYA.SlnSynor.Mantenimientos\AYA.SlnSinort.Mantenimientos.csproj", "{A9258A1D-E1D1-48F5-B3A9-FF6E69E1F466}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AYA.SlnSinort.WCF", "AYA.SlnSynor.WCF\AYA.SlnSinort.WCF.csproj", "{5FC0EE2B-8F9C-47E1-823F-C5787A3A3E6E}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AYA.SlnSinortModel", "AYA.SlnSynorModel\AYA.SlnSinortModel.csproj", "{9ECD985B-2354-4156-AD6A-3EBD888C0241}" @@ -20,6 +18,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{ADB5B0 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Atesa.Utilitarios", "Atesa.Utilitarios\Atesa.Utilitarios.csproj", "{DF92655D-08EA-4E25-A1E1-EE13CB7902D7}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReportViewerForMvc", "ReportViewerForMvc\ReportViewerForMvc.csproj", "{B7F6A951-ECE3-4BDD-BE20-0F7FFD944695}" +EndProject Global GlobalSection(TeamFoundationVersionControl) = preSolution SccNumberOfProjects = 7 @@ -35,15 +35,15 @@ Global SccProjectUniqueName3 = AYA.SlnSynor\\AYA.SlnSinort.csproj SccProjectName3 = AYA.SlnSynor SccLocalPath3 = AYA.SlnSynor - SccProjectUniqueName4 = AYA.SlnSynor.Mantenimientos\\AYA.SlnSinort.Mantenimientos.csproj - SccProjectName4 = AYA.SlnSynor.Mantenimientos - SccLocalPath4 = AYA.SlnSynor.Mantenimientos - SccProjectUniqueName5 = AYA.SlnSynor.WCF\\AYA.SlnSinort.WCF.csproj - SccProjectName5 = AYA.SlnSynor.WCF - SccLocalPath5 = AYA.SlnSynor.WCF - SccProjectUniqueName6 = Atesa.Utilitarios\\Atesa.Utilitarios.csproj - SccProjectName6 = Atesa.Utilitarios - SccLocalPath6 = Atesa.Utilitarios + SccProjectUniqueName4 = AYA.SlnSynor.WCF\\AYA.SlnSinort.WCF.csproj + SccProjectName4 = AYA.SlnSynor.WCF + SccLocalPath4 = AYA.SlnSynor.WCF + SccProjectUniqueName5 = Atesa.Utilitarios\\Atesa.Utilitarios.csproj + SccProjectName5 = Atesa.Utilitarios + SccLocalPath5 = Atesa.Utilitarios + SccProjectUniqueName6 = ReportViewerForMvc\\ReportViewerForMvc.csproj + SccProjectName6 = ReportViewerForMvc + SccLocalPath6 = ReportViewerForMvc EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -54,10 +54,6 @@ Global {D672EAD6-E8C6-4374-B149-DED461546905}.Debug|Any CPU.Build.0 = Debug|Any CPU {D672EAD6-E8C6-4374-B149-DED461546905}.Release|Any CPU.ActiveCfg = Release|Any CPU {D672EAD6-E8C6-4374-B149-DED461546905}.Release|Any CPU.Build.0 = Release|Any CPU - {A9258A1D-E1D1-48F5-B3A9-FF6E69E1F466}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9258A1D-E1D1-48F5-B3A9-FF6E69E1F466}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9258A1D-E1D1-48F5-B3A9-FF6E69E1F466}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9258A1D-E1D1-48F5-B3A9-FF6E69E1F466}.Release|Any CPU.Build.0 = Release|Any CPU {5FC0EE2B-8F9C-47E1-823F-C5787A3A3E6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {5FC0EE2B-8F9C-47E1-823F-C5787A3A3E6E}.Debug|Any CPU.Build.0 = Debug|Any CPU {5FC0EE2B-8F9C-47E1-823F-C5787A3A3E6E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -74,6 +70,10 @@ Global {DF92655D-08EA-4E25-A1E1-EE13CB7902D7}.Debug|Any CPU.Build.0 = Debug|Any CPU {DF92655D-08EA-4E25-A1E1-EE13CB7902D7}.Release|Any CPU.ActiveCfg = Release|Any CPU {DF92655D-08EA-4E25-A1E1-EE13CB7902D7}.Release|Any CPU.Build.0 = Release|Any CPU + {B7F6A951-ECE3-4BDD-BE20-0F7FFD944695}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B7F6A951-ECE3-4BDD-BE20-0F7FFD944695}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B7F6A951-ECE3-4BDD-BE20-0F7FFD944695}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B7F6A951-ECE3-4BDD-BE20-0F7FFD944695}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/AYA.SlnSynor/AYA.SlnSynor/ReportViewerWebForm.aspx b/AYA.SlnSynor/AYA.SlnSynor/ReportViewerWebForm.aspx new file mode 100644 index 000000000..89e9d2219 --- /dev/null +++ b/AYA.SlnSynor/AYA.SlnSynor/ReportViewerWebForm.aspx @@ -0,0 +1,23 @@ +<%@ Page Language="C#" AutoEventWireup="True" CodeBehind="ReportViewerWebForm.aspx.cs" Inherits="ReportViewerForMvc.ReportViewerWebForm" %> + +<%@ Register Assembly="Microsoft.ReportViewer.WebForms, Version=11.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" Namespace="Microsoft.Reporting.WebForms" TagPrefix="rsweb" %> + + + + + + + + +
+
+ + + + + + +
+
+ + diff --git a/AYA.SlnSynor/AYA.SlnSynor/Scripts/index.d.ts b/AYA.SlnSynor/AYA.SlnSynor/Scripts/index.d.ts deleted file mode 100644 index e83ea0c8d..000000000 --- a/AYA.SlnSynor/AYA.SlnSynor/Scripts/index.d.ts +++ /dev/null @@ -1,138 +0,0 @@ -// Type definitions for popper.js 1.10 -// Project: https://github.com/FezVrasta/popper.js/ -// Definitions by: edcarroll , ggray , rhysd , joscha , seckardt , marcfallows - -// This file only declares the public portions of the API. -// It should not define internal pieces such as utils or modifier details. - -export type Position = 'top' | 'right' | 'bottom' | 'left'; - -export type Placement = 'auto-start' - | 'auto' - | 'auto-end' - | 'top-start' - | 'top' - | 'top-end' - | 'right-start' - | 'right' - | 'right-end' - | 'bottom-end' - | 'bottom' - | 'bottom-start' - | 'left-end' - | 'left' - | 'left-start'; - -export type Boundary = 'scrollParent' | 'viewport' | 'window'; - -export type Behavior = 'flip' | 'clockwise' | 'counterclockwise'; - -export type ModifierFn = (data: Data, options: Object) => Data; - -export interface BaseModifier { - order?: number; - enabled?: boolean; - fn?: ModifierFn; -} - -export interface Modifiers { - shift?: BaseModifier; - offset?: BaseModifier & { - offset?: number | string, - }; - preventOverflow?: BaseModifier & { - priority?: Position[], - padding?: number, - boundariesElement?: Boundary | Element, - escapeWithReference?: boolean - }; - keepTogether?: BaseModifier; - arrow?: BaseModifier & { - element?: string | Element, - }; - flip?: BaseModifier & { - behavior?: Behavior | Position[], - padding?: number, - boundariesElement?: Boundary | Element, - }; - inner?: BaseModifier; - hide?: BaseModifier; - applyStyle?: BaseModifier & { - onLoad?: Function, - gpuAcceleration?: boolean, - }; - computeStyle?: BaseModifier & { - gpuAcceleration?: boolean; - x?: 'bottom' | 'top', - y?: 'left' | 'right' - }; - - [name: string]: (BaseModifier & Record) | undefined; -} - -export interface Offset { - top: number; - left: number; - width: number; - height: number; -} - -export interface Data { - instance: Popper; - placement: Placement; - originalPlacement: Placement; - flipped: boolean; - hide: boolean; - arrowElement: Element; - styles: CSSStyleDeclaration; - boundaries: Object; - offsets: { - popper: Offset, - reference: Offset, - arrow: { - top: number, - left: number, - }, - }; -} - -export interface PopperOptions { - placement?: Placement; - positionFixed?: boolean; - eventsEnabled?: boolean; - modifiers?: Modifiers; - removeOnDestroy?: boolean; - - onCreate?(data: Data): void; - - onUpdate?(data: Data): void; -} - -export interface ReferenceObject { - clientHeight: number; - clientWidth: number; - - getBoundingClientRect(): ClientRect; -} - -declare class Popper { - static modifiers: (BaseModifier & { name: string })[]; - static placements: Placement[]; - static Defaults: PopperOptions; - - options: PopperOptions; - - constructor(reference: Element | ReferenceObject, popper: Element, options?: PopperOptions); - - destroy(): void; - - update(): void; - - scheduleUpdate(): void; - - enableEventListeners(): void; - - disableEventListeners(): void; -} - -export default Popper; diff --git a/AYA.SlnSynor/AYA.SlnSynor/Views/NormativaReglamentacionTecnica/FichaTecnica.cshtml b/AYA.SlnSynor/AYA.SlnSynor/Views/NormativaReglamentacionTecnica/FichaTecnica.cshtml index 324d6665a..8bf7e806b 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Views/NormativaReglamentacionTecnica/FichaTecnica.cshtml +++ b/AYA.SlnSynor/AYA.SlnSynor/Views/NormativaReglamentacionTecnica/FichaTecnica.cshtml @@ -350,11 +350,17 @@ Nombre Creado por - + + + diff --git a/AYA.SlnSynor/AYA.SlnSynor/bower_components/datatables.net-bs/.bower.json b/AYA.SlnSynor/AYA.SlnSynor/bower_components/datatables.net-bs/.bower.json deleted file mode 100644 index 23e1b847d..000000000 --- a/AYA.SlnSynor/AYA.SlnSynor/bower_components/datatables.net-bs/.bower.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "name": "datatables.net-bs", - "description": "DataTables for jQuery with styling for [Bootstrap](http://getbootstrap.com/)", - "main": [ - "js/dataTables.bootstrap.js", - "css/dataTables.bootstrap.css" - ], - "keywords": [ - "filter", - "sort", - "DataTables", - "jQuery", - "table", - "Bootstrap" - ], - "dependencies": { - "jquery": ">=1.7", - "datatables.net": ">=1.10.9" - }, - "moduleType": [ - "globals", - "amd", - "node" - ], - "ignore": [ - "composer.json", - "datatables.json", - "package.json" - ], - "authors": [ - { - "name": "SpryMedia Ltd", - "homepage": "https://datatables.net" - } - ], - "homepage": "https://datatables.net", - "license": "MIT", - "version": "2.1.1", - "_release": "2.1.1", - "_resolution": { - "type": "version", - "tag": "2.1.1", - "commit": "c9aedb3c531795574d69203688888a6c16e02265" - }, - "_source": "https://github.com/DataTables/Dist-DataTables-Bootstrap.git", - "_target": "^2.1.1", - "_originalSource": "datatables.net-bs" -} \ No newline at end of file diff --git a/AYA.SlnSynor/AYA.SlnSynor/bower_components/datatables.net-bs/License.txt b/AYA.SlnSynor/AYA.SlnSynor/bower_components/datatables.net-bs/License.txt deleted file mode 100644 index 379a7e7c8..000000000 --- a/AYA.SlnSynor/AYA.SlnSynor/bower_components/datatables.net-bs/License.txt +++ /dev/null @@ -1,20 +0,0 @@ -Copyright SpryMedia Limited and other contributors -http://datatables.net - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/AYA.SlnSynor/AYA.SlnSynor/bower_components/datatables.net-bs/Readme.md b/AYA.SlnSynor/AYA.SlnSynor/bower_components/datatables.net-bs/Readme.md deleted file mode 100644 index 54acee4ea..000000000 --- a/AYA.SlnSynor/AYA.SlnSynor/bower_components/datatables.net-bs/Readme.md +++ /dev/null @@ -1,50 +0,0 @@ -# DataTables for jQuery with styling for [Bootstrap](http://getbootstrap.com/) - -This package contains distribution files required to style [DataTables library](https://datatables.net) for [jQuery](http://jquery.com/) with styling for [Bootstrap](http://getbootstrap.com/). - -DataTables is a table enhancing library which adds features such as paging, ordering, search, scrolling and many more to a static HTML page. A comprehensive API is also available that can be used to manipulate the table. Please refer to the [DataTables web-site](//datatables.net) for a full range of documentation and examples. - - -## Installation - -### Browser - -For inclusion of this library using a standard `