From b01cf77a94c3b2365967b46ea873fd054cd14990 Mon Sep 17 00:00:00 2001 From: jnunez Date: Fri, 20 Jul 2018 16:32:38 +0000 Subject: [PATCH] git-tfs-id: [http://192.168.1.10:8080/tfs/AyA]$/SINORT;C315 --- .../AYA.SlnSynor/Sinort-Scripts/Global.js | 1 + .../BusquedaFichaTecnica.js | 100 +--- .../BusquedaFichaTecnica.cshtml | 496 +----------------- 3 files changed, 24 insertions(+), 573 deletions(-) diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js index 680990ac5..720d880f1 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js +++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/Global.js @@ -880,6 +880,7 @@ $.fn.TableInit = function (columnOrder, order, bPaginate, bFilter, bInfo, column "lengthMenu": [[10, 25, 50, -1], [10, 25, 50, "All"]], //"scrollY": '50vh', //"scrollCollapse": true, + "bSort": false, "fixedHeader": true }); }; diff --git a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/NormativaReglamentacionTecnica/BusquedaFichaTecnica.js b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/NormativaReglamentacionTecnica/BusquedaFichaTecnica.js index 5215612ef..4e0d971e4 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/NormativaReglamentacionTecnica/BusquedaFichaTecnica.js +++ b/AYA.SlnSynor/AYA.SlnSynor/Sinort-Scripts/NormativaReglamentacionTecnica/BusquedaFichaTecnica.js @@ -1,30 +1,10 @@  var Item = {}; +var data; jQuery(document).ready(function () { - //$('#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(); + }); @@ -46,18 +26,21 @@ 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 } ]; - + var contador = 0; $('#tableFichas').DataTable({ + initComplete: function () { - $('#tableFichas').TableInit(1, false, true, false, true, columnDefinition, FichaTecnica); + $('#tableFichas').TableInit(1, false, true, true, true, columnDefinition, FichaTecnica); + this.api().columns().every(function () { + var column = this; var select = $('') - .appendTo($(column.footer()).empty()) + .appendTo($(column.header()).empty()) .on('change', function () { var val = $.fn.dataTable.util.escapeRegex( $(this).val() @@ -69,7 +52,13 @@ this.CargarTablaFichas = function (data) { }); column.data().unique().sort().each(function (d, j) { - select.append('') + if (j == 0) + contador = contador + 1; + + if (contador != 5) + select.append('') + + }); }); } @@ -84,62 +73,7 @@ this.CargarTablaFichas = function (data) { } } -this.CargarFiltros = function () { - $('#tableFichas').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('') - }); - }); - } - }); - - - - - - //StartSelectControlRequest('#drpEmisor'); - //CleanSelectControl('#drpEmisor'); - - //var ArrayEmisores = []; - //var data = FichaTecnica; - - //$.each(data, function (key, item) { - - // var exist = $.grep(ArrayEmisores, function (data) { - // return data == item.DescripcionEmisor; - // }); - - // if (exist.length == 0) { - // ArrayEmisores.push(item.DescripcionEmisor); - // AddSelectOption('#drpEmisor', item.DescripcionEmisor, item.DescripcionEmisor); - // } - //}); - - //var tareas; - //tareas = $("#ucSeleccionarEmisor").html(); - - //$('#tableFichas thead tr th').append(tareas) - - - - -} $('#tableFichas').on('click', 'button', function () { diff --git a/AYA.SlnSynor/AYA.SlnSynor/Views/NormativaReglamentacionTecnica/BusquedaFichaTecnica.cshtml b/AYA.SlnSynor/AYA.SlnSynor/Views/NormativaReglamentacionTecnica/BusquedaFichaTecnica.cshtml index dbd2be462..029d6846a 100644 --- a/AYA.SlnSynor/AYA.SlnSynor/Views/NormativaReglamentacionTecnica/BusquedaFichaTecnica.cshtml +++ b/AYA.SlnSynor/AYA.SlnSynor/Views/NormativaReglamentacionTecnica/BusquedaFichaTecnica.cshtml @@ -13,486 +13,6 @@

- @* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
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
*@ @@ -500,18 +20,19 @@ - @* - *@ + @**@ + - - + @**@ + - + +
@@ -523,11 +44,6 @@
- @*
- -
*@