From da65188ca9982f9c8eeaf94c020f726b740d4c31 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Sat, 18 Sep 2021 12:57:15 +0200 Subject: [PATCH 01/16] Update NavMenu --- MP.Land/Shared/NavMenu.razor | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/MP.Land/Shared/NavMenu.razor b/MP.Land/Shared/NavMenu.razor index 0044cc52..d87bb531 100644 --- a/MP.Land/Shared/NavMenu.razor +++ b/MP.Land/Shared/NavMenu.razor @@ -13,13 +13,33 @@
  • - - Archivio File + + QR User
  • - - Setup + + Update vers + +
    • +
  • + + Config Import + +
    • +
  • + + About + +
    • +
  • + + Contacts + +
    • +
  • + + System Info
    • From 3267f6a44db5dbc01eb2034d641291d5ee805e36 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 20 Sep 2021 11:03:52 +0200 Subject: [PATCH 02/16] Implementazione vocabolario (sync) --- MP.AppAuth/AppAuthContext.cs | 18 +++++++- MP.AppAuth/Controllers/AppAuthController.cs | 15 +++++++ MP.AppAuth/Models/Vocabolario.cs | 21 +++++++++ MP.AppAuth/MoonProContext.cs | 18 +++++++- MP.Land/Data/AppAuthService.cs | 47 +++++++++++++++++++++ MP.Land/MP.Land.csproj | 4 +- MP.Land/Pages/Index.razor | 5 ++- MP.Land/Pages/Index.razor.cs | 10 +++++ MP.Land/Resources/ChangeLog.html | 2 +- MP.Land/Resources/VersNum.txt | 2 +- MP.Land/Resources/manifest.xml | 2 +- MP.Land/Startup.cs | 4 +- MP.Land/appsettings.json | 2 +- MP.Prog/appsettings.json | 2 +- MP.Stats/MP.Stats.csproj | 2 +- MP.Stats/Resources/ChangeLog.html | 2 +- MP.Stats/Resources/VersNum.txt | 2 +- MP.Stats/Resources/manifest.xml | 6 +-- 18 files changed, 146 insertions(+), 18 deletions(-) create mode 100644 MP.AppAuth/Models/Vocabolario.cs diff --git a/MP.AppAuth/AppAuthContext.cs b/MP.AppAuth/AppAuthContext.cs index fad88874..29066c68 100644 --- a/MP.AppAuth/AppAuthContext.cs +++ b/MP.AppAuth/AppAuthContext.cs @@ -59,9 +59,10 @@ namespace MP.AppAuth #region Public Properties //public virtual DbSet DbSetMacchine { get; set; } - //public virtual DbSet DbSetProgFile { get; set; } public virtual DbSet DbSetUpdMan { get; set; } + public virtual DbSet DbSetVocabolario { get; set; } + #endregion Public Properties #region Private Methods @@ -92,6 +93,21 @@ namespace MP.AppAuth { modelBuilder.HasAnnotation("Relational:Collation", "SQL_Latin1_General_CP1_CI_AS"); + modelBuilder.Entity(entity => + { + entity.HasKey(e => new { e.Lingua, e.Lemma }); + + entity.ToTable("Vocabolario"); + + entity.Property(e => e.Lingua).HasMaxLength(3); + + entity.Property(e => e.Lemma).HasMaxLength(50); + + entity.Property(e => e.Traduzione) + .IsRequired() + .HasMaxLength(500); + }); + // modelBuilder.Seed(); diff --git a/MP.AppAuth/Controllers/AppAuthController.cs b/MP.AppAuth/Controllers/AppAuthController.cs index ef16df17..08b1a064 100644 --- a/MP.AppAuth/Controllers/AppAuthController.cs +++ b/MP.AppAuth/Controllers/AppAuthController.cs @@ -81,6 +81,21 @@ namespace MP.AppAuth.Controllers return dbResult; } + /// + /// Elenco Record x gestione Update + /// + /// + public List VocabolarioGetAll() + { + List dbResult = new List(); + + dbResult = dbCtx + .DbSetVocabolario + .ToList(); + + return dbResult; + } + #endregion Public Methods } } \ No newline at end of file diff --git a/MP.AppAuth/Models/Vocabolario.cs b/MP.AppAuth/Models/Vocabolario.cs new file mode 100644 index 00000000..15b6f1c6 --- /dev/null +++ b/MP.AppAuth/Models/Vocabolario.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations.Schema; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MP.AppAuth.Models +{ + [Table("Vocabolario")] + public partial class Vocabolario + { + #region Public Properties + + public string Lemma { get; set; } + public string Lingua { get; set; } + public string Traduzione { get; set; } + + #endregion Public Properties + } +} \ No newline at end of file diff --git a/MP.AppAuth/MoonProContext.cs b/MP.AppAuth/MoonProContext.cs index ef7a9291..33453f34 100644 --- a/MP.AppAuth/MoonProContext.cs +++ b/MP.AppAuth/MoonProContext.cs @@ -43,7 +43,8 @@ namespace MP.AppAuth public virtual DbSet LinkMenuJqms { get; set; } public virtual DbSet ListValues { get; set; } public virtual DbSet Macchines { get; set; } - public virtual DbSet UpdMen { get; set; } + public virtual DbSet UpdMan { get; set; } + public virtual DbSet Vocabolario { get; set; } #endregion Public Properties @@ -518,6 +519,21 @@ namespace MP.AppAuth .HasDefaultValueSql("('')"); }); + modelBuilder.Entity(entity => + { + entity.HasKey(e => new { e.Lingua, e.Lemma }); + + entity.ToTable("Vocabolario"); + + entity.Property(e => e.Lingua).HasMaxLength(3); + + entity.Property(e => e.Lemma).HasMaxLength(50); + + entity.Property(e => e.Traduzione) + .IsRequired() + .HasMaxLength(500); + }); + OnModelCreatingPartial(modelBuilder); } diff --git a/MP.Land/Data/AppAuthService.cs b/MP.Land/Data/AppAuthService.cs index 5a17d488..ed3b396d 100644 --- a/MP.Land/Data/AppAuthService.cs +++ b/MP.Land/Data/AppAuthService.cs @@ -8,6 +8,8 @@ using NLog; using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Caching.Memory; using System.Diagnostics; +using System.Text; +using Newtonsoft.Json; namespace MP.Land.Data { @@ -38,6 +40,8 @@ namespace MP.Land.Data /// private int chSliExp = 5; + private Dictionary Vocabolario = new Dictionary(); + #endregion Private Fields #region Public Fields @@ -90,6 +94,36 @@ namespace MP.Land.Data #endregion Private Properties + #region Protected Methods + + protected async Task CheckVoc() + { + string cacheKey = "MP:VOCAB"; + string rawData; + //var redisDataList = await distributedCache.GetAsync(cacheKey); + var redisDataList = distributedCache.Get(cacheKey); + if (redisDataList != null) + { + rawData = Encoding.UTF8.GetString(redisDataList); + Vocabolario = JsonConvert.DeserializeObject>(rawData); + } + if (Vocabolario.Count == 0) + { + Stopwatch stopWatch = new Stopwatch(); + stopWatch.Start(); + Vocabolario = dbController.VocabolarioGetAll().ToDictionary(x => $"{x.Lingua}#{x.Lemma}", x => x.Traduzione); + rawData = JsonConvert.SerializeObject(Vocabolario); + redisDataList = Encoding.UTF8.GetBytes(rawData); + distributedCache.Set(cacheKey, redisDataList, cacheOptLong); + //await distributedCache.SetAsync(cacheKey, redisDataList, cacheOptLong); + stopWatch.Stop(); + TimeSpan ts = stopWatch.Elapsed; + Log.Trace($"Effettuato rilettura da DB + caching per Vocabolario: {ts.TotalMilliseconds} ms"); + } + } + + #endregion Protected Methods + #region Public Methods public void Dispose() @@ -97,6 +131,19 @@ namespace MP.Land.Data throw new NotImplementedException(); } + public async Task Traduci(string lemma, string lingua = "IT") + { + string answ = $"__{lemma}__"; + string keyReq = $"{lingua}#{lemma}"; + await CheckVoc(); + // cerco in vocabolario... + if (Vocabolario.ContainsKey(keyReq)) + { + answ = Vocabolario[keyReq]; + } + return answ; + } + public async Task> UpdManList() { List dbResult = new List(); diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj index e9b03c72..105a6265 100644 --- a/MP.Land/MP.Land.csproj +++ b/MP.Land/MP.Land.csproj @@ -3,7 +3,7 @@ net5.0 MP.Land - 1.1.2109.1812 + 1.1.2109.2011 @@ -31,7 +31,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/MP.Land/Pages/Index.razor b/MP.Land/Pages/Index.razor index 59e3ac5a..1006c710 100644 --- a/MP.Land/Pages/Index.razor +++ b/MP.Land/Pages/Index.razor @@ -44,7 +44,10 @@

    @item.AppName

    - detttagli + dettagli +
      + @(traduci($"{item.AppName}-LIST")) +
    @if (string.IsNullOrEmpty(item.LicenseKey)) { diff --git a/MP.Land/Pages/Index.razor.cs b/MP.Land/Pages/Index.razor.cs index 1f8023fb..f4903b86 100644 --- a/MP.Land/Pages/Index.razor.cs +++ b/MP.Land/Pages/Index.razor.cs @@ -71,6 +71,16 @@ namespace MP.Land.Pages await Task.Delay(1); } + protected MarkupString traduci(string lemma) + { + MarkupString answ; + //string rawHtml = "
  • primo
  • secondo
    • "; + string rawHtml = DataService.Traduci(lemma, "IT").Result; + answ = new MarkupString(rawHtml); + // cerco nella cache Redis + return answ; + } + #endregion Protected Methods } } \ No newline at end of file diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html index e2cfb611..342c67d8 100644 --- a/MP.Land/Resources/ChangeLog.html +++ b/MP.Land/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo gestione Programmi MAPO -

    Versione: 1.1.2109.1812

    +

    Versione: 1.1.2109.2011


    Note di rilascio:
      diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt index ec7dc9b4..440efd98 100644 --- a/MP.Land/Resources/VersNum.txt +++ b/MP.Land/Resources/VersNum.txt @@ -1 +1 @@ -1.1.2109.1812 +1.1.2109.2011 diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml index 31ade05b..1a60e419 100644 --- a/MP.Land/Resources/manifest.xml +++ b/MP.Land/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.1.2109.1812 + 1.1.2109.2011 https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/MP.Land.zip https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/ChangeLog.html false diff --git a/MP.Land/Startup.cs b/MP.Land/Startup.cs index 665b2123..c6dd8202 100644 --- a/MP.Land/Startup.cs +++ b/MP.Land/Startup.cs @@ -105,8 +105,8 @@ namespace MP.Land services.AddStackExchangeRedisCache(options => { - //options.Configuration = "localhost:6379"; - options.ConfigurationOptions = new StackExchange.Redis.ConfigurationOptions() { KeepAlive = 180, DefaultDatabase = 5, EndPoints = { { "localhost", 6379 } } }; + options.Configuration = Configuration["ConnectionStrings:Redis"]; + //options.ConfigurationOptions = new StackExchange.Redis.ConfigurationOptions() { KeepAlive = 180, DefaultDatabase = 1, EndPoints = { { "localhost", 6379 } } }; options.InstanceName = "MP:Land"; }); diff --git a/MP.Land/appsettings.json b/MP.Land/appsettings.json index 28740eea..d7fa4540 100644 --- a/MP.Land/appsettings.json +++ b/MP.Land/appsettings.json @@ -17,6 +17,6 @@ "ConnectionStrings": { "DefaultConnection": "Server=SQL2016DEV;Database=MoonPro;Trusted_Connection=True;MultipleActiveResultSets=true", "MP.Land": "Server=SQL2016DEV;Database=MoonPro;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;", - "Redis": "localhost:6379" + "Redis": "localhost:6379,defaultDatabase=1,keepAlive=180,asyncTimeout=5000" } } \ No newline at end of file diff --git a/MP.Prog/appsettings.json b/MP.Prog/appsettings.json index 1336c695..0ffa0a63 100644 --- a/MP.Prog/appsettings.json +++ b/MP.Prog/appsettings.json @@ -15,7 +15,7 @@ }, "AllowedHosts": "*", "ConnectionStrings": { - "DefaultConnection": "Server=SQL2016DEV;Database=MoonPro_PROG;Trusted_Connection=True;MultipleActiveResultSets=true", + "DefaultConnection": "Server=SQL2016DEV;Database=MoonPro_PROG;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Prog;", "Mp.Prog": "Server=SQL2016DEV;Database=MoonPro_PROG;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Prog;", "Redis": "localhost:6379" } diff --git a/MP.Stats/MP.Stats.csproj b/MP.Stats/MP.Stats.csproj index 184464c3..ae779454 100644 --- a/MP.Stats/MP.Stats.csproj +++ b/MP.Stats/MP.Stats.csproj @@ -4,7 +4,7 @@ net5.0 MP.Stats 826e877c-ba70-4253-84cb-d0b1cafd4440 - 1.1.2109.1617 + 1.1.2109.2010 diff --git a/MP.Stats/Resources/ChangeLog.html b/MP.Stats/Resources/ChangeLog.html index e2c7ddbd..bc59a157 100644 --- a/MP.Stats/Resources/ChangeLog.html +++ b/MP.Stats/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo statistiche MAPO -

      Versione: 1.1.2109.1617

      +

      Versione: 1.1.2109.2010


      Note di rilascio:
        diff --git a/MP.Stats/Resources/VersNum.txt b/MP.Stats/Resources/VersNum.txt index 5bac5ea4..8aec05e9 100644 --- a/MP.Stats/Resources/VersNum.txt +++ b/MP.Stats/Resources/VersNum.txt @@ -1 +1 @@ -1.1.2109.1617 +1.1.2109.2010 diff --git a/MP.Stats/Resources/manifest.xml b/MP.Stats/Resources/manifest.xml index bf837864..fade9946 100644 --- a/MP.Stats/Resources/manifest.xml +++ b/MP.Stats/Resources/manifest.xml @@ -1,7 +1,7 @@ - 1.1.2109.1617 - https://nexus.steamware.net/repository/SWS/MP-STATS/stable/0/MP.Stats.zip - https://nexus.steamware.net/repository/SWS/MP-STATS/stable/0/ChangeLog.html + 1.1.2109.2010 + https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/MP.Stats.zip + https://nexus.steamware.net/repository/SWS/MP-STATS/stable/LAST/ChangeLog.html false From 4070c4600f5ce43444ac8ffe7936add5d1595b14 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 20 Sep 2021 11:54:06 +0200 Subject: [PATCH 03/16] Fix chiamate vocabolario sovrapposte --- MP.Land/Data/AppAuthService.cs | 46 ++++++++++++++++++---------------- MP.Land/Pages/Index.razor.cs | 2 +- MP.Land/Startup.cs | 2 +- 3 files changed, 27 insertions(+), 23 deletions(-) diff --git a/MP.Land/Data/AppAuthService.cs b/MP.Land/Data/AppAuthService.cs index ed3b396d..f75d8083 100644 --- a/MP.Land/Data/AppAuthService.cs +++ b/MP.Land/Data/AppAuthService.cs @@ -96,29 +96,32 @@ namespace MP.Land.Data #region Protected Methods - protected async Task CheckVoc() + protected void CheckVoc() { string cacheKey = "MP:VOCAB"; string rawData; - //var redisDataList = await distributedCache.GetAsync(cacheKey); - var redisDataList = distributedCache.Get(cacheKey); - if (redisDataList != null) - { - rawData = Encoding.UTF8.GetString(redisDataList); - Vocabolario = JsonConvert.DeserializeObject>(rawData); - } if (Vocabolario.Count == 0) { - Stopwatch stopWatch = new Stopwatch(); - stopWatch.Start(); - Vocabolario = dbController.VocabolarioGetAll().ToDictionary(x => $"{x.Lingua}#{x.Lemma}", x => x.Traduzione); - rawData = JsonConvert.SerializeObject(Vocabolario); - redisDataList = Encoding.UTF8.GetBytes(rawData); - distributedCache.Set(cacheKey, redisDataList, cacheOptLong); - //await distributedCache.SetAsync(cacheKey, redisDataList, cacheOptLong); - stopWatch.Stop(); - TimeSpan ts = stopWatch.Elapsed; - Log.Trace($"Effettuato rilettura da DB + caching per Vocabolario: {ts.TotalMilliseconds} ms"); + //var redisDataList = await distributedCache.GetAsync(cacheKey); + var redisDataList = distributedCache.Get(cacheKey); + if (redisDataList != null) + { + rawData = Encoding.UTF8.GetString(redisDataList); + Vocabolario = JsonConvert.DeserializeObject>(rawData); + } + else + { + Stopwatch stopWatch = new Stopwatch(); + stopWatch.Start(); + Vocabolario = dbController.VocabolarioGetAll().ToDictionary(x => $"{x.Lingua}#{x.Lemma}", x => x.Traduzione); + rawData = JsonConvert.SerializeObject(Vocabolario); + redisDataList = Encoding.UTF8.GetBytes(rawData); + distributedCache.Set(cacheKey, redisDataList, cacheOptLong); + //await distributedCache.SetAsync(cacheKey, redisDataList, cacheOptLong); + stopWatch.Stop(); + TimeSpan ts = stopWatch.Elapsed; + Log.Trace($"Effettuato rilettura da DB + caching per Vocabolario: {ts.TotalMilliseconds} ms"); + } } } @@ -128,14 +131,15 @@ namespace MP.Land.Data public void Dispose() { - throw new NotImplementedException(); + // Clear database controller + dbController.Dispose(); } - public async Task Traduci(string lemma, string lingua = "IT") + public string Traduci(string lemma, string lingua = "IT") { string answ = $"__{lemma}__"; string keyReq = $"{lingua}#{lemma}"; - await CheckVoc(); + CheckVoc(); // cerco in vocabolario... if (Vocabolario.ContainsKey(keyReq)) { diff --git a/MP.Land/Pages/Index.razor.cs b/MP.Land/Pages/Index.razor.cs index f4903b86..f803a9c2 100644 --- a/MP.Land/Pages/Index.razor.cs +++ b/MP.Land/Pages/Index.razor.cs @@ -75,7 +75,7 @@ namespace MP.Land.Pages { MarkupString answ; //string rawHtml = "
      • primo
      • secondo
        • "; - string rawHtml = DataService.Traduci(lemma, "IT").Result; + string rawHtml = DataService.Traduci(lemma, "IT"); answ = new MarkupString(rawHtml); // cerco nella cache Redis return answ; diff --git a/MP.Land/Startup.cs b/MP.Land/Startup.cs index c6dd8202..65b36ec6 100644 --- a/MP.Land/Startup.cs +++ b/MP.Land/Startup.cs @@ -105,8 +105,8 @@ namespace MP.Land services.AddStackExchangeRedisCache(options => { - options.Configuration = Configuration["ConnectionStrings:Redis"]; //options.ConfigurationOptions = new StackExchange.Redis.ConfigurationOptions() { KeepAlive = 180, DefaultDatabase = 1, EndPoints = { { "localhost", 6379 } } }; + options.Configuration = Configuration["ConnectionStrings:Redis"]; options.InstanceName = "MP:Land"; }); From 74c13ed1a74561792f7c92f9703ba82e24daca36 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 20 Sep 2021 12:43:34 +0200 Subject: [PATCH 04/16] Update display componenti in elenco --- MP.Land/Data/AppAuthService.cs | 4 +--- MP.Land/MP.Land.csproj | 2 +- MP.Land/Pages/Index.razor | 23 ++++++++++++++++------- MP.Land/Pages/Index.razor.cs | 9 +++++++++ MP.Land/Resources/ChangeLog.html | 2 +- MP.Land/Resources/VersNum.txt | 2 +- MP.Land/Resources/manifest.xml | 2 +- MP.Land/appsettings.Production.json | 1 + MP.Land/appsettings.Staging.json | 1 + MP.Land/appsettings.json | 1 + 10 files changed, 33 insertions(+), 14 deletions(-) diff --git a/MP.Land/Data/AppAuthService.cs b/MP.Land/Data/AppAuthService.cs index f75d8083..8217150a 100644 --- a/MP.Land/Data/AppAuthService.cs +++ b/MP.Land/Data/AppAuthService.cs @@ -98,11 +98,10 @@ namespace MP.Land.Data protected void CheckVoc() { - string cacheKey = "MP:VOCAB"; + string cacheKey = ":MP:VOCAB"; string rawData; if (Vocabolario.Count == 0) { - //var redisDataList = await distributedCache.GetAsync(cacheKey); var redisDataList = distributedCache.Get(cacheKey); if (redisDataList != null) { @@ -117,7 +116,6 @@ namespace MP.Land.Data rawData = JsonConvert.SerializeObject(Vocabolario); redisDataList = Encoding.UTF8.GetBytes(rawData); distributedCache.Set(cacheKey, redisDataList, cacheOptLong); - //await distributedCache.SetAsync(cacheKey, redisDataList, cacheOptLong); stopWatch.Stop(); TimeSpan ts = stopWatch.Elapsed; Log.Trace($"Effettuato rilettura da DB + caching per Vocabolario: {ts.TotalMilliseconds} ms"); diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj index 105a6265..961819b4 100644 --- a/MP.Land/MP.Land.csproj +++ b/MP.Land/MP.Land.csproj @@ -3,7 +3,7 @@ net5.0 MP.Land - 1.1.2109.2011 + 1.1.2109.2012 diff --git a/MP.Land/Pages/Index.razor b/MP.Land/Pages/Index.razor index 1006c710..aa3e8ea1 100644 --- a/MP.Land/Pages/Index.razor +++ b/MP.Land/Pages/Index.razor @@ -38,16 +38,25 @@
        @foreach (var item in ListRecords) { -
        +
        -

        @item.AppName

        + +

        @item.AppName 

        +
        -
        - dettagli -
          - @(traduci($"{item.AppName}-LIST")) -
        +
        +
        +
        + +
        +
        + @(traduci($"{item.AppName}-TITLE")) +
          + @(traduci($"{item.AppName}-LIST")) +
        +
        +
        @if (string.IsNullOrEmpty(item.LicenseKey)) { diff --git a/MP.Land/Pages/Index.razor.cs b/MP.Land/Pages/Index.razor.cs index f803a9c2..1889435e 100644 --- a/MP.Land/Pages/Index.razor.cs +++ b/MP.Land/Pages/Index.razor.cs @@ -5,6 +5,7 @@ using System.Threading.Tasks; using MP.Land.Data; using MP.Land.Components; using Microsoft.AspNetCore.Components; +using Microsoft.Extensions.Configuration; namespace MP.Land.Pages { @@ -24,6 +25,9 @@ namespace MP.Land.Pages #region Private Properties + [Inject] + private IConfiguration Configuration { get; set; } + private bool isLoading { get; set; } = false; #endregion Private Properties @@ -40,6 +44,11 @@ namespace MP.Land.Pages #region Protected Methods + protected string fullUrl(string relUrl) + { + return $"{Configuration["BaseUrl"]}{relUrl}"; + } + protected override void OnInitialized() { AppMService.ShowSearch = false; diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html index 342c67d8..beeab3e2 100644 --- a/MP.Land/Resources/ChangeLog.html +++ b/MP.Land/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo gestione Programmi MAPO -

        Versione: 1.1.2109.2011

        +

        Versione: 1.1.2109.2012


        Note di rilascio:
          diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt index 440efd98..223aaeef 100644 --- a/MP.Land/Resources/VersNum.txt +++ b/MP.Land/Resources/VersNum.txt @@ -1 +1 @@ -1.1.2109.2011 +1.1.2109.2012 diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml index 1a60e419..e0a371ae 100644 --- a/MP.Land/Resources/manifest.xml +++ b/MP.Land/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.1.2109.2011 + 1.1.2109.2012 https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/MP.Land.zip https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/ChangeLog.html false diff --git a/MP.Land/appsettings.Production.json b/MP.Land/appsettings.Production.json index 5ae46854..eb20bdad 100644 --- a/MP.Land/appsettings.Production.json +++ b/MP.Land/appsettings.Production.json @@ -8,6 +8,7 @@ } }, "AllowedHosts": "*", + "BaseUrl": "IIS02", "ConnectionStrings": { "DefaultConnection": "Server=localhost\\SQLEXPRESS;Database=MoonPro_PROG;Trusted_Connection=True;MultipleActiveResultSets=true", "MP.Land": "Server=localhost\\SQLEXPRESS;Database=MoonPro_PROG;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;" diff --git a/MP.Land/appsettings.Staging.json b/MP.Land/appsettings.Staging.json index 18f6a4f2..e5865059 100644 --- a/MP.Land/appsettings.Staging.json +++ b/MP.Land/appsettings.Staging.json @@ -8,6 +8,7 @@ } }, "AllowedHosts": "*", + "BaseUrl": "IIS01", "ConnectionStrings": { "DefaultConnection": "Server=SQL2016DEV;Database=MoonPro_PROG;Trusted_Connection=True;MultipleActiveResultSets=true", "MP.Land": "Server=SQL2016DEV;Database=MoonPro_PROG;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;" diff --git a/MP.Land/appsettings.json b/MP.Land/appsettings.json index d7fa4540..50cb7a42 100644 --- a/MP.Land/appsettings.json +++ b/MP.Land/appsettings.json @@ -14,6 +14,7 @@ //} }, "AllowedHosts": "*", + "BaseUrl": "https://localhost:44309/", "ConnectionStrings": { "DefaultConnection": "Server=SQL2016DEV;Database=MoonPro;Trusted_Connection=True;MultipleActiveResultSets=true", "MP.Land": "Server=SQL2016DEV;Database=MoonPro;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;", From cdd12bf7643aa4b48b08ab7d8034ce8929afc316 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 20 Sep 2021 13:15:17 +0200 Subject: [PATCH 05/16] Fix grafico pagina elenco --- MP.Land/MP.Land.csproj | 2 +- MP.Land/Pages/Index.razor | 66 +++++++++++++++++++++++--------- MP.Land/Pages/Index.razor.cs | 7 ++++ MP.Land/Resources/ChangeLog.html | 2 +- MP.Land/Resources/VersNum.txt | 2 +- MP.Land/Resources/manifest.xml | 2 +- 6 files changed, 58 insertions(+), 23 deletions(-) diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj index 961819b4..4aedca16 100644 --- a/MP.Land/MP.Land.csproj +++ b/MP.Land/MP.Land.csproj @@ -3,7 +3,7 @@ net5.0 MP.Land - 1.1.2109.2012 + 1.1.2109.2013 diff --git a/MP.Land/Pages/Index.razor b/MP.Land/Pages/Index.razor index aa3e8ea1..3dbc283d 100644 --- a/MP.Land/Pages/Index.razor +++ b/MP.Land/Pages/Index.razor @@ -41,29 +41,57 @@
          - -

          @item.AppName 

          -           + @if (authOk(item)) + { + +

          @item.AppName 

          +           + } + else + { + +

          @item.AppName

          +           + }
          -
          +
          -
          - -
          -
          - @(traduci($"{item.AppName}-TITLE")) -
            - @(traduci($"{item.AppName}-LIST")) -
          -
          + @if (authOk(item)) + { +
          + +
          +
          + @(traduci($"{item.AppName}-TITLE")) +
            + @(traduci($"{item.AppName}-LIST")) +
          +
          + } + else + { +
          + +
          +
          + @(traduci($"{item.AppName}-TITLE")) +
            + @(traduci($"{item.AppName}-LIST")) +
          +
          + }
          - @if (string.IsNullOrEmpty(item.LicenseKey)) - { -
          - Licenza non attivata! -
          - } +
          + @if (authOk(item)) + { + Programma Attivato + } + else + { + Licenza non attivata! + } +
          } diff --git a/MP.Land/Pages/Index.razor.cs b/MP.Land/Pages/Index.razor.cs index 1889435e..eddd4477 100644 --- a/MP.Land/Pages/Index.razor.cs +++ b/MP.Land/Pages/Index.razor.cs @@ -6,6 +6,7 @@ using MP.Land.Data; using MP.Land.Components; using Microsoft.AspNetCore.Components; using Microsoft.Extensions.Configuration; +using MP.AppAuth.Models; namespace MP.Land.Pages { @@ -44,6 +45,12 @@ namespace MP.Land.Pages #region Protected Methods + protected bool authOk(UpdMan currItem) + { + bool answ = !string.IsNullOrEmpty(currItem.LicenseKey) && Convert.ToBoolean(currItem.IsAuth); + return answ; + } + protected string fullUrl(string relUrl) { return $"{Configuration["BaseUrl"]}{relUrl}"; diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html index beeab3e2..4e1f5932 100644 --- a/MP.Land/Resources/ChangeLog.html +++ b/MP.Land/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo gestione Programmi MAPO -

          Versione: 1.1.2109.2012

          +

          Versione: 1.1.2109.2013


          Note di rilascio:
            diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt index 223aaeef..2029b9ac 100644 --- a/MP.Land/Resources/VersNum.txt +++ b/MP.Land/Resources/VersNum.txt @@ -1 +1 @@ -1.1.2109.2012 +1.1.2109.2013 diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml index e0a371ae..f30be695 100644 --- a/MP.Land/Resources/manifest.xml +++ b/MP.Land/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.1.2109.2012 + 1.1.2109.2013 https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/MP.Land.zip https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/ChangeLog.html false From f95d426953f02640b311f5cc70878065af4a675c Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 20 Sep 2021 15:20:15 +0200 Subject: [PATCH 06/16] review home --- MP.Land/Pages/Index.razor | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/MP.Land/Pages/Index.razor b/MP.Land/Pages/Index.razor index 3dbc283d..64759817 100644 --- a/MP.Land/Pages/Index.razor +++ b/MP.Land/Pages/Index.razor @@ -3,27 +3,28 @@ @using MP.Land.Data @using MP.Land.Components -
            -
            -
            -
            -

            MAPO Land

            -
            - Pannello di gestione della suite MAPO MES: l'integrazione di MES + SCADA + IOT + Gestione Commesse -
            +
            +
            +
            +

            MAPO Land

            +
            + Pannello di gestione della suite MAPO MES: l'integrazione di MES + SCADA + IOT + Gestione Commesse
            -
            -
            - MES Suite -
            -
            -
            - powered by EgalWare -
            +
            +
            +
            + MES Suite +
            +
            +
            + powered by EgalWare
            +
            + +
            @if (ListRecords == null) { From d4b8116fc14f278600b2c2fd49743b7e84dc158d Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 20 Sep 2021 16:23:40 +0200 Subject: [PATCH 07/16] Pulizia moduli inutilizzati --- MP.Land/Components/ArchiveStatus.razor | 99 ------------- MP.Land/Components/ArchiveStatus.razor.cs | 133 ------------------ MP.Land/Components/CodArtSelector.razor | 110 --------------- MP.Land/Components/FileEditor.razor | 31 ----- MP.Land/Components/FileEditor.razor.cs | 161 ---------------------- MP.Land/Components/TagSearch.razor | 36 ----- MP.Land/Components/TagSearch.razor.cs | 142 ------------------- 7 files changed, 712 deletions(-) delete mode 100644 MP.Land/Components/ArchiveStatus.razor delete mode 100644 MP.Land/Components/ArchiveStatus.razor.cs delete mode 100644 MP.Land/Components/CodArtSelector.razor delete mode 100644 MP.Land/Components/FileEditor.razor delete mode 100644 MP.Land/Components/FileEditor.razor.cs delete mode 100644 MP.Land/Components/TagSearch.razor delete mode 100644 MP.Land/Components/TagSearch.razor.cs diff --git a/MP.Land/Components/ArchiveStatus.razor b/MP.Land/Components/ArchiveStatus.razor deleted file mode 100644 index 2a8f5230..00000000 --- a/MP.Land/Components/ArchiveStatus.razor +++ /dev/null @@ -1,99 +0,0 @@ -
            -
            - -
            -
            - @if (showProgress) - { -
            -
            -
            - } -
            -
            - @if (ListRecords == null) - { -
            -
            - @if (showProgress) - { -
            -
            - @if (setupMessages.Count > 0) - { -
              - @foreach (var item in setupMessages) - { -
            • @item
              • - } -
            - } -
            -
            - } -
            -
            - -
            -
            - } - else if (totalCount == 0) - { -
            Nessun record trovato
            - } - else - { - - - - - - - - - - - - - - - @foreach (var record in ListRecords) - { - - - - - - - - - - } - -
            MacchinaPathTagsSenza TagModificatiTot File
            - @if (!string.IsNullOrEmpty(record.BasePath)) - { - - } - - @record.Nome - -
            @record.BasePath
            -             		- @record.TotalTags - - @record.NoTags - - @record.NumChanged - - - @record.TotFile - -
            - } -
            -
            \ No newline at end of file diff --git a/MP.Land/Components/ArchiveStatus.razor.cs b/MP.Land/Components/ArchiveStatus.razor.cs deleted file mode 100644 index c3df7a6e..00000000 --- a/MP.Land/Components/ArchiveStatus.razor.cs +++ /dev/null @@ -1,133 +0,0 @@ -using Microsoft.AspNetCore.Components; -using MP.FileData.DTO; -using MP.Land.Data; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; - -namespace MP.Land.Components -{ - public partial class ArchiveStatus - { - #region Private Fields - - private List ListRecords; - - private int numChecks = 0; - - private int totalCount = 0; - - #endregion Private Fields - - #region Private Properties - - private List setupMessages { get; set; } = new List(); - - #endregion Private Properties - - #region Protected Properties - - [Inject] - protected FileArchDataService DataService { get; set; } - - protected int percLoading { get; set; } = 0; - protected bool showProgress { get; set; } = false; - - #endregion Protected Properties - - #region Private Methods - - private async Task verificaSingola(string idxMacchina, int numDays, int numMacchine) - { - // recupero elenco macchine - percLoading += 100 / numMacchine; - numChecks = await DataService.updateMachineArchive(idxMacchina, numDays, true, false); - await Task.Delay(1); - setupMessages.Add($"{idxMacchina}: {numChecks} files"); - StateHasChanged(); - await Task.Delay(1); - } - - private async Task verificaTutte(int numDays) - { - // recupero elenco macchine - var listaMacchine = await DataService.MacchineGetAll(); - int numMacchine = listaMacchine.Count(); - foreach (var item in listaMacchine.Where(x => !string.IsNullOrEmpty(x.BasePath)).ToList()) - { - await verificaSingola(item.IdxMacchina, numDays, numMacchine); - } - } - - #endregion Private Methods - - #region Protected Methods - - protected async Task ArchiveCheck(int maxHour) - { - showProgress = true; - percLoading = 0; - await verificaTutte(maxHour); - - setupMessages.Add($"Effettuata verifica e rilettura di {numChecks} files!"); - await ReloadData(); - } - - protected async Task ArchiveSingleCheck(string idxMacchina, int maxHour) - { - showProgress = true; - percLoading = 0; - await verificaSingola(idxMacchina, maxHour, 2); - - setupMessages.Add($"Effettuata verifica e rilettura di {numChecks} files!"); - await ReloadData(); - } - - protected async Task ClearMessage() - { - await Task.Delay(10); - setupMessages = new List(); - } - - protected async Task ForceCheck(int maxHour) - { - setupMessages.Add("Inizio Analisi Archivio..."); - ListRecords = null; - await Task.Delay(1); - await ArchiveCheck(maxHour); - await ClearMessage(); - await ReloadData(); - } - - protected async Task ForceCheckMacchina(string idxMacchina) - { - setupMessages.Add("Inizio Analisi Archivio..."); - ListRecords = null; - await Task.Delay(1); - await ArchiveSingleCheck(idxMacchina, 0); - await ClearMessage(); - await ReloadData(); - } - - protected override async Task OnInitializedAsync() - { - ListRecords = null; - await ReloadData(); - } - - protected async Task ReloadData() - { - await Task.Delay(1); - numChecks = 0; - ListRecords = await DataService.GetArchiveStatus(); - totalCount = ListRecords.Count; - await Task.Delay(1); - setupMessages = new List(); - showProgress = false; - percLoading = 0; - } - - #endregion Protected Methods - } -} \ No newline at end of file diff --git a/MP.Land/Components/CodArtSelector.razor b/MP.Land/Components/CodArtSelector.razor deleted file mode 100644 index f76926fc..00000000 --- a/MP.Land/Components/CodArtSelector.razor +++ /dev/null @@ -1,110 +0,0 @@ -@using MP.FileData.DatabaseModels -@using MP.Prog.Data - -@inject FileArchDataService DataService -@inject MessageService AppMService - -@if (ArtList == null) -{ - -} -else -{ -
            -
            - - - -
            - - -
            - -
            -
            -} - -@code { - - [Parameter] - public EventCallback searchUpdated { get; set; } - [Parameter] - public string SelCodArt - { - get - { - string answ = ""; - if (AppMService.File_Filter != null) - { - answ = AppMService.File_Filter.CodArticolo; - } - return answ; - } - set - { - if (!AppMService.File_Filter.CodArticolo.Equals(value)) - { - AppMService.File_Filter.CodArticolo = value; - } - reportChange(); - } - } - - private void reportChange() - { - searchUpdated.InvokeAsync(SelCodArt); - } - - protected string _SearchArt; - protected string defCodArt = ""; - protected List ArtList; - - protected string SearchArt - { - get - { - return _SearchArt; - } - set - { - _SearchArt = value; - // se son > 3 char... debounce... - if (string.IsNullOrEmpty(value)) - { - _SearchArt = defCodArt; - } - if (value.Length >= defCodArt.Length) - { - var pUpd = Task.Run(async () => - { - ArtList = await DataService.ArticoliGetFilt(SearchArt); - }); - pUpd.Wait(); - } - } - } - protected override async Task OnInitializedAsync() - { - await ReloadAllData(); - _SearchArt = defCodArt; - } - - protected async Task ReloadAllData() - { - SelCodArt = defCodArt; - ArtList = await DataService.ArticoliGetFilt(SearchArt); - } - - protected void ResetSearchArt() - { - SearchArt = defCodArt; - } -} \ No newline at end of file diff --git a/MP.Land/Components/FileEditor.razor b/MP.Land/Components/FileEditor.razor deleted file mode 100644 index 6da44a7b..00000000 --- a/MP.Land/Components/FileEditor.razor +++ /dev/null @@ -1,31 +0,0 @@ -
            -
            -
            -
            -
            Dettaglio modifiche
            -
            -
            - @if (_currItem.DiskStatus != FileData.FileState.Ok) - { -
            -
            - -
            -
            - -
            -
            - } -
            -
            - @numDiff -
            -
            - -
            -
            -
            -
            - -
            -
            \ No newline at end of file diff --git a/MP.Land/Components/FileEditor.razor.cs b/MP.Land/Components/FileEditor.razor.cs deleted file mode 100644 index d403ee1a..00000000 --- a/MP.Land/Components/FileEditor.razor.cs +++ /dev/null @@ -1,161 +0,0 @@ -using Microsoft.AspNetCore.Components; -using Microsoft.JSInterop; -using MP.FileData.DatabaseModels; -using MP.Land.Data; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; - -namespace MP.Land.Components -{ - public partial class FileEditor : ComponentBase - { - #region Protected Fields - - protected int numDiff = 0; - - #endregion Protected Fields - - #region Public Fields - - public FileModel _currItem = new FileModel(); - - #endregion Public Fields - - #region Protected Properties - - [Inject] - protected FileArchDataService DataService { get; set; } - - [Inject] - protected IJSRuntime JSRuntime { get; set; } - - #endregion Protected Properties - - #region Public Properties - - [Parameter] - public FileModel currItem - { - get - { - return _currItem = null; - } - set - { - _currItem = value; - } - } - - [Parameter] - public EventCallback DataReset { get; set; } - - [Parameter] - public EventCallback DataUpdated { get; set; } - - [Parameter] - public List MacList { get; set; } - - [Parameter] - public List TagList { get; set; } - - #endregion Public Properties - - #region Private Methods - - private async Task ApproveChange() - { - if (!await JSRuntime.InvokeAsync("confirm", "Sicuro di voler asccettare la modifica del file selezionato generando una nuova revisione?")) - return; - - if (_currItem != null) - { - await DataService.FileApprove(_currItem); - await DataUpdated.InvokeAsync(1); - } - else - { - Console.WriteLine("File null!"); - } - } - - private async Task cancelUpdate() - { - await DataReset.InvokeAsync(0); - } - - private async Task deleteRecord() - { - if (!await JSRuntime.InvokeAsync("confirm", "Sicuro di voler eliminare il file selezionato??")) - return; - - if (_currItem != null) - { - await DataService.FileDelete(_currItem); - await DataUpdated.InvokeAsync(1); - } - else - { - Console.WriteLine("File null!"); - } - } - - private async Task RejectChange() - { - if (!await JSRuntime.InvokeAsync("confirm", "Sicuro di voler eliminare la modifica del file selezionato e sovrascrivere la versione in rete?")) - return; - - if (_currItem != null) - { - await DataService.FileReject(_currItem); - await DataUpdated.InvokeAsync(1); - } - else - { - Console.WriteLine("File null!"); - } - } - - private async Task saveUpdate() - { - if (_currItem != null) - { - await DataService.FileUpdate(_currItem); - await DataUpdated.InvokeAsync(1); - } - else - { - Console.WriteLine("File null!"); - } - } - - #endregion Private Methods - - #region Protected Methods - - protected void diffDoneHandler(int numChanges) - { -#if false - numDiff = numChanges; -#endif - } - - #endregion Protected Methods - - #region Public Methods - - public string CurrFileContent(string fullPath) - { - string answ = ""; - if (File.Exists(fullPath)) - { - answ = File.ReadAllText(fullPath); - } - return answ; - } - - #endregion Public Methods - } -} \ No newline at end of file diff --git a/MP.Land/Components/TagSearch.razor b/MP.Land/Components/TagSearch.razor deleted file mode 100644 index d1bf7e85..00000000 --- a/MP.Land/Components/TagSearch.razor +++ /dev/null @@ -1,36 +0,0 @@ - \ No newline at end of file diff --git a/MP.Land/Components/TagSearch.razor.cs b/MP.Land/Components/TagSearch.razor.cs deleted file mode 100644 index 25ba642a..00000000 --- a/MP.Land/Components/TagSearch.razor.cs +++ /dev/null @@ -1,142 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Components; -using MP.FileData.DatabaseModels; -using MP.Land; -using MP.Land.Data; - -namespace MP.Land.Components -{ - public partial class TagSearch - { - #region Protected Fields - - protected string _SearchTag; - protected string defTag = "###"; - - protected string LastSelTag = ""; - - #endregion Protected Fields - - #region Protected Properties - - [Inject] - protected MessageService AppMService { get; set; } - - [Inject] - protected FileArchDataService DataService { get; set; } - - protected string SearchTag - { - get - { - return _SearchTag; - } - set - { - _SearchTag = value; - // se son > 3 char... debounce... - if (string.IsNullOrEmpty(value)) - { - _SearchTag = defTag; - } - if (value.Length >= defTag.Length) - { - var pUpd = Task.Run(async () => - { - TagList = await DataService.TagGetSearch(_SearchTag, 50); - }); - pUpd.Wait(); - } - } - } - - protected List TagList { get; set; } = new List(); - - #endregion Protected Properties - - #region Public Properties - - [Parameter] - public EventCallback OnClose { get; set; } - - [Parameter] - public EventCallback searchUpdated { get; set; } - - [Parameter] - public string SelTag - { - get - { - string answ = ""; - if (AppMService.File_Filter != null) - { - answ = AppMService.File_Filter.Tag; - } - return answ; - } - set - { - if (!AppMService.File_Filter.Tag.Equals(value)) - { - AppMService.File_Filter.Tag = value; - } - reportChange(); - } - } - - [Parameter] - public string Text { get; set; } - - [Parameter] - public string Title { get; set; } - - #endregion Public Properties - - #region Private Methods - - private Task ModalCancel() - { - // resetto ricerca - SelTag = LastSelTag; - return OnClose.InvokeAsync(false); - } - - private Task ModalOk() - { - return OnClose.InvokeAsync(true); - } - - private void reportChange() - { - searchUpdated.InvokeAsync(SelTag); - } - - #endregion Private Methods - - #region Protected Methods - - protected override async Task OnInitializedAsync() - { - LastSelTag = SelTag; - await ReloadAllData(); - _SearchTag = defTag; - } - - protected async Task ReloadAllData() - { - SelTag = defTag; - TagList = await DataService.TagGetSearch(SearchTag, 20); - } - - protected async Task ResetSearchTag() - { - SearchTag = defTag; - await Task.Delay(1); - } - - #endregion Protected Methods - } -} \ No newline at end of file From 521edc8f91ca6e555fcc3bc1f9f70d3f3f027b0e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 20 Sep 2021 16:24:12 +0200 Subject: [PATCH 08/16] Pagina cartellino QR Operatori --- MP.AppAuth/AppAuthContext.cs | 2 +- MP.AppAuth/Controllers/AppAuthController.cs | 21 ++++ MP.AppAuth/Models/AnagraficaOperatori.cs | 16 ++- MP.AppAuth/MoonProContext.cs | 69 ------------- MP.Land/Components/UserCard.razor | 60 ++++++++++++ MP.Land/Pages/UserQr.razor | 28 ++++++ MP.Land/Pages/UserQr.razor.cs | 102 ++++++++++++++++++++ 7 files changed, 218 insertions(+), 80 deletions(-) create mode 100644 MP.Land/Components/UserCard.razor create mode 100644 MP.Land/Pages/UserQr.razor create mode 100644 MP.Land/Pages/UserQr.razor.cs diff --git a/MP.AppAuth/AppAuthContext.cs b/MP.AppAuth/AppAuthContext.cs index 29066c68..520acb42 100644 --- a/MP.AppAuth/AppAuthContext.cs +++ b/MP.AppAuth/AppAuthContext.cs @@ -58,7 +58,7 @@ namespace MP.AppAuth #region Public Properties - //public virtual DbSet DbSetMacchine { get; set; } + public virtual DbSet DbSetAnagOpr { get; set; } public virtual DbSet DbSetUpdMan { get; set; } public virtual DbSet DbSetVocabolario { get; set; } diff --git a/MP.AppAuth/Controllers/AppAuthController.cs b/MP.AppAuth/Controllers/AppAuthController.cs index 08b1a064..3c2897a9 100644 --- a/MP.AppAuth/Controllers/AppAuthController.cs +++ b/MP.AppAuth/Controllers/AppAuthController.cs @@ -31,6 +31,27 @@ namespace MP.AppAuth.Controllers #region Public Methods + public List AnagOpGetAll(string searchVal) + { + List dbResult = new List(); + + if (!string.IsNullOrEmpty(searchVal)) + { + dbResult = dbCtx + .DbSetAnagOpr + .Where(x => x.Cognome.Contains(searchVal) || x.Nome.Contains(searchVal)) + .ToList(); + } + else + { + dbResult = dbCtx + .DbSetAnagOpr + .ToList(); + } + // ritorno + return dbResult; + } + public void Dispose() { // Clear database context diff --git a/MP.AppAuth/Models/AnagraficaOperatori.cs b/MP.AppAuth/Models/AnagraficaOperatori.cs index 675260c1..39cd386f 100644 --- a/MP.AppAuth/Models/AnagraficaOperatori.cs +++ b/MP.AppAuth/Models/AnagraficaOperatori.cs @@ -1,29 +1,25 @@ using System; using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; #nullable disable namespace MP.AppAuth.Models { + [Table("AnagraficaOperatori")] public partial class AnagraficaOperatori { - #region Public Constructors - - public AnagraficaOperatori() - { - Gruppi2Operatoris = new HashSet(); - } - - #endregion Public Constructors - #region Public Properties public string AuthKey { get; set; } public string CodOprExt { get; set; } public string Cognome { get; set; } - public virtual ICollection Gruppi2Operatoris { get; set; } public bool? IsAdmin { get; set; } + + [Key] public int MatrOpr { get; set; } + public string Nome { get; set; } #endregion Public Properties diff --git a/MP.AppAuth/MoonProContext.cs b/MP.AppAuth/MoonProContext.cs index 33453f34..a1eca39d 100644 --- a/MP.AppAuth/MoonProContext.cs +++ b/MP.AppAuth/MoonProContext.cs @@ -29,7 +29,6 @@ namespace MP.AppAuth public virtual DbSet AnagKeyValues { get; set; } public virtual DbSet AnagraficaCausaliScartos { get; set; } public virtual DbSet AnagraficaFlussis { get; set; } - public virtual DbSet AnagraficaGruppis { get; set; } public virtual DbSet AnagraficaIngressis { get; set; } public virtual DbSet AnagraficaMicroStatis { get; set; } public virtual DbSet AnagraficaOperatoris { get; set; } @@ -37,8 +36,6 @@ namespace MP.AppAuth public virtual DbSet DatiMacchines { get; set; } public virtual DbSet FamigliaTipoIngressis { get; set; } public virtual DbSet FamiglieMacchines { get; set; } - public virtual DbSet Gruppi2Macchines { get; set; } - public virtual DbSet Gruppi2Operatoris { get; set; } public virtual DbSet KeepAlives { get; set; } public virtual DbSet LinkMenuJqms { get; set; } public virtual DbSet ListValues { get; set; } @@ -184,28 +181,6 @@ namespace MP.AppAuth entity.Property(e => e.DescrFlux).HasMaxLength(50); }); - modelBuilder.Entity(entity => - { - entity.HasKey(e => e.CodGruppo); - - entity.ToTable("AnagraficaGruppi"); - - entity.Property(e => e.CodGruppo).HasMaxLength(50); - - entity.Property(e => e.DescrGruppo) - .IsRequired() - .HasMaxLength(250) - .HasDefaultValueSql("('')"); - - entity.Property(e => e.SelEnabled).HasComment("Indica se sia selezionabile a livello di tendina x inserimento BCode"); - - entity.Property(e => e.TipoGruppo) - .IsRequired() - .HasMaxLength(50) - .HasDefaultValueSql("('REPARTO')") - .HasComment("tipo gruppo: reparto (es x gestione operatori assegnati), GRUPPO FASE (es macchien che fanno lo stesso tipo di lavoro), ..."); - }); - modelBuilder.Entity(entity => { entity.HasKey(e => new { e.IdxFamigliaIngresso, e.ValoreIngresso }); @@ -353,50 +328,6 @@ namespace MP.AppAuth .HasComment("Indica se la famiglia macchina prevede UserDataInput ovvero inserimento MANUALE informazioni"); }); - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.IdxMacchina, e.CodGruppo }); - - entity.ToTable("Gruppi2Macchine"); - - entity.Property(e => e.IdxMacchina).HasMaxLength(50); - - entity.Property(e => e.CodGruppo).HasMaxLength(50); - - entity.HasOne(d => d.CodGruppoNavigation) - .WithMany(p => p.Gruppi2Macchines) - .HasForeignKey(d => d.CodGruppo) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("FK_Gruppi2Macchine_AnagraficaGruppi"); - - entity.HasOne(d => d.IdxMacchinaNavigation) - .WithMany(p => p.Gruppi2Macchines) - .HasForeignKey(d => d.IdxMacchina) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("FK_Gruppi2Macchine_Macchine"); - }); - - modelBuilder.Entity(entity => - { - entity.HasKey(e => new { e.MatrOpr, e.CodGruppo }); - - entity.ToTable("Gruppi2Operatori"); - - entity.Property(e => e.CodGruppo).HasMaxLength(50); - - entity.HasOne(d => d.CodGruppoNavigation) - .WithMany(p => p.Gruppi2Operatoris) - .HasForeignKey(d => d.CodGruppo) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("FK_Gruppi2Operatori_AnagraficaGruppi"); - - entity.HasOne(d => d.MatrOprNavigation) - .WithMany(p => p.Gruppi2Operatoris) - .HasForeignKey(d => d.MatrOpr) - .OnDelete(DeleteBehavior.ClientSetNull) - .HasConstraintName("FK_Gruppi2Operatori_AnagraficaOperatori"); - }); - modelBuilder.Entity(entity => { entity.HasKey(e => e.IdxMacchina); diff --git a/MP.Land/Components/UserCard.razor b/MP.Land/Components/UserCard.razor new file mode 100644 index 00000000..8f3ef9f5 --- /dev/null +++ b/MP.Land/Components/UserCard.razor @@ -0,0 +1,60 @@ +@using MP.AppAuth.Models + +@inject IJSRuntime JSRuntime + +
            +
            +
            +
            + EgalWare +
            +
            +

            @CardMessage

            +
            +
            +
            +
            +
            +
            + @*Image 12345*@ +
            +
            +
            +

            @CurrItem.Cognome @CurrItem.Nome

            + matr: @CurrItem.MatrOpr +
            +
            +
            +
            + Card login MAPO-TAB +
            +
            + +@code { + + [Parameter] + public AnagraficaOperatori CurrItem { get; set; } + + [Parameter] + public string CardMessage { get; set; } + + protected override async Task OnAfterRenderAsync(bool firstRender) + { + await JSRuntime.InvokeVoidAsync("displayQr", $"qrCodeImg_{CurrItem.MatrOpr}", rawCode); + } + + protected string BaseUrl = "http://IIS01/"; + + protected string rawCode + { + get + { + string answ = ""; + if (CurrItem != null) + { + answ = $"{BaseUrl}&MatrOpr={CurrItem.MatrOpr}&UserAuthKey={CurrItem.AuthKey}"; + } + return answ; + } + } +} \ No newline at end of file diff --git a/MP.Land/Pages/UserQr.razor b/MP.Land/Pages/UserQr.razor new file mode 100644 index 00000000..117e491a --- /dev/null +++ b/MP.Land/Pages/UserQr.razor @@ -0,0 +1,28 @@ +@page "/UserQr" + +@using MP.Land.Data +@using MP.Land.Components + +
            +
            + @if (ListRecords == null) + { + + } + else if (totalCount == 0) + { +
            Nessun record trovato
            + } + else + { +
            + @foreach (var item in ListRecords) + { +
            + +
            + } +
            + } +
            +
            \ No newline at end of file diff --git a/MP.Land/Pages/UserQr.razor.cs b/MP.Land/Pages/UserQr.razor.cs new file mode 100644 index 00000000..1ed8ab66 --- /dev/null +++ b/MP.Land/Pages/UserQr.razor.cs @@ -0,0 +1,102 @@ +using Microsoft.AspNetCore.Components; +using Microsoft.Extensions.Configuration; +using MP.AppAuth.Models; +using MP.Land.Data; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace MP.Land.Pages +{ + public partial class UserQr + { + #region Private Fields + + private List ListRecords; + + #endregion Private Fields + + #region Protected Fields + + protected string CardMessage = "User Card"; + protected int totalCount = 0; + + #endregion Protected Fields + + #region Private Properties + + [Inject] + private IConfiguration Configuration { get; set; } + + private bool isLoading { get; set; } = false; + + #endregion Private Properties + + #region Protected Properties + + [Inject] + protected MessageService AppMService { get; set; } + + [Inject] + protected AppAuthService DataService { get; set; } + + #endregion Protected Properties + + #region Protected Methods + + protected bool authOk(UpdMan currItem) + { + bool answ = !string.IsNullOrEmpty(currItem.LicenseKey) && Convert.ToBoolean(currItem.IsAuth); + return answ; + } + + protected string fullUrl(string relUrl) + { + return $"{Configuration["BaseUrl"]}{relUrl}"; + } + + protected override void OnInitialized() + { + AppMService.ShowSearch = false; + AppMService.PageName = "User Card"; + AppMService.PageIcon = "fas fa-qrcode pr-2"; + //AppMService.EA_SearchUpdated += OnSeachUpdated; + //AppMService.EA_FilterUpdated += OnFilterUpdated; + } + + protected override async Task OnInitializedAsync() + { + await ReloadAllData(); + } + + protected async Task ReloadAllData() + { + isLoading = true; + //MacList = await DataService.MacchineGetAll(); + await ReloadData(); + } + + protected async Task ReloadData() + { + isLoading = true; + // importante altrimenti NON mostra update UI + await Task.Delay(1); + ListRecords = await DataService.AnagOperList(); + totalCount = ListRecords.Count(); + await Task.Delay(1); + } + + protected MarkupString traduci(string lemma) + { + MarkupString answ; + //string rawHtml = "
          • primo
          • secondo
            • "; + string rawHtml = DataService.Traduci(lemma, "IT"); + answ = new MarkupString(rawHtml); + // cerco nella cache Redis + return answ; + } + + #endregion Protected Methods + } +} \ No newline at end of file From c980019ca124fb57b755deb50292edefb033cf70 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 20 Sep 2021 16:24:21 +0200 Subject: [PATCH 09/16] Fix modelli --- MP.AppAuth/Models/AnagraficaGruppi.cs | 31 --------------------------- MP.AppAuth/Models/Gruppi2Macchine.cs | 19 ---------------- MP.AppAuth/Models/Gruppi2Operatori.cs | 19 ---------------- MP.AppAuth/Models/Macchine.cs | 10 --------- 4 files changed, 79 deletions(-) delete mode 100644 MP.AppAuth/Models/AnagraficaGruppi.cs delete mode 100644 MP.AppAuth/Models/Gruppi2Macchine.cs delete mode 100644 MP.AppAuth/Models/Gruppi2Operatori.cs diff --git a/MP.AppAuth/Models/AnagraficaGruppi.cs b/MP.AppAuth/Models/AnagraficaGruppi.cs deleted file mode 100644 index 8ffc922b..00000000 --- a/MP.AppAuth/Models/AnagraficaGruppi.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.AppAuth.Models -{ - public partial class AnagraficaGruppi - { - #region Public Constructors - - public AnagraficaGruppi() - { - Gruppi2Macchines = new HashSet(); - Gruppi2Operatoris = new HashSet(); - } - - #endregion Public Constructors - - #region Public Properties - - public string CodGruppo { get; set; } - public string DescrGruppo { get; set; } - public virtual ICollection Gruppi2Macchines { get; set; } - public virtual ICollection Gruppi2Operatoris { get; set; } - public bool SelEnabled { get; set; } - public string TipoGruppo { get; set; } - - #endregion Public Properties - } -} \ No newline at end of file diff --git a/MP.AppAuth/Models/Gruppi2Macchine.cs b/MP.AppAuth/Models/Gruppi2Macchine.cs deleted file mode 100644 index 9bb3f661..00000000 --- a/MP.AppAuth/Models/Gruppi2Macchine.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.AppAuth.Models -{ - public partial class Gruppi2Macchine - { - #region Public Properties - - public string CodGruppo { get; set; } - public virtual AnagraficaGruppi CodGruppoNavigation { get; set; } - public string IdxMacchina { get; set; } - public virtual Macchine IdxMacchinaNavigation { get; set; } - - #endregion Public Properties - } -} \ No newline at end of file diff --git a/MP.AppAuth/Models/Gruppi2Operatori.cs b/MP.AppAuth/Models/Gruppi2Operatori.cs deleted file mode 100644 index f701f0aa..00000000 --- a/MP.AppAuth/Models/Gruppi2Operatori.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.Collections.Generic; - -#nullable disable - -namespace MP.AppAuth.Models -{ - public partial class Gruppi2Operatori - { - #region Public Properties - - public string CodGruppo { get; set; } - public virtual AnagraficaGruppi CodGruppoNavigation { get; set; } - public int MatrOpr { get; set; } - public virtual AnagraficaOperatori MatrOprNavigation { get; set; } - - #endregion Public Properties - } -} \ No newline at end of file diff --git a/MP.AppAuth/Models/Macchine.cs b/MP.AppAuth/Models/Macchine.cs index 259e0029..f7ef7966 100644 --- a/MP.AppAuth/Models/Macchine.cs +++ b/MP.AppAuth/Models/Macchine.cs @@ -7,22 +7,12 @@ namespace MP.AppAuth.Models { public partial class Macchine { - #region Public Constructors - - public Macchine() - { - Gruppi2Macchines = new HashSet(); - } - - #endregion Public Constructors - #region Public Properties public string CodMacchina { get; set; } public int ColNum { get; set; } public string Css { get; set; } public string Descrizione { get; set; } - public virtual ICollection Gruppi2Macchines { get; set; } public string IdxMacchina { get; set; } public string Locazione { get; set; } public string Nome { get; set; } From d5896b136bfa8ddc17577518f405d3920601ba18 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 20 Sep 2021 16:24:38 +0200 Subject: [PATCH 10/16] Aggiunta lib x qrcode --- MP.Land/Pages/_Host.cshtml | 24 +- MP.Land/wwwroot/lib/LICENSE | 14 + MP.Land/wwwroot/lib/README.md | 46 ++ MP.Land/wwwroot/lib/bower.json | 18 + MP.Land/wwwroot/lib/index-svg.html | 47 ++ MP.Land/wwwroot/lib/index.html | 44 ++ MP.Land/wwwroot/lib/index.svg | 37 ++ MP.Land/wwwroot/lib/jquery.min.js | 2 + MP.Land/wwwroot/lib/qrcode.js | 702 +++++++++++++++++++++++++++++ MP.Land/wwwroot/lib/qrcode.min.js | 1 + 10 files changed, 934 insertions(+), 1 deletion(-) create mode 100644 MP.Land/wwwroot/lib/LICENSE create mode 100644 MP.Land/wwwroot/lib/README.md create mode 100644 MP.Land/wwwroot/lib/bower.json create mode 100644 MP.Land/wwwroot/lib/index-svg.html create mode 100644 MP.Land/wwwroot/lib/index.html create mode 100644 MP.Land/wwwroot/lib/index.svg create mode 100644 MP.Land/wwwroot/lib/jquery.min.js create mode 100644 MP.Land/wwwroot/lib/qrcode.js create mode 100644 MP.Land/wwwroot/lib/qrcode.min.js diff --git a/MP.Land/Pages/_Host.cshtml b/MP.Land/Pages/_Host.cshtml index 35693471..51a0d53f 100644 --- a/MP.Land/Pages/_Host.cshtml +++ b/MP.Land/Pages/_Host.cshtml @@ -36,12 +36,34 @@ 🗙
            - + + + + \ No newline at end of file diff --git a/MP.Land/wwwroot/lib/LICENSE b/MP.Land/wwwroot/lib/LICENSE new file mode 100644 index 00000000..93c33233 --- /dev/null +++ b/MP.Land/wwwroot/lib/LICENSE @@ -0,0 +1,14 @@ +The MIT License (MIT) +--------------------- +Copyright (c) 2012 davidshimjs + +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/MP.Land/wwwroot/lib/README.md b/MP.Land/wwwroot/lib/README.md new file mode 100644 index 00000000..5e2d2dc6 --- /dev/null +++ b/MP.Land/wwwroot/lib/README.md @@ -0,0 +1,46 @@ +# QRCode.js +QRCode.js is javascript library for making QRCode. QRCode.js supports Cross-browser with HTML5 Canvas and table tag in DOM. +QRCode.js has no dependencies. + +## Basic Usages +``` +
            + +``` + +or with some options + +``` +
            + +``` + +and you can use some methods + +``` +qrcode.clear(); // clear the code. +qrcode.makeCode("http://naver.com"); // make another code. +``` + +## Browser Compatibility +IE6~10, Chrome, Firefox, Safari, Opera, Mobile Safari, Android, Windows Mobile, ETC. + +## License +MIT License + +## Contact +twitter @davidshimjs + +[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/davidshimjs/qrcodejs/trend.png)](https://bitdeli.com/free "Bitdeli Badge") + diff --git a/MP.Land/wwwroot/lib/bower.json b/MP.Land/wwwroot/lib/bower.json new file mode 100644 index 00000000..0509be6a --- /dev/null +++ b/MP.Land/wwwroot/lib/bower.json @@ -0,0 +1,18 @@ +{ + "name": "qrcode.js", + "version": "0.0.1", + "homepage": "https://github.com/davidshimjs/qrcodejs", + "authors": [ + "Sangmin Shim", "Sangmin Shim (http://jaguarjs.com)" + ], + "description": "Cross-browser QRCode generator for javascript", + "main": "qrcode.js", + "ignore": [ + "bower_components", + "node_modules", + "index.html", + "index.svg", + "jquery.min.js", + "qrcode.min.js" + ] +} diff --git a/MP.Land/wwwroot/lib/index-svg.html b/MP.Land/wwwroot/lib/index-svg.html new file mode 100644 index 00000000..025a1355 --- /dev/null +++ b/MP.Land/wwwroot/lib/index-svg.html @@ -0,0 +1,47 @@ + + + + Cross-Browser QRCode generator for Javascript + + + + + + + + + + + + + diff --git a/MP.Land/wwwroot/lib/index.html b/MP.Land/wwwroot/lib/index.html new file mode 100644 index 00000000..fc16f3d9 --- /dev/null +++ b/MP.Land/wwwroot/lib/index.html @@ -0,0 +1,44 @@ + + + +Cross-Browser QRCode generator for Javascript + + + + + + +
            +
            + + + \ No newline at end of file diff --git a/MP.Land/wwwroot/lib/index.svg b/MP.Land/wwwroot/lib/index.svg new file mode 100644 index 00000000..fabe56aa --- /dev/null +++ b/MP.Land/wwwroot/lib/index.svg @@ -0,0 +1,37 @@ + + + + + +
            + +
            + + + +             +             diff --git a/MP.Land/wwwroot/lib/jquery.min.js b/MP.Land/wwwroot/lib/jquery.min.js new file mode 100644 index 00000000..2740cc4c --- /dev/null +++ b/MP.Land/wwwroot/lib/jquery.min.js @@ -0,0 +1,2 @@ +/*! jQuery v1.8.3 jquery.com | jquery.org/license */ +(function(e,t){function _(e){var t=M[e]={};return v.each(e.split(y),function(e,n){t[n]=!0}),t}function H(e,n,r){if(r===t&&e.nodeType===1){var i="data-"+n.replace(P,"-$1").toLowerCase();r=e.getAttribute(i);if(typeof r=="string"){try{r=r==="true"?!0:r==="false"?!1:r==="null"?null:+r+""===r?+r:D.test(r)?v.parseJSON(r):r}catch(s){}v.data(e,n,r)}else r=t}return r}function B(e){var t;for(t in e){if(t==="data"&&v.isEmptyObject(e[t]))continue;if(t!=="toJSON")return!1}return!0}function et(){return!1}function tt(){return!0}function ut(e){return!e||!e.parentNode||e.parentNode.nodeType===11}function at(e,t){do e=e[t];while(e&&e.nodeType!==1);return e}function ft(e,t,n){t=t||0;if(v.isFunction(t))return v.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return v.grep(e,function(e,r){return e===t===n});if(typeof t=="string"){var r=v.grep(e,function(e){return e.nodeType===1});if(it.test(t))return v.filter(t,r,!n);t=v.filter(t,r)}return v.grep(e,function(e,r){return v.inArray(e,t)>=0===n})}function lt(e){var t=ct.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function At(e,t){if(t.nodeType!==1||!v.hasData(e))return;var n,r,i,s=v._data(e),o=v._data(t,s),u=s.events;if(u){delete o.handle,o.events={};for(n in u)for(r=0,i=u[n].length;r").appendTo(i.body),n=t.css("display");t.remove();if(n==="none"||n===""){Pt=i.body.appendChild(Pt||v.extend(i.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!Ht||!Pt.createElement)Ht=(Pt.contentWindow||Pt.contentDocument).document,Ht.write(""),Ht.close();t=Ht.body.appendChild(Ht.createElement(e)),n=Dt(t,"display"),i.body.removeChild(Pt)}return Wt[e]=n,n}function fn(e,t,n,r){var i;if(v.isArray(t))v.each(t,function(t,i){n||sn.test(e)?r(e,i):fn(e+"["+(typeof i=="object"?t:"")+"]",i,n,r)});else if(!n&&v.type(t)==="object")for(i in t)fn(e+"["+i+"]",t[i],n,r);else r(e,t)}function Cn(e){return function(t,n){typeof t!="string"&&(n=t,t="*");var r,i,s,o=t.toLowerCase().split(y),u=0,a=o.length;if(v.isFunction(n))for(;u)[^>]*$|#([\w\-]*)$)/,E=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,S=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,T=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,N=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,C=/^-ms-/,k=/-([\da-z])/gi,L=function(e,t){return(t+"").toUpperCase()},A=function(){i.addEventListener?(i.removeEventListener("DOMContentLoaded",A,!1),v.ready()):i.readyState==="complete"&&(i.detachEvent("onreadystatechange",A),v.ready())},O={};v.fn=v.prototype={constructor:v,init:function(e,n,r){var s,o,u,a;if(!e)return this;if(e.nodeType)return this.context=this[0]=e,this.length=1,this;if(typeof e=="string"){e.charAt(0)==="<"&&e.charAt(e.length-1)===">"&&e.length>=3?s=[null,e,null]:s=w.exec(e);if(s&&(s[1]||!n)){if(s[1])return n=n instanceof v?n[0]:n,a=n&&n.nodeType?n.ownerDocument||n:i,e=v.parseHTML(s[1],a,!0),E.test(s[1])&&v.isPlainObject(n)&&this.attr.call(e,n,!0),v.merge(this,e);o=i.getElementById(s[2]);if(o&&o.parentNode){if(o.id!==s[2])return r.find(e);this.length=1,this[0]=o}return this.context=i,this.selector=e,this}return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e)}return v.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),v.makeArray(e,this))},selector:"",jquery:"1.8.3",length:0,size:function(){return this.length},toArray:function(){return l.call(this)},get:function(e){return e==null?this.toArray():e<0?this[this.length+e]:this[e]},pushStack:function(e,t,n){var r=v.merge(this.constructor(),e);return r.prevObject=this,r.context=this.context,t==="find"?r.selector=this.selector+(this.selector?" ":"")+n:t&&(r.selector=this.selector+"."+t+"("+n+")"),r},each:function(e,t){return v.each(this,e,t)},ready:function(e){return v.ready.promise().done(e),this},eq:function(e){return e=+e,e===-1?this.slice(e):this.slice(e,e+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(l.apply(this,arguments),"slice",l.call(arguments).join(","))},map:function(e){return this.pushStack(v.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:[].sort,splice:[].splice},v.fn.init.prototype=v.fn,v.extend=v.fn.extend=function(){var e,n,r,i,s,o,u=arguments[0]||{},a=1,f=arguments.length,l=!1;typeof u=="boolean"&&(l=u,u=arguments[1]||{},a=2),typeof u!="object"&&!v.isFunction(u)&&(u={}),f===a&&(u=this,--a);for(;a0)return;r.resolveWith(i,[v]),v.fn.trigger&&v(i).trigger("ready").off("ready")},isFunction:function(e){return v.type(e)==="function"},isArray:Array.isArray||function(e){return v.type(e)==="array"},isWindow:function(e){return e!=null&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return e==null?String(e):O[h.call(e)]||"object"},isPlainObject:function(e){if(!e||v.type(e)!=="object"||e.nodeType||v.isWindow(e))return!1;try{if(e.constructor&&!p.call(e,"constructor")&&!p.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||p.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw new Error(e)},parseHTML:function(e,t,n){var r;return!e||typeof e!="string"?null:(typeof t=="boolean"&&(n=t,t=0),t=t||i,(r=E.exec(e))?[t.createElement(r[1])]:(r=v.buildFragment([e],t,n?null:[]),v.merge([],(r.cacheable?v.clone(r.fragment):r.fragment).childNodes)))},parseJSON:function(t){if(!t||typeof t!="string")return null;t=v.trim(t);if(e.JSON&&e.JSON.parse)return e.JSON.parse(t);if(S.test(t.replace(T,"@").replace(N,"]").replace(x,"")))return(new Function("return "+t))();v.error("Invalid JSON: "+t)},parseXML:function(n){var r,i;if(!n||typeof n!="string")return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(s){r=t}return(!r||!r.documentElement||r.getElementsByTagName("parsererror").length)&&v.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&g.test(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(C,"ms-").replace(k,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,n,r){var i,s=0,o=e.length,u=o===t||v.isFunction(e);if(r){if(u){for(i in e)if(n.apply(e[i],r)===!1)break}else for(;s0&&e[0]&&e[a-1]||a===0||v.isArray(e));if(f)for(;u-1)a.splice(n,1),i&&(n<=o&&o--,n<=u&&u--)}),this},has:function(e){return v.inArray(e,a)>-1},empty:function(){return a=[],this},disable:function(){return a=f=n=t,this},disabled:function(){return!a},lock:function(){return f=t,n||c.disable(),this},locked:function(){return!f},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],a&&(!r||f)&&(i?f.push(t):l(t)),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},v.extend({Deferred:function(e){var t=[["resolve","done",v.Callbacks("once memory"),"resolved"],["reject","fail",v.Callbacks("once memory"),"rejected"],["notify","progress",v.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return v.Deferred(function(n){v.each(t,function(t,r){var s=r[0],o=e[t];i[r[1]](v.isFunction(o)?function(){var e=o.apply(this,arguments);e&&v.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[s+"With"](this===i?n:this,[e])}:n[s])}),e=null}).promise()},promise:function(e){return e!=null?v.extend(e,r):r}},i={};return r.pipe=r.then,v.each(t,function(e,s){var o=s[2],u=s[3];r[s[1]]=o.add,u&&o.add(function(){n=u},t[e^1][2].disable,t[2][2].lock),i[s[0]]=o.fire,i[s[0]+"With"]=o.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=l.call(arguments),r=n.length,i=r!==1||e&&v.isFunction(e.promise)?r:0,s=i===1?e:v.Deferred(),o=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?l.call(arguments):r,n===u?s.notifyWith(t,n):--i||s.resolveWith(t,n)}},u,a,f;if(r>1){u=new Array(r),a=new Array(r),f=new Array(r);for(;t
            a",n=p.getElementsByTagName("*"),r=p.getElementsByTagName("a")[0];if(!n||!r||!n.length)return{};s=i.createElement("select"),o=s.appendChild(i.createElement("option")),u=p.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:r.getAttribute("href")==="/a",opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:u.value==="on",optSelected:o.selected,getSetAttribute:p.className!=="t",enctype:!!i.createElement("form").enctype,html5Clone:i.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",boxModel:i.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},u.checked=!0,t.noCloneChecked=u.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!o.disabled;try{delete p.test}catch(d){t.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",h=function(){t.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick"),p.detachEvent("onclick",h)),u=i.createElement("input"),u.value="t",u.setAttribute("type","radio"),t.radioValue=u.value==="t",u.setAttribute("checked","checked"),u.setAttribute("name","t"),p.appendChild(u),a=i.createDocumentFragment(),a.appendChild(p.lastChild),t.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,t.appendChecked=u.checked,a.removeChild(u),a.appendChild(p);if(p.attachEvent)for(l in{submit:!0,change:!0,focusin:!0})f="on"+l,c=f in p,c||(p.setAttribute(f,"return;"),c=typeof p[f]=="function"),t[l+"Bubbles"]=c;return v(function(){var n,r,s,o,u="padding:0;margin:0;border:0;display:block;overflow:hidden;",a=i.getElementsByTagName("body")[0];if(!a)return;n=i.createElement("div"),n.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",a.insertBefore(n,a.firstChild),r=i.createElement("div"),n.appendChild(r),r.innerHTML="
            t
            ",s=r.getElementsByTagName("td"),s[0].style.cssText="padding:0;margin:0;border:0;display:none",c=s[0].offsetHeight===0,s[0].style.display="",s[1].style.display="none",t.reliableHiddenOffsets=c&&s[0].offsetHeight===0,r.innerHTML="",r.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=r.offsetWidth===4,t.doesNotIncludeMarginInBodyOffset=a.offsetTop!==1,e.getComputedStyle&&(t.pixelPosition=(e.getComputedStyle(r,null)||{}).top!=="1%",t.boxSizingReliable=(e.getComputedStyle(r,null)||{width:"4px"}).width==="4px",o=i.createElement("div"),o.style.cssText=r.style.cssText=u,o.style.marginRight=o.style.width="0",r.style.width="1px",r.appendChild(o),t.reliableMarginRight=!parseFloat((e.getComputedStyle(o,null)||{}).marginRight)),typeof r.style.zoom!="undefined"&&(r.innerHTML="",r.style.cssText=u+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=r.offsetWidth===3,r.style.display="block",r.style.overflow="visible",r.innerHTML="
            ",r.firstChild.style.width="5px",t.shrinkWrapBlocks=r.offsetWidth!==3,n.style.zoom=1),a.removeChild(n),n=r=s=o=null}),a.removeChild(p),n=r=s=o=u=a=p=null,t}();var D=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;v.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(v.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?v.cache[e[v.expando]]:e[v.expando],!!e&&!B(e)},data:function(e,n,r,i){if(!v.acceptData(e))return;var s,o,u=v.expando,a=typeof n=="string",f=e.nodeType,l=f?v.cache:e,c=f?e[u]:e[u]&&u;if((!c||!l[c]||!i&&!l[c].data)&&a&&r===t)return;c||(f?e[u]=c=v.deletedIds.pop()||v.guid++:c=u),l[c]||(l[c]={},f||(l[c].toJSON=v.noop));if(typeof n=="object"||typeof n=="function")i?l[c]=v.extend(l[c],n):l[c].data=v.extend(l[c].data,n);return s=l[c],i||(s.data||(s.data={}),s=s.data),r!==t&&(s[v.camelCase(n)]=r),a?(o=s[n],o==null&&(o=s[v.camelCase(n)])):o=s,o},removeData:function(e,t,n){if(!v.acceptData(e))return;var r,i,s,o=e.nodeType,u=o?v.cache:e,a=o?e[v.expando]:v.expando;if(!u[a])return;if(t){r=n?u[a]:u[a].data;if(r){v.isArray(t)||(t in r?t=[t]:(t=v.camelCase(t),t in r?t=[t]:t=t.split(" ")));for(i=0,s=t.length;i1,null,!1))},removeData:function(e){return this.each(function(){v.removeData(this,e)})}}),v.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=v._data(e,t),n&&(!r||v.isArray(n)?r=v._data(e,t,v.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=v.queue(e,t),r=n.length,i=n.shift(),s=v._queueHooks(e,t),o=function(){v.dequeue(e,t)};i==="inprogress"&&(i=n.shift(),r--),i&&(t==="fx"&&n.unshift("inprogress"),delete s.stop,i.call(e,o,s)),!r&&s&&s.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return v._data(e,n)||v._data(e,n,{empty:v.Callbacks("once memory").add(function(){v.removeData(e,t+"queue",!0),v.removeData(e,n,!0)})})}}),v.fn.extend({queue:function(e,n){var r=2;return typeof e!="string"&&(n=e,e="fx",r--),arguments.length1)},removeAttr:function(e){return this.each(function(){v.removeAttr(this,e)})},prop:function(e,t){return v.access(this,v.prop,e,t,arguments.length>1)},removeProp:function(e){return e=v.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,s,o,u;if(v.isFunction(e))return this.each(function(t){v(this).addClass(e.call(this,t,this.className))});if(e&&typeof e=="string"){t=e.split(y);for(n=0,r=this.length;n=0)r=r.replace(" "+n[s]+" "," ");i.className=e?v.trim(r):""}}}return this},toggleClass:function(e,t){var n=typeof e,r=typeof t=="boolean";return v.isFunction(e)?this.each(function(n){v(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if(n==="string"){var i,s=0,o=v(this),u=t,a=e.split(y);while(i=a[s++])u=r?u:!o.hasClass(i),o[u?"addClass":"removeClass"](i)}else if(n==="undefined"||n==="boolean")this.className&&v._data(this,"__className__",this.className),this.className=this.className||e===!1?"":v._data(this,"__className__")||""})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;n=0)return!0;return!1},val:function(e){var n,r,i,s=this[0];if(!arguments.length){if(s)return n=v.valHooks[s.type]||v.valHooks[s.nodeName.toLowerCase()],n&&"get"in n&&(r=n.get(s,"value"))!==t?r:(r=s.value,typeof r=="string"?r.replace(R,""):r==null?"":r);return}return i=v.isFunction(e),this.each(function(r){var s,o=v(this);if(this.nodeType!==1)return;i?s=e.call(this,r,o.val()):s=e,s==null?s="":typeof s=="number"?s+="":v.isArray(s)&&(s=v.map(s,function(e){return e==null?"":e+""})),n=v.valHooks[this.type]||v.valHooks[this.nodeName.toLowerCase()];if(!n||!("set"in n)||n.set(this,s,"value")===t)this.value=s})}}),v.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,s=e.type==="select-one"||i<0,o=s?null:[],u=s?i+1:r.length,a=i<0?u:s?i:0;for(;a=0}),n.length||(e.selectedIndex=-1),n}}},attrFn:{},attr:function(e,n,r,i){var s,o,u,a=e.nodeType;if(!e||a===3||a===8||a===2)return;if(i&&v.isFunction(v.fn[n]))return v(e)[n](r);if(typeof e.getAttribute=="undefined")return v.prop(e,n,r);u=a!==1||!v.isXMLDoc(e),u&&(n=n.toLowerCase(),o=v.attrHooks[n]||(X.test(n)?F:j));if(r!==t){if(r===null){v.removeAttr(e,n);return}return o&&"set"in o&&u&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r)}return o&&"get"in o&&u&&(s=o.get(e,n))!==null?s:(s=e.getAttribute(n),s===null?t:s)},removeAttr:function(e,t){var n,r,i,s,o=0;if(t&&e.nodeType===1){r=t.split(y);for(;o=0}})});var $=/^(?:textarea|input|select)$/i,J=/^([^\.]*|)(?:\.(.+)|)$/,K=/(?:^|\s)hover(\.\S+|)\b/,Q=/^key/,G=/^(?:mouse|contextmenu)|click/,Y=/^(?:focusinfocus|focusoutblur)$/,Z=function(e){return v.event.special.hover?e:e.replace(K,"mouseenter$1 mouseleave$1")};v.event={add:function(e,n,r,i,s){var o,u,a,f,l,c,h,p,d,m,g;if(e.nodeType===3||e.nodeType===8||!n||!r||!(o=v._data(e)))return;r.handler&&(d=r,r=d.handler,s=d.selector),r.guid||(r.guid=v.guid++),a=o.events,a||(o.events=a={}),u=o.handle,u||(o.handle=u=function(e){return typeof v=="undefined"||!!e&&v.event.triggered===e.type?t:v.event.dispatch.apply(u.elem,arguments)},u.elem=e),n=v.trim(Z(n)).split(" ");for(f=0;f=0&&(y=y.slice(0,-1),a=!0),y.indexOf(".")>=0&&(b=y.split("."),y=b.shift(),b.sort());if((!s||v.event.customEvent[y])&&!v.event.global[y])return;n=typeof n=="object"?n[v.expando]?n:new v.Event(y,n):new v.Event(y),n.type=y,n.isTrigger=!0,n.exclusive=a,n.namespace=b.join("."),n.namespace_re=n.namespace?new RegExp("(^|\\.)"+b.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,h=y.indexOf(":")<0?"on"+y:"";if(!s){u=v.cache;for(f in u)u[f].events&&u[f].events[y]&&v.event.trigger(n,r,u[f].handle.elem,!0);return}n.result=t,n.target||(n.target=s),r=r!=null?v.makeArray(r):[],r.unshift(n),p=v.event.special[y]||{};if(p.trigger&&p.trigger.apply(s,r)===!1)return;m=[[s,p.bindType||y]];if(!o&&!p.noBubble&&!v.isWindow(s)){g=p.delegateType||y,l=Y.test(g+y)?s:s.parentNode;for(c=s;l;l=l.parentNode)m.push([l,g]),c=l;c===(s.ownerDocument||i)&&m.push([c.defaultView||c.parentWindow||e,g])}for(f=0;f=0:v.find(h,this,null,[s]).length),u[h]&&f.push(c);f.length&&w.push({elem:s,matches:f})}d.length>m&&w.push({elem:this,matches:d.slice(m)});for(r=0;r0?this.on(t,null,e,n):this.trigger(t)},Q.test(t)&&(v.event.fixHooks[t]=v.event.keyHooks),G.test(t)&&(v.event.fixHooks[t]=v.event.mouseHooks)}),function(e,t){function nt(e,t,n,r){n=n||[],t=t||g;var i,s,a,f,l=t.nodeType;if(!e||typeof e!="string")return n;if(l!==1&&l!==9)return[];a=o(t);if(!a&&!r)if(i=R.exec(e))if(f=i[1]){if(l===9){s=t.getElementById(f);if(!s||!s.parentNode)return n;if(s.id===f)return n.push(s),n}else if(t.ownerDocument&&(s=t.ownerDocument.getElementById(f))&&u(t,s)&&s.id===f)return n.push(s),n}else{if(i[2])return S.apply(n,x.call(t.getElementsByTagName(e),0)),n;if((f=i[3])&&Z&&t.getElementsByClassName)return S.apply(n,x.call(t.getElementsByClassName(f),0)),n}return vt(e.replace(j,"$1"),t,n,r,a)}function rt(e){return function(t){var n=t.nodeName.toLowerCase();return n==="input"&&t.type===e}}function it(e){return function(t){var n=t.nodeName.toLowerCase();return(n==="input"||n==="button")&&t.type===e}}function st(e){return N(function(t){return t=+t,N(function(n,r){var i,s=e([],n.length,t),o=s.length;while(o--)n[i=s[o]]&&(n[i]=!(r[i]=n[i]))})})}function ot(e,t,n){if(e===t)return n;var r=e.nextSibling;while(r){if(r===t)return-1;r=r.nextSibling}return 1}function ut(e,t){var n,r,s,o,u,a,f,l=L[d][e+" "];if(l)return t?0:l.slice(0);u=e,a=[],f=i.preFilter;while(u){if(!n||(r=F.exec(u)))r&&(u=u.slice(r[0].length)||u),a.push(s=[]);n=!1;if(r=I.exec(u))s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=r[0].replace(j," ");for(o in i.filter)(r=J[o].exec(u))&&(!f[o]||(r=f[o](r)))&&(s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=o,n.matches=r);if(!n)break}return t?u.length:u?nt.error(e):L(e,a).slice(0)}function at(e,t,r){var i=t.dir,s=r&&t.dir==="parentNode",o=w++;return t.first?function(t,n,r){while(t=t[i])if(s||t.nodeType===1)return e(t,n,r)}:function(t,r,u){if(!u){var a,f=b+" "+o+" ",l=f+n;while(t=t[i])if(s||t.nodeType===1){if((a=t[d])===l)return t.sizset;if(typeof a=="string"&&a.indexOf(f)===0){if(t.sizset)return t}else{t[d]=l;if(e(t,r,u))return t.sizset=!0,t;t.sizset=!1}}}else while(t=t[i])if(s||t.nodeType===1)if(e(t,r,u))return t}}function ft(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function lt(e,t,n,r,i){var s,o=[],u=0,a=e.length,f=t!=null;for(;u-1&&(s[f]=!(o[f]=c))}}else g=lt(g===o?g.splice(d,g.length):g),i?i(null,o,g,a):S.apply(o,g)})}function ht(e){var t,n,r,s=e.length,o=i.relative[e[0].type],u=o||i.relative[" "],a=o?1:0,f=at(function(e){return e===t},u,!0),l=at(function(e){return T.call(t,e)>-1},u,!0),h=[function(e,n,r){return!o&&(r||n!==c)||((t=n).nodeType?f(e,n,r):l(e,n,r))}];for(;a1&&ft(h),a>1&&e.slice(0,a-1).join("").replace(j,"$1"),n,a0,s=e.length>0,o=function(u,a,f,l,h){var p,d,v,m=[],y=0,w="0",x=u&&[],T=h!=null,N=c,C=u||s&&i.find.TAG("*",h&&a.parentNode||a),k=b+=N==null?1:Math.E;T&&(c=a!==g&&a,n=o.el);for(;(p=C[w])!=null;w++){if(s&&p){for(d=0;v=e[d];d++)if(v(p,a,f)){l.push(p);break}T&&(b=k,n=++o.el)}r&&((p=!v&&p)&&y--,u&&x.push(p))}y+=w;if(r&&w!==y){for(d=0;v=t[d];d++)v(x,m,a,f);if(u){if(y>0)while(w--)!x[w]&&!m[w]&&(m[w]=E.call(l));m=lt(m)}S.apply(l,m),T&&!u&&m.length>0&&y+t.length>1&&nt.uniqueSort(l)}return T&&(b=k,c=N),x};return o.el=0,r?N(o):o}function dt(e,t,n){var r=0,i=t.length;for(;r2&&(f=u[0]).type==="ID"&&t.nodeType===9&&!s&&i.relative[u[1].type]){t=i.find.ID(f.matches[0].replace($,""),t,s)[0];if(!t)return n;e=e.slice(u.shift().length)}for(o=J.POS.test(e)?-1:u.length-1;o>=0;o--){f=u[o];if(i.relative[l=f.type])break;if(c=i.find[l])if(r=c(f.matches[0].replace($,""),z.test(u[0].type)&&t.parentNode||t,s)){u.splice(o,1),e=r.length&&u.join("");if(!e)return S.apply(n,x.call(r,0)),n;break}}}return a(e,h)(r,t,s,n,z.test(e)),n}function mt(){}var n,r,i,s,o,u,a,f,l,c,h=!0,p="undefined",d=("sizcache"+Math.random()).replace(".",""),m=String,g=e.document,y=g.documentElement,b=0,w=0,E=[].pop,S=[].push,x=[].slice,T=[].indexOf||function(e){var t=0,n=this.length;for(;ti.cacheLength&&delete e[t.shift()],e[n+" "]=r},e)},k=C(),L=C(),A=C(),O="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",_=M.replace("w","w#"),D="([*^$|!~]?=)",P="\\["+O+"*("+M+")"+O+"*(?:"+D+O+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+_+")|)|)"+O+"*\\]",H=":("+M+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+P+")|[^:]|\\\\.)*|.*))\\)|)",B=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+O+"*((?:-\\d)?\\d*)"+O+"*\\)|)(?=[^-]|$)",j=new RegExp("^"+O+"+|((?:^|[^\\\\])(?:\\\\.)*)"+O+"+$","g"),F=new RegExp("^"+O+"*,"+O+"*"),I=new RegExp("^"+O+"*([\\x20\\t\\r\\n\\f>+~])"+O+"*"),q=new RegExp(H),R=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,U=/^:not/,z=/[\x20\t\r\n\f]*[+~]/,W=/:not\($/,X=/h\d/i,V=/input|select|textarea|button/i,$=/\\(?!\\)/g,J={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),NAME:new RegExp("^\\[name=['\"]?("+M+")['\"]?\\]"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+H),POS:new RegExp(B,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+O+"*(even|odd|(([+-]|)(\\d*)n|)"+O+"*(?:([+-]|)"+O+"*(\\d+)|))"+O+"*\\)|)","i"),needsContext:new RegExp("^"+O+"*[>+~]|"+B,"i")},K=function(e){var t=g.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}},Q=K(function(e){return e.appendChild(g.createComment("")),!e.getElementsByTagName("*").length}),G=K(function(e){return e.innerHTML="",e.firstChild&&typeof e.firstChild.getAttribute!==p&&e.firstChild.getAttribute("href")==="#"}),Y=K(function(e){e.innerHTML="";var t=typeof e.lastChild.getAttribute("multiple");return t!=="boolean"&&t!=="string"}),Z=K(function(e){return e.innerHTML="",!e.getElementsByClassName||!e.getElementsByClassName("e").length?!1:(e.lastChild.className="e",e.getElementsByClassName("e").length===2)}),et=K(function(e){e.id=d+0,e.innerHTML="
            ",y.insertBefore(e,y.firstChild);var t=g.getElementsByName&&g.getElementsByName(d).length===2+g.getElementsByName(d+0).length;return r=!g.getElementById(d),y.removeChild(e),t});try{x.call(y.childNodes,0)[0].nodeType}catch(tt){x=function(e){var t,n=[];for(;t=this[e];e++)n.push(t);return n}}nt.matches=function(e,t){return nt(e,null,null,t)},nt.matchesSelector=function(e,t){return nt(t,null,null,[e]).length>0},s=nt.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(i===1||i===9||i===11){if(typeof e.textContent=="string")return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=s(e)}else if(i===3||i===4)return e.nodeValue}else for(;t=e[r];r++)n+=s(t);return n},o=nt.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?t.nodeName!=="HTML":!1},u=nt.contains=y.contains?function(e,t){var n=e.nodeType===9?e.documentElement:e,r=t&&t.parentNode;return e===r||!!(r&&r.nodeType===1&&n.contains&&n.contains(r))}:y.compareDocumentPosition?function(e,t){return t&&!!(e.compareDocumentPosition(t)&16)}:function(e,t){while(t=t.parentNode)if(t===e)return!0;return!1},nt.attr=function(e,t){var n,r=o(e);return r||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):r||Y?e.getAttribute(t):(n=e.getAttributeNode(t),n?typeof e[t]=="boolean"?e[t]?t:null:n.specified?n.value:null:null)},i=nt.selectors={cacheLength:50,createPseudo:N,match:J,attrHandle:G?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},find:{ID:r?function(e,t,n){if(typeof t.getElementById!==p&&!n){var r=t.getElementById(e);return r&&r.parentNode?[r]:[]}}:function(e,n,r){if(typeof n.getElementById!==p&&!r){var i=n.getElementById(e);return i?i.id===e||typeof i.getAttributeNode!==p&&i.getAttributeNode("id").value===e?[i]:t:[]}},TAG:Q?function(e,t){if(typeof t.getElementsByTagName!==p)return t.getElementsByTagName(e)}:function(e,t){var n=t.getElementsByTagName(e);if(e==="*"){var r,i=[],s=0;for(;r=n[s];s++)r.nodeType===1&&i.push(r);return i}return n},NAME:et&&function(e,t){if(typeof t.getElementsByName!==p)return t.getElementsByName(name)},CLASS:Z&&function(e,t,n){if(typeof t.getElementsByClassName!==p&&!n)return t.getElementsByClassName(e)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace($,""),e[3]=(e[4]||e[5]||"").replace($,""),e[2]==="~="&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),e[1]==="nth"?(e[2]||nt.error(e[0]),e[3]=+(e[3]?e[4]+(e[5]||1):2*(e[2]==="even"||e[2]==="odd")),e[4]=+(e[6]+e[7]||e[2]==="odd")):e[2]&&nt.error(e[0]),e},PSEUDO:function(e){var t,n;if(J.CHILD.test(e[0]))return null;if(e[3])e[2]=e[3];else if(t=e[4])q.test(t)&&(n=ut(t,!0))&&(n=t.indexOf(")",t.length-n)-t.length)&&(t=t.slice(0,n),e[0]=e[0].slice(0,n)),e[2]=t;return e.slice(0,3)}},filter:{ID:r?function(e){return e=e.replace($,""),function(t){return t.getAttribute("id")===e}}:function(e){return e=e.replace($,""),function(t){var n=typeof t.getAttributeNode!==p&&t.getAttributeNode("id");return n&&n.value===e}},TAG:function(e){return e==="*"?function(){return!0}:(e=e.replace($,"").toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[d][e+" "];return t||(t=new RegExp("(^|"+O+")"+e+"("+O+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==p&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r,i){var s=nt.attr(r,e);return s==null?t==="!=":t?(s+="",t==="="?s===n:t==="!="?s!==n:t==="^="?n&&s.indexOf(n)===0:t==="*="?n&&s.indexOf(n)>-1:t==="$="?n&&s.substr(s.length-n.length)===n:t==="~="?(" "+s+" ").indexOf(n)>-1:t==="|="?s===n||s.substr(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r){return e==="nth"?function(e){var t,i,s=e.parentNode;if(n===1&&r===0)return!0;if(s){i=0;for(t=s.firstChild;t;t=t.nextSibling)if(t.nodeType===1){i++;if(e===t)break}}return i-=r,i===n||i%n===0&&i/n>=0}:function(t){var n=t;switch(e){case"only":case"first":while(n=n.previousSibling)if(n.nodeType===1)return!1;if(e==="first")return!0;n=t;case"last":while(n=n.nextSibling)if(n.nodeType===1)return!1;return!0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||nt.error("unsupported pseudo: "+e);return r[d]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?N(function(e,n){var i,s=r(e,t),o=s.length;while(o--)i=T.call(e,s[o]),e[i]=!(n[i]=s[o])}):function(e){return r(e,0,n)}):r}},pseudos:{not:N(function(e){var t=[],n=[],r=a(e.replace(j,"$1"));return r[d]?N(function(e,t,n,i){var s,o=r(e,null,i,[]),u=e.length;while(u--)if(s=o[u])e[u]=!(t[u]=s)}):function(e,i,s){return t[0]=e,r(t,null,s,n),!n.pop()}}),has:N(function(e){return function(t){return nt(e,t).length>0}}),contains:N(function(e){return function(t){return(t.textContent||t.innerText||s(t)).indexOf(e)>-1}}),enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&!!e.checked||t==="option"&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},parent:function(e){return!i.pseudos.empty(e)},empty:function(e){var t;e=e.firstChild;while(e){if(e.nodeName>"@"||(t=e.nodeType)===3||t===4)return!1;e=e.nextSibling}return!0},header:function(e){return X.test(e.nodeName)},text:function(e){var t,n;return e.nodeName.toLowerCase()==="input"&&(t=e.type)==="text"&&((n=e.getAttribute("type"))==null||n.toLowerCase()===t)},radio:rt("radio"),checkbox:rt("checkbox"),file:rt("file"),password:rt("password"),image:rt("image"),submit:it("submit"),reset:it("reset"),button:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&e.type==="button"||t==="button"},input:function(e){return V.test(e.nodeName)},focus:function(e){var t=e.ownerDocument;return e===t.activeElement&&(!t.hasFocus||t.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},active:function(e){return e===e.ownerDocument.activeElement},first:st(function(){return[0]}),last:st(function(e,t){return[t-1]}),eq:st(function(e,t,n){return[n<0?n+t:n]}),even:st(function(e,t){for(var n=0;n=0;)e.push(r);return e}),gt:st(function(e,t,n){for(var r=n<0?n+t:n;++r",e.querySelectorAll("[selected]").length||i.push("\\["+O+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||i.push(":checked")}),K(function(e){e.innerHTML="

            ",e.querySelectorAll("[test^='']").length&&i.push("[*^$]="+O+"*(?:\"\"|'')"),e.innerHTML="",e.querySelectorAll(":enabled").length||i.push(":enabled",":disabled")}),i=new RegExp(i.join("|")),vt=function(e,r,s,o,u){if(!o&&!u&&!i.test(e)){var a,f,l=!0,c=d,h=r,p=r.nodeType===9&&e;if(r.nodeType===1&&r.nodeName.toLowerCase()!=="object"){a=ut(e),(l=r.getAttribute("id"))?c=l.replace(n,"\\$&"):r.setAttribute("id",c),c="[id='"+c+"'] ",f=a.length;while(f--)a[f]=c+a[f].join("");h=z.test(e)&&r.parentNode||r,p=a.join(",")}if(p)try{return S.apply(s,x.call(h.querySelectorAll(p),0)),s}catch(v){}finally{l||r.removeAttribute("id")}}return t(e,r,s,o,u)},u&&(K(function(t){e=u.call(t,"div");try{u.call(t,"[test!='']:sizzle"),s.push("!=",H)}catch(n){}}),s=new RegExp(s.join("|")),nt.matchesSelector=function(t,n){n=n.replace(r,"='$1']");if(!o(t)&&!s.test(n)&&!i.test(n))try{var a=u.call(t,n);if(a||e||t.document&&t.document.nodeType!==11)return a}catch(f){}return nt(n,null,null,[t]).length>0})}(),i.pseudos.nth=i.pseudos.eq,i.filters=mt.prototype=i.pseudos,i.setFilters=new mt,nt.attr=v.attr,v.find=nt,v.expr=nt.selectors,v.expr[":"]=v.expr.pseudos,v.unique=nt.uniqueSort,v.text=nt.getText,v.isXMLDoc=nt.isXML,v.contains=nt.contains}(e);var nt=/Until$/,rt=/^(?:parents|prev(?:Until|All))/,it=/^.[^:#\[\.,]*$/,st=v.expr.match.needsContext,ot={children:!0,contents:!0,next:!0,prev:!0};v.fn.extend({find:function(e){var t,n,r,i,s,o,u=this;if(typeof e!="string")return v(e).filter(function(){for(t=0,n=u.length;t0)for(i=r;i=0:v.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,s=[],o=st.test(e)||typeof e!="string"?v(e,t||this.context):0;for(;r-1:v.find.matchesSelector(n,e)){s.push(n);break}n=n.parentNode}}return s=s.length>1?v.unique(s):s,this.pushStack(s,"closest",e)},index:function(e){return e?typeof e=="string"?v.inArray(this[0],v(e)):v.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(e,t){var n=typeof e=="string"?v(e,t):v.makeArray(e&&e.nodeType?[e]:e),r=v.merge(this.get(),n);return this.pushStack(ut(n[0])||ut(r[0])?r:v.unique(r))},addBack:function(e){return this.add(e==null?this.prevObject:this.prevObject.filter(e))}}),v.fn.andSelf=v.fn.addBack,v.each({parent:function(e){var t=e.parentNode;return t&&t.nodeType!==11?t:null},parents:function(e){return v.dir(e,"parentNode")},parentsUntil:function(e,t,n){return v.dir(e,"parentNode",n)},next:function(e){return at(e,"nextSibling")},prev:function(e){return at(e,"previousSibling")},nextAll:function(e){return v.dir(e,"nextSibling")},prevAll:function(e){return v.dir(e,"previousSibling")},nextUntil:function(e,t,n){return v.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return v.dir(e,"previousSibling",n)},siblings:function(e){return v.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return v.sibling(e.firstChild)},contents:function(e){return v.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:v.merge([],e.childNodes)}},function(e,t){v.fn[e]=function(n,r){var i=v.map(this,t,n);return nt.test(e)||(r=n),r&&typeof r=="string"&&(i=v.filter(r,i)),i=this.length>1&&!ot[e]?v.unique(i):i,this.length>1&&rt.test(e)&&(i=i.reverse()),this.pushStack(i,e,l.call(arguments).join(","))}}),v.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),t.length===1?v.find.matchesSelector(t[0],e)?[t[0]]:[]:v.find.matches(e,t)},dir:function(e,n,r){var i=[],s=e[n];while(s&&s.nodeType!==9&&(r===t||s.nodeType!==1||!v(s).is(r)))s.nodeType===1&&i.push(s),s=s[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)e.nodeType===1&&e!==t&&n.push(e);return n}});var ct="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",ht=/ jQuery\d+="(?:null|\d+)"/g,pt=/^\s+/,dt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,vt=/<([\w:]+)/,mt=/]","i"),Et=/^(?:checkbox|radio)$/,St=/checked\s*(?:[^=]|=\s*.checked.)/i,xt=/\/(java|ecma)script/i,Tt=/^\s*\s*$/g,Nt={option:[1,""],legend:[1,"
            ","
            "],thead:[1,"","
            "],tr:[2,"","
            "],td:[3,"","
            "],col:[2,"","
            "],area:[1,"",""],_default:[0,"",""]},Ct=lt(i),kt=Ct.appendChild(i.createElement("div"));Nt.optgroup=Nt.option,Nt.tbody=Nt.tfoot=Nt.colgroup=Nt.caption=Nt.thead,Nt.th=Nt.td,v.support.htmlSerialize||(Nt._default=[1,"X
            ","
            "]),v.fn.extend({text:function(e){return v.access(this,function(e){return e===t?v.text(this):this.empty().append((this[0]&&this[0].ownerDocument||i).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(v.isFunction(e))return this.each(function(t){v(this).wrapAll(e.call(this,t))});if(this[0]){var t=v(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&e.firstChild.nodeType===1)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return v.isFunction(e)?this.each(function(t){v(this).wrapInner(e.call(this,t))}):this.each(function(){var t=v(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=v.isFunction(e);return this.each(function(n){v(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){v.nodeName(this,"body")||v(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(e,this.firstChild)})},before:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(e,this),"before",this.selector)}},after:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this.nextSibling)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(this,e),"after",this.selector)}},remove:function(e,t){var n,r=0;for(;(n=this[r])!=null;r++)if(!e||v.filter(e,[n]).length)!t&&n.nodeType===1&&(v.cleanData(n.getElementsByTagName("*")),v.cleanData([n])),n.parentNode&&n.parentNode.removeChild(n);return this},empty:function(){var e,t=0;for(;(e=this[t])!=null;t++){e.nodeType===1&&v.cleanData(e.getElementsByTagName("*"));while(e.firstChild)e.removeChild(e.firstChild)}return this},clone:function(e,t){return e=e==null?!1:e,t=t==null?e:t,this.map(function(){return v.clone(this,e,t)})},html:function(e){return v.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return n.nodeType===1?n.innerHTML.replace(ht,""):t;if(typeof e=="string"&&!yt.test(e)&&(v.support.htmlSerialize||!wt.test(e))&&(v.support.leadingWhitespace||!pt.test(e))&&!Nt[(vt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(dt,"<$1>");try{for(;r1&&typeof f=="string"&&St.test(f))return this.each(function(){v(this).domManip(e,n,r)});if(v.isFunction(f))return this.each(function(i){var s=v(this);e[0]=f.call(this,i,n?s.html():t),s.domManip(e,n,r)});if(this[0]){i=v.buildFragment(e,this,l),o=i.fragment,s=o.firstChild,o.childNodes.length===1&&(o=s);if(s){n=n&&v.nodeName(s,"tr");for(u=i.cacheable||c-1;a0?this.clone(!0):this).get(),v(o[i])[t](r),s=s.concat(r);return this.pushStack(s,e,o.selector)}}),v.extend({clone:function(e,t,n){var r,i,s,o;v.support.html5Clone||v.isXMLDoc(e)||!wt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(kt.innerHTML=e.outerHTML,kt.removeChild(o=kt.firstChild));if((!v.support.noCloneEvent||!v.support.noCloneChecked)&&(e.nodeType===1||e.nodeType===11)&&!v.isXMLDoc(e)){Ot(e,o),r=Mt(e),i=Mt(o);for(s=0;r[s];++s)i[s]&&Ot(r[s],i[s])}if(t){At(e,o);if(n){r=Mt(e),i=Mt(o);for(s=0;r[s];++s)At(r[s],i[s])}}return r=i=null,o},clean:function(e,t,n,r){var s,o,u,a,f,l,c,h,p,d,m,g,y=t===i&&Ct,b=[];if(!t||typeof t.createDocumentFragment=="undefined")t=i;for(s=0;(u=e[s])!=null;s++){typeof u=="number"&&(u+="");if(!u)continue;if(typeof u=="string")if(!gt.test(u))u=t.createTextNode(u);else{y=y||lt(t),c=t.createElement("div"),y.appendChild(c),u=u.replace(dt,"<$1>"),a=(vt.exec(u)||["",""])[1].toLowerCase(),f=Nt[a]||Nt._default,l=f[0],c.innerHTML=f[1]+u+f[2];while(l--)c=c.lastChild;if(!v.support.tbody){h=mt.test(u),p=a==="table"&&!h?c.firstChild&&c.firstChild.childNodes:f[1]===""&&!h?c.childNodes:[];for(o=p.length-1;o>=0;--o)v.nodeName(p[o],"tbody")&&!p[o].childNodes.length&&p[o].parentNode.removeChild(p[o])}!v.support.leadingWhitespace&&pt.test(u)&&c.insertBefore(t.createTextNode(pt.exec(u)[0]),c.firstChild),u=c.childNodes,c.parentNode.removeChild(c)}u.nodeType?b.push(u):v.merge(b,u)}c&&(u=c=y=null);if(!v.support.appendChecked)for(s=0;(u=b[s])!=null;s++)v.nodeName(u,"input")?_t(u):typeof u.getElementsByTagName!="undefined"&&v.grep(u.getElementsByTagName("input"),_t);if(n){m=function(e){if(!e.type||xt.test(e.type))return r?r.push(e.parentNode?e.parentNode.removeChild(e):e):n.appendChild(e)};for(s=0;(u=b[s])!=null;s++)if(!v.nodeName(u,"script")||!m(u))n.appendChild(u),typeof u.getElementsByTagName!="undefined"&&(g=v.grep(v.merge([],u.getElementsByTagName("script")),m),b.splice.apply(b,[s+1,0].concat(g)),s+=g.length)}return b},cleanData:function(e,t){var n,r,i,s,o=0,u=v.expando,a=v.cache,f=v.support.deleteExpando,l=v.event.special;for(;(i=e[o])!=null;o++)if(t||v.acceptData(i)){r=i[u],n=r&&a[r];if(n){if(n.events)for(s in n.events)l[s]?v.event.remove(i,s):v.removeEvent(i,s,n.handle);a[r]&&(delete a[r],f?delete i[u]:i.removeAttribute?i.removeAttribute(u):i[u]=null,v.deletedIds.push(r))}}}}),function(){var e,t;v.uaMatch=function(e){e=e.toLowerCase();var t=/(chrome)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||e.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e)||[];return{browser:t[1]||"",version:t[2]||"0"}},e=v.uaMatch(o.userAgent),t={},e.browser&&(t[e.browser]=!0,t.version=e.version),t.chrome?t.webkit=!0:t.webkit&&(t.safari=!0),v.browser=t,v.sub=function(){function e(t,n){return new e.fn.init(t,n)}v.extend(!0,e,this),e.superclass=this,e.fn=e.prototype=this(),e.fn.constructor=e,e.sub=this.sub,e.fn.init=function(r,i){return i&&i instanceof v&&!(i instanceof e)&&(i=e(i)),v.fn.init.call(this,r,i,t)},e.fn.init.prototype=e.fn;var t=e(i);return e}}();var Dt,Pt,Ht,Bt=/alpha\([^)]*\)/i,jt=/opacity=([^)]*)/,Ft=/^(top|right|bottom|left)$/,It=/^(none|table(?!-c[ea]).+)/,qt=/^margin/,Rt=new RegExp("^("+m+")(.*)$","i"),Ut=new RegExp("^("+m+")(?!px)[a-z%]+$","i"),zt=new RegExp("^([-+])=("+m+")","i"),Wt={BODY:"block"},Xt={position:"absolute",visibility:"hidden",display:"block"},Vt={letterSpacing:0,fontWeight:400},$t=["Top","Right","Bottom","Left"],Jt=["Webkit","O","Moz","ms"],Kt=v.fn.toggle;v.fn.extend({css:function(e,n){return v.access(this,function(e,n,r){return r!==t?v.style(e,n,r):v.css(e,n)},e,n,arguments.length>1)},show:function(){return Yt(this,!0)},hide:function(){return Yt(this)},toggle:function(e,t){var n=typeof e=="boolean";return v.isFunction(e)&&v.isFunction(t)?Kt.apply(this,arguments):this.each(function(){(n?e:Gt(this))?v(this).show():v(this).hide()})}}),v.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Dt(e,"opacity");return n===""?"1":n}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":v.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(!e||e.nodeType===3||e.nodeType===8||!e.style)return;var s,o,u,a=v.camelCase(n),f=e.style;n=v.cssProps[a]||(v.cssProps[a]=Qt(f,a)),u=v.cssHooks[n]||v.cssHooks[a];if(r===t)return u&&"get"in u&&(s=u.get(e,!1,i))!==t?s:f[n];o=typeof r,o==="string"&&(s=zt.exec(r))&&(r=(s[1]+1)*s[2]+parseFloat(v.css(e,n)),o="number");if(r==null||o==="number"&&isNaN(r))return;o==="number"&&!v.cssNumber[a]&&(r+="px");if(!u||!("set"in u)||(r=u.set(e,r,i))!==t)try{f[n]=r}catch(l){}},css:function(e,n,r,i){var s,o,u,a=v.camelCase(n);return n=v.cssProps[a]||(v.cssProps[a]=Qt(e.style,a)),u=v.cssHooks[n]||v.cssHooks[a],u&&"get"in u&&(s=u.get(e,!0,i)),s===t&&(s=Dt(e,n)),s==="normal"&&n in Vt&&(s=Vt[n]),r||i!==t?(o=parseFloat(s),r||v.isNumeric(o)?o||0:s):s},swap:function(e,t,n){var r,i,s={};for(i in t)s[i]=e.style[i],e.style[i]=t[i];r=n.call(e);for(i in t)e.style[i]=s[i];return r}}),e.getComputedStyle?Dt=function(t,n){var r,i,s,o,u=e.getComputedStyle(t,null),a=t.style;return u&&(r=u.getPropertyValue(n)||u[n],r===""&&!v.contains(t.ownerDocument,t)&&(r=v.style(t,n)),Ut.test(r)&&qt.test(n)&&(i=a.width,s=a.minWidth,o=a.maxWidth,a.minWidth=a.maxWidth=a.width=r,r=u.width,a.width=i,a.minWidth=s,a.maxWidth=o)),r}:i.documentElement.currentStyle&&(Dt=function(e,t){var n,r,i=e.currentStyle&&e.currentStyle[t],s=e.style;return i==null&&s&&s[t]&&(i=s[t]),Ut.test(i)&&!Ft.test(t)&&(n=s.left,r=e.runtimeStyle&&e.runtimeStyle.left,r&&(e.runtimeStyle.left=e.currentStyle.left),s.left=t==="fontSize"?"1em":i,i=s.pixelLeft+"px",s.left=n,r&&(e.runtimeStyle.left=r)),i===""?"auto":i}),v.each(["height","width"],function(e,t){v.cssHooks[t]={get:function(e,n,r){if(n)return e.offsetWidth===0&&It.test(Dt(e,"display"))?v.swap(e,Xt,function(){return tn(e,t,r)}):tn(e,t,r)},set:function(e,n,r){return Zt(e,n,r?en(e,t,r,v.support.boxSizing&&v.css(e,"boxSizing")==="border-box"):0)}}}),v.support.opacity||(v.cssHooks.opacity={get:function(e,t){return jt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=v.isNumeric(t)?"alpha(opacity="+t*100+")":"",s=r&&r.filter||n.filter||"";n.zoom=1;if(t>=1&&v.trim(s.replace(Bt,""))===""&&n.removeAttribute){n.removeAttribute("filter");if(r&&!r.filter)return}n.filter=Bt.test(s)?s.replace(Bt,i):s+" "+i}}),v(function(){v.support.reliableMarginRight||(v.cssHooks.marginRight={get:function(e,t){return v.swap(e,{display:"inline-block"},function(){if(t)return Dt(e,"marginRight")})}}),!v.support.pixelPosition&&v.fn.position&&v.each(["top","left"],function(e,t){v.cssHooks[t]={get:function(e,n){if(n){var r=Dt(e,t);return Ut.test(r)?v(e).position()[t]+"px":r}}}})}),v.expr&&v.expr.filters&&(v.expr.filters.hidden=function(e){return e.offsetWidth===0&&e.offsetHeight===0||!v.support.reliableHiddenOffsets&&(e.style&&e.style.display||Dt(e,"display"))==="none"},v.expr.filters.visible=function(e){return!v.expr.filters.hidden(e)}),v.each({margin:"",padding:"",border:"Width"},function(e,t){v.cssHooks[e+t]={expand:function(n){var r,i=typeof n=="string"?n.split(" "):[n],s={};for(r=0;r<4;r++)s[e+$t[r]+t]=i[r]||i[r-2]||i[0];return s}},qt.test(e)||(v.cssHooks[e+t].set=Zt)});var rn=/%20/g,sn=/\[\]$/,on=/\r?\n/g,un=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,an=/^(?:select|textarea)/i;v.fn.extend({serialize:function(){return v.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?v.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||an.test(this.nodeName)||un.test(this.type))}).map(function(e,t){var n=v(this).val();return n==null?null:v.isArray(n)?v.map(n,function(e,n){return{name:t.name,value:e.replace(on,"\r\n")}}):{name:t.name,value:n.replace(on,"\r\n")}}).get()}}),v.param=function(e,n){var r,i=[],s=function(e,t){t=v.isFunction(t)?t():t==null?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};n===t&&(n=v.ajaxSettings&&v.ajaxSettings.traditional);if(v.isArray(e)||e.jquery&&!v.isPlainObject(e))v.each(e,function(){s(this.name,this.value)});else for(r in e)fn(r,e[r],n,s);return i.join("&").replace(rn,"+")};var ln,cn,hn=/#.*$/,pn=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,dn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,vn=/^(?:GET|HEAD)$/,mn=/^\/\//,gn=/\?/,yn=/)<[^<]*)*<\/script>/gi,bn=/([?&])_=[^&]*/,wn=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,En=v.fn.load,Sn={},xn={},Tn=["*/"]+["*"];try{cn=s.href}catch(Nn){cn=i.createElement("a"),cn.href="",cn=cn.href}ln=wn.exec(cn.toLowerCase())||[],v.fn.load=function(e,n,r){if(typeof e!="string"&&En)return En.apply(this,arguments);if(!this.length)return this;var i,s,o,u=this,a=e.indexOf(" ");return a>=0&&(i=e.slice(a,e.length),e=e.slice(0,a)),v.isFunction(n)?(r=n,n=t):n&&typeof n=="object"&&(s="POST"),v.ajax({url:e,type:s,dataType:"html",data:n,complete:function(e,t){r&&u.each(r,o||[e.responseText,t,e])}}).done(function(e){o=arguments,u.html(i?v("
            ").append(e.replace(yn,"")).find(i):e)}),this},v.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(e,t){v.fn[t]=function(e){return this.on(t,e)}}),v.each(["get","post"],function(e,n){v[n]=function(e,r,i,s){return v.isFunction(r)&&(s=s||i,i=r,r=t),v.ajax({type:n,url:e,data:r,success:i,dataType:s})}}),v.extend({getScript:function(e,n){return v.get(e,t,n,"script")},getJSON:function(e,t,n){return v.get(e,t,n,"json")},ajaxSetup:function(e,t){return t?Ln(e,v.ajaxSettings):(t=e,e=v.ajaxSettings),Ln(e,t),e},ajaxSettings:{url:cn,isLocal:dn.test(ln[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":Tn},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":v.parseJSON,"text xml":v.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:Cn(Sn),ajaxTransport:Cn(xn),ajax:function(e,n){function T(e,n,s,a){var l,y,b,w,S,T=n;if(E===2)return;E=2,u&&clearTimeout(u),o=t,i=a||"",x.readyState=e>0?4:0,s&&(w=An(c,x,s));if(e>=200&&e<300||e===304)c.ifModified&&(S=x.getResponseHeader("Last-Modified"),S&&(v.lastModified[r]=S),S=x.getResponseHeader("Etag"),S&&(v.etag[r]=S)),e===304?(T="notmodified",l=!0):(l=On(c,w),T=l.state,y=l.data,b=l.error,l=!b);else{b=T;if(!T||e)T="error",e<0&&(e=0)}x.status=e,x.statusText=(n||T)+"",l?d.resolveWith(h,[y,T,x]):d.rejectWith(h,[x,T,b]),x.statusCode(g),g=t,f&&p.trigger("ajax"+(l?"Success":"Error"),[x,c,l?y:b]),m.fireWith(h,[x,T]),f&&(p.trigger("ajaxComplete",[x,c]),--v.active||v.event.trigger("ajaxStop"))}typeof e=="object"&&(n=e,e=t),n=n||{};var r,i,s,o,u,a,f,l,c=v.ajaxSetup({},n),h=c.context||c,p=h!==c&&(h.nodeType||h instanceof v)?v(h):v.event,d=v.Deferred(),m=v.Callbacks("once memory"),g=c.statusCode||{},b={},w={},E=0,S="canceled",x={readyState:0,setRequestHeader:function(e,t){if(!E){var n=e.toLowerCase();e=w[n]=w[n]||e,b[e]=t}return this},getAllResponseHeaders:function(){return E===2?i:null},getResponseHeader:function(e){var n;if(E===2){if(!s){s={};while(n=pn.exec(i))s[n[1].toLowerCase()]=n[2]}n=s[e.toLowerCase()]}return n===t?null:n},overrideMimeType:function(e){return E||(c.mimeType=e),this},abort:function(e){return e=e||S,o&&o.abort(e),T(0,e),this}};d.promise(x),x.success=x.done,x.error=x.fail,x.complete=m.add,x.statusCode=function(e){if(e){var t;if(E<2)for(t in e)g[t]=[g[t],e[t]];else t=e[x.status],x.always(t)}return this},c.url=((e||c.url)+"").replace(hn,"").replace(mn,ln[1]+"//"),c.dataTypes=v.trim(c.dataType||"*").toLowerCase().split(y),c.crossDomain==null&&(a=wn.exec(c.url.toLowerCase()),c.crossDomain=!(!a||a[1]===ln[1]&&a[2]===ln[2]&&(a[3]||(a[1]==="http:"?80:443))==(ln[3]||(ln[1]==="http:"?80:443)))),c.data&&c.processData&&typeof c.data!="string"&&(c.data=v.param(c.data,c.traditional)),kn(Sn,c,n,x);if(E===2)return x;f=c.global,c.type=c.type.toUpperCase(),c.hasContent=!vn.test(c.type),f&&v.active++===0&&v.event.trigger("ajaxStart");if(!c.hasContent){c.data&&(c.url+=(gn.test(c.url)?"&":"?")+c.data,delete c.data),r=c.url;if(c.cache===!1){var N=v.now(),C=c.url.replace(bn,"$1_="+N);c.url=C+(C===c.url?(gn.test(c.url)?"&":"?")+"_="+N:"")}}(c.data&&c.hasContent&&c.contentType!==!1||n.contentType)&&x.setRequestHeader("Content-Type",c.contentType),c.ifModified&&(r=r||c.url,v.lastModified[r]&&x.setRequestHeader("If-Modified-Since",v.lastModified[r]),v.etag[r]&&x.setRequestHeader("If-None-Match",v.etag[r])),x.setRequestHeader("Accept",c.dataTypes[0]&&c.accepts[c.dataTypes[0]]?c.accepts[c.dataTypes[0]]+(c.dataTypes[0]!=="*"?", "+Tn+"; q=0.01":""):c.accepts["*"]);for(l in c.headers)x.setRequestHeader(l,c.headers[l]);if(!c.beforeSend||c.beforeSend.call(h,x,c)!==!1&&E!==2){S="abort";for(l in{success:1,error:1,complete:1})x[l](c[l]);o=kn(xn,c,n,x);if(!o)T(-1,"No Transport");else{x.readyState=1,f&&p.trigger("ajaxSend",[x,c]),c.async&&c.timeout>0&&(u=setTimeout(function(){x.abort("timeout")},c.timeout));try{E=1,o.send(b,T)}catch(k){if(!(E<2))throw k;T(-1,k)}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var Mn=[],_n=/\?/,Dn=/(=)\?(?=&|$)|\?\?/,Pn=v.now();v.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Mn.pop()||v.expando+"_"+Pn++;return this[e]=!0,e}}),v.ajaxPrefilter("json jsonp",function(n,r,i){var s,o,u,a=n.data,f=n.url,l=n.jsonp!==!1,c=l&&Dn.test(f),h=l&&!c&&typeof a=="string"&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Dn.test(a);if(n.dataTypes[0]==="jsonp"||c||h)return s=n.jsonpCallback=v.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,o=e[s],c?n.url=f.replace(Dn,"$1"+s):h?n.data=a.replace(Dn,"$1"+s):l&&(n.url+=(_n.test(f)?"&":"?")+n.jsonp+"="+s),n.converters["script json"]=function(){return u||v.error(s+" was not called"),u[0]},n.dataTypes[0]="json",e[s]=function(){u=arguments},i.always(function(){e[s]=o,n[s]&&(n.jsonpCallback=r.jsonpCallback,Mn.push(s)),u&&v.isFunction(o)&&o(u[0]),u=o=t}),"script"}),v.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(e){return v.globalEval(e),e}}}),v.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),v.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=i.head||i.getElementsByTagName("head")[0]||i.documentElement;return{send:function(s,o){n=i.createElement("script"),n.async="async",e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,i){if(i||!n.readyState||/loaded|complete/.test(n.readyState))n.onload=n.onreadystatechange=null,r&&n.parentNode&&r.removeChild(n),n=t,i||o(200,"success")},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(0,1)}}}});var Hn,Bn=e.ActiveXObject?function(){for(var e in Hn)Hn[e](0,1)}:!1,jn=0;v.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&Fn()||In()}:Fn,function(e){v.extend(v.support,{ajax:!!e,cors:!!e&&"withCredentials"in e})}(v.ajaxSettings.xhr()),v.support.ajax&&v.ajaxTransport(function(n){if(!n.crossDomain||v.support.cors){var r;return{send:function(i,s){var o,u,a=n.xhr();n.username?a.open(n.type,n.url,n.async,n.username,n.password):a.open(n.type,n.url,n.async);if(n.xhrFields)for(u in n.xhrFields)a[u]=n.xhrFields[u];n.mimeType&&a.overrideMimeType&&a.overrideMimeType(n.mimeType),!n.crossDomain&&!i["X-Requested-With"]&&(i["X-Requested-With"]="XMLHttpRequest");try{for(u in i)a.setRequestHeader(u,i[u])}catch(f){}a.send(n.hasContent&&n.data||null),r=function(e,i){var u,f,l,c,h;try{if(r&&(i||a.readyState===4)){r=t,o&&(a.onreadystatechange=v.noop,Bn&&delete Hn[o]);if(i)a.readyState!==4&&a.abort();else{u=a.status,l=a.getAllResponseHeaders(),c={},h=a.responseXML,h&&h.documentElement&&(c.xml=h);try{c.text=a.responseText}catch(p){}try{f=a.statusText}catch(p){f=""}!u&&n.isLocal&&!n.crossDomain?u=c.text?200:404:u===1223&&(u=204)}}}catch(d){i||s(-1,d)}c&&s(u,f,c,l)},n.async?a.readyState===4?setTimeout(r,0):(o=++jn,Bn&&(Hn||(Hn={},v(e).unload(Bn)),Hn[o]=r),a.onreadystatechange=r):r()},abort:function(){r&&r(0,1)}}}});var qn,Rn,Un=/^(?:toggle|show|hide)$/,zn=new RegExp("^(?:([-+])=|)("+m+")([a-z%]*)$","i"),Wn=/queueHooks$/,Xn=[Gn],Vn={"*":[function(e,t){var n,r,i=this.createTween(e,t),s=zn.exec(t),o=i.cur(),u=+o||0,a=1,f=20;if(s){n=+s[2],r=s[3]||(v.cssNumber[e]?"":"px");if(r!=="px"&&u){u=v.css(i.elem,e,!0)||n||1;do a=a||".5",u/=a,v.style(i.elem,e,u+r);while(a!==(a=i.cur()/o)&&a!==1&&--f)}i.unit=r,i.start=u,i.end=s[1]?u+(s[1]+1)*n:n}return i}]};v.Animation=v.extend(Kn,{tweener:function(e,t){v.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;r-1,f={},l={},c,h;a?(l=i.position(),c=l.top,h=l.left):(c=parseFloat(o)||0,h=parseFloat(u)||0),v.isFunction(t)&&(t=t.call(e,n,s)),t.top!=null&&(f.top=t.top-s.top+c),t.left!=null&&(f.left=t.left-s.left+h),"using"in t?t.using.call(e,f):i.css(f)}},v.fn.extend({position:function(){if(!this[0])return;var e=this[0],t=this.offsetParent(),n=this.offset(),r=er.test(t[0].nodeName)?{top:0,left:0}:t.offset();return n.top-=parseFloat(v.css(e,"marginTop"))||0,n.left-=parseFloat(v.css(e,"marginLeft"))||0,r.top+=parseFloat(v.css(t[0],"borderTopWidth"))||0,r.left+=parseFloat(v.css(t[0],"borderLeftWidth"))||0,{top:n.top-r.top,left:n.left-r.left}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||i.body;while(e&&!er.test(e.nodeName)&&v.css(e,"position")==="static")e=e.offsetParent;return e||i.body})}}),v.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);v.fn[e]=function(i){return v.access(this,function(e,i,s){var o=tr(e);if(s===t)return o?n in o?o[n]:o.document.documentElement[i]:e[i];o?o.scrollTo(r?v(o).scrollLeft():s,r?s:v(o).scrollTop()):e[i]=s},e,i,arguments.length,null)}}),v.each({Height:"height",Width:"width"},function(e,n){v.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){v.fn[i]=function(i,s){var o=arguments.length&&(r||typeof i!="boolean"),u=r||(i===!0||s===!0?"margin":"border");return v.access(this,function(n,r,i){var s;return v.isWindow(n)?n.document.documentElement["client"+e]:n.nodeType===9?(s=n.documentElement,Math.max(n.body["scroll"+e],s["scroll"+e],n.body["offset"+e],s["offset"+e],s["client"+e])):i===t?v.css(n,r,i,u):v.style(n,r,i,u)},n,o?i:t,o,null)}})}),e.jQuery=e.$=v,typeof define=="function"&&define.amd&&define.amd.ajQuery&&define("jquery",[],function(){return v})})(window); \ No newline at end of file diff --git a/MP.Land/wwwroot/lib/qrcode.js b/MP.Land/wwwroot/lib/qrcode.js new file mode 100644 index 00000000..b776f43a --- /dev/null +++ b/MP.Land/wwwroot/lib/qrcode.js @@ -0,0 +1,702 @@ +/** + * @fileoverview + * - Using the 'QRCode for Javascript library' + * - Fixed dataset of 'QRCode for Javascript library' for support full-spec. + * - this library has no dependencies. + * + * @author davidshimjs + * @see http://www.d-project.com/ + * @see http://jeromeetienne.github.com/jquery-qrcode/ + */ +var QRCode; + +(function () { + //--------------------------------------------------------------------- + // QRCode for JavaScript + // + // Copyright (c) 2009 Kazuhiko Arase + // + // URL: http://www.d-project.com/ + // + // Licensed under the MIT license: + // http://www.opensource.org/licenses/mit-license.php + // + // The word "QR Code" is registered trademark of + // DENSO WAVE INCORPORATED + // http://www.denso-wave.com/qrcode/faqpatent-e.html + // + //--------------------------------------------------------------------- + function QR8bitByte(data) { + this.mode = QRMode.MODE_8BIT_BYTE; + this.data = data; + this.parsedData = []; + + // Added to support UTF-8 Characters + for (var i = 0, l = this.data.length; i < l; i++) { + var byteArray = []; + var code = this.data.charCodeAt(i); + + if (code > 0x10000) { + byteArray[0] = 0xF0 | ((code & 0x1C0000) >>> 18); + byteArray[1] = 0x80 | ((code & 0x3F000) >>> 12); + byteArray[2] = 0x80 | ((code & 0xFC0) >>> 6); + byteArray[3] = 0x80 | (code & 0x3F); + } else if (code > 0x800) { + byteArray[0] = 0xE0 | ((code & 0xF000) >>> 12); + byteArray[1] = 0x80 | ((code & 0xFC0) >>> 6); + byteArray[2] = 0x80 | (code & 0x3F); + } else if (code > 0x80) { + byteArray[0] = 0xC0 | ((code & 0x7C0) >>> 6); + byteArray[1] = 0x80 | (code & 0x3F); + } else { + byteArray[0] = code; + } + + this.parsedData.push(byteArray); + } + + this.parsedData = Array.prototype.concat.apply([], this.parsedData); + + if (this.parsedData.length != this.data.length) { + this.parsedData.unshift(191); + this.parsedData.unshift(187); + this.parsedData.unshift(239); + } + } + + QR8bitByte.prototype = { + getLength: function (buffer) { + return this.parsedData.length; + }, + write: function (buffer) { + for (var i = 0, l = this.parsedData.length; i < l; i++) { + buffer.put(this.parsedData[i], 8); + } + } + }; + + function QRCodeModel(typeNumber, errorCorrectLevel) { + this.typeNumber = typeNumber; + this.errorCorrectLevel = errorCorrectLevel; + this.modules = null; + this.moduleCount = 0; + this.dataCache = null; + this.dataList = []; + } + + QRCodeModel.prototype = { + addData: function (data) { var newData = new QR8bitByte(data); this.dataList.push(newData); this.dataCache = null; }, isDark: function (row, col) { + if (row < 0 || this.moduleCount <= row || col < 0 || this.moduleCount <= col) { throw new Error(row + "," + col); } + return this.modules[row][col]; + }, getModuleCount: function () { return this.moduleCount; }, make: function () { this.makeImpl(false, this.getBestMaskPattern()); }, makeImpl: function (test, maskPattern) { + this.moduleCount = this.typeNumber * 4 + 17; this.modules = new Array(this.moduleCount); for (var row = 0; row < this.moduleCount; row++) { this.modules[row] = new Array(this.moduleCount); for (var col = 0; col < this.moduleCount; col++) { this.modules[row][col] = null; } } + this.setupPositionProbePattern(0, 0); this.setupPositionProbePattern(this.moduleCount - 7, 0); this.setupPositionProbePattern(0, this.moduleCount - 7); this.setupPositionAdjustPattern(); this.setupTimingPattern(); this.setupTypeInfo(test, maskPattern); if (this.typeNumber >= 7) { this.setupTypeNumber(test); } + if (this.dataCache == null) { this.dataCache = QRCodeModel.createData(this.typeNumber, this.errorCorrectLevel, this.dataList); } + this.mapData(this.dataCache, maskPattern); + }, setupPositionProbePattern: function (row, col) { for (var r = -1; r <= 7; r++) { if (row + r <= -1 || this.moduleCount <= row + r) continue; for (var c = -1; c <= 7; c++) { if (col + c <= -1 || this.moduleCount <= col + c) continue; if ((0 <= r && r <= 6 && (c == 0 || c == 6)) || (0 <= c && c <= 6 && (r == 0 || r == 6)) || (2 <= r && r <= 4 && 2 <= c && c <= 4)) { this.modules[row + r][col + c] = true; } else { this.modules[row + r][col + c] = false; } } } }, getBestMaskPattern: function () { + var minLostPoint = 0; var pattern = 0; for (var i = 0; i < 8; i++) { this.makeImpl(true, i); var lostPoint = QRUtil.getLostPoint(this); if (i == 0 || minLostPoint > lostPoint) { minLostPoint = lostPoint; pattern = i; } } + return pattern; + }, createMovieClip: function (target_mc, instance_name, depth) { + var qr_mc = target_mc.createEmptyMovieClip(instance_name, depth); var cs = 1; this.make(); for (var row = 0; row < this.modules.length; row++) { var y = row * cs; for (var col = 0; col < this.modules[row].length; col++) { var x = col * cs; var dark = this.modules[row][col]; if (dark) { qr_mc.beginFill(0, 100); qr_mc.moveTo(x, y); qr_mc.lineTo(x + cs, y); qr_mc.lineTo(x + cs, y + cs); qr_mc.lineTo(x, y + cs); qr_mc.endFill(); } } } + return qr_mc; + }, setupTimingPattern: function () { + for (var r = 8; r < this.moduleCount - 8; r++) { + if (this.modules[r][6] != null) { continue; } + this.modules[r][6] = (r % 2 == 0); + } + for (var c = 8; c < this.moduleCount - 8; c++) { + if (this.modules[6][c] != null) { continue; } + this.modules[6][c] = (c % 2 == 0); + } + }, setupPositionAdjustPattern: function () { + var pos = QRUtil.getPatternPosition(this.typeNumber); for (var i = 0; i < pos.length; i++) { + for (var j = 0; j < pos.length; j++) { + var row = pos[i]; var col = pos[j]; if (this.modules[row][col] != null) { continue; } + for (var r = -2; r <= 2; r++) { for (var c = -2; c <= 2; c++) { if (r == -2 || r == 2 || c == -2 || c == 2 || (r == 0 && c == 0)) { this.modules[row + r][col + c] = true; } else { this.modules[row + r][col + c] = false; } } } + } + } + }, setupTypeNumber: function (test) { + var bits = QRUtil.getBCHTypeNumber(this.typeNumber); for (var i = 0; i < 18; i++) { var mod = (!test && ((bits >> i) & 1) == 1); this.modules[Math.floor(i / 3)][i % 3 + this.moduleCount - 8 - 3] = mod; } + for (var i = 0; i < 18; i++) { var mod = (!test && ((bits >> i) & 1) == 1); this.modules[i % 3 + this.moduleCount - 8 - 3][Math.floor(i / 3)] = mod; } + }, setupTypeInfo: function (test, maskPattern) { + var data = (this.errorCorrectLevel << 3) | maskPattern; var bits = QRUtil.getBCHTypeInfo(data); for (var i = 0; i < 15; i++) { var mod = (!test && ((bits >> i) & 1) == 1); if (i < 6) { this.modules[i][8] = mod; } else if (i < 8) { this.modules[i + 1][8] = mod; } else { this.modules[this.moduleCount - 15 + i][8] = mod; } } + for (var i = 0; i < 15; i++) { var mod = (!test && ((bits >> i) & 1) == 1); if (i < 8) { this.modules[8][this.moduleCount - i - 1] = mod; } else if (i < 9) { this.modules[8][15 - i - 1 + 1] = mod; } else { this.modules[8][15 - i - 1] = mod; } } + this.modules[this.moduleCount - 8][8] = (!test); + }, mapData: function (data, maskPattern) { + var inc = -1; var row = this.moduleCount - 1; var bitIndex = 7; var byteIndex = 0; for (var col = this.moduleCount - 1; col > 0; col -= 2) { + if (col == 6) col--; while (true) { + for (var c = 0; c < 2; c++) { + if (this.modules[row][col - c] == null) { + var dark = false; if (byteIndex < data.length) { dark = (((data[byteIndex] >>> bitIndex) & 1) == 1); } + var mask = QRUtil.getMask(maskPattern, row, col - c); if (mask) { dark = !dark; } + this.modules[row][col - c] = dark; bitIndex--; if (bitIndex == -1) { byteIndex++; bitIndex = 7; } + } + } + row += inc; if (row < 0 || this.moduleCount <= row) { row -= inc; inc = -inc; break; } + } + } + } + }; QRCodeModel.PAD0 = 0xEC; QRCodeModel.PAD1 = 0x11; QRCodeModel.createData = function (typeNumber, errorCorrectLevel, dataList) { + var rsBlocks = QRRSBlock.getRSBlocks(typeNumber, errorCorrectLevel); var buffer = new QRBitBuffer(); for (var i = 0; i < dataList.length; i++) { var data = dataList[i]; buffer.put(data.mode, 4); buffer.put(data.getLength(), QRUtil.getLengthInBits(data.mode, typeNumber)); data.write(buffer); } + var totalDataCount = 0; for (var i = 0; i < rsBlocks.length; i++) { totalDataCount += rsBlocks[i].dataCount; } + if (buffer.getLengthInBits() > totalDataCount * 8) { + throw new Error("code length overflow. (" + + buffer.getLengthInBits() + + ">" + + totalDataCount * 8 + + ")"); + } + if (buffer.getLengthInBits() + 4 <= totalDataCount * 8) { buffer.put(0, 4); } + while (buffer.getLengthInBits() % 8 != 0) { buffer.putBit(false); } + while (true) { + if (buffer.getLengthInBits() >= totalDataCount * 8) { break; } + buffer.put(QRCodeModel.PAD0, 8); if (buffer.getLengthInBits() >= totalDataCount * 8) { break; } + buffer.put(QRCodeModel.PAD1, 8); + } + return QRCodeModel.createBytes(buffer, rsBlocks); + }; QRCodeModel.createBytes = function (buffer, rsBlocks) { + var offset = 0; var maxDcCount = 0; var maxEcCount = 0; var dcdata = new Array(rsBlocks.length); var ecdata = new Array(rsBlocks.length); for (var r = 0; r < rsBlocks.length; r++) { + var dcCount = rsBlocks[r].dataCount; var ecCount = rsBlocks[r].totalCount - dcCount; maxDcCount = Math.max(maxDcCount, dcCount); maxEcCount = Math.max(maxEcCount, ecCount); dcdata[r] = new Array(dcCount); for (var i = 0; i < dcdata[r].length; i++) { dcdata[r][i] = 0xff & buffer.buffer[i + offset]; } + offset += dcCount; var rsPoly = QRUtil.getErrorCorrectPolynomial(ecCount); var rawPoly = new QRPolynomial(dcdata[r], rsPoly.getLength() - 1); var modPoly = rawPoly.mod(rsPoly); ecdata[r] = new Array(rsPoly.getLength() - 1); for (var i = 0; i < ecdata[r].length; i++) { var modIndex = i + modPoly.getLength() - ecdata[r].length; ecdata[r][i] = (modIndex >= 0) ? modPoly.get(modIndex) : 0; } + } + var totalCodeCount = 0; for (var i = 0; i < rsBlocks.length; i++) { totalCodeCount += rsBlocks[i].totalCount; } + var data = new Array(totalCodeCount); var index = 0; for (var i = 0; i < maxDcCount; i++) { for (var r = 0; r < rsBlocks.length; r++) { if (i < dcdata[r].length) { data[index++] = dcdata[r][i]; } } } + for (var i = 0; i < maxEcCount; i++) { for (var r = 0; r < rsBlocks.length; r++) { if (i < ecdata[r].length) { data[index++] = ecdata[r][i]; } } } + return data; + }; var QRMode = { MODE_NUMBER: 1 << 0, MODE_ALPHA_NUM: 1 << 1, MODE_8BIT_BYTE: 1 << 2, MODE_KANJI: 1 << 3 }; var QRErrorCorrectLevel = { L: 1, M: 0, Q: 3, H: 2 }; var QRMaskPattern = { PATTERN000: 0, PATTERN001: 1, PATTERN010: 2, PATTERN011: 3, PATTERN100: 4, PATTERN101: 5, PATTERN110: 6, PATTERN111: 7 }; var QRUtil = { + PATTERN_POSITION_TABLE: [[], [6, 18], [6, 22], [6, 26], [6, 30], [6, 34], [6, 22, 38], [6, 24, 42], [6, 26, 46], [6, 28, 50], [6, 30, 54], [6, 32, 58], [6, 34, 62], [6, 26, 46, 66], [6, 26, 48, 70], [6, 26, 50, 74], [6, 30, 54, 78], [6, 30, 56, 82], [6, 30, 58, 86], [6, 34, 62, 90], [6, 28, 50, 72, 94], [6, 26, 50, 74, 98], [6, 30, 54, 78, 102], [6, 28, 54, 80, 106], [6, 32, 58, 84, 110], [6, 30, 58, 86, 114], [6, 34, 62, 90, 118], [6, 26, 50, 74, 98, 122], [6, 30, 54, 78, 102, 126], [6, 26, 52, 78, 104, 130], [6, 30, 56, 82, 108, 134], [6, 34, 60, 86, 112, 138], [6, 30, 58, 86, 114, 142], [6, 34, 62, 90, 118, 146], [6, 30, 54, 78, 102, 126, 150], [6, 24, 50, 76, 102, 128, 154], [6, 28, 54, 80, 106, 132, 158], [6, 32, 58, 84, 110, 136, 162], [6, 26, 54, 82, 110, 138, 166], [6, 30, 58, 86, 114, 142, 170]], G15: (1 << 10) | (1 << 8) | (1 << 5) | (1 << 4) | (1 << 2) | (1 << 1) | (1 << 0), G18: (1 << 12) | (1 << 11) | (1 << 10) | (1 << 9) | (1 << 8) | (1 << 5) | (1 << 2) | (1 << 0), G15_MASK: (1 << 14) | (1 << 12) | (1 << 10) | (1 << 4) | (1 << 1), getBCHTypeInfo: function (data) { + var d = data << 10; while (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G15) >= 0) { d ^= (QRUtil.G15 << (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G15))); } + return ((data << 10) | d) ^ QRUtil.G15_MASK; + }, getBCHTypeNumber: function (data) { + var d = data << 12; while (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G18) >= 0) { d ^= (QRUtil.G18 << (QRUtil.getBCHDigit(d) - QRUtil.getBCHDigit(QRUtil.G18))); } + return (data << 12) | d; + }, getBCHDigit: function (data) { + var digit = 0; while (data != 0) { digit++; data >>>= 1; } + return digit; + }, getPatternPosition: function (typeNumber) { return QRUtil.PATTERN_POSITION_TABLE[typeNumber - 1]; }, getMask: function (maskPattern, i, j) { switch (maskPattern) { case QRMaskPattern.PATTERN000: return (i + j) % 2 == 0; case QRMaskPattern.PATTERN001: return i % 2 == 0; case QRMaskPattern.PATTERN010: return j % 3 == 0; case QRMaskPattern.PATTERN011: return (i + j) % 3 == 0; case QRMaskPattern.PATTERN100: return (Math.floor(i / 2) + Math.floor(j / 3)) % 2 == 0; case QRMaskPattern.PATTERN101: return (i * j) % 2 + (i * j) % 3 == 0; case QRMaskPattern.PATTERN110: return ((i * j) % 2 + (i * j) % 3) % 2 == 0; case QRMaskPattern.PATTERN111: return ((i * j) % 3 + (i + j) % 2) % 2 == 0; default: throw new Error("bad maskPattern:" + maskPattern); } }, getErrorCorrectPolynomial: function (errorCorrectLength) { + var a = new QRPolynomial([1], 0); for (var i = 0; i < errorCorrectLength; i++) { a = a.multiply(new QRPolynomial([1, QRMath.gexp(i)], 0)); } + return a; + }, getLengthInBits: function (mode, type) { if (1 <= type && type < 10) { switch (mode) { case QRMode.MODE_NUMBER: return 10; case QRMode.MODE_ALPHA_NUM: return 9; case QRMode.MODE_8BIT_BYTE: return 8; case QRMode.MODE_KANJI: return 8; default: throw new Error("mode:" + mode); } } else if (type < 27) { switch (mode) { case QRMode.MODE_NUMBER: return 12; case QRMode.MODE_ALPHA_NUM: return 11; case QRMode.MODE_8BIT_BYTE: return 16; case QRMode.MODE_KANJI: return 10; default: throw new Error("mode:" + mode); } } else if (type < 41) { switch (mode) { case QRMode.MODE_NUMBER: return 14; case QRMode.MODE_ALPHA_NUM: return 13; case QRMode.MODE_8BIT_BYTE: return 16; case QRMode.MODE_KANJI: return 12; default: throw new Error("mode:" + mode); } } else { throw new Error("type:" + type); } }, getLostPoint: function (qrCode) { + var moduleCount = qrCode.getModuleCount(); var lostPoint = 0; for (var row = 0; row < moduleCount; row++) { + for (var col = 0; col < moduleCount; col++) { + var sameCount = 0; var dark = qrCode.isDark(row, col); for (var r = -1; r <= 1; r++) { + if (row + r < 0 || moduleCount <= row + r) { continue; } + for (var c = -1; c <= 1; c++) { + if (col + c < 0 || moduleCount <= col + c) { continue; } + if (r == 0 && c == 0) { continue; } + if (dark == qrCode.isDark(row + r, col + c)) { sameCount++; } + } + } + if (sameCount > 5) { lostPoint += (3 + sameCount - 5); } + } + } + for (var row = 0; row < moduleCount - 1; row++) { for (var col = 0; col < moduleCount - 1; col++) { var count = 0; if (qrCode.isDark(row, col)) count++; if (qrCode.isDark(row + 1, col)) count++; if (qrCode.isDark(row, col + 1)) count++; if (qrCode.isDark(row + 1, col + 1)) count++; if (count == 0 || count == 4) { lostPoint += 3; } } } + for (var row = 0; row < moduleCount; row++) { for (var col = 0; col < moduleCount - 6; col++) { if (qrCode.isDark(row, col) && !qrCode.isDark(row, col + 1) && qrCode.isDark(row, col + 2) && qrCode.isDark(row, col + 3) && qrCode.isDark(row, col + 4) && !qrCode.isDark(row, col + 5) && qrCode.isDark(row, col + 6)) { lostPoint += 40; } } } + for (var col = 0; col < moduleCount; col++) { for (var row = 0; row < moduleCount - 6; row++) { if (qrCode.isDark(row, col) && !qrCode.isDark(row + 1, col) && qrCode.isDark(row + 2, col) && qrCode.isDark(row + 3, col) && qrCode.isDark(row + 4, col) && !qrCode.isDark(row + 5, col) && qrCode.isDark(row + 6, col)) { lostPoint += 40; } } } + var darkCount = 0; for (var col = 0; col < moduleCount; col++) { for (var row = 0; row < moduleCount; row++) { if (qrCode.isDark(row, col)) { darkCount++; } } } + var ratio = Math.abs(100 * darkCount / moduleCount / moduleCount - 50) / 5; lostPoint += ratio * 10; return lostPoint; + } + }; var QRMath = { + glog: function (n) { + if (n < 1) { throw new Error("glog(" + n + ")"); } + return QRMath.LOG_TABLE[n]; + }, gexp: function (n) { + while (n < 0) { n += 255; } + while (n >= 256) { n -= 255; } + return QRMath.EXP_TABLE[n]; + }, EXP_TABLE: new Array(256), LOG_TABLE: new Array(256) + }; for (var i = 0; i < 8; i++) { QRMath.EXP_TABLE[i] = 1 << i; } + for (var i = 8; i < 256; i++) { QRMath.EXP_TABLE[i] = QRMath.EXP_TABLE[i - 4] ^ QRMath.EXP_TABLE[i - 5] ^ QRMath.EXP_TABLE[i - 6] ^ QRMath.EXP_TABLE[i - 8]; } + for (var i = 0; i < 255; i++) { QRMath.LOG_TABLE[QRMath.EXP_TABLE[i]] = i; } + function QRPolynomial(num, shift) { + if (num.length == undefined) { throw new Error(num.length + "/" + shift); } + var offset = 0; while (offset < num.length && num[offset] == 0) { offset++; } + this.num = new Array(num.length - offset + shift); for (var i = 0; i < num.length - offset; i++) { this.num[i] = num[i + offset]; } + } + QRPolynomial.prototype = { + get: function (index) { return this.num[index]; }, getLength: function () { return this.num.length; }, multiply: function (e) { + var num = new Array(this.getLength() + e.getLength() - 1); for (var i = 0; i < this.getLength(); i++) { for (var j = 0; j < e.getLength(); j++) { num[i + j] ^= QRMath.gexp(QRMath.glog(this.get(i)) + QRMath.glog(e.get(j))); } } + return new QRPolynomial(num, 0); + }, mod: function (e) { + if (this.getLength() - e.getLength() < 0) { return this; } + var ratio = QRMath.glog(this.get(0)) - QRMath.glog(e.get(0)); var num = new Array(this.getLength()); for (var i = 0; i < this.getLength(); i++) { num[i] = this.get(i); } + for (var i = 0; i < e.getLength(); i++) { num[i] ^= QRMath.gexp(QRMath.glog(e.get(i)) + ratio); } + return new QRPolynomial(num, 0).mod(e); + } + }; function QRRSBlock(totalCount, dataCount) { this.totalCount = totalCount; this.dataCount = dataCount; } + QRRSBlock.RS_BLOCK_TABLE = [[1, 26, 19], [1, 26, 16], [1, 26, 13], [1, 26, 9], [1, 44, 34], [1, 44, 28], [1, 44, 22], [1, 44, 16], [1, 70, 55], [1, 70, 44], [2, 35, 17], [2, 35, 13], [1, 100, 80], [2, 50, 32], [2, 50, 24], [4, 25, 9], [1, 134, 108], [2, 67, 43], [2, 33, 15, 2, 34, 16], [2, 33, 11, 2, 34, 12], [2, 86, 68], [4, 43, 27], [4, 43, 19], [4, 43, 15], [2, 98, 78], [4, 49, 31], [2, 32, 14, 4, 33, 15], [4, 39, 13, 1, 40, 14], [2, 121, 97], [2, 60, 38, 2, 61, 39], [4, 40, 18, 2, 41, 19], [4, 40, 14, 2, 41, 15], [2, 146, 116], [3, 58, 36, 2, 59, 37], [4, 36, 16, 4, 37, 17], [4, 36, 12, 4, 37, 13], [2, 86, 68, 2, 87, 69], [4, 69, 43, 1, 70, 44], [6, 43, 19, 2, 44, 20], [6, 43, 15, 2, 44, 16], [4, 101, 81], [1, 80, 50, 4, 81, 51], [4, 50, 22, 4, 51, 23], [3, 36, 12, 8, 37, 13], [2, 116, 92, 2, 117, 93], [6, 58, 36, 2, 59, 37], [4, 46, 20, 6, 47, 21], [7, 42, 14, 4, 43, 15], [4, 133, 107], [8, 59, 37, 1, 60, 38], [8, 44, 20, 4, 45, 21], [12, 33, 11, 4, 34, 12], [3, 145, 115, 1, 146, 116], [4, 64, 40, 5, 65, 41], [11, 36, 16, 5, 37, 17], [11, 36, 12, 5, 37, 13], [5, 109, 87, 1, 110, 88], [5, 65, 41, 5, 66, 42], [5, 54, 24, 7, 55, 25], [11, 36, 12], [5, 122, 98, 1, 123, 99], [7, 73, 45, 3, 74, 46], [15, 43, 19, 2, 44, 20], [3, 45, 15, 13, 46, 16], [1, 135, 107, 5, 136, 108], [10, 74, 46, 1, 75, 47], [1, 50, 22, 15, 51, 23], [2, 42, 14, 17, 43, 15], [5, 150, 120, 1, 151, 121], [9, 69, 43, 4, 70, 44], [17, 50, 22, 1, 51, 23], [2, 42, 14, 19, 43, 15], [3, 141, 113, 4, 142, 114], [3, 70, 44, 11, 71, 45], [17, 47, 21, 4, 48, 22], [9, 39, 13, 16, 40, 14], [3, 135, 107, 5, 136, 108], [3, 67, 41, 13, 68, 42], [15, 54, 24, 5, 55, 25], [15, 43, 15, 10, 44, 16], [4, 144, 116, 4, 145, 117], [17, 68, 42], [17, 50, 22, 6, 51, 23], [19, 46, 16, 6, 47, 17], [2, 139, 111, 7, 140, 112], [17, 74, 46], [7, 54, 24, 16, 55, 25], [34, 37, 13], [4, 151, 121, 5, 152, 122], [4, 75, 47, 14, 76, 48], [11, 54, 24, 14, 55, 25], [16, 45, 15, 14, 46, 16], [6, 147, 117, 4, 148, 118], [6, 73, 45, 14, 74, 46], [11, 54, 24, 16, 55, 25], [30, 46, 16, 2, 47, 17], [8, 132, 106, 4, 133, 107], [8, 75, 47, 13, 76, 48], [7, 54, 24, 22, 55, 25], [22, 45, 15, 13, 46, 16], [10, 142, 114, 2, 143, 115], [19, 74, 46, 4, 75, 47], [28, 50, 22, 6, 51, 23], [33, 46, 16, 4, 47, 17], [8, 152, 122, 4, 153, 123], [22, 73, 45, 3, 74, 46], [8, 53, 23, 26, 54, 24], [12, 45, 15, 28, 46, 16], [3, 147, 117, 10, 148, 118], [3, 73, 45, 23, 74, 46], [4, 54, 24, 31, 55, 25], [11, 45, 15, 31, 46, 16], [7, 146, 116, 7, 147, 117], [21, 73, 45, 7, 74, 46], [1, 53, 23, 37, 54, 24], [19, 45, 15, 26, 46, 16], [5, 145, 115, 10, 146, 116], [19, 75, 47, 10, 76, 48], [15, 54, 24, 25, 55, 25], [23, 45, 15, 25, 46, 16], [13, 145, 115, 3, 146, 116], [2, 74, 46, 29, 75, 47], [42, 54, 24, 1, 55, 25], [23, 45, 15, 28, 46, 16], [17, 145, 115], [10, 74, 46, 23, 75, 47], [10, 54, 24, 35, 55, 25], [19, 45, 15, 35, 46, 16], [17, 145, 115, 1, 146, 116], [14, 74, 46, 21, 75, 47], [29, 54, 24, 19, 55, 25], [11, 45, 15, 46, 46, 16], [13, 145, 115, 6, 146, 116], [14, 74, 46, 23, 75, 47], [44, 54, 24, 7, 55, 25], [59, 46, 16, 1, 47, 17], [12, 151, 121, 7, 152, 122], [12, 75, 47, 26, 76, 48], [39, 54, 24, 14, 55, 25], [22, 45, 15, 41, 46, 16], [6, 151, 121, 14, 152, 122], [6, 75, 47, 34, 76, 48], [46, 54, 24, 10, 55, 25], [2, 45, 15, 64, 46, 16], [17, 152, 122, 4, 153, 123], [29, 74, 46, 14, 75, 47], [49, 54, 24, 10, 55, 25], [24, 45, 15, 46, 46, 16], [4, 152, 122, 18, 153, 123], [13, 74, 46, 32, 75, 47], [48, 54, 24, 14, 55, 25], [42, 45, 15, 32, 46, 16], [20, 147, 117, 4, 148, 118], [40, 75, 47, 7, 76, 48], [43, 54, 24, 22, 55, 25], [10, 45, 15, 67, 46, 16], [19, 148, 118, 6, 149, 119], [18, 75, 47, 31, 76, 48], [34, 54, 24, 34, 55, 25], [20, 45, 15, 61, 46, 16]]; QRRSBlock.getRSBlocks = function (typeNumber, errorCorrectLevel) { + var rsBlock = QRRSBlock.getRsBlockTable(typeNumber, errorCorrectLevel); if (rsBlock == undefined) { throw new Error("bad rs block @ typeNumber:" + typeNumber + "/errorCorrectLevel:" + errorCorrectLevel); } + var length = rsBlock.length / 3; var list = []; for (var i = 0; i < length; i++) { var count = rsBlock[i * 3 + 0]; var totalCount = rsBlock[i * 3 + 1]; var dataCount = rsBlock[i * 3 + 2]; for (var j = 0; j < count; j++) { list.push(new QRRSBlock(totalCount, dataCount)); } } + return list; + }; QRRSBlock.getRsBlockTable = function (typeNumber, errorCorrectLevel) { switch (errorCorrectLevel) { case QRErrorCorrectLevel.L: return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 0]; case QRErrorCorrectLevel.M: return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 1]; case QRErrorCorrectLevel.Q: return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 2]; case QRErrorCorrectLevel.H: return QRRSBlock.RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 3]; default: return undefined; } }; function QRBitBuffer() { this.buffer = []; this.length = 0; } + QRBitBuffer.prototype = { + get: function (index) { var bufIndex = Math.floor(index / 8); return ((this.buffer[bufIndex] >>> (7 - index % 8)) & 1) == 1; }, put: function (num, length) { for (var i = 0; i < length; i++) { this.putBit(((num >>> (length - i - 1)) & 1) == 1); } }, getLengthInBits: function () { return this.length; }, putBit: function (bit) { + var bufIndex = Math.floor(this.length / 8); if (this.buffer.length <= bufIndex) { this.buffer.push(0); } + if (bit) { this.buffer[bufIndex] |= (0x80 >>> (this.length % 8)); } + this.length++; + } + }; var QRCodeLimitLength = [[17, 14, 11, 7], [32, 26, 20, 14], [53, 42, 32, 24], [78, 62, 46, 34], [106, 84, 60, 44], [134, 106, 74, 58], [154, 122, 86, 64], [192, 152, 108, 84], [230, 180, 130, 98], [271, 213, 151, 119], [321, 251, 177, 137], [367, 287, 203, 155], [425, 331, 241, 177], [458, 362, 258, 194], [520, 412, 292, 220], [586, 450, 322, 250], [644, 504, 364, 280], [718, 560, 394, 310], [792, 624, 442, 338], [858, 666, 482, 382], [929, 711, 509, 403], [1003, 779, 565, 439], [1091, 857, 611, 461], [1171, 911, 661, 511], [1273, 997, 715, 535], [1367, 1059, 751, 593], [1465, 1125, 805, 625], [1528, 1190, 868, 658], [1628, 1264, 908, 698], [1732, 1370, 982, 742], [1840, 1452, 1030, 790], [1952, 1538, 1112, 842], [2068, 1628, 1168, 898], [2188, 1722, 1228, 958], [2303, 1809, 1283, 983], [2431, 1911, 1351, 1051], [2563, 1989, 1423, 1093], [2699, 2099, 1499, 1139], [2809, 2213, 1579, 1219], [2953, 2331, 1663, 1273]]; + + function _isSupportCanvas() { + return typeof CanvasRenderingContext2D != "undefined"; + } + + // android 2.x doesn't support Data-URI spec + function _getAndroid() { + var android = false; + var sAgent = navigator.userAgent; + + if (/android/i.test(sAgent)) { // android + android = true; + var aMat = sAgent.toString().match(/android ([0-9]\.[0-9])/i); + + if (aMat && aMat[1]) { + android = parseFloat(aMat[1]); + } + } + + return android; + } + + var svgDrawer = (function () { + var Drawing = function (el, htOption) { + this._el = el; + this._htOption = htOption; + }; + + Drawing.prototype.draw = function (oQRCode) { + var _htOption = this._htOption; + var _el = this._el; + var nCount = oQRCode.getModuleCount(); + var nWidth = Math.floor(_htOption.width / nCount); + var nHeight = Math.floor(_htOption.height / nCount); + + this.clear(); + + function makeSVG(tag, attrs) { + var el = document.createElementNS('http://www.w3.org/2000/svg', tag); + for (var k in attrs) + if (attrs.hasOwnProperty(k)) el.setAttribute(k, attrs[k]); + return el; + } + + var svg = makeSVG("svg", { 'viewBox': '0 0 ' + String(nCount) + " " + String(nCount), 'width': '100%', 'height': '100%', 'fill': _htOption.colorLight }); + svg.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:xlink", "http://www.w3.org/1999/xlink"); + _el.appendChild(svg); + + svg.appendChild(makeSVG("rect", { "fill": _htOption.colorLight, "width": "100%", "height": "100%" })); + svg.appendChild(makeSVG("rect", { "fill": _htOption.colorDark, "width": "1", "height": "1", "id": "template" })); + + for (var row = 0; row < nCount; row++) { + for (var col = 0; col < nCount; col++) { + if (oQRCode.isDark(row, col)) { + var child = makeSVG("use", { "x": String(col), "y": String(row) }); + child.setAttributeNS("http://www.w3.org/1999/xlink", "href", "#template") + svg.appendChild(child); + } + } + } + }; + Drawing.prototype.clear = function () { + while (this._el.hasChildNodes()) + this._el.removeChild(this._el.lastChild); + }; + return Drawing; + })(); + + var useSVG = document.documentElement.tagName.toLowerCase() === "svg"; + + // Drawing in DOM by using Table tag + var Drawing = useSVG ? svgDrawer : !_isSupportCanvas() ? (function () { + var Drawing = function (el, htOption) { + this._el = el; + this._htOption = htOption; + }; + + /** + * Draw the QRCode + * + * @param {QRCode} oQRCode + */ + Drawing.prototype.draw = function (oQRCode) { + var _htOption = this._htOption; + var _el = this._el; + var nCount = oQRCode.getModuleCount(); + var nWidth = Math.floor(_htOption.width / nCount); + var nHeight = Math.floor(_htOption.height / nCount); + var aHTML = ['
            ']; + + for (var row = 0; row < nCount; row++) { + aHTML.push(''); + + for (var col = 0; col < nCount; col++) { + aHTML.push(''); + } + + aHTML.push(''); + } + + aHTML.push('
            '); + _el.innerHTML = aHTML.join(''); + + // Fix the margin values as real size. + var elTable = _el.childNodes[0]; + var nLeftMarginTable = (_htOption.width - elTable.offsetWidth) / 2; + var nTopMarginTable = (_htOption.height - elTable.offsetHeight) / 2; + + if (nLeftMarginTable > 0 && nTopMarginTable > 0) { + elTable.style.margin = nTopMarginTable + "px " + nLeftMarginTable + "px"; + } + }; + + /** + * Clear the QRCode + */ + Drawing.prototype.clear = function () { + this._el.innerHTML = ''; + }; + + return Drawing; + })() : (function () { // Drawing in Canvas + function _onMakeImage() { + this._elImage.src = this._elCanvas.toDataURL("image/png"); + this._elImage.style.display = "block"; + this._elCanvas.style.display = "none"; + this._elImage.className = "img-fluid"; + } + + // Android 2.1 bug workaround + // http://code.google.com/p/android/issues/detail?id=5141 + if (this._android && this._android <= 2.1) { + var factor = 1 / window.devicePixelRatio; + var drawImage = CanvasRenderingContext2D.prototype.drawImage; + CanvasRenderingContext2D.prototype.drawImage = function (image, sx, sy, sw, sh, dx, dy, dw, dh) { + if (("nodeName" in image) && /img/i.test(image.nodeName)) { + for (var i = arguments.length - 1; i >= 1; i--) { + arguments[i] = arguments[i] * factor; + } + } else if (typeof dw == "undefined") { + arguments[1] *= factor; + arguments[2] *= factor; + arguments[3] *= factor; + arguments[4] *= factor; + } + + drawImage.apply(this, arguments); + }; + } + + /** + * Check whether the user's browser supports Data URI or not + * + * @private + * @param {Function} fSuccess Occurs if it supports Data URI + * @param {Function} fFail Occurs if it doesn't support Data URI + */ + function _safeSetDataURI(fSuccess, fFail) { + var self = this; + self._fFail = fFail; + self._fSuccess = fSuccess; + + // Check it just once + if (self._bSupportDataURI === null) { + var el = document.createElement("img"); + var fOnError = function () { + self._bSupportDataURI = false; + + if (self._fFail) { + self._fFail.call(self); + } + }; + var fOnSuccess = function () { + self._bSupportDataURI = true; + + if (self._fSuccess) { + self._fSuccess.call(self); + } + }; + + el.onabort = fOnError; + el.onerror = fOnError; + el.onload = fOnSuccess; + el.src = "data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg=="; // the Image contains 1px data. + return; + } else if (self._bSupportDataURI === true && self._fSuccess) { + self._fSuccess.call(self); + } else if (self._bSupportDataURI === false && self._fFail) { + self._fFail.call(self); + } + }; + + /** + * Drawing QRCode by using canvas + * + * @constructor + * @param {HTMLElement} el + * @param {Object} htOption QRCode Options + */ + var Drawing = function (el, htOption) { + this._bIsPainted = false; + this._android = _getAndroid(); + + this._htOption = htOption; + this._elCanvas = document.createElement("canvas"); + this._elCanvas.width = htOption.width; + this._elCanvas.height = htOption.height; + el.appendChild(this._elCanvas); + this._el = el; + this._oContext = this._elCanvas.getContext("2d"); + this._bIsPainted = false; + this._elImage = document.createElement("img"); + this._elImage.alt = "Scan me!"; + this._elImage.style.display = "none"; + this._elImage.className = "img-fluid"; + this._el.appendChild(this._elImage); + this._bSupportDataURI = null; + }; + + /** + * Draw the QRCode + * + * @param {QRCode} oQRCode + */ + Drawing.prototype.draw = function (oQRCode) { + var _elImage = this._elImage; + var _oContext = this._oContext; + var _htOption = this._htOption; + + var nCount = oQRCode.getModuleCount(); + var nWidth = _htOption.width / nCount; + var nHeight = _htOption.height / nCount; + var nRoundedWidth = Math.round(nWidth); + var nRoundedHeight = Math.round(nHeight); + + _elImage.style.display = "none"; + _elImage.className = "img-fluid"; + this.clear(); + + for (var row = 0; row < nCount; row++) { + for (var col = 0; col < nCount; col++) { + var bIsDark = oQRCode.isDark(row, col); + var nLeft = col * nWidth; + var nTop = row * nHeight; + _oContext.strokeStyle = bIsDark ? _htOption.colorDark : _htOption.colorLight; + _oContext.lineWidth = 1; + _oContext.fillStyle = bIsDark ? _htOption.colorDark : _htOption.colorLight; + _oContext.fillRect(nLeft, nTop, nWidth, nHeight); + + // 안티 앨리어싱 방지 처리 + _oContext.strokeRect( + Math.floor(nLeft) + 0.5, + Math.floor(nTop) + 0.5, + nRoundedWidth, + nRoundedHeight + ); + + _oContext.strokeRect( + Math.ceil(nLeft) - 0.5, + Math.ceil(nTop) - 0.5, + nRoundedWidth, + nRoundedHeight + ); + } + } + + this._bIsPainted = true; + }; + + /** + * Make the image from Canvas if the browser supports Data URI. + */ + Drawing.prototype.makeImage = function () { + if (this._bIsPainted) { + _safeSetDataURI.call(this, _onMakeImage); + } + }; + + /** + * Return whether the QRCode is painted or not + * + * @return {Boolean} + */ + Drawing.prototype.isPainted = function () { + return this._bIsPainted; + }; + + /** + * Clear the QRCode + */ + Drawing.prototype.clear = function () { + this._oContext.clearRect(0, 0, this._elCanvas.width, this._elCanvas.height); + this._bIsPainted = false; + }; + + /** + * @private + * @param {Number} nNumber + */ + Drawing.prototype.round = function (nNumber) { + if (!nNumber) { + return nNumber; + } + + return Math.floor(nNumber * 1000) / 1000; + }; + + return Drawing; + })(); + + /** + * Get the type by string length + * + * @private + * @param {String} sText + * @param {Number} nCorrectLevel + * @return {Number} type + */ + function _getTypeNumber(sText, nCorrectLevel) { + var nType = 1; + var length = _getUTF8Length(sText); + + for (var i = 0, len = QRCodeLimitLength.length; i <= len; i++) { + var nLimit = 0; + + switch (nCorrectLevel) { + case QRErrorCorrectLevel.L: + nLimit = QRCodeLimitLength[i][0]; + break; + case QRErrorCorrectLevel.M: + nLimit = QRCodeLimitLength[i][1]; + break; + case QRErrorCorrectLevel.Q: + nLimit = QRCodeLimitLength[i][2]; + break; + case QRErrorCorrectLevel.H: + nLimit = QRCodeLimitLength[i][3]; + break; + } + + if (length <= nLimit) { + break; + } else { + nType++; + } + } + + if (nType > QRCodeLimitLength.length) { + throw new Error("Too long data"); + } + + return nType; + } + + function _getUTF8Length(sText) { + var replacedText = encodeURI(sText).toString().replace(/\%[0-9a-fA-F]{2}/g, 'a'); + return replacedText.length + (replacedText.length != sText ? 3 : 0); + } + + /** + * @class QRCode + * @constructor + * @example + * new QRCode(document.getElementById("test"), "http://jindo.dev.naver.com/collie"); + * + * @example + * var oQRCode = new QRCode("test", { + * text : "http://naver.com", + * width : 128, + * height : 128 + * }); + * + * oQRCode.clear(); // Clear the QRCode. + * oQRCode.makeCode("http://map.naver.com"); // Re-create the QRCode. + * + * @param {HTMLElement|String} el target element or 'id' attribute of element. + * @param {Object|String} vOption + * @param {String} vOption.text QRCode link data + * @param {Number} [vOption.width=256] + * @param {Number} [vOption.height=256] + * @param {String} [vOption.colorDark="#000000"] + * @param {String} [vOption.colorLight="#ffffff"] + * @param {QRCode.CorrectLevel} [vOption.correctLevel=QRCode.CorrectLevel.H] [L|M|Q|H] + */ + QRCode = function (el, vOption) { + this._htOption = { + width: 256, + height: 256, + typeNumber: 4, + colorDark: "#000000", + colorLight: "#ffffff", + correctLevel: QRErrorCorrectLevel.H + }; + + if (typeof vOption === 'string') { + vOption = { + text: vOption + }; + } + + // Overwrites options + if (vOption) { + for (var i in vOption) { + this._htOption[i] = vOption[i]; + } + } + + if (typeof el == "string") { + el = document.getElementById(el); + } + + if (this._htOption.useSVG) { + Drawing = svgDrawer; + } + + this._android = _getAndroid(); + this._el = el; + this._oQRCode = null; + this._oDrawing = new Drawing(this._el, this._htOption); + + if (this._htOption.text) { + this.makeCode(this._htOption.text); + } + }; + + /** + * Make the QRCode + * + * @param {String} sText link data + */ + QRCode.prototype.makeCode = function (sText) { + this._oQRCode = new QRCodeModel(_getTypeNumber(sText, this._htOption.correctLevel), this._htOption.correctLevel); + this._oQRCode.addData(sText); + this._oQRCode.make(); + this._el.title = sText; + this._oDrawing.draw(this._oQRCode); + this.makeImage(); + }; + + /** + * Make the Image from Canvas element + * - It occurs automatically + * - Android below 3 doesn't support Data-URI spec. + * + * @private + */ + QRCode.prototype.makeImage = function () { + if (typeof this._oDrawing.makeImage == "function" && (!this._android || this._android >= 3)) { + this._oDrawing.makeImage(); + } + }; + + /** + * Clear the QRCode + */ + QRCode.prototype.clear = function () { + this._oDrawing.clear(); + }; + + /** + * @name QRCode.CorrectLevel + */ + QRCode.CorrectLevel = QRErrorCorrectLevel; +})(); \ No newline at end of file diff --git a/MP.Land/wwwroot/lib/qrcode.min.js b/MP.Land/wwwroot/lib/qrcode.min.js new file mode 100644 index 00000000..993e88f3 --- /dev/null +++ b/MP.Land/wwwroot/lib/qrcode.min.js @@ -0,0 +1 @@ +var QRCode;!function(){function a(a){this.mode=c.MODE_8BIT_BYTE,this.data=a,this.parsedData=[];for(var b=[],d=0,e=this.data.length;e>d;d++){var f=this.data.charCodeAt(d);f>65536?(b[0]=240|(1835008&f)>>>18,b[1]=128|(258048&f)>>>12,b[2]=128|(4032&f)>>>6,b[3]=128|63&f):f>2048?(b[0]=224|(61440&f)>>>12,b[1]=128|(4032&f)>>>6,b[2]=128|63&f):f>128?(b[0]=192|(1984&f)>>>6,b[1]=128|63&f):b[0]=f,this.parsedData=this.parsedData.concat(b)}this.parsedData.length!=this.data.length&&(this.parsedData.unshift(191),this.parsedData.unshift(187),this.parsedData.unshift(239))}function b(a,b){this.typeNumber=a,this.errorCorrectLevel=b,this.modules=null,this.moduleCount=0,this.dataCache=null,this.dataList=[]}function i(a,b){if(void 0==a.length)throw new Error(a.length+"/"+b);for(var c=0;c=f;f++){var h=0;switch(b){case d.L:h=l[f][0];break;case d.M:h=l[f][1];break;case d.Q:h=l[f][2];break;case d.H:h=l[f][3]}if(h>=e)break;c++}if(c>l.length)throw new Error("Too long data");return c}function s(a){var b=encodeURI(a).toString().replace(/\%[0-9a-fA-F]{2}/g,"a");return b.length+(b.length!=a?3:0)}a.prototype={getLength:function(){return this.parsedData.length},write:function(a){for(var b=0,c=this.parsedData.length;c>b;b++)a.put(this.parsedData[b],8)}},b.prototype={addData:function(b){var c=new a(b);this.dataList.push(c),this.dataCache=null},isDark:function(a,b){if(0>a||this.moduleCount<=a||0>b||this.moduleCount<=b)throw new Error(a+","+b);return this.modules[a][b]},getModuleCount:function(){return this.moduleCount},make:function(){this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(a,c){this.moduleCount=4*this.typeNumber+17,this.modules=new Array(this.moduleCount);for(var d=0;d=7&&this.setupTypeNumber(a),null==this.dataCache&&(this.dataCache=b.createData(this.typeNumber,this.errorCorrectLevel,this.dataList)),this.mapData(this.dataCache,c)},setupPositionProbePattern:function(a,b){for(var c=-1;7>=c;c++)if(!(-1>=a+c||this.moduleCount<=a+c))for(var d=-1;7>=d;d++)-1>=b+d||this.moduleCount<=b+d||(this.modules[a+c][b+d]=c>=0&&6>=c&&(0==d||6==d)||d>=0&&6>=d&&(0==c||6==c)||c>=2&&4>=c&&d>=2&&4>=d?!0:!1)},getBestMaskPattern:function(){for(var a=0,b=0,c=0;8>c;c++){this.makeImpl(!0,c);var d=f.getLostPoint(this);(0==c||a>d)&&(a=d,b=c)}return b},createMovieClip:function(a,b,c){var d=a.createEmptyMovieClip(b,c),e=1;this.make();for(var f=0;f=g;g++)for(var h=-2;2>=h;h++)this.modules[d+g][e+h]=-2==g||2==g||-2==h||2==h||0==g&&0==h?!0:!1}},setupTypeNumber:function(a){for(var b=f.getBCHTypeNumber(this.typeNumber),c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[Math.floor(c/3)][c%3+this.moduleCount-8-3]=d}for(var c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[c%3+this.moduleCount-8-3][Math.floor(c/3)]=d}},setupTypeInfo:function(a,b){for(var c=this.errorCorrectLevel<<3|b,d=f.getBCHTypeInfo(c),e=0;15>e;e++){var g=!a&&1==(1&d>>e);6>e?this.modules[e][8]=g:8>e?this.modules[e+1][8]=g:this.modules[this.moduleCount-15+e][8]=g}for(var e=0;15>e;e++){var g=!a&&1==(1&d>>e);8>e?this.modules[8][this.moduleCount-e-1]=g:9>e?this.modules[8][15-e-1+1]=g:this.modules[8][15-e-1]=g}this.modules[this.moduleCount-8][8]=!a},mapData:function(a,b){for(var c=-1,d=this.moduleCount-1,e=7,g=0,h=this.moduleCount-1;h>0;h-=2)for(6==h&&h--;;){for(var i=0;2>i;i++)if(null==this.modules[d][h-i]){var j=!1;g>>e));var k=f.getMask(b,d,h-i);k&&(j=!j),this.modules[d][h-i]=j,e--,-1==e&&(g++,e=7)}if(d+=c,0>d||this.moduleCount<=d){d-=c,c=-c;break}}}},b.PAD0=236,b.PAD1=17,b.createData=function(a,c,d){for(var e=j.getRSBlocks(a,c),g=new k,h=0;h8*l)throw new Error("code length overflow. ("+g.getLengthInBits()+">"+8*l+")");for(g.getLengthInBits()+4<=8*l&&g.put(0,4);0!=g.getLengthInBits()%8;)g.putBit(!1);for(;;){if(g.getLengthInBits()>=8*l)break;if(g.put(b.PAD0,8),g.getLengthInBits()>=8*l)break;g.put(b.PAD1,8)}return b.createBytes(g,e)},b.createBytes=function(a,b){for(var c=0,d=0,e=0,g=new Array(b.length),h=new Array(b.length),j=0;j=0?p.get(q):0}}for(var r=0,m=0;mm;m++)for(var j=0;jm;m++)for(var j=0;j=0;)b^=f.G15<=0;)b^=f.G18<>>=1;return b},getPatternPosition:function(a){return f.PATTERN_POSITION_TABLE[a-1]},getMask:function(a,b,c){switch(a){case e.PATTERN000:return 0==(b+c)%2;case e.PATTERN001:return 0==b%2;case e.PATTERN010:return 0==c%3;case e.PATTERN011:return 0==(b+c)%3;case e.PATTERN100:return 0==(Math.floor(b/2)+Math.floor(c/3))%2;case e.PATTERN101:return 0==b*c%2+b*c%3;case e.PATTERN110:return 0==(b*c%2+b*c%3)%2;case e.PATTERN111:return 0==(b*c%3+(b+c)%2)%2;default:throw new Error("bad maskPattern:"+a)}},getErrorCorrectPolynomial:function(a){for(var b=new i([1],0),c=0;a>c;c++)b=b.multiply(new i([1,g.gexp(c)],0));return b},getLengthInBits:function(a,b){if(b>=1&&10>b)switch(a){case c.MODE_NUMBER:return 10;case c.MODE_ALPHA_NUM:return 9;case c.MODE_8BIT_BYTE:return 8;case c.MODE_KANJI:return 8;default:throw new Error("mode:"+a)}else if(27>b)switch(a){case c.MODE_NUMBER:return 12;case c.MODE_ALPHA_NUM:return 11;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 10;default:throw new Error("mode:"+a)}else{if(!(41>b))throw new Error("type:"+b);switch(a){case c.MODE_NUMBER:return 14;case c.MODE_ALPHA_NUM:return 13;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 12;default:throw new Error("mode:"+a)}}},getLostPoint:function(a){for(var b=a.getModuleCount(),c=0,d=0;b>d;d++)for(var e=0;b>e;e++){for(var f=0,g=a.isDark(d,e),h=-1;1>=h;h++)if(!(0>d+h||d+h>=b))for(var i=-1;1>=i;i++)0>e+i||e+i>=b||(0!=h||0!=i)&&g==a.isDark(d+h,e+i)&&f++;f>5&&(c+=3+f-5)}for(var d=0;b-1>d;d++)for(var e=0;b-1>e;e++){var j=0;a.isDark(d,e)&&j++,a.isDark(d+1,e)&&j++,a.isDark(d,e+1)&&j++,a.isDark(d+1,e+1)&&j++,(0==j||4==j)&&(c+=3)}for(var d=0;b>d;d++)for(var e=0;b-6>e;e++)a.isDark(d,e)&&!a.isDark(d,e+1)&&a.isDark(d,e+2)&&a.isDark(d,e+3)&&a.isDark(d,e+4)&&!a.isDark(d,e+5)&&a.isDark(d,e+6)&&(c+=40);for(var e=0;b>e;e++)for(var d=0;b-6>d;d++)a.isDark(d,e)&&!a.isDark(d+1,e)&&a.isDark(d+2,e)&&a.isDark(d+3,e)&&a.isDark(d+4,e)&&!a.isDark(d+5,e)&&a.isDark(d+6,e)&&(c+=40);for(var k=0,e=0;b>e;e++)for(var d=0;b>d;d++)a.isDark(d,e)&&k++;var l=Math.abs(100*k/b/b-50)/5;return c+=10*l}},g={glog:function(a){if(1>a)throw new Error("glog("+a+")");return g.LOG_TABLE[a]},gexp:function(a){for(;0>a;)a+=255;for(;a>=256;)a-=255;return g.EXP_TABLE[a]},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)},h=0;8>h;h++)g.EXP_TABLE[h]=1<h;h++)g.EXP_TABLE[h]=g.EXP_TABLE[h-4]^g.EXP_TABLE[h-5]^g.EXP_TABLE[h-6]^g.EXP_TABLE[h-8];for(var h=0;255>h;h++)g.LOG_TABLE[g.EXP_TABLE[h]]=h;i.prototype={get:function(a){return this.num[a]},getLength:function(){return this.num.length},multiply:function(a){for(var b=new Array(this.getLength()+a.getLength()-1),c=0;cf;f++)for(var g=c[3*f+0],h=c[3*f+1],i=c[3*f+2],k=0;g>k;k++)e.push(new j(h,i));return e},j.getRsBlockTable=function(a,b){switch(b){case d.L:return j.RS_BLOCK_TABLE[4*(a-1)+0];case d.M:return j.RS_BLOCK_TABLE[4*(a-1)+1];case d.Q:return j.RS_BLOCK_TABLE[4*(a-1)+2];case d.H:return j.RS_BLOCK_TABLE[4*(a-1)+3];default:return void 0}},k.prototype={get:function(a){var b=Math.floor(a/8);return 1==(1&this.buffer[b]>>>7-a%8)},put:function(a,b){for(var c=0;b>c;c++)this.putBit(1==(1&a>>>b-c-1))},getLengthInBits:function(){return this.length},putBit:function(a){var b=Math.floor(this.length/8);this.buffer.length<=b&&this.buffer.push(0),a&&(this.buffer[b]|=128>>>this.length%8),this.length++}};var l=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]],o=function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){function g(a,b){var c=document.createElementNS("http://www.w3.org/2000/svg",a);for(var d in b)b.hasOwnProperty(d)&&c.setAttribute(d,b[d]);return c}var b=this._htOption,c=this._el,d=a.getModuleCount();Math.floor(b.width/d),Math.floor(b.height/d),this.clear();var h=g("svg",{viewBox:"0 0 "+String(d)+" "+String(d),width:"100%",height:"100%",fill:b.colorLight});h.setAttributeNS("http://www.w3.org/2000/xmlns/","xmlns:xlink","http://www.w3.org/1999/xlink"),c.appendChild(h),h.appendChild(g("rect",{fill:b.colorDark,width:"1",height:"1",id:"template"}));for(var i=0;d>i;i++)for(var j=0;d>j;j++)if(a.isDark(i,j)){var k=g("use",{x:String(i),y:String(j)});k.setAttributeNS("http://www.w3.org/1999/xlink","href","#template"),h.appendChild(k)}},a.prototype.clear=function(){for(;this._el.hasChildNodes();)this._el.removeChild(this._el.lastChild)},a}(),p="svg"===document.documentElement.tagName.toLowerCase(),q=p?o:m()?function(){function a(){this._elImage.src=this._elCanvas.toDataURL("image/png"),this._elImage.style.display="block",this._elCanvas.style.display="none"}function d(a,b){var c=this;if(c._fFail=b,c._fSuccess=a,null===c._bSupportDataURI){var d=document.createElement("img"),e=function(){c._bSupportDataURI=!1,c._fFail&&_fFail.call(c)},f=function(){c._bSupportDataURI=!0,c._fSuccess&&c._fSuccess.call(c)};return d.onabort=e,d.onerror=e,d.onload=f,d.src="data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==",void 0}c._bSupportDataURI===!0&&c._fSuccess?c._fSuccess.call(c):c._bSupportDataURI===!1&&c._fFail&&c._fFail.call(c)}if(this._android&&this._android<=2.1){var b=1/window.devicePixelRatio,c=CanvasRenderingContext2D.prototype.drawImage;CanvasRenderingContext2D.prototype.drawImage=function(a,d,e,f,g,h,i,j){if("nodeName"in a&&/img/i.test(a.nodeName))for(var l=arguments.length-1;l>=1;l--)arguments[l]=arguments[l]*b;else"undefined"==typeof j&&(arguments[1]*=b,arguments[2]*=b,arguments[3]*=b,arguments[4]*=b);c.apply(this,arguments)}}var e=function(a,b){this._bIsPainted=!1,this._android=n(),this._htOption=b,this._elCanvas=document.createElement("canvas"),this._elCanvas.width=b.width,this._elCanvas.height=b.height,a.appendChild(this._elCanvas),this._el=a,this._oContext=this._elCanvas.getContext("2d"),this._bIsPainted=!1,this._elImage=document.createElement("img"),this._elImage.style.display="none",this._el.appendChild(this._elImage),this._bSupportDataURI=null};return e.prototype.draw=function(a){var b=this._elImage,c=this._oContext,d=this._htOption,e=a.getModuleCount(),f=d.width/e,g=d.height/e,h=Math.round(f),i=Math.round(g);b.style.display="none",this.clear();for(var j=0;e>j;j++)for(var k=0;e>k;k++){var l=a.isDark(j,k),m=k*f,n=j*g;c.strokeStyle=l?d.colorDark:d.colorLight,c.lineWidth=1,c.fillStyle=l?d.colorDark:d.colorLight,c.fillRect(m,n,f,g),c.strokeRect(Math.floor(m)+.5,Math.floor(n)+.5,h,i),c.strokeRect(Math.ceil(m)-.5,Math.ceil(n)-.5,h,i)}this._bIsPainted=!0},e.prototype.makeImage=function(){this._bIsPainted&&d.call(this,a)},e.prototype.isPainted=function(){return this._bIsPainted},e.prototype.clear=function(){this._oContext.clearRect(0,0,this._elCanvas.width,this._elCanvas.height),this._bIsPainted=!1},e.prototype.round=function(a){return a?Math.floor(1e3*a)/1e3:a},e}():function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){for(var b=this._htOption,c=this._el,d=a.getModuleCount(),e=Math.floor(b.width/d),f=Math.floor(b.height/d),g=[''],h=0;d>h;h++){g.push("");for(var i=0;d>i;i++)g.push('');g.push("")}g.push("
            "),c.innerHTML=g.join("");var j=c.childNodes[0],k=(b.width-j.offsetWidth)/2,l=(b.height-j.offsetHeight)/2;k>0&&l>0&&(j.style.margin=l+"px "+k+"px")},a.prototype.clear=function(){this._el.innerHTML=""},a}();QRCode=function(a,b){if(this._htOption={width:256,height:256,typeNumber:4,colorDark:"#000000",colorLight:"#ffffff",correctLevel:d.H},"string"==typeof b&&(b={text:b}),b)for(var c in b)this._htOption[c]=b[c];"string"==typeof a&&(a=document.getElementById(a)),this._android=n(),this._el=a,this._oQRCode=null,this._oDrawing=new q(this._el,this._htOption),this._htOption.text&&this.makeCode(this._htOption.text)},QRCode.prototype.makeCode=function(a){this._oQRCode=new b(r(a,this._htOption.correctLevel),this._htOption.correctLevel),this._oQRCode.addData(a),this._oQRCode.make(),this._el.title=a,this._oDrawing.draw(this._oQRCode),this.makeImage()},QRCode.prototype.makeImage=function(){"function"==typeof this._oDrawing.makeImage&&(!this._android||this._android>=3)&&this._oDrawing.makeImage()},QRCode.prototype.clear=function(){this._oDrawing.clear()},QRCode.CorrectLevel=d}(); \ No newline at end of file From a99406ca76888b2ab63898d70672a4af14549660 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 20 Sep 2021 16:24:48 +0200 Subject: [PATCH 11/16] Fix x elementi non in stampa --- MP.Land/Shared/MainLayout.razor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MP.Land/Shared/MainLayout.razor b/MP.Land/Shared/MainLayout.razor index 3d810c12..8af3c918 100644 --- a/MP.Land/Shared/MainLayout.razor +++ b/MP.Land/Shared/MainLayout.razor @@ -7,13 +7,13 @@ @implements IDisposable
            -
            +
            -
            +
            From 397be33d04a8160c9164e67d05df0d938db2bf27 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 20 Sep 2021 16:24:54 +0200 Subject: [PATCH 12/16] Refresh --- MP-LAND.sln | 2 +- MP.Land/Data/AppAuthService.cs | 12 ++++++++++++ MP.Land/MP.Land.csproj | 11 ++++++++++- MP.Land/Pages/Index.razor | 2 +- MP.Land/Resources/ChangeLog.html | 2 +- MP.Land/Resources/VersNum.txt | 2 +- MP.Land/Resources/manifest.xml | 2 +- MP.Land/Shared/NavMenu.razor | 4 ++-- MP.Land/appsettings.Development.json | 2 +- 9 files changed, 30 insertions(+), 9 deletions(-) diff --git a/MP-LAND.sln b/MP-LAND.sln index bba25374..f4e0ede6 100644 --- a/MP-LAND.sln +++ b/MP-LAND.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.31229.75 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.Land", "MP.Land\MP.Land.csproj", "{D949AB45-9B65-4594-A97E-182BC3831707}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.AppAuth", "MP.AppAuth\MP.AppAuth.csproj", "{E8B1E617-87BC-4638-A8B6-04EEBA3B8F47}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.AppAuth", "MP.AppAuth\MP.AppAuth.csproj", "{E8B1E617-87BC-4638-A8B6-04EEBA3B8F47}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/MP.Land/Data/AppAuthService.cs b/MP.Land/Data/AppAuthService.cs index 8217150a..fb255c02 100644 --- a/MP.Land/Data/AppAuthService.cs +++ b/MP.Land/Data/AppAuthService.cs @@ -127,6 +127,18 @@ namespace MP.Land.Data #region Public Methods + public async Task> AnagOperList() + { + List dbResult = new List(); + Stopwatch stopWatch = new Stopwatch(); + stopWatch.Start(); + dbResult = dbController.AnagOpGetAll(""); + stopWatch.Stop(); + TimeSpan ts = stopWatch.Elapsed; + Log.Trace($"Effettuata lettura da DB per AnagOperList: {ts.TotalMilliseconds} ms"); + return await Task.FromResult(dbResult); + } + public void Dispose() { // Clear database controller diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj index 4aedca16..7f2be65a 100644 --- a/MP.Land/MP.Land.csproj +++ b/MP.Land/MP.Land.csproj @@ -3,7 +3,7 @@ net5.0 MP.Land - 1.1.2109.2013 + 1.1.2109.2016 @@ -24,6 +24,15 @@ + + + + + + + + + diff --git a/MP.Land/Pages/Index.razor b/MP.Land/Pages/Index.razor index 64759817..d3605e12 100644 --- a/MP.Land/Pages/Index.razor +++ b/MP.Land/Pages/Index.razor @@ -39,7 +39,7 @@
            @foreach (var item in ListRecords) { -
            +
            @if (authOk(item)) diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html index 4e1f5932..324bb6d0 100644 --- a/MP.Land/Resources/ChangeLog.html +++ b/MP.Land/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo gestione Programmi MAPO -

            Versione: 1.1.2109.2013

            +

            Versione: 1.1.2109.2016


            Note di rilascio:
              diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt index 2029b9ac..f22c4f6c 100644 --- a/MP.Land/Resources/VersNum.txt +++ b/MP.Land/Resources/VersNum.txt @@ -1 +1 @@ -1.1.2109.2013 +1.1.2109.2016 diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml index f30be695..67ba9dd0 100644 --- a/MP.Land/Resources/manifest.xml +++ b/MP.Land/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.1.2109.2013 + 1.1.2109.2016 https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/MP.Land.zip https://nexus.steamware.net/repository/SWS/MP-PROG/stable/LAST/ChangeLog.html false diff --git a/MP.Land/Shared/NavMenu.razor b/MP.Land/Shared/NavMenu.razor index d87bb531..ff8b5485 100644 --- a/MP.Land/Shared/NavMenu.razor +++ b/MP.Land/Shared/NavMenu.razor @@ -14,7 +14,7 @@
            • - QR User + QR User
            • @@ -29,7 +29,7 @@
            • - About + About
            • diff --git a/MP.Land/appsettings.Development.json b/MP.Land/appsettings.Development.json index 9645b0c6..fb218b9a 100644 --- a/MP.Land/appsettings.Development.json +++ b/MP.Land/appsettings.Development.json @@ -1,5 +1,5 @@ { - //"DetailedErrors": true, + "DetailedErrors": true, "Logging": { "LogLevel": { "Default": "Information", From c9d75fc0848e1625d669c172e27f6108cf30471e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 20 Sep 2021 16:39:07 +0200 Subject: [PATCH 13/16] COmpletata review QRCode cards --- MP.Land/Components/UserCard.razor | 26 ++++++++++++++++---------- MP.Land/Pages/UserQr.razor | 2 +- MP.Land/Pages/UserQr.razor.cs | 21 ++++++++++----------- MP.Land/appsettings.json | 1 + 4 files changed, 28 insertions(+), 22 deletions(-) diff --git a/MP.Land/Components/UserCard.razor b/MP.Land/Components/UserCard.razor index 8f3ef9f5..e758614f 100644 --- a/MP.Land/Components/UserCard.razor +++ b/MP.Land/Components/UserCard.razor @@ -2,14 +2,19 @@ @inject IJSRuntime JSRuntime -
              -
              +
              +
              - EgalWare +
              +
              + EgalWare +
              +
              + @* EgalWare*@
              -
              -

              @CardMessage

              +
              +

              @Environment

              @@ -25,7 +30,7 @@
              -
              +
              Card login MAPO-TAB
              @@ -35,15 +40,16 @@ [Parameter] public AnagraficaOperatori CurrItem { get; set; } - [Parameter] - public string CardMessage { get; set; } - protected override async Task OnAfterRenderAsync(bool firstRender) { await JSRuntime.InvokeVoidAsync("displayQr", $"qrCodeImg_{CurrItem.MatrOpr}", rawCode); } - protected string BaseUrl = "http://IIS01/"; + [Parameter] + public string BaseUrl { get; set; } + + [Parameter] + public string Environment { get; set; } protected string rawCode { diff --git a/MP.Land/Pages/UserQr.razor b/MP.Land/Pages/UserQr.razor index 117e491a..caf322d9 100644 --- a/MP.Land/Pages/UserQr.razor +++ b/MP.Land/Pages/UserQr.razor @@ -19,7 +19,7 @@ @foreach (var item in ListRecords) {
              - +
              }
              diff --git a/MP.Land/Pages/UserQr.razor.cs b/MP.Land/Pages/UserQr.razor.cs index 1ed8ab66..6e3041c7 100644 --- a/MP.Land/Pages/UserQr.razor.cs +++ b/MP.Land/Pages/UserQr.razor.cs @@ -38,24 +38,23 @@ namespace MP.Land.Pages [Inject] protected MessageService AppMService { get; set; } + protected string BaseUrl + { + get => Configuration["BaseUrl"]; + } + [Inject] protected AppAuthService DataService { get; set; } + protected string Environment + { + get => Configuration["Environment"]; + } + #endregion Protected Properties #region Protected Methods - protected bool authOk(UpdMan currItem) - { - bool answ = !string.IsNullOrEmpty(currItem.LicenseKey) && Convert.ToBoolean(currItem.IsAuth); - return answ; - } - - protected string fullUrl(string relUrl) - { - return $"{Configuration["BaseUrl"]}{relUrl}"; - } - protected override void OnInitialized() { AppMService.ShowSearch = false; diff --git a/MP.Land/appsettings.json b/MP.Land/appsettings.json index 50cb7a42..731901a3 100644 --- a/MP.Land/appsettings.json +++ b/MP.Land/appsettings.json @@ -15,6 +15,7 @@ }, "AllowedHosts": "*", "BaseUrl": "https://localhost:44309/", + "Environment": "Steam DEV", "ConnectionStrings": { "DefaultConnection": "Server=SQL2016DEV;Database=MoonPro;Trusted_Connection=True;MultipleActiveResultSets=true", "MP.Land": "Server=SQL2016DEV;Database=MoonPro;User ID=sa;Password=keyhammer16;integrated security=False;MultipleActiveResultSets=True;App=MP.Land;", From 661d2580bca97496374323948c9075996bba9e44 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 20 Sep 2021 16:53:00 +0200 Subject: [PATCH 14/16] Cambio: home mostrata con componenti --- MP.Land/Components/HomeLink.razor | 86 +++++++++++++++++++++++++++++++ MP.Land/Components/UserCard.razor | 1 - MP.Land/Pages/Index.razor | 55 +------------------- MP.Land/Pages/Index.razor.cs | 26 ---------- 4 files changed, 87 insertions(+), 81 deletions(-) create mode 100644 MP.Land/Components/HomeLink.razor diff --git a/MP.Land/Components/HomeLink.razor b/MP.Land/Components/HomeLink.razor new file mode 100644 index 00000000..e8ca1aa0 --- /dev/null +++ b/MP.Land/Components/HomeLink.razor @@ -0,0 +1,86 @@ +@using MP.AppAuth.Models +@using MP.Land.Data +@using Microsoft.Extensions.Configuration + +@inject IConfiguration Configuration + +@inject AppAuthService DataService + +
              +
              + @if (authOk()) + { + +

              @CurrItem.AppName 

              +               + } + else + { + +

              @CurrItem.AppName

              +               + } +
              +
              +
              + @if (authOk()) + { +
              + +
              +
              + @(traduci($"{CurrItem.AppName}-TITLE")) +
                + @(traduci($"{CurrItem.AppName}-LIST")) +
              +
              + } + else + { +
              + +
              +
              + @(traduci($"{CurrItem.AppName}-TITLE")) +
                + @(traduci($"{CurrItem.AppName}-LIST")) +
              +
              + } +
              +
              +
              + @if (authOk()) + { + Programma Attivato + } + else + { + Licenza non attivata! + } +
              +
              +@code { + + [Parameter] + public UpdMan CurrItem { get; set; } + + protected bool authOk() + { + bool answ = !string.IsNullOrEmpty(CurrItem.LicenseKey) && Convert.ToBoolean(CurrItem.IsAuth); + return answ; + } + + protected string fullUrl(string relUrl) + { + return $"{Configuration["BaseUrl"]}{relUrl}"; + } + + protected MarkupString traduci(string lemma) + { + MarkupString answ; + string rawHtml = DataService.Traduci(lemma, "IT"); + answ = new MarkupString(rawHtml); + return answ; + } +} \ No newline at end of file diff --git a/MP.Land/Components/UserCard.razor b/MP.Land/Components/UserCard.razor index e758614f..6e0b7852 100644 --- a/MP.Land/Components/UserCard.razor +++ b/MP.Land/Components/UserCard.razor @@ -21,7 +21,6 @@
              - @*Image 12345*@
              diff --git a/MP.Land/Pages/Index.razor b/MP.Land/Pages/Index.razor index d3605e12..6c3b2895 100644 --- a/MP.Land/Pages/Index.razor +++ b/MP.Land/Pages/Index.razor @@ -40,60 +40,7 @@ @foreach (var item in ListRecords) {
              -
              -
              - @if (authOk(item)) - { - -

              @item.AppName 

              -               - } - else - { - -

              @item.AppName

              -               - } -
              -
              -
              - @if (authOk(item)) - { -
              - -
              -
              - @(traduci($"{item.AppName}-TITLE")) -
                - @(traduci($"{item.AppName}-LIST")) -
              -
              - } - else - { -
              - -
              -
              - @(traduci($"{item.AppName}-TITLE")) -
                - @(traduci($"{item.AppName}-LIST")) -
              -
              - } -
              -
              -
              - @if (authOk(item)) - { - Programma Attivato - } - else - { - Licenza non attivata! - } -
              -
              +
              }
              diff --git a/MP.Land/Pages/Index.razor.cs b/MP.Land/Pages/Index.razor.cs index eddd4477..a5c69119 100644 --- a/MP.Land/Pages/Index.razor.cs +++ b/MP.Land/Pages/Index.razor.cs @@ -26,9 +26,6 @@ namespace MP.Land.Pages #region Private Properties - [Inject] - private IConfiguration Configuration { get; set; } - private bool isLoading { get; set; } = false; #endregion Private Properties @@ -45,24 +42,11 @@ namespace MP.Land.Pages #region Protected Methods - protected bool authOk(UpdMan currItem) - { - bool answ = !string.IsNullOrEmpty(currItem.LicenseKey) && Convert.ToBoolean(currItem.IsAuth); - return answ; - } - - protected string fullUrl(string relUrl) - { - return $"{Configuration["BaseUrl"]}{relUrl}"; - } - protected override void OnInitialized() { AppMService.ShowSearch = false; AppMService.PageName = "Home"; AppMService.PageIcon = "fas fa-home pr-2"; - //AppMService.EA_SearchUpdated += OnSeachUpdated; - //AppMService.EA_FilterUpdated += OnFilterUpdated; } protected override async Task OnInitializedAsync() @@ -87,16 +71,6 @@ namespace MP.Land.Pages await Task.Delay(1); } - protected MarkupString traduci(string lemma) - { - MarkupString answ; - //string rawHtml = "
            • primo
            • secondo
              • "; - string rawHtml = DataService.Traduci(lemma, "IT"); - answ = new MarkupString(rawHtml); - // cerco nella cache Redis - return answ; - } - #endregion Protected Methods } } \ No newline at end of file From 5cdb0e077da367a9f92253e29e11c8b5b3337dc4 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 20 Sep 2021 16:53:36 +0200 Subject: [PATCH 15/16] Pulizia pagine inutilizzate --- MP.Land/Pages/Archive.razor | 208 ------------- MP.Land/Pages/Archive.razor.cs | 523 --------------------------------- MP.Land/Pages/Setup.razor | 17 -- MP.Land/Pages/Setup.razor.cs | 21 -- 4 files changed, 769 deletions(-) delete mode 100644 MP.Land/Pages/Archive.razor delete mode 100644 MP.Land/Pages/Archive.razor.cs delete mode 100644 MP.Land/Pages/Setup.razor delete mode 100644 MP.Land/Pages/Setup.razor.cs diff --git a/MP.Land/Pages/Archive.razor b/MP.Land/Pages/Archive.razor deleted file mode 100644 index 94eb73e3..00000000 --- a/MP.Land/Pages/Archive.razor +++ /dev/null @@ -1,208 +0,0 @@ -@page "/Archive" - -@using MP.Land.Components - -
              -
              -
              -
              -
              -
              -

              Elenco Programmi

              -
              -
              -
              - -
              -
              -
              -
              -
              -
              -
              -
              - -
              -
              -
              -
              -
              - - - -
              - -
              -
              -
              -
              -
              - - -
              -
              -
              -
              -
              -
              - - -
              -
              -
              -
              -
              -
              - - -
              -
              -
              -
              - @if (!string.IsNullOrEmpty(SelFileName)) - { - @SelFileName - } -
              -
              -
              -
              - - Tags -
              -
              - @if (!string.IsNullOrEmpty(SelTag)) - { - @SelTag - } - else - { -   ...   - } -
              -
              - -
              -
              - @if (DeleteDialogOpen) - { - - } -
              -
              -
              -
              -
              -
              - @if (currRecord != null) - { - - } - @if (ListRecords == null) - { - - } - else if (totalCount == 0) - { -
              Nessun record trovato
              - } - else - { -
              -
              - - - - - - - - - - - - @**@ - - - - - @foreach (var record in ListRecords) - { - - - - - - - - - - - } - -
              FileRevSizeStateMacchinaTagsModificatoControllo
              - @if (currRecord == null && record.Active) - { - - } - else - { - - } - -
              -
              @record.Name
              - -
              -               		-
              @record.Rev
              -               		-
              @((((double)record.Size)/1024).ToString("N2")) k
              -               		- - - @record.DiskStatus - - - -
              @record.Macchina.Nome
              -
              @record.Macchina.Descrizione
              -               		- @foreach (var item in record.Tags) - { - - } - -
              @record.LastMod.ToString("yyyy.MM.dd")
              -
              @record.LastMod.ToString("ddd HH:mm.ss")
              -
              -
              -
              - } -
              -
              - -
              -
              \ No newline at end of file diff --git a/MP.Land/Pages/Archive.razor.cs b/MP.Land/Pages/Archive.razor.cs deleted file mode 100644 index 229dd856..00000000 --- a/MP.Land/Pages/Archive.razor.cs +++ /dev/null @@ -1,523 +0,0 @@ -using Microsoft.AspNetCore.Components; -using Microsoft.JSInterop; -using MP.FileData.DatabaseModels; -using MP.Land.Data; -using NLog; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading; -using System.Threading.Tasks; - -namespace MP.Land.Pages -{ - public partial class Archive : ComponentBase, IDisposable - { - #region Private Fields - - private static NLog.Logger Log = LogManager.GetCurrentClassLogger(); - private FileModel currRecord = null; - private List ListRecords; - private List MacList; - private List TagList; - - #endregion Private Fields - - #region Protected Fields - - protected string _SearchTag; - - protected string defTag = ""; - - protected int totalCount = 0; - - #endregion Protected Fields - - #region Private Properties - - private int currPage - { - get - { - return AppMService.File_Filter.PageNum; - } - set - { - AppMService.File_Filter.PageNum = value; - } - } - - private bool isLoading { get; set; } = false; - - private int numRecord - { - get - { - return AppMService.File_Filter.PageSize; - } - set - { - AppMService.File_Filter.PageSize = value; - } - } - - private bool OnlyActive - { - get - { - bool answ = false; - if (AppMService.File_Filter != null) - { - answ = AppMService.File_Filter.OnlyActive; - } - return answ; - } - set - { - if (!AppMService.File_Filter.OnlyActive.Equals(value)) - { - AppMService.File_Filter.OnlyActive = value; - var pUpd = Task.Run(async () => - { - await AsyncReload(); - }); - pUpd.Wait(); - } - } - } - - private bool OnlyMod - { - get - { - bool answ = false; - if (AppMService.File_Filter != null) - { - answ = AppMService.File_Filter.OnlyMod; - } - return answ; - } - set - { - if (!AppMService.File_Filter.OnlyMod.Equals(value)) - { - AppMService.File_Filter.OnlyMod = value; - var pUpd = Task.Run(async () => - { - await AsyncReload(); - }); - pUpd.Wait(); - } - } - } - - private bool OnlyNoTag - { - get - { - bool answ = false; - if (AppMService.File_Filter != null) - { - answ = AppMService.File_Filter.OnlyNoTag; - } - return answ; - } - set - { - if (!AppMService.File_Filter.OnlyNoTag.Equals(value)) - { - AppMService.File_Filter.OnlyNoTag = value; - var pUpd = Task.Run(async () => - { - await AsyncReload(); - }); - pUpd.Wait(); - } - } - } - - private string SearchVal - { - get - { - string answ = ""; - if (AppMService.File_Filter != null) - { - answ = AppMService.File_Filter.SearchVal; - } - return answ; - } - set - { - if (!AppMService.File_Filter.SearchVal.Equals(value)) - { - AppMService.File_Filter.SearchVal = value; - var pUpd = Task.Run(async () => - { - await AsyncReload(); - }); - pUpd.Wait(); - } - } - } - - private string SelFileName - { - get - { - string answ = ""; - if (AppMService.File_Filter != null) - { - answ = AppMService.File_Filter.FileName; - } - return answ; - } - set - { - if (!AppMService.File_Filter.FileName.Equals(value)) - { - AppMService.File_Filter.FileName = value; - var pUpd = Task.Run(async () => - { - await AsyncReload(); - }); - pUpd.Wait(); - } - } - } - - private string SelIdxMacc - { - get - { - string answ = ""; - if (AppMService.File_Filter != null) - { - answ = AppMService.File_Filter.IdxMacchina; - } - return answ; - } - set - { - if (!AppMService.File_Filter.IdxMacchina.Equals(value)) - { - AppMService.File_Filter.IdxMacchina = value; - var pUpd = Task.Run(async () => - { - await AsyncReload(); - }); - pUpd.Wait(); - } - } - } - - private string SelTag - { - get - { - string answ = ""; - if (AppMService.File_Filter != null) - { - answ = AppMService.File_Filter.Tag; - } - return answ; - } - set - { - if (!AppMService.File_Filter.Tag.Equals(value)) - { - AppMService.File_Filter.Tag = value; - var pUpd = Task.Run(async () => - { - await AsyncReload(); - }); - pUpd.Wait(); - } - } - } - - #endregion Private Properties - - #region Protected Properties - - [Inject] - protected MessageService AppMService { get; set; } - - [Inject] - protected FileArchDataService DataService { get; set; } - - [Inject] - protected IJSRuntime JSRuntime { get; set; } - - [Inject] - protected NavigationManager NavManager { get; set; } - - protected string SearchTag - { - get - { - return _SearchTag; - } - set - { - _SearchTag = value; - // se son > 3 char... debounce... - if (string.IsNullOrEmpty(value)) - { - _SearchTag = defTag; - } - if (value.Length >= defTag.Length) - { - var pUpd = Task.Run(async () => - { - TagList = await DataService.TagGetFilt(SearchTag); - }); - pUpd.Wait(); - } - isLoading = false; - } - } - - #endregion Protected Properties - - #region Public Properties - - public bool DeleteDialogOpen { get; set; } - - #endregion Public Properties - - #region Private Methods - - private string cssActive(bool active) - { - string answ = active ? "text-dark" : "text-secondary textStriked"; - return answ; - } - - private string cssStatusByCod(FileData.FileState currStatus) - { - string answ = "badge"; - switch (currStatus) - { - case FileData.FileState.Changed: - answ += " badge-warning"; - break; - - case FileData.FileState.Deleted: - answ += " badge-danger"; - break; - - case FileData.FileState.Ok: - answ += " badge-success"; - break; - - case FileData.FileState.ND: - default: - answ += " badge-light"; - break; - } - return answ; - } - - private async Task OnDialogClose(bool accepted) - { - DeleteDialogOpen = false; - currPage = 1; - await AsyncReload(); - //StateHasChanged(); - } - - private void OpenDialog() - { - DeleteDialogOpen = true; - StateHasChanged(); - } - - #endregion Private Methods - - #region Protected Methods - - protected async Task AsyncReload() - { - isLoading = true; - currRecord = null; - ListRecords = null; - await ReloadData(); - isLoading = false; - } - - protected void Edit(FileModel selRecord) - { - // rileggo dal DB il record corrente... - var pUpd = Task.Run(async () => currRecord = await DataService.FileGetByKey(selRecord.FileId)); - pUpd.Wait(); - } - - protected async Task FilterPath(string searchVal) - { - SelFileName = searchVal; - OnlyActive = false; - await ReloadAllData(); - isLoading = false; - } - - protected async Task FilterTag(string searchVal) - { - SelTag = searchVal; - await ReloadAllData(); - isLoading = false; - } - - protected async Task ForceCheck(int numDays) - { - currRecord = null; - ListRecords = null; - // importante altrimenti NON mostra update UI - await Task.Delay(1); - //AppMService.File_Filter = SelectData.Init(5, 10); - var numCheck = await DataService.updateAllArchive(numDays, false); - await ReloadAllData(); - await Task.Delay(1); - await RefreshDisplayLoading(); - } - - protected override async Task OnInitializedAsync() - { - SearchTag = defTag; - AppMService.ShowSearch = true; - AppMService.PageName = "Archivio File Programmi"; - AppMService.PageIcon = "fas fa-folder pr-2"; - AppMService.EA_SearchUpdated += OnSeachUpdated; - AppMService.EA_FilterUpdated += OnFilterUpdated; - await ReloadAllData(); - isLoading = false; - } - - protected async Task PagerReloadNum(int newNum) - { - numRecord = newNum; - await ReloadData(); - isLoading = false; - } - - protected async Task PagerReloadPage(int newNum) - { - currPage = newNum; - await ReloadData(); - isLoading = false; - } - - protected async Task RefreshDisplayLoading() - { - await Task.Delay(1); - isLoading = false; - } - - protected async Task ReloadAllData() - { - isLoading = true; - MacList = await DataService.MacchineGetAll(); - SelIdxMacc = "0"; - SearchTag = defTag; - TagList = await DataService.TagGetFilt(SearchTag); - await ReloadData(); - } - - protected async Task ReloadData() - { - isLoading = true; - // importante altrimenti NON mostra update UI - await Task.Delay(1); - totalCount = await DataService.FileCountFilt(AppMService.File_Filter); - //SearchRecords = await DataService.FileGetFilt(AppMService.File_Filter); - //// faccio paginazione SOLO NELLA DECINA attuale... (quindi non tutte le pagine ma solo subset) - //ListRecords = SearchRecords.Skip(numRecord * (currPage % 10 - 1)).Take(numRecord).ToList(); - - ListRecords = await DataService.FileGetFilt(AppMService.File_Filter); - await Task.Delay(1); - } - - protected void ResetData() - { - DataService.rollBackEdit(currRecord); - currRecord = null; - } - - protected async Task ResetFilter() - { - currRecord = null; - ListRecords = null; - AppMService.File_Filter = SelectData.Init(5, 10); - AppMService.SearchVal = ""; - SearchTag = defTag; - await ReloadAllData(); - isLoading = false; - } - - protected void ResetSearchTag() - { - SearchTag = defTag; - } - - protected void Select(FileModel selRecord) - { - // applico filtro da selezione - currRecord = selRecord; - } - - protected async Task UpdateData() - { - currRecord = null; - ListRecords = null; - DataService.ResetController(); - await ReloadData(); - await Task.Delay(1); - isLoading = false; - } - - #endregion Protected Methods - - #region Public Methods - - public string checkSelect(int FileId) - { - string answ = ""; - if (currRecord != null) - { - try - { - answ = (currRecord.FileId == FileId) ? "table-info" : ""; - } - catch - { } - } - return answ; - } - - public void Dispose() - { - AppMService.EA_SearchUpdated -= OnSeachUpdated; - AppMService.EA_FilterUpdated -= OnFilterUpdated; - } - - public async void OnFilterUpdated() - { - await ReloadData(); - //StateHasChanged(); - } - - public async void OnSeachUpdated() - { - SearchVal = AppMService.SearchVal; - //await ReloadData(); - StateHasChanged(); - } - - public void ResetTag() - { - SelTag = ""; - } - - #endregion Public Methods - } -} \ No newline at end of file diff --git a/MP.Land/Pages/Setup.razor b/MP.Land/Pages/Setup.razor deleted file mode 100644 index aba9003d..00000000 --- a/MP.Land/Pages/Setup.razor +++ /dev/null @@ -1,17 +0,0 @@ -@page "/Setup" - -@using MP.Land.Data -@using System.Text -@using DiffMatchPatch - -@inject MessageService AppMService - -
              -
              -

              Setup

              -
              -
              - -
              - @*
              Footer
              *@ -
              \ No newline at end of file diff --git a/MP.Land/Pages/Setup.razor.cs b/MP.Land/Pages/Setup.razor.cs deleted file mode 100644 index 7f2d52b3..00000000 --- a/MP.Land/Pages/Setup.razor.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Microsoft.AspNetCore.Components; -using MP.Land.Data; -using System; -using System.Threading.Tasks; - -namespace MP.Land.Pages -{ - public partial class Setup : ComponentBase - { - #region Protected Methods - - protected override void OnInitialized() - { - AppMService.ShowSearch = false; - AppMService.PageName = "Setup"; - AppMService.PageIcon = "fas fa-wrench pr-2"; - } - - #endregion Protected Methods - } -} \ No newline at end of file From 4f4cd7bf2f74928867258a7d77153868ff4bb294 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 20 Sep 2021 19:21:42 +0200 Subject: [PATCH 16/16] Ok singolo download --- MP.AppAuth/Controllers/AppAuthController.cs | 1 - MP.AppAuth/Models/UpdMan.cs | 2 +- MP.AppAuth/UpdateMan.cs | 270 ++++++++++++++++++++ MP.Land/Components/HomeLink.razor | 2 +- MP.Land/Components/SingleDownload.razor | 14 + MP.Land/Components/SingleDownload.razor.cs | 111 ++++++++ MP.Land/Components/UserCard.razor | 4 +- MP.Land/MP.Land.csproj | 2 +- MP.Land/Pages/Index.razor | 2 +- MP.Land/Pages/Index.razor.cs | 9 - MP.Land/Pages/UpdateManager.razor | 48 ++++ MP.Land/Pages/UpdateManager.razor.cs | 64 +++++ MP.Land/Resources/ChangeLog.html | 2 +- MP.Land/Resources/VersNum.txt | 2 +- MP.Land/Resources/manifest.xml | 2 +- MP.Land/Shared/NavMenu.razor | 4 +- MP.Land/appsettings.json | 2 + MP.Land/wwwroot/img/LogoBluGreen.png | Bin 0 -> 87309 bytes MP.Land/wwwroot/img/LogoMapoFull.png | Bin 0 -> 157981 bytes 19 files changed, 520 insertions(+), 21 deletions(-) create mode 100644 MP.AppAuth/UpdateMan.cs create mode 100644 MP.Land/Components/SingleDownload.razor create mode 100644 MP.Land/Components/SingleDownload.razor.cs create mode 100644 MP.Land/Pages/UpdateManager.razor create mode 100644 MP.Land/Pages/UpdateManager.razor.cs create mode 100644 MP.Land/wwwroot/img/LogoBluGreen.png create mode 100644 MP.Land/wwwroot/img/LogoMapoFull.png diff --git a/MP.AppAuth/Controllers/AppAuthController.cs b/MP.AppAuth/Controllers/AppAuthController.cs index 3c2897a9..316d3743 100644 --- a/MP.AppAuth/Controllers/AppAuthController.cs +++ b/MP.AppAuth/Controllers/AppAuthController.cs @@ -96,7 +96,6 @@ namespace MP.AppAuth.Controllers dbResult = dbCtx .DbSetUpdMan - //.Where(x => !string.IsNullOrEmpty(x.AppName)) .ToList(); return dbResult; diff --git a/MP.AppAuth/Models/UpdMan.cs b/MP.AppAuth/Models/UpdMan.cs index ff1efe8b..d1496155 100644 --- a/MP.AppAuth/Models/UpdMan.cs +++ b/MP.AppAuth/Models/UpdMan.cs @@ -16,7 +16,7 @@ namespace MP.AppAuth.Models public string AppName { get; set; } public string AppUrl { get; set; } - public bool? IsAuth { get; set; } + public bool IsAuth { get; set; } = false; public string LicenseKey { get; set; } public string LocalRepo { get; set; } public string ManifestUrl { get; set; } diff --git a/MP.AppAuth/UpdateMan.cs b/MP.AppAuth/UpdateMan.cs new file mode 100644 index 00000000..06b39a98 --- /dev/null +++ b/MP.AppAuth/UpdateMan.cs @@ -0,0 +1,270 @@ +using NLog; +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Net; +using System.Net.Http; +using System.Text; +using System.Threading.Tasks; +using System.Xml; + +namespace MP.AppAuth +{ + /// + /// Object of this class gives you all the details about the update useful in handling the update logic yourself. + /// + public class UpdateInfoEventArgs : EventArgs + { + #region Public Properties + + /// + /// URL of the webpage specifying changes in the new update. + /// + public string ChangelogURL { get; set; } + + /// + /// Returns newest version of the application available to download. + /// + public Version CurrentVersion { get; set; } + + /// + /// Download URL of the update file. + /// + public string DownloadURL { get; set; } + + /// + /// Returns version of the application currently installed on the user's PC. + /// + public Version InstalledVersion { get; set; } + + /// + /// If new update is available then returns true otherwise false. + /// + public bool IsUpdateAvailable { get; set; } + + /// + /// Shows if the update is required or optional. + /// + public bool Mandatory { get; set; } + + #endregion Public Properties + } + + /// + /// Gestione update applicazioni + /// + public class UpdateMan + { + #region Private Fields + + private static NLog.Logger Log = LogManager.GetCurrentClassLogger(); + + #endregion Private Fields + + #region Protected Fields + + protected bool doAuth = false; + + #endregion Protected Fields + + #region Public Fields + + /// + /// Init classe + /// + public static UpdateMan obj = new UpdateMan(); + + #endregion Public Fields + + #region Public Constructors + + /// + /// Init classe + /// + public UpdateMan() + { } + + /// + /// Init classe + /// + /// + /// + public UpdateMan(string user, string pwd) + { + userName = user; + passwd = pwd; + doAuth = !string.IsNullOrEmpty($"{userName}{passwd}"); + } + + #endregion Public Constructors + + #region Protected Properties + + protected string passwd { get; set; } = ""; + protected string userName { get; set; } = ""; + + #endregion Protected Properties + + #region Public Methods + + /// + /// Effettua download ultima versione applicativo + /// + /// + /// + /// + public long downloadLatest(string remoteUrl, string localRepo, string packName) + { + long size = 0; + // verifico directory + if (!Directory.Exists(localRepo)) + { + Directory.CreateDirectory(localRepo); + } + string localFile = ""; + string localLast = ""; + string DownloadURL = ""; + try + { + // in primis scarico update info... + UpdateInfoEventArgs updateData = getUpdateInfo(remoteUrl); + if (updateData.IsUpdateAvailable) + { + DownloadURL = updateData.DownloadURL; + localFile = string.Format(@"{0}\{1}_Build_{2}.zip", localRepo, packName, updateData.CurrentVersion); + localLast = string.Format(@"{0}\{1}.zip", localRepo, packName); + // scarica file e salva in directory locale... + using (var http = new HttpClient()) + { + //var client = new WebClient(); + //bool doAuth = !string.IsNullOrEmpty($"{userName}{passwd}"); + if (doAuth) + { + //client.Credentials = new System.Net.NetworkCredential(userName, passwd); + http.DefaultRequestHeaders.Accept.Clear(); + var byteArray = System.Text.ASCIIEncoding.UTF8.GetBytes($"{userName}:{passwd}"); + http.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", Convert.ToBase64String(byteArray)); + } + //client.DownloadFile(updateData.DownloadURL, localFile); + + // url da chiamare + http.BaseAddress = new Uri(DownloadURL); + // lettura + var data = http.GetAsync(DownloadURL).Result; + using (var myReader = data.Content.ReadAsStreamAsync()) + { + //var myReader = data.Content.ReadAsStreamAsync(); + if (data.StatusCode != HttpStatusCode.OK) + { + Log.Info($"Errore in chiamata getUpdateInfo per URL {remoteUrl}: status code: {data.StatusCode}"); + } + else + { + using (Stream outStream = File.OpenWrite(localFile)) + { + myReader.Result.CopyTo(outStream); + } + // ora lo copio come latest... + File.Copy(localFile, localLast, true); + // indico come fatto! + var thisFile = new FileInfo(localLast); + size = thisFile.Length; + } + } + } + } + else + { + localFile = string.Format(@"{0}\Error.log", localRepo); + // scrivo file in area target... + using (StreamWriter sw = File.AppendText(localFile)) + { + sw.WriteLine($"{DateTime.Now:yyyy-MM-dd HH:mm:ss} ATTENZIONE! Installer NON disponibile | {remoteUrl}"); + } + } + } + catch (Exception exc) + { + localFile = string.Format(@"{0}\Error.log", localRepo); + // scrivo file in area target... + using (StreamWriter sw = File.AppendText(localFile)) + { + sw.WriteLine($"{DateTime.Now:yyyy-MM-dd HH:mm:ss} Errore in fase di download installers{Environment.NewLine}XML: {remoteUrl}{Environment.NewLine}URL: {DownloadURL}"); + sw.WriteLine(exc.ToString()); + } + } + return size; + } + + /// + /// Recupera l'ultima versione disponibile + /// + /// + /// + public UpdateInfoEventArgs getUpdateInfo(string remoteUrl) + { + //bool doAuth = !string.IsNullOrEmpty($"{userName}{passwd}"); + + UpdateInfoEventArgs args = new UpdateInfoEventArgs(); + Version CurrentVersion; + bool Mandatory; + XmlDocument recXml = new XmlDocument(); + try + { + // recupero dati + using (var http = new HttpClient()) + { + if (doAuth) + { + http.DefaultRequestHeaders.Accept.Clear(); + var byteArray = System.Text.ASCIIEncoding.UTF8.GetBytes($"{userName}:{passwd}"); + http.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", Convert.ToBase64String(byteArray)); + } + // url da chiamare + http.BaseAddress = new Uri(remoteUrl); + // lettura + var data = http.GetAsync(remoteUrl).Result; + var myReader = data.Content.ReadAsStreamAsync(); + if (data.StatusCode != HttpStatusCode.OK) + { + Log.Info($"Errore in chiamata getUpdateInfo per URL {remoteUrl}: status code: {data.StatusCode}"); + } + else + { + recXml.Load(myReader.Result); + + XmlNodeList recData = recXml.SelectNodes("item"); + if (recData != null) + { + foreach (XmlNode item in recData) + { + XmlNode appCastVersion = item.SelectSingleNode("version"); + Version.TryParse(appCastVersion?.InnerText, out CurrentVersion); + args.CurrentVersion = CurrentVersion; + XmlNode appCastChangeLog = item.SelectSingleNode("changelog"); + args.ChangelogURL = appCastChangeLog?.InnerText; + XmlNode appCastUrl = item.SelectSingleNode("url"); + args.DownloadURL = appCastUrl?.InnerText; + XmlNode mandatory = item.SelectSingleNode("mandatory"); + Boolean.TryParse(mandatory?.InnerText, out Mandatory); + args.Mandatory = Mandatory; + args.IsUpdateAvailable = true; + } + } + } + } + } + catch (Exception exc) + { + Log.Info($"Eccezione in getUpdateInfo:{Environment.NewLine}{exc}"); + // metto versione = 0 + errore... + args.IsUpdateAvailable = false; + args.CurrentVersion = new Version("0.0.0.0"); + } + return args; + } + + #endregion Public Methods + } +} \ No newline at end of file diff --git a/MP.Land/Components/HomeLink.razor b/MP.Land/Components/HomeLink.razor index e8ca1aa0..653cb0fa 100644 --- a/MP.Land/Components/HomeLink.razor +++ b/MP.Land/Components/HomeLink.razor @@ -67,7 +67,7 @@ protected bool authOk() { - bool answ = !string.IsNullOrEmpty(CurrItem.LicenseKey) && Convert.ToBoolean(CurrItem.IsAuth); + bool answ = !string.IsNullOrEmpty(CurrItem.LicenseKey); return answ; } diff --git a/MP.Land/Components/SingleDownload.razor b/MP.Land/Components/SingleDownload.razor new file mode 100644 index 00000000..4530ffe6 --- /dev/null +++ b/MP.Land/Components/SingleDownload.razor @@ -0,0 +1,14 @@ +
              + @if (authOk()) + { +
              +

              @CurrItem.AppName 

              +
              +
              + +
              +
              + @outMessage +
              + } +
              \ No newline at end of file diff --git a/MP.Land/Components/SingleDownload.razor.cs b/MP.Land/Components/SingleDownload.razor.cs new file mode 100644 index 00000000..58975b3d --- /dev/null +++ b/MP.Land/Components/SingleDownload.razor.cs @@ -0,0 +1,111 @@ +using Microsoft.AspNetCore.Components; +using MP.AppAuth; +using MP.AppAuth.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.Extensions.Configuration; +using MP.Land.Data; +using System.Diagnostics; + +namespace MP.Land.Components +{ + public partial class SingleDownload + { + #region Protected Fields + + protected string outMessage = ""; + protected UpdateInfoEventArgs updArgs = new UpdateInfoEventArgs(); + protected UpdateMan updateManAuth = new UpdateMan("SWDownloader", "viaD@nte16"); + + #endregion Protected Fields + + #region Protected Properties + + [Inject] + protected IConfiguration Configuration { get; set; } + + [Inject] + protected AppAuthService DataService { get; set; } + + #endregion Protected Properties + + #region Public Properties + + [Parameter] + public UpdMan CurrItem { get; set; } + + #endregion Public Properties + + #region Protected Methods + + protected bool authOk() + { + bool answ = !string.IsNullOrEmpty(CurrItem.LicenseKey); + return answ; + } + + /// + /// effettua download del pacchetto indicato + /// + protected void DownloadPack() + { + long size = 0; + Stopwatch stopWatch = new Stopwatch(); + stopWatch.Start(); + if (CurrItem.IsAuth) + { + size = updateManAuth.downloadLatest(CurrItem.ManifestUrl, localPath(CurrItem.LocalRepo), CurrItem.PackName); + } + else + { + size = UpdateMan.obj.downloadLatest(CurrItem.ManifestUrl, localPath(CurrItem.LocalRepo), CurrItem.PackName); + } + stopWatch.Stop(); + TimeSpan ts = stopWatch.Elapsed; + + if (size > 0) + { + outMessage = $"Scaricati {(double)size / (1024 * 1024):N2} Mb in {ts.TotalSeconds:N2} s"; + } + else + { + outMessage = $"Download non riuscito per {CurrItem.AppName}"; + } + } + + protected string fullUrl(string relUrl) + { + return $"{Configuration["BaseUrl"]}{relUrl}"; + } + + protected string localPath(string localRepo) + { + return @$"{Configuration["downloadPath"]}\{localRepo}\{Configuration["appVers"]}"; ; + } + + protected override void OnInitialized() + { + // Recupero info ADM... + if (CurrItem.IsAuth) + { + updArgs = updateManAuth.getUpdateInfo(CurrItem.ManifestUrl); + } + else + { + updArgs = UpdateMan.obj.getUpdateInfo(CurrItem.ManifestUrl); + } + } + + protected MarkupString traduci(string lemma) + { + MarkupString answ; + string rawHtml = DataService.Traduci(lemma, "IT"); + answ = new MarkupString(rawHtml); + return answ; + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/MP.Land/Components/UserCard.razor b/MP.Land/Components/UserCard.razor index 6e0b7852..247d9bbf 100644 --- a/MP.Land/Components/UserCard.razor +++ b/MP.Land/Components/UserCard.razor @@ -8,10 +8,10 @@
              - EgalWare + EgalWare
              - @* EgalWare*@ + @* EgalWare*@

              @Environment

              diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj index 7f2be65a..85d4b197 100644 --- a/MP.Land/MP.Land.csproj +++ b/MP.Land/MP.Land.csproj @@ -3,7 +3,7 @@ net5.0 MP.Land - 1.1.2109.2016 + 1.1.2109.2019 diff --git a/MP.Land/Pages/Index.razor b/MP.Land/Pages/Index.razor index 6c3b2895..54c0195e 100644 --- a/MP.Land/Pages/Index.razor +++ b/MP.Land/Pages/Index.razor @@ -17,7 +17,7 @@
              - powered by EgalWare + powered by EgalWare
            diff --git a/MP.Land/Pages/Index.razor.cs b/MP.Land/Pages/Index.razor.cs index a5c69119..89eb18b1 100644 --- a/MP.Land/Pages/Index.razor.cs +++ b/MP.Land/Pages/Index.razor.cs @@ -24,12 +24,6 @@ namespace MP.Land.Pages #endregion Protected Fields - #region Private Properties - - private bool isLoading { get; set; } = false; - - #endregion Private Properties - #region Protected Properties [Inject] @@ -56,14 +50,11 @@ namespace MP.Land.Pages protected async Task ReloadAllData() { - isLoading = true; - //MacList = await DataService.MacchineGetAll(); await ReloadData(); } protected async Task ReloadData() { - isLoading = true; // importante altrimenti NON mostra update UI await Task.Delay(1); ListRecords = await DataService.UpdManList(); diff --git a/MP.Land/Pages/UpdateManager.razor b/MP.Land/Pages/UpdateManager.razor new file mode 100644 index 00000000..9fd8b77b --- /dev/null +++ b/MP.Land/Pages/UpdateManager.razor @@ -0,0 +1,48 @@ +@page "/UpdateManager" + +@using MP.Land.Data +@using MP.Land.Components + +
            +
            +
            + +
            +
            +

            Aggiornamento Moduli

            +
            + Ultime release applicazioni +
            +

            Scaricare uno o più pacchetti selezionando dall'elenco riportato.

            +
            +
            +
            + ALL Packages +
            + +
            +
            +
            +
            +
            + @if (ListRecords == null) + { + + } + else if (totalCount == 0) + { +
            Nessun record trovato
            + } + else + { +
            + @foreach (var item in ListRecords) + { +
            + +
            + } +
            + } +
            +
            \ No newline at end of file diff --git a/MP.Land/Pages/UpdateManager.razor.cs b/MP.Land/Pages/UpdateManager.razor.cs new file mode 100644 index 00000000..0d06a403 --- /dev/null +++ b/MP.Land/Pages/UpdateManager.razor.cs @@ -0,0 +1,64 @@ +using Microsoft.AspNetCore.Components; +using MP.Land.Data; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace MP.Land.Pages +{ + public partial class UpdateManager + { + #region Private Fields + + private List ListRecords; + + #endregion Private Fields + + #region Protected Fields + + protected int totalCount = 0; + + #endregion Protected Fields + + #region Protected Properties + + [Inject] + protected MessageService AppMService { get; set; } + + [Inject] + protected AppAuthService DataService { get; set; } + + #endregion Protected Properties + + #region Protected Methods + + protected override void OnInitialized() + { + AppMService.ShowSearch = false; + AppMService.PageName = "Update Manager"; + AppMService.PageIcon = "fas fa-download pr-2"; + } + + protected override async Task OnInitializedAsync() + { + await ReloadAllData(); + } + + protected async Task ReloadAllData() + { + await ReloadData(); + } + + protected async Task ReloadData() + { + // importante altrimenti NON mostra update UI + await Task.Delay(1); + ListRecords = await DataService.UpdManList(); + totalCount = ListRecords.Count(); + await Task.Delay(1); + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html index 324bb6d0..5b062486 100644 --- a/MP.Land/Resources/ChangeLog.html +++ b/MP.Land/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo gestione Programmi MAPO -

            Versione: 1.1.2109.2016

            +

            Versione: 1.1.2109.2019


            Note di rilascio: