diff --git a/XPS/App_Code/DS_applicazione.xsd b/XPS/App_Code/DS_applicazione.xsd index 9dd0c87..f3d2050 100644 --- a/XPS/App_Code/DS_applicazione.xsd +++ b/XPS/App_Code/DS_applicazione.xsd @@ -863,14 +863,14 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + - + @@ -883,14 +883,14 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + - + @@ -903,21 +903,21 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + - + - + @@ -928,213 +928,6 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1151,28 +944,14 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + - - - - - - - - - - - - - - - + @@ -1186,6 +965,20 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat + + + + + + + + + + + + + + @@ -1196,16 +989,10 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + + - - - - - - - - + @@ -1213,14 +1000,35 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + - + + + + + + + + + + + + + + + + + + + + + + @@ -1230,14 +1038,103 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -1299,6 +1196,7 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat + @@ -1307,8 +1205,110 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1321,28 +1321,28 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + - + - + - + @@ -1355,56 +1355,56 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + - + - + - + - + - + - + - + @@ -1417,44 +1417,44 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + - + - + - - + + - + - - + + @@ -1467,7 +1467,7 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + diff --git a/XPS/App_Code/DS_import.xsd b/XPS/App_Code/DS_import.xsd new file mode 100644 index 0000000..7d6c3bb --- /dev/null +++ b/XPS/App_Code/DS_import.xsd @@ -0,0 +1,857 @@ + + + + + + + + + + + + + + + DELETE FROM `acl` WHERE ((`clcodcn` = ?)) + + + + + + + + INSERT INTO `acl` (`clcodcn`, `clragd`, `cl_flcanc`, `clcod`, `clcdpiva`, `clindi`, `clloca`, `clcapo`, `clprov`, `cldist`, `clstat`, `clstatiso`, `clcdfi`, `cltele`, `clnfax`, `clindidomfisc`, `cllocadomfisc`, `clcapodomfisc`, `clprovdomfisc`, `cldistdomfisc`, `clstatdomfisc`, `clstatisodomfisc`, `clteledomfisc`, `clnfaxdomfisc`, `clalle`, `clfldi`, `clcognom`, `clnome`, `cldtna`, `clcona`, `clprna`, `cluscn`, `clstna`, `clsess`, `clrita`, `clannot1`, `clannot2`, `cl_zona`, `clcategoria`, `clcategoria2`, `cl_sett_att1`, `cl_sett_att2`, `clnote`, `cl_categco`, `cl_ling`, `cl_filiale`, `cl_cod_old`, `cl_cod_gruppo`, `cl_vt1`, `cl_vt2`, `cl_vt3`, `cl_vt4`, `abc_pa_sol_csolv_ID`, `cl_solv_dtupd`, `cldtfineutil`, `cl_fl_decod_anag`, `clindirec`, `cllocarec`, `clcaporec`, `clprovrec`, `clnfaxrec`, `cltelerec`, `clprcinps`, `clsuffreplica`, `cldtins`, `cldtvalidini`, `clcdaccisa`, `clnicciaa`, `clnregimp`, `clcod_estero`, `clemail`, `clwww`, `clctrib`, `clCodCausRit`, `clQuadro`, `cl_destStampe`, `clragd_n`, `clindi_n`, `clloca_n`, `clindidomfisc_n`, `cllocadomfisc_n`, `clindirec_n`, `cllocarec_n`) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT clcodcn, clragd, cl_flcanc, clcod, clcdpiva, clindi, clloca, clcapo, clprov, cldist, clstat, clstatiso, clcdfi, cltele, clnfax, clindidomfisc, cllocadomfisc, clcapodomfisc, clprovdomfisc, cldistdomfisc, clstatdomfisc, clstatisodomfisc, clteledomfisc, clnfaxdomfisc, clalle, clfldi, clcognom, clnome, cldtna, clcona, clprna, cluscn, clstna, clsess, clrita, clannot1, clannot2, cl_zona, clcategoria, clcategoria2, cl_sett_att1, cl_sett_att2, clnote, cl_categco, cl_ling, cl_filiale, cl_cod_old, cl_cod_gruppo, cl_vt1, cl_vt2, cl_vt3, cl_vt4, abc_pa_sol_csolv_ID, cl_solv_dtupd, cldtfineutil, cl_fl_decod_anag, clindirec, cllocarec, clcaporec, clprovrec, clnfaxrec, cltelerec, clprcinps, clsuffreplica, cldtins, cldtvalidini, clcdaccisa, clnicciaa, clnregimp, clcod_estero, clemail, clwww, clctrib, clCodCausRit, clQuadro, cl_destStampe, clragd_n, clindi_n, clloca_n, clindidomfisc_n, cllocadomfisc_n, clindirec_n, cllocarec_n FROM acl + + + + + + UPDATE `acl` SET `clcodcn` = ?, `clragd` = ?, `cl_flcanc` = ?, `clcod` = ?, `clcdpiva` = ?, `clindi` = ?, `clloca` = ?, `clcapo` = ?, `clprov` = ?, `cldist` = ?, `clstat` = ?, `clstatiso` = ?, `clcdfi` = ?, `cltele` = ?, `clnfax` = ?, `clindidomfisc` = ?, `cllocadomfisc` = ?, `clcapodomfisc` = ?, `clprovdomfisc` = ?, `cldistdomfisc` = ?, `clstatdomfisc` = ?, `clstatisodomfisc` = ?, `clteledomfisc` = ?, `clnfaxdomfisc` = ?, `clalle` = ?, `clfldi` = ?, `clcognom` = ?, `clnome` = ?, `cldtna` = ?, `clcona` = ?, `clprna` = ?, `cluscn` = ?, `clstna` = ?, `clsess` = ?, `clrita` = ?, `clannot1` = ?, `clannot2` = ?, `cl_zona` = ?, `clcategoria` = ?, `clcategoria2` = ?, `cl_sett_att1` = ?, `cl_sett_att2` = ?, `clnote` = ?, `cl_categco` = ?, `cl_ling` = ?, `cl_filiale` = ?, `cl_cod_old` = ?, `cl_cod_gruppo` = ?, `cl_vt1` = ?, `cl_vt2` = ?, `cl_vt3` = ?, `cl_vt4` = ?, `abc_pa_sol_csolv_ID` = ?, `cl_solv_dtupd` = ?, `cldtfineutil` = ?, `cl_fl_decod_anag` = ?, `clindirec` = ?, `cllocarec` = ?, `clcaporec` = ?, `clprovrec` = ?, `clnfaxrec` = ?, `cltelerec` = ?, `clprcinps` = ?, `clsuffreplica` = ?, `cldtins` = ?, `cldtvalidini` = ?, `clcdaccisa` = ?, `clnicciaa` = ?, `clnregimp` = ?, `clcod_estero` = ?, `clemail` = ?, `clwww` = ?, `clctrib` = ?, `clCodCausRit` = ?, `clQuadro` = ?, `cl_destStampe` = ?, `clragd_n` = ?, `clindi_n` = ?, `clloca_n` = ?, `clindidomfisc_n` = ?, `cllocadomfisc_n` = ?, `clindirec_n` = ?, `cllocarec_n` = ? WHERE ((`clcodcn` = ?)) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/XPS/App_Code/DS_import.xss b/XPS/App_Code/DS_import.xss new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/XPS/App_Code/DS_import.xss @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/XPS/App_Code/extSync.cs b/XPS/App_Code/extSync.cs new file mode 100644 index 0000000..a2fe272 --- /dev/null +++ b/XPS/App_Code/extSync.cs @@ -0,0 +1,77 @@ +using System; +using System.Collections.Generic; +using System.Web; + +/// +/// Summary description for extSync +/// +public class extSync +{ + #region area tableAdapter + + DS_importTableAdapters.aclTableAdapter taACL_orig; + DS_applicazioneTableAdapters.AnagClientiTableAdapter taAnagCli; + + private void caricaTA() + { + taAnagCli = new DS_applicazioneTableAdapters.AnagClientiTableAdapter(); + taACL_orig = new DS_importTableAdapters.aclTableAdapter(); + } + + #endregion + + protected extSync() + { + // avvio tableAdapters + caricaTA(); + } + + public static extSync obj = new extSync(); + + /// + /// + /// + /// + public bool caricaClienti() + { + bool answ = false; + // carico tab clienti access + DS_import.aclDataTable tabOrig = taACL_orig.GetData(); + // carico tab clienti MSSQL + DS_applicazione.AnagClientiDataTable tabDest = taAnagCli.GetData(); + DS_applicazione.AnagClientiRow rigaDest; + string ragSoc; + // verifico uno ad uno i clienti... + foreach (DS_import.aclRow riga in tabOrig) + { + try + { + rigaDest = tabDest.FindByCodCliente(riga.clcodcn); + if (rigaDest != null) + { + // se c'è faccio update... + ragSoc = string.Format("{0}, {1} {2} {3} {4}", riga.clragd, riga.clindi, riga.clcapo, riga.clloca, riga.clprov); + // controllo se eccedo i 50 char...) + if (ragSoc.Length > 50) + { + rigaDest.RagioneSociale = ragSoc.Substring(0, 50); + } + else + { + rigaDest.RagioneSociale = ragSoc; + } + } + else + { + // se manca aggiungo... + taAnagCli.Insert(riga.clcodcn, string.Format("{0}, {1} {2} {3} {4}", riga.clragd, riga.clindi, riga.clcapo, riga.clloca, riga.clprov).Substring(0, 50)); + } + } + catch + { + SteamWare.logger.lg.scriviLog(string.Format("errore inserimento per cod cliente {0}", riga.clcodcn), SteamWare.tipoLog.EXCEPTION); + } + } + return answ; + } +} diff --git a/XPS/App_Data/SP_DB_init.sql b/XPS/App_Data/SP_DB_init.sql new file mode 100644 index 0000000..ef15a1a Binary files /dev/null and b/XPS/App_Data/SP_DB_init.sql differ diff --git a/XPS/App_Data/si_dt30.mdb b/XPS/App_Data/si_dt30.mdb new file mode 100644 index 0000000..d6a1b76 Binary files /dev/null and b/XPS/App_Data/si_dt30.mdb differ diff --git a/XPS/Bin/SteamWare.XML b/XPS/Bin/SteamWare.XML index d2f1fa8..d901dfd 100644 --- a/XPS/Bin/SteamWare.XML +++ b/XPS/Bin/SteamWare.XML @@ -200,7 +200,6 @@ inserisce l'evento indicato dai parametri - datetime dell'evento user che ha generato l'evento pagina/form applicaizone in cui l'evento si è generato valore originale(se c'è) @@ -212,7 +211,6 @@ inserisce la nota utente indicata dai parametri, restituisce idx della nota creata... - datetime della nota utente user che ha inserito la nota testo della nota valore ulteriore da associare alla nota (es: label, codice, versione, ...) @@ -243,7 +241,7 @@ segna come cestinati tutti gli eventi dell'utente indicato non ancora associati o cestinati - utente generatore dell'evento + utente generatore dell'evento @@ -267,11 +265,36 @@ metodo di comportamento del controllo di logging + + + nasconde pannello log + + + + + memorizza log inserito + + + + + mostra pannello log + + metodo di comportamento del controllo di logging + + + con incremento indice di revisione dell'oggetto approvato + + + + + mantiene indice di revisione corrente + + Represents a strongly typed in-memory cache of data. @@ -386,12 +409,11 @@ - + setta le directory - @@ -402,13 +424,28 @@ inizializza il metodo alla cartella indicata - cartella di lavoro + + non serve +... x retrocompatibilità... metodo di avvio empty + + + cerca di caricare il fileinfo o da httpcontext-application re-position o direttamente come workpath + nomefile + + + + + + + cerca di caricare la directoryInfo o da httpcontext-application re-position o direttamente come workpath + + + + Legge i dati da uno stream fino a quando arriva alla fine. @@ -443,11 +480,23 @@ + + + elenco dei files come array di oggetti FileInfo + + + + + + elenco dei files come array di oggetti FileInfo filtrati per parametro + + + + elimina la directory di lavoro se è dir virtuale mappata - @@ -491,6 +540,7 @@ scrive il file dalla stringa inviata + @@ -504,7 +554,7 @@ converte un byte[] in una string - + @@ -525,19 +575,24 @@ + + + imposta la dir di lavoro + + + imposta la dir di lavoro - + non serve +... x retrocompatibilità... - + imposta la dir di lavoro impostandola dal mapPath corretto della web app... - @@ -565,6 +620,27 @@ nome con cui salvare il file + + + comprime zip il file indicato + + + + + + + calcola la dim della directory corrente... + + + + + + + elimina il file + vecchio + + + + versione statica (singleton) del'oggetto fileMover @@ -762,21 +838,141 @@ tipologia di file immagine + + + formato gif (no alpha channel) + + + + + formato jpeg + + + + + formato png + + tipo di immagini usate per le icone di comando in web applications + + + icona annulla (croce rossa) + + + + + icona approva (simbolo coccarda) + + + + + icona clona (magic wand) + + + + + icona converma (spunta verde) + + + + + icona elimina (cestino) + + + + + icona modifica (matita) + + + + + icona notepad (blocco note) + + + + + icona notepad + pdf (blocco note) + + + + + icona nuovo (segno +) + + + + + icona seleziona (lente) + + + + + icona semaforo giallo + + + + + icona semaforo rosso + + + + + icona semaforo verde + + + + + icona stampa (printer) + + dimensione immagini usate per le icone di comando in web applications + + + formato piccolo + + + + + formato medio + + + + + formato grande + + classe per effettuare confronto tra valori disomogeneri per tipo e costruire diff testuali + + + valore originale + + + + + nuovo valore + + + + + dictionary dei parametri vecchi + + + + + dictionary dei parametri nuovi + + inizializzazione classe @@ -822,6 +1018,36 @@ classe di gestione lettura + + + esegue parsing fornendo dati ed headers + + + + + + + + esegue parsing fornendo dati + + + + + + + esegue parsing fornendo dati come stream + + + + + + + esegue parsing fornendo dati come stream ed headers + + + + + Summary description for selettori @@ -854,6 +1080,57 @@ + + + tipo di chart (2D/3D) + + + + + 2D + + + + + 3D + + + + + web control che disegna un grafico a torta + + + + + altezza di default + + + + + larghezza di default + + + + + padding di default + + + + + legenda visibile di default + + + + + soglia minima 5% per mostrare il dato + + + + + renderizza il contenuto + + + disegna la leggenda html laterale... @@ -879,6 +1156,60 @@ + + + converte intero a stringa esadecimale + + + + + + + converte stringa esadecimale a intero + + + + + + + tipo di grafico (2D/3D) + + + + + ampiezza del grafico + + + + + altezza del grafico + + + + + padding grafico/container + + + + + boolean se si debba mostrale la legenda + + + + + percentuale minima da mostrare + + + + + serie di dati (tipizzata) ma mostrare + + + + + testo associato al controllo + + layer gestione vari tipi di memoria: cache, session... @@ -1044,7 +1375,8 @@ aggiunge la stringa corrente nel dictionary delle tabelle messe in session che vanno preservate da comando update (es: oggetto selezionato...) - + + @@ -1066,11 +1398,31 @@ definisce un intervalo di 2 date + + + data inizio + + + + + data fine + + struttura orario ordinarie/strordinarie + + + ore ordinarie + + + + + ore straordinarie + + classe di funzioni inerenti le date @@ -1121,6 +1473,7 @@ restituisce l'intervallo di N giorni fino alla data indicata + @@ -1144,12 +1497,21 @@ + + + classe di gestione delle email + + + + + stringa nel nome DNS o dell'ip del server SMTP + + metodo static per la gestione delle email - @@ -1457,6 +1819,14 @@ sistema tutte le labels traducendo i lemmi nella lingua utente ed in inglese + + + calcola come percentuale la radio dividendo/divisore + + + + + limita una stringa al numero max di caratteri imposto @@ -2320,13 +2690,6 @@ provvede a verificare la dim della cartella dei log e cancella i + vecchi fino a restare a dim inferiori a _logMaxMb - - - calcola la dim di una directory - - - - fornisce il file + vecchio @@ -2339,6 +2702,41 @@ tipo di log ammesso + + + informazioni di debug + + + + + errori + + + + + eccezioni nell'esecuzione try/catch + + + + + errori fatali + + + + + informazioni opzionali + + + + + fase di avvio componente + + + + + avvisi + + struttura di comando da input utente (es: via barcode) diff --git a/XPS/Bin/SteamWare.dll b/XPS/Bin/SteamWare.dll index 6317f55..2a9ed1e 100644 Binary files a/XPS/Bin/SteamWare.dll and b/XPS/Bin/SteamWare.dll differ diff --git a/XPS/Web.config b/XPS/Web.config index d6ebcab..6199c1d 100644 --- a/XPS/Web.config +++ b/XPS/Web.config @@ -79,7 +79,7 @@ - + @@ -114,9 +114,13 @@ - - - + + + + diff --git a/XPS/mod_menuBottom.ascx b/XPS/mod_menuBottom.ascx index 2fc888e..04a8ae4 100644 --- a/XPS/mod_menuBottom.ascx +++ b/XPS/mod_menuBottom.ascx @@ -1,4 +1,4 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeFile="mod_menuBottom.ascx.cs" Inherits="mod_menuBottom" %> -78 - +88 - diff --git a/XPS/mod_update.ascx b/XPS/mod_update.ascx new file mode 100644 index 0000000..c55b83a --- /dev/null +++ b/XPS/mod_update.ascx @@ -0,0 +1,25 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="mod_update.ascx.cs" Inherits="mod_update" %> +<%--

+ Modulo di update...

+

+  

+

+ faremo tante cose

+

+  

+

+ 1) wizard install
+ 2) wizard di upgrade db

+

+ per ora sarà solo visibile SOLO la funzione di sync dati del cliente (x caricare i dati dell'anagrafica...)

--%> +

+Aggiorna anagrafica clienti +

+

+con questa funzione verranno ricaricate le anagrafiche dei clienti: questo significa che i nuovi clienti saranno importati ed aggiunti, mentr per i vecchi clienti di cui si sia cambiata la descrizione e/o la parte di indirizzo (ma mantenuto il codice cliente) si provvederà all'aggiornamento di questi dati a pari codice.

+ +
  • +
    • +
    • + diff --git a/XPS/mod_update.ascx.cs b/XPS/mod_update.ascx.cs new file mode 100644 index 0000000..54a681a --- /dev/null +++ b/XPS/mod_update.ascx.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +public partial class mod_update : System.Web.UI.UserControl +{ + protected void Page_Load(object sender, EventArgs e) + { + + } + protected void Button1_Click(object sender, EventArgs e) + { + lblStart.Text = "inizio sync..."; + extSync.obj.caricaClienti(); + lblEnd.Text = "...sync completato!"; + } +} diff --git a/XPS/update.aspx b/XPS/update.aspx new file mode 100644 index 0000000..2854d4c --- /dev/null +++ b/XPS/update.aspx @@ -0,0 +1,8 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxTitle.master" AutoEventWireup="true" CodeFile="update.aspx.cs" Inherits="update" %> + +<%@ Register src="mod_update.ascx" tagname="mod_update" tagprefix="uc1" %> + + + + + diff --git a/XPS/update.aspx.cs b/XPS/update.aspx.cs new file mode 100644 index 0000000..43bd159 --- /dev/null +++ b/XPS/update.aspx.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +public partial class update : System.Web.UI.Page +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} diff --git a/project/XPS_deploy/Release/bin/SteamWare.dll b/project/XPS_deploy/Release/bin/SteamWare.dll index fd02498..6317f55 100644 Binary files a/project/XPS_deploy/Release/bin/SteamWare.dll and b/project/XPS_deploy/Release/bin/SteamWare.dll differ diff --git a/project/XPS_deploy/Release/bin/XPS.dll b/project/XPS_deploy/Release/bin/XPS.dll index 1d738cb..d576c6d 100644 Binary files a/project/XPS_deploy/Release/bin/XPS.dll and b/project/XPS_deploy/Release/bin/XPS.dll differ diff --git a/project/XPS_deploy/Release/mod_ULP.ascx b/project/XPS_deploy/Release/mod_ULP.ascx index dae274e..d250220 100644 --- a/project/XPS_deploy/Release/mod_ULP.ascx +++ b/project/XPS_deploy/Release/mod_ULP.ascx @@ -39,10 +39,10 @@ - - + <%----%> diff --git a/project/XPS_deploy/Release/mod_elencoComm.ascx b/project/XPS_deploy/Release/mod_elencoComm.ascx index 929bebc..c865708 100644 --- a/project/XPS_deploy/Release/mod_elencoComm.ascx +++ b/project/XPS_deploy/Release/mod_elencoComm.ascx @@ -117,8 +117,8 @@ - + <%----%> diff --git a/project/XPS_deploy/Release/mod_menuBottom.ascx b/project/XPS_deploy/Release/mod_menuBottom.ascx index 2509564..8be9b6c 100644 --- a/project/XPS_deploy/Release/mod_menuBottom.ascx +++ b/project/XPS_deploy/Release/mod_menuBottom.ascx @@ -1,3 +1,3 @@ <%@ control language="C#" autoeventwireup="true" inherits="mod_menuBottom, XPS" %> -78 - +88 - diff --git a/project/XPS_deploy/Release/web.config b/project/XPS_deploy/Release/web.config index a3bff84..badebb2 100644 --- a/project/XPS_deploy/Release/web.config +++ b/project/XPS_deploy/Release/web.config @@ -109,14 +109,18 @@ - + - - - + + + + diff --git a/project/XPS_deploy/ResolveAssemblyReference.cache b/project/XPS_deploy/ResolveAssemblyReference.cache index 5fc88a8..c46b352 100644 Binary files a/project/XPS_deploy/ResolveAssemblyReference.cache and b/project/XPS_deploy/ResolveAssemblyReference.cache differ diff --git a/project/XPS_deploy/Source/App_Code/DS_applicazione.xsd b/project/XPS_deploy/Source/App_Code/DS_applicazione.xsd index 9dd0c87..f3d2050 100644 --- a/project/XPS_deploy/Source/App_Code/DS_applicazione.xsd +++ b/project/XPS_deploy/Source/App_Code/DS_applicazione.xsd @@ -863,14 +863,14 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + - + @@ -883,14 +883,14 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + - + @@ -903,21 +903,21 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + - + - + @@ -928,213 +928,6 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1151,28 +944,14 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + - - - - - - - - - - - - - - - + @@ -1186,6 +965,20 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat + + + + + + + + + + + + + + @@ -1196,16 +989,10 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + + - - - - - - - - + @@ -1213,14 +1000,35 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + - + + + + + + + + + + + + + + + + + + + + + + @@ -1230,14 +1038,103 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -1299,6 +1196,7 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat + @@ -1307,8 +1205,110 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1321,28 +1321,28 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + - + - + - + @@ -1355,56 +1355,56 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + - + - + - + - + - + - + - + @@ -1417,44 +1417,44 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + - + - + - - + + - + - - + + @@ -1467,7 +1467,7 @@ WHERE (CodMappa = @CodMappa) AND (CodObj = @CodObj) AND (CodStato = @CodStat - + diff --git a/project/XPS_deploy/Source/App_Code/DS_import.xsd b/project/XPS_deploy/Source/App_Code/DS_import.xsd new file mode 100644 index 0000000..7d6c3bb --- /dev/null +++ b/project/XPS_deploy/Source/App_Code/DS_import.xsd @@ -0,0 +1,857 @@ + + + + + + + + + + + + + + + DELETE FROM `acl` WHERE ((`clcodcn` = ?)) + + + + + + + + INSERT INTO `acl` (`clcodcn`, `clragd`, `cl_flcanc`, `clcod`, `clcdpiva`, `clindi`, `clloca`, `clcapo`, `clprov`, `cldist`, `clstat`, `clstatiso`, `clcdfi`, `cltele`, `clnfax`, `clindidomfisc`, `cllocadomfisc`, `clcapodomfisc`, `clprovdomfisc`, `cldistdomfisc`, `clstatdomfisc`, `clstatisodomfisc`, `clteledomfisc`, `clnfaxdomfisc`, `clalle`, `clfldi`, `clcognom`, `clnome`, `cldtna`, `clcona`, `clprna`, `cluscn`, `clstna`, `clsess`, `clrita`, `clannot1`, `clannot2`, `cl_zona`, `clcategoria`, `clcategoria2`, `cl_sett_att1`, `cl_sett_att2`, `clnote`, `cl_categco`, `cl_ling`, `cl_filiale`, `cl_cod_old`, `cl_cod_gruppo`, `cl_vt1`, `cl_vt2`, `cl_vt3`, `cl_vt4`, `abc_pa_sol_csolv_ID`, `cl_solv_dtupd`, `cldtfineutil`, `cl_fl_decod_anag`, `clindirec`, `cllocarec`, `clcaporec`, `clprovrec`, `clnfaxrec`, `cltelerec`, `clprcinps`, `clsuffreplica`, `cldtins`, `cldtvalidini`, `clcdaccisa`, `clnicciaa`, `clnregimp`, `clcod_estero`, `clemail`, `clwww`, `clctrib`, `clCodCausRit`, `clQuadro`, `cl_destStampe`, `clragd_n`, `clindi_n`, `clloca_n`, `clindidomfisc_n`, `cllocadomfisc_n`, `clindirec_n`, `cllocarec_n`) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT clcodcn, clragd, cl_flcanc, clcod, clcdpiva, clindi, clloca, clcapo, clprov, cldist, clstat, clstatiso, clcdfi, cltele, clnfax, clindidomfisc, cllocadomfisc, clcapodomfisc, clprovdomfisc, cldistdomfisc, clstatdomfisc, clstatisodomfisc, clteledomfisc, clnfaxdomfisc, clalle, clfldi, clcognom, clnome, cldtna, clcona, clprna, cluscn, clstna, clsess, clrita, clannot1, clannot2, cl_zona, clcategoria, clcategoria2, cl_sett_att1, cl_sett_att2, clnote, cl_categco, cl_ling, cl_filiale, cl_cod_old, cl_cod_gruppo, cl_vt1, cl_vt2, cl_vt3, cl_vt4, abc_pa_sol_csolv_ID, cl_solv_dtupd, cldtfineutil, cl_fl_decod_anag, clindirec, cllocarec, clcaporec, clprovrec, clnfaxrec, cltelerec, clprcinps, clsuffreplica, cldtins, cldtvalidini, clcdaccisa, clnicciaa, clnregimp, clcod_estero, clemail, clwww, clctrib, clCodCausRit, clQuadro, cl_destStampe, clragd_n, clindi_n, clloca_n, clindidomfisc_n, cllocadomfisc_n, clindirec_n, cllocarec_n FROM acl + + + + + + UPDATE `acl` SET `clcodcn` = ?, `clragd` = ?, `cl_flcanc` = ?, `clcod` = ?, `clcdpiva` = ?, `clindi` = ?, `clloca` = ?, `clcapo` = ?, `clprov` = ?, `cldist` = ?, `clstat` = ?, `clstatiso` = ?, `clcdfi` = ?, `cltele` = ?, `clnfax` = ?, `clindidomfisc` = ?, `cllocadomfisc` = ?, `clcapodomfisc` = ?, `clprovdomfisc` = ?, `cldistdomfisc` = ?, `clstatdomfisc` = ?, `clstatisodomfisc` = ?, `clteledomfisc` = ?, `clnfaxdomfisc` = ?, `clalle` = ?, `clfldi` = ?, `clcognom` = ?, `clnome` = ?, `cldtna` = ?, `clcona` = ?, `clprna` = ?, `cluscn` = ?, `clstna` = ?, `clsess` = ?, `clrita` = ?, `clannot1` = ?, `clannot2` = ?, `cl_zona` = ?, `clcategoria` = ?, `clcategoria2` = ?, `cl_sett_att1` = ?, `cl_sett_att2` = ?, `clnote` = ?, `cl_categco` = ?, `cl_ling` = ?, `cl_filiale` = ?, `cl_cod_old` = ?, `cl_cod_gruppo` = ?, `cl_vt1` = ?, `cl_vt2` = ?, `cl_vt3` = ?, `cl_vt4` = ?, `abc_pa_sol_csolv_ID` = ?, `cl_solv_dtupd` = ?, `cldtfineutil` = ?, `cl_fl_decod_anag` = ?, `clindirec` = ?, `cllocarec` = ?, `clcaporec` = ?, `clprovrec` = ?, `clnfaxrec` = ?, `cltelerec` = ?, `clprcinps` = ?, `clsuffreplica` = ?, `cldtins` = ?, `cldtvalidini` = ?, `clcdaccisa` = ?, `clnicciaa` = ?, `clnregimp` = ?, `clcod_estero` = ?, `clemail` = ?, `clwww` = ?, `clctrib` = ?, `clCodCausRit` = ?, `clQuadro` = ?, `cl_destStampe` = ?, `clragd_n` = ?, `clindi_n` = ?, `clloca_n` = ?, `clindidomfisc_n` = ?, `cllocadomfisc_n` = ?, `clindirec_n` = ?, `cllocarec_n` = ? WHERE ((`clcodcn` = ?)) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/project/XPS_deploy/Source/App_Code/DS_import.xss b/project/XPS_deploy/Source/App_Code/DS_import.xss new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/project/XPS_deploy/Source/App_Code/DS_import.xss @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/project/XPS_deploy/Source/App_Code/extSync.cs b/project/XPS_deploy/Source/App_Code/extSync.cs new file mode 100644 index 0000000..2ee5b3f --- /dev/null +++ b/project/XPS_deploy/Source/App_Code/extSync.cs @@ -0,0 +1,62 @@ +using System; +using System.Collections.Generic; +using System.Web; + +/// +/// Summary description for extSync +/// +public class extSync +{ + #region area tableAdapter + + DS_importTableAdapters.aclTableAdapter taACL_orig; + DS_applicazioneTableAdapters.AnagClientiTableAdapter taAnagCli; + + private void caricaTA() + { + taAnagCli = new DS_applicazioneTableAdapters.AnagClientiTableAdapter(); + taACL_orig = new DS_importTableAdapters.aclTableAdapter(); + } + + #endregion + + public extSync() + { + // avvio tableAdapters + caricaTA(); + } + + + /// + /// + /// + /// + public bool caricaClienti() + { + bool answ = false; + // carico tab clienti access + DS_import.aclDataTable tabOrig = taACL_orig.GetData(); + // carico tab clienti MSSQL + DS_applicazione.AnagClientiDataTable tabDest = taAnagCli.GetData(); + DS_applicazione.AnagClientiRow rigaDest; + // verifico uno ad uno i clienti... + foreach (DS_import.aclRow riga in tabOrig) + { + try + { + rigaDest = tabDest.FindByCodCliente(riga.clcodcn); + if (rigaDest != null) + { + // se c'è faccio update... + } + rigaDest.RagioneSociale = string.Format("{0}, {1} {2} {3} {4}", riga.clragd, riga.clindi, riga.clcapo, riga.clloca, riga.clprov).Substring(0, 50); + } + catch + { + // se manca aggiungo... + taAnagCli.Insert(riga.clcodcn, string.Format("{0}, {1} {2} {3} {4}", riga.clragd, riga.clindi, riga.clcapo, riga.clloca, riga.clprov).Substring(0, 50)); + } + } + return answ; + } +} diff --git a/project/XPS_deploy/Source/App_Data/si_dt30.mdb b/project/XPS_deploy/Source/App_Data/si_dt30.mdb new file mode 100644 index 0000000..d6a1b76 Binary files /dev/null and b/project/XPS_deploy/Source/App_Data/si_dt30.mdb differ diff --git a/project/XPS_deploy/Source/Bin/SteamWare.dll b/project/XPS_deploy/Source/Bin/SteamWare.dll index fd02498..6317f55 100644 Binary files a/project/XPS_deploy/Source/Bin/SteamWare.dll and b/project/XPS_deploy/Source/Bin/SteamWare.dll differ diff --git a/project/XPS_deploy/Source/Web.config b/project/XPS_deploy/Source/Web.config index 006bfb7..f10171a 100644 --- a/project/XPS_deploy/Source/Web.config +++ b/project/XPS_deploy/Source/Web.config @@ -109,14 +109,18 @@ - + - - - + + + + diff --git a/project/XPS_deploy/Source/mod_ULP.ascx b/project/XPS_deploy/Source/mod_ULP.ascx index 3f96a30..87badcb 100644 --- a/project/XPS_deploy/Source/mod_ULP.ascx +++ b/project/XPS_deploy/Source/mod_ULP.ascx @@ -39,10 +39,10 @@ - - + <%----%> diff --git a/project/XPS_deploy/Source/mod_elencoComm.ascx b/project/XPS_deploy/Source/mod_elencoComm.ascx index e77a5cb..f88223a 100644 --- a/project/XPS_deploy/Source/mod_elencoComm.ascx +++ b/project/XPS_deploy/Source/mod_elencoComm.ascx @@ -118,8 +118,8 @@ - + <%----%> diff --git a/project/XPS_deploy/Source/mod_menuBottom.ascx b/project/XPS_deploy/Source/mod_menuBottom.ascx index 2fc888e..04a8ae4 100644 --- a/project/XPS_deploy/Source/mod_menuBottom.ascx +++ b/project/XPS_deploy/Source/mod_menuBottom.ascx @@ -1,4 +1,4 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeFile="mod_menuBottom.ascx.cs" Inherits="mod_menuBottom" %> -78 - +88 - diff --git a/project/XPS_deploy/XPS_deploy.wdproj b/project/XPS_deploy/XPS_deploy.wdproj index de97b93..852c91e 100644 --- a/project/XPS_deploy/XPS_deploy.wdproj +++ b/project/XPS_deploy/XPS_deploy.wdproj @@ -32,11 +32,12 @@ true - - - + + + + diff --git a/project/XPS_installer/Release/XPS_installer.msi b/project/XPS_installer/Release/XPS_installer.msi index 9764581..fa957e5 100644 Binary files a/project/XPS_installer/Release/XPS_installer.msi and b/project/XPS_installer/Release/XPS_installer.msi differ diff --git a/project/XPS_installer/XPS_installer.vdproj b/project/XPS_installer/XPS_installer.vdproj index 7d23b43..474d689 100644 --- a/project/XPS_installer/XPS_installer.vdproj +++ b/project/XPS_installer/XPS_installer.vdproj @@ -320,7 +320,7 @@ "Name" = "8:logs" "AlwaysCreate" = "11:TRUE" "Condition" = "8:" - "Transitive" = "11:FALSE" + "Transitive" = "11:TRUE" "Property" = "8:_8ED13096DD68411CAC41B9812554A36B" "Folders" { @@ -378,7 +378,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:XPS" "ProductCode" = "8:{50DB8641-2B0C-42FA-9D32-A1195B154A3A}" - "PackageCode" = "8:{0A5879E1-FA94-4387-8CE4-37B3C6F8C650}" + "PackageCode" = "8:{B615D9D1-48EA-4666-B01C-8FAC5EABEC5C}" "UpgradeCode" = "8:{71B65361-FEA5-44CA-9B9A-45597433DB20}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE"